Port to 1.20

build.gradle

@@ -1,27 +1,25 @@
-buildscript {
-    repositories {
-        // These repositories are only for Gradle plugins, put any other repositories in the repository block further below
-        maven { url = 'https://maven.minecraftforge.net' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-    }
+plugins {
+  id 'eclipse'
+  id 'idea'
+  id 'maven-publish'
+  id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'eclipse'
 import net.minecraftforge.gradle.common.tasks.SignJar
 
 version = "${mc_version}-${version}"
 group = "elucent.roots" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "RootsClassic"
+base {
+  archivesName = "RootsClassic"
+}
 
 // Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16.
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    mappings  channel: "${mcp_channel}", version: "${mcp_mappings}"
+    mappings channel: mapping_channel, version: mapping_version
+
+    copyIdeResources = true
 
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

gradle.properties

@@ -6,14 +6,14 @@ org.gradle.daemon=false
 dist_folder=c:/temp
 
 # Base info
-mc_version=1.19.4
-forge_version=45.1.0
-mcp_channel=official
-mcp_mappings=1.19.4
+mc_version=1.20
+forge_version=46.0.12
+mapping_channel=official
+mapping_version=1.20
 
 # Version
-version=1.1.37
+version=1.2.0
 
 # Dependencies
-jei_version=13.1.0.11
+jei_version=14.0.0.4
 crafttweaker_version=10.1.44

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.2-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,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.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

@@ -1,6 +1,13 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net/' }
+        maven {
+            name = 'MinecraftForge'
+            url = 'https://maven.minecraftforge.net/'
+        }
     }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
 }

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -1,4 +1,4 @@
-// 1.19.4	2023-06-11T04:11:03.7744039	Registries
+// 1.20	2023-06-11T04:42:08.9519344	Registries
 1879771bcc17b5a943e1fe9c4198baf9c90535a3 data/rootsclassic/damage_type/cactus.json
 7a2bf84ebf0a4410c18ff947f42ef028d565f3bc data/rootsclassic/damage_type/fire.json
 31e1cbbcc6c7da6bf385498e76aeed31c705cc70 data/rootsclassic/damage_type/generic.json

src/generated/resources/.cache/286d659d547507bb217c21ba5db4542265de7af7

@@ -1,3 +1,3 @@
-// 1.19.4	2023-06-11T03:37:51.2579561	Tags for minecraft:block mod id rootsclassic
+// 1.20	2023-06-11T04:42:08.9519344	Tags for minecraft:block mod id rootsclassic
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/rootsclassic/tags/blocks/needs_engraved_tool.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/rootsclassic/tags/blocks/needs_living_tool.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,19 +1,19 @@
-// 1.19.4	2023-06-11T03:37:51.256956	Loot Tables
-feaea696733861680ddd6a8c13bc39181f5c38e6 data/rootsclassic/loot_tables/blocks/accelerator_standing_stone.json
-b88da4a6f1385f9855e3360bf95a78f7962b081b data/rootsclassic/loot_tables/blocks/aesthetic_standing_stone.json
-07f4ac0225fa88692f19d233c4b7a5da3baed0e7 data/rootsclassic/loot_tables/blocks/altar.json
-581d93f423413fccfdabbe40546ea11605e8c743 data/rootsclassic/loot_tables/blocks/attuned_standing_stone.json
-959a65846959f562199d6bdde9c5b379bfdfdefc data/rootsclassic/loot_tables/blocks/brazier.json
-c97a9aed0e3611e97896fced66fb0537eefba074 data/rootsclassic/loot_tables/blocks/entangler_standing_stone.json
-16921f4f5c32f90e07c65fc98ed3c734b43d2007 data/rootsclassic/loot_tables/blocks/flare_orchid.json
-3ec6d7fe262c42d086e5836425dd6cb0fcbded5e data/rootsclassic/loot_tables/blocks/grower_standing_stone.json
-567ad68e6f96b3159dfbbccc66045e3b0a82963f data/rootsclassic/loot_tables/blocks/healer_standing_stone.json
-ab96f69175a4f972fc51f792cf12a463fb8a4ffb data/rootsclassic/loot_tables/blocks/igniter_standing_stone.json
-e6168dcf6fa23d087f77ae4d33505923e2e851c4 data/rootsclassic/loot_tables/blocks/imbuer.json
-97ebe7e0ea32bf2721c6bf24875b97eccf8c0cc6 data/rootsclassic/loot_tables/blocks/midnight_bloom.json
-6d24e5d32270ac52ff475a3e05546edfd1b6cbad data/rootsclassic/loot_tables/blocks/mortar.json
-d8f6437e004f9d4cb1893433a0b983a64abd1b39 data/rootsclassic/loot_tables/blocks/mundane_standing_stone.json
-1c078b7ddd475b22d765c01a5b911bc515d06904 data/rootsclassic/loot_tables/blocks/radiant_daisy.json
-8b5938eca7f264c89d7b8a04e7d2beb0264603db data/rootsclassic/loot_tables/blocks/repulsor_standing_stone.json
-17527b2b27618c610dad053366ad8ff946828d50 data/rootsclassic/loot_tables/blocks/vacuum_standing_stone.json
-ef017fe8afbc1e704a7cfb4818ece7ba018f9c91 data/rootsclassic/loot_tables/entities/phantom_skeleton.json
+// 1.20	2023-06-11T04:42:08.9509344	Loot Tables
+70a9f864a55a97c409ef11a253a09efdaa734c0b data/rootsclassic/loot_tables/blocks/accelerator_standing_stone.json
+405e09a558e50b10639abca64f0d08c0f22a5f68 data/rootsclassic/loot_tables/blocks/aesthetic_standing_stone.json
+b728df4efefe2635010ccb8d989e1908c7affd48 data/rootsclassic/loot_tables/blocks/altar.json
+54837f962002fd0484d1a12eff4d40310c472a26 data/rootsclassic/loot_tables/blocks/attuned_standing_stone.json
+8fc5e87970fef67d075d75b03d1be5811ea12051 data/rootsclassic/loot_tables/blocks/brazier.json
+3429e730875ec7445f38d0d9500cfc96c69dd737 data/rootsclassic/loot_tables/blocks/entangler_standing_stone.json
+7a0bfafb5732ecf484e619da79b388a91446fc4b data/rootsclassic/loot_tables/blocks/flare_orchid.json
+82fe349e63298bf01c910caa45c88f66ad4eb54a data/rootsclassic/loot_tables/blocks/grower_standing_stone.json
+a7daedb5cfcb81347aca8b65ff2dc70a9a901119 data/rootsclassic/loot_tables/blocks/healer_standing_stone.json
+d5c12c122944cda582cd992c52dc553b43a2dd68 data/rootsclassic/loot_tables/blocks/igniter_standing_stone.json
+2ab75fb9e2bd371a5ec5876c2e4d60e8bba313ea data/rootsclassic/loot_tables/blocks/imbuer.json
+be7ece28f0135991aada7af379f3cba41076256a data/rootsclassic/loot_tables/blocks/midnight_bloom.json
+9d2c8a364e9f5c9d76354ce79a9228b7197a8f55 data/rootsclassic/loot_tables/blocks/mortar.json
+4fcd158cc7b18b336fb3ee040c653e263e7b4593 data/rootsclassic/loot_tables/blocks/mundane_standing_stone.json
+9b995acf90d3fe8cc95c9c138307693f20843c1b data/rootsclassic/loot_tables/blocks/radiant_daisy.json
+78c3f10704f9efd61d8b95d2f1a3ba6d5c952dd2 data/rootsclassic/loot_tables/blocks/repulsor_standing_stone.json
+d4ec0f474be08623a3fa9d175d4997b8af02cb6d data/rootsclassic/loot_tables/blocks/vacuum_standing_stone.json
+f547c80f0d59e9b2796677541d510f38a18949d4 data/rootsclassic/loot_tables/entities/phantom_skeleton.json

src/generated/resources/.cache/6a8f7dfaf2f192ace4a91ede8ea4fa7fec15ed9c

@@ -1,4 +1,4 @@
-// 1.19.4	2023-06-11T03:37:51.2559572	Tags for minecraft:item mod id rootsclassic
+// 1.20	2023-06-11T04:42:08.949934	Tags for minecraft:item mod id rootsclassic
 35eac428592b750d11c1cf1de4a1bd3514bc10f6 data/rootsclassic/tags/items/barks.json
 9dba0a2956e1c0e115cc8079755a0ee102f301ab data/rootsclassic/tags/items/barks/acacia.json
 a745da3593566a775d84f3d68de5334d9cf85cc3 data/rootsclassic/tags/items/barks/birch.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,20 +1,20 @@
-// 1.19.4	2023-06-11T03:37:51.2574561	Recipes
-6cf04a432aab8ecac3202d9c56339fa4f0c6c91a data/rootsclassic/advancements/recipes/food/fruit_salad.json
-25bd941f11abf62b80fd4842222e41798fc55d2e data/rootsclassic/advancements/recipes/food/rooty_stew.json
-5954dc5339c9189cc68a6d19446c0aefa1a327b3 data/rootsclassic/advancements/recipes/misc/altar.json
-772fd3189ed43afc51d0eb37946ed7336868d741 data/rootsclassic/advancements/recipes/misc/attuned_standing_stone.json
-544f475e4400003574ddde6d587e5dace0a52f23 data/rootsclassic/advancements/recipes/misc/brazier.json
-7858dcd5835f12c77145d994f8c9481a05aeb4f0 data/rootsclassic/advancements/recipes/misc/ender_pearl.json
-f37487293a97d6693f1d7167f71487c823650b23 data/rootsclassic/advancements/recipes/misc/growth_powder.json
-882fd9805563fc3d68cf6d22935fb406819ada21 data/rootsclassic/advancements/recipes/misc/healing_poultice.json
-5ef99bc51aec9fb482dde2ebdab137ef9373cd65 data/rootsclassic/advancements/recipes/misc/imbuer.json
-06d78397daf9e416e4639d1bdceda5576af55a0b data/rootsclassic/advancements/recipes/misc/mortar.json
-8a89aa2b1f178e537e3fcc91b1a99687ffe83f88 data/rootsclassic/advancements/recipes/misc/mundane_standing_stone.json
-4f7dfff805ca37426996046aba6e68751bd1e5be data/rootsclassic/advancements/recipes/misc/mutating_powder.json
-4e6175f63f714de365010fe3f3b9696c2ec14347 data/rootsclassic/advancements/recipes/misc/pestle.json
-8ad4bd86547b1082f313c17c3adc75a49948b13d data/rootsclassic/advancements/recipes/misc/pestle2.json
-e7cea6ff3d40cc9486f7f413697714bbc3a0c311 data/rootsclassic/advancements/recipes/misc/runic_tablet.json
-51cbebd09c5dad89dfecb1fbc1fb179ceacd074b data/rootsclassic/advancements/recipes/tools/bark_knife.json
+// 1.20	2023-06-11T04:42:08.9514349	Recipes
+3867cbb38f27f867aa25d4a1be4c2b49020d2468 data/rootsclassic/advancements/recipes/food/fruit_salad.json
+1ce652726ea555d81de9be180f3b7136b484dc66 data/rootsclassic/advancements/recipes/food/rooty_stew.json
+d6380dbbe52ee0429f24394653fbd9aaf8f58040 data/rootsclassic/advancements/recipes/misc/altar.json
+78972e426332d24e60125bf126571b9edf469c98 data/rootsclassic/advancements/recipes/misc/attuned_standing_stone.json
+1a592854dc9f4fabf7cdfe5e149d93137481b166 data/rootsclassic/advancements/recipes/misc/brazier.json
+bafceafaf830fd168e8775f7e385c2d799b77efe data/rootsclassic/advancements/recipes/misc/ender_pearl.json
+915dda7ab527258adaa1d86c2484f61bedad1b72 data/rootsclassic/advancements/recipes/misc/growth_powder.json
+07bbfdde0c112163d48a01773c6884ca1c6c4b9a data/rootsclassic/advancements/recipes/misc/healing_poultice.json
+81dd713a7ac6f4cae4990ab9a24c2372fb389e2a data/rootsclassic/advancements/recipes/misc/imbuer.json
+c56b217c57bef2b76cbff1b77e3394b0958ff9f4 data/rootsclassic/advancements/recipes/misc/mortar.json
+f851c4960426dff1c12cd206da4ffed382559420 data/rootsclassic/advancements/recipes/misc/mundane_standing_stone.json
+e8457db3bf70a97f7e1ad5723faa28a83d54f165 data/rootsclassic/advancements/recipes/misc/mutating_powder.json
+ffa2c5227f0b7c7d63e55b6ecb82c1ba3bc90ab8 data/rootsclassic/advancements/recipes/misc/pestle.json
+8f7593cccf0b827bdb6df55bb3f2fc79db4959d9 data/rootsclassic/advancements/recipes/misc/pestle2.json
+7c8878c6a9ae709002aa0511e30779f1ecd22786 data/rootsclassic/advancements/recipes/misc/runic_tablet.json
+4bdf3934f2c10a359e3aa157444ad5679371e930 data/rootsclassic/advancements/recipes/tools/bark_knife.json
 c088f943e5f157821bad91cdd8ca097e558a9f8a data/rootsclassic/recipes/altar.json
 b94f3184c4ae21a6cec69aeb695d57d43860319f data/rootsclassic/recipes/attuned_standing_stone.json
 8686f2329c7fe44e3900eb6da5844e78fc499b2d data/rootsclassic/recipes/bark_knife.json

src/generated/resources/.cache/dd065c0bc7419a740d4130c3c8bac4698f0f4206

@@ -1,3 +1,3 @@
-// 1.19.4	2023-06-11T03:37:51.2584563	Global Loot Modifiers : rootsclassic
+// 1.20	2023-06-11T04:42:08.9524348	Global Loot Modifiers : rootsclassic
 9bb4046fdf6a64fd12d95106257955ca152c2607 data/forge/loot_modifiers/global_loot_modifiers.json
 53dc65d8312b4587cc5fbb24ed94db2d56434521 data/rootsclassic/loot_modifiers/rootsclassic_drops.json

src/generated/resources/data/rootsclassic/advancements/recipes/food/fruit_salad.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:fruit_salad"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/food/rooty_stew.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:rooty_stew"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/altar.json

@@ -28,5 +28,6 @@
     "recipes": [
       "rootsclassic:altar"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/attuned_standing_stone.json

@@ -28,5 +28,6 @@
     "recipes": [
       "rootsclassic:attuned_standing_stone"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/brazier.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:brazier"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/ender_pearl.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:ender_pearl"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/growth_powder.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:growth_powder"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/healing_poultice.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:healing_poultice"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/imbuer.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:imbuer"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/mortar.json

@@ -28,5 +28,6 @@
     "recipes": [
       "rootsclassic:mortar"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/mundane_standing_stone.json

@@ -28,5 +28,6 @@
     "recipes": [
       "rootsclassic:mundane_standing_stone"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/generated/resources/data/rootsclassic/advancements/recipes/misc/mutating_powder.json

@@ -30,5 +30,6 @@
     "recipes": [
       "rootsclassic:mutating_powder"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }