From 69019b9a6204ea58e27162d309b84a84dad3a271 Mon Sep 17 00:00:00 2001 From: gorbit99 Date: Sun, 18 Oct 2026 03:39:12 +0200 Subject: [PATCH] Implement metadata checking into the NBT path of block.properties parsing (#2267) --- .../AngelicaChunkBuilderMeshingTask.java | 2 +- .../block_rendering/BlockMaterialMapping.java | 4 ++-- .../block_rendering/NbtConditionalIdMap.java | 21 +++++++++++++++---- .../iris/uniforms/EntityIdHelperTest.java | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java index 9cdca2b67..6f09c0e28 100644 --- a/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/celeritas/AngelicaChunkBuilderMeshingTask.java @@ -488,7 +488,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask { for (BlockEntry entry : entries) { if (entry.hasNbtProperties()) { - map.addCondition(entry.id(), entry.nbtProperties(), intId); + map.addCondition(entry.id(), entry.nbtProperties(), intId, entry.metas()); } } }); @@ -121,7 +121,7 @@ public class BlockMaterialMapping { return; } - teMap.addCondition(block, entry.nbtProperties(), intId); + teMap.addCondition(block, entry.nbtProperties(), intId, entry.metas()); } /** diff --git a/src/main/java/net/coderbot/iris/block_rendering/NbtConditionalIdMap.java b/src/main/java/net/coderbot/iris/block_rendering/NbtConditionalIdMap.java index eab175b7f..72cf9f950 100644 --- a/src/main/java/net/coderbot/iris/block_rendering/NbtConditionalIdMap.java +++ b/src/main/java/net/coderbot/iris/block_rendering/NbtConditionalIdMap.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; /** * Maps objects with specific NBT properties to shader IDs. Generic over the @@ -34,7 +35,9 @@ public class NbtConditionalIdMap { boolean isExistenceOnly() { return expectedValue == null; } } - record NbtCondition(PropertyMatcher[] matchers, int shaderId) {} + record NbtCondition(PropertyMatcher[] matchers, Set metas, int shaderId) { + boolean isMetaMatch() { return metas != null && !metas.isEmpty(); } + } private final Map> conditionsByKey; @@ -47,7 +50,7 @@ public class NbtConditionalIdMap { * registries at registration time. Single-quoted values are kept as literals. * Dot notation paths are pre-split here so we prevent allocations. */ - public void addCondition(K key, Map nbtProperties, int shaderId) { + public void addCondition(K key, Map nbtProperties, int shaderId, Set metas) { final PropertyMatcher[] matchers = new PropertyMatcher[nbtProperties.size()]; int i = 0; @@ -88,7 +91,7 @@ public class NbtConditionalIdMap { } conditionsByKey.computeIfAbsent(key, k -> new ArrayList<>()) - .add(new NbtCondition(matchers, shaderId)); + .add(new NbtCondition(matchers, metas, shaderId)); } public boolean hasConditions(K key) { @@ -102,13 +105,16 @@ public class NbtConditionalIdMap { /** * Resolves the shader ID by matching the provided NBT data. */ - public int resolve(K key, NBTTagCompound nbt) { + public int resolve(K key, NBTTagCompound nbt, Integer meta) { final List conditions = conditionsByKey.get(key); if (conditions == null) { return -1; } for (NbtCondition condition : conditions) { + if (meta != null && condition.isMetaMatch() && !condition.metas.contains(meta)) { + continue; + } if (matchesNbt(nbt, condition.matchers())) { return condition.shaderId; } @@ -117,6 +123,13 @@ public class NbtConditionalIdMap { return -1; } + /** + * Resolves the shader ID by matching the provided NBT data. + */ + public int resolve(K key, NBTTagCompound nbt) { + return resolve(key, nbt, null); + } + private static boolean matchesNbt(NBTTagCompound nbt, PropertyMatcher[] matchers) { for (PropertyMatcher matcher : matchers) { if (matcher.isPathMatch()) { diff --git a/src/test/java/net/coderbot/iris/uniforms/EntityIdHelperTest.java b/src/test/java/net/coderbot/iris/uniforms/EntityIdHelperTest.java index dc34ee6a3..323ef67ab 100644 --- a/src/test/java/net/coderbot/iris/uniforms/EntityIdHelperTest.java +++ b/src/test/java/net/coderbot/iris/uniforms/EntityIdHelperTest.java @@ -75,7 +75,7 @@ class EntityIdHelperTest { for (int id : new int[] { 41, 42 }) { settings.setEntityIds(key -> name.equals(key) ? 17 : -1); final NbtConditionalIdMap nbt = new NbtConditionalIdMap<>(); - nbt.addCondition(name, Collections.singletonMap("Data.Variant", new NbtValue("original", true)), id); + nbt.addCondition(name, Collections.singletonMap("Data.Variant", new NbtValue("original", true)), id, null); settings.setEntityNbtMap(nbt); assertEquals(id, identity.resolve(), "resolve the captured variant against the current pack"); assertEquals(17, EntityIdHelper.getEntityId(entity), "the live entity has changed variants");