Skip to content
This repository has been archived by the owner on Jul 28, 2024. It is now read-only.

Commit

Permalink
we're doing this again huh...
Browse files Browse the repository at this point in the history
* WE'RE BACK WITH MORE
* Get 4 advancements!
  • Loading branch information
CrypticVerse committed Mar 30, 2024
1 parent 5578e85 commit 5af6062
Show file tree
Hide file tree
Showing 15 changed files with 176 additions and 80 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// 1.20.4 2024-03-29T19:28:27.6913627 Better Biomes/Tags for minecraft:fluid
// 1.20.4 2024-03-30T17:48:00.0754414 Better Biomes/Tags for minecraft:fluid
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// 1.20.4 2024-03-29T19:28:27.6773622 Better Biomes/betterbiomes
// 1.20.4 2024-03-30T17:48:00.0634415 Better Biomes/betterbiomes
9fe5bd6f8d1bceae2062b694e9ecf123721e5754 data\betterbiomes\worldgen\placed_feature\reed.json
daf5b25e846b6fca2e1923ffd095e1c1f0a342fd data\betterbiomes\worldgen\configured_feature\maple.json
32d8a91a69d6bfce2798f0b9970ddadd790fc62c data\betterbiomes\damage_type\reed.json
c283e62405930845289066a6f8d1ff1cb35d4197 data\betterbiomes\worldgen\placed_feature\thin.json
892b7c2080ba69a756b79cb08eebc8748ab5ddf4 data\betterbiomes\worldgen\placed_feature\maple.json
c283e62405930845289066a6f8d1ff1cb35d4197 data\betterbiomes\worldgen\placed_feature\thin.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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-03-29T19:28:27.6823624 Better Biomes/Recipes
// 1.20.4 2024-03-30T17:48:00.0704407 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-03-29T19:28:27.6813627 Better Biomes/Tags for minecraft:item
// 1.20.4 2024-03-30T17:48:00.0694419 Better Biomes/Tags for minecraft:item
e880e9ab84852a8c728ebbdc4202975b6ac789ca data\minecraft\tags\items\cherry_logs.json
7d7cd3f6edf5e35f2aa925e300eca503d050b984 data\minecraft\tags\items\jungle_logs.json
9f9c6a08114c679f7ff74392be1da6244eab0360 data\minecraft\tags\items\mangrove_logs.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// 1.20.4 2024-03-29T19:28:27.6843627 Better Biomes/Model Definitions
// 1.20.4 2024-03-30T17:48:00.071441 Better Biomes/Model Definitions
5db65f5c7f6c760cd0cb0722af3c060b0cbf78d4 assets\betterbiomes\blockstates\thin_birch_log.json
8640db6cd770242832f8bd12eba6f0a1600f16a2 assets\betterbiomes\blockstates\stripped_thin_oak_log.json
fc5b3cb436ae398abd976dc77c40b345e9eb6b6b assets\betterbiomes\models\item\maple_syrup_bottle.json
1e3dea24b8134eeac211cef1a66972ddd1d6a478 assets\betterbiomes\models\block\maple_door_top_left_open.json
408f41e823d957591ead00a8e6d0c733c32d1cd1 assets\betterbiomes\blockstates\thin_acacia_log.json
4affa55b3e1548be3fde2d94426f4edbd3454e70 assets\betterbiomes\blockstates\maple_wall_sign.json
870adb12c5b94c525c9934826ad93a589cf49506 assets\betterbiomes\blockstates\stripped_thin_cherry_log.json
408f41e823d957591ead00a8e6d0c733c32d1cd1 assets\betterbiomes\blockstates\thin_acacia_log.json
d1698af67ede90275b37cb1b441742a9441e2c73 assets\betterbiomes\models\item\thin_mangrove_log.json
32220f2246b02b734484c61aca99ccb8b5982098 assets\betterbiomes\models\block\maple_button_inventory.json
49ce67e1a7eea6282d4056176ee51680a844bb14 assets\betterbiomes\models\block\maple_fence_gate_wall.json
19f713616539f74856537c05bd6afa8cc65fa986 assets\betterbiomes\blockstates\maple_slab.json
49ce67e1a7eea6282d4056176ee51680a844bb14 assets\betterbiomes\models\block\maple_fence_gate_wall.json
ccd4b0b42460fb010fbb137d8eedfb3aaf99ea3a assets\betterbiomes\models\item\maple_fence.json
267799219974284ffac303655a89cb22c6bb1467 assets\betterbiomes\models\item\stripped_thin_spruce_log.json
be18031c1384195f7986ad548e646799a63116a6 assets\betterbiomes\models\block\maple_door_bottom_right_open.json
Expand Down Expand Up @@ -37,9 +37,9 @@ b052e34c7d8be7e63d0dbfa163e11ae313b8b981 assets\betterbiomes\models\item\pancake
4c13e283560715adda5dda29bc498497916f708f assets\betterbiomes\models\block\maple_fence_inventory.json
da23968e0d794bc388e9440b84f2331ca42ce296 assets\betterbiomes\models\block\maple_door_bottom_left.json
a211f9813262a13440a738d28fef8b8cab65f8c4 assets\betterbiomes\models\item\maple_sapling.json
8260f0a14b0c9f7dc459283d74a3c452c5859052 assets\betterbiomes\models\item\maple_pressure_plate.json
17cb8bb7c67aebf8aaa84f71ee0e3d8b2ab5aa00 assets\betterbiomes\models\item\stripped_thin_cherry_log.json
1450826f8f315e3fb2026e1de542e0af1d86278c assets\betterbiomes\models\item\maple_sign.json
8260f0a14b0c9f7dc459283d74a3c452c5859052 assets\betterbiomes\models\item\maple_pressure_plate.json
74200007664870e0f5fa25e31331566005207f8d assets\betterbiomes\models\item\stripped_thin_mangrove_log.json
f1d984fbc34dfc3f1e78bb9f2c3c6cf8476310a2 assets\betterbiomes\blockstates\maple_wood.json
137b509e4b785273185e61bd130a1c62bfc8d064 assets\betterbiomes\models\item\stripped_maple_log.json
Expand All @@ -59,9 +59,9 @@ aa9906b1a0a1bdddf76a07b9ae72b8079af0305d assets\betterbiomes\models\item\thin_oa
eddfe8cb64b42bed370e4db7afb80ce64d57a927 assets\betterbiomes\blockstates\maple_stairs.json
d85a14153723f4e34a5834e600d5cff31a40ff4e assets\betterbiomes\models\item\maple_stairs.json
4affa55b3e1548be3fde2d94426f4edbd3454e70 assets\betterbiomes\blockstates\maple_standing_sign.json
bb4c7a4e1124607e9fe8c0a338a539be081ed54d assets\betterbiomes\models\item\tapped_bucket.json
d64f981a30e6d0cbb132754a3e499374ec52f9db assets\betterbiomes\blockstates\thin_mangrove_log.json
cfe022b02f5f8e9cb4a674f70a9cd77ecc41e4bd assets\betterbiomes\blockstates\maple_leaves.json
bb4c7a4e1124607e9fe8c0a338a539be081ed54d assets\betterbiomes\models\item\tapped_bucket.json
6b7c165791d55766a5a4c962c405e981a7731351 assets\betterbiomes\models\block\maple_fence_gate_wall_open.json
6ed61ecde250e6349525245137d81993f1c651f1 assets\betterbiomes\blockstates\thin_oak_log.json
6e47469af40e8e3f69573a594aaeaf299ada331d assets\betterbiomes\blockstates\stripped_maple_wood.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// 1.20.4 2024-03-29T19:28:27.6903629 Better Biomes/Advancements
// 1.20.4 2024-03-30T17:48:00.0744415 Better Biomes/Advancements
8908b2b6c7948006d6fc01633a91f737c94e9136 data\betterbiomes\advancements\maple_forest.json
13c912fa728f31b37a0eae1eefa4139bcf3d1592 data\betterbiomes\advancements\root.json
d685400ec99e0a4a25a7b4b95c2f3862dc39e11f data\betterbiomes\advancements\oasis.json
1b2793d92e8739cabd57affbbc5a2bdbafc26c3f data\betterbiomes\advancements\root.json
4e856e48d8da4f4ed92cc26b4e1d0d235a23f057 data\betterbiomes\advancements\thin_log.json
e26a89f7f7d4c7240967ef0449a400720f3969d1 data\betterbiomes\advancements\boiler.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// 1.20.4 2024-03-29T19:28:27.6803629 Better Biomes/Tags for minecraft:block
// 1.20.4 2024-03-30T17:48:00.0684413 Better Biomes/Tags for minecraft:block
8a5877d80d4ac1e7844c9ff3f6a6ee1d963ed57b data\minecraft\tags\blocks\leaves.json
8c1beecead4cc3cdf3236f42b200934c7d5d2315 data\minecraft\tags\blocks\wall_signs.json
09a6e0b7ece62c1f08042e001a7d257da50e9654 data\minecraft\tags\blocks\wooden_pressure_plates.json
33b6720d3f5a29e9541a3532103d63d6fcaf0899 data\minecraft\tags\blocks\jungle_logs.json
80b6dee4a62e892ba004e01ac1fe36b0d7d9709f data\minecraft\tags\blocks\dark_oak_logs.json
a594d68da0d1abcee37cda4eea530149680a8e46 data\minecraft\tags\blocks\birch_logs.json
80b6dee4a62e892ba004e01ac1fe36b0d7d9709f data\minecraft\tags\blocks\dark_oak_logs.json
3e26a2a868beb88c9dd225202b4c0b3c46ac4ca4 data\minecraft\tags\blocks\wall_hanging_signs.json
2a410c3553ec3698adc2aeca6b009e5aa18614f6 data\minecraft\tags\blocks\logs.json
ff5bcb317ced67679216754080c27169bb684ce2 data\minecraft\tags\blocks\mangrove_logs.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-03-29T19:28:27.6793624 Better Biomes/Block Loot Tables
// 1.20.4 2024-03-30T17:48:00.0664412 Better Biomes/Block Loot Tables
b1a51c96037e2c71af318e824d243d7b984f9eb4 data\betterbiomes\loot_tables\blocks\maple_log.json
1315a9cad838c37037062aee89f890273bacde62 data\betterbiomes\loot_tables\blocks\maple_sapling.json
98e9658eb92a1fff7c59c85677c7963535b6d794 data\betterbiomes\loot_tables\blocks\thin_dark_oak_log.json
Expand Down
30 changes: 30 additions & 0 deletions src/main/generated/data/betterbiomes/advancements/boiler.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"parent": "betterbiomes:maple_forest",
"criteria": {
"has_boiler": {
"conditions": {
"items": [
{
"items": [
"betterbiomes:maple_syrup_boiler"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"display": {
"description": "Obtain a boiler",
"icon": {
"item": "betterbiomes:maple_syrup_boiler"
},
"title": "This is boiling!"
},
"requirements": [
[
"has_boiler"
]
],
"sends_telemetry_event": true
}
35 changes: 35 additions & 0 deletions src/main/generated/data/betterbiomes/advancements/oasis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parent": "betterbiomes:root",
"criteria": {
"entered_oasis": {
"conditions": {
"player": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"structure": "betterbiomes:oasis"
}
}
}
]
},
"trigger": "minecraft:location"
}
},
"display": {
"description": "Find a rare Oasis",
"hidden": true,
"icon": {
"item": "minecraft:sand"
},
"title": "Refreshing!"
},
"requirements": [
[
"entered_oasis"
]
],
"sends_telemetry_event": true
}
14 changes: 8 additions & 6 deletions src/main/generated/data/betterbiomes/advancements/root.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"criteria": {
"has_thin_logs": {
"has_crafting_table": {
"conditions": {
"items": [
{
"items": [
"betterbiomes:thin_birch_log"
"minecraft:crafting_table"
]
}
]
Expand All @@ -14,16 +14,18 @@
}
},
"display": {
"announce_to_chat": false,
"background": "betterbiomes:textures/block/maple_planks.png",
"description": "Obtain a thin birch log",
"description": "Welcome!",
"icon": {
"item": "betterbiomes:thin_birch_log"
"item": "minecraft:grass_block"
},
"title": "Minecraft: But It's Cursed Logs"
"show_toast": false,
"title": "Better Biomes"
},
"requirements": [
[
"has_thin_logs"
"has_crafting_table"
]
],
"sends_telemetry_event": true
Expand Down
30 changes: 30 additions & 0 deletions src/main/generated/data/betterbiomes/advancements/thin_log.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"parent": "betterbiomes:root",
"criteria": {
"has_thin_logs": {
"conditions": {
"items": [
{
"items": [
"betterbiomes:thin_birch_log"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"display": {
"description": "Obtain a thin birch log",
"icon": {
"item": "betterbiomes:thin_birch_log"
},
"title": "Minecraft: But It's Cursed Logs"
},
"requirements": [
[
"has_thin_logs"
]
],
"sends_telemetry_event": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,41 @@
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;

import net.crypticverse.betterbiomes.BetterBiomes;
import net.crypticverse.betterbiomes.block.BiomeBlocks;
import net.crypticverse.betterbiomes.world.BetterBiomesStructures;
import net.crypticverse.betterbiomes.world.biome.BetterBiomesBiomes;

public class AdvancementGen extends FabricAdvancementProvider {


public AdvancementGen(FabricDataOutput output) {
super(output);
}

@Override
public void generateAdvancement(Consumer<AdvancementHolder> consumer) {

AdvancementHolder root = Advancement.Builder.advancement()
.display(new ItemStack(Items.GRASS_BLOCK),
Component.literal("Better Biomes"), Component.literal("Welcome!"),
new ResourceLocation(BetterBiomes.MOD_ID, "textures/block/maple_planks.png"), AdvancementType.TASK,
false, false, false)
.addCriterion("has_crafting_table", InventoryChangeTrigger.TriggerInstance.hasItems(Items.CRAFTING_TABLE))
.save(consumer, BetterBiomes.MOD_ID + ":root");


AdvancementHolder thinLog = Advancement.Builder.advancement()
.display(new ItemStack(BiomeBlocks.THIN_BIRCH_LOG),
// Change this to thin oak when the eventually naturally generate
Component.literal("Minecraft: But It's Cursed Logs"), Component.literal("Obtain a thin birch log"),
new ResourceLocation(BetterBiomes.MOD_ID, "textures/block/maple_planks.png"), AdvancementType.TASK,
null, AdvancementType.TASK,
true, true, false)
.parent(root)
.addCriterion("has_thin_logs", InventoryChangeTrigger.TriggerInstance.hasItems(BiomeBlocks.THIN_BIRCH_LOG))
.save(consumer, BetterBiomes.MOD_ID + ":root");
.save(consumer, BetterBiomes.MOD_ID + ":thin_log");

AdvancementHolder mapleForest = Advancement.Builder.advancement()
.display(new ItemStack(BiomeBlocks.MAPLE_LOG),
Expand All @@ -44,5 +58,23 @@ public void generateAdvancement(Consumer<AdvancementHolder> consumer) {
.parent(root)
.addCriterion("entered_maple_forest", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inBiome(BetterBiomesBiomes.MAPLE_FOREST)))
.save(consumer, BetterBiomes.MOD_ID + ":maple_forest");

AdvancementHolder boiler = Advancement.Builder.advancement()
.display(new ItemStack(BiomeBlocks.MAPLE_SYRUP_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 oasis = Advancement.Builder.advancement()
.display(new ItemStack(Items.SAND),
Component.literal("Refreshing!"), Component.literal("Find a rare Oasis"),
null, AdvancementType.TASK,
true, true, true)
.parent(root)
.addCriterion("entered_oasis", PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.inStructure(BetterBiomesStructures.OASIS)))
.save(consumer, BetterBiomes.MOD_ID + ":oasis");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package net.crypticverse.betterbiomes.world;

import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.levelgen.structure.Structure;

import net.crypticverse.betterbiomes.BetterBiomes;

public class BetterBiomesStructures {
public static final ResourceKey<Structure> OASIS = ResourceKey.create(Registries.STRUCTURE, new ResourceLocation(BetterBiomes.MOD_ID, "oasis"));
}
Loading

0 comments on commit 5af6062

Please sign in to comment.