From bd3f0329d0e391bd84b5f9e3ff207d9dd9815853 Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Mon, 9 Oct 2023 12:58:02 +0200
Subject: new pr because fixing merge conflict would take too long

---
 .../hysky/skyblocker/mixin/FarmlandBlockMixin.java | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java

(limited to 'src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java')

diff --git a/src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java b/src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java
new file mode 100644
index 00000000..dfa886c4
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/mixin/FarmlandBlockMixin.java
@@ -0,0 +1,38 @@
+package de.hysky.skyblocker.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.utils.Utils;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FarmlandBlock;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(FarmlandBlock.class)
+public abstract class FarmlandBlockMixin extends Block {
+    @Shadow
+    @Final
+    protected static VoxelShape SHAPE;
+
+    protected FarmlandBlockMixin(Settings settings) {
+        super(settings);
+    }
+
+    @ModifyReturnValue(method = "getOutlineShape", at = @At("RETURN"))
+    private VoxelShape skyblocker$replaceOutlineShape(VoxelShape original) {
+        return Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.hitbox.oldFarmlandHitbox ? VoxelShapes.fullCube() : original;
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
+        return SHAPE;
+    }
+}
-- 
cgit