mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-27 14:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix biome names and conditions

Browse Source 
- Register readable client biome IDs while preserving saved registry identities.
- Audit the modded registry naming mixin.
- Return false from MythicMobs conditions while saved biome data loads.
- Cover biome naming and MythicMobs loading behavior with regression tests.
This commit is contained in:
Brian Neumann-Fopiano committed 2026-10-04 20:10:26 -04:00
1 parent ee5aaec87c
commit c479e94c49
6 files changed
+261 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/art/arcane/iris/integration/data/MythicMobsDataProvider.java
+22 -7
View File
@@ -3,6 +3,7 @@ package art.arcane.iris.integration.data;
import art.arcane.iris.integration.ExternalDataProvider;
import art.arcane.iris.integration.Identifier;
import art.arcane.iris.world.IrisToolbelt;
import art.arcane.iris.world.history.SavedBiomeUnavailableException;
import art.arcane.iris.generation.runtime.Engine;
import art.arcane.iris.generation.biome.IrisBiome;
import art.arcane.iris.generation.terrain.IrisRegion;
@@ -110,10 +111,17 @@ public class MythicMobsDataProvider extends ExternalDataProvider implements List
if (access == null) return false;
Engine engine = access.getEngine();
if (engine == null) return false;
IrisBiome biome = surface ?
engine.getSurfaceBiome(target.getBlockX(), target.getBlockZ()) :
engine.getBiomeOrMantle(target.getBlockX(), target.getBlockY() - engine.getMinHeight(), target.getBlockZ());
return biomes.contains(biome.getLoadKey());
try {
IrisBiome biome = surface ?
engine.getSurfaceBiome(target.getBlockX(), target.getBlockZ()) :
engine.getBiomeOrMantle(target.getBlockX(), target.getBlockY() - engine.getMinHeight(), target.getBlockZ());
return biomes.contains(biome.getLoadKey());
} catch (SavedBiomeUnavailableException unavailable) {
if (unavailable.isLoading() && unavailable.getSuppressed().length == 0) {
return false;
}
throw unavailable;
}
}
}
@@ -134,9 +142,16 @@ public class MythicMobsDataProvider extends ExternalDataProvider implements List
if (access == null) return false;
Engine engine = access.getEngine();
if (engine == null) return false;
IrisRegion region = engine.getRegion(
target.getBlockX(), target.getBlockY() - engine.getMinHeight(), target.getBlockZ());
return regions.contains(region.getLoadKey());
try {
IrisRegion region = engine.getRegion(
target.getBlockX(), target.getBlockY() - engine.getMinHeight(), target.getBlockZ());
return regions.contains(region.getLoadKey());
} catch (SavedBiomeUnavailableException unavailable) {
if (unavailable.isLoading() && unavailable.getSuppressed().length == 0) {
return false;
}
throw unavailable;
}
}
}
}
core/src/main/java/art/arcane/iris/world/history/GenerationRegistryContractFactory.java
+18 -2
View File
@@ -23,6 +23,7 @@ import art.arcane.iris.generation.terrain.IrisRegion;
import art.arcane.iris.structure.placement.IrisStructurePlacement;
import art.arcane.iris.spi.IrisPlatforms;
import art.arcane.iris.spi.PlatformGenerationRegistry;
import art.arcane.volmlib.nativelib.terrain.RegistryClientNames;
import art.arcane.iris.spi.PlatformRegistries;
import art.arcane.volmlib.util.collection.KList;
import com.google.gson.JsonArray;
@@ -253,6 +254,7 @@ public final class GenerationRegistryContractFactory {
requiredBiome.getId()
);
String resourceKey = requiredRegistry.customBiomeResourceKey(identityFingerprint);
registerCustomBiomeName(requiredDimension.getLoadKey(), requiredBiome.getId(), resourceKey);
GenerationRegistryContract.PhysicalResourceKey physicalKey = key(BIOME_REGISTRY, resourceKey);
PlatformGenerationRegistry.Definition canonicalDefinition = requiredRegistry.canonicalDefinition(
BIOME_REGISTRY,
@@ -285,13 +287,15 @@ public final class GenerationRegistryContractFactory {
ContentGate contentGate
) {
IrisBiomeCustom requiredBiome = Objects.requireNonNull(customBiome, "customBiome");
return PlatformGenerationRegistry.contentAddressedCustomBiomeResourceKey(
String resourceKey = PlatformGenerationRegistry.contentAddressedCustomBiomeResourceKey(
fingerprintCustomBiomeIdentity(
fingerprintCustomBiomeEffectiveDefinition(requiredBiome, contentGate),
dimensionKey,
requiredBiome.getId()
)
);
registerCustomBiomeName(dimensionKey, requiredBiome.getId(), resourceKey);
return resourceKey;
}
public static String customBiomeResourceKey(
@@ -310,13 +314,15 @@ public final class GenerationRegistryContractFactory {
) {
IrisBiomeCustom requiredBiome = Objects.requireNonNull(customBiome, "customBiome");
PlatformGenerationRegistry requiredRegistry = Objects.requireNonNull(registry, "registry");
return requiredRegistry.customBiomeResourceKey(
String resourceKey = requiredRegistry.customBiomeResourceKey(
fingerprintCustomBiomeIdentity(
fingerprintCustomBiomeEffectiveDefinition(requiredBiome, contentGate),
dimensionKey,
requiredBiome.getId()
)
);
registerCustomBiomeName(dimensionKey, requiredBiome.getId(), resourceKey);
return resourceKey;
}
public static String fingerprintCustomBiomeIdentity(
@@ -387,6 +393,7 @@ public final class GenerationRegistryContractFactory {
}
}
if (selectedKey != null) {
registerCustomBiomeName(dimensionKey, customBiomeId, selectedKey);
return selectedKey;
}
throw new IOException("Historical generation registry contract has no custom biome mapping for "
@@ -1539,6 +1546,14 @@ public final class GenerationRegistryContractFactory {
}
}
private static void registerCustomBiomeName(String dimensionKey, String biomeId, String resourceKey) {
String dimension = requireText(dimensionKey, "Dimension load key").toLowerCase(Locale.ROOT)
.replaceAll("[^a-z0-9/._-]", "_");
String biome = requireText(biomeId, "Custom biome ID").toLowerCase(Locale.ROOT)
.replaceAll("[^a-z0-9/._-]", "_");
RegistryClientNames.register(BIOME_REGISTRY, resourceKey, "iris:" + dimension + "/" + biome);
}
private static void updateString(MessageDigest digest, String value) {
byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
updateInt(digest, bytes.length);
@@ -1608,6 +1623,7 @@ public final class GenerationRegistryContractFactory {
+ dimension + ":" + requiredBiome.getId() + ".");
}
requireGeneratedSemanticFingerprint(physicalKey, source, contract.definitions().get(physicalKey));
registerCustomBiomeName(dimension, requiredBiome.getId(), resourceKey);
dimensionKeys.put(requiredBiome, resourceKey);
return resourceKey;
}