Pre-Release 2

CrypticVerse · Mar 31, 2024 · f0c0016 · f0c0016
1 parent 5af6062
commit f0c0016
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,13 @@
 This version brings additions
 
 #### Forge and Fabric
-- New oasis structure! 
-- Find this rare structure generating in the desert biome
-- Our tests show there is 1 per ~3000 blocks, so it's a LUCKY find!
-- Thin Logs and a thin birch forest
-- Thin logs are strippable and waterloggable
-- Maple forest is tweaked to spawn with oak trees
-- Reeds are found in swamps and mangrove swamps!
-- They damage you, so be careful
-- Acts like tall grass/sweet berries
+- 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)
diff --git a/build.gradle b/build.gradle
@@ -158,7 +158,7 @@ modrinth {
     token = System.getenv("MODRINTH_TOKEN")
     projectId = "Qs2o8KiI"
     versionNumber = "fabric-${mod_version}"
-    versionName = "Better Biomes Fabric ${mod_name} Pre-Release 1"
+    versionName = "Better Biomes Fabric ${mod_name} Pre-Release 2"
     versionType = "alpha"
     uploadFile = remapJar
     gameVersions = ["1.20.4"]
@@ -176,7 +176,7 @@ task curseforge(type: TaskPublishCurseForge) {
 
     def mainFile = upload(938715, remapJar)
     mainFile.releaseType = 'alpha'
-    mainFile.displayName = "Better Biomes Fabric ${mod_name} Pre-Release 1"
+    mainFile.displayName = "Better Biomes Fabric ${mod_name} Pre-Release 2"
     mainFile.addGameVersion("1.20.4")
     mainFile.addModLoader("Quilt")
     mainFile.addJavaVersion("Java 17")
@@ -191,7 +191,7 @@ githubRelease {
     owner = "CrypticVerse"
     repo = "BetterBiomes"
     tagName = "fabric-${mod_version}"
-    releaseName = "Better Biomes Fabric ${mod_name} Pre-Release 1"
+    releaseName = "Better Biomes Fabric ${mod_name} Pre-Release 2"
     targetCommitish = "dev-features"
     prerelease = true
     draft = false

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ 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-alpha
+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
diff --git a/src/main/java/net/crypticverse/betterbiomes/data/AdvancementGen.java b/src/main/java/net/crypticverse/betterbiomes/data/AdvancementGen.java
@@ -7,8 +7,10 @@
 
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementHolder;
+import net.minecraft.advancements.AdvancementRewards;
 import net.minecraft.advancements.AdvancementType;
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
+import net.minecraft.advancements.critereon.ItemUsedOnLocationTrigger;
 import net.minecraft.advancements.critereon.LocationPredicate;
 import net.minecraft.advancements.critereon.PlayerTrigger;
 import net.minecraft.network.chat.Component;
@@ -18,6 +20,7 @@
 
 import net.crypticverse.betterbiomes.BetterBiomes;
 import net.crypticverse.betterbiomes.block.BiomeBlocks;
+import net.crypticverse.betterbiomes.item.BiomeItems;
 import net.crypticverse.betterbiomes.world.BetterBiomesStructures;
 import net.crypticverse.betterbiomes.world.biome.BetterBiomesBiomes;
 
@@ -52,27 +55,46 @@ public void generateAdvancement(Consumer<AdvancementHolder> consumer) {
 
         AdvancementHolder mapleForest = Advancement.Builder.advancement()
                 .display(new ItemStack(BiomeBlocks.MAPLE_LOG),
-                        Component.literal("Smells like... Maple!"), Component.literal("Find a Maple Forest"),
+                        Component.literal("Smells Like... Maple!"), Component.literal("Find a Maple Forest"),
                         null, AdvancementType.TASK,
                         true, true, false)
                 .parent(root)
                 .addCriterion("entered_maple_forest", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(BetterBiomesBiomes.MAPLE_FOREST)))
                 .save(consumer, BetterBiomes.MOD_ID + ":maple_forest");
 
+        AdvancementHolder tappedBucket = Advancement.Builder.advancement()
+                .display(new ItemStack(BiomeItems.TAPPED_BUCKET),
+                        Component.literal("Let it Drip!"), Component.literal("Try getting maple sap through a tapped bucket"),
+                        null, AdvancementType.GOAL,
+                        true, true, false)
+                .parent(mapleForest)
+                .addCriterion("planted_tapped_bucket", ItemUsedOnLocationTrigger.TriggerInstance.placedBlock(BiomeBlocks.TAPPED_BUCKET))
+                .save(consumer, BetterBiomes.MOD_ID + ":maple_sap");
+
         AdvancementHolder boiler = Advancement.Builder.advancement()
                 .display(new ItemStack(BiomeBlocks.MAPLE_SYRUP_BOILER),
-                        Component.literal("This is boiling!"), Component.literal("Obtain a boiler"),
+                        Component.literal("This is Boiling!"), Component.literal("Obtain a boiler"),
                         null, AdvancementType.TASK,
                         true, true, false)
                 .parent(mapleForest)
                 .addCriterion("has_boiler", InventoryChangeTrigger.TriggerInstance.hasItems(BiomeBlocks.MAPLE_SYRUP_BOILER))
                 .save(consumer, BetterBiomes.MOD_ID + ":boiler");
 
+        AdvancementHolder pancake = Advancement.Builder.advancement()
+                .display(new ItemStack(BiomeItems.PANCAKE),
+                        Component.literal("This Cake is Flat!"), Component.literal("Get a pancake"),
+                        null, AdvancementType.TASK,
+                        true, true, false)
+                .parent(boiler)
+                .addCriterion("has_pancake", InventoryChangeTrigger.TriggerInstance.hasItems(BiomeItems.PANCAKE))
+                .save(consumer, BetterBiomes.MOD_ID + ":pancake");
+
         AdvancementHolder oasis = Advancement.Builder.advancement()
                 .display(new ItemStack(Items.SAND),
                         Component.literal("Refreshing!"), Component.literal("Find a rare Oasis"),
-                        null, AdvancementType.TASK,
-                        true, true, true)
+                        null, AdvancementType.CHALLENGE,
+                        true, true, false)
+                .rewards(AdvancementRewards.Builder.experience(40))
                 .parent(root)
                 .addCriterion("entered_oasis", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inStructure(BetterBiomesStructures.OASIS)))
                 .save(consumer, BetterBiomes.MOD_ID + ":oasis");