From 000fea03d2b61d6baa48d8618da6442600697ab9 Mon Sep 17 00:00:00 2001 From: OsamaBeingLagging Date: Fri, 22 Dec 2023 10:13:28 +0600 Subject: [PATCH 1/2] Silly silly --- .../farmhelperv2/feature/impl/AutoBazaar.java | 19 +++++++++++-------- .../feature/impl/AutoSprayonator.java | 8 ++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java index 732b1295..0f3c7ece 100644 --- a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java +++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java @@ -165,7 +165,10 @@ public void onTick(TickEvent.ClientTickEvent event) { @SubscribeEvent public void onChatReceive(ClientChatReceivedEvent event) { if (event.type != 0 || !this.enabled) return; - String message = StringUtils.stripControlCodes(event.message.getUnformattedText()); + String chatMessage = event.message.getUnformattedTextForChat(); + if(chatMessage == null) return; + + String message = StringUtils.stripControlCodes(chatMessage); String boughtMessage = String.format("[Bazaar] Bought %dx %s for", this.buyAmount, this.itemToBuy); if (message.startsWith(boughtMessage) && this.buyState == BuyState.BUY_VERIFY) { @@ -235,10 +238,10 @@ private void handleBuyFromBz() { return; } InventoryUtils.clickContainerSlot(buyInstantlySlot, InventoryUtils.ClickType.LEFT, InventoryUtils.ClickMode.PICKUP); - this.buyState = BuyState.BUY_INSTANTLY_VERIY; + this.buyState = BuyState.BUY_INSTANTLY_VERIFY; this.timer.schedule(2000); break; - case BUY_INSTANTLY_VERIY: + case BUY_INSTANTLY_VERIFY: if (this.openedChestGuiNameStartsWith(this.itemToBuy + " ➜ Instant Buy")) { log("Opened instant buy page"); this.timer.schedule(500); @@ -261,7 +264,7 @@ private void handleBuyFromBz() { return; } if (lore.contains("Loading...")) { // Makes more sense down here - this.buyState = BuyState.BUY_INSTANTLY_VERIY; + this.buyState = BuyState.BUY_INSTANTLY_VERIFY; return; } } @@ -377,14 +380,14 @@ private void handleSellToBz() { if (this.openedChestGuiNameStartsWith("Bazaar ➜ ")) { log("Opened Bz."); this.timer.schedule(500); - this.sellState = SellState.CLICK_INSTASELLL; + this.sellState = SellState.CLICK_INSTASELL; } if (this.hasTimerEnded()) { this.disable("Cannot open bz"); } break; - case CLICK_INSTASELLL: + case CLICK_INSTASELL: if (!this.hasTimerEnded()) return; int sellType = this.sellTypes.get(0); @@ -498,11 +501,11 @@ enum MainState { // Insta Buy enum BuyState { - STARTING, OPEN_BZ, BZ_VERIFY, CLICK_ON_PRODUCT, PRODUCT_VERIFY, CLICK_BUY_INSTANTLY, BUY_INSTANTLY_VERIY, OPEN_SIGN, OPEN_SIGN_VERIFY, EDIT_SIGN, VERIFY_CONFIRM_PAGE, CLICK_BUY, BUY_VERIFY, DISABLE + STARTING, OPEN_BZ, BZ_VERIFY, CLICK_ON_PRODUCT, PRODUCT_VERIFY, CLICK_BUY_INSTANTLY, BUY_INSTANTLY_VERIFY, OPEN_SIGN, OPEN_SIGN_VERIFY, EDIT_SIGN, VERIFY_CONFIRM_PAGE, CLICK_BUY, BUY_VERIFY, DISABLE } // Insta Sell enum SellState { - STARTING, OPEN_BZ, BZ_VERIFY, CLICK_INSTASELLL, INSTASELL_VERIFY, CLICK_CONFIRM_INSTASELL, CONFIRM_INSTASELL_VERIFY, DISABLE + STARTING, OPEN_BZ, BZ_VERIFY, CLICK_INSTASELL, INSTASELL_VERIFY, CLICK_CONFIRM_INSTASELL, CONFIRM_INSTASELL_VERIFY, DISABLE } } \ No newline at end of file diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java index 139a3ab4..abcae82d 100644 --- a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java +++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java @@ -149,7 +149,7 @@ public void onTickMainState(TickEvent.ClientTickEvent event) { case NONE: break; case STARTING: - // Remove these varialbes if u need + // Remove these variables if u need Plot currentPlot = this.plots[GameStateHandler.getInstance().getCurrentPlot()]; boolean shouldCheckPlots = Arrays.stream(this.plots).noneMatch(Objects::nonNull); boolean sprayonatorItemNotInInventory = !InventoryUtils.hasItemInInventory(this.SPRAYONATOR_ITEM[FarmHelperConfig.autoSprayonatorType]); @@ -193,7 +193,11 @@ public void onTickMainState(TickEvent.ClientTickEvent event) { @SubscribeEvent public void onChatReceive(ClientChatReceivedEvent event) { if (event.type != 0 || !this.enabled) return; - String message = StringUtils.stripControlCodes(event.message.getUnformattedText()); + String chatMessage = event.message.getUnformattedTextForChat(); + if(chatMessage == null) return; + + String message = StringUtils.stripControlCodes(chatMessage); + if (message.startsWith("SPRAYONATOR! Your selected material is now ") && this.sprayState == SprayState.SPRAYONATOR_TYPE_VERIFY) { log("Sprayonator Material Changed"); String itemName = SPRAYONATOR_ITEM[FarmHelperConfig.autoSprayonatorType]; From 20241d61d33617d3f0d7407eee8ce8eb45c1aa0f Mon Sep 17 00:00:00 2001 From: OsamaBeingLagging Date: Fri, 22 Dec 2023 13:02:33 +0600 Subject: [PATCH 2/2] Actual FIX ONG FRFR SMH --- .../com/jelly/farmhelperv2/feature/impl/AutoBazaar.java | 7 +++---- .../jelly/farmhelperv2/feature/impl/AutoSprayonator.java | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java index 0f3c7ece..b3879d82 100644 --- a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java +++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoBazaar.java @@ -112,7 +112,7 @@ public boolean shouldCheckForFailsafes() { return false; } - public void buy(String itemName, int amount){ + public void buy(String itemName, int amount) { this.buy(itemName, amount, 0); } @@ -165,10 +165,9 @@ public void onTick(TickEvent.ClientTickEvent event) { @SubscribeEvent public void onChatReceive(ClientChatReceivedEvent event) { if (event.type != 0 || !this.enabled) return; - String chatMessage = event.message.getUnformattedTextForChat(); - if(chatMessage == null) return; + if (event.message == null) return; - String message = StringUtils.stripControlCodes(chatMessage); + String message = StringUtils.stripControlCodes(event.message.getUnformattedTextForChat()); String boughtMessage = String.format("[Bazaar] Bought %dx %s for", this.buyAmount, this.itemToBuy); if (message.startsWith(boughtMessage) && this.buyState == BuyState.BUY_VERIFY) { diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java index abcae82d..e83ec869 100644 --- a/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java +++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/AutoSprayonator.java @@ -193,11 +193,9 @@ public void onTickMainState(TickEvent.ClientTickEvent event) { @SubscribeEvent public void onChatReceive(ClientChatReceivedEvent event) { if (event.type != 0 || !this.enabled) return; - String chatMessage = event.message.getUnformattedTextForChat(); - if(chatMessage == null) return; - - String message = StringUtils.stripControlCodes(chatMessage); + if (event.message == null) return; + String message = StringUtils.stripControlCodes(event.message.getUnformattedTextForChat()); if (message.startsWith("SPRAYONATOR! Your selected material is now ") && this.sprayState == SprayState.SPRAYONATOR_TYPE_VERIFY) { log("Sprayonator Material Changed"); String itemName = SPRAYONATOR_ITEM[FarmHelperConfig.autoSprayonatorType];