Merge master

# Conflicts:
#	core/src/main/java/art/arcane/iris/world/pregen/AsyncPregenMethod.java

adapters/fabric/build.gradle

@@ -201,6 +201,7 @@ dependencies {
         libs.asm,
         libs.lru,
         libs.caffeine,
+        'com.fulcrumgenomics:jlibdeflate:0.2.0',
         libs.dom4j,
         libs.jaxen
     ]

adapters/forge/build.gradle

@@ -200,6 +200,7 @@ dependencies {
         libs.asm,
         libs.lru,
         libs.caffeine,
+        'com.fulcrumgenomics:jlibdeflate:0.2.0',
         libs.dom4j,
         libs.jaxen
     ]

adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedEngineBootstrap.java

@@ -391,10 +391,7 @@ public final class ModdedEngineBootstrap {
                 BlockDataMergeSupport.StateMerger previousMerger = BlockDataMergeSupport.bindPlatformMerger(new NativeStateMerger(ModdedBlockResolution.BLOCKS)::merge);
                 rollback.add(() -> BlockDataMergeSupport.restorePlatformMerger(previousMerger));
 
-                NativeTileReader nativeTileReader = new NativeTileReader(() -> {
-                    NativeModdedServer server = boundLoader.currentServer();
-                    return server == null ? null : server.registryAccess();
-                });
+                NativeTileReader nativeTileReader = NativeTileReader.forServer(boundLoader::currentServer);
                 TileData.TileReader previousTileReader = TileData.bindPlatformReader(in -> ModdedTileData.wrap(nativeTileReader.read(in)));
                 rollback.add(() -> TileData.restorePlatformReader(previousTileReader));
 

adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedPlatform.java

@@ -38,8 +38,6 @@ import art.arcane.iris.spi.PlatformScheduler;
 import art.arcane.iris.spi.PlatformStructureHooks;
 import art.arcane.volmlib.nativelib.terrain.NativeWorld;
 
-import net.minecraft.core.HolderLookup;
-
 import java.io.File;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -64,7 +62,7 @@ public final class ModdedPlatform implements IrisPlatform {
         this.loader = loader;
         this.registries = new ModdedRegistries(
                 new NativeRegistryAccess(new NativeRegistryAccess.Configuration(
-                        ModdedPlatform::nativeRegistries, ModdedPlatform::reloadableRegistries,
+                        ModdedEngineBootstrap::currentServer,
                         ModdedRegistries::warnNotReady)),
                 ModdedPlatform::generationRegistry);
         this.scheduler = new ModdedScheduler();
@@ -72,16 +70,6 @@ public final class ModdedPlatform implements IrisPlatform {
         this.biomeWriter = new ModdedBiomeWriter(new NativeBiomeRegistry(ModdedEngineBootstrap::currentServer, "minecraft:plains"));
     }
 
-    private static HolderLookup.Provider nativeRegistries() {
-        NativeModdedServer server = ModdedEngineBootstrap.currentServer();
-        return server == null ? null : server.registryAccess();
-    }
-
-    private static HolderLookup.Provider reloadableRegistries() {
-        NativeModdedServer server = ModdedEngineBootstrap.currentServer();
-        return server == null ? null : server.reloadableRegistries();
-    }
-
     public static void errorSink(Consumer<Throwable> sink) {
         ERROR_SINK = sink;
     }

adapters/modded-common/src/main/resources/pack.mcmeta

@@ -0,0 +1,7 @@
+{
+  "pack": {
+    "description": "Iris client resources and mod data",
+    "min_format": [88, 0],
+    "max_format": [107, 1]
+  }
+}

adapters/modded-common/src/test/java/art/arcane/iris/modded/IrisModLanguageAssetsTest.java

@@ -72,10 +72,10 @@ public class IrisModLanguageAssetsTest {
     }
 
     private Set<String> resourceFiles() throws Exception {
-        URL resource = IrisModLanguageAssetsTest.class.getClassLoader().getResource(ROOT);
-        assertNotNull("Missing mod language resource directory: " + ROOT, resource);
+        URL resource = IrisModLanguageAssetsTest.class.getClassLoader().getResource(ROOT + "en_us.json");
+        assertNotNull("Missing English mod language resource", resource);
         assertEquals("Mod language resources must resolve to a directory on disk", "file", resource.getProtocol());
-        Path directory = Path.of(resource.toURI());
+        Path directory = Path.of(resource.toURI()).getParent();
         try (Stream<Path> paths = Files.list(directory)) {
             return paths
                     .filter(Files::isRegularFile)

adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedPackMetadataTest.java

@@ -0,0 +1,45 @@
+package art.arcane.iris.modded;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.mojang.serialization.JsonOps;
+import net.minecraft.SharedConstants;
+import net.minecraft.server.Bootstrap;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class ModdedPackMetadataTest {
+    @BeforeClass
+    public static void bootstrapMinecraftRegistries() {
+        SharedConstants.tryDetectVersion();
+        Bootstrap.bootStrap();
+    }
+
+    @Test
+    public void metadataLoadsClientResourcesAndServerDataForCurrentMinecraft() throws IOException {
+        try (InputStream resource = ModdedPackMetadataTest.class.getResourceAsStream("/pack.mcmeta")) {
+            assertNotNull(resource);
+            try (InputStreamReader reader = new InputStreamReader(resource, StandardCharsets.UTF_8)) {
+                JsonObject metadata = JsonParser.parseReader(reader).getAsJsonObject();
+                for (PackType type : PackType.values()) {
+                    PackMetadataSection section = PackMetadataSection.forPackType(type).codec()
+                            .parse(JsonOps.INSTANCE, metadata.get("pack")).getOrThrow();
+                    assertEquals("Iris client resources and mod data", section.description().getString());
+                    assertTrue(type.toString(), section.supportedFormats().isValueInRange(
+                            SharedConstants.getCurrentVersion().packVersion(type)));
+                }
+            }
+        }
+    }
+}

adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedStructureTemplateCacheTest.java

@@ -1,6 +1,7 @@
 package art.arcane.iris.modded;
 
 import org.junit.Test;
+import org.objectweb.asm.ClassReader;
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -62,9 +63,11 @@ public class ModdedStructureTemplateCacheTest {
             config = new String(input.readAllBytes(), StandardCharsets.UTF_8);
         }
         assertTrue(config.contains("\"StructureTemplatePaletteConcurrencyMixin\""));
-        assertNotNull(Class.forName(
-                "art.arcane.volmlib.nativelib.minecraft26_2.modded.mixin.StructureTemplatePaletteConcurrencyMixin",
-                false,
-                ModdedStructureTemplateCacheTest.class.getClassLoader()));
+        String mixin = "art/arcane/volmlib/nativelib/minecraft26_2/modded/mixin/StructureTemplatePaletteConcurrencyMixin";
+        try (InputStream input = ModdedStructureTemplateCacheTest.class.getClassLoader()
+                .getResourceAsStream(mixin + ".class")) {
+            assertNotNull(input);
+            assertEquals(mixin, new ClassReader(input).getClassName());
+        }
     }
 }

adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedTileParityTest.java

@@ -41,7 +41,7 @@ public class ModdedTileParityTest {
         SharedConstants.tryDetectVersion();
         Bootstrap.bootStrap();
         registries = RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY);
-        NativeTileReader nativeTileReader = new NativeTileReader(() -> null);
+        NativeTileReader nativeTileReader = NativeTileReader.forServer(() -> null);
         TileData.bindPlatformReader(in -> ModdedTileData.wrap(nativeTileReader.read(in)));
         TileData.bindPlatformFactory(ModdedTileData::fromProperties);
     }

adapters/modded-common/src/test/java/art/arcane/iris/modded/ModdedWaterEntitySpawnTest.java

@@ -11,9 +11,12 @@ import art.arcane.iris.generation.decoration.IrisSurface;
 import art.arcane.volmlib.util.math.RNG;
 import net.minecraft.SharedConstants;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.server.Bootstrap;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -34,6 +37,11 @@ public class ModdedWaterEntitySpawnTest {
     public static void bootstrapMinecraftRegistries() {
         SharedConstants.tryDetectVersion();
         Bootstrap.bootStrap();
+        for (Block block : BuiltInRegistries.BLOCK) {
+            for (BlockState state : block.getStateDefinition().getPossibleStates()) {
+                state.initCache();
+            }
+        }
     }
 
     @Test

adapters/modded-common/src/test/java/art/arcane/iris/modded/NativeRegistryAccessTest.java

@@ -1,20 +1,31 @@
 package art.arcane.iris.modded;
 
 import art.arcane.volmlib.nativelib.minecraft26_2.modded.NativeRegistryAccess;
+import art.arcane.volmlib.nativelib.minecraft26_2.modded.NativeModdedServer;
 import art.arcane.volmlib.nativelib.terrain.NativeBlockProperty;
 import net.minecraft.SharedConstants;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.Bootstrap;
+import net.minecraft.server.MinecraftServer;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class NativeRegistryAccessTest {
     @BeforeClass
@@ -25,7 +36,7 @@ public class NativeRegistryAccessTest {
 
     @Test
     public void statePropertiesPreserveTypesDefaultsAndSharedGroups() {
-        NativeRegistryAccess access = new NativeRegistryAccess(new NativeRegistryAccess.Configuration(() -> null, () -> null, message -> {}));
+        NativeRegistryAccess access = new NativeRegistryAccess(new NativeRegistryAccess.Configuration(() -> null, message -> {}));
         Map<String, List<NativeBlockProperty>> properties = access.blockStateProperties();
 
         assertSame(properties.get("minecraft:stone"), properties.get("minecraft:dirt"));
@@ -41,7 +52,7 @@ public class NativeRegistryAccessTest {
     @Test
     public void staticRegistriesResolveWithoutAnActiveServerAndDynamicReadsStayEmpty() {
         List<String> warnings = new ArrayList<>();
-        NativeRegistryAccess access = new NativeRegistryAccess(new NativeRegistryAccess.Configuration(() -> null, () -> null, warnings::add));
+        NativeRegistryAccess access = new NativeRegistryAccess(new NativeRegistryAccess.Configuration(() -> null, warnings::add));
 
         assertEquals("minecraft:diamond_sword", access.item("DIAMOND SWORD").key());
         assertEquals("creature", access.entity("minecraft:cow").spawnCategory());
@@ -49,6 +60,34 @@ public class NativeRegistryAccessTest {
         assertTrue(access.biomeKeys().isEmpty());
         assertTrue(access.structureKeys().isEmpty());
         assertTrue(access.enchantmentKeys().isEmpty());
-        assertEquals(List.of("biome", "structure", "enchantment"), warnings);
+        assertTrue(access.lootTableKeys().isEmpty());
+        assertEquals(List.of("biome", "structure", "enchantment", "loot table"), warnings);
+    }
+
+    @Test
+    public void dynamicRegistriesFollowServerStartupReloadAndShutdown() {
+        AtomicReference<NativeModdedServer> activeServer = new AtomicReference<>();
+        List<String> warnings = new ArrayList<>();
+        NativeRegistryAccess access = new NativeRegistryAccess(new NativeRegistryAccess.Configuration(activeServer::get, warnings::add));
+        assertTrue(access.lootTableKeys().isEmpty());
+
+        MinecraftServer server = mock(MinecraftServer.class, RETURNS_DEEP_STUBS);
+        when(server.registryAccess().lookupOrThrow(Registries.BIOME).listElementIds())
+                .thenAnswer(invocation -> Stream.of(ResourceKey.create(Registries.BIOME, Identifier.parse("example:biome"))));
+        when(server.reloadableRegistries().lookup().lookupOrThrow(Registries.LOOT_TABLE).listElementIds())
+                .thenAnswer(invocation -> Stream.of(ResourceKey.create(Registries.LOOT_TABLE, Identifier.parse("example:initial"))));
+        activeServer.set(NativeModdedServer.fromHandle(server));
+
+        assertEquals(List.of("example:biome"), access.biomeKeys());
+        assertEquals(List.of("example:initial"), access.lootTableKeys());
+        HolderLookup.Provider reloadedRegistries = mock(HolderLookup.Provider.class, RETURNS_DEEP_STUBS);
+        when(reloadedRegistries.lookupOrThrow(Registries.LOOT_TABLE).listElementIds())
+                .thenAnswer(invocation -> Stream.of(ResourceKey.create(Registries.LOOT_TABLE, Identifier.parse("example:reloaded"))));
+        when(server.reloadableRegistries().lookup()).thenReturn(reloadedRegistries);
+        assertEquals(List.of("example:reloaded"), access.lootTableKeys());
+        activeServer.set(null);
+        assertTrue(access.biomeKeys().isEmpty());
+        assertTrue(access.lootTableKeys().isEmpty());
+        assertEquals(List.of("loot table", "biome", "loot table"), warnings);
     }
 }

adapters/neoforge/build.gradle

@@ -173,6 +173,7 @@ dependencies {
         libs.asm,
         libs.lru,
         libs.caffeine,
+        'com.fulcrumgenomics:jlibdeflate:0.2.0',
         libs.dom4j,
         libs.jaxen
     ]