Make Pre-releases official (#13)

* Implement the oasis structure

* Oasis structure v2

* Oasis structure v3

* Condense statements

* Thin forest and logs

* Spotless

* Waterlogged Thin Logs

* ParchmentMC

* Loot Chest inside oasis

* Reed plant

* Lang stuff

* Bump some deps

* Finally ready for pre-release!

* Advancements! again!

* Advancements! again!

* Advancements! again!

* Spotless

* we're doing this again huh...

* Pre-Release 2

* Pre-Release 2 2nd try

* Update to Loader 0.15.9

.github/workflows/build.yml

@@ -21,7 +21,7 @@
           uses: gradle/actions/setup-gradle@v3
 
         - name: Build
-          run: ./gradlew build
+          run: ./gradlew build --stacktrace
           env:
             MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
             CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}

CHANGELOG.md

@@ -1,7 +1,13 @@
-This version brings changes
+This version brings additions
 
-#### Forge
-- Forge is now ported to 1.20.4!
-- All features are the same on 1.20.4 Forge
-- Requires Forge 49.0.34
-- JEI AND REI are disabled until 2.1.5.3
+#### Forge and Fabric
+- Added Advancements
+
+##### New advancements
+- Root (Obtain a crafting table)
+- Minecraft: But It's Cursed Logs (Obtain a thin birch log)
+- Smells like... Maple! (Find a Maple Forest)
+- [Goal] Let it drip! (Try getting maple sap through a tapped bucket)
+- This is Boiling! (Obtain a boiler)
+- This cake is flat! (Get a pancake)
+- [Challenge, Hidden] Refreshing! (Find a rare Oasis)

build.gradle

@@ -1,6 +1,6 @@
 import net.darkhax.curseforgegradle.TaskPublishCurseForge
 plugins {
-    id 'fabric-loom' version '1.5.+'
+    id 'fabric-loom' version '1.6.+'
     id 'maven-publish'
     id 'com.modrinth.minotaur' version '2.+'
     id 'net.darkhax.curseforgegradle' version '1.1.18'
@@ -33,6 +33,7 @@ repositories {
             includeGroup "curse.maven"
         }
     }
+    maven {url = "https://maven.parchmentmc.org"}
     maven {
         name = "Modrinth"
         url = "https://api.modrinth.com/maven"
@@ -78,36 +79,32 @@ sourceSets {
             ]
         }
     }
-    desktop {
-        java {
-            srcDirs("src/desktop/java")
-        }
-    }
 }
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
+    mappings loom.layered {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-1.20.4:2024.02.25@zip")
+    }
+
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    include "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    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.bookkeepersmc:Notebook-api-fabric-${minecraft_version}:${notebook_version}")
 
-    modImplementation "com.github.glitchfiend:TerraBlender-fabric:${project.minecraft_version}-${project.terrablender_version}"
-    include "com.github.glitchfiend:TerraBlender-fabric:${project.minecraft_version}-${project.terrablender_version}"
+    include modImplementation("com.github.glitchfiend:TerraBlender-fabric:${project.minecraft_version}-${project.terrablender_version}")
 
-    modImplementation "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}"
-    include "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_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}"
 
     modApi ("me.shedaniel.cloth:cloth-config-fabric:13.0.121") {
         exclude(group: "net.fabricmc.fabric-api")
     }
-    modApi "dev.architectury:architectury-fabric:11.0.9"
+    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.
 
@@ -138,10 +135,6 @@ jar {
     from("LICENSE") {
         rename { "${it}_${project.base.archivesName.get()}"}
     }
-    def desktop = sourceSets.getByName("desktop")
-    from(desktop.output.classesDirs)
-    from(desktop.output.resourcesDir)
-    manifest.attributes["Main-Class"] = "net.crypticverse.desktop.LaunchWarn"
 }
 
 // configure the maven publication
@@ -165,8 +158,8 @@ modrinth {
     token = System.getenv("MODRINTH_TOKEN")
     projectId = "Qs2o8KiI"
     versionNumber = "fabric-${mod_version}"
-    versionName = "Better Biomes Fabric ${mod_name}"
-    versionType = "beta"
+    versionName = "Better Biomes Fabric ${mod_name} Pre-Release 2"
+    versionType = "alpha"
     uploadFile = remapJar
     gameVersions = ["1.20.4"]
     loaders = ["fabric", "quilt"]
@@ -182,8 +175,8 @@ task curseforge(type: TaskPublishCurseForge) {
     apiToken = System.getenv("CURSEFORGE_TOKEN")
 
     def mainFile = upload(938715, remapJar)
-    mainFile.releaseType = 'beta'
-    mainFile.displayName = "Better Biomes Fabric ${mod_name}"
+    mainFile.releaseType = 'alpha'
+    mainFile.displayName = "Better Biomes Fabric ${mod_name} Pre-Release 2"
     mainFile.addGameVersion("1.20.4")
     mainFile.addModLoader("Quilt")
     mainFile.addJavaVersion("Java 17")
@@ -197,9 +190,10 @@ task curseforge(type: TaskPublishCurseForge) {
 githubRelease {
     owner = "CrypticVerse"
     repo = "BetterBiomes"
-    tagName = "fabric-${mod_name}"
-    releaseName = "Better Biomes Fabric ${mod_name}"
-    targetCommitish = "2.x-1.20.4"
+    tagName = "fabric-${mod_version}"
+    releaseName = "Better Biomes Fabric ${mod_name} Pre-Release 2"
+    targetCommitish = "dev-features"
+    prerelease = true
     draft = false
     releaseAssets tasks.remapJar
     body = project.file("CHANGELOG.md").text

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.7
+loader_version=0.15.9
 terrablender_version=3.3.0.12
 rei_version=14.0.688
-fabric_version=0.96.4+1.20.4
+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.1.5.2-1.20.4
-mod_name=2.1.5.2
+mod_version=2.2.0.0-1.20.4-alpha.2
+mod_name=2.2.0.0
 maven_group=net.crypticverse.betterbiomes
 archives_base_name=betterbiomes-fabric