Patches

adapters/fabric/build.gradle

@@ -90,13 +90,25 @@ configurations.named('bundle').configure {
 configurations.compileClasspath.extendsFrom(configurations.devBundle)
 configurations.runtimeClasspath.extendsFrom(configurations.devBundle)
 
+configurations.create('jij') {
+    transitive = true
+}
+
 dependencies {
     minecraft("com.mojang:minecraft:${minecraftVersion}")
     implementation("net.fabricmc:fabric-loader:${fabricLoaderVersion}")
+    jij('net.fabricmc.fabric-api:fabric-api-base:2.0.3+ece063234c')
+    jij('net.fabricmc.fabric-api:fabric-registry-sync-v0:7.1.0+2fa62b4e4c')
+    jij('net.fabricmc.fabric-api:fabric-resource-loader-v1:2.0.10+7c44c7324c')
+    jij('net.fabricmc.fabric-api:fabric-lifecycle-events-v1:4.1.0+6d50a0854c')
+    jij('net.fabricmc.fabric-api:fabric-command-api-v2:3.0.5+e2bdee784c')
+    jij('net.fabricmc.fabric-api:fabric-events-interaction-v0:5.2.2+07b380be4c')
     implementation('net.fabricmc.fabric-api:fabric-api-base:2.0.3+ece063234c')
     implementation('net.fabricmc.fabric-api:fabric-registry-sync-v0:7.1.0+2fa62b4e4c')
     implementation('net.fabricmc.fabric-api:fabric-resource-loader-v1:2.0.10+7c44c7324c')
     implementation('net.fabricmc.fabric-api:fabric-lifecycle-events-v1:4.1.0+6d50a0854c')
+    implementation('net.fabricmc.fabric-api:fabric-command-api-v2:3.0.5+e2bdee784c')
+    implementation('net.fabricmc.fabric-api:fabric-events-interaction-v0:5.2.2+07b380be4c')
     compileOnly('org.slf4j:slf4j-api:2.0.17')
     compileOnly(libs.spigot) {
         transitive = false
@@ -174,6 +186,12 @@ tasks.named('shadowJar', ShadowJar).configure {
     exclude('META-INF/*.DSA')
     exclude('META-INF/*.RSA')
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    relocate('org.objectweb.asm', 'art.arcane.iris.shadow.asm')
+    exclude('oshi.properties')
+    from(project.configurations.named('jij')) {
+        into('META-INF/jars')
+        rename { String fileName -> fileName.replaceAll(/-[0-9][^-]*\.jar$/, '.jar') }
+    }
 }
 
 tasks.named('assemble').configure {

adapters/fabric/src/main/java/art/arcane/iris/fabric/FabricModdedLoader.java

@@ -39,6 +39,13 @@ public final class FabricModdedLoader implements ModdedLoader {
                 .orElse("unknown");
     }
 
+    @Override
+    public String modVersion() {
+        return FabricLoader.getInstance().getModContainer("irisworldgen")
+                .map((ModContainer container) -> container.getMetadata().getVersion().getFriendlyString())
+                .orElse("unknown");
+    }
+
     @Override
     public MinecraftServer currentServer() {
         Object instance = FabricLoader.getInstance().getGameInstance();

adapters/fabric/src/main/java/art/arcane/iris/fabric/IrisFabricBootstrap.java

@@ -23,14 +23,32 @@ import art.arcane.iris.modded.ModdedEngineBootstrap;
 import art.arcane.iris.modded.ModdedParityProbe;
 import art.arcane.iris.modded.ModdedWorldCheck;
 import art.arcane.iris.modded.ModdedWorldEngines;
+import art.arcane.iris.modded.command.IrisModdedCommands;
+import art.arcane.iris.modded.command.ModdedObjectUndo;
+import art.arcane.iris.modded.command.ModdedWandService;
+import com.mojang.brigadier.CommandDispatcher;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
+import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.Identifier;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.BlockHitResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,6 +58,7 @@ public final class IrisFabricBootstrap implements ModInitializer {
     @Override
     public void onInitialize() {
         ModdedEngineBootstrap.initialize(new FabricModdedLoader());
+        art.arcane.iris.modded.ModdedPackInstaller.ensureDefaultPack(ModdedEngineBootstrap.loader().configDir());
         FabricLoader loader = FabricLoader.getInstance();
         String modVersion = loader.getModContainer("irisworldgen")
             .map((ModContainer container) -> container.getMetadata().getVersion().getFriendlyString())
@@ -53,7 +72,17 @@ public final class IrisFabricBootstrap implements ModInitializer {
         ModdedEngineBootstrap.bind();
         Registry.register(BuiltInRegistries.CHUNK_GENERATOR, Identifier.fromNamespaceAndPath("irisworldgen", "iris"), IrisModdedChunkGenerator.CODEC);
         LOGGER.info("Iris chunk generator registered as irisworldgen:iris");
-        ServerLifecycleEvents.SERVER_STOPPING.register((MinecraftServer server) -> ModdedWorldEngines.shutdown());
+        ServerLifecycleEvents.SERVER_STOPPING.register((MinecraftServer server) -> {
+            ModdedObjectUndo.clearAll();
+            ModdedWandService.clearAll();
+            ModdedWorldEngines.shutdown();
+        });
+        CommandRegistrationCallback.EVENT.register((CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext buildContext, Commands.CommandSelection selection) -> IrisModdedCommands.register(dispatcher));
+        AttackBlockCallback.EVENT.register((Player player, Level level, InteractionHand hand, BlockPos pos, Direction direction) ->
+                ModdedWandService.attackBlock(player, level, hand, pos) ? InteractionResult.SUCCESS : InteractionResult.PASS);
+        UseBlockCallback.EVENT.register((Player player, Level level, InteractionHand hand, BlockHitResult hit) ->
+                ModdedWandService.useBlock(player, level, hand, hit.getBlockPos()) ? InteractionResult.SUCCESS : InteractionResult.PASS);
+        ServerTickEvents.END_SERVER_TICK.register((MinecraftServer server) -> ModdedWandService.serverTick(server));
 
         String parity = System.getProperty("iris.parity");
         if (parity != null) {

adapters/fabric/src/main/resources/fabric.mod.json

@@ -13,11 +13,17 @@
   "entrypoints": {
     "main": ["art.arcane.iris.fabric.IrisFabricBootstrap"]
   },
+  "jars": [
+    { "file": "META-INF/jars/fabric-api-base.jar" },
+    { "file": "META-INF/jars/fabric-registry-sync-v0.jar" },
+    { "file": "META-INF/jars/fabric-resource-loader-v1.jar" },
+    { "file": "META-INF/jars/fabric-lifecycle-events-v1.jar" },
+    { "file": "META-INF/jars/fabric-networking-api-v1.jar" },
+    { "file": "META-INF/jars/fabric-command-api-v2.jar" },
+    { "file": "META-INF/jars/fabric-events-interaction-v0.jar" }
+  ],
   "depends": {
     "fabricloader": ">=0.19.0",
-    "fabric-registry-sync-v0": "*",
-    "fabric-resource-loader-v1": "*",
-    "fabric-lifecycle-events-v1": "*",
     "minecraft": "~${minecraftVersion}",
     "java": ">=25"
   }