diff --git a/build.gradle b/build.gradle index eded3a9..e962bdf 100644 --- a/build.gradle +++ b/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' } diff --git a/gradle.properties b/gradle.properties index 807338d..9ad951b 100644 --- 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.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 \ No newline at end of file +fabric_version=0.96.1+1.20.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..c1962a7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 59bc51a..509c4a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index c53aefa..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal 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 index 61f05cc..801b38a 100644 --- 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,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 { diff --git a/src/main/java/io/github/techstreet/dfscript/screen/widget/CItem.java b/src/main/java/io/github/techstreet/dfscript/screen/widget/CItem.java index db69ce0..1721448 100644 --- a/src/main/java/io/github/techstreet/dfscript/screen/widget/CItem.java +++ b/src/main/java/io/github/techstreet/dfscript/screen/widget/CItem.java @@ -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); } 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 index 51191c9..a9a5e76 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionArgument.java +++ b/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionArgument.java @@ -143,7 +143,7 @@ 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)) @@ -151,7 +151,7 @@ private ItemStack convertIcon(ItemStack icon) { } 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; 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 index bbc03bd..e60067a 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionType.java +++ b/src/main/java/io/github/techstreet/dfscript/script/action/ScriptActionType.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))); } } 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 index e39f71e..6c30921 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptClientValueArgument.java +++ b/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptClientValueArgument.java @@ -179,7 +179,7 @@ public enum ScriptClientValueArgument implements ScriptArgument { .fillStyle(Style.EMPTY .withItalic(false))); NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal(description) + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal(description) .fillStyle(Style.EMPTY .withColor(Formatting.GRAY) .withItalic(false))))); diff --git a/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptVariableArgument.java b/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptVariableArgument.java index 22c5dd4..2b82123 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptVariableArgument.java +++ b/src/main/java/io/github/techstreet/dfscript/script/argument/ScriptVariableArgument.java @@ -58,7 +58,7 @@ public ItemStack getArgIcon() { NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(scope.getName()))); + lore.add(NbtString.of(Text.Serialization.toJsonString(scope.getName()))); icon.getSubNbt("display").put("Lore", lore); diff --git a/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBooleanSet.java b/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBooleanSet.java index 975b91d..d3d2c4e 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBooleanSet.java +++ b/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBooleanSet.java @@ -43,14 +43,14 @@ public class ScriptBooleanSet extends ScriptParametrizedPart { NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Sets a variable to the result of a condition.").setStyle(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("Sets a variable to the result of a condition.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("")))); MutableText t = ScriptActionArgument.ScriptActionArgumentType.VARIABLE.text(); t.append(Text.literal(" - ").fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.GRAY))) .append(Text.literal("Result").fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.WHITE))); - lore.add(NbtString.of(Text.Serializer.toJson(t))); + lore.add(NbtString.of(Text.Serialization.toJsonString(t))); booleanSetIcon.getSubNbt("display") .put("Lore", lore); @@ -115,18 +115,18 @@ public ItemStack getIcon() { NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Sets a variable to the result of a condition.").setStyle(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("Sets a variable to the result of a condition.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("")))); MutableText t = ScriptActionArgument.ScriptActionArgumentType.VARIABLE.text(); t.append(Text.literal(" - ").fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.GRAY))) .append(Text.literal("Result").fillStyle(Style.EMPTY.withItalic(false).withColor(Formatting.WHITE))); - lore.add(NbtString.of(Text.Serializer.toJson(t))); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("")))); + lore.add(NbtString.of(Text.Serialization.toJsonString(t))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("")))); for (Text txt : condition.getLore()) { - lore.add(NbtString.of(Text.Serializer.toJson(txt))); + lore.add(NbtString.of(Text.Serialization.toJsonString(txt))); } icon.getSubNbt("display") diff --git a/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBranch.java b/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBranch.java index 9b4b478..ab51c66 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBranch.java +++ b/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptBranch.java @@ -39,7 +39,7 @@ public class ScriptBranch extends ScriptParametrizedPart implements ScriptScopeP NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Closes the current code block.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("Closes the current code block.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); closeBracketIcon.getSubNbt("display") .put("Lore", lore); @@ -51,7 +51,7 @@ public class ScriptBranch extends ScriptParametrizedPart implements ScriptScopeP lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Executes if the last IF condition failed.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("Executes if the last IF condition failed.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); elseIcon.getSubNbt("display") .put("Lore", lore); diff --git a/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptConditionType.java b/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptConditionType.java index dab8058..359ee7e 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptConditionType.java +++ b/src/main/java/io/github/techstreet/dfscript/script/conditions/ScriptConditionType.java @@ -337,7 +337,7 @@ public ItemStack getIcon(String prefix) { NbtList lore = new NbtList(); for (Text txt : getLore()) { - lore.add(NbtString.of(Text.Serializer.toJson(txt))); + lore.add(NbtString.of(Text.Serialization.toJsonString(txt))); } item.getSubNbt("display") diff --git a/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEmptyHeader.java b/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEmptyHeader.java index 8da7fd1..3794ed0 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEmptyHeader.java +++ b/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEmptyHeader.java @@ -33,7 +33,7 @@ public class ScriptEmptyHeader extends ScriptHeader { NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Literally can never be triggered...").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("Literally can never be triggered...").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); emptyIcon.getSubNbt("display") .put("Lore", lore); 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 index 97d695b..2043e8e 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEventType.java +++ b/src/main/java/io/github/techstreet/dfscript/script/event/ScriptEventType.java @@ -49,7 +49,7 @@ public enum ScriptEventType { .withColor(Formatting.WHITE) .withItalic(false))); NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal(description) + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal(description) .fillStyle(Style.EMPTY .withColor(Formatting.GRAY) .withItalic(false))))); diff --git a/src/main/java/io/github/techstreet/dfscript/script/event/ScriptFunction.java b/src/main/java/io/github/techstreet/dfscript/script/event/ScriptFunction.java index 00150b4..a2b8994 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/event/ScriptFunction.java +++ b/src/main/java/io/github/techstreet/dfscript/script/event/ScriptFunction.java @@ -57,19 +57,19 @@ public ItemStack getIcon() { if(description != "") { for (String descriptionLine: description.split("\n")) { - 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))))); } if(argList.size() > 0) - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("")))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("")))); } for (ScriptActionArgument arg : argList) { for (Text txt : arg.text()) { - lore.add(NbtString.of(Text.Serializer.toJson(txt))); + lore.add(NbtString.of(Text.Serialization.toJsonString(txt))); } } diff --git a/src/main/java/io/github/techstreet/dfscript/script/options/ScriptOptionEnum.java b/src/main/java/io/github/techstreet/dfscript/script/options/ScriptOptionEnum.java index 294dde8..0925106 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/options/ScriptOptionEnum.java +++ b/src/main/java/io/github/techstreet/dfscript/script/options/ScriptOptionEnum.java @@ -65,7 +65,7 @@ public ItemStack getIcon() NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal(description) + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal(description) .fillStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false)) ))); diff --git a/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptRepetitionType.java b/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptRepetitionType.java index 39609e1..f809652 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptRepetitionType.java +++ b/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptRepetitionType.java @@ -129,28 +129,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))); } } diff --git a/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptWhile.java b/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptWhile.java index f345136..2e22302 100644 --- a/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptWhile.java +++ b/src/main/java/io/github/techstreet/dfscript/script/repetitions/ScriptWhile.java @@ -39,7 +39,7 @@ public class ScriptWhile extends ScriptRepetition { NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Repeats while a condition is true.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("Repeats while a condition is true.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); whileIcon.getSubNbt("display") .put("Lore", lore); @@ -66,11 +66,11 @@ public ItemStack getIcon() { NbtList lore = new NbtList(); - lore.add(NbtString.of(Text.Serializer.toJson(Text.literal("Repeats while a condition is true.").setStyle(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("Repeats while a condition is true.").setStyle(Style.EMPTY.withColor(Formatting.GRAY).withItalic(false))))); + lore.add(NbtString.of(Text.Serialization.toJsonString(Text.literal("")))); for (Text txt : condition.getLore()) { - lore.add(NbtString.of(Text.Serializer.toJson(txt))); + lore.add(NbtString.of(Text.Serialization.toJsonString(txt))); } icon.getSubNbt("display") diff --git a/src/main/java/io/github/techstreet/dfscript/util/ComponentUtil.java b/src/main/java/io/github/techstreet/dfscript/util/ComponentUtil.java index 19c0093..6c6b099 100644 --- a/src/main/java/io/github/techstreet/dfscript/util/ComponentUtil.java +++ b/src/main/java/io/github/techstreet/dfscript/util/ComponentUtil.java @@ -34,7 +34,7 @@ public static MutableText fromString(String message) { s = s.withFormatting(Formatting.byCode(col.charAt(1))); } else { s = Style.EMPTY.withColor( - TextColor.parse("#" + col.replaceAll("§", "").substring(1))); + TextColor.parse("#" + col.replaceAll("§", "").substring(1)).getOrThrow(false, (h) -> {throw new IllegalArgumentException(h);})); } lastIndex = matcher.end(); } 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 index 7de7370..1bb2e0a 100644 --- a/src/main/java/io/github/techstreet/dfscript/util/render/BlendableTexturedButtonWidget.java +++ b/src/main/java/io/github/techstreet/dfscript/util/render/BlendableTexturedButtonWidget.java @@ -25,10 +25,10 @@ public BlendableTexturedButtonWidget(int x, int y, int width, int height, Identi // } @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { RenderSystem.clearColor(1.0F, 1.0F, 1.0F, this.alpha); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); - super.renderButton(context, mouseX, mouseY, delta); + super.renderWidget(context, mouseX, mouseY, delta); } } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7a2da59..18a06f0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -22,9 +22,9 @@ "dfscript.mixins.json" ], "depends": { - "fabricloader": ">=0.15.3", + "fabricloader": ">=0.15.7", "fabric-api": "*", - "minecraft": "~1.20", + "minecraft": "1.20.4", "java": ">=17" } }