dwa

probe/src/main/java/art/arcane/iris/probe/GenerationProbe.java

@@ -21,6 +21,10 @@ package art.arcane.iris.probe;
 import art.arcane.iris.core.loader.IrisData;
 import art.arcane.iris.engine.IrisEngine;
 import art.arcane.iris.engine.framework.Engine;
+import art.arcane.iris.engine.framework.EngineAssignedComponent;
+import art.arcane.iris.engine.framework.EngineEffects;
+import art.arcane.iris.engine.framework.EngineEffectsProvider;
+import art.arcane.iris.engine.framework.EnginePlatformHooks;
 import art.arcane.iris.engine.framework.EngineTarget;
 import art.arcane.iris.engine.framework.EngineWorldManager;
 import art.arcane.iris.engine.framework.EngineWorldManagerProvider;
@@ -33,10 +37,6 @@ import art.arcane.iris.spi.IrisServices;
 import art.arcane.iris.spi.PlatformBiome;
 import art.arcane.iris.spi.PlatformBlockState;
 import art.arcane.iris.util.project.hunk.Hunk;
-import org.bukkit.Chunk;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
@@ -102,26 +102,23 @@ public final class GenerationProbe {
         @Override
         public void onSave() {
         }
+    }
 
-        @Override
-        public void onBlockBreak(BlockBreakEvent e) {
+    private static final class InertEffects extends EngineAssignedComponent implements EngineEffects {
+        private InertEffects(Engine engine) {
+            super(engine, "FX");
         }
 
         @Override
-        public void onBlockPlace(BlockPlaceEvent e) {
+        public void updatePlayerMap() {
         }
 
         @Override
-        public void onChunkLoad(Chunk e, boolean generated) {
+        public void tickRandomPlayer() {
         }
+    }
 
-        @Override
-        public void onChunkUnload(Chunk e) {
-        }
-
-        @Override
-        public void teleportAsync(PlayerTeleportEvent e) {
-        }
+    private static final class InertPlatformHooks implements EnginePlatformHooks {
     }
 
     public static void main(String[] args) throws Exception {
@@ -130,6 +127,8 @@ public final class GenerationProbe {
         StubPlatform.errorSink(REPORTED::add);
         IrisServices.register(PreservationRegistry.class, new InertPreservation());
         IrisServices.register(EngineWorldManagerProvider.class, (EngineWorldManagerProvider) (Engine engine) -> new InertWorldManager());
+        IrisServices.register(EngineEffectsProvider.class, (EngineEffectsProvider) InertEffects::new);
+        IrisServices.register(EnginePlatformHooks.class, new InertPlatformHooks());
 
         File packSource = new File(args[0]);
         int radius = args.length > 1 ? Integer.parseInt(args[1]) : 2;

probe/src/main/java/art/arcane/iris/probe/StubPlatform.java

@@ -127,6 +127,20 @@ public final class StubPlatform implements IrisPlatform {
             return false;
         }
 
+        @Override
+        public boolean isTreeBlock() {
+            String blockKey = key;
+            int properties = blockKey.indexOf('[');
+            if (properties >= 0) {
+                blockKey = blockKey.substring(0, properties);
+            }
+            return blockKey.endsWith("_log")
+                    || blockKey.endsWith("_wood")
+                    || blockKey.endsWith("_stem")
+                    || blockKey.endsWith("_hyphae")
+                    || blockKey.endsWith("_leaves");
+        }
+
         @Override
         public boolean isFoliagePlantable() {
             return false;

probe/src/main/resources/classload-allowlist.tsv

@@ -10,19 +10,20 @@ art.arcane.iris.core.events.IrisLootEvent$1	BUKKIT_API	org.bukkit.loot.LootTable
 art.arcane.iris.core.events.IrisLootEvent$2	BUKKIT_API	org.bukkit.inventory.InventoryHolder
 art.arcane.iris.core.lifecycle.PaperLibBootstrap	PAPERLIB_API	io.papermc.lib.environments.Environment
 art.arcane.iris.core.lifecycle.PaperLibBootstrap$ModernPaperEnvironment	PAPERLIB_API	io.papermc.lib.environments.PaperEnvironment
-art.arcane.iris.core.link.ExternalDataProvider	BUKKIT_API	org.bukkit.event.Listener
-art.arcane.iris.core.link.data.CraftEngineDataProvider	BUKKIT_API	org.bukkit.event.Listener
-art.arcane.iris.core.link.data.EcoItemsDataProvider	BUKKIT_API	org.bukkit.event.Listener
-art.arcane.iris.core.link.data.ExecutableItemsDataProvider	BUKKIT_API	org.bukkit.event.Listener
-art.arcane.iris.core.link.data.HMCLeavesDataProvider	BUKKIT_API	org.bukkit.event.Listener
+art.arcane.iris.core.lifecycle.WorldLifecycleService	BUKKIT_API	org.bukkit.generator.WorldInfo
+art.arcane.iris.core.lifecycle.WorldLifecycleSupport	BUKKIT_API	org.bukkit.generator.WorldInfo
+art.arcane.iris.core.link.ExternalDataProvider	BUKKIT_API	org.bukkit.block.BlockFace
+art.arcane.iris.core.link.data.CraftEngineDataProvider	BUKKIT_API	org.bukkit.block.data.BlockData
+art.arcane.iris.core.link.data.EcoItemsDataProvider	BUKKIT_API	org.bukkit.block.BlockFace
+art.arcane.iris.core.link.data.ExecutableItemsDataProvider	BUKKIT_API	org.bukkit.block.BlockFace
 art.arcane.iris.core.link.data.ItemAdderDataProvider	BUKKIT_API	org.bukkit.event.Listener
-art.arcane.iris.core.link.data.KGeneratorsDataProvider	BUKKIT_API	org.bukkit.event.Listener
-art.arcane.iris.core.link.data.MMOItemsDataProvider	BUKKIT_API	org.bukkit.event.Listener
-art.arcane.iris.core.link.data.MythicCrucibleDataProvider	BUKKIT_API	org.bukkit.event.Listener
+art.arcane.iris.core.link.data.KGeneratorsDataProvider	BUKKIT_API	org.bukkit.block.data.BlockData
+art.arcane.iris.core.link.data.MMOItemsDataProvider	BUKKIT_API	org.bukkit.block.BlockFace
+art.arcane.iris.core.link.data.MythicCrucibleDataProvider	BUKKIT_API	org.bukkit.block.data.BlockData
 art.arcane.iris.core.link.data.MythicMobsDataProvider	BUKKIT_API	org.bukkit.event.Listener
 art.arcane.iris.core.link.data.MythicMobsDataProvider$IrisBiomeCondition	MYTHICMOBS_API	io.lumine.mythic.api.skills.conditions.ILocationCondition
 art.arcane.iris.core.link.data.MythicMobsDataProvider$IrisRegionCondition	MYTHICMOBS_API	io.lumine.mythic.api.skills.conditions.ILocationCondition
-art.arcane.iris.core.link.data.NexoDataProvider	BUKKIT_API	org.bukkit.event.Listener
+art.arcane.iris.core.link.data.NexoDataProvider	BUKKIT_API	org.bukkit.block.data.BlockData
 art.arcane.iris.core.nms.INMS	BUKKIT_API	org.bukkit.Bukkit
 art.arcane.iris.core.project.IrisProject	BUKKIT_API	org.bukkit.entity.Entity
 art.arcane.iris.core.runtime.WorldRuntimeControlService	BUKKIT_API	org.bukkit.entity.Entity
@@ -41,6 +42,7 @@ art.arcane.iris.core.tools.IrisWorldCreator	BUKKIT_API	org.bukkit.generator.Chun
 art.arcane.iris.core.tools.TreePlausibilizer	BUKKIT_API	org.bukkit.Keyed
 art.arcane.iris.engine.IrisWorldManager	BUKKIT_API	org.bukkit.event.Listener
 art.arcane.iris.engine.framework.EngineAssignedWorldManager	BUKKIT_API	org.bukkit.event.Listener
+art.arcane.iris.engine.framework.EnginePlayer	BUKKIT_API	org.bukkit.entity.Entity
 art.arcane.iris.engine.framework.placer.WorldObjectPlacer	BUKKIT_API	org.bukkit.event.Event
 art.arcane.iris.engine.object.IrisDirection$11	BUKKIT_API	org.bukkit.block.BlockFace
 art.arcane.iris.engine.object.IrisEffect$BukkitFx	BUKKIT_API	org.bukkit.entity.Entity
@@ -60,12 +62,15 @@ art.arcane.iris.engine.platform.DummyChunkGenerator	BUKKIT_API	org.bukkit.genera
 art.arcane.iris.engine.platform.EngineBukkitOps	BUKKIT_API	org.bukkit.entity.Entity
 art.arcane.iris.engine.platform.studio.generators.ObjectStudioGenerator	BUKKIT_API	org.bukkit.Material
 art.arcane.iris.platform.bukkit.BukkitBlockResolution	BUKKIT_API	org.bukkit.Material
+art.arcane.iris.platform.bukkit.BukkitBlockState	BUKKIT_API	org.bukkit.Keyed
 art.arcane.iris.platform.bukkit.BukkitPlatform	BUKKIT_API	org.bukkit.command.CommandSender
+art.arcane.iris.platform.bukkit.BukkitWorldBinding	BUKKIT_API	org.bukkit.generator.WorldInfo
 art.arcane.iris.util.common.data.IrisCustomData	BUKKIT_API	org.bukkit.block.data.BlockData
 art.arcane.iris.util.common.data.registry.Attributes	BUKKIT_API	org.bukkit.attribute.Attribute
 art.arcane.iris.util.common.data.registry.Materials	BUKKIT_API	org.bukkit.Material
 art.arcane.iris.util.common.data.registry.Particles	BUKKIT_API	org.bukkit.Particle
 art.arcane.iris.util.common.director.handlers.VectorHandler	BUKKIT_API	org.bukkit.util.Vector
+art.arcane.iris.util.common.director.handlers.WorldHandler	BUKKIT_API	org.bukkit.generator.WorldInfo
 art.arcane.iris.util.common.format.C$DyeMaps	BUKKIT_API	org.bukkit.DyeColor
 art.arcane.iris.util.common.inventorygui.WindowResolution	BUKKIT_API	org.bukkit.event.inventory.InventoryType
 art.arcane.iris.util.common.misc.Bindings	BUKKIT_API	org.bukkit.plugin.Plugin

probe/src/test/java/art/arcane/iris/probe/IdentifierPlatformIsolationTest.java

@@ -0,0 +1,21 @@
+package art.arcane.iris.probe;
+
+import art.arcane.iris.core.link.Identifier;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+public final class IdentifierPlatformIsolationTest {
+    @Test
+    public void equalityDoesNotResolveBukkitOnTheProbeRuntime() {
+        ClassLoader classLoader = IdentifierPlatformIsolationTest.class.getClassLoader();
+        assertThrows(ClassNotFoundException.class,
+                () -> Class.forName("org.bukkit.NamespacedKey", false, classLoader));
+
+        Identifier identifier = new Identifier("minecraft", "stone");
+        assertTrue(identifier.equals(new Identifier("minecraft", "stone")));
+        assertFalse(identifier.equals("minecraft:stone"));
+    }
+}