Update to 1.19.3

Author: Earthcomputer

build.gradle

@@ -29,15 +29,9 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modImplementation('net.earthcomputer.multiconnect:multiconnect-api:1.5.10') {
-		transitive = false
-	}
-	include('net.earthcomputer.multiconnect:multiconnect-api:1.5.10') {
-		transitive = false
-	}
 
-	modImplementation 'dev.xpple:clientarguments:1.4.1'
-	include 'dev.xpple:clientarguments:1.4.1'
+	modImplementation 'dev.xpple:clientarguments:1.4.2'
+	include 'dev.xpple:clientarguments:1.4.2'
 
 	modRuntimeOnly 'me.djtheredstoner:DevAuth-fabric:1.1.0'
 }

gradle.properties

@@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.19.2
-	minecraft_version_dependency=1.19.2
-	yarn_mappings=1.19.2+build.28
-	loader_version=0.14.10
+	minecraft_version=1.19.3
+	minecraft_version_dependency=1.19.3
+	yarn_mappings=1.19.3+build.1
+	loader_version=0.14.11
 
 # Mod Properties
 	mod_version = 2.7.5
@@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx2G
 
 # Dependencies
 	# also check this on https://modmuss50.me/fabric.html
-	fabric_version=0.64.0+1.19.2
+	fabric_version=0.68.1+1.19.3

src/main/java/net/cortex/clientAddon/cracker/SeedCracker.java

