Merge pull request #548 from jchung01/vanilla-tweaks

Get ExtendedBlockState before rendering in block overlay fix
ACGaming · Aug 29, 2024 · c5ddc55 · c5ddc55
2 parents 8eefd9b + 20c4cbb
commit c5ddc55
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/mod/acgaming/universaltweaks/bugfixes/blocks/blockoverlay/UTBlockOverlay.java b/src/main/java/mod/acgaming/universaltweaks/bugfixes/blocks/blockoverlay/UTBlockOverlay.java
@@ -66,6 +66,8 @@ public static void renderNearbyBlocks(float partialTicks)
                 bufferBuilder.setTranslation(-x, -(y - player.getEyeHeight()), -z);
             }
             IBlockState state1 = state.getActualState(world, pos);
+            // Call extendedBlockState if it has one: see BlockRendererDispatcher#renderBlock()
+            state1 = state.getBlock().getExtendedState(state1, world, pos);
             mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModel(world, mc.getBlockRendererDispatcher().getModelForState(state1), state1, pos, bufferBuilder, false);
         });
 

diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigBugfixes.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigBugfixes.java
@@ -112,10 +112,7 @@ public static class BlockOverlayCategory
                     "Excludes blocks from the block overlay bugfix",
                     "Syntax: modid:block"
                 })
-            public String[] utBlockOverlayBlacklist = new String[]
-                {
-                    "appliedenergistics2:drive"
-                };
+            public String[] utBlockOverlayBlacklist = new String[] {};
 
             @Config.Name("[3] Whitelist")
             @Config.Comment