Improve datagen mixin to not hang if something fails

Author: object-Object

Forge/src/main/java/gay/object/hexdebug/forge/mixin/ForgeHexDebugMixinConfigPlugin.java

@@ -23,7 +23,7 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
         if (mixinClassName.equals("gay.object.hexdebug.forge.mixin.MixinDatagenMain")) {
             var shouldApply = System.getProperty("hexdebug.apply-datagen-mixin", "false").equals("true");
             if (shouldApply) {
-                HexDebug.LOGGER.error("Applying scuffed datagen mixin. This should not happen if not running datagen!");
+                HexDebug.LOGGER.warn("Applying scuffed datagen mixin. This should not happen if not running datagen!");
             }
             return shouldApply;
         }

Forge/src/main/java/gay/object/hexdebug/forge/mixin/MixinDatagenMain.java

@@ -1,5 +1,7 @@
 package gay.object.hexdebug.forge.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import gay.object.hexdebug.HexDebug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -9,9 +11,15 @@
 // scuffed workaround for https://github.com/architectury/architectury-loom/issues/189
 @Mixin(net.minecraft.data.Main.class)
 public class MixinDatagenMain {
-    @Inject(method = "main", at = @At("TAIL"), remap = false)
-    private static void hexdebug$systemExitAfterDatagenFinishes(String[] strings, CallbackInfo ci) {
-        HexDebug.LOGGER.info("Terminating datagen.");
+    @WrapMethod(method = "main", remap = false)
+    private static void hexdummyexample$systemExitAfterDatagenFinishes(String[] strings, Operation<Void> original) {
+        try {
+            original.call((Object) strings);
+        } catch (Throwable throwable) {
+            HexDebug.LOGGER.error("Datagen failed!", throwable);
+            System.exit(1);
+        }
+        HexDebug.LOGGER.info("Datagen succeeded, terminating.");
         System.exit(0);
     }
 }

gradle/libs.versions.toml

@@ -33,7 +33,7 @@ patchouli-forge = "1.20.1-84-FORGE"
 
 cardinalComponents = "5.2.1"
 serializationHooks = "0.4.99999"
-mixinExtras = "0.3.6"
+mixinExtras = "0.5.0"
 trinkets = "3.7.0"
 clothConfig = "11.1.106"
 modMenu = "7.1.0"