From ddb1578ccf3038609f36922b34276d1e626053df Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Wed, 29 Mar 2023 19:50:09 +0200
Subject: [PATCH] Fixed sneaking finally Fixed Wall block culling

---
 .../mixin/fixes/minecraft/block/MixinWallBlock.java   | 11 +++++++++++
 .../fixes/minecraft/entity/MixinPlayerEntity.java     |  9 +++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
index 9e24da40..94a8d645 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/block/MixinWallBlock.java
@@ -39,6 +39,8 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.util.Map;
+
 @Mixin(WallBlock.class)
 public class MixinWallBlock extends Block {
 
@@ -101,6 +103,10 @@ public class MixinWallBlock extends Block {
     @Shadow
     @Final
     public static EnumProperty<WallShape> SOUTH_SHAPE;
+    @Shadow
+    @Final
+    private Map<BlockState, VoxelShape> shapeMap;
+
     public MixinWallBlock(Settings settings) {
         super(settings);
     }
@@ -163,6 +169,11 @@ public class MixinWallBlock extends Block {
         }
     }
 
+    @Override
+    public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
+        return this.shapeMap.get(state); // Always use the real outline shape for culling
+    }
+
     @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true)
     public void injectGetOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
         if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(ProtocolVersion.v1_12_2)) {
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
index 43cc3cb1..59f22749 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinPlayerEntity.java
@@ -105,6 +105,15 @@ public abstract class MixinPlayerEntity extends LivingEntity {
         }
     }
 
+    @ModifyConstant(method = "getActiveEyeHeight", constant = @Constant(floatValue = 1.27f))
+    private float modifySneakEyeHeight(float prevEyeHeight) {
+        if (ProtocolHack.getTargetVersion().isNewerThan(ProtocolVersion.v1_13_2)) {
+            return prevEyeHeight;
+        } else {
+            return 1.54f;
+        }
+    }
+
     @Unique
     public boolean viafabricplus_isSprinting;