@@ -105,7 +105,7 @@ private static void doCrack(OnCrack Callback){
     }
 
     public static void onEntityCreation(EntitySpawnS2CPacket packet) {
-        if (packet.getEntityTypeId() == EntityType.ITEM && SeedCracker.expectedItems>0) {
+        if (packet.getEntityType() == EntityType.ITEM && SeedCracker.expectedItems>0) {
 
             long rand_val = (long) ((Math.atan2(packet.getVelocityZ(), packet.getVelocityX()) + Math.PI) / (Math.PI * 2) * ((float) (1 << 24)));
             long top_bits = rand_val;

src/main/java/net/earthcomputer/clientcommands/MulticonnectCompat.java

@@ -0,0 +1,80 @@
+package net.earthcomputer.clientcommands;
+
+import net.minecraft.SharedConstants;
+import net.minecraft.registry.Registry;
+import net.minecraft.util.Util;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Method;
+
+public final class MulticonnectCompat {
+    public static final int V1_13_2 = 404;
+    public static final int V1_14 = 477;
+    public static final int V1_14_2 = 485;
+    public static final int V1_15 = 573;
+    public static final int V1_15_2 = 578;
+    public static final int V1_17 = 755;
+    public static final int V1_18 = 757;
+
+    private MulticonnectCompat() {
+    }
+
+    @Nullable
+    private static final Object api = Util.make(() -> {
+        Class<?> clazz;
+        try {
+            clazz = Class.forName("net.earthcomputer.multiconnect.api.MultiConnectAPI");
+        } catch (ClassNotFoundException e) {
+            return null;
+        }
+        try {
+            return clazz.getMethod("getInstance").invoke(null);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    });
+    private static final Method getProtocolVersion = Util.make(() -> {
+        if (api == null) {
+            return null;
+        }
+        try {
+            return api.getClass().getMethod("getProtocolVersion");
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    });
+    private static final Method doesServerKnow = Util.make(() -> {
+        if (api == null) {
+            return null;
+        }
+        try {
+            return api.getClass().getMethod("doesServerKnow", Registry.class, Object.class);
+        } catch (ReflectiveOperationException e) {
+            throw new RuntimeException(e);
+        }
+    });
+
+    public static int getProtocolVersion() {
+        if (api == null) {
+            return SharedConstants.getProtocolVersion();
+        } else {
+            try {
+                return (Integer) getProtocolVersion.invoke(api);
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public static <T> boolean doesServerKnow(Registry<T> registry, T value) {
+        if (api == null) {
+            return true;
+        } else {
+            try {
+                return (Boolean) doesServerKnow.invoke(api, registry, value);
+            } catch (ReflectiveOperationException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}

src/main/java/net/earthcomputer/clientcommands/c2c/CCNetworkHandler.java

@@ -7,6 +7,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.network.encryption.PlayerPublicKey;
+import net.minecraft.network.encryption.PublicPlayerSession;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -37,7 +38,11 @@ public void sendPacket(C2CPacket packet, PlayerListEntry recipient) throws Comma
             LOGGER.warn("Could not send the packet because the id was not recognised");
             return;
         }
-        PlayerPublicKey ppk = recipient.getPublicKeyData();
+        PublicPlayerSession session = recipient.getSession();
+        if (session == null) {
+            throw PUBLIC_KEY_NOT_FOUND_EXCEPTION.create();
+        }
+        PlayerPublicKey ppk = session.publicKeyData();
         if (ppk == null) {
             throw PUBLIC_KEY_NOT_FOUND_EXCEPTION.create();
         }
@@ -58,7 +63,7 @@ public void sendPacket(C2CPacket packet, PlayerListEntry recipient) throws Comma
         if (commandString.length() >= 256) {
             throw MESSAGE_TOO_LONG_EXCEPTION.create();
         }
-        MinecraftClient.getInstance().player.sendCommand(commandString, null);
+        MinecraftClient.getInstance().getNetworkHandler().sendChatCommand(commandString);
         OutgoingPacketFilter.addPacket(packetString);
     }
 

src/main/java/net/earthcomputer/clientcommands/command/AliasCommand.java

@@ -15,6 +15,7 @@
 import net.fabricmc.fabric.impl.command.client.ClientCommandInternals;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import org.slf4j.Logger;
@@ -95,11 +96,15 @@ private static int executeAliasCommand(FabricClientCommandSource source, String
         } else if (arguments != null){
             cmd += " " + arguments;
         }
+        ClientPlayNetworkHandler networkHandler = MinecraftClient.getInstance().getNetworkHandler();
+        if (networkHandler == null) {
+            return Command.SINGLE_SUCCESS;
+        }
         if (cmd.startsWith("/")) {
             cmd = cmd.substring(1);
-            source.getPlayer().sendCommand(cmd);
+            networkHandler.sendChatCommand(cmd);
         } else {
-            source.getPlayer().sendChatMessage(cmd, null);
+            networkHandler.sendChatMessage(cmd);
         }
 
         return Command.SINGLE_SUCCESS;

src/main/java/net/earthcomputer/clientcommands/command/BookCommand.java

@@ -4,8 +4,7 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import net.earthcomputer.multiconnect.api.MultiConnectAPI;
-import net.earthcomputer.multiconnect.api.Protocols;
+import net.earthcomputer.clientcommands.MulticonnectCompat;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -36,7 +35,7 @@ public class BookCommand {
     private static final int DEFAULT_LIMIT = 50;
 
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
-        if (MultiConnectAPI.instance().getProtocolVersion() >= Protocols.V1_15) {
+        if (MulticonnectCompat.getProtocolVersion() >= MulticonnectCompat.V1_15) {
             return; // chunk savestate fixed in 1.15
         }
 

src/main/java/net/earthcomputer/clientcommands/command/CParticleCommand.java

@@ -7,10 +7,10 @@
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.random.Random;
-import net.minecraft.util.registry.Registry;
 
 import static com.mojang.brigadier.arguments.FloatArgumentType.*;
 import static com.mojang.brigadier.arguments.IntegerArgumentType.*;
@@ -60,7 +60,7 @@ private static int spawnParticle(FabricClientCommandSource source, ParticleEffec
                     }
                 }
                 source.sendFeedback(Text.translatable("commands.cparticle.success",
-                        Registry.PARTICLE_TYPE.getId(parameters.getType()).toString()));
+                        Registries.PARTICLE_TYPE.getId(parameters.getType()).toString()));
                 return Command.SINGLE_SUCCESS;
         }
     }

src/main/java/net/earthcomputer/clientcommands/command/FakeCommandSource.java

@@ -2,8 +2,8 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
+import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.util.registry.DynamicRegistryManager;
 
 import java.util.Collection;
 import java.util.stream.Collectors;

src/main/java/net/earthcomputer/clientcommands/command/FindItemCommand.java

@@ -217,7 +217,7 @@ public boolean canUse(PlayerEntity var1) {
                         }
 
                         @Override
-                        public ItemStack transferSlot(PlayerEntity player, int index) {
+                        public ItemStack quickMove(PlayerEntity player, int index) {
                             return ItemStack.EMPTY;
                         }