Merge branch '1.20.x' into LootTableLoadEventFix-1.20.4

neoforged · Dec 14, 2023 · afcd01a · afcd01a
2 parents aa81111 + 84d25b7
commit afcd01a
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 1 deletion.
diff --git a/patches/net/minecraft/client/renderer/blockentity/PistonHeadRenderer.java.patch b/patches/net/minecraft/client/renderer/blockentity/PistonHeadRenderer.java.patch
@@ -11,3 +11,14 @@
          RenderType rendertype = ItemBlockRenderTypes.getMovingBlockRenderType(p_112460_);
          VertexConsumer vertexconsumer = p_112462_.getBuffer(rendertype);
          this.blockRenderer
+@@ -86,5 +_,10 @@
+     @Override
+     public int getViewDistance() {
+         return 68;
++    }
++
++    @Override
++    public net.minecraft.world.phys.AABB getRenderBoundingBox(PistonMovingBlockEntity blockEntity) {
++        return INFINITE_EXTENT_AABB;
+     }
+ }
diff --git a/patches/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.java.patch b/patches/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.java.patch
@@ -8,6 +8,6 @@
 +    @Override
 +    public net.minecraft.world.phys.AABB getRenderBoundingBox(ShulkerBoxBlockEntity blockEntity) {
 +        net.minecraft.core.BlockPos pos = blockEntity.getBlockPos();
-+        return new net.minecraft.world.phys.AABB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1.0, pos.getY() + 1.5, pos.getZ() + 1.0);
++        return new net.minecraft.world.phys.AABB(pos.getX() - 0.5, pos.getY() - 0.5, pos.getZ() - 0.5, pos.getX() + 1.5, pos.getY() + 1.5, pos.getZ() + 1.5);
 +    }
  }
diff --git a/patches/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java.patch b/patches/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java.patch
@@ -0,0 +1,13 @@
+--- a/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java
++++ b/net/minecraft/client/renderer/blockentity/SpawnerRenderer.java
+@@ -57,4 +_,10 @@
+         p_312703_.render(p_312223_, 0.0, 0.0, 0.0, 0.0F, p_311943_, p_312805_, p_312394_, p_311996_);
+         p_312805_.popPose();
+     }
++
++    @Override
++    public net.minecraft.world.phys.AABB getRenderBoundingBox(SpawnerBlockEntity blockEntity) {
++        net.minecraft.core.BlockPos pos = blockEntity.getBlockPos();
++        return new net.minecraft.world.phys.AABB(pos.getX() - 1.0, pos.getY() - 1.0, pos.getZ() - 1.0, pos.getX() + 2.0, pos.getY() + 2.0, pos.getZ() + 2.0);
++    }
+ }
diff --git a/patches/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java.patch b/patches/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java.patch
@@ -0,0 +1,12 @@
+--- a/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java
++++ b/net/minecraft/client/renderer/blockentity/TheEndGatewayRenderer.java
+@@ -51,4 +_,9 @@
+     public int getViewDistance() {
+         return 256;
+     }
++
++    @Override
++    public net.minecraft.world.phys.AABB getRenderBoundingBox(TheEndGatewayBlockEntity blockEntity) {
++        return blockEntity.isSpawning() || blockEntity.isCoolingDown() ? INFINITE_EXTENT_AABB : super.getRenderBoundingBox(blockEntity);
++    }
+ }
diff --git a/patches/net/minecraft/client/renderer/blockentity/TrialSpawnerRenderer.java.patch b/patches/net/minecraft/client/renderer/blockentity/TrialSpawnerRenderer.java.patch
@@ -0,0 +1,13 @@
+--- a/net/minecraft/client/renderer/blockentity/TrialSpawnerRenderer.java
++++ b/net/minecraft/client/renderer/blockentity/TrialSpawnerRenderer.java
+@@ -32,4 +_,10 @@
+             }
+         }
+     }
++
++    @Override
++    public net.minecraft.world.phys.AABB getRenderBoundingBox(TrialSpawnerBlockEntity blockEntity) {
++        net.minecraft.core.BlockPos pos = blockEntity.getBlockPos();
++        return new net.minecraft.world.phys.AABB(pos.getX() - 1.0, pos.getY() - 1.0, pos.getZ() - 1.0, pos.getX() + 2.0, pos.getY() + 2.0, pos.getZ() + 2.0);
++    }
+ }