build: make sure 1.21.11 receives proper decompilations again

Author: lineargraph

build-src/src/main/kotlin/moulconfig.fabric.gradle.kts

@@ -17,11 +17,12 @@ val aF = project.file("src/main/resources/moulconfig.accesswidener")
 val hasAW = aF.exists()
 the<UniminedExtension>().minecraft {
 	version(minecraftVersion)
-
     if (!isDeobfuscated) {
         mappings {
             intermediary()
             mojmap()
+            // unimined currently incorrectly renames 1.21.11 namespaces to official instead of above 1.21.11
+            devNamespace("mojmap")
         }
     }
 

modern/1.21.11/gradle.properties

@@ -1,3 +1,4 @@
 moulconfig.minecraft=1.21.11
-moulconfig.yarn=2
-moulconfig.fabric=0.135.1+1.21.11
+moulconfig.yarn=4
+moulconfig.fabric=0.141.3+1.21.11
+moulconfig.rlv1=true

modern/templates/java/io/github/notenoughupdates/moulconfig/test/CommandUtils.java

@@ -0,0 +1,16 @@
+package io.github.notenoughupdates.moulconfig.test;
+
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+
+public class CommandUtils {
+    public static LiteralArgumentBuilder<FabricClientCommandSource> literal(String name) {
+        return LiteralArgumentBuilder.literal(name);
+    }
+    public static <T> RequiredArgumentBuilder<FabricClientCommandSource, T> argument(String name, ArgumentType<T> type) {
+        return RequiredArgumentBuilder.argument(name, type);
+    }
+
+}

modern/templates/java/io/github/notenoughupdates/moulconfig/test/FabricMain.java

@@ -0,0 +1,110 @@
+package io.github.notenoughupdates.moulconfig.test;
+
+import io.github.notenoughupdates.moulconfig.common.IItemStack;
+import io.github.notenoughupdates.moulconfig.common.IMinecraft;
+import io.github.notenoughupdates.moulconfig.common.MyResourceLocation;
+import io.github.notenoughupdates.moulconfig.gui.CloseEventListener;
+import io.github.notenoughupdates.moulconfig.managed.ManagedConfig;
+import io.github.notenoughupdates.moulconfig.observer.ObservableList;
+import io.github.notenoughupdates.moulconfig.platform.MoulConfigPlatform;
+import io.github.notenoughupdates.moulconfig.xml.Bind;
+import io.github.notenoughupdates.moulconfig.xml.XMLUniverse;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Blocks;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Random;
+
+import static io.github.notenoughupdates.moulconfig.test.CommandUtils.literal;
+
+public class FabricMain implements ModInitializer {
+    @Override
+    public void onInitialize() {
+        if (!"true".equals(System.getProperty("moulconfig.testmod"))) return;
+        ManagedConfig<TestConfig> config = ManagedConfig.create(new File("config/moulconfig/test.json"), TestConfig.class);
+        ClientCommandRegistrationCallback.EVENT.register((a, b) -> {
+            a.register(literal("moulconfig").executes(ctx -> {
+                Minecraft.getInstance().schedule(() -> {
+                    var editor = config.getEditor();
+                    editor.setWide(config.getInstance().getTestCategoryA().isWide());
+                    IMinecraft.INSTANCE.openWrappedScreen(editor);
+                });
+                return 0;
+            }));
+            a.register(literal("moulconfigxml").executes(ctx -> {
+                Minecraft.getInstance().schedule(() -> {
+                    XMLUniverse xmlUniverse = XMLUniverse.getDefaultUniverse();
+                    var scene = xmlUniverse.load(
+                        new ObjectBound(),
+                        IMinecraft.INSTANCE.loadResourceLocation(MyResourceLocation.Companion.parse("moulconfig:test.xml"))
+                    );
+                    IMinecraft.getInstance()
+                            .openWrappedScreen(scene);
+                });
+                return 0;
+            }));
+        });
+    }
+
+    public static class Element {
+        @Bind
+        public String text;
+
+        @Bind
+        public boolean enabled = false;
+
+        public Element(String text) {
+            this.text = text;
+        }
+
+        @Bind
+        public void randomize() {
+            text = "§" + "abcdef0123456789".charAt(new Random().nextInt(16)) + text.replaceAll("§.", "");
+        }
+    }
+
+    public static class ObjectBound {
+        @Bind
+        public Runnable requestClose = null;
+
+        @Bind
+        public void afterClose() {
+            System.out.println("After close");
+        }
+
+        @Bind
+        public CloseEventListener.CloseAction beforeClose() {
+            System.out.println("Before close");
+            return CloseEventListener.CloseAction.NO_OBJECTIONS_TO_CLOSE;
+        }
+
+        @Bind
+        public IItemStack itemStack = MoulConfigPlatform.wrap(new ItemStack(Blocks.SAND));
+
+        @Bind
+        public boolean value = false;
+
+        @Bind
+        public String textField = "";
+
+        @Bind
+        public float slider = 0f;
+
+        @Bind
+        public void addElement() {
+            data.add(new Element(textField));
+            textField = "";
+        }
+
+        @Bind
+        public ObservableList<Element> data =
+            new ObservableList<>(new ArrayList<>(Arrays.asList(
+                new Element("Test 1"), new Element("Test 2"), new Element("Test 3")
+            )));
+    }
+}