Update to 1.21.3

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -30,6 +30,7 @@ repositories {
 	maven { url "https://maven.ladysnake.org/releases" }
 	maven { url "https://maven.quiltmc.org/repository/release" }
 	maven { url "https://jitpack.io" }
+	maven { url "https://maven.andante.dev/releases/" }
 	maven {
 		url "https://maven.jamieswhiteshirt.com/libs-release"
 		content {

gradle.properties

@@ -3,26 +3,26 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
     # check these on https://fabricmc.net/develop
-    minecraft_base_version=1.21
-    minecraft_version=1.21
-    yarn_mappings=1.21+build.9
-    loader_version=0.15.11
+    minecraft_base_version=1.21.3
+    minecraft_version=1.21.3
+    yarn_mappings=1.21.3+build.2
+    loader_version=0.16.7
 
 # Mod Properties
     mod_version = 0.2.4
     maven_group = io.wispforest
     archives_base_name = gadget
 
 # Dependencies
-    fabric_version=0.100.6+1.21
-    owo_version=0.12.10+1.21
-    modmenu_version=11.0.1
-    rei_version=16.0.729
-    fabric_perms_api=0.3.1
+    fabric_version=0.107.0+1.21.3
+    owo_version=0.12.17+1.21.2
+    modmenu_version=12.0.0-beta.1
+    rei_version=17.0.789
+    fabric_perms_api=0.3.3
     mapping_io=0.6.1
     auoeke_result=0.4.1
     auoeke_unsafe=1.7.3
     auoeke_reflect=6.3.0
     quiltflower=1.9.0
     auth_me=7.0.1+1.20
-    cloth_config=15.0.127
+    cloth_config=16.0.141

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/generated/GadgetConfig.java

@@ -0,0 +1,252 @@
+package io.wispforest.gadget.util;
+
+import blue.endless.jankson.Jankson;
+import io.wispforest.owo.config.ConfigWrapper;
+import io.wispforest.owo.config.ConfigWrapper.BuilderConsumer;
+import io.wispforest.owo.config.Option;
+import io.wispforest.owo.util.Observable;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public class GadgetConfig extends ConfigWrapper<io.wispforest.gadget.util.GadgetConfigModel> {
+
+    public final Keys keys = new Keys();
+
+    private final Option<java.lang.Boolean> menuButtonEnabled = this.optionForKey(this.keys.menuButtonEnabled);
+    private final Option<java.lang.Boolean> rightClickDump = this.optionForKey(this.keys.rightClickDump);
+    private final Option<java.lang.Boolean> dropChunkData = this.optionForKey(this.keys.dropChunkData);
+    private final Option<io.wispforest.gadget.util.GadgetConfigModel.DumpSafetyMode> dumpSafety = this.optionForKey(this.keys.dumpSafety);
+    private final Option<java.lang.Boolean> debugKeysInScreens = this.optionForKey(this.keys.debugKeysInScreens);
+    private final Option<java.lang.Boolean> matrixStackDebugging = this.optionForKey(this.keys.matrixStackDebugging);
+    private final Option<java.lang.Boolean> uiInspector = this.optionForKey(this.keys.uiInspector);
+    private final Option<java.lang.Boolean> silenceStartupErrors = this.optionForKey(this.keys.silenceStartupErrors);
+    private final Option<java.lang.String> quiltflowerVersion = this.optionForKey(this.keys.quiltflowerVersion);
+    private final Option<io.wispforest.gadget.util.GadgetConfigModel.MappingsType> mappings = this.optionForKey(this.keys.mappings);
+    private final Option<io.wispforest.gadget.util.GadgetConfigModel.UICounterMode> uiCounterMode = this.optionForKey(this.keys.uiCounterMode);
+    private final Option<java.lang.Boolean> inspectClasses = this.optionForKey(this.keys.inspectClasses);
+    private final Option<java.lang.Boolean> fullDecompilationContext = this.optionForKey(this.keys.fullDecompilationContext);
+    private final Option<java.util.List<java.lang.String>> hiddenFields = this.optionForKey(this.keys.hiddenFields);
+    private final Option<java.lang.Boolean> errorCheckOwoUi = this.optionForKey(this.keys.errorCheckOwoUi);
+    private final Option<java.lang.Boolean> internalSettings_debugMatrixStackDebugging = this.optionForKey(this.keys.internalSettings_debugMatrixStackDebugging);
+    private final Option<java.lang.Boolean> internalSettings_injectMatrixStackErrors = this.optionForKey(this.keys.internalSettings_injectMatrixStackErrors);
+    private final Option<java.lang.Boolean> internalSettings_dumpTRMappings = this.optionForKey(this.keys.internalSettings_dumpTRMappings);
+    private final Option<java.lang.Boolean> internalSettings_dumpFieldDataRequests = this.optionForKey(this.keys.internalSettings_dumpFieldDataRequests);
+
+    private GadgetConfig() {
+        super(io.wispforest.gadget.util.GadgetConfigModel.class);
+    }
+
+    private GadgetConfig(BuilderConsumer consumer) {
+        super(io.wispforest.gadget.util.GadgetConfigModel.class, consumer);
+    }
+
+    public static GadgetConfig createAndLoad() {
+        var wrapper = new GadgetConfig();
+        wrapper.load();
+        return wrapper;
+    }
+
+    public static GadgetConfig createAndLoad(BuilderConsumer consumer) {
+        var wrapper = new GadgetConfig(consumer);
+        wrapper.load();
+        return wrapper;
+    }
+
+    public boolean menuButtonEnabled() {
+        return menuButtonEnabled.value();
+    }
+
+    public void menuButtonEnabled(boolean value) {
+        menuButtonEnabled.set(value);
+    }
+
+    public boolean rightClickDump() {
+        return rightClickDump.value();
+    }
+
+    public void rightClickDump(boolean value) {
+        rightClickDump.set(value);
+    }
+
+    public boolean dropChunkData() {
+        return dropChunkData.value();
+    }
+
+    public void dropChunkData(boolean value) {
+        dropChunkData.set(value);
+    }
+
+    public io.wispforest.gadget.util.GadgetConfigModel.DumpSafetyMode dumpSafety() {
+        return dumpSafety.value();
+    }
+
+    public void dumpSafety(io.wispforest.gadget.util.GadgetConfigModel.DumpSafetyMode value) {
+        dumpSafety.set(value);
+    }
+
+    public boolean debugKeysInScreens() {
+        return debugKeysInScreens.value();
+    }
+
+    public void debugKeysInScreens(boolean value) {
+        debugKeysInScreens.set(value);
+    }
+
+    public boolean matrixStackDebugging() {
+        return matrixStackDebugging.value();
+    }
+
+    public void matrixStackDebugging(boolean value) {
+        matrixStackDebugging.set(value);
+    }
+
+    public boolean uiInspector() {
+        return uiInspector.value();
+    }
+
+    public void uiInspector(boolean value) {
+        uiInspector.set(value);
+    }
+
+    public boolean silenceStartupErrors() {
+        return silenceStartupErrors.value();
+    }
+
+    public void silenceStartupErrors(boolean value) {
+        silenceStartupErrors.set(value);
+    }
+
+    public java.lang.String quiltflowerVersion() {
+        return quiltflowerVersion.value();
+    }
+
+    public void quiltflowerVersion(java.lang.String value) {
+        quiltflowerVersion.set(value);
+    }
+
+    public io.wispforest.gadget.util.GadgetConfigModel.MappingsType mappings() {
+        return mappings.value();
+    }
+
+    public void mappings(io.wispforest.gadget.util.GadgetConfigModel.MappingsType value) {
+        mappings.set(value);
+    }
+
+    public void subscribeToMappings(Consumer<io.wispforest.gadget.util.GadgetConfigModel.MappingsType> subscriber) {
+        mappings.observe(subscriber);
+    }
+
+    public io.wispforest.gadget.util.GadgetConfigModel.UICounterMode uiCounterMode() {
+        return uiCounterMode.value();
+    }
+
+    public void uiCounterMode(io.wispforest.gadget.util.GadgetConfigModel.UICounterMode value) {
+        uiCounterMode.set(value);
+    }
+
+    public boolean inspectClasses() {
+        return inspectClasses.value();
+    }
+
+    public void inspectClasses(boolean value) {
+        inspectClasses.set(value);
+    }
+
+    public boolean fullDecompilationContext() {
+        return fullDecompilationContext.value();
+    }
+
+    public void fullDecompilationContext(boolean value) {
+        fullDecompilationContext.set(value);
+    }
+
+    public java.util.List<java.lang.String> hiddenFields() {
+        return hiddenFields.value();
+    }
+
+    public void hiddenFields(java.util.List<java.lang.String> value) {
+        hiddenFields.set(value);
+    }
+
+    public void subscribeToHiddenFields(Consumer<java.util.List<java.lang.String>> subscriber) {
+        hiddenFields.observe(subscriber);
+    }
+
+    public boolean errorCheckOwoUi() {
+        return errorCheckOwoUi.value();
+    }
+
+    public void errorCheckOwoUi(boolean value) {
+        errorCheckOwoUi.set(value);
+    }
+
+    public final InternalSettings_ internalSettings = new InternalSettings_();
+    public class InternalSettings_ implements InternalSettings {
+        public boolean debugMatrixStackDebugging() {
+            return internalSettings_debugMatrixStackDebugging.value();
+        }
+
+        public void debugMatrixStackDebugging(boolean value) {
+            internalSettings_debugMatrixStackDebugging.set(value);
+        }
+
+        public boolean injectMatrixStackErrors() {
+            return internalSettings_injectMatrixStackErrors.value();
+        }
+
+        public void injectMatrixStackErrors(boolean value) {
+            internalSettings_injectMatrixStackErrors.set(value);
+        }
+
+        public boolean dumpTRMappings() {
+            return internalSettings_dumpTRMappings.value();
+        }
+
+        public void dumpTRMappings(boolean value) {
+            internalSettings_dumpTRMappings.set(value);
+        }
+
+        public boolean dumpFieldDataRequests() {
+            return internalSettings_dumpFieldDataRequests.value();
+        }
+
+        public void dumpFieldDataRequests(boolean value) {
+            internalSettings_dumpFieldDataRequests.set(value);
+        }
+
+    }
+    public interface InternalSettings {
+        boolean debugMatrixStackDebugging();
+        void debugMatrixStackDebugging(boolean value);
+        boolean injectMatrixStackErrors();
+        void injectMatrixStackErrors(boolean value);
+        boolean dumpTRMappings();
+        void dumpTRMappings(boolean value);
+        boolean dumpFieldDataRequests();
+        void dumpFieldDataRequests(boolean value);
+    }
+    public static class Keys {
+        public final Option.Key menuButtonEnabled = new Option.Key("menuButtonEnabled");
+        public final Option.Key rightClickDump = new Option.Key("rightClickDump");
+        public final Option.Key dropChunkData = new Option.Key("dropChunkData");
+        public final Option.Key dumpSafety = new Option.Key("dumpSafety");
+        public final Option.Key debugKeysInScreens = new Option.Key("debugKeysInScreens");
+        public final Option.Key matrixStackDebugging = new Option.Key("matrixStackDebugging");
+        public final Option.Key uiInspector = new Option.Key("uiInspector");
+        public final Option.Key silenceStartupErrors = new Option.Key("silenceStartupErrors");
+        public final Option.Key quiltflowerVersion = new Option.Key("quiltflowerVersion");
+        public final Option.Key mappings = new Option.Key("mappings");
+        public final Option.Key uiCounterMode = new Option.Key("uiCounterMode");
+        public final Option.Key inspectClasses = new Option.Key("inspectClasses");
+        public final Option.Key fullDecompilationContext = new Option.Key("fullDecompilationContext");
+        public final Option.Key hiddenFields = new Option.Key("hiddenFields");
+        public final Option.Key errorCheckOwoUi = new Option.Key("errorCheckOwoUi");
+        public final Option.Key internalSettings_debugMatrixStackDebugging = new Option.Key("internalSettings.debugMatrixStackDebugging");
+        public final Option.Key internalSettings_injectMatrixStackErrors = new Option.Key("internalSettings.injectMatrixStackErrors");
+        public final Option.Key internalSettings_dumpTRMappings = new Option.Key("internalSettings.dumpTRMappings");
+        public final Option.Key internalSettings_dumpFieldDataRequests = new Option.Key("internalSettings.dumpFieldDataRequests");
+    }
+}
+

src/main/java/io/wispforest/gadget/client/command/ReloadMappingsCommand.java

@@ -1,12 +1,12 @@
 package io.wispforest.gadget.client.command;
 
+import com.google.common.io.MoreFiles;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.context.CommandContext;
 import io.wispforest.gadget.mappings.MappingsManager;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.text.Text;
-import org.spongepowered.include.com.google.common.io.MoreFiles;
 
 import java.io.IOException;
 import java.nio.file.Files;

src/main/java/io/wispforest/gadget/client/gui/NotificationToast.java

@@ -5,6 +5,7 @@
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.core.*;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.toast.Toast;
 import net.minecraft.client.toast.ToastManager;
@@ -14,6 +15,8 @@ public class NotificationToast implements Toast {
     private final OwoUIAdapter<FlowLayout> adapter;
     private final MinecraftClient client = MinecraftClient.getInstance();
 
+    private Visibility visibility = Visibility.HIDE;
+
     public NotificationToast(Text headText, Text messageText) {
         this.adapter = OwoUIAdapter.createWithoutScreen(0, 0, 160, 32, Containers::verticalFlow);
 
@@ -45,9 +48,17 @@ public void register() {
     }
 
     @Override
-    public Visibility draw(DrawContext ctx, ToastManager manager, long startTime) {
-        this.adapter.render(ctx, 0, 0, client.getRenderTickCounter().getTickDelta(false));
+    public void draw(DrawContext context, TextRenderer textRenderer, long startTime) {
+        this.adapter.render(context, 0, 0, client.getRenderTickCounter().getTickDelta(false));
+    }
+
+    @Override
+    public void update(ToastManager manager, long time) {
+        this.visibility = time > 5000 ? Visibility.HIDE : Visibility.SHOW;
+    }
 
-        return startTime > 5000 ? Visibility.HIDE : Visibility.SHOW;
+    @Override
+    public Visibility getVisibility() {
+        return this.visibility;
     }
 }