Merge branch 'master' into moving-fancy-status-bars

5 files changed, 55 insertions, 11 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index c6c6979d..0a7260f8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -37,21 +37,25 @@ public class SkyblockerConfig implements ConfigData {
         public String apiKey;
 
         @ConfigEntry.Category("bars")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Bars bars = new Bars();
       
         @ConfigEntry.Category("itemList")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public ItemList itemList = new ItemList();
 
         @ConfigEntry.Category("quicknav")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Quicknav quicknav = new Quicknav();
 
         @ConfigEntry.Category("itemTooltip")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public ItemTooltip itemTooltip = new ItemTooltip();
 
+        @ConfigEntry.Category("hitbox")
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
+        public Hitbox hitbox = new Hitbox();
+
         @ConfigEntry.Gui.Excluded
         public List<Integer> lockedSlots = new ArrayList<>();
     }
@@ -101,6 +105,11 @@ public class SkyblockerConfig implements ConfigData {
         }
     }
 
+    public static class Hitbox {
+        public boolean oldFarmlandHitbox = true;
+        public boolean oldLeverHitbox = false;
+    }
+
     public static class RichPresence {
         public boolean enableRichPresence = false;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
@@ -145,11 +154,11 @@ public class SkyblockerConfig implements ConfigData {
 
     public static class Locations {
         @ConfigEntry.Category("dungeons")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Dungeons dungeons = new Dungeons();
 
         @ConfigEntry.Category("dwarvenmines")
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public DwarvenMines dwarvenMines = new DwarvenMines();
     }
 
@@ -158,8 +167,7 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solveThreeWeirdos = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
-        public boolean oldLevers = false;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public Terminals terminals = new Terminals();
     }
 
@@ -173,7 +181,7 @@ public class SkyblockerConfig implements ConfigData {
         public boolean enableDrillFuel = true;
         public boolean solveFetchur = true;
         public boolean solvePuzzler = true;
-        @ConfigEntry.Gui.CollapsibleObject(startExpanded = true)
+        @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
         public DwarvenHud dwarvenHud = new DwarvenHud();
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/FarmlandBlockMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/FarmlandBlockMixin.java
new file mode 100644
index 00000000..d7ca3686
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/FarmlandBlockMixin.java
@@ -0,0 +1,33 @@
+package me.xmrvizzy.skyblocker.mixin;
+
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FarmlandBlock;
+import net.minecraft.block.ShapeContext;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(FarmlandBlock.class)
+public abstract class FarmlandBlockMixin extends Block {
+    protected FarmlandBlockMixin(Settings settings) {
+        super(settings);
+    }
+
+    @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true)
+    public void onGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
+        if (Utils.isOnSkyblock && SkyblockerConfig.get().general.hitbox.oldFarmlandHitbox)
+            cir.setReturnValue(Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 16.0, 16.0));
+    }
+
+    @Override
+    public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
+        return Block.createCuboidShape(0.0, 0.0, 0.0, 16.0, 15.0, 16.0);
+    }
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java
index fc26f913..c836e4f3 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java
@@ -14,7 +14,7 @@ public class OldLever {
     protected static final VoxelShape WEST_SHAPE;
 
     public static VoxelShape getShape(WallMountLocation wallMountLocation, Direction direction) {
-        if (!SkyblockerConfig.get().locations.dungeons.oldLevers)
+        if (!SkyblockerConfig.get().general.hitbox.oldLeverHitbox)
             return null;
 
         if (wallMountLocation == WallMountLocation.FLOOR) {
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index c758a715..0c3899d4 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -24,6 +24,9 @@
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Enable Lowest BIN Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Enable Bazaar buy/sell Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Enable Museum & Date",
+  "text.autoconfig.skyblocker.option.general.hitbox": "Hitboxes",
+  "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "Enable 1.8 farmland hitbox",
+  "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "Enable 1.8 lever hitbox",
   "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cItem price information on tooltip will renew in max 60 seconds. If not, check latest.log",
 
   "text.autoconfig.skyblocker.category.richPresence": "Discord Rich Presence",
@@ -42,7 +45,6 @@
   "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle",
   "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle",
   "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve Trivia Puzzle",
-  "text.autoconfig.skyblocker.option.locations.dungeons.oldLevers": "1.8 lever hitbox",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Solvers",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Solve Select Colored",
   "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Solve Click In Order",
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index f07fbfc8..654e0400 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -9,6 +9,7 @@
     "InGameHudMixin",
     "ItemRendererMixin",
     "LeverBlockMixin",
+    "FarmlandBlockMixin",
     "MinecraftClientMixin",
     "AccessorWorldRenderer",
     "GenericContainerScreenMixin",