Merge remote-tracking branch 'upstream/1.18' into XTer-2-118

XTerPL · XTerPL · commit dcf0a26806b7 · 2022-09-18T15:55:44.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.11-SNAPSHOT'
+    id 'fabric-loom' version '0.12-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:8.0.75"
-    modImplementation "me.shedaniel.cloth:cloth-config-fabric:8.0.75"
+    include "me.shedaniel.cloth:cloth-config-fabric:6.2.57"
+    modImplementation "me.shedaniel.cloth:cloth-config-fabric:6.2.57"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.1
-loader_version=0.14.8
+minecraft_version=1.18.2
+yarn_mappings=1.18.2+build.2
+loader_version=0.13.3
 # 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.58.6+1.19.2
+fabric_version=0.48.0+1.18.2
diff --git a/src/main/java/io/github/techstreet/dfscript/commands/Command.java b/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.v2.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v1.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);
     }
-}
+}
diff --git a/src/main/java/io/github/techstreet/dfscript/commands/CommandManager.java b/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.v2.ClientCommandRegistrationCallback;
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
 
 public class CommandManager implements Loadable {
 
@@ -25,7 +25,7 @@ public CommandManager getInstance() {
     public void load() {
         commands.add(new ScriptsCommand());
 
-        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> attachTo(dispatcher));
+        attachTo(ClientCommandManager.DISPATCHER);
     }
 
     private void attachTo(CommandDispatcher<FabricClientCommandSource> cd) {
diff --git a/src/main/java/io/github/techstreet/dfscript/commands/misc/ScriptsCommand.java b/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.v2.FabricClientCommandSource;
+import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
 
 public class ScriptsCommand implements Command {
 
diff --git a/src/main/java/io/github/techstreet/dfscript/features/UpdateAlerts.java b/src/main/java/io/github/techstreet/dfscript/features/UpdateAlerts.java
@@ -9,6 +9,7 @@
 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
@@ -19,11 +20,11 @@ public void load() {
             int versionsBehind = latestVersion - currentVersion;
 
             if (versionsBehind >= 1) {
-                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))
+                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)))
                                 .styled(style -> style.withColor(Formatting.YELLOW)))
