Pure water and oasis upgrades. 2.2.1.0

.github/workflows/publish.yml

@@ -21,9 +21,23 @@
           uses: gradle/actions/setup-gradle@v3
 
         - name: Build and Publish
-          run: ./gradlew build publishMods --stacktrace
+          run: ./gradlew build publishMods publish --stacktrace
           env:
             MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
             CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            MAVEN_URL: ${{ secrets.MAVEN_URL }}
+
+        - name: Checkout M2 Repo
+          uses: actions/checkout@v4
+          with:
+            repository: 'BookkeepersMC/m2'
+            ref: 'master'
+            token: ${{ secrets.GITHUB_TOKEN }}
+
+        - name: Commit artifacts to m2 repo
+          uses: BookkeepersMC/actions@v1
+          with:
+            add: 'net/*'
+            default_author: CrypticVerse
+            cwd: "./home/runner/work/m2/m2"
+            message: "Publish Better Biomes"

CHANGELOG.md

@@ -1,4 +1,6 @@
 This version brings additions
 
 #### Forge and Fabric
-- Make pre-releases official!
+- New Pure Liquid!
+- Find in oasises
+- More uses later on

build.gradle

@@ -92,8 +92,6 @@ dependencies {
 
     include modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
-    include modImplementation("com.bookkeepersmc:Notebook-api-fabric-${minecraft_version}:${notebook_version}")
-
     include modImplementation("com.github.glitchfiend:TerraBlender-fabric:${project.minecraft_version}-${project.terrablender_version}")
 
     include modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}")
@@ -137,17 +135,24 @@ jar {
     }
 }
 
+idea {
+    module {
+        downloadSources = true
+        downloadJavadoc = true
+    }
+}
+
 // configure the maven publication
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifactId = "BetterBiomes-Fabric"
             from components.java
         }
     }
     repositories {
         maven {
-            url = System.getenv("MAVEN_URL").toString()
+            // NEVER RUN MANUALLY!!!!!!!!!! this is used by gh actions to commit these changes to the m2 repo
+            url = "file://${project.projectDir}/"
         }
     }
 }

gradle.properties

@@ -5,15 +5,15 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.20.4
-loader_version=0.15.9
+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
 
 # Mod Properties
-mod_version=2.2.0.0-1.20.4
-mod_name=2.2.0.0
+mod_version=2.2.1.0-1.20.4
+mod_name=2.2.1.0
 maven_group=net.crypticverse.betterbiomes
 archives_base_name=betterbiomes-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle

@@ -7,4 +7,6 @@ pluginManagement {
 		mavenCentral()
 		gradlePluginPortal()
 	}
-}
+}
+
+rootProject.name = 'BetterBiomes-Fabric'

src/main/generated/.cache/00401c9afb79e57c5c0a0e8c960b9c13cd236f26

@@ -1 +1,2 @@
-// 1.20.4	2024-03-31T11:55:47.910462	Better Biomes/Tags for minecraft:fluid
+// 1.20.4	2024-06-03T12:40:03.994025	Better Biomes/Tags for minecraft:fluid
+8e8a175b144e13488126f3568829311dbb89c35b data\minecraft\tags\fluids\water.json

src/main/generated/.cache/04cdd67837e1ed41e62cbf711f50b4da038903ea

@@ -1,10 +1,10 @@
-// 1.20.4	2024-03-31T11:55:47.9014623	Better Biomes/betterbiomes
-9fe5bd6f8d1bceae2062b694e9ecf123721e5754 data\betterbiomes\worldgen\placed_feature\reed.json
-daf5b25e846b6fca2e1923ffd095e1c1f0a342fd data\betterbiomes\worldgen\configured_feature\maple.json
+// 1.20.4	2024-06-03T12:40:03.9860243	Better Biomes/betterbiomes
 32d8a91a69d6bfce2798f0b9970ddadd790fc62c data\betterbiomes\damage_type\reed.json
-c283e62405930845289066a6f8d1ff1cb35d4197 data\betterbiomes\worldgen\placed_feature\thin.json
+daf5b25e846b6fca2e1923ffd095e1c1f0a342fd data\betterbiomes\worldgen\configured_feature\maple.json
 892b7c2080ba69a756b79cb08eebc8748ab5ddf4 data\betterbiomes\worldgen\placed_feature\maple.json
-551999b1a305f643a7c915c40f98bc993ddea300 data\betterbiomes\worldgen\biome\maple_forest.json
-52de90f14e0d568f5935f6eb2b90884c22f9e817 data\betterbiomes\worldgen\configured_feature\reed.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
+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-03-31T11:55:47.9064622	Better Biomes/Recipes
-22b12390648837f3b9e65c9df0be3dab4dff7ff1 data\betterbiomes\advancements\recipes\misc\maple_fence.json
-1c287bf234876099d1589db423be768612d32bba data\betterbiomes\advancements\recipes\misc\maple_fence_gate.json
-8f4428a754b178945e25414afc27c9aac6282268 data\betterbiomes\advancements\recipes\food\pancake_stack.json
-c3abdc7ae69aea9d1c40ac4b793f5fd187ecca2b data\betterbiomes\advancements\recipes\misc\uncured_maple_syrup.json
-736b41239325816388c3e80b47d7263b0fbcc345 data\betterbiomes\recipes\maple_stairs.json
-b9d0659da3e487f7c0b9ac47547114d462774a49 data\betterbiomes\recipes\maple_pressure_plate.json
-092da9f2b5d1c0cd9e46287b2daeb518ebbe8728 data\betterbiomes\recipes\maple_hanging_sign.json
-7c5ad1c2e99fbd38422f43746f758cdab41343d9 data\betterbiomes\advancements\recipes\misc\maple_stairs.json
-ed4ab60347d4311561ff40b935fae2462d0c40d0 data\betterbiomes\recipes\uncured_maple_syrup.json
-8ace40c1bb8f4de545e91eac7b1bc63cc94ffc0f data\betterbiomes\recipes\maple_pancake.json
-96432b92f48966879ac7325cb82378e4d6ad28ff data\betterbiomes\recipes\maple_button.json
+// 1.20.4	2024-06-03T12:40:03.990025	Better Biomes/Recipes
+cb17ea9ca22b8e45db959fbb64d6716ad193288a data\betterbiomes\advancements\recipes\misc\maple_slab.json
 719d1a05867d0f2fbf18f745b3b80bd7372d56f6 data\betterbiomes\advancements\recipes\transportation\maple_hanging_sign.json
