1.19.3 (#80)

* 22w45a

* 1.19.3-pre2

* Update branch to 1.19.3 release (#81)

* Update to Fabric Release for 1.19.3

* Removed old compile setting in README.md

Co-authored-by: JOO200 <github@joo200.de>

Author: zml2008

README.md

@@ -21,7 +21,7 @@ WorldEdit selections will be shown without any configuration necessary, but the
 Compiling
 ---------
 
-Run `_JAVA_OPTIONS="-Xmx2G" ./gradlew build`
+Run `./gradlew build`
 
 To import the project into your IDE, see [FabricMC Wiki article](https://fabricmc.net/wiki/tutorial:setup) and start from **Step 3**.
 

build.gradle.kts

@@ -1,19 +1,19 @@
 plugins {
     java
-    id("fabric-loom") version "1.0-SNAPSHOT"
-    id("io.github.juuxel.loom-quiltflower") version "1.7.4"
-    id("com.github.ben-manes.versions") version "0.42.0"
+    id("fabric-loom") version "1.0.+"
+    id("io.github.juuxel.loom-quiltflower") version "1.8.0"
+    id("com.github.ben-manes.versions") version "0.44.0"
     id("de.jjohannes.missing-metadata-guava") version "31.1.1"
 }
 
-val minecraftVersion = "1.19.2"
-val fabricLoaderVersion = "0.14.10"
-val fabricApiVersion = "0.66.0+1.19.2"
-val modmenuVersion = "4.1.0"
+val minecraftVersion = "1.19.3"
+val fabricLoaderVersion = "0.14.11"
+val fabricApiVersion = "0.68.1+1.19.3"
+val modmenuVersion = "5.0.1"
 val multiconnectVersion = "1.5.10"
 
 group = "org.enginehub.worldeditcui"
-version = "$minecraftVersion+02-SNAPSHOT"
+version = "$minecraftVersion+01-SNAPSHOT"
 
 repositories {
     // mirrors:
@@ -60,7 +60,7 @@ dependencies {
         officialMojangMappings {
             nameSyntheticMembers = false
         }
-        parchment("org.parchmentmc.data:parchment-1.19.2:2022.11.06@zip")
+        parchment("org.parchmentmc.data:parchment-1.19.2:2022.11.27@zip")
     })
     modImplementation("net.fabricmc:fabric-loader:$fabricLoaderVersion")
     modImplementation("com.terraformersmc:modmenu:$modmenuVersion")
@@ -117,13 +117,13 @@ dependencies {
     }
 
     // for development
-    modRuntimeOnly("com.sk89q.worldedit:worldedit-fabric-mc1.19.2:7.2.12") {
+    /*modRuntimeOnly("com.sk89q.worldedit:worldedit-fabric-mc1.19.2:7.2.12") {
         exclude("com.google.guava", "guava")
         exclude("com.google.code.gson", "gson")
         exclude("com.google.code.gson", "gson")
         exclude("it.unimi.dsi", "fastutil")
         exclude("org.apache.logging.log4j", "log4j-api")
-    }
+    }*/
 }
 
 tasks {

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -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,10 +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##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
@@ -143,12 +143,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
@@ -205,6 +209,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.

gradlew

@@ -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

gradlew.bat

@@ -121,7 +121,7 @@ private void onTick(final Minecraft mc) {
 
             while (this.keyBindClearSel.consumeClick()) {
                 if (mc.player != null) {
-                    mc.player.commandUnsigned("/sel");
+                    mc.player.connection.sendUnsignedCommand("/sel");
                 }
 
                 if (config.isClearAllOnKey()) {
@@ -144,7 +144,7 @@ private void onTick(final Minecraft mc) {
                 this.helo(mc.getConnection());
                 this.delayedHelo = FabricModWorldEditCUI.DELAYED_HELO_TICKS;
                 if (mc.player != null && config.isPromiscuous()) {
-                    mc.player.commandUnsigned("we cui"); // Tricks WE to send the current selection
+                    mc.player.connection.sendUnsignedCommand("we cui"); // Tricks WE to send the current selection
                 }
             }
 

src/main/java/org/enginehub/worldeditcui/fabric/FabricModWorldEditCUI.java

@@ -63,7 +63,7 @@ protected void init() {
         }
         done = this.addRenderableWidget(new AbstractWidget((this.width - BUTTON_WIDTH) / 2, this.height - (BUTTON_HEIGHT + 7), BUTTON_WIDTH, BUTTON_HEIGHT, CommonComponents.GUI_DONE) {
             @Override
-            public void updateNarration(NarrationElementOutput builder) {
+            protected void updateWidgetNarration(final NarrationElementOutput builder) {
                 this.defaultButtonNarrationText(builder);
             }
 
@@ -94,7 +94,7 @@ public void onClick(double mouseX, double mouseY) {
             } else if(value instanceof Boolean) {
                 element = this.addRenderableWidget(new AbstractWidget(buttonX, y, 70, BUTTON_HEIGHT, ((Boolean) value ? TRUE: FALSE)) {
                     @Override
-                    public void updateNarration(NarrationElementOutput builder) {
+                    protected void updateWidgetNarration(final NarrationElementOutput builder) {
                         this.defaultButtonNarrationText(builder);
                     }
 
@@ -146,7 +146,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
             }
             this.configList.addEntry(new SettingsEntry(this.configList, (textTemp != null) ? textTemp : Component.literal(text), element, this.addRenderableWidget(new AbstractWidget(buttonX + 75, y, BUTTON_HEIGHT, BUTTON_HEIGHT, Component.empty()) {
                 @Override
-                public void updateNarration(NarrationElementOutput builder) {
+                protected void updateWidgetNarration(final NarrationElementOutput builder) {
                     this.defaultButtonNarrationText(builder);
                 }
 

src/main/java/org/enginehub/worldeditcui/gui/CUIConfigPanel.java

@@ -48,7 +48,8 @@ public void render(PoseStack matrices, int index, int y, int x, int rowWidth, in
         }
 
         // Widgets
-        this.widgetButton.y = this.resetButton.y = y + 1;
+        this.resetButton.setY(y + 1);
+        this.widgetButton.setY(y + 1);
         this.widgetButton.render(matrices, mouseX, mouseY, delta);
         this.resetButton.render(matrices,mouseX, mouseY, delta);
     }

src/main/java/org/enginehub/worldeditcui/gui/SettingsEntry.java

@@ -4,9 +4,9 @@
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexFormat;
-import com.mojang.math.Vector3f;
 import net.minecraft.client.renderer.ShaderInstance;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Vector3f;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL32;