1.19.2

MelanX · Jul 11, 2023 · b642a97 · b642a97
1 parent bd46a81
commit b642a97
Show file tree

Hide file tree

Showing 75 changed files with 340 additions and 337 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -2,13 +2,13 @@ name: Bug Report
 description: Report an issue with supported versions of Ex Naturae
 labels: [ bug ]
 body:
-  - type: input
+  - type: dropdown
     id: mc-version
     attributes:
       label: Minecraft version
-      placeholder: eg. 1.18.2
-    validations:
-      required: true
+      options:
+        - 1.18.2
+        - 1.19.2
   - type: input
     id: mod-version
     attributes:

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
     tools {
         jdk 'java17'
     }
-    environment { 
+    environment {
         MODGRADLE_CI = 'true'
     }
     stages {

diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,19 @@
 buildscript {
-    apply from: 'https://noeppi-noeppi.github.io/ModUtils/v3/buildscript.gradle', to: buildscript
+    apply from: 'https://moddingx.github.io/ModUtils/v5/buildscript.gradle', to: buildscript
 }
 
-apply from: 'https://noeppi-noeppi.github.io/ModUtils/v3/mod.gradle'
-apply plugin: 'io.github.noeppi_noeppi.tools.modgradle.cursedep'
+apply from: 'https://moddingx.github.io/ModUtils/v5/mod.gradle'
+apply plugin: 'org.moddingx.modgradle.cursedep'
 
 repositories {
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+    }
+
     maven {
         name = "JEI"
-        url = "https://dvs1.progwml6.com/files/maven/"
+        url = "https://modmaven.dev/"
     }
     maven {
         name = "curios"
@@ -29,16 +34,16 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor fg.deobf("io.github.noeppi_noeppi.mods:LibX:1.18.2-3.2.15")
-    implementation fg.deobf("io.github.noeppi_noeppi.mods:LibX:1.18.2-3.2.15")
+    annotationProcessor fg.deobf("org.moddingx:LibX:1.19.2-4.2.8")
+    implementation fg.deobf("org.moddingx:LibX:1.19.2-4.2.8")
 
-    implementation curse.mod(400012, 3810814) // Ex Nihilo: Sequentia 1.18.2-20220530-183458
-    implementation fg.deobf("vazkii.botania:Botania:1.18.2-433")
+//    implementation curse.mod(400012, 4343775) // Ex Nihilo: Sequentia 1.18.2-20220530-183458
+    implementation fg.deobf("vazkii.botania:Botania:1.19.2-439-FORGE")
 
 //    implementation curse.mod(241967, 3226248) // Ex Compressum 1.16.5-4.0.2
 
-    runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.2-5.0.7.0")
-    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-69")
-    runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.5.174")
-    runtimeOnly fg.deobf("de.melanx:RecipePrinter:1.18.2-3.2.0")
+    runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19.2-5.1.1.0")
+    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.19.2-77")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.19.2-forge:11.6.0.1015")
+    implementation fg.deobf("maven.modrinth:ex-nihilo-sequentia:1.19.2-4.2.0.53")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,25 +1,2 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-
-# mod properties
-modid=exnaturae
-group=de.melanx
-base_version=2.0
-
-# dependencies
-forge_version=1.18.2-40.1.31
-mappings=sugarcane_2022.06.05-1.18.2
-
-# upload properties
-upload_versions=1.18.2
-upload_release=beta
-modrinth_project=TQ12BIKN
-modrinth_requirements=pfjLUfGv, qEH6GYul
-curse_project=482122
-curse_requirements=botania, libx, ex-nihilo-sequentia
-curse_optionals=ex-compressum
-
-# misc
-local_maven=/var/www/maven
-license_name=The Apache License, Version 2.0
-license_url=https://www.apache.org/licenses/LICENSE-2.0.txt
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/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.

diff --git 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/mod.properties b/mod.properties
@@ -0,0 +1,22 @@
+# mod properties
+modid=exnaturae
+group=de.melanx
+base_version=3.0
+
+# dependencies
+forge_version=1.19.2-43.2.0
+mappings=sugarcane_2022.11.27-1.19.2
+
+# upload properties
+upload_versions=1.19.2
+upload_release=beta
+upload_requirements=botania, libx, ex-nihilo-sequentia
+curse_optionals=ex-compressum
+modrinth_project=TQ12BIKN
+curse_project=482122
+
+# misc
+local_maven=/var/www/maven
+license=The Apache License, Version 2.0
+license_url=https://www.apache.org/licenses/LICENSE-2.0.txt
+changelog_repository=https://github.com/MelanX/ExNaturae/commit/%H
diff --git a/src/generated/resources/data/excompressum/tags/items/compressed_hammer.json b/src/generated/resources/data/excompressum/tags/items/compressed_hammer.json
@@ -1,10 +1,9 @@
 {
-  "replace": false,
   "values": [
-    "exnaturae:compressed_livingwood_hammer",
+    "exnaturae:compressed_elementium_hammer",
     "exnaturae:compressed_livingrock_hammer",
+    "exnaturae:compressed_livingwood_hammer",
     "exnaturae:compressed_manasteel_hammer",
-    "exnaturae:compressed_elementium_hammer",
     "exnaturae:compressed_terrasteel_hammer"
   ]
 }
diff --git a/src/generated/resources/data/excompressum/tags/items/hammer.json b/src/generated/resources/data/excompressum/tags/items/hammer.json
@@ -1,19 +1,18 @@
 {
-  "replace": false,
   "values": [
-    "exnaturae:livingwood_hammer",
-    "exnaturae:livingrock_hammer",
-    "exnaturae:manasteel_hammer",
-    "exnaturae:elementium_hammer",
-    "exnaturae:terrasteel_hammer",
-    "exnaturae:livingwood_crook",
-    "exnaturae:dreamwood_crook",
-    "exnaturae:compressed_livingwood_hammer",
+    "exnaturae:compressed_dreamwood_crook",
+    "exnaturae:compressed_elementium_hammer",
     "exnaturae:compressed_livingrock_hammer",
+    "exnaturae:compressed_livingwood_crook",
+    "exnaturae:compressed_livingwood_hammer",
     "exnaturae:compressed_manasteel_hammer",
-    "exnaturae:compressed_elementium_hammer",
     "exnaturae:compressed_terrasteel_hammer",
-    "exnaturae:compressed_livingwood_crook",
-    "exnaturae:compressed_dreamwood_crook"
+    "exnaturae:dreamwood_crook",
+    "exnaturae:elementium_hammer",
+    "exnaturae:livingrock_hammer",
+    "exnaturae:livingwood_crook",
+    "exnaturae:livingwood_hammer",
+    "exnaturae:manasteel_hammer",
+    "exnaturae:terrasteel_hammer"
   ]
 }
diff --git a/src/generated/resources/data/exnaturae/advancements/recipes/exnaturae/dreamwood_crook.json b/src/generated/resources/data/exnaturae/advancements/recipes/exnaturae/dreamwood_crook.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "exnaturae:dreamwood_crook"
-    ]
-  },
   "criteria": {
     "criterion0": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,19 +10,25 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "exnaturae:dreamwood_crook"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "criterion0",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "exnaturae:dreamwood_crook"
+    ]
+  }
 }
diff --git a/src/generated/resources/data/exnaturae/advancements/recipes/exnaturae/elementium_hammer.json b/src/generated/resources/data/exnaturae/advancements/recipes/exnaturae/elementium_hammer.json
@@ -1,13 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "exnaturae:elementium_hammer"
-    ]
-  },
   "criteria": {
     "criterion0": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -16,10 +10,10 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "criterion1": {
-      "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
@@ -28,13 +22,14 @@
             ]
           }
         ]
-      }
+      },
+      "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
       "conditions": {
         "recipe": "exnaturae:elementium_hammer"
-      }
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
@@ -43,5 +38,10 @@
       "criterion1",
       "has_the_recipe"
     ]
-  ]
+  ],
+  "rewards": {
+    "recipes": [
+      "exnaturae:elementium_hammer"
+    ]
+  }
 }