-de9368f77053a7f059d26dd3f530ba4e95fb1148 data\betterbiomes\recipes\maple_chest_boat.json
-91a6ba4f4a5d964950047bdb55c4fe6109449437 data\betterbiomes\recipes\maple_slab.json
-e133a9be2118e56a42ad5dd0df5da2aa4b9ba958 data\betterbiomes\advancements\recipes\misc\maple_button.json
-742eba9bba7099c464d0a5ae874123cf262adfec data\betterbiomes\advancements\recipes\misc\maple_pressure_plate.json
-aaaea2986b3238eef2326a2d55c9e0cf0940ebfe data\betterbiomes\recipes\pancake_stack.json
 78eb7045aff06339e7350d3b1dd1236f54e67ff1 data\betterbiomes\recipes\maple_fence.json
-c540a788b4cd0a5c22aef9640102a4c446e5e40b data\betterbiomes\recipes\pancake.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
-32f719dc5be6d07c9e64a6f9d480f23174da1468 data\betterbiomes\advancements\recipes\food\pancake.json
-7ce037835947e7d5e9454a402d852dfd70305a3a data\betterbiomes\recipes\chocolate_pancake.json
-997d3dcffc4333d0333216f454c965618e7767bf data\betterbiomes\recipes\maple_wood.json
-b09c8194d3b99620325080a66129be3095bff9c7 data\betterbiomes\recipes\maple_fence_gate.json
-d62a6fe8d2ef2741308f9b88ac78d23526552be8 data\betterbiomes\recipes\tapped_bucket.json
-49198f808e11a0ca1367d6d282ba075ccf103389 data\betterbiomes\advancements\recipes\food\maple_pancake_stack.json
-a5f39f2e2b4c4a73523a535f8746c1e624fff932 data\betterbiomes\advancements\recipes\misc\tapped_bucket.json
-e2079f480b9650a647f1f7546b8c8682f5bb7d22 data\betterbiomes\recipes\maple_boat.json
-6e515a925e4f225dd446b6540d387ba5e60a6e82 data\betterbiomes\advancements\recipes\food\maple_pancake.json
-cb17ea9ca22b8e45db959fbb64d6716ad193288a data\betterbiomes\advancements\recipes\misc\maple_slab.json
-1f8284c5e1955c778b489a1be96219312c9bfdd6 data\betterbiomes\advancements\recipes\food\chocolate_pancake.json
-39bdd4e623d9bf551d87cc1ea2da05544c219f59 data\betterbiomes\advancements\recipes\misc\maple_door.json
-b20598e0df1ee88c808e26de480aa5a0204aecc6 data\betterbiomes\advancements\recipes\transportation\maple_chest_boat.json
-f7b8c3b7b601d20660099e8b31e66f00b77764db data\betterbiomes\advancements\recipes\misc\maple_syrup_boiler.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
-59c046b854a7245c9ed6710931b321c6b8560261 data\betterbiomes\advancements\recipes\transportation\maple_boat.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
-aaf6cf0c8861b639c58a7ba79837102ecb1cd6fb data\betterbiomes\recipes\chocolate_pancake_stack.json
-5683cea70ea3932d6fee832250070b8b4196d5cf data\betterbiomes\recipes\maple_trapdoor.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

src/main/generated/.cache/3e49fd16f841b0ea6fe3421610a602a4cbc31304

@@ -1,13 +1,13 @@
-// 1.20.4	2024-03-31T11:55:47.9054625	Better Biomes/Tags for minecraft:item
-e880e9ab84852a8c728ebbdc4202975b6ac789ca data\minecraft\tags\items\cherry_logs.json
+// 1.20.4	2024-06-03T12:40:03.9890257	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
-9f9c6a08114c679f7ff74392be1da6244eab0360 data\minecraft\tags\items\mangrove_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
-a594d68da0d1abcee37cda4eea530149680a8e46 data\minecraft\tags\items\birch_logs.json
-7b6116d59392ccea07514ede4a8a8d4b8f655643 data\minecraft\tags\items\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
-ef1ae98e462bb06674eb31062e83e0f02c82f881 data\minecraft\tags\items\planks.json
-8a5877d80d4ac1e7844c9ff3f6a6ee1d963ed57b data\minecraft\tags\items\leaves.json
 83b8aebb6560f7692d1767e13e5abb729450c407 data\minecraft\tags\items\acacia_logs.json
-c71f1638ca3985a4779631f7797d22127f5f4595 data\minecraft\tags\items\logs_that_burn.json
+a594d68da0d1abcee37cda4eea530149680a8e46 data\minecraft\tags\items\birch_logs.json
+e880e9ab84852a8c728ebbdc4202975b6ac789ca data\minecraft\tags\items\cherry_logs.json