-                        .append(Text.literal("Click here to download the latest version!")
+                        .append(((LiteralText) Text.of("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);
diff --git a/src/main/java/io/github/techstreet/dfscript/mixin/game/MClientPlayNetworkHandler.java b/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.content());
+        ReceiveChatEvent event = new ReceiveChatEvent(packet.getMessage());
         EventManager.getInstance().dispatch(event);
         if (event.isCancelled()) {
             ci.cancel();
         }
 
-        String packetString = packet.content().getString();
+        String packetString = packet.getMessage().getString();
 
         if (packetString.equals("» You are now in dev mode.")) {
             DevModeEvent modeEvent = new DevModeEvent();
diff --git a/src/main/java/io/github/techstreet/dfscript/mixin/player/MLocalPlayer.java b/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, Text preview, CallbackInfo ci) {
+    private void chat(String message, CallbackInfo ci) {
         SendChatEvent event = new SendChatEvent(message);
         EventManager.getInstance().dispatch(event);
         if (event.isCancelled()) {
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/CScreen.java b/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.literal("DFScript Screen"));
+        super(Text.of("DFScript Screen"));
         this.width = width;
         this.height = height;
         DFScript.MC.keyboard.setRepeatEvents(true);
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptActionCategoryScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptActionCategoryScreen.java
@@ -7,6 +7,7 @@
 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;
 
@@ -25,7 +26,7 @@ public ScriptActionCategoryScreen(Script script, int insertIndex) {
         this.script = script;
 
         ItemStack eventsItem = new ItemStack(Items.DIAMOND);
-        eventsItem.setCustomName(Text.literal("Events").fillStyle(Style.EMPTY.withItalic(false)));
+        eventsItem.setCustomName(((LiteralText) Text.of("Events")).fillStyle(Style.EMPTY.withItalic(false)));
 
         int x = 3;
         int y = 3;
@@ -55,4 +56,4 @@ public ScriptActionCategoryScreen(Script script, int insertIndex) {
     public void close() {
         DFScript.MC.setScreen(new ScriptEditScreen(script));
     }
-}
+}
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddArgumentScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddArgumentScreen.java
@@ -13,6 +13,7 @@
 import net.minecraft.item.Items;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
+import net.minecraft.text.LiteralText;
 
 public class ScriptAddArgumentScreen extends CScreen {
 
@@ -27,20 +28,20 @@ public ScriptAddArgumentScreen(Script script, ScriptAction action, int index) {
         CTextField input = new CTextField("Input", 2, 2, 96, 35, true);
 
         ItemStack textIcon = new ItemStack(Items.BOOK);
-        textIcon.setCustomName(Text.literal("Text")
-            .fillStyle(Style.EMPTY.withItalic(false)));
+        textIcon.setCustomName(((LiteralText) Text.of("Text"))
+                .fillStyle(Style.EMPTY.withItalic(false)));
 
         ItemStack numberIcon = new ItemStack(Items.SLIME_BALL);
-        numberIcon.setCustomName(Text.literal("Number")
-            .fillStyle(Style.EMPTY.withItalic(false)));
+        numberIcon.setCustomName(((LiteralText) Text.of("Number"))
+                .fillStyle(Style.EMPTY.withItalic(false)));
 
         ItemStack variableIcon = new ItemStack(Items.MAGMA_CREAM);
-        variableIcon.setCustomName(Text.literal("Variable")
-            .fillStyle(Style.EMPTY.withItalic(false)));
+        variableIcon.setCustomName(((LiteralText) Text.of("Variable"))
+                .fillStyle(Style.EMPTY.withItalic(false)));
 
         ItemStack clientValueIcon = new ItemStack(Items.NAME_TAG);
-        clientValueIcon.setCustomName(Text.literal("Client Value")
-            .fillStyle(Style.EMPTY.withItalic(false)));
+        clientValueIcon.setCustomName(((LiteralText) Text.of("Client Value"))
+                .fillStyle(Style.EMPTY.withItalic(false)));
 
         ItemStack configValueIcon = new ItemStack(Items.INK_SAC);
         configValueIcon.setCustomName(Text.literal("Config Value")
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptAddScreen.java
@@ -21,7 +21,6 @@
 import java.nio.charset.Charset;
 import java.util.*;
 
-import net.minecraft.text.LiteralTextContent;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 
@@ -149,7 +148,7 @@ private void fillPanel(List<VirtualScript> scriptList) {
         long minutes = (time % 3600) / 60;
         long seconds = time % 60;
 
-        panel.add(new CText(8, 0, Text.literal("Last update: " + minutes + "m " + seconds + "s" + " ago!")));
+        panel.add(new CText(8, 0, Text.of("Last update: " + minutes + "m " + seconds + "s" + " ago!")));
     }
 
     @Override
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditActionScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditActionScreen.java
@@ -59,7 +59,7 @@ public ScriptEditActionScreen(ScriptAction action, Script script) {
             }
 
             widgets.add(new CItem(5, y, icon));
-            widgets.add(new CText(15, y + 2, Text.literal(text)));
+            widgets.add(new CText(15, y + 2, Text.of(text)));
 
             int currentIndex = index;
 
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptEditScreen.java
@@ -58,7 +58,7 @@ public ScriptEditScreen(Script script) {
         for (ScriptPart part : script.getParts()) {
             if (part instanceof ScriptEvent se) {
                 panel.add(new CItem(5, y, se.getType().getIcon()));
-                panel.add(new CText(15, y + 2, Text.literal(se.getType().getName())));
+                panel.add(new CText(15, y + 2, Text.of(se.getType().getName())));
                 indent = 5;
 
                 int currentIndex = index;
@@ -111,7 +111,7 @@ public boolean mouseClicked(double x, double y, int button) {
                 }
 
                 panel.add(new CItem(5 + indent, y, sa.getType().getIcon()));
-                panel.add(new CText(15 + indent, y + 2, Text.literal(sa.getType().getName())));
+                panel.add(new CText(15 + indent, y + 2, Text.of(sa.getType().getName())));
 
                 for (int i = 0; i < indent; i += 5) {
                     int xpos = 8 + i;
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptInstallScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptInstallScreen.java
@@ -24,10 +24,10 @@ public class ScriptInstallScreen extends CScreen {
     protected ScriptInstallScreen(VirtualScript script) {
         super(125, 52);
 
-        CText name = new CText(5, 5, Text.literal("Name: " + script.getName()));
-        CText owner = new CText(5, 12, Text.literal("Creator: " + script.getOwner()));
-        CText id = new CText(5, 19, Text.literal("ID: " + script.getId()));
-        CText approved = new CText(5, 26, Text.literal("Approved: " + (script.isApproved() ? "§a✓ by " + script.getApprover() : "§c❌")));
+        CText name = new CText(5, 5, Text.of("Name: " + script.getName()));
+        CText owner = new CText(5, 12, Text.of("Creator: " + script.getOwner()));
+        CText id = new CText(5, 19, Text.of("ID: " + script.getId()));
+        CText approved = new CText(5, 26, Text.of("Approved: " + (script.isApproved() ? "§a✓ by " + script.getApprover() : "§c❌")));
 
         widgets.add(name);
         widgets.add(owner);
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptListScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptListScreen.java
@@ -43,11 +43,11 @@ public ScriptListScreen(boolean allowEditAndUpload) {
 
         int y = 0;
         for (Script s : ScriptManager.getInstance().getScripts()) {
-            MutableText text = Text.literal(s.getName());
+            MutableText text = (MutableText) Text.of(s.getName());
             VirtualScript script = ScriptAddScreen.scriptHash.get(s.getServer());
 
             if (script != null) {
-                text = Text.literal((script.isApproved() ? "⭐ " : "") + s.getName());
+                text = (MutableText) Text.of((script.isApproved() ? "⭐ " : "") + s.getName());
 
                 if (script.isApproved()) {
                     text = text.formatted(Formatting.YELLOW);
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptMessageScreen.java b/src/main/java/io/github/techstreet/dfscript/screen/script/ScriptMessageScreen.java
@@ -29,7 +29,7 @@ public ScriptMessageScreen(Screen parent, String message) {
                 int width = DFScript.MC.textRenderer.getWidth(words.toString());
                 int x = (106 - width);
 
-                CText text = new CText(10, y, Text.literal(words.toString()));
+                CText text = new CText(10, y, Text.of(words.toString()));
                 System.out.println(x + ":" + y + " == " + words);
                 widgets.add(text);
 
diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CButton.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CButton.java
@@ -26,7 +26,7 @@ public CButton(int x, int y, int width, int height, float textScale, String text
         this.width = width;
         this.height = height;
         this.textScale = textScale;
-        this.text = Text.literal(text);
+        this.text = Text.of(text);
         this.onClick = onClick;
         this.disabled = false;
     }
@@ -84,7 +84,7 @@ public void setOnClick(Runnable onClick) {
     }
 
     public void setText(String text) {
-        this.text = Text.literal(text);
+        this.text = Text.of(text);
     }
 
     public void setText(Text text) {
diff --git a/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionArgument.java b/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionArgument.java
@@ -4,6 +4,7 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import net.minecraft.text.LiteralText;
 
 public class ScriptActionArgument {
 
@@ -46,13 +47,16 @@ public ScriptActionArgumentType type() {
     public Text text() {
         MutableText t = type.text();
         if (plural) {
-            t.append(Text.literal("(s)").fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.WHITE)));
+            t.append(((LiteralText) Text.of("(s)")).fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.WHITE)));
         }
+
         if (optional) {
-            t.append(Text.literal("*").fillStyle(Style.EMPTY.withItalic(true)));
+            t.append(((LiteralText) Text.of("*")).fillStyle(Style.EMPTY.withItalic(true)));
         }
-        return t.append(Text.literal(" - ").fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.GRAY)))
-            .append(Text.literal(name).fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.WHITE)));
+
+        return t.append(((LiteralText) Text.of(" - ")).fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.GRAY)))
+            .append(((LiteralText) Text.of(name)).fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.WHITE)));
+
     }
 
     public enum ScriptActionArgumentType {
@@ -64,7 +68,7 @@ public enum ScriptActionArgumentType {
         ANY;
 
         public MutableText text() {
-            MutableText val = Text.literal(switch (this) {
+            MutableText val = (MutableText) Text.of(switch (this) {
                 case VARIABLE -> "Variable";
                 case NUMBER -> "Number";
                 case TEXT -> "Text";
diff --git a/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionCategory.java b/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionCategory.java
@@ -5,6 +5,7 @@
 import net.minecraft.item.Items;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
+import net.minecraft.text.LiteralText;
 
 public enum ScriptActionCategory {
 
@@ -24,7 +25,7 @@ public enum ScriptActionCategory {
 
     ScriptActionCategory(String name, Item icon) {
         this.icon = new ItemStack(icon);
-        this.icon.setCustomName(Text.literal(name).fillStyle(Style.EMPTY.withItalic(false)));
+        this.icon.setCustomName(((LiteralText) Text.of(name)).fillStyle(Style.EMPTY.withItalic(false)));
     }
 
     public ItemStack getIcon() {
diff --git a/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionType.java b/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionType.java
diff --git a/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptClientValueArgument.java b/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptClientValueArgument.java
diff --git a/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEventType.java b/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEventType.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/ComponentUtil.java b/src/main/java/io/github/techstreet/dfscript/util/ComponentUtil.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/RenderUtil.java b/src/main/java/io/github/techstreet/dfscript/util/RenderUtil.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/StringUtil.java b/src/main/java/io/github/techstreet/dfscript/util/StringUtil.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/chat/ChatUtil.java b/src/main/java/io/github/techstreet/dfscript/util/chat/ChatUtil.java
diff --git a/src/main/java/io/github/techstreet/dfscript/util/render/BlendableTexturedButtonWidget.java b/src/main/java/io/github/techstreet/dfscript/util/render/BlendableTexturedButtonWidget.java
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,13 @@ private void onGameMessage(GameMessageS2CPacket packet, CallbackInfo ci) {`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`	`36`
`37`		`- ReceiveChatEvent event = new ReceiveChatEvent(packet.content());`
	`37`	`+ ReceiveChatEvent event = new ReceiveChatEvent(packet.getMessage());`
`38`	`38`	`EventManager.getInstance().dispatch(event);`
`39`	`39`	`if (event.isCancelled()) {`
`40`	`40`	`ci.cancel();`
`41`	`41`	`}`
`42`	`42`
`43`		`- String packetString = packet.content().getString();`
	`43`	`+ String packetString = packet.getMessage().getString();`
`44`	`44`
`45`	`45`	`if (packetString.equals("» You are now in dev mode.")) {`
`46`	`46`	`DevModeEvent modeEvent = new DevModeEvent();`