Updated to 1.20.6

.github/ISSUE_TEMPLATE/1-bug_report.yml

@@ -1,4 +1,4 @@
-name: 1.20.4+ Bug Report
+name: 1.20.6+ Bug Report
 description: File a bug report
 labels: [bug]
 body:

.github/ISSUE_TEMPLATE/2-crash_report.yml

@@ -1,4 +1,4 @@
-name: 1.20.4+ Crash Report
+name: 1.20.6+ Crash Report
 description: File a crash report
 labels: [crash]
 body:

.github/ISSUE_TEMPLATE/3-feature_request.yml

@@ -1,4 +1,4 @@
-name: 1.20.4+ Feature Request
+name: 1.20.6+ Feature Request
 description: Request a new feature
 labels: [feature]
 body:

.github/workflows/gradle-publish.yml

@@ -14,30 +14,30 @@
        with:
          fetch-depth: 0
          fetch-tags: true
-     - name: Set up JDK 17
-       uses: actions/setup-java@v3
-       with:
-         java-version: '17'
-         distribution: 'oracle'
-         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-         settings-path: ${{ github.workspace }} # location for the settings.xml file
-     - name: Setup Gradle
-       uses: gradle/gradle-build-action@v2
-     - name: Publish
-       run: ./gradlew publish
-       env:
-         MAVEN_USER: ${{ secrets.MAVEN_USER }}
-         MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-         BUILD_NUMBER: ${{ github.run_number }}
-     - name: CurseForge Publish
-       run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
-       env:
-         CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
-         BUILD_NUMBER: ${{ github.run_number }}
-       continue-on-error: true
-     - name: Modrinth Publish
-       run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
-       env:
-         MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-         BUILD_NUMBER: ${{ github.run_number }}
-       continue-on-error: true
+#     - name: Set up JDK 21
+#       uses: actions/setup-java@v3
+#       with:
+#         java-version: '21'
+#         distribution: 'oracle'
+#         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+#         settings-path: ${{ github.workspace }} # location for the settings.xml file
+#     - name: Setup Gradle
+#       uses: gradle/gradle-build-action@v2
+#     - name: Publish
+#       run: ./gradlew publish
+#       env:
+#         MAVEN_USER: ${{ secrets.MAVEN_USER }}
+#         MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+#         BUILD_NUMBER: ${{ github.run_number }}
+#     - name: CurseForge Publish
+#       run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
+#       env:
+#         CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
+#         BUILD_NUMBER: ${{ github.run_number }}
+#       continue-on-error: true
+#     - name: Modrinth Publish
+#       run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
+#       env:
+#         MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+#         BUILD_NUMBER: ${{ github.run_number }}
+#       continue-on-error: true

build.gradle

