Skip to content

Commit

Permalink
Changes since first 2.4.1-pre version:
Browse files Browse the repository at this point in the history
= Fixed issue with stuck on spawn after pests destroyer
+ Auto Pest Hunter BETA - for now it's manual only
+ Profit calculator - added reset button
+ Discord Webhook - added ban stats
+ Pests Destroyer & Visitors - Infinite AFK Mode
+ S Shape Melon/Pumpkin - AntiStuck when stucked inside melon/pumpkin
+ Check for cancelled rotation packet after rewarp (aka having No Rotation in Oringo)
= Failsafes changes and fixes
= Visitors Macro - Fixed issue with lore of rewards (ffs Hypixel, stop changing your lores and names)
+ Visitors Macro - Added option to ignore (will also automatically ignore visitor, if it has profit reward, but item is not buyable on bz or price manipulated)
  • Loading branch information
May2Beez committed Jan 14, 2024
1 parent 0968eca commit 7938ca8
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 25 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
mcVersion=1.8.9
modid=farmhelperv2
modName=FarmHelper
version=2.4.1-pre14
version=2.4.1
shouldRelease=true
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ public enum SPRAYONATOR_ITEM {
name = "Use Path finder in Visitors macro between serving visitors", category = VISITORS_MACRO, subcategory = "Visitors Macro",
description = "Uses path finder between serving visitors"
)
public static boolean visitorsMacroUsePathFinder = false;
public static boolean visitorsMacroUsePathFinder = true;

