Update to 1.21.3

.gitignore

@@ -31,3 +31,7 @@ bin/
 # fabric
 
 run/
+
+# gadget
+
+src/main/generated/GadgetConfig.java

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.9-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.4
+    minecraft_version=1.21.4
+    yarn_mappings=1.21.4+build.2
+    loader_version=0.16.9
 
 # 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.112.2+1.21.4
+    owo_version=0.12.19+1.21.4
+    modmenu_version=13.0.0-beta.1
+    rei_version=18.0.796
+    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
+    auth_me=8.0.0+1.21.4
+    cloth_config=17.0.144

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.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/wispforest/gadget/client/GadgetClient.java

@@ -22,8 +22,12 @@
 import io.wispforest.gadget.network.InspectionTarget;
 import io.wispforest.gadget.network.packet.c2s.OpenFieldDataScreenC2SPacket;
 import io.wispforest.gadget.network.packet.c2s.RequestResourceC2SPacket;
-import io.wispforest.gadget.network.packet.s2c.*;
-import io.wispforest.owo.config.ui.ConfigScreen;
+import io.wispforest.gadget.network.packet.s2c.FieldDataErrorS2CPacket;
+import io.wispforest.gadget.network.packet.s2c.FieldDataResponseS2CPacket;
+import io.wispforest.gadget.network.packet.s2c.OpenFieldDataScreenS2CPacket;
+import io.wispforest.gadget.network.packet.s2c.ResourceDataS2CPacket;
+import io.wispforest.gadget.network.packet.s2c.ResourceListS2CPacket;
+import io.wispforest.owo.config.ui.ConfigScreenProviders;
 import io.wispforest.owo.ui.component.Components;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.core.Insets;
