From b552bf2566f79c52de2916ff3d9108825bd5b2b2 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 10 Mar 2026 18:44:02 -0500 Subject: [PATCH] Fix block state wrapper for old MC versions --- .../wrappers/block/BlockStateWrapper.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index 8f08e87c8..1deff2935 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -93,15 +93,6 @@ public class BlockStateWrapper implements IBlockStateWrapper public static final String DIRT_RESOURCE_LOCATION_STRING = "minecraft:dirt"; public static final String WATER_RESOURCE_LOCATION_STRING = "minecraft:water"; - /** Used to handle older MC versions that don't have an simple way of getting the block's tags */ - public static final List OLD_BEACON_BASE_BLOCK_NAME_LIST = Arrays.asList( - "iron_block", - "gold_block", - "diamond_block", - "emerald_block", - "netherite_block" - ); - public static ObjectOpenHashSet rendererIgnoredBlocks = null; public static ObjectOpenHashSet rendererIgnoredCaveBlocks = null; @@ -194,11 +185,21 @@ public class BlockStateWrapper implements IBlockStateWrapper // beacon base blocks #if MC_VER <= MC_1_18_2 + + // Used to handle older MC versions that don't have an simple way of getting the block's tags + List oldBeaconBaseBlockNameList = Arrays.asList( + "iron_block", + "gold_block", + "diamond_block", + "emerald_block", + "netherite_block" + ); + // Older MC versions are harder to get block tags, so just use a static list to determine beacon blocks boolean isBeaconBaseBlock = false; - for (int i = 0; i < OLD_BEACON_BASE_BLOCK_NAME_LIST.size(); i++) + for (int i = 0; i < oldBeaconBaseBlockNameList.size(); i++) { - String baseBlockName = OLD_BEACON_BASE_BLOCK_NAME_LIST.get(i); + String baseBlockName = oldBeaconBaseBlockNameList.get(i); if (lowercaseSerial.contains(baseBlockName)) { isBeaconBaseBlock = true;