diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java index e81b6685a..196bdd6a3 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java @@ -118,11 +118,18 @@ public final class FabricUtil { map.put(pair.getFirst(), new ArrayList<>(pair.getSecond().stream().toList())), HashMap::putAll); - TERRA_BIOME_MAP.forEach((vanilla, terra) -> getEntry(registry, vanilla.getKey().orElseThrow().getValue()).orElseThrow() - .streamTags() - .forEach(tag -> collect.computeIfAbsent(tag, t -> new ArrayList<>()).add(getEntry(registry, terra.getKey().orElseThrow().getValue()).orElseThrow()))); + TERRA_BIOME_MAP.forEach((vanilla, terra) -> { + RegistryEntry entry = getEntry(registry, + vanilla.getKey().orElseThrow().getValue()) + .orElseThrow(); + logger.info(entry.getKey().orElseThrow().getValue() + " (vanilla for " + terra.getKey().orElseThrow().getValue() + ": " + + vanilla.streamTags().toList()); + entry.streamTags() + .forEach(tag -> collect.computeIfAbsent(tag, t -> new ArrayList<>()) + .add(getEntry(registry, terra.getKey().orElseThrow().getValue()).orElseThrow())); + }); + - registry.clearTags(); registry.populateTags(ImmutableMap.copyOf(collect)); registry.streamEntries() diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java index bc80b66f3..d80166223 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java @@ -37,7 +37,7 @@ public class ProtoPlatformBiome implements PlatformBiome { } public RegistryEntry get(Registry registry) { - return registry.getOrCreateEntry(registry.getKey(registry.get(identifier)).orElseThrow()); + return FabricUtil.getEntry(registry, identifier).orElseThrow(); } @Override