Merge pull request #53 from XTerPL/1.20.4

update to 1.20.4

Author: TechStreetDev

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
 }

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.15.3
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.7
 # 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.91.2+1.20.2
+fabric_version=0.96.1+1.20.4

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -21,8 +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;
 
 public class ScriptAddScreen extends CScreen {

gradlew

@@ -46,7 +46,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float tickDelta)
         RenderUtil.renderGuiItem(context, item);
         if(countText != null)
         {
-            stack.translate(4, 4, 0);
+            stack.translate(4, 4, 200);
             stack.scale(0.5f, 0.5f, 0.5f);
             context.drawText(DFScript.MC.textRenderer, countText, 0, 0, 0xFFFFFFFF, true);
         }

gradlew.bat

@@ -143,15 +143,15 @@ private ItemStack convertIcon(ItemStack icon) {
         }
 
         if(optional() || plural()) {
-            lore.add(NbtString.of(Text.Serializer.toJson(
+            lore.add(NbtString.of(Text.Serialization.toJsonString(
                     Text.literal((optional() ? (plural() ? "Optional & " : "Optional") : "")
                                     + (plural() ? "Plural" : ""))
                             .fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.GRAY))
             )));
         }
 
         if(!(defaultValue() instanceof ScriptUnknownValue)) {
-            lore.add(NbtString.of(Text.Serializer.toJson(
+            lore.add(NbtString.of(Text.Serialization.toJsonString(
                     Text.literal("Default: "+defaultValue().formatAsText())
                             .fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.GRAY))
             )));
@@ -230,7 +230,7 @@ public ItemStack icon(String name) {
             itemStack.setCustomName(Text.literal(name).setStyle(Style.EMPTY.withColor(Formatting.WHITE).withItalic(false)));
 
             NbtList lore = new NbtList();
-            lore.add(NbtString.of(Text.Serializer.toJson(text())));
+            lore.add(NbtString.of(Text.Serialization.toJsonString(text())));
             itemStack.getSubNbt("display").put("Lore", lore);
 
             return itemStack;

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

@@ -1693,28 +1693,28 @@ public ItemStack getIcon() {
 
         if(isDeprecated())
         {
-            lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("This action is deprecated!")
+            lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("This action is deprecated!")
                     .fillStyle(Style.EMPTY
                             .withColor(Formatting.RED)
                             .withItalic(false)))));
-            lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Use '" + deprecated.getName() + "'")
+            lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("Use '" + deprecated.getName() + "'")
                     .fillStyle(Style.EMPTY
                             .withColor(Formatting.RED)
                             .withItalic(false)))));
         }
 
         for (String descriptionLine: description) {
-            lore.add(NbtString.of(Text.Serializer.toJson(Text.literal(descriptionLine)
+            lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal(descriptionLine)
                 .fillStyle(Style.EMPTY
                       .withColor(Formatting.GRAY)
                       .withItalic(false)))));
         }
 
-        lore.add(NbtString.of(Text.Serializer.toJson(Text.literal(""))));
+        lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal(""))));
 
         for (ScriptActionArgument arg : arguments) {
             for (Text txt : arg.text()) {
-                lore.add(NbtString.of(Text.Serializer.toJson(txt)));
+                lore.add(NbtString.of(Text.Serialization.toJsonString(txt)));
             }
         }