Merge pull request #158 from MonkeySaint/main

Update to 1.21.6/7

Author: Coderx-Gamer

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.2
-loader_version=0.16.9
+minecraft_version=1.21.7
+yarn_mappings=1.21.7+build.6
+loader_version=0.16.14
 
 # Fabric API
-fabric_version=0.113.0+1.21.4
+fabric_version=0.128.2+1.21.7
 # Mod Properties
-mod_version = 2.3.0
+mod_version = 2.4.0
 
 #x.y.z
 

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/com/ui_utils/MainClient.java

@@ -1,6 +1,8 @@
 package com.ui_utils;
 
 import com.google.common.collect.ImmutableList;
+import com.google.gson.Gson;
+import com.mojang.serialization.JsonOps;
 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -14,13 +16,14 @@
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
-import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
 import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.screen.sync.ItemStackHash;
 import net.minecraft.text.Text;
+import net.minecraft.text.TextCodecs;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 import org.slf4j.Logger;
@@ -29,7 +32,6 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.Vector;
@@ -258,13 +260,13 @@ public static void createWidgets(MinecraftClient mc, Screen screen) {
                                     actionField.getSelectedItem() != null) {
                         int syncId = Integer.parseInt(syncIdField.getText());
                         int revision = Integer.parseInt(revisionField.getText());
-                        int slot = Integer.parseInt(slotField.getText());
-                        int button0 = Integer.parseInt(buttonField.getText());
+                        short slot = Short.parseShort(slotField.getText());
+                        byte button0 = Byte.parseByte(buttonField.getText());
                         SlotActionType action = MainClient.stringToSlotActionType(actionField.getSelectedItem().toString());
                         int timesToSend = Integer.parseInt(timesToSendField.getText());
 
                         if (action != null) {
-                            ClickSlotC2SPacket packet = new ClickSlotC2SPacket(syncId, revision, slot, button0, action, ItemStack.EMPTY, new Int2ObjectArrayMap<>());
+                            ClickSlotC2SPacket packet = new ClickSlotC2SPacket(syncId, revision, slot, button0, action, new Int2ObjectArrayMap<>(), ItemStackHash.EMPTY);
                             try {
                                 Runnable toRun = getFabricatePacketRunnable(mc, delayBox.isSelected(), packet);
                                 for (int i = 0; i < timesToSend; i++) {
@@ -448,7 +450,8 @@ public static void createWidgets(MinecraftClient mc, Screen screen) {
                     throw new IllegalStateException("The current minecraft screen (mc.currentScreen) is null");
                 }
                 // fixes #137
-                mc.keyboard.setClipboard(Text.Serialization.toJsonString(mc.currentScreen.getTitle(), Objects.requireNonNull(MinecraftClient.getInstance().getServer()).getRegistryManager()));
+                // From fabric wiki https://docs.fabricmc.net/develop/text-and-translations#serializing-text
+                mc.keyboard.setClipboard(new Gson().toJson(TextCodecs.CODEC.encodeStart(JsonOps.INSTANCE, mc.currentScreen.getTitle()).getOrThrow()));
             } catch (IllegalStateException e) {
                 LOGGER.error("Error while copying title JSON to clipboard", e);
             }

src/main/java/com/ui_utils/mixin/ClientConnectionMixin.java

@@ -1,7 +1,7 @@
 package com.ui_utils.mixin;
 
+import io.netty.channel.ChannelFutureListener;
 import net.minecraft.network.ClientConnection;
-import net.minecraft.network.PacketCallbacks;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
 import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
@@ -17,7 +17,7 @@ public class ClientConnectionMixin {
 
     // called when sending any packet
     @Inject(at = @At("HEAD"), method = "sendImmediately", cancellable = true)
-    public void sendImmediately(Packet<?> packet, PacketCallbacks callbacks, boolean flush, CallbackInfo ci) {
+    public void sendImmediately(Packet<?> packet, ChannelFutureListener channelFutureListener, boolean flush, CallbackInfo ci) {
         // checks for if packets should be sent and if the packet is a gui related packet
         if (!SharedVariables.sendUIPackets && (packet instanceof ClickSlotC2SPacket || packet instanceof ButtonClickC2SPacket)) {
             ci.cancel();

src/main/resources/fabric.mod.json

@@ -33,7 +33,7 @@
   "depends": {
     "fabricloader": ">=0.16.9",
     "fabric": "*",
-    "minecraft": "~1.21.4",
+    "minecraft": ["~1.21.6"],
     "java": ">=17"
   },