1.21 update!

.github/workflows/build.yml

@@ -15,7 +15,7 @@
           uses: actions/setup-java@v4
           with:
             distribution: temurin
-            java-version: 17
+            java-version: 21
 
         - name: Setup Gradle
           uses: gradle/actions/setup-gradle@v3

.github/workflows/publish.yml

@@ -24,13 +24,13 @@
           uses: actions/setup-java@v4
           with:
             distribution: temurin
-            java-version: 17
+            java-version: 21
 
         - name: Setup Gradle
           uses: gradle/actions/setup-gradle@v3
 
         - name: Build and Publish
-          run: ./gradlew build publishMods publish --stacktrace
+          run: ./gradlew build publishMods --stacktrace
           env:
             MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
             CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}

CHANGELOG.md

@@ -1,6 +1,4 @@
 This version brings additions
 
 #### Forge and Fabric
-- New Pure Liquid!
-- Find in oasises
-- More uses later on
+- Update to 1.21!

build.gradle

@@ -83,26 +83,18 @@ sourceSets {
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-1.20.4:2024.02.25@zip")
-    }
+    mappings loom.officialMojangMappings()
 
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     include modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
-    include modImplementation("com.github.glitchfiend:TerraBlender-fabric:${project.minecraft_version}-${project.terrablender_version}")
+    include modImplementation("com.github.glitchfiend:TerraBlender-fabric:${project.terrablender_version}")
 
     include modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}")
 
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
-    modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
+    // Wait for 1.21 REI. Sorry!!!
 
