change: use inject instead of overriding

Author: Sychic

src/main/java/club/sk1er/patcher/hooks/CropUtilities.java

@@ -1,21 +1,15 @@
 package club.sk1er.patcher.hooks;
 
-import club.sk1er.patcher.config.PatcherConfig;
 import club.sk1er.patcher.mixins.accessors.BlockAccessor;
-import gg.essential.api.EssentialAPI;
-import gg.essential.api.utils.MinecraftUtils;
 import net.minecraft.block.*;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
 
 @SuppressWarnings("unused")
 public class CropUtilities {
     //#if MC==10809
-    private static final Minecraft mc = Minecraft.getMinecraft();
-    private static final MinecraftUtils minecraftUtils = EssentialAPI.getMinecraftUtil();
 
     public static final AxisAlignedBB[] CARROT_POTATO_BOX = {
         new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.125D, 1.0D),
@@ -52,23 +46,16 @@ public static void updateCropsMaxY(World world, BlockPos pos, Block block) {
         final IBlockState blockState = world.getBlockState(pos);
         final Integer ageValue = blockState.getValue(BlockCrops.AGE);
         BlockAccessor accessor = (BlockAccessor) block;
-        if (PatcherConfig.futureHitBoxes && (minecraftUtils.isHypixel() || mc.isIntegratedServerRunning())) {
-            accessor.setMaxY(
-                blockState.getBlock() instanceof BlockPotato || blockState.getBlock() instanceof BlockCarrot
-                    ? CARROT_POTATO_BOX[ageValue].maxY
-                    : WHEAT_BOX[ageValue].maxY
-            );
-            return;
-        }
-
-        accessor.setMaxY(0.25F);
+        accessor.setMaxY(
+            blockState.getBlock() instanceof BlockPotato || blockState.getBlock() instanceof BlockCarrot
+                ? CARROT_POTATO_BOX[ageValue].maxY
+                : WHEAT_BOX[ageValue].maxY
+        );
     }
 
     public static void updateWartMaxY(World world, BlockPos pos, Block block) {
         ((BlockAccessor) block).setMaxY(
-            PatcherConfig.futureHitBoxes && (minecraftUtils.isHypixel() || mc.isIntegratedServerRunning())
-                ? NETHER_WART_BOX[world.getBlockState(pos).getValue(BlockNetherWart.AGE)].maxY
-                : .25F
+            NETHER_WART_BOX[world.getBlockState(pos).getValue(BlockNetherWart.AGE)].maxY
         );
     }
 

src/main/java/club/sk1er/patcher/mixins/features/cropheight/BlockCropsMixin_CropHeight.java

@@ -1,29 +1,34 @@
 package club.sk1er.patcher.mixins.features.cropheight;
 
+import club.sk1er.patcher.config.PatcherConfig;
 import club.sk1er.patcher.hooks.CropUtilities;
-import net.minecraft.block.BlockBush;
+import gg.essential.api.EssentialAPI;
+import gg.essential.universal.UMinecraft;
 import net.minecraft.block.BlockCrops;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(BlockCrops.class)
-public abstract class BlockCropsMixin_CropHeight extends BlockBush {
+public abstract class BlockCropsMixin_CropHeight extends BlockMixin_CropHitbox {
 
     //#if MC==10809
     @Override
-    public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos) {
-        CropUtilities.updateCropsMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
-        return super.getSelectedBoundingBox(worldIn, pos);
+    public void getSelectedBoundingBox(World worldIn, BlockPos pos, CallbackInfoReturnable<AxisAlignedBB> cir) {
+        if (PatcherConfig.futureHitBoxes && (EssentialAPI.getMinecraftUtil().isHypixel() || UMinecraft.getMinecraft().isIntegratedServerRunning())) {
+            CropUtilities.updateCropsMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
+        }
     }
 
     @Override
-    public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end) {
-        CropUtilities.updateCropsMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
-        return super.collisionRayTrace(worldIn, pos, start, end);
+    public void collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end, CallbackInfoReturnable<MovingObjectPosition> cir) {
+        if (PatcherConfig.futureHitBoxes && (EssentialAPI.getMinecraftUtil().isHypixel() || UMinecraft.getMinecraft().isIntegratedServerRunning())) {
+            CropUtilities.updateCropsMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
+        }
     }
     //#endif
 }

src/main/java/club/sk1er/patcher/mixins/features/cropheight/BlockMixin_CropHitbox.java

@@ -1,6 +1,7 @@
 package club.sk1er.patcher.mixins.features.cropheight;
 
 import net.minecraft.block.Block;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
@@ -13,6 +14,12 @@
 @Mixin(Block.class)
 public class BlockMixin_CropHitbox {
     //#if MC==10809
+
+    @Inject(method = "getSelectedBoundingBox", at = @At("HEAD"))
+    public void getSelectedBoundingBox(World worldIn, BlockPos pos, CallbackInfoReturnable<AxisAlignedBB> cir) {
+
+    }
+
     @Inject(method = "collisionRayTrace", at = @At("HEAD"))
     public void collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end, CallbackInfoReturnable<MovingObjectPosition> cir) {
 

src/main/java/club/sk1er/patcher/mixins/features/cropheight/BlockNetherWartMixin_CropHeight.java

@@ -1,29 +1,34 @@
 package club.sk1er.patcher.mixins.features.cropheight;
 
+import club.sk1er.patcher.config.PatcherConfig;
 import club.sk1er.patcher.hooks.CropUtilities;
-import net.minecraft.block.BlockBush;
+import gg.essential.api.EssentialAPI;
+import gg.essential.universal.UMinecraft;
 import net.minecraft.block.BlockNetherWart;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(BlockNetherWart.class)
-public abstract class BlockNetherWartMixin_CropHeight extends BlockBush {
+public abstract class BlockNetherWartMixin_CropHeight extends BlockMixin_CropHitbox {
 
     //#if MC==10809
     @Override
-    public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos) {
-        CropUtilities.updateWartMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
-        return super.getSelectedBoundingBox(worldIn, pos);
+    public void getSelectedBoundingBox(World worldIn, BlockPos pos, CallbackInfoReturnable<AxisAlignedBB> cir) {
+        if (PatcherConfig.futureHitBoxes && (EssentialAPI.getMinecraftUtil().isHypixel() || UMinecraft.getMinecraft().isIntegratedServerRunning())) {
+            CropUtilities.updateWartMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
+        }
     }
 
     @Override
-    public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end) {
-        CropUtilities.updateWartMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
-        return super.collisionRayTrace(worldIn, pos, start, end);
+    public void collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end, CallbackInfoReturnable<MovingObjectPosition> cir) {
+        if (PatcherConfig.futureHitBoxes && (EssentialAPI.getMinecraftUtil().isHypixel() || UMinecraft.getMinecraft().isIntegratedServerRunning())) {
+            CropUtilities.updateWartMaxY(worldIn, pos, worldIn.getBlockState(pos).getBlock());
+        }
     }
     //#endif
 }