diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/all_biomes.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/all_biomes.json index 5099dd0bb..644b6ac0a 100644 --- a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/all_biomes.json +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/all_biomes.json @@ -12,7 +12,7 @@ }, "frame": "challenge" }, - "parent": "biomesoplenty:biomesoplenty/root", + "parent": "biomesoplenty:biomesoplenty/craft_biome_finder", "criteria": { "alps": { "trigger": "minecraft:location", diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/craft_biome_finder.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/craft_biome_finder.json new file mode 100644 index 000000000..dc688fcc7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/craft_biome_finder.json @@ -0,0 +1,27 @@ +{ + "display": { + "icon": { + "item": "biomesoplenty:biome_finder" + }, + "title": { + "translate": "advancements.biomesoplenty.craft_biome_finder.title" + }, + "description": { + "translate": "advancements.biomesoplenty.craft_biome_finder.description" + }, + "frame": "goal" + }, + "parent": "biomesoplenty:biomesoplenty/root", + "criteria": { + "biome_finder": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:biome_finder" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/flesh_and_blood.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/flesh_and_blood.json new file mode 100644 index 000000000..d23e66ad5 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/flesh_and_blood.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "biomesoplenty:fleshchunk" + }, + "title": { + "translate": "advancements.biomesoplenty.flesh_and_blood.title" + }, + "description": { + "translate": "advancements.biomesoplenty.flesh_and_blood.description" + } + }, + "parent": "biomesoplenty:biomesoplenty/root", + "criteria": { + "flesh": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:fleshchunk" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/harvest_turnip.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/harvest_turnip.json new file mode 100644 index 000000000..c56ed54a2 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/harvest_turnip.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "biomesoplenty:turnip" + }, + "title": { + "translate": "advancements.biomesoplenty.harvest_turnip.title" + }, + "description": { + "translate": "advancements.biomesoplenty.harvest_turnip.description" + } + }, + "parent": "biomesoplenty:biomesoplenty/miners_delight", + "criteria": { + "turnip": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:turnip" + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/honey_hell.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/honey_hell.json new file mode 100644 index 000000000..98927412d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/honey_hell.json @@ -0,0 +1,29 @@ +{ + "display": { + "icon": { + "item": "biomesoplenty:jar_filled", + "data": 0 + }, + "title": { + "translate": "advancements.biomesoplenty.honey_hell.title" + }, + "description": { + "translate": "advancements.biomesoplenty.honey_hell.description" + }, + "frame": "goal" + }, + "parent": "biomesoplenty:biomesoplenty/flesh_and_blood", + "criteria": { + "honey_jar": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:jar_filled", + "data": 0 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/miners_delight.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/miners_delight.json new file mode 100644 index 000000000..3a2c34df5 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/miners_delight.json @@ -0,0 +1,28 @@ +{ + "display": { + "icon": { + "item": "biomesoplenty:flower_1", + "data": 3 + }, + "title": { + "translate": "advancements.biomesoplenty.miners_delight.title" + }, + "description": { + "translate": "advancements.biomesoplenty.miners_delight.description" + } + }, + "parent": "biomesoplenty:biomesoplenty/root", + "criteria": { + "miners_delight": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:flower_1", + "data": 3 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/sacred_oak_sapling.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/sacred_oak_sapling.json new file mode 100644 index 000000000..ebb252104 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/sacred_oak_sapling.json @@ -0,0 +1,26 @@ +{ + "display": { + "icon": { + "item": "biomesoplenty:sapling_1", + "data": 7 + }, + "title": { + "translate": "advancements.biomesoplenty.sacred_oak_sapling.title" + }, + "description": { + "translate": "advancements.biomesoplenty.sacred_oak_sapling.description" + } + }, + "parent": "biomesoplenty:biomesoplenty/harvest_turnip", + "criteria": { + "sacred_oak_sapling": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "biomesoplenty:sapling_1", + "state": { + "variant": "sacred_oak" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/yin_and_yang.json b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/yin_and_yang.json new file mode 100644 index 000000000..176d37ac3 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/biomesoplenty/yin_and_yang.json @@ -0,0 +1,42 @@ +{ + "display": { + "icon": { + "item": "biomesoplenty:flower_0", + "data": 3 + }, + "title": { + "translate": "advancements.biomesoplenty.yin_and_yang.title" + }, + "description": { + "translate": "advancements.biomesoplenty.yin_and_yang.description" + }, + "frame": "challenge" + }, + "parent": "biomesoplenty:biomesoplenty/sacred_oak_sapling", + "criteria": { + "glowflower": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "biomesoplenty:flower_0", + "state": { + "variant": "glowflower" + }, + "location": { + "biome": "biomesoplenty:ominous_woods" + } + } + }, + "deathbloom": { + "trigger": "minecraft:placed_block", + "conditions": { + "block": "biomesoplenty:flower_0", + "state": { + "variant": "deathbloom" + }, + "location": { + "biome": "biomesoplenty:mystic_grove" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_planks.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_planks.json new file mode 100644 index 000000000..52299ad38 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_planks.json @@ -0,0 +1,32 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:fir_planks" + ] + }, + "criteria": { + "has_log": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:log_0", + "data": 7 + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:fir_planks" + } + } + }, + "requirements": [ + [ + "has_log", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_stairs.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_stairs.json new file mode 100644 index 000000000..74d59fe6c --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_stairs.json @@ -0,0 +1,32 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:fir_stairs" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:fir_stairs" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0", + "data": 3 + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_wooden_slab.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_wooden_slab.json new file mode 100644 index 000000000..819f64ceb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/buildingBlocks/fir_wooden_slab.json @@ -0,0 +1,32 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:fir_wooden_slab" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:fir_wooden_slab" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0", + "data": 3 + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/crafting_table.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/crafting_table.json new file mode 100644 index 000000000..75ddb0eca --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/crafting_table.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "minecraft:crafting_table" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:crafting_table" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/fir_fence.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/fir_fence.json new file mode 100644 index 000000000..bb0f6c567 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/fir_fence.json @@ -0,0 +1,32 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:fir_fence" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:fir_fence" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0", + "data": 3 + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/sign.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/sign.json new file mode 100644 index 000000000..ebf4ff8a5 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/decorations/sign.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "minecraft:sign" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:sign" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/fir_door.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/fir_door.json new file mode 100644 index 000000000..5de634050 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/fir_door.json @@ -0,0 +1,32 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:fir_door" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:fir_door" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0", + "data": 3 + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/fir_fence_gate.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/fir_fence_gate.json new file mode 100644 index 000000000..0be25ab73 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/fir_fence_gate.json @@ -0,0 +1,32 @@ +{ + "rewards": { + "recipes": [ + "biomesoplenty:fir_fence_gate" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "biomesoplenty:fir_fence_gate" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0", + "data": 3 + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/trapdoor.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/trapdoor.json new file mode 100644 index 000000000..d3c029edf --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/trapdoor.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "minecraft:trapdoor" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:trapdoor" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/wooden_button.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/wooden_button.json new file mode 100644 index 000000000..542205dfb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/wooden_button.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "minecraft:wooden_button" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:wooden_button" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/wooden_pressure_plate.json b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/wooden_pressure_plate.json new file mode 100644 index 000000000..5413d4bb9 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/advancements/recipes/redstone/wooden_pressure_plate.json @@ -0,0 +1,31 @@ +{ + "rewards": { + "recipes": [ + "minecraft:wooden_pressure_plate" + ] + }, + "criteria": { + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "minecraft:wooden_pressure_plate" + } + }, + "has_planks": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "biomesoplenty:planks_0" + } + ] + } + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_planks" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 055659344..e26ff114b 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -1,6 +1,19 @@ advancements.biomesoplenty.root.title=Biomes O' Plenty advancements.biomesoplenty.root.description=The explorer's dream... - +advancements.biomesoplenty.sacred_oak_sapling.title=Yggdrasil +advancements.biomesoplenty.sacred_oak_sapling.description=Plant a mighty Sacred Oak sapling +advancements.biomesoplenty.yin_and_yang.title=Yin and Yang +advancements.biomesoplenty.yin_and_yang.description=Plant a glowflower in the Ominous Woods, and a deathbloom in the Mystic Grove +advancements.biomesoplenty.miners_delight.title=Life Finds a Way +advancements.biomesoplenty.miners_delight.description=Find a miner's delight flower deep in a cave +advancements.biomesoplenty.harvest_turnip.title=Stalk Market +advancements.biomesoplenty.harvest_turnip.description=Harvest a turnip +advancements.biomesoplenty.flesh_and_blood.title=Flesh and Blood +advancements.biomesoplenty.flesh_and_blood.description=Harvest flesh from the Visceral Heap +advancements.biomesoplenty.honey_hell.title=Honey Hell +advancements.biomesoplenty.honey_hell.description=Steal some sweet honey from a Nether Wasp hive +advancements.biomesoplenty.craft_biome_finder.title=Search Party +advancements.biomesoplenty.craft_biome_finder.description=Craft a Biome Finder to guide your path advancements.biomesoplenty.all_biomes.title=Wanderer advancements.biomesoplenty.all_biomes.description=Discover every biome in Biomes O' Plenty @@ -408,4 +421,4 @@ tile.crystal.name=Celestial Crystal entity.biomesoplenty.mudball.name=Mudball entity.biomesoplenty.pixie.name=Pixie -entity.biomesoplenty.wasp.name=Wasp \ No newline at end of file +entity.biomesoplenty.wasp.name=Nether Wasp \ No newline at end of file diff --git a/src/main/resources/assets/biomesoplenty/recipes/ambrosia.json b/src/main/resources/assets/biomesoplenty/recipes/ambrosia.json index 08bc51959..6ff55da10 100644 --- a/src/main/resources/assets/biomesoplenty/recipes/ambrosia.json +++ b/src/main/resources/assets/biomesoplenty/recipes/ambrosia.json @@ -7,27 +7,9 @@ { "item": "minecraft:potion" }, - { - "item": "biomesoplenty:seaweed", - "data": 0 - }, - { - "item": "biomesoplenty:plant_1", - "data": 9 - }, - { - "item": "biomesoplenty:crystal_shard" - }, { "item": "biomesoplenty:jar_filled", "data": 0 - }, - { - "item": "biomesoplenty:berries" - }, - { - "item": "minecraft:sugar", - "data": 32767 } ], "result": { diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ambrosia.png b/src/main/resources/assets/biomesoplenty/textures/items/ambrosia.png index 058b5177b..0301d2111 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/items/ambrosia.png and b/src/main/resources/assets/biomesoplenty/textures/items/ambrosia.png differ