Merge pull request #22 from XTerPL/XTer-2

Fix my mistake of pulling a 1.18 version of this branch to 1.19 lmao

Author: TechStreetDev

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.12-SNAPSHOT'
+    id 'fabric-loom' version '0.11-SNAPSHOT'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
@@ -47,8 +47,8 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Cloth Config API
-    include "me.shedaniel.cloth:cloth-config-fabric:6.2.57"
-    modImplementation "me.shedaniel.cloth:cloth-config-fabric:6.2.57"
+    include "me.shedaniel.cloth:cloth-config-fabric:8.0.75"
+    modImplementation "me.shedaniel.cloth:cloth-config-fabric:8.0.75"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.18.2
-yarn_mappings=1.18.2+build.2
-loader_version=0.13.3
+minecraft_version=1.19.2
+yarn_mappings=1.19.2+build.1
+loader_version=0.14.8
 # Mod Properties
 mod_version=1.0-SNAPSHOT
 maven_group=io.github.techstreet.dfscript
 archives_base_name=DFScript
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.48.0+1.18.2
+fabric_version=0.58.6+1.19.2

src/main/java/io/github/techstreet/dfscript/commands/Command.java

@@ -4,7 +4,7 @@
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 
 public interface Command {
 
@@ -20,4 +20,4 @@ default LiteralArgumentBuilder<FabricClientCommandSource> literal(String name) {
     default <T> RequiredArgumentBuilder<FabricClientCommandSource, T> argument(String name, ArgumentType<T> type) {
         return RequiredArgumentBuilder.argument(name, type);
     }
-}
+}

src/main/java/io/github/techstreet/dfscript/commands/CommandManager.java

@@ -5,8 +5,8 @@
 import io.github.techstreet.dfscript.loader.Loadable;
 import java.util.ArrayList;
 import java.util.List;
-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;
 
 public class CommandManager implements Loadable {
 
@@ -25,7 +25,7 @@ public CommandManager getInstance() {
     public void load() {
         commands.add(new ScriptsCommand());
 
-        attachTo(ClientCommandManager.DISPATCHER);
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> attachTo(dispatcher));
     }
 
     private void attachTo(CommandDispatcher<FabricClientCommandSource> cd) {

src/main/java/io/github/techstreet/dfscript/commands/misc/ScriptsCommand.java

@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
-import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 
 public class ScriptsCommand implements Command {
 

src/main/java/io/github/techstreet/dfscript/features/UpdateAlerts.java

@@ -9,7 +9,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import net.minecraft.text.LiteralText;
 
 public class UpdateAlerts implements Loadable {
     @Override
@@ -20,11 +19,11 @@ public void load() {
             int versionsBehind = latestVersion - currentVersion;
 
             if (versionsBehind >= 1) {
-                MutableText message = ((LiteralText) Text.of(""))
-                        .append(((LiteralText) Text.of(String.format("You are currently on build #%s of DFScript, which is %s versions behind the latest (%s). ",
-                                currentVersion, versionsBehind, latestVersion)))
+                MutableText message = Text.literal("")
+                        .append(Text.literal(String.format("You are currently on build #%s of DFScript, which is %s versions behind the latest (%s). ",
+                                currentVersion, versionsBehind, latestVersion))
                                 .styled(style -> style.withColor(Formatting.YELLOW)))
-                        .append(((LiteralText) Text.of("Click here to download the latest version!"))
+                        .append(Text.literal("Click here to download the latest version!")
                                 .styled(style -> {
                                     style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/TechStreetDev/DFScript/releases/latest"));
                                     style.withColor(Formatting.AQUA);

src/main/java/io/github/techstreet/dfscript/mixin/game/MClientPlayNetworkHandler.java

@@ -34,13 +34,13 @@ private void onGameMessage(GameMessageS2CPacket packet, CallbackInfo ci) {
             return;
         }
 
-        ReceiveChatEvent event = new ReceiveChatEvent(packet.getMessage());
+        ReceiveChatEvent event = new ReceiveChatEvent(packet.content());
         EventManager.getInstance().dispatch(event);
         if (event.isCancelled()) {
             ci.cancel();
         }
 
-        String packetString = packet.getMessage().getString();
+        String packetString = packet.content().getString();
 
         if (packetString.equals("» You are now in dev mode.")) {
             DevModeEvent modeEvent = new DevModeEvent();

src/main/java/io/github/techstreet/dfscript/mixin/player/MLocalPlayer.java

@@ -14,7 +14,7 @@
 public class MLocalPlayer {
 
     @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
-    private void chat(String message, CallbackInfo ci) {
+    private void chat(String message, Text preview, CallbackInfo ci) {
         SendChatEvent event = new SendChatEvent(message);
         EventManager.getInstance().dispatch(event);
         if (event.isCancelled()) {

src/main/java/io/github/techstreet/dfscript/screen/CScreen.java

@@ -17,7 +17,7 @@ public class CScreen extends Screen {
     public final List<CWidget> widgets = new ArrayList<>();
 
     protected CScreen(int width, int height) {
-        super(Text.of("DFScript Screen"));
+        super(Text.literal("DFScript Screen"));
         this.width = width;
         this.height = height;
         DFScript.MC.keyboard.setRepeatEvents(true);

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptActionCategoryScreen.java

@@ -7,7 +7,6 @@
 import io.github.techstreet.dfscript.script.action.ScriptActionCategory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 
@@ -26,7 +25,7 @@ public ScriptActionCategoryScreen(Script script, int insertIndex) {
         this.script = script;
 
         ItemStack eventsItem = new ItemStack(Items.DIAMOND);
-        eventsItem.setCustomName(((LiteralText) Text.of("Events")).fillStyle(Style.EMPTY.withItalic(false)));
+        eventsItem.setCustomName(Text.literal("Events").fillStyle(Style.EMPTY.withItalic(false)));
 
         int x = 3;
         int y = 3;
@@ -56,4 +55,4 @@ public ScriptActionCategoryScreen(Script script, int insertIndex) {
     public void close() {
         DFScript.MC.setScreen(new ScriptEditScreen(script));
     }
-}
+}