Updated to MC 1.20.4

build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id "fabric-loom" version "1.3-SNAPSHOT"
+	id "fabric-loom" version "1.4-SNAPSHOT"
 	id "maven-publish"
 }
 
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
-repositories {
+base {
+	archivesName = project.archives_base_name
+	version = project.mod_version
+	group = project.maven_group
 }
 
 dependencies {

gradle.properties

@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 
 # fabric
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.14.24
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.3
 
 # mod
 mod_version=1.4.0-SNAPSHOT
 maven_group=de.florianmichael
 archives_base_name=ui-utils-reborn
 
 # libraries
-fabric_version=0.90.7+1.20.2
+fabric_version=0.91.3+1.20.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

src/main/java/de/florianmichael/uiutilsreborn/UIUtilsReborn.java

@@ -149,7 +149,7 @@ public void onInitializeClient() {
         exploits.add(new ExploitButtonWidget(Text.translatable("gui.ui-utils-reborn.copy"), b -> {
             assert mc.player != null;
 
-            mc.keyboard.setClipboard("SyncID: " + mc.player.currentScreenHandler.syncId + ", Revision: " + mc.player.currentScreenHandler.getRevision() + ", Title: " + Text.Serializer.toJson(mc.currentScreen.getTitle()));
+            mc.keyboard.setClipboard("SyncID: " + mc.player.currentScreenHandler.syncId + ", Revision: " + mc.player.currentScreenHandler.getRevision() + ", Title: " + Text.Serialization.toJsonString(mc.currentScreen.getTitle()));
         }));
 
         // Packet Fabrication

src/main/java/de/florianmichael/uiutilsreborn/gui/FabricateScreen.java

@@ -28,7 +28,6 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
@@ -139,29 +138,29 @@ private void initButtons(final int startX) {
 
         this.syncID = new TextFieldWidget(textRenderer, startX, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, Text.empty());
         y += UIUtilsReborn.BUTTON_DIFF;
-        ((ITextFieldAdapter) this.syncID).setSideInformation("Sync ID");
+        ((ITextFieldAdapter) this.syncID).uiUtilsReborn$setSideInformation("Sync ID");
         this.addDrawableChild(this.syncID);
 
         if (this.currentPacket == CurrentPacket.CLICK_SLOT) {
             this.revision = new TextFieldWidget(textRenderer, startX, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, Text.empty());
             y += UIUtilsReborn.BUTTON_DIFF;
-            ((ITextFieldAdapter) this.revision).setSideInformation("Revision");
+            ((ITextFieldAdapter) this.revision).uiUtilsReborn$setSideInformation("Revision");
             this.addDrawableChild(this.revision);
 
             this.slot = new TextFieldWidget(textRenderer, startX, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, Text.empty());
             y += UIUtilsReborn.BUTTON_DIFF;
-            ((ITextFieldAdapter) this.slot).setSideInformation("Slot");
+            ((ITextFieldAdapter) this.slot).uiUtilsReborn$setSideInformation("Slot");
             this.addDrawableChild(this.slot);
 
             this.button = new TextFieldWidget(textRenderer, startX, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, Text.empty());
             y += UIUtilsReborn.BUTTON_DIFF;
-            ((ITextFieldAdapter) this.button).setSideInformation("Button");
+            ((ITextFieldAdapter) this.button).uiUtilsReborn$setSideInformation("Button");
             this.addDrawableChild(this.button);
 
             this.action = new DropboxWidget(startX, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_HEIGHT, 0, Arrays.stream(SlotActionType.values()).map(Enum::name).toList());
         } else {
             this.buttonID = new TextFieldWidget(textRenderer, startX, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, Text.empty());
-            ((ITextFieldAdapter) this.buttonID).setSideInformation("Button ID");
+            ((ITextFieldAdapter) this.buttonID).uiUtilsReborn$setSideInformation("Button ID");
             this.addDrawableChild(this.buttonID);
 
             this.action = null;

src/main/java/de/florianmichael/uiutilsreborn/mixin/MixinTextFieldWidget.java

@@ -23,7 +23,6 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -37,21 +36,23 @@
 public abstract class MixinTextFieldWidget extends ClickableWidget implements ITextFieldAdapter {
 
     @Shadow @Final private TextRenderer textRenderer;
+
     @Unique
-    private Text sideInformation;
+    private Text uiUtilsReborn$sideInformation;
 
     public MixinTextFieldWidget(int x, int y, int width, int height, Text message) {
         super(x, y, width, height, message);
     }
 
-    @Inject(method = "renderButton", at = @At("RETURN"))
+    @Inject(method = "renderWidget", at = @At("RETURN"))
     public void hookCustomSideInformation(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (this.sideInformation != null)
-            context.drawTextWithShadow(textRenderer, this.sideInformation, this.getX() - textRenderer.getWidth(this.sideInformation.getString()) - 10, this.getY() + this.getHeight() / 4, -1);
+        if (this.uiUtilsReborn$sideInformation != null) {
+            context.drawTextWithShadow(textRenderer, this.uiUtilsReborn$sideInformation, this.getX() - textRenderer.getWidth(this.uiUtilsReborn$sideInformation.getString()) - 10, this.getY() + this.getHeight() / 4, -1);
+        }
     }
 
     @Override
-    public void setSideInformation(String information) {
-        this.sideInformation = Text.literal(information);
+    public void uiUtilsReborn$setSideInformation(String information) {
+        this.uiUtilsReborn$sideInformation = Text.literal(information);
     }
 }

src/main/java/de/florianmichael/uiutilsreborn/util/ITextFieldAdapter.java

@@ -20,6 +20,6 @@
 
 public interface ITextFieldAdapter {
 
-    void setSideInformation(final String information);
+    void uiUtilsReborn$setSideInformation(final String information);
 
 }

src/main/resources/fabric.mod.json

@@ -26,8 +26,9 @@
     "ui-utils-reborn.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.22",
-    "minecraft": "~1.20.2",
+    "fabricloader": ">=0.15",
+    "fabric-api": ">=0.91.3",
+    "minecraft": "~1.20.4",
     "java": ">=17"
   }
 }