-    modApi ("me.shedaniel.cloth:cloth-config-fabric:13.0.121") {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
-    modApi "dev.architectury:architectury-fabric:11.1.17"
     // Uncomment the following line to enable the deprecated Fabric API modules.
     // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
 
@@ -118,7 +110,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    it.options.release = 17
+    it.options.release = 21
 }
 
 java {
@@ -163,14 +155,12 @@ modrinth {
     versionName = "Better Biomes Fabric ${mod_name}"
     versionType = "beta"
     uploadFile = remapJar
-    gameVersions = ["1.20.4"]
+    gameVersions = ["1.21"]
     loaders = ["fabric", "quilt"]
     changelog = project.file("CHANGELOG.md").text
     dependencies {
         required.project "fabric-api"
         required.project "terrablender"
-        required.project "notebook-api"
-        optional.project "rei"
     }
 }
 task curseforge(type: TaskPublishCurseForge) {
@@ -179,22 +169,20 @@ task curseforge(type: TaskPublishCurseForge) {
     def mainFile = upload(938715, remapJar)
     mainFile.releaseType = 'beta'
     mainFile.displayName = "Better Biomes Fabric ${mod_name}"
-    mainFile.addGameVersion("1.20.4")
+    mainFile.addGameVersion("1.21")
     mainFile.addModLoader("Quilt")
     mainFile.addJavaVersion("Java 17")
     mainFile.changelog = project.file("CHANGELOG.md").text
     mainFile.changelogType = 'markdown'
     mainFile.addRequirement("fabric-api")
     mainFile.addRequirement("terrablender-fabric")
-    mainFile.addRequirement("notebook-api")
-    mainFile.addOptional("roughly-enough-items")
 }
 githubRelease {
     owner = "CrypticVerse"
     repo = "BetterBiomes"
     tagName = "fabric-${mod_version}"
     releaseName = "Better Biomes Fabric ${mod_name}"
-    targetCommitish = "2.x-1.20.4"
+    targetCommitish = "3.x-1.21"
     prerelease = false
     draft = false
     releaseAssets tasks.remapJar
@@ -205,4 +193,5 @@ tasks.register("publishMods") {
     dependsOn tasks.modrinth
     dependsOn tasks.curseforge
     dependsOn tasks.githubRelease
+    dependsOn tasks.publish
 }

gradle.properties

@@ -4,13 +4,12 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
+minecraft_version=1.21
 loader_version=0.15.11
-terrablender_version=3.3.0.12
-rei_version=14.0.688
-fabric_version=0.96.11+1.20.4
-terraform_wood_api_version=9.0.0
-notebook_version=1.1.10+1.20.4
+terrablender_version=1.21-4.0.0.0
+rei_version=15.0.728
+fabric_version=0.100.1+1.21
+terraform_wood_api_version=11.0.0-alpha.1
 
 # Mod Properties
 mod_version=2.2.1.0-1.20.4

src/main/generated/.cache/00401c9afb79e57c5c0a0e8c960b9c13cd236f26

@@ -1,2 +1,2 @@
-// 1.20.4	2024-06-03T16:53:01.5484417	Better Biomes/Tags for minecraft:fluid
-8e8a175b144e13488126f3568829311dbb89c35b data\minecraft\tags\fluids\water.json
+// 1.21	2024-06-15T17:45:45.2614365	Better Biomes/Tags for minecraft:fluid
+fc4ab7ef4f491c5eb4989de29cbe81c72b0018f9 data\minecraft\tags\fluid\water.json

src/main/generated/.cache/04cdd67837e1ed41e62cbf711f50b4da038903ea

@@ -1,10 +1,10 @@
-// 1.20.4	2024-06-03T16:53:01.5384401	Better Biomes/betterbiomes
+// 1.21	2024-06-15T17:45:45.2554349	Better Biomes/betterbiomes
 32d8a91a69d6bfce2798f0b9970ddadd790fc62c data\betterbiomes\damage_type\reed.json
 daf5b25e846b6fca2e1923ffd095e1c1f0a342fd data\betterbiomes\worldgen\configured_feature\maple.json
 892b7c2080ba69a756b79cb08eebc8748ab5ddf4 data\betterbiomes\worldgen\placed_feature\maple.json
 0f6a77f996f50318647c5adc4a571f885ae79dab data\betterbiomes\worldgen\configured_feature\thin.json
-9fe5bd6f8d1bceae2062b694e9ecf123721e5754 data\betterbiomes\worldgen\placed_feature\reed.json
 52de90f14e0d568f5935f6eb2b90884c22f9e817 data\betterbiomes\worldgen\configured_feature\reed.json
 551999b1a305f643a7c915c40f98bc993ddea300 data\betterbiomes\worldgen\biome\maple_forest.json
+9fe5bd6f8d1bceae2062b694e9ecf123721e5754 data\betterbiomes\worldgen\placed_feature\reed.json
 c283e62405930845289066a6f8d1ff1cb35d4197 data\betterbiomes\worldgen\placed_feature\thin.json
 6ab5004e43318871071f523b5b15215dec254852 data\betterbiomes\worldgen\biome\thin_birch_forest.json

src/main/generated/.cache/37fa80211bdf2dccd5688bf42a278f3250ad5ead

@@ -1,45 +1,45 @@
-// 1.20.4	2024-06-03T16:53:01.5434427	Better Biomes/Recipes
-cb17ea9ca22b8e45db959fbb64d6716ad193288a data\betterbiomes\advancements\recipes\misc\maple_slab.json
-719d1a05867d0f2fbf18f745b3b80bd7372d56f6 data\betterbiomes\advancements\recipes\transportation\maple_hanging_sign.json
-78eb7045aff06339e7350d3b1dd1236f54e67ff1 data\betterbiomes\recipes\maple_fence.json
-1f8284c5e1955c778b489a1be96219312c9bfdd6 data\betterbiomes\advancements\recipes\food\chocolate_pancake.json
-997d3dcffc4333d0333216f454c965618e7767bf data\betterbiomes\recipes\maple_wood.json
-dce2f8834eea1093958e70c5237fb755e32236ee data\betterbiomes\advancements\recipes\food\chocolate_pancake_stack.json
-092da9f2b5d1c0cd9e46287b2daeb518ebbe8728 data\betterbiomes\recipes\maple_hanging_sign.json
-e133a9be2118e56a42ad5dd0df5da2aa4b9ba958 data\betterbiomes\advancements\recipes\misc\maple_button.json
-c1c3982c081323cfe1fe1df7839d083ea5758936 data\betterbiomes\advancements\recipes\misc\maple_wood.json
-aaf6cf0c8861b639c58a7ba79837102ecb1cd6fb data\betterbiomes\recipes\chocolate_pancake_stack.json
-91a6ba4f4a5d964950047bdb55c4fe6109449437 data\betterbiomes\recipes\maple_slab.json
-57c255018d1416946263ac26e59b0364d31817ba data\betterbiomes\recipes\maple_door.json
-5683cea70ea3932d6fee832250070b8b4196d5cf data\betterbiomes\recipes\maple_trapdoor.json
-ccd2b301dce50f8245a49d879277c42d3db7ec3f data\betterbiomes\recipes\maple_syrup_boiler.json
-6e515a925e4f225dd446b6540d387ba5e60a6e82 data\betterbiomes\advancements\recipes\food\maple_pancake.json
-742eba9bba7099c464d0a5ae874123cf262adfec data\betterbiomes\advancements\recipes\misc\maple_pressure_plate.json
-e2079f480b9650a647f1f7546b8c8682f5bb7d22 data\betterbiomes\recipes\maple_boat.json
-736b41239325816388c3e80b47d7263b0fbcc345 data\betterbiomes\recipes\maple_stairs.json
-a5f39f2e2b4c4a73523a535f8746c1e624fff932 data\betterbiomes\advancements\recipes\misc\tapped_bucket.json
-ed4ab60347d4311561ff40b935fae2462d0c40d0 data\betterbiomes\recipes\uncured_maple_syrup.json
-de9368f77053a7f059d26dd3f530ba4e95fb1148 data\betterbiomes\recipes\maple_chest_boat.json
-f7b8c3b7b601d20660099e8b31e66f00b77764db data\betterbiomes\advancements\recipes\misc\maple_syrup_boiler.json
-d62a6fe8d2ef2741308f9b88ac78d23526552be8 data\betterbiomes\recipes\tapped_bucket.json
-96432b92f48966879ac7325cb82378e4d6ad28ff data\betterbiomes\recipes\maple_button.json
-670e55207f96b06a77070e06aa8234f8ea88b125 data\betterbiomes\advancements\recipes\misc\maple_trapdoor.json
-32f719dc5be6d07c9e64a6f9d480f23174da1468 data\betterbiomes\advancements\recipes\food\pancake.json
-8f4428a754b178945e25414afc27c9aac6282268 data\betterbiomes\advancements\recipes\food\pancake_stack.json
-1c287bf234876099d1589db423be768612d32bba data\betterbiomes\advancements\recipes\misc\maple_fence_gate.json
-c540a788b4cd0a5c22aef9640102a4c446e5e40b data\betterbiomes\recipes\pancake.json
-49198f808e11a0ca1367d6d282ba075ccf103389 data\betterbiomes\advancements\recipes\food\maple_pancake_stack.json
-fa15642525ed0f2d1a5ad83f38e4a6f78322a28e data\betterbiomes\advancements\recipes\transportation\maple_sign.json
-694062633bc731ac9dcc1844b9a2c72c7d5110f5 data\betterbiomes\recipes\maple_sign.json
-6a182cebc5d02e38b4f4adc0a6b82aac2720c2c3 data\betterbiomes\recipes\maple_pancake_stack.json
-22b12390648837f3b9e65c9df0be3dab4dff7ff1 data\betterbiomes\advancements\recipes\misc\maple_fence.json
-aaaea2986b3238eef2326a2d55c9e0cf0940ebfe data\betterbiomes\recipes\pancake_stack.json
-b9d0659da3e487f7c0b9ac47547114d462774a49 data\betterbiomes\recipes\maple_pressure_plate.json
-7c5ad1c2e99fbd38422f43746f758cdab41343d9 data\betterbiomes\advancements\recipes\misc\maple_stairs.json
-7ce037835947e7d5e9454a402d852dfd70305a3a data\betterbiomes\recipes\chocolate_pancake.json
-b20598e0df1ee88c808e26de480aa5a0204aecc6 data\betterbiomes\advancements\recipes\transportation\maple_chest_boat.json
-39bdd4e623d9bf551d87cc1ea2da05544c219f59 data\betterbiomes\advancements\recipes\misc\maple_door.json
-59c046b854a7245c9ed6710931b321c6b8560261 data\betterbiomes\advancements\recipes\transportation\maple_boat.json
-b09c8194d3b99620325080a66129be3095bff9c7 data\betterbiomes\recipes\maple_fence_gate.json
-c3abdc7ae69aea9d1c40ac4b793f5fd187ecca2b data\betterbiomes\advancements\recipes\misc\uncured_maple_syrup.json
-8ace40c1bb8f4de545e91eac7b1bc63cc94ffc0f data\betterbiomes\recipes\maple_pancake.json
+// 1.21	2024-06-15T17:45:45.2584359	Better Biomes/Recipes
+2b20a51e98a1b1fcc45257d8bad46d502ef73734 data\betterbiomes\advancement\recipes\misc\maple_slab.json
+c6aa34aecab18263bb6a1df261cefaece6f5651d data\betterbiomes\recipe\maple_door.json
+85edec3a11155f3a2789183f467193480e86756b data\betterbiomes\advancement\recipes\misc\maple_syrup_boiler.json
+1cf412a2edef7e6c9d0379127b93659c99102861 data\betterbiomes\recipe\maple_pressure_plate.json
+bf43c39c23b276bb090eee3b89f577a4f7a5d7e4 data\betterbiomes\recipe\maple_hanging_sign.json
+6ec5f710ddb9986cec18e2119769802e5283b873 data\betterbiomes\recipe\maple_syrup_boiler.json
+9873bf4151d7c9645e6fc9c6956d3299f737d37b data\betterbiomes\advancement\recipes\misc\maple_door.json
+256cb5240cee2637655df466e87e9df78bbbb6e0 data\betterbiomes\advancement\recipes\food\pancake.json
+dd90971adf9cdee83f1aa141304d433cdfc8605c data\betterbiomes\advancement\recipes\misc\maple_pressure_plate.json
+28816498d9c6873fddf0e83208c24e166f09b169 data\betterbiomes\recipe\maple_chest_boat.json
+ee011ec2983d40abee0f7d01aab522e505be0fb7 data\betterbiomes\recipe\maple_fence_gate.json
+c2ab75b49562393d575cd3bab3e0393449a722ac data\betterbiomes\advancement\recipes\food\maple_pancake_stack.json
+0af184068ca37965ae7f838282685c2d1dc036f5 data\betterbiomes\advancement\recipes\food\chocolate_pancake.json
+1882c39ebdab7b2b314233364ca0dc0508fd306c data\betterbiomes\recipe\maple_pancake_stack.json
+984afa2dbb552a2fbae5a23ec921065df5941d52 data\betterbiomes\recipe\maple_slab.json
+e4856ec037292ffc793136fcff2d143632b9af90 data\betterbiomes\advancement\recipes\misc\uncured_maple_syrup.json
+616a38bfc771b9f6c5482d02529d8911c4e2a4e3 data\betterbiomes\advancement\recipes\misc\maple_wood.json
+8e5d2524f1fef3677f226ab9b34aa6bf1fc1f64e data\betterbiomes\advancement\recipes\transportation\maple_sign.json
+9629cb9d7803b841a455e23e453228f92df20dc8 data\betterbiomes\recipe\chocolate_pancake_stack.json
+82d0d6d8239f7638729b9cf74e8b7021bdd8be6e data\betterbiomes\advancement\recipes\misc\maple_button.json
+78cda06275b734eb2158ba8632699a6b827863eb data\betterbiomes\advancement\recipes\transportation\maple_hanging_sign.json
+3861ac0d490af2e37e94575013c79e291a94925d data\betterbiomes\recipe\maple_pancake.json
+9ff1bea149bb6e0a0a5ef59bd0cbb673a8f5960a data\betterbiomes\recipe\maple_stairs.json
+eb117045c6071ea8d179b3324b0962f88e5e17f8 data\betterbiomes\recipe\pancake.json
+c9d2803159e7e80eba28938b532613a936c4fa4b data\betterbiomes\recipe\tapped_bucket.json
+418ea6c5f236cb9272db79ea7ae0169a2b30ef5f data\betterbiomes\advancement\recipes\food\chocolate_pancake_stack.json
+572a62787edfdeae114a79e6d73a68496aa01d41 data\betterbiomes\recipe\chocolate_pancake.json
+238483147f5ffb3ddcd4401a99acd3f0f5026039 data\betterbiomes\advancement\recipes\misc\maple_fence.json
+e94c673dc709aefddfb8c9590f669823aafb1582 data\betterbiomes\advancement\recipes\transportation\maple_chest_boat.json
+d77724f18c158908429f04c5c296024546e62c4e data\betterbiomes\recipe\maple_button.json
+111488c02801d8c107ecb9cf5560a54f427ea478 data\betterbiomes\recipe\maple_boat.json
+708415ef77c21088bade79931fb8b3c74310ab0a data\betterbiomes\advancement\recipes\food\pancake_stack.json
+c274eb298798cad744efc099ee7b5a0bce726862 data\betterbiomes\recipe\maple_fence.json
+46a3cc3aac93982f3838bd52cdc469bdf1a23efa data\betterbiomes\advancement\recipes\transportation\maple_boat.json
+3714c0014dc7c1ddef7576a5d3c1b87ea553ab26 data\betterbiomes\advancement\recipes\misc\maple_trapdoor.json
+bd90a079ff68262d023ae4ee4297befed172a789 data\betterbiomes\advancement\recipes\misc\tapped_bucket.json
+f09effd2d33f19ccee1335d9103fef60ddb3d241 data\betterbiomes\advancement\recipes\misc\maple_fence_gate.json
+42bc5a50692edd379e8a2b65778212bc17ea6ef2 data\betterbiomes\advancement\recipes\food\maple_pancake.json
+ec394963a8a7f25569b41c86db9d9f743295e68d data\betterbiomes\recipe\maple_wood.json
+d2abfcfd6d9ac7614a5f341ab8e73fa047f96ed8 data\betterbiomes\recipe\maple_trapdoor.json
+514b3567083395166c44bcdbb65c4e3f01f0b46b data\betterbiomes\advancement\recipes\misc\maple_stairs.json
+d7d6f0de430a26543eeabf4331c50d1c89a538a5 data\betterbiomes\recipe\uncured_maple_syrup.json
+1f1d5a7e7c31482813dc350adc884e95d5ae32d5 data\betterbiomes\recipe\maple_sign.json
+ebef996a9381e0e6efb4e0dc8a73c2d18006a58a data\betterbiomes\recipe\pancake_stack.json

src/main/generated/.cache/3e49fd16f841b0ea6fe3421610a602a4cbc31304

@@ -1,13 +1,13 @@
-// 1.20.4	2024-06-03T16:53:01.5424408	Better Biomes/Tags for minecraft:item
-7b6116d59392ccea07514ede4a8a8d4b8f655643 data\minecraft\tags\items\oak_logs.json
-8a5877d80d4ac1e7844c9ff3f6a6ee1d963ed57b data\minecraft\tags\items\leaves.json
-7d7cd3f6edf5e35f2aa925e300eca503d050b984 data\minecraft\tags\items\jungle_logs.json
-ef1ae98e462bb06674eb31062e83e0f02c82f881 data\minecraft\tags\items\planks.json
-5ddbc0be9a7cff15f816d00f5dc756a6600b7f02 data\betterbiomes\tags\items\maple_logs.json
-d722282e73501bce87bcda1f1110ec0c73a0e765 data\minecraft\tags\items\dark_oak_logs.json
-c71f1638ca3985a4779631f7797d22127f5f4595 data\minecraft\tags\items\logs_that_burn.json
-9f9c6a08114c679f7ff74392be1da6244eab0360 data\minecraft\tags\items\mangrove_logs.json
-44fffcace05981432cfe437fdf9da83ed0d75caf data\minecraft\tags\items\spruce_logs.json
-83b8aebb6560f7692d1767e13e5abb729450c407 data\minecraft\tags\items\acacia_logs.json
-a594d68da0d1abcee37cda4eea530149680a8e46 data\minecraft\tags\items\birch_logs.json
-e880e9ab84852a8c728ebbdc4202975b6ac789ca data\minecraft\tags\items\cherry_logs.json
+// 1.21	2024-06-15T17:45:45.2584359	Better Biomes/Tags for minecraft:item
+86e654fc602d397c5701769be473dc179dcc7bb0 data\minecraft\tags\item\acacia_logs.json
+9fbef0fe7d6cf4bb6e89f226dfc6761799b4c2d1 data\minecraft\tags\item\mangrove_logs.json
+90c49c994b9f69d095fa8efc833beef0ce18ea49 data\minecraft\tags\item\jungle_logs.json
+471841d11d3b96bd64ae11bf11ac37343f3707db data\minecraft\tags\item\logs_that_burn.json
+4ffb68838a21391d53bc17e2ffa5a31277705bda data\minecraft\tags\item\birch_logs.json
+532d611487dd5fc2dc57373c2cebfd5c1fce7879 data\betterbiomes\tags\item\maple_logs.json
+ba3e79d07519967617c364cf2198b397d334eb73 data\minecraft\tags\item\spruce_logs.json
+93c3a32c9b417d0475434ff54811d399114c7bf9 data\minecraft\tags\item\cherry_logs.json
+09e3e245578d544dec59ea1fe9ad735ad3b09efc data\minecraft\tags\item\leaves.json
+5e5be22e4f199f5e42aca275808e05d6e563144f data\minecraft\tags\item\oak_logs.json
+2982743d0f693b0960bfc9ed4c75a8a11d2097e0 data\minecraft\tags\item\planks.json
+bf9b466d0d32c91bd2da7113013c36dbfa4ef7b2 data\minecraft\tags\item\dark_oak_logs.json