Initial 1.19 update

Author: Earthcomputer

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "clientcommands-scripting"]
-	path = clientcommands-scripting
-	url = ../clientcommands-scripting

build.gradle

@@ -1,5 +1,6 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
+	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'io.github.juuxel.loom-quiltflower' version '1.7.1'
 	id 'maven-publish'
 }
 
@@ -20,15 +21,6 @@ loom {
 	accessWidenerPath = file('src/main/resources/clientcommands.aw')
 }
 
-def clientcommandsScriptingExists = findProject(':clientcommands-scripting') != null
-subprojects {
-	afterEvaluate {
-		dependencies {
-			implementation project(':')
-		}
-	}
-}
-
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
@@ -41,22 +33,19 @@ dependencies {
 		transitive = false
 	}
 
-	modImplementation 'dev.xpple:clientarguments:1.3.1'
-	include 'dev.xpple:clientarguments:1.3.1'
-
-	if (clientcommandsScriptingExists) {
-		include project(':clientcommands-scripting')
-	}
+	modImplementation 'dev.xpple:clientarguments:1.4.1'
+	include 'dev.xpple:clientarguments:1.4.1'
 }
 
 processResources {
 	inputs.property "version", project.version
+	inputs.property "mcversion", project.minecraft_version_semver
 
 	duplicatesStrategy DuplicatesStrategy.WARN
 
 	from(sourceSets.main.resources.srcDirs) {
 		include "fabric.mod.json"
-		expand "version": project.version
+		expand "version": project.version, "mcversion": project.minecraft_version_semver
 	}
 
 	from(sourceSets.main.resources.srcDirs) {
@@ -69,7 +58,7 @@ tasks.withType(JavaCompile) {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
+	archiveClassifier.set("sources")
 	from sourceSets.main.allSource
 }
 

clientcommands-scripting

@@ -3,9 +3,10 @@ org.gradle.jvmargs=-Xmx6G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.18.2
-	yarn_mappings=1.18.2+build.1
-	loader_version=0.13.3
+	minecraft_version=1.19-rc2
+	minecraft_version_semver=1.19-rc.2
+	yarn_mappings=1.19-rc2+build.1
+	loader_version=0.14.6
 
 # Mod Properties
 	mod_version = 2.6.6
@@ -14,4 +15,4 @@ org.gradle.jvmargs=-Xmx6G
 
 # Dependencies
 	# also check this on https://modmuss50.me/fabric.html
-	fabric_version=0.47.8+1.18.2
+	fabric_version=0.55.1+1.19

gradle.properties

@@ -1,21 +1,20 @@
 package net.cortex.clientAddon.cracker;
 
-import net.earthcomputer.clientcommands.Rand;
 import net.earthcomputer.clientcommands.TempRules;
 import net.earthcomputer.clientcommands.command.ClientCommandHelper;
 import net.earthcomputer.clientcommands.features.EnchantmentCracker;
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
+import net.earthcomputer.clientcommands.mixin.CheckedRandomAccessor;
 import net.earthcomputer.clientcommands.task.LongTask;
 import net.earthcomputer.clientcommands.task.TaskManager;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.EntityType;
-import net.minecraft.network.MessageType;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
 import net.minecraft.text.*;
 import net.minecraft.util.Formatting;
-import net.minecraft.util.Util;
+import net.minecraft.util.math.random.Random;
 
 public class SeedCracker {
     public interface OnCrack {void callback(long seed); }
@@ -37,7 +36,7 @@ private static boolean throwItems()
         for (int i = 0; i < 20; i++) {
             boolean success = PlayerRandCracker.throwItem();
             if (!success) {
-                MinecraftClient.getInstance().inGameHud.addChatMessage(MessageType.GAME_INFO, new TranslatableText("itemCrack.notEnoughItems").formatted(Formatting.RED), Util.NIL_UUID);
+                MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.translatable("itemCrack.notEnoughItems").formatted(Formatting.RED));
                 EnchantmentCracker.LOGGER.info("Unable to use rng SeedCracker |not enough items|");
                 return false;
             }
@@ -52,8 +51,8 @@ public static void attemptCrack()
         {
             attemptCount++;
             if (attemptCount > MAX_ATTEMPTS) {
-                ClientCommandHelper.sendError(new TranslatableText("commands.ccrackrng.failed"));
-                ClientCommandHelper.sendFeedback(new TranslatableText("commands.ccrackrng.failed.help").styled(style -> style.withColor(Formatting.AQUA)));
+                ClientCommandHelper.sendError(Text.translatable("commands.ccrackrng.failed"));
+                ClientCommandHelper.sendFeedback(Text.translatable("commands.ccrackrng.failed.help").styled(style -> style.withColor(Formatting.AQUA)));
             } else {
                 SeedCracker.doCrack(SeedCracker.callback);
             }
@@ -63,7 +62,7 @@ public static void attemptCrack()
 
         TempRules.playerCrackState = PlayerRandCracker.CrackState.CRACKED;
 
-        Rand rand=new Rand(seed);
+        Random rand=Random.create(seed ^ 0x5deece66dL);
         rand.nextFloat();
         rand.nextFloat();
         //rand.nextFloat();
@@ -77,7 +76,7 @@ public static void attemptCrack()
 			System.out.print(padLeftZeros(Long.toBinaryString((((long) (rand.nextFloat() * ((float) (1 << 24)))) >> (24 - 4))&0xFL), 4)+" \n");
 		}*/
 
-        callback.callback(rand.getSeed());//extract seed and call callback
+        callback.callback(((CheckedRandomAccessor) rand).getSeed().get());//extract seed and call callback
     }
 
     public static void crack(OnCrack callback) {
@@ -87,15 +86,15 @@ public static void crack(OnCrack callback) {
 
     private static void doCrack(OnCrack Callback){
         callback=Callback;
-        ClientCommandHelper.addOverlayMessage(new TranslatableText("commands.ccrackrng.retries", attemptCount, MAX_ATTEMPTS), 100);
+        ClientCommandHelper.addOverlayMessage(Text.translatable("commands.ccrackrng.retries", attemptCount, MAX_ATTEMPTS), 100);
         if(throwItems())
         {
             TempRules.playerCrackState = PlayerRandCracker.CrackState.CRACKING;
             expectedItems=20;
             if (currentTask == null) {
                 currentTask = new SeedCrackTask();
                 String taskName = TaskManager.addTask("ccrackrng", currentTask);
-                Text message = new TranslatableText("commands.ccrackrng.starting")
+                Text message = Text.translatable("commands.ccrackrng.starting")
                         .append(" ")
                         .append(ClientCommandHelper.getCommandTextComponent("commands.client.cancel", "/ctask stop " + taskName));
                 MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(message);

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

@@ -4,9 +4,10 @@
 import com.mojang.logging.LogUtils;
 import net.earthcomputer.clientcommands.command.*;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.command.CommandRegistryAccess;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -19,7 +20,7 @@ public class ClientCommands implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        registerCommands(ClientCommandManager.DISPATCHER);
+        ClientCommandRegistrationCallback.EVENT.register(ClientCommands::registerCommands);
 
         configDir = FabricLoader.getInstance().getConfigDir().resolve("clientcommands");
         try {
@@ -29,14 +30,14 @@ public void onInitializeClient() {
         }
     }
 
-    public static void registerCommands(CommandDispatcher<FabricClientCommandSource> dispatcher) {
+    public static void registerCommands(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
         BookCommand.register(dispatcher);
         LookCommand.register(dispatcher);
         NoteCommand.register(dispatcher);
         ShrugCommand.register(dispatcher);
         FindCommand.register(dispatcher);
-        FindBlockCommand.register(dispatcher);
-        FindItemCommand.register(dispatcher);
+        FindBlockCommand.register(dispatcher, registryAccess);
+        FindItemCommand.register(dispatcher, registryAccess);
         TaskCommand.register(dispatcher);
         CalcCommand.register(dispatcher);
         TempRuleCommand.register(dispatcher);
@@ -46,27 +47,27 @@ public static void registerCommands(CommandDispatcher<FabricClientCommandSource>
         CEnchantCommand.register(dispatcher);
         GlowCommand.register(dispatcher);
         GetDataCommand.register(dispatcher);
-        CalcStackCommand.register(dispatcher);
+        CalcStackCommand.register(dispatcher, registryAccess);
         GammaCommand.register(dispatcher);
         MoteCommand.register(dispatcher);
         ChorusCommand.register(dispatcher);
-        FishCommand.register(dispatcher);
+        FishCommand.register(dispatcher, registryAccess);
         SignSearchCommand.register(dispatcher);
-        GhostBlockCommand.register(dispatcher);
+        GhostBlockCommand.register(dispatcher, registryAccess);
         RelogCommand.register(dispatcher);
-        CGiveCommand.register(dispatcher);
+        CGiveCommand.register(dispatcher, registryAccess);
         CPlaySoundCommand.register(dispatcher);
         CStopSoundCommand.register(dispatcher);
         FovCommand.register(dispatcher);
         HotbarCommand.register(dispatcher);
         KitCommand.register(dispatcher);
-        ItemGroupCommand.register(dispatcher);
+        ItemGroupCommand.register(dispatcher, registryAccess);
         CParticleCommand.register(dispatcher);
         PermissionLevelCommand.register(dispatcher);
         CTellRawCommand.register(dispatcher);
         CTimeCommand.register(dispatcher);
         AliasCommand.register(dispatcher);
-        AreaStatsCommand.register(dispatcher);
+        AreaStatsCommand.register(dispatcher, registryAccess);
         CTeleportCommand.register(dispatcher);
         PlayerInfoCommand.register(dispatcher);
         PingCommand.register(dispatcher);

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

@@ -2,7 +2,7 @@
 
 import net.earthcomputer.clientcommands.features.Relogger;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.TranslatableText;
+import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
 public class ServerBrandManager {
@@ -32,7 +32,7 @@ public static void onDisconnect() {
     public static void rngWarning() {
         if (!isVanilla() && !hasWarnedRng && !MinecraftClient.getInstance().isIntegratedServerRunning()) {
             MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(
-                    new TranslatableText("playerManip.serverBrandWarning").formatted(Formatting.YELLOW));
+                    Text.translatable("playerManip.serverBrandWarning").formatted(Formatting.YELLOW));
             hasWarnedRng = true;
         }
     }