Improve render type handling

* Use Forge delegates as map keys * Don't allow any other render types for a given block if there is an Iris override
Asek3 · Jan 4, 2024 · de8f045 · de8f045
1 parent 1157255
commit de8f045
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/src/main/java/net/coderbot/iris/block_rendering/BlockMaterialMapping.java b/src/main/java/net/coderbot/iris/block_rendering/BlockMaterialMapping.java
@@ -3,10 +3,12 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
 import net.coderbot.iris.Iris;
 import net.coderbot.iris.shaderpack.materialmap.BlockEntry;
@@ -20,6 +22,8 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.IRegistryDelegate;
 
 public class BlockMaterialMapping {
 	public static Object2IntMap<BlockState> createBlockStateIdMap(Int2ObjectMap<List<BlockEntry>> blockPropertiesMap) {
@@ -34,15 +38,19 @@ public static Object2IntMap<BlockState> createBlockStateIdMap(Int2ObjectMap<List
 		return blockStateIds;
 	}
 
-	public static Map<Block, RenderType> createBlockTypeMap(Map<NamespacedId, BlockRenderType> blockPropertiesMap) {
-		Map<Block, RenderType> blockTypeIds = new Reference2ReferenceOpenHashMap<>();
+	public static Map<IRegistryDelegate<Block>, RenderType> createBlockTypeMap(Map<NamespacedId, BlockRenderType> blockPropertiesMap) {
+		Map<IRegistryDelegate<Block>, RenderType> blockTypeIds = new Object2ObjectOpenHashMap<>();
 
 		blockPropertiesMap.forEach((id, blockType) -> {
 			ResourceLocation resourceLocation = new ResourceLocation(id.getNamespace(), id.getName());
 
-			Block block = Registry.BLOCK.get(resourceLocation);
+			Block block = ForgeRegistries.BLOCKS.getValue(resourceLocation);
 
-			blockTypeIds.put(block, convertBlockToRenderType(blockType));
+			if (block == null || block == Blocks.AIR) {
+				return;
+			}
+
+			blockTypeIds.put(block.delegate, convertBlockToRenderType(blockType));
 		});
 
 		return blockTypeIds;

diff --git a/src/main/java/net/coderbot/iris/block_rendering/BlockRenderingSettings.java b/src/main/java/net/coderbot/iris/block_rendering/BlockRenderingSettings.java
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import net.minecraftforge.registries.IRegistryDelegate;
 import org.jetbrains.annotations.Nullable;
 
 import it.unimi.dsi.fastutil.objects.Object2IntFunction;
@@ -16,7 +17,7 @@ public class BlockRenderingSettings {
 
 	private boolean reloadRequired;
 	private Object2IntMap<BlockState> blockStateIds;
-	private Map<Block, RenderType> blockTypeIds;
+	private Map<IRegistryDelegate<Block>, RenderType> blockTypeIds;
 	private Object2IntFunction<NamespacedId> entityIds;
 	private float ambientOcclusionLevel;
 	private boolean disableDirectionalShading;
@@ -47,7 +48,7 @@ public Object2IntMap<BlockState> getBlockStateIds() {
 	}
 
 	@Nullable
-	public Map<Block, RenderType> getBlockTypeIds() {
+	public Map<IRegistryDelegate<Block>, RenderType> getBlockTypeIds() {
 		return blockTypeIds;
 	}
 
@@ -66,7 +67,7 @@ public void setBlockStateIds(Object2IntMap<BlockState> blockStateIds) {
 		this.blockStateIds = blockStateIds;
 	}
 
-	public void setBlockTypeIds(Map<Block, RenderType> blockTypeIds) {
+	public void setBlockTypeIds(Map<IRegistryDelegate<Block>, RenderType> blockTypeIds) {
 		if (this.blockTypeIds != null && this.blockTypeIds.equals(blockTypeIds)) {
 			return;
 		}

diff --git a/src/main/java/net/coderbot/iris/mixin/MixinItemBlockRenderTypes.java b/src/main/java/net/coderbot/iris/mixin/MixinItemBlockRenderTypes.java
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import net.minecraftforge.registries.IRegistryDelegate;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -17,9 +18,9 @@
 public class MixinItemBlockRenderTypes {
 	@Inject(method = "getChunkRenderType", at = @At("HEAD"), cancellable = true)
 	private static void iris$setCustomRenderType(BlockState arg, CallbackInfoReturnable<RenderType> cir) {
-		Map<Block, RenderType> idMap = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
+		Map<IRegistryDelegate<Block>, RenderType> idMap = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
 		if (idMap != null) {
-			RenderType type = idMap.get(arg.getBlock());
+			RenderType type = idMap.get(arg.getBlock().delegate);
 			if (type != null) {
 				cir.setReturnValue(type);
 			}
@@ -28,11 +29,12 @@ public class MixinItemBlockRenderTypes {
 
 	@Inject(method = "canRenderInLayer(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/renderer/RenderType;)Z", at = @At("HEAD"), cancellable = true)
 	private static void iris$checkCustomRenderType(BlockState arg, RenderType type, CallbackInfoReturnable<Boolean> cir) {
-		Map<Block, RenderType> idMap = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
+		Map<IRegistryDelegate<Block>, RenderType> idMap = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
 		if (idMap != null) {
-			RenderType irisType = idMap.get(arg.getBlock());
-			if (type.equals(irisType)) {
-				cir.setReturnValue(true);
+			RenderType irisType = idMap.get(arg.getBlock().delegate);
+			if (irisType != null) {
+				// If we have an override registered for this block, only allow rendering precisely that type
+				cir.setReturnValue(type.equals(irisType));
 			}
 		}
 	}