@@ -75,7 +79,7 @@ public void onInitializeClient() {
         ContextMenuScreens.init();
         ChatLogAppender.init();
 
-        ConfigScreen.registerProvider("gadget", GadgetConfigScreen::new);
+        ConfigScreenProviders.register("gadget", GadgetConfigScreen::new);
 
         GadgetNetworking.CHANNEL.registerClientbound(OpenFieldDataScreenS2CPacket.class, (packet, access) -> {
             access.runtime().setScreen(new FieldDataScreen(

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/config/RemappingListOptionContainer.java

@@ -14,7 +14,13 @@
 import io.wispforest.owo.ui.container.CollapsibleContainer;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Component;
+import io.wispforest.owo.ui.core.CursorStyle;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.ParentComponent;
+import io.wispforest.owo.ui.core.Positioning;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 import io.wispforest.owo.ui.util.UISounds;
 import io.wispforest.owo.util.NumberReflection;
 import io.wispforest.owo.util.ReflectionUtils;

src/main/java/io/wispforest/gadget/client/dump/DumpStatsScreen.java

@@ -11,7 +11,13 @@
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.container.ScrollContainer;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Color;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.OwoUIAdapter;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;

src/main/java/io/wispforest/gadget/client/dump/OpenDumpScreen.java

@@ -1,10 +1,20 @@
 package io.wispforest.gadget.client.dump;
 
 import io.wispforest.gadget.Gadget;
-import io.wispforest.gadget.client.gui.*;
+import io.wispforest.gadget.client.gui.BasedSliderComponent;
+import io.wispforest.gadget.client.gui.BasedVerticalFlowLayout;
+import io.wispforest.gadget.client.gui.EventEaterWrapper;
+import io.wispforest.gadget.client.gui.NotificationToast;
+import io.wispforest.gadget.client.gui.SaveFilePathComponent;
+import io.wispforest.gadget.client.gui.SidebarBuilder;
 import io.wispforest.gadget.dump.read.DumpedPacket;
 import io.wispforest.gadget.dump.read.PacketDumpReader;
-import io.wispforest.gadget.util.*;
+import io.wispforest.gadget.util.CancellationToken;
+import io.wispforest.gadget.util.CancellationTokenSource;
+import io.wispforest.gadget.util.FormattedDumper;
+import io.wispforest.gadget.util.ProgressToast;
+import io.wispforest.gadget.util.ReactiveUtils;
+import io.wispforest.gadget.util.TimeUtil;
 import io.wispforest.owo.ui.base.BaseOwoScreen;
 import io.wispforest.owo.ui.component.Components;
 import io.wispforest.owo.ui.component.LabelComponent;
@@ -13,7 +23,15 @@
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.container.OverlayContainer;
 import io.wispforest.owo.ui.container.ScrollContainer;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Color;
+import io.wispforest.owo.ui.core.Component;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.OwoUIAdapter;
+import io.wispforest.owo.ui.core.OwoUIDrawContext;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 import io.wispforest.owo.util.Observable;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
@@ -22,14 +40,12 @@
 import net.minecraft.util.math.MathHelper;
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.commons.lang3.mutable.MutableLong;
-import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.lang.Math;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;

src/main/java/io/wispforest/gadget/client/dump/RenderedPacketComponent.java

@@ -16,7 +16,11 @@
 import io.wispforest.owo.ui.container.CollapsibleContainer;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Component;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.Surface;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;

src/main/java/io/wispforest/gadget/client/field/FieldDataIsland.java

@@ -7,7 +7,11 @@
 import io.wispforest.gadget.client.nbt.KeyAdderWidget;
 import io.wispforest.gadget.client.nbt.NbtDataIsland;
 import io.wispforest.gadget.client.nbt.NbtPath;
-import io.wispforest.gadget.desc.*;
+import io.wispforest.gadget.desc.BytesFieldObject;
+import io.wispforest.gadget.desc.ComplexFieldObject;
+import io.wispforest.gadget.desc.ErrorFieldObject;
+import io.wispforest.gadget.desc.NbtCompoundFieldObject;
+import io.wispforest.gadget.desc.PrimitiveFieldObject;
 import io.wispforest.gadget.field.FieldDataHolder;
 import io.wispforest.gadget.field.FieldDataSource;
 import io.wispforest.gadget.network.FieldData;

src/main/java/io/wispforest/gadget/client/field/FieldDataScreen.java

@@ -20,7 +20,15 @@
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.container.OverlayContainer;
 import io.wispforest.owo.ui.container.ScrollContainer;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Color;
+import io.wispforest.owo.ui.core.Component;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.OwoUIAdapter;
+import io.wispforest.owo.ui.core.Positioning;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.resource.language.I18n;

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

@@ -18,7 +18,13 @@
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
 import io.wispforest.owo.ui.container.ScrollContainer;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Color;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.OwoUIAdapter;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;

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

@@ -7,7 +7,12 @@
 import io.wispforest.owo.ui.component.LabelComponent;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Component;
+import io.wispforest.owo.ui.core.CursorStyle;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.ParentComponent;
+import io.wispforest.owo.ui.core.Positioning;
+import io.wispforest.owo.ui.core.Sizing;
 import io.wispforest.owo.ui.util.UISounds;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.MutableText;

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

@@ -3,8 +3,13 @@
 import io.wispforest.owo.ui.component.Components;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.OwoUIAdapter;
+import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 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 +19,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 +52,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;
     }
 }

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

@@ -6,8 +6,16 @@
 import io.wispforest.owo.ui.component.LabelComponent;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.Color;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.OwoUIAdapter;
+import io.wispforest.owo.ui.core.Positioning;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 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;
@@ -26,6 +34,8 @@ public class ProgressToastImpl implements Toast, ProgressToast {
     private LongSupplier following = null;
     private long followingTotal = 0;
 
+    private Visibility visibility = Visibility.HIDE;
+
     public ProgressToastImpl(Text headText) {
         this.adapter = OwoUIAdapter.createWithoutScreen(0, 0, 160, 32, Containers::verticalFlow);
 
@@ -53,7 +63,7 @@ public ProgressToastImpl(Text headText) {
     }
 
     @Override
-    public Visibility draw(DrawContext ctx, ToastManager manager, long startTime) {
+    public void draw(DrawContext context, TextRenderer textRenderer, long startTime) {
         long value = following == null ? -1 : following.getAsLong();
 
         if (value < 0) {
@@ -63,20 +73,30 @@ public Visibility draw(DrawContext ctx, ToastManager manager, long startTime) {
             progressBox.horizontalSizing(Sizing.fixed((int) (value * 140 / followingTotal)));
         }
 
-        this.adapter.render(ctx, 0, 0, client.getRenderTickCounter().getTickDelta(false));
+        this.adapter.render(context, 0, 0, client.getRenderTickCounter().getTickDelta(false));
+    }
 
-        if (stopTime == -1)
-            stopTime = startTime + 1;
-        else if (stopTime == -2)
-            return Visibility.HIDE;
+    @Override
+    public void update(ToastManager manager, long time) {
+        if (stopTime == -1) {
+            stopTime = time + 1;
+        }  else if (stopTime == -2) {
+            this.visibility = Visibility.HIDE;
+            return;
+        }
 
         if (stopTime == 0) {
-            return Visibility.SHOW;
+            this.visibility = Visibility.SHOW;
         } else {
-            return startTime - stopTime > 2500 ? Visibility.HIDE : Visibility.SHOW;
+            this.visibility = time - stopTime > 2500 ? Visibility.HIDE : Visibility.SHOW;
         }
     }
 
+    @Override
+    public Visibility getVisibility() {
+        return this.visibility;
+    }
+
     @Override
     public void step(Text text) {
         MinecraftClient.getInstance().execute(() -> {

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

@@ -4,7 +4,13 @@
 import io.wispforest.owo.ui.component.LabelComponent;
 import io.wispforest.owo.ui.container.Containers;
 import io.wispforest.owo.ui.container.FlowLayout;
-import io.wispforest.owo.ui.core.*;
+import io.wispforest.owo.ui.core.CursorStyle;
+import io.wispforest.owo.ui.core.HorizontalAlignment;
+import io.wispforest.owo.ui.core.Insets;
+import io.wispforest.owo.ui.core.Positioning;
+import io.wispforest.owo.ui.core.Sizing;
+import io.wispforest.owo.ui.core.Surface;
+import io.wispforest.owo.ui.core.VerticalAlignment;
 import io.wispforest.owo.ui.util.UISounds;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;