Skip to content

Commit c4a1f0d

Browse files
authored
Smol update
Auto sprayonator: = Switched to AutoBazaar = It's based on tablist now, thanks Osama! Config: = Fixed rare crash occurence, thanks RobotHanzo! Lower AVG BPS: = Another attempt to fix this lol
2 parents d97a945 + d6a6b64 commit c4a1f0d

File tree

6 files changed

+205
-747
lines changed

6 files changed

+205
-747
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
44
mcVersion=1.8.9
55
modid=farmhelperv2
66
modName=FarmHelper
7-
version=2.8.2-pre2
8-
shouldRelease=false
7+
version=2.8.2-pre3
8+
shouldRelease=true

src/main/java/com/jelly/farmhelperv2/command/FarmHelperMainCommand.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import cc.polyfrost.oneconfig.utils.commands.annotations.SubCommand;
77
import com.jelly.farmhelperv2.FarmHelper;
88
import com.jelly.farmhelperv2.config.FarmHelperConfig;
9+
import com.jelly.farmhelperv2.handler.GameStateHandler;
910
import com.jelly.farmhelperv2.pathfinder.FlyPathFinderExecutor;
1011
import com.jelly.farmhelperv2.util.LogUtils;
1112
import com.jelly.farmhelperv2.util.PlayerUtils;
@@ -67,4 +68,9 @@ public void update() {
6768
PlayerUtils.closeScreen();
6869
FarmHelperConfig.checkForUpdate();
6970
}
71+
72+
@SubCommand
73+
public void test(){
74+
LogUtils.sendSuccess("SprayonatorState: " + GameStateHandler.getInstance().getSprayonatorState());
75+
}
7076
}

src/main/java/com/jelly/farmhelperv2/config/FarmHelperConfig.java

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,7 @@ public static void triggerManuallyAutoPestExchange() {
17091709
@Switch(
17101710
name = "Auto Sprayonator", category = AUTO_SPRAYONATOR, subcategory = "Auto Sprayonator"
17111711
)
1712-
public static boolean autoSprayonatorEnable = false;
1712+
public static boolean autoSprayonator = false;
17131713

17141714
@Dropdown(
17151715
name = "Type", category = AUTO_SPRAYONATOR, subcategory = "Auto Sprayonator",
@@ -1721,39 +1721,9 @@ public static void triggerManuallyAutoPestExchange() {
17211721
"Dung (Beetle & Fly)",
17221722
"Plant Matter (Locust & Slug)",
17231723
"Tasty Cheese (Rat & Mite)"
1724-
}, size = 5
1725-
)
1726-
public static int sprayonatorType;
1727-
1728-
@Getter
1729-
public enum SPRAYONATOR_ITEM {
1730-
FINE_FLOUR("Fine Flour"),
1731-
COMPOST("Compost"),
1732-
HONEY_JAR("Honey Jar"),
1733-
DUNG("Dung"),
1734-
PLANT_MATTER("Plant Matter"),
1735-
TASTY_CHEESE("Tasty Cheese"),
1736-
NONE("NONE");
1737-
1738-
final String itemName;
1739-
1740-
SPRAYONATOR_ITEM(final String item_name) {
1741-
this.itemName = item_name;
1742-
}
1743-
}
1744-
1745-
@Switch(
1746-
name = "Inventory Only", category = AUTO_SPRAYONATOR, subcategory = "Auto Sprayonator"
1747-
)
1748-
public static boolean sprayonatorItemInventoryOnly;
1749-
1750-
@Slider(
1751-
name = "Sprayonator Slot", category = AUTO_SPRAYONATOR, subcategory = "Auto Sprayonator",
1752-
min = 1, max = 8,
1753-
step = 1,
1754-
description = "Slot to move sprayonator to"
1724+
}
17551725
)
1756-
public static int autoSprayonatorSlot = 1;
1726+
public static int autoSprayonatorSprayMaterial = 0;
17571727

17581728
@Slider(
17591729
name = "Additional Delay", category = AUTO_SPRAYONATOR, subcategory = "Auto Sprayonator",
@@ -1774,16 +1744,6 @@ public enum SPRAYONATOR_ITEM {
17741744
min = 1, max = 64
17751745
)
17761746
public static int autoSprayonatorAutoBuyAmount = 1;
1777-
1778-
@Button(
1779-
name = "Reset Plots", category = AUTO_SPRAYONATOR, subcategory = "Auto Sprayonator",
1780-
text = "Click Here",
1781-
description = "Resets the cached data for sprayonator"
1782-
)
1783-
Runnable _autoSprayonatorResetPlots = () -> {
1784-
AutoSprayonator.getInstance().resetPlots();
1785-
};
1786-
17871747
//</editor-fold>
17881748

17891749
//<editor-fold desc="DELAYS">

0 commit comments

Comments
 (0)