Updated GrimEfly

FaxHack · FaxHack · commit 57d72d681298 · 2025-05-13T19:10:58.000+01:00
diff --git a/src/main/java/dev/journey/PathSeeker/PathSeeker.java b/src/main/java/dev/journey/PathSeeker/PathSeeker.java
@@ -10,12 +10,16 @@
 import dev.journey.PathSeeker.utils.Update.UpdateChecker;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
 import meteordevelopment.meteorclient.commands.Commands;
+import meteordevelopment.meteorclient.events.game.GameLeftEvent;
 import meteordevelopment.meteorclient.systems.modules.Category;
 import meteordevelopment.meteorclient.systems.modules.Modules;
+import meteordevelopment.orbit.EventHandler;
 import net.fabricmc.loader.api.FabricLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static meteordevelopment.meteorclient.MeteorClient.EVENT_BUS;
+
 
 public class PathSeeker extends MeteorAddon {
     public static final Logger LOG = LoggerFactory.getLogger(PathSeeker.class);
@@ -28,7 +32,8 @@ public class PathSeeker extends MeteorAddon {
     @Override
     public void onInitialize() {
         LOG.info("Initializing Path-Seeker!");
-        UpdateChecker.checkForUpdate();
+
+        EVENT_BUS.subscribe(this);
 
         //Hunting
         Modules.get().add(new ActivatedSpawnerDetector());
@@ -63,13 +68,11 @@ public void onInitialize() {
         Modules.get().add(new TridentAura());
         Modules.get().add(new AutoPortal());
 
-
         /* To Release
 
         Modules.get().add(new ChestIndex());
 
-         */
-
+        */
 
         //Commands
         Commands.add(new MeteorFolderCommand());
@@ -87,6 +90,11 @@ public void onInitialize() {
         }
     }
 
+    @EventHandler
+    private void onGameLeft(GameLeftEvent event) {
+        UpdateChecker.resetCheckedStatus();
+    }
+
     @Override
     public void onRegisterCategories() {
         Modules.registerCategory(Hunting);
@@ -98,5 +106,4 @@ public void onRegisterCategories() {
     public String getPackage() {
         return "dev.journey.PathSeeker";
     }
-
 }
diff --git a/src/main/java/dev/journey/PathSeeker/modules/automation/AFKVanillaFly.java b/src/main/java/dev/journey/PathSeeker/modules/automation/AFKVanillaFly.java
@@ -1,42 +1,24 @@
 package dev.journey.PathSeeker.modules.automation;
 
 import dev.journey.PathSeeker.PathSeeker;
-import dev.journey.PathSeeker.modules.exploration.TrailFollower;
 import meteordevelopment.meteorclient.events.world.TickEvent;
+import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Module;
-import meteordevelopment.orbit.EventHandler;
-import meteordevelopment.meteorclient.utils.player.InvUtils;
 import meteordevelopment.meteorclient.utils.player.FindItemResult;
-import meteordevelopment.meteorclient.settings.*;
+import meteordevelopment.meteorclient.utils.player.InvUtils;
+import meteordevelopment.orbit.EventHandler;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
-import net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket;
 
 
 public class AFKVanillaFly extends Module {
-    private long lastRocketUse = 0;
-    private boolean launched = false;
-    private double yTarget = -1;
-    private float targetPitch = 0;
-
-    public AFKVanillaFly() {
-        super(PathSeeker.Automation, "AFKVanillaFly", "Maintains a level Y-flight with fireworks and smooth pitch control.");
-    }
-
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
-
-    public enum AutoFireworkMode {
-        VELOCITY,
-        TIMED_DELAY
-    }
-
     private final Setting<AutoFireworkMode> fireworkMode = sgGeneral.add(new EnumSetting.Builder<AutoFireworkMode>()
             .name("Auto Firework Mode")
             .description("Choose between velocity-based or timed firework usage.")
             .defaultValue(AutoFireworkMode.VELOCITY)
             .build()
     );
-
     private final Setting<Integer> fireworkDelay = sgGeneral.add(new IntSetting.Builder()
             .name("Timed Delay (ms)")
             .description("How long to wait between fireworks when using Timed Delay.")
@@ -45,7 +27,6 @@ public enum AutoFireworkMode {
             .visible(() -> fireworkMode.get() == AutoFireworkMode.TIMED_DELAY)
             .build()
     );
-
     private final Setting<Double> velocityThreshold = sgGeneral.add(new DoubleSetting.Builder()
             .name("Velocity Threshold")
             .description("Use a firework if your horizontal speed is below this value.")
@@ -54,6 +35,14 @@ public enum AutoFireworkMode {
             .visible(() -> fireworkMode.get() == AutoFireworkMode.VELOCITY)
             .build()
     );
+    private long lastRocketUse = 0;
+    private boolean launched = false;
+    private double yTarget = -1;
+    private float targetPitch = 0;
+
+    public AFKVanillaFly() {
+        super(PathSeeker.Automation, "AFKVanillaFly", "Maintains a level Y-flight with fireworks and smooth pitch control.");
+    }
 
     @Override
     public void onActivate() {
@@ -122,19 +111,16 @@ public void tickFlyLogic() {
         }
     }
 
-
     public void resetYLock() {
         yTarget = -1;
         launched = false;
     }
 
-
     @EventHandler
     private void onTick(TickEvent.Pre event) {
         tickFlyLogic();
     }
 
-
     private void tryUseFirework() {
         FindItemResult hotbar = InvUtils.findInHotbar(Items.FIREWORK_ROCKET);
         if (!hotbar.found()) {
@@ -166,4 +152,9 @@ private int findEmptyHotbarSlot() {
         }
         return -1;
     }
+
+    public enum AutoFireworkMode {
+        VELOCITY,
+        TIMED_DELAY
+    }
 }
diff --git a/src/main/java/dev/journey/PathSeeker/modules/automation/TridentAura.java b/src/main/java/dev/journey/PathSeeker/modules/automation/TridentAura.java
@@ -2,21 +2,21 @@
 
 import dev.journey.PathSeeker.PathSeeker;
 import meteordevelopment.meteorclient.events.world.TickEvent;
-import meteordevelopment.meteorclient.settings.*;
+import meteordevelopment.meteorclient.settings.BoolSetting;
+import meteordevelopment.meteorclient.settings.DoubleSetting;
+import meteordevelopment.meteorclient.settings.Setting;
+import meteordevelopment.meteorclient.settings.SettingGroup;
 import meteordevelopment.meteorclient.systems.modules.Module;
-import meteordevelopment.orbit.EventHandler;
-import meteordevelopment.meteorclient.utils.player.Rotations; // may possibly use
 import meteordevelopment.meteorclient.utils.player.InvUtils;
+import meteordevelopment.orbit.EventHandler;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.mob.HostileEntity;
-import net.minecraft.entity.player.PlayerEntity; // will use
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
 
 
-
 public class TridentAura extends Module {
     private final SettingGroup sgGeneral = settings.getDefaultGroup();
 
@@ -35,21 +35,19 @@ public class TridentAura extends Module {
             .sliderMax(100)
             .build()
     );
+    private final boolean justSwitched = false;
+    private Entity currentTarget = null;
+    private int cooldownTicks = 0;
 
     public TridentAura() {
         super(PathSeeker.Automation, "Trident Aura", "For trident spam");
     }
 
-    private Entity currentTarget = null;
-
     @Override
     public void onDeactivate() {
         currentTarget = null;
     }
 
-    private int cooldownTicks = 0;
-    private boolean justSwitched = false;
-
     @EventHandler
     private void onTick(TickEvent.Pre event) {
         if (mc.player == null || mc.world == null) return;
diff --git a/src/main/java/dev/journey/PathSeeker/modules/exploration/BaseFinder.java b/src/main/java/dev/journey/PathSeeker/modules/exploration/BaseFinder.java
@@ -33,7 +33,6 @@
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.entity.projectile.thrown.EnderPearlEntity;
 import net.minecraft.entity.vehicle.BoatEntity;
-import net.minecraft.entity.vehicle.ChestBoatEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
diff --git a/src/main/java/dev/journey/PathSeeker/modules/exploration/BetterStashFinder.java b/src/main/java/dev/journey/PathSeeker/modules/exploration/BetterStashFinder.java
@@ -4,7 +4,6 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import dev.journey.PathSeeker.PathSeeker;
-import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.gui.GuiTheme;
 import meteordevelopment.meteorclient.gui.WindowScreen;
 import meteordevelopment.meteorclient.gui.widgets.WWidget;
diff --git a/src/main/java/dev/journey/PathSeeker/modules/exploration/TrailFollower.java b/src/main/java/dev/journey/PathSeeker/modules/exploration/TrailFollower.java
@@ -204,6 +204,7 @@ public class TrailFollower extends Module {
     private double targetYaw;
     private int baritoneSetGoalTicks = 0;
     private double pathDistanceActual;
+
     public TrailFollower() {
         super(PathSeeker.Hunting, "TrailFollower", "Automatically follows trails in all dimensions.");
     }
diff --git a/src/main/java/dev/journey/PathSeeker/modules/render/EntityClusterESP.java b/src/main/java/dev/journey/PathSeeker/modules/render/EntityClusterESP.java
@@ -18,7 +18,6 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import dev.journey.PathSeeker.PathSeeker;
-import meteordevelopment.meteorclient.MeteorClient;
 import meteordevelopment.meteorclient.events.render.Render3DEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.gui.GuiTheme;
diff --git a/src/main/java/dev/journey/PathSeeker/modules/utility/BaritonePathing.java b/src/main/java/dev/journey/PathSeeker/modules/utility/BaritonePathing.java
@@ -3,13 +3,14 @@
 import baritone.api.BaritoneAPI;
 import dev.journey.PathSeeker.PathSeeker;
 import meteordevelopment.meteorclient.events.world.TickEvent;
-import meteordevelopment.meteorclient.events.game.ReceiveMessageEvent;
-import meteordevelopment.meteorclient.settings.*;
+import meteordevelopment.meteorclient.settings.IntSetting;
+import meteordevelopment.meteorclient.settings.KeybindSetting;
+import meteordevelopment.meteorclient.settings.Setting;
+import meteordevelopment.meteorclient.settings.SettingGroup;
 import meteordevelopment.meteorclient.systems.modules.Module;
+import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.utils.misc.Keybind;
 import meteordevelopment.orbit.EventHandler;
-import meteordevelopment.meteorclient.systems.modules.Modules;
-import net.minecraft.text.Text;
 
 public class BaritonePathing extends Module {
     private final SettingGroup sgSettings = settings.getDefaultGroup();
@@ -36,14 +37,13 @@ public class BaritonePathing extends Module {
             .defaultValue(Keybind.none())
             .build()
     );
+    private final boolean trailFollowerWasActive = false;
 
     public BaritonePathing() {
         super(PathSeeker.Automation, "BaritonePathMacro", "Easy macro to activate TrailFollower in the nether. Must deploy in air.");
         BaritoneAPI.getSettings().logger.value = this::info;  // fix for baritone chat logs
     }
 
-    private boolean trailFollowerWasActive = false;
-
     @EventHandler
     private void onTick(TickEvent.Post event) {
         if (flyKeybind.get().isPressed()) {
@@ -64,7 +64,6 @@ private void onTick(TickEvent.Post event) {
     }
 
 
-
     private void sendBaritoneCommand(String command) {
         if (command != null && !command.isEmpty()) {
             BaritoneAPI.getProvider().getPrimaryBaritone().getCommandManager().execute(command);
diff --git a/src/main/java/dev/journey/PathSeeker/modules/utility/Firework.java b/src/main/java/dev/journey/PathSeeker/modules/utility/Firework.java
@@ -1,14 +1,12 @@
 package dev.journey.PathSeeker.modules.utility;
 
 import dev.journey.PathSeeker.PathSeeker;
-import dev.journey.PathSeeker.modules.automation.AFKVanillaFly;
 import meteordevelopment.meteorclient.events.world.TickEvent;
 import meteordevelopment.meteorclient.settings.BoolSetting;
 import meteordevelopment.meteorclient.settings.DoubleSetting;
 import meteordevelopment.meteorclient.settings.Setting;
 import meteordevelopment.meteorclient.settings.SettingGroup;
 import meteordevelopment.meteorclient.systems.modules.Module;
-import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.item.Items;
 import net.minecraft.util.Hand;
diff --git a/src/main/java/dev/journey/PathSeeker/modules/utility/GrimEfly.java b/src/main/java/dev/journey/PathSeeker/modules/utility/GrimEfly.java
diff --git a/src/main/java/dev/journey/PathSeeker/modules/utility/SignHistorian.java b/src/main/java/dev/journey/PathSeeker/modules/utility/SignHistorian.java
diff --git a/src/main/java/dev/journey/PathSeeker/utils/PathSeekerUtil.java b/src/main/java/dev/journey/PathSeeker/utils/PathSeekerUtil.java
diff --git a/src/main/java/dev/journey/PathSeeker/utils/Update/UpdateChecker.java b/src/main/java/dev/journey/PathSeeker/utils/Update/UpdateChecker.java

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@ public class TrailFollower extends Module {`
`204`	`204`	`private double targetYaw;`
`205`	`205`	`private int baritoneSetGoalTicks = 0;`
`206`	`206`	`private double pathDistanceActual;`
	`207`	`+`
`207`	`208`	`public TrailFollower() {`
`208`	`209`	`super(PathSeeker.Hunting, "TrailFollower", "Automatically follows trails in all dimensions.");`
`209`	`210`	`}`