Skip to content

Commit

Permalink
v2.4.4-pre3 update
Browse files Browse the repository at this point in the history
+ Knockback Failsafe - it's confirmed it exists
+ Auto Pest Hunter - automatic desk location & bug fixes
  • Loading branch information
onixiya1337 committed Jan 22, 2024
1 parent f356f4c commit cd43976
Show file tree
Hide file tree
Showing 8 changed files with 472 additions and 27 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.4-pre2
version=2.4.4-pre3
shouldRelease=true
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,12 @@ public class FarmHelperConfig extends Config {
min = 0.5f, max = 20f
)
public static float teleportCheckSensitivity = 4;
@Slider(
name = "Knockback Check Vertical Sensitivity", category = FAILSAFE, subcategory = "Miscellaneous",
description = "The minimum power of vertical knockback (motionY) to trigger failsafe",
min = 2000, max = 10000, step = 1000
)
public static float knockbackCheckVerticalSensitivity = 4000;

@Switch(
name = "Average BPS Drop check", category = FAILSAFE, subcategory = "Miscellaneous",
Expand Down Expand Up @@ -1172,6 +1178,11 @@ public static void triggerManuallyPestsDestroyer() {
min = 5, max = 200
)
public static int autoPestHunterMinPests = 10;
@Switch(
name = "Send Webhook Log", category = AUTO_PEST_HUNTER, subcategory = "Auto Pest Hunter",
description = "Logs all events related to the auto pest hunter"
)
public static boolean logAutoPestHunterEvents = true;
@Info(
text = "The auto pest hunter will start automatically once you rewarp!",
type = InfoType.WARNING,
Expand All @@ -1190,7 +1201,6 @@ public static void triggerManuallyAutoPestHunter() {
AutoPestHunter.getInstance().setManuallyStarted(true);
AutoPestHunter.getInstance().start();
}

@Button(
name = "Set the pest hunter location", category = AUTO_PEST_HUNTER, subcategory = "Auto Pest Hunter",
description = "Sets the pest hunter location",
Expand Down Expand Up @@ -1224,6 +1234,15 @@ public static void triggerManuallyAutoPestHunter() {
min = -300, max = 300
)
public static int pestHunterDeskZ = 0;
@Info(
text = "You don't have to set the pest hunter location, it will be set automatically. Check the guide for more info.",
type = InfoType.INFO,
category = AUTO_PEST_HUNTER,
subcategory = "Auto Pest Hunter",
size = 2
)
public static boolean autoPestHunterInfo2;

//</editor-fold>

//<editor-fold desc="God Pot">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ public class CustomFailsafeMessagesPage {
multiline = true
)
public static String customTeleportationMessages = "";
@Text(
name = "Knockback failsafe messages",
description = "The messages to send to the chat when the knockback failsafe has been triggered (use '|' to split the messages)",
placeholder = "Leave empty to use a random message",
multiline = true
)
public static String customKnockbackMessages = "";

@Text(
name = "Bedrock failsafe messages",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ public class FailsafeNotificationsPage {
)
public static boolean notifyOnTeleportationFailsafe = true;

@Switch(
name = "Knockback Check Notifications",
description = "Whether or not to send a notification when the knockback check failsafe is triggered.",
category = "Failsafe Notifications"
)
public static boolean notifyOnKnockbackFailsafe = true;

@Switch(
name = "Dirt Check Notifications",
description = "Whether or not to send a notification when the dirt check failsafe is triggered.",
Expand Down Expand Up @@ -108,6 +115,13 @@ public class FailsafeNotificationsPage {
)
public static boolean alertOnTeleportationFailsafe = true;

@Switch(
name = "Knockback Check Sound Alert",
description = "Whether or not to play a sound when the knockback check failsafe is triggered.",
category = "Failsafe Sound Alerts"
)
public static boolean alertOnKnockbackFailsafe = true;

@Switch(
name = "Dirt Check Sound Alert",
description = "Whether or not to play a sound when the dirt check failsafe is triggered.",
Expand Down Expand Up @@ -200,6 +214,13 @@ public class FailsafeNotificationsPage {
)
public static boolean tagEveryoneOnTeleportationFailsafe = true;

@Switch(
name = "Knockback Check Tag Everyone",
description = "Whether or not to tag everyone in the webhook message when the knockback check failsafe is triggered.",
category = "Failsafe Tag Everyone"
)
public static boolean tagEveryoneOnKnockbackFailsafe = true;

@Switch(
name = "Dirt Check Tag Everyone",
description = "Whether or not to tag everyone in the webhook message when the dirt check failsafe is triggered.",
Expand Down Expand Up @@ -291,6 +312,13 @@ public class FailsafeNotificationsPage {
)
public static boolean autoAltTabOnTeleportationFailsafe = true;

@Switch(
name = "Knockback Check Auto Alt-tab",
description = "Whether or not to automatically alt-tab when the knockback check failsafe is triggered.",
category = "Failsafe Auto Alt-tab"
)
public static boolean autoAltTabOnKnockbackFailsafe = true;

@Switch(
name = "Dirt Check Auto Alt-tab",
description = "Whether or not to automatically alt-tab when the dirt check failsafe is triggered.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public FailsafeManager() {
GuestVisitFailsafe.getInstance(),
ItemChangeFailsafe.getInstance(),
JacobFailsafe.getInstance(),
KnockbackFailsafe.getInstance(),
LowerAvgBpsFailsafe.getInstance(),
RotationFailsafe.getInstance(),
TeleportFailsafe.getInstance(),
Expand Down Expand Up @@ -393,6 +394,7 @@ public enum EmergencyType {
NONE(""),
ROTATION_CHECK("You've got§l ROTATED§r§d by staff member!"),
TELEPORT_CHECK("You've got§l TELEPORTED§r§d by staff member!"),
KNOCKBACK_CHECK("You've got§l KNOCKBACKED OUT OF THE FARM§r§d by staff member!"),
DIRT_CHECK("You've got§l DIRT CHECKED§r§d by staff member!"),
ITEM_CHANGE_CHECK("Your §lITEM HAS CHANGED§r§d!"),
WORLD_CHANGE_CHECK("Your §lWORLD HAS CHANGED§r§d!"),
Expand Down
Loading

0 comments on commit cd43976

Please sign in to comment.