@Slider(
name = "The minimum amount of coins to start the macro (in thousands)", category = VISITORS_MACRO, subcategory = "Visitors Macro",
Expand Down Expand Up @@ -1114,38 +1114,38 @@ public enum SPRAYONATOR_ITEM {
@Dropdown(
name = "Uncommon", category = VISITORS_MACRO, subcategory = "Rarity",
description = "The action taken when an uncommon visitor arrives",
options = {"Accept", "Accept if profitable only", "Decline"},
options = {"Accept", "Accept if profitable only", "Decline", "Ignore"},
size = 2
)
public static int visitorsActionUncommon = 0;
@Dropdown(
name = "Rare", category = VISITORS_MACRO, subcategory = "Rarity",
description = "The action taken when a rare visitor arrives",
options = {"Accept", "Accept if profitable only", "Decline"},
options = {"Accept", "Accept if profitable only", "Decline", "Ignore"},
size = 2
)
public static int visitorsActionRare = 0;
@Dropdown(
name = "Legendary", category = VISITORS_MACRO, subcategory = "Rarity",
description = "The action taken when a legendary visitor arrives",
options = {"Accept", "Accept if profitable only", "Decline"},
options = {"Accept", "Accept if profitable only", "Decline", "Ignore"},
size = 2
)
public static int visitorsActionLegendary = 0;
@Dropdown(
name = "Mythic", category = VISITORS_MACRO, subcategory = "Rarity",
description = "The action taken when a mythic visitor arrives",
options = {"Accept", "Accept if profitable only", "Decline"},
options = {"Accept", "Accept if profitable only", "Decline", "Ignore"},
size = 2
)
public static int visitorsActionMythic = 0;
@Dropdown(
name = "Special", category = VISITORS_MACRO, subcategory = "Rarity",
description = "The action taken when a special visitor arrives",
options = {"Accept", "Accept if profitable only", "Decline"},
options = {"Accept", "Accept if profitable only", "Decline", "Ignore"},
size = 2
)
public static int visitorsActionSpecial = 0;
public static int visitorsActionSpecial = 3;
//</editor-fold>
//</editor-fold>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ else if (BlockUtils.getRelativeBlock(1, 1, 0).equals(Blocks.dirt))
if (FailsafeManager.getInstance().swapItemDuringRecording && Math.random() > 0.6)
FailsafeManager.getInstance().swapItemDuringRecording = false;
dirtBlocks.removeIf(tuple -> {
if (System.currentTimeMillis() - tuple.getSecond() > 120_000 || !mc.theWorld.getBlockState(tuple.getFirst()).getBlock().isCollidable() || BlockUtils.canWalkThrough(tuple.getFirst())) {
if (System.currentTimeMillis() - tuple.getSecond() > 120_000 || !mc.theWorld.getBlockState(tuple.getFirst()).getBlock().isCollidable() || BlockUtils.canWalkThrough(tuple.getFirst()) || mc.theWorld.getBlockState(tuple.getFirst()).getBlock().equals(Blocks.air) || CropUtils.isCrop(mc.theWorld.getBlockState(tuple.getFirst()).getBlock()) || mc.theWorld.getBlockState(tuple.getFirst()).getBlock().equals(Blocks.water) || mc.theWorld.getBlockState(tuple.getFirst()).getBlock().equals(Blocks.flowing_water)) {
LogUtils.sendDebug("[Failsafe] Dirt block removed: " + tuple.getFirst());
return true;
}
Expand Down Expand Up @@ -208,7 +208,7 @@ else if (BlockUtils.getRelativeBlock(1, 1, 0).equals(Blocks.dirt))
break;
case ROTATE_TO_POS_BEFORE:
if (FailsafeManager.getInstance().rotation.isRotating()) break;
FailsafeManager.getInstance().rotation.easeTo(new RotationConfiguration(new Rotation(rotationBeforeReacting.getYaw(), rotationBeforeReacting.getPitch()),
FailsafeManager.getInstance().rotation.easeTo(new RotationConfiguration(new Rotation((float) (rotationBeforeReacting.getYaw() + (Math.random() * 30 - 15)), (float) (Math.random() * 30 + 30)),
500, null));
dirtCheckState = DirtCheckState.END_DIRT_CHECK;
FailsafeManager.getInstance().scheduleRandomDelay(500, 1000);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

public class RotationFailsafe extends Failsafe {
private static RotationFailsafe instance;

public static RotationFailsafe getInstance() {
if (instance == null) {
instance = new RotationFailsafe();
Expand Down Expand Up @@ -139,7 +140,7 @@ public void duringFailsafeTrigger() {
FailsafeManager.getInstance().scheduleRandomDelay(500, 1000);
break;
case ROTATE_TO_POS_BEFORE:
rotation.easeTo(new RotationConfiguration(new Rotation(rotationBeforeReacting.getYaw(), rotationBeforeReacting.getPitch()),
FailsafeManager.getInstance().rotation.easeTo(new RotationConfiguration(new Rotation((float) (rotationBeforeReacting.getYaw() + (Math.random() * 30 - 15)), (float) (Math.random() * 30 + 30)),
500, null));
rotationCheckState = RotationCheckState.LOOK_AROUND_2;
FailsafeManager.getInstance().scheduleRandomDelay(500, 1000);
Expand Down Expand Up @@ -196,7 +197,7 @@ public void duringFailsafeTrigger() {
break;
case ROTATE_TO_POS_BEFORE_2:
if (rotation.isRotating()) break;
rotation.easeTo(new RotationConfiguration(new Rotation(rotationBeforeReacting.getYaw(), rotationBeforeReacting.getPitch()),
FailsafeManager.getInstance().rotation.easeTo(new RotationConfiguration(new Rotation((float) (rotationBeforeReacting.getYaw() + (Math.random() * 30 - 15)), (float) (Math.random() * 30 + 30)),
500, null));
this.endOfFailsafeTrigger();
FailsafeManager.getInstance().scheduleRandomDelay(500, 1000);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void duringFailsafeTrigger() {
FailsafeManager.getInstance().scheduleRandomDelay(500, 1000);
break;
case ROTATE_TO_POS_BEFORE:
rotation.easeTo(new RotationConfiguration(new Rotation(rotationBeforeReacting.getYaw(), rotationBeforeReacting.getPitch()),
FailsafeManager.getInstance().rotation.easeTo(new RotationConfiguration(new Rotation((float) (rotationBeforeReacting.getYaw() + (Math.random() * 30 - 15)), (float) (Math.random() * 30 + 30)),
500, null));
teleportCheckState = TeleportCheckState.LOOK_AROUND_2;
FailsafeManager.getInstance().swapItemDuringRecording = Math.random() < 0.2;
Expand Down Expand Up @@ -235,7 +235,7 @@ public void duringFailsafeTrigger() {
break;
case ROTATE_TO_POS_BEFORE_2:
if (rotation.isRotating()) break;
rotation.easeTo(new RotationConfiguration(new Rotation(rotationBeforeReacting.getYaw(), rotationBeforeReacting.getPitch()),
FailsafeManager.getInstance().rotation.easeTo(new RotationConfiguration(new Rotation((float) (rotationBeforeReacting.getYaw() + (Math.random() * 30 - 15)), (float) (Math.random() * 30 + 30)),
500, null));
teleportCheckState = TeleportCheckState.END;
FailsafeManager.getInstance().scheduleRandomDelay(500, 1000);
Expand Down
Loading

0 comments on commit 7938ca8

Please sign in to comment.