@@ -49,7 +49,7 @@ subprojects {
 
     version = "${minecraft_version}-${mod_version}"
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
     java.withSourcesJar()
 
     jar {
@@ -83,7 +83,7 @@ subprojects {
 
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = 'UTF-8'
-        it.options.release.set(17)
+        it.options.release.set(21)
     }
 
     processResources {
@@ -98,7 +98,7 @@ subprojects {
             mod_discord_url     : mod_discord_url,
             mod_license         : mod_license
         ]
-        filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', "*.mixins.json"]) {
+        filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', 'META-INF/neoforge.mods.toml', "*.mixins.json"]) {
             expand expandProps
         }
         inputs.properties(expandProps)

common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -1,4 +1,4 @@
-// 1.20.4	2024-04-02T21:00:35.567177	Registries
+// 1.20.6	2024-05-05T11:55:32.2531647	Registries
 bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
 41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
 1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
@@ -114,22 +114,22 @@ cd2b9f82f108fe30dd3a4a878bd7216a37c98091 data/biomesoplenty/worldgen/configured_
 08290748a4feb659eabc32c099b036ba04f3d930 data/biomesoplenty/worldgen/configured_feature/dead_tree_wasteland.json
 599fe99edb01b6d56389ca55908717765a1ea2cb data/biomesoplenty/worldgen/configured_feature/dead_twiglet_tree.json
 b725b186faf96d8bf990458b9559690d4b630a6e data/biomesoplenty/worldgen/configured_feature/dead_twiglet_tree_small.json
-3b0961f953b1a4384bc8b86074f534fa6c657a67 data/biomesoplenty/worldgen/configured_feature/disk_black_sand.json
-6080b951f0ef4d59955f29c226ef469621b4e534 data/biomesoplenty/worldgen/configured_feature/disk_calcite.json
-bc949791fd28fc05e341147cfc7298db9a30a7e7 data/biomesoplenty/worldgen/configured_feature/disk_gravel_extra.json
-e1061ccb981bba9ea561e9741bd73beedee0faa0 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_basalt.json
-ec32f214d8a8878c92dc687211e549e807d411b7 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_calcite.json
-41b13c031de90aa10112146980e16e28afa4dfe1 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_gravel.json
-39f32524355775a2aaa13db13129a75d831470a8 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_packed_mud.json
-b35f010f25e98eb3652c4d177268e089638b85a1 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_thermal_calcite.json
-5a0dcec2ace77b2e1ea31534938a3ec5cda18b58 data/biomesoplenty/worldgen/configured_feature/disk_mud.json
-d9b7c38b6c87551455bd1a8db476426235ac25e7 data/biomesoplenty/worldgen/configured_feature/disk_orange_sand.json
-593d885e52a4c5028d872c612ea2bbfa71ceb4fa data/biomesoplenty/worldgen/configured_feature/disk_volcano_black_sandstone.json
-ddd5cf32a45e1a8912a5fba97f2dab3431792537 data/biomesoplenty/worldgen/configured_feature/disk_volcano_magma.json
-ed89ea4c769889c41e7f9603f59a43a86dab7eb3 data/biomesoplenty/worldgen/configured_feature/disk_volcano_smooth_basalt.json
-7f2e0e858755f8995d0b42fc1215c455024a0158 data/biomesoplenty/worldgen/configured_feature/disk_white_sand.json
-eb32815d593d6f64b435a5740d0ef633abecb03c data/biomesoplenty/worldgen/configured_feature/disk_white_sandstone.json
-7f4bf23ce72cc7d3bca36ffdb4864fe6497de431 data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json
+928634810fa93379ce2a547083670b1b15c954f6 data/biomesoplenty/worldgen/configured_feature/disk_black_sand.json
+3a94c16d8b98c11bdbb1a150891f10b21d495071 data/biomesoplenty/worldgen/configured_feature/disk_calcite.json
+c1bfb60e471030f0560b0811277becdb48534717 data/biomesoplenty/worldgen/configured_feature/disk_gravel_extra.json
+be6a683d925bed695bb82994e9a272d912b2db06 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_basalt.json
+2b9efd1534048e0ea4aa6d0da5e18f4cf8b69007 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_calcite.json
+29eb9ae483194defe331532d184bd3d7cdc34491 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_gravel.json
+58852fb032a122b38833f5552fb78835dd64dff6 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_packed_mud.json
+ac085b384260879cb2419e06e2bba63d8c1d361e data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_thermal_calcite.json
+8bc018cfea871aa788f56f04cbaf2484e126cc54 data/biomesoplenty/worldgen/configured_feature/disk_mud.json
+c563ad258883fd395ecb8660e9d0eb8146de08c3 data/biomesoplenty/worldgen/configured_feature/disk_orange_sand.json
+293a102cbf011fcd50957136b847a141d8a415ca data/biomesoplenty/worldgen/configured_feature/disk_volcano_black_sandstone.json
+2402a0183690723f44d7f385724c463e4c0f0988 data/biomesoplenty/worldgen/configured_feature/disk_volcano_magma.json
+5ed10914f9d87eb4b4a2bf024d6a3f17a0397f57 data/biomesoplenty/worldgen/configured_feature/disk_volcano_smooth_basalt.json
+be36cdc53e41b5a257de388f7b98ec72d702a506 data/biomesoplenty/worldgen/configured_feature/disk_white_sand.json
+5f1f3dc0f032c5f697463dc30cb1b14ce51d24cd data/biomesoplenty/worldgen/configured_feature/disk_white_sandstone.json
+a1bba8c3cff391c97f25a6c8efd61a148175f49e data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json
 3dae5b2ef0083880df71c23055035a7419d6b29b data/biomesoplenty/worldgen/configured_feature/dripstone_splatter.json
 4e41d0e05784172880bed9933f984af09933c869 data/biomesoplenty/worldgen/configured_feature/dying_tree.json
 4acbdd9bf7bf6740488eec2ad2b414f9a7045a65 data/biomesoplenty/worldgen/configured_feature/dying_tree_wasteland.json
@@ -173,13 +173,13 @@ b7c8479b58bf928126528554a624b24b31e271c9 data/biomesoplenty/worldgen/configured_
 e61a36facff8a5ebc08130e6bf1d0ad698ee0c2d data/biomesoplenty/worldgen/configured_feature/giant_tree.json
 058d0fbddf7d5401d3ce43a8ff48495914d0d2a7 data/biomesoplenty/worldgen/configured_feature/glowing_grotto_ceiling_plants.json
 8548fcda4d231ff1fd559b533a744d05679ddd7d data/biomesoplenty/worldgen/configured_feature/glowing_grotto_floor_plants.json
-e965af2123aa8370d24048c005c943a83de6b679 data/biomesoplenty/worldgen/configured_feature/glowing_moss_patch.json
-a58a9feee8ed675421187fc4bd393b2458c79481 data/biomesoplenty/worldgen/configured_feature/glowing_moss_patch_bonemeal.json
-465dd2845e4f36d543c30bf84b4126159e41a0d3 data/biomesoplenty/worldgen/configured_feature/glowing_moss_patch_bonemeal_bottom.json
-cf8d22a77f9689ec358e1588f9059addb2000cf9 data/biomesoplenty/worldgen/configured_feature/glowworm_silk.json
+1cb6a8a68b979adcfa1535fb1d1db6870ebd186e data/biomesoplenty/worldgen/configured_feature/glowing_moss_patch.json
+ce9fa912ec2c173c46b7cf7cd64049f18052b92d data/biomesoplenty/worldgen/configured_feature/glowing_moss_patch_bonemeal.json
+bf90b09138dba6d2a0361484bc1cb210c3a59a77 data/biomesoplenty/worldgen/configured_feature/glowing_moss_patch_bonemeal_bottom.json
+35a3c49db1bbd7b9db17f38b2ea01e3cccc7362c data/biomesoplenty/worldgen/configured_feature/glowworm_silk.json
 fdc974dfafbf4a7658e36a1c3ab88f7d08ce99e2 data/biomesoplenty/worldgen/configured_feature/goldenrod.json
 6d3c2a7a45a0663fce2968d5151036de0e606e34 data/biomesoplenty/worldgen/configured_feature/hair.json
-1720fccad2a1c008866928baaabe5ea6b7105beb data/biomesoplenty/worldgen/configured_feature/hanging_cobweb.json
+199afe709ca0eb14c968a4383f70ad8dd6f670ae data/biomesoplenty/worldgen/configured_feature/hanging_cobweb.json
 0a41fd780977f719f967a075fc408c0fb8f37da1 data/biomesoplenty/worldgen/configured_feature/hanging_flesh_tendon.json
 6e7f8c0abb00c5857d368ffccaa4d27077420621 data/biomesoplenty/worldgen/configured_feature/hellbark_tree.json
 88e47f74faa560f597703adf818f2725fb0b8f9e data/biomesoplenty/worldgen/configured_feature/high_grass.json
@@ -198,7 +198,7 @@ ff586ddbcea23f843447b2b046db40beb8ff87f1 data/biomesoplenty/worldgen/configured_
 d35bf3c1e11553184b23b3eb257d08f0b1ded418 data/biomesoplenty/worldgen/configured_feature/jungle_bush.json
 bccd849ed1fd3f32daad2b1f705c30f834c20f96 data/biomesoplenty/worldgen/configured_feature/jungle_twiglet_tree.json
 e6c40fcb31d153fc2379756e7f97f99cd816a51f data/biomesoplenty/worldgen/configured_feature/large_fumarole.json
-a8aa7c8ae1c6881f8951d829a780767d266906cc data/biomesoplenty/worldgen/configured_feature/large_rose_quartz.json
+dae0a1ba6f5534a72d7a71a9d38f6c9494e21bed data/biomesoplenty/worldgen/configured_feature/large_rose_quartz.json
 863215c984d1e63a8021b3117febf08233b183d4 data/biomesoplenty/worldgen/configured_feature/lava_lake_volcano.json
 bc7a09901e7f698ce8bfd34adbc13b3c22495df2 data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json
 d8bd16e51de0100b1d889553f4db0a8bd0293ebe data/biomesoplenty/worldgen/configured_feature/liquid_null_spring.json
@@ -211,7 +211,7 @@ b5e4c509d7abd098aa93dadce54a8533dc692d63 data/biomesoplenty/worldgen/configured_
 a6e83b4f1b4a43b5bcb4e5625095fbbde09a13f8 data/biomesoplenty/worldgen/configured_feature/monolith.json
 172efe6d9b7c70c459409e0b454ffc27bd7c7735 data/biomesoplenty/worldgen/configured_feature/mossy_black_sand_splatter.json
 d6d5e186672bad3ad86b6c611d6b2bd3d4aee3a3 data/biomesoplenty/worldgen/configured_feature/moss_splatter.json
-397835a0d2b8cd9763552f0439633921e0620061 data/biomesoplenty/worldgen/configured_feature/mud_patch.json
+2b61bbe51f8954e912e3bd7bba3a1cf1da5b095b data/biomesoplenty/worldgen/configured_feature/mud_patch.json
 882eec10122c22a5a16f28079134d0e1a956daa1 data/biomesoplenty/worldgen/configured_feature/mud_plants.json
 d084d0061cb1e43b9be194ace27e38c5ab0029fa data/biomesoplenty/worldgen/configured_feature/mud_splatter.json
 d0604daa873d67e12bd3f0ce62d7994671c5b124 data/biomesoplenty/worldgen/configured_feature/mycelium_splatter.json
@@ -274,7 +274,7 @@ ca3184df9eb3aeafd43c2de175c9e041fb97feed data/biomesoplenty/worldgen/configured_
 f2378e3c6e5a6759f5dc23d5386851c304a189f6 data/biomesoplenty/worldgen/configured_feature/small_glowshroom_cave.json
 5f502ab11b0a04c491190261e0f9e011b16a2fb6 data/biomesoplenty/worldgen/configured_feature/small_red_mushroom.json
 5ca7d5e702fec44275b8ab910d823648bddd8837 data/biomesoplenty/worldgen/configured_feature/small_toadstool.json
-5b7de709e8e8433bf6c352e7ecdab52ce58910db data/biomesoplenty/worldgen/configured_feature/snowblossom_tree.json
+58409bc05236186142200cc110589ec551fa2266 data/biomesoplenty/worldgen/configured_feature/snowblossom_tree.json
 d7e80d57be0f65c68e009a3fd868f2c551c03c2c data/biomesoplenty/worldgen/configured_feature/snowblossom_twiglet_tree.json
 f9e433aba0886753c79fc8ccce4d8a060101f0f4 data/biomesoplenty/worldgen/configured_feature/sparse_acacia_tree.json
 5b536b003147b324e218f2148075d2cb220ce2e3 data/biomesoplenty/worldgen/configured_feature/sparse_dune_grass.json
@@ -330,7 +330,7 @@ bf541c17022068e4679cb496b24e8e0cc0c437e8 data/biomesoplenty/worldgen/configured_
 a4fd2cddf6d33adc3b3ee36c61d8abc60eeaf22b data/biomesoplenty/worldgen/configured_feature/trees_scrubland.json
 550e4350d5d189145ed852f894f789405bb0f22b data/biomesoplenty/worldgen/configured_feature/trees_seasonal_forest.json
 8b971a958d2ca8bb6d881e7e7950c8b3bcf60954 data/biomesoplenty/worldgen/configured_feature/trees_seasonal_pumpkin_patch.json
-5b7de709e8e8433bf6c352e7ecdab52ce58910db data/biomesoplenty/worldgen/configured_feature/trees_snowblossom_grove.json
+58409bc05236186142200cc110589ec551fa2266 data/biomesoplenty/worldgen/configured_feature/trees_snowblossom_grove.json
 a163b4897c68b965e8c8fdcd2f28daa563684085 data/biomesoplenty/worldgen/configured_feature/trees_snowy_coniferous_forest.json
 3875507d8666634a2dda2f69343638cd29260640 data/biomesoplenty/worldgen/configured_feature/trees_snowy_maple_forest.json
 8a80a42aee701cfb732b05ccc78af242f38c6f04 data/biomesoplenty/worldgen/configured_feature/trees_tropics.json