Update gradle, update to 1.19.4, migrate to kotlin script & RoundaLib…

… plugin

README.md

@@ -1,14 +1,14 @@
 # Roundaround's Enchantment Compatibility
 
 <img src="https://img.shields.io/badge/Loader-Fabric-%23313e51?style=for-the-badge"/>
-<img src="https://img.shields.io/badge/MC-1.19-%23313e51?style=for-the-badge"/>
+<img src="https://img.shields.io/badge/MC-1.19--1.19.4-%23313e51?style=for-the-badge"/>
 <img src="https://img.shields.io/badge/Side-Server-%23313e51?style=for-the-badge"/>
 
 Make many mutually-exclusive enchantments compatible.
 
 ## Download
 
-TBD
+https://modrinth.com/mod/enchantment-compat
 
 ## License
 

build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("roundalib") version "0.2.75"
+}

gradle.properties

@@ -1,17 +1,13 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx4G -XX:ActiveProcessorCount=4
+org.gradle.parallel=true
 
-# Fabric Properties
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.5
-loader_version=0.14.14
-
-# Mod Properties
-mod_version = 1.0.1
-maven_group = me.roundaround
-archives_base_name = enchantmentcompat
-
-# Dependencies
-fabric_version=0.73.2+1.19.3
-mod_menu_version=5.0.2
-roundalib_version=0.2.1+1.19.3
+# RoundaLib Properties
+group_id=me.roundaround
+mod_id=enchantmentcompat
+mod_version=1.1.0
+minecraft_version=1.19.4
+yarn_mappings=build.1
+loader_version=0.14.19
+roundalib_version=1.0.1
+mod_menu_version=6.1.0-rc.4

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

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

settings.gradle.kts

@@ -0,0 +1,7 @@
+pluginManagement {
+  repositories {
+    gradlePluginPortal()
+    maven("https://maven.fabricmc.net/")
+    maven("https://maven.rnda.dev/releases/")
+  }
+}

src/main/java/me/roundaround/enchantmentcompat/compat/modmenu/ModMenuImpl.java

@@ -2,9 +2,8 @@
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
-
 import me.roundaround.enchantmentcompat.EnchantmentCompatMod;
-import me.roundaround.roundalib.config.gui.screen.ConfigScreen;
+import me.roundaround.roundalib.client.gui.screen.ConfigScreen;
 
 public class ModMenuImpl implements ModMenuApi {
   @Override

src/main/java/me/roundaround/enchantmentcompat/config/EnchantmentCompatConfig.java

@@ -14,34 +14,34 @@ public class EnchantmentCompatConfig extends ModConfig {
   public EnchantmentCompatConfig() {
     super(EnchantmentCompatMod.MOD_ID);
 
-    MOD_ENABLED = registerConfigOption(
-        BooleanConfigOption
-            .builder("modEnabled", "enchantmentcompat.mod_enabled.label")
-            .setComment("Simple toggle for the mod! Set to false to disable.")
-            .build());
-
-    INFINITY_MENDING = registerConfigOption(
-        BooleanConfigOption
-            .yesNoBuilder("infinityMending", "enchantmentcompat.infinity_mending.label")
-            .setComment("Whether to allow infinity and mending to combine.")
-            .build());
-
-    MULTISHOT_PIERCING = registerConfigOption(
-        BooleanConfigOption
-            .yesNoBuilder("multishotPiercing", "enchantmentcompat.multishot_piercing.label")
-            .setComment("Whether to allow multishot and piercing to combine.")
-            .build());
-
-    PROTECTION = registerConfigOption(
-        BooleanConfigOption
-            .yesNoBuilder("protection", "enchantmentcompat.protection.label")
-            .setComment("Whether to allow the different protections to combine.")
-            .build());
-
-    DAMAGE = registerConfigOption(
-        BooleanConfigOption
-            .yesNoBuilder("damage", "enchantmentcompat.damage.label")
-            .setComment("Whether to allow the different damages to combine.")
-            .build());
+    MOD_ENABLED = registerConfigOption(BooleanConfigOption.builder(this,
+            "modEnabled",
+            "enchantmentcompat.mod_enabled.label")
+        .setComment("Simple toggle for the mod! Set to false to disable.")
+        .build());
+
+    INFINITY_MENDING = registerConfigOption(BooleanConfigOption.yesNoBuilder(this,
+            "infinityMending",
+            "enchantmentcompat.infinity_mending.label")
+        .setComment("Whether to allow infinity and mending to combine.")
+        .build());
+
+    MULTISHOT_PIERCING = registerConfigOption(BooleanConfigOption.yesNoBuilder(this,
+            "multishotPiercing",
+            "enchantmentcompat.multishot_piercing.label")
+        .setComment("Whether to allow multishot and piercing to combine.")
+        .build());
+
+    PROTECTION = registerConfigOption(BooleanConfigOption.yesNoBuilder(this,
+            "protection",
+            "enchantmentcompat.protection.label")
+        .setComment("Whether to allow the different protections to combine.")
+        .build());
+
+    DAMAGE = registerConfigOption(BooleanConfigOption.yesNoBuilder(this,
+            "damage",
+            "enchantmentcompat.damage.label")
+        .setComment("Whether to allow the different damages to combine.")
+        .build());
   }
 }

src/main/resources/fabric.mod.json

@@ -3,13 +3,14 @@
   "id": "enchantmentcompat",
   "version": "${version}",
   "name": "Enchantment Compatibility",
-  "description": "Make many mutually-exclusive enchantments compatible.",
+  "description": "Make many mutually-exclusive enchantments compatible.\n${library}",
   "authors": [
     "Roundaround"
   ],
   "contact": {
-    "homepage": "",
-    "sources": ""
+    "homepage": "https://modrinth.com/mod/enchantment-compat",
+    "sources": "https://github.com/Roundaround/mc-fabric-enchantment-compat",
+    "issues": "https://github.com/Roundaround/mc-fabric-enchantment-compat/issues"
   },
   "license": "MIT",
   "icon": "assets/enchantmentcompat/icon.png",
@@ -26,9 +27,8 @@
     "enchantmentcompat.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.13.3",
+    "fabricloader": "*",
     "minecraft": "1.19.x",
-    "java": ">=17",
-    "roundalib": "~0.2.0"
+    "java": ">=17"
   }
 }