More fixes

Author: RedCarlos26

src/main/java/me/redcarlos/netherfreedom/modules/hud/WelcomeHudNF.java

@@ -16,16 +16,7 @@
 import static meteordevelopment.meteorclient.MeteorClient.mc;
 
 public class WelcomeHudNF extends HudElement {
-    public static final HudElementInfo<WelcomeHudNF> INFO = new HudElementInfo<>(NFAddon.Hud, "welcome-hud", "Displays a friendly welcome.", WelcomeHudNF::new);
-
-    private final SettingGroup sgGeneral = settings.getDefaultGroup();
-
-    private final Setting<Mode> mode = sgGeneral.add(new EnumSetting.Builder<Mode>()
-        .name("mode")
-        .description("What text to show for the greeting.")
-        .defaultValue(Mode.Time)
-        .build()
-    );
+    public static final HudElementInfo<WelcomeHudNF> INFO = new HudElementInfo<>(NFAddon.Hud, "welcome-hud-NF", "Displays a friendly welcome.", WelcomeHudNF::new);
 
     private String leftText;
     private String rightText;
@@ -37,13 +28,7 @@ public WelcomeHudNF() {
 
     @Override
     public void tick(HudRenderer renderer) {
-        int localTime = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
-
-        if (mode.get() == Mode.NetherFreedom) leftText = "Welcome to NF Client, ";
-        else if (localTime <= 12) leftText = "Good Morning, ";
-        else if (localTime <= 16) leftText = "Good Afternoon, ";
-        else leftText = "Good Evening, ";
-
+        leftText = "Welcome to NetherFreedom, ";
         rightText = Modules.get().get(NameProtect.class).getName(mc.getSession().getUsername());
 
         leftWidth = renderer.textWidth(leftText);
@@ -58,16 +43,11 @@ public void render(HudRenderer renderer) {
         double y = this.y;
 
         if (isInEditor()) {
-            renderer.text("NFWelcome", x, y, TextHud.getSectionColor(0), true);
+            renderer.text("WelcomeHUD-NF", x, y, TextHud.getSectionColor(0), true);
             return;
         }
 
         renderer.text(leftText, x, y, TextHud.getSectionColor(0), true);
         renderer.text(rightText, x + leftWidth, y, TextHud.getSectionColor(1), true);
     }
-
-    public enum Mode {
-        NetherFreedom,
-        Time
-    }
 }

src/main/java/me/redcarlos/netherfreedom/modules/main/BaritoneMiner.java

@@ -19,6 +19,7 @@
 import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Module;
 import meteordevelopment.meteorclient.systems.modules.Modules;
+import meteordevelopment.meteorclient.utils.misc.HorizontalDirection;
 import meteordevelopment.meteorclient.utils.misc.Keybind;
 import meteordevelopment.meteorclient.utils.player.FindItemResult;
 import meteordevelopment.meteorclient.utils.player.InvUtils;
@@ -110,18 +111,26 @@ public class BaritoneMiner extends Module {
     );
 
     public BaritoneMiner() {
-        super(NFAddon.Main, "baritone-miner-Beta", "Paths automatically (BETA).");
+        super(NFAddon.Main, " [BETA]-baritone-miner ", "Paths to dig automatically.");
     }
 
-    private BlockPos endOfLinePos, barPos, offsetPos, currPlayerPos, shulkerPlacePos, savedPos = null;
     private Direction toEndOfLineDir, toAdvanceDir, shulkerPlaceDir = null;
+    private HorizontalDirection dir = null;
+    private BlockPos endOfLinePos, barPos, offsetPos, currPlayerPos, shulkerPlacePos, savedPos = null;
     private boolean offsetting, bindPressed, isPaused, refilling, placedShulker, defined = false;
     private int length, initialNetherrack, initialPicksBroken = 0;
 
     Modules modules = Modules.get();
 
     @Override
     public void onActivate() {
+        baritoneSettings.blockPlacementPenalty.value = 0.0;
+        baritoneSettings.assumeWalkOnLava.value = true;
+        baritoneSettings.allowPlace.value = true;
+        baritoneSettings.mineScanDroppedItems.value = true;
+
+        dir = HorizontalDirection.get(mc.player.getYaw());
+
         if (!defined && !pathStart.get()) {
             start();
         } else if (!defined && pathStart.get()) {
@@ -134,11 +143,6 @@ public void onActivate() {
 
         initialPicksBroken = NFUtils.getPickaxesBroken();
         initialNetherrack = NFUtils.getNetherrack();
-
-        baritoneSettings.blockPlacementPenalty.value = 0.0;
-        baritoneSettings.assumeWalkOnLava.value = true;
-        baritoneSettings.allowPlace.value = true;
-        baritoneSettings.mineScanDroppedItems.value = true;
     }
 
     @Override
@@ -234,10 +238,13 @@ public void onTick(TickEvent.Pre event) throws InterruptedException {
                     barPos = new BlockPos(barPos.offset(toEndOfLineDir));
                 }
                 setGoal(barPos);
+
+                /**
                 // Places a block under the goal to keep baritone from pulling any funny business
                 if (underPos.getY() != cornerOne.get().getY()) {
                     placeUnder(barPos);
                 }
+                 */
             } catch (Exception ignored) {}
         }
 
@@ -335,9 +342,9 @@ private void start() {
 
         currPlayerPos = mc.player.getBlockPos();
         BlockPos extrapolatePos = new BlockPos(cornerOne.get().getX(), cornerOne.get().getY(), cornerTwo.get().getZ());
-        //toEndOfLineDir = findBlockDir(cornerOne.get(), extrapolatePos);
+        toEndOfLineDir = findBlockDir(cornerOne.get(), extrapolatePos);
         length = findDistance(cornerOne.get(), extrapolatePos, toEndOfLineDir);
-        //toAdvanceDir = findBlockDir(extrapolatePos, cornerTwo.get());
+        toAdvanceDir = findBlockDir(extrapolatePos, cornerTwo.get());
         endOfLinePos = currPlayerPos.offset(toEndOfLineDir, length);
         barPos = currPlayerPos.offset(toEndOfLineDir, 2);
         shulkerPlaceDir = toEndOfLineDir.getOpposite();
@@ -346,15 +353,15 @@ private void start() {
         setGoal(barPos);
     }
 
-    /**
+
     // Finds the direction for one block to get to the other
     private Direction findBlockDir(BlockPos originBlock, BlockPos goalBlock) {
         // Very bad this can very easily break if the 2 blocks positions are not inline with each other
         BlockPos vec3d = BlockPos.ofFloored(Math.signum(goalBlock.getX() - originBlock.getX()), 0, Math.signum(goalBlock.getZ() - originBlock.getZ()));
-        return Direction.fromVector(vec3d);
+        return Direction.getFacing(Vec3d.of(vec3d)).getOpposite();
     }
-     */
 
+    /**
     // Places a block below the input
     private void placeUnder(BlockPos pos) {
         if (mc.world == null) return;
@@ -364,6 +371,7 @@ private void placeUnder(BlockPos pos) {
             BlockUtils.place(under, InvUtils.findInHotbar(Blocks.NETHERRACK.asItem()), false, 0);
         }
     }
+    */
 
     private void setGoal(BlockPos goal) {
         baritone.getCustomGoalProcess().setGoalAndPath(new GoalBlock(goal));
@@ -373,14 +381,12 @@ private void setGoal(BlockPos goal) {
     private int findDistance(BlockPos pos1, BlockPos pos2, Direction dir) {
         int dist = 0;
         switch (dir) {
-            case EAST, SOUTH -> {
+            case NORTH, SOUTH -> {
+                dist = Math.abs(pos1.getZ() - pos2.getZ());
             }
-            case WEST -> {
+            case EAST, WEST -> {
                 dist = Math.abs(pos1.getX() - pos2.getX());
             }
-            case NORTH -> {
-                dist = Math.abs(pos1.getZ() - pos2.getZ());
-            }
         }
         return dist;
     }