diff --git a/src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java b/src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java index 949e0c24a..db5e5773a 100644 --- a/src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java +++ b/src/main/java/net/id/paradiselost/mixin/item/PotionItemMixin.java @@ -1,6 +1,7 @@ package net.id.paradiselost.mixin.item; import net.id.paradiselost.blocks.ParadiseLostBlocks; +import net.minecraft.advancement.criterion.Criteria; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; @@ -12,6 +13,7 @@ import net.minecraft.particle.ParticleTypes; import net.minecraft.potion.PotionUtil; import net.minecraft.potion.Potions; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.ActionResult; @@ -35,6 +37,9 @@ public void useOnBlock(ItemUsageContext context, CallbackInfoReturnable MIXED_TREES = register("mixed_trees", ParadiseLostTreeConfiguredFeatures.MIXED_TREES, CountMultilayerPlacementModifier.of(1), ChancePlacementModifier.of(30)); public static final RegistryEntry SPARSE_TREES = register("sparse_trees", ParadiseLostTreeConfiguredFeatures.SPARSE_TREES, CountMultilayerPlacementModifier.of(7), ChancePlacementModifier.of(100), CountPlacementModifier.of(UniformIntProvider.create(0, 2))); public static final RegistryEntry THICKET_TREES = register("thicket_trees", ParadiseLostTreeConfiguredFeatures.THICKET_TREES, CountMultilayerPlacementModifier.of(6), CountPlacementModifier.of(UniformIntProvider.create(0, 3))); - public static final RegistryEntry THICKET_MOTHER_AUREL_TREES = register("thicket_mother_aurel_trees", ParadiseLostTreeConfiguredFeatures.THICKET_MOTHER_AUREL_TREES, CountMultilayerPlacementModifier.of(1), ChancePlacementModifier.of(60)); + public static final RegistryEntry THICKET_MOTHER_AUREL_TREES = register("thicket_mother_aurel_trees", ParadiseLostTreeConfiguredFeatures.THICKET_MOTHER_AUREL_TREES, CountMultilayerPlacementModifier.of(2), ChancePlacementModifier.of(30)); public static final RegistryEntry RAINBOW_FOREST_TREES = register("wisteria_woods_trees", ParadiseLostTreeConfiguredFeatures.RAINBOW_FOREST_TREES, CountMultilayerPlacementModifier.of(17), CountPlacementModifier.of(UniformIntProvider.create(0, 4))); // Fallen leaves public static final RegistryEntry FALLEN_LEAVES = register("fallen_leaves", ParadiseLostTreeConfiguredFeatures.FALLEN_LEAVES, SPREAD_32_ABOVE, PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, CountPlacementModifier.of(3), ChancePlacementModifier.of(5), HeightmapPlacementModifier.of(Heightmap.Type.WORLD_SURFACE)); diff --git a/src/main/resources/assets/paradise_lost/lang/en_us.json b/src/main/resources/assets/paradise_lost/lang/en_us.json index a080218c5..81c8d6dac 100644 --- a/src/main/resources/assets/paradise_lost/lang/en_us.json +++ b/src/main/resources/assets/paradise_lost/lang/en_us.json @@ -476,20 +476,32 @@ "subtitles.paradise_lost.item.bloodstone.prick": "Bloodstone pricks", + "advancements.paradise_lost.bloomed_calcite_craft.title": "Healing Crystals", + "advancements.paradise_lost.bloomed_calcite_craft.description": "Douse a calcite block with a healing potion", "advancements.paradise_lost.consume_food.title": "Exotic Starter", "advancements.paradise_lost.consume_food.description": "Consume something from Paradise", "advancements.paradise_lost.enter_paradise_lost.title": "We Need to Go Higher", - "advancements.paradise_lost.enter_paradise_lost.description": "Build a frame of shimmering glowstone, flood it with water, and step into the light", - "advancements.paradise_lost.food_bowl_fill.title": "Not Your Average Birdfeeder", - "advancements.paradise_lost.food_bowl_fill.description": "Fill a feeding trough with raw meat for your Moas", + "advancements.paradise_lost.enter_paradise_lost.description": "Build a frame of Bloomed Calcite, flood it with water, and step into the light", "advancements.paradise_lost.float_up_paradise_lost.title": "To Infinity", "advancements.paradise_lost.float_up_paradise_lost.description": "Ride a levitating block to the sky limit", + "advancements.paradise_lost.food_bowl_fill.title": "Not Your Average Birdfeeder", + "advancements.paradise_lost.food_bowl_fill.description": "Fill a feeding trough with raw meat for your Moas", + "advancements.paradise_lost.glazed_upgrade_find.title": "Lost Art", + "advancements.paradise_lost.glazed_upgrade_find.description": "Find a Glazed Gold Upgrade in a Lost Vault", + "advancements.paradise_lost.glazed_upgrade_use.title": "Dunkin'", + "advancements.paradise_lost.glazed_upgrade_use.description": "Improve a piece of gold equipment with a Glazed Gold Upgrade", "advancements.paradise_lost.mother_aurel.title": "The Matriarch", "advancements.paradise_lost.mother_aurel.description": "Find a Mother Aurel Tree in a Highlands Thicket", "advancements.paradise_lost.mother_aurel_strip.title": "Stripping For Gold", "advancements.paradise_lost.mother_aurel_strip.description": "Strip a Mother Aurel log to collect its amber", + "advancements.paradise_lost.nitra_bunch.title": "Bundle of Joy", + "advancements.paradise_lost.nitra_bunch.description": "Create an explosive bundle of Nitra", + "advancements.paradise_lost.nitra_find.title": "Seeds of Wrath", + "advancements.paradise_lost.nitra_find.description": "Find a Nitra seed in an Aurel Tower", "advancements.paradise_lost.root.title": "Paradise Lost", "advancements.paradise_lost.root.description": "A hostile paradise in the sky, full of mystery and surprises", + "advancements.paradise_lost.surtrum_blast.title": "Is it getting hot in here?", + "advancements.paradise_lost.surtrum_blast.description": "Blast your way into a Meteorite and harvest some Surtrum", "advancements.paradise_lost.tame_moa.title": "Air Superiority", "advancements.paradise_lost.tame_moa.description": "Tame a wild Moa with raw meat", "advancements.paradise_lost.void_paradise_lost.title": "I've been falling, for 30 minutes!", diff --git a/src/main/resources/data/paradise_lost/advancements/bloomed_calcite_craft.json b/src/main/resources/data/paradise_lost/advancements/bloomed_calcite_craft.json new file mode 100644 index 000000000..789e165a4 --- /dev/null +++ b/src/main/resources/data/paradise_lost/advancements/bloomed_calcite_craft.json @@ -0,0 +1,53 @@ +{ + "display": { + "title": { + "translate": "advancements.paradise_lost.bloomed_calcite_craft.title" + }, + "description": { + "translate": "advancements.paradise_lost.bloomed_calcite_craft.description" + }, + "icon": { + "item": "paradise_lost:bloomed_calcite" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "douse": { + "trigger": "minecraft:item_used_on_block", + "conditions": { + "item": { + "item": "minecraft:potion" + }, + "location": { + "block": { + "blocks": [ + "minecraft:calcite" + ] + } + } + } + }, + "hold_bc": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:bloomed_calcite" + ] + } + ] + } + } + }, + "requirements": [ + [ + "douse", + "hold_bc" + ] + ], + "parent": "minecraft:nether/brew_potion" +} diff --git a/src/main/resources/data/paradise_lost/advancements/enter_paradise_lost.json b/src/main/resources/data/paradise_lost/advancements/enter_paradise_lost.json index b81654dda..8c8c8d25b 100644 --- a/src/main/resources/data/paradise_lost/advancements/enter_paradise_lost.json +++ b/src/main/resources/data/paradise_lost/advancements/enter_paradise_lost.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:story/enter_the_nether", + "parent": "paradise_lost:bloomed_calcite_craft", "display": { "icon": { "item": "paradise_lost:bloomed_calcite" diff --git a/src/main/resources/data/paradise_lost/advancements/glazed_upgrade_find.json b/src/main/resources/data/paradise_lost/advancements/glazed_upgrade_find.json new file mode 100644 index 000000000..b72d00ac4 --- /dev/null +++ b/src/main/resources/data/paradise_lost/advancements/glazed_upgrade_find.json @@ -0,0 +1,37 @@ +{ + "parent": "paradise_lost:mother_aurel_strip", + "criteria": { + "upgrade": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_upgrade_smithing_template" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.paradise_lost.glazed_upgrade_find.description" + }, + "frame": "task", + "hidden": false, + "icon": { + "item": "paradise_lost:glazed_gold_upgrade_smithing_template" + }, + "show_toast": true, + "title": { + "translate": "advancements.paradise_lost.glazed_upgrade_find.title" + } + }, + "requirements": [ + [ + "upgrade" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/advancements/glazed_upgrade_use.json b/src/main/resources/data/paradise_lost/advancements/glazed_upgrade_use.json new file mode 100644 index 000000000..a07dc668a --- /dev/null +++ b/src/main/resources/data/paradise_lost/advancements/glazed_upgrade_use.json @@ -0,0 +1,141 @@ +{ + "parent": "paradise_lost:glazed_upgrade_find", + "criteria": { + "shovel": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_shovel" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "pickaxe": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_pickaxe" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "axe": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_axe" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "sword": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_sword" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "hoe": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_hoe" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "helmet": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_helmet" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "chestplate": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_chestplate" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "leggings": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_leggings" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "boots": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:glazed_gold_boots" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.paradise_lost.glazed_upgrade_use.description" + }, + "frame": "task", + "hidden": false, + "icon": { + "item": "paradise_lost:glazed_gold_pickaxe" + }, + "show_toast": true, + "title": { + "translate": "advancements.paradise_lost.glazed_upgrade_use.title" + } + }, + "requirements": [ + [ + "shovel", + "pickaxe", + "axe", + "sword", + "hoe", + "helmet", + "chestplate", + "leggings", + "boots" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/advancements/nitra_bunch.json b/src/main/resources/data/paradise_lost/advancements/nitra_bunch.json new file mode 100644 index 000000000..ecbf696bf --- /dev/null +++ b/src/main/resources/data/paradise_lost/advancements/nitra_bunch.json @@ -0,0 +1,37 @@ +{ + "parent": "paradise_lost:nitra_find", + "criteria": { + "find": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:nitra_bunch" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.paradise_lost.nitra_bunch.description" + }, + "frame": "task", + "hidden": false, + "icon": { + "item": "paradise_lost:nitra_bunch" + }, + "show_toast": true, + "title": { + "translate": "advancements.paradise_lost.nitra_bunch.title" + } + }, + "requirements": [ + [ + "find" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/advancements/nitra_find.json b/src/main/resources/data/paradise_lost/advancements/nitra_find.json new file mode 100644 index 000000000..a341f2cfc --- /dev/null +++ b/src/main/resources/data/paradise_lost/advancements/nitra_find.json @@ -0,0 +1,37 @@ +{ + "parent": "paradise_lost:root", + "criteria": { + "find": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:nitra" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.paradise_lost.nitra_find.description" + }, + "frame": "task", + "hidden": false, + "icon": { + "item": "paradise_lost:nitra" + }, + "show_toast": true, + "title": { + "translate": "advancements.paradise_lost.nitra_find.title" + } + }, + "requirements": [ + [ + "find" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/advancements/root.json b/src/main/resources/data/paradise_lost/advancements/root.json index d4ed3f78e..bf0a1a28d 100644 --- a/src/main/resources/data/paradise_lost/advancements/root.json +++ b/src/main/resources/data/paradise_lost/advancements/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "paradise_lost:highlands_grass" + "item": "paradise_lost:chiseled_floestone" }, "title": { "translate": "advancements.paradise_lost.root.title", diff --git a/src/main/resources/data/paradise_lost/advancements/surtrum_blast.json b/src/main/resources/data/paradise_lost/advancements/surtrum_blast.json new file mode 100644 index 000000000..953f89488 --- /dev/null +++ b/src/main/resources/data/paradise_lost/advancements/surtrum_blast.json @@ -0,0 +1,50 @@ +{ + "parent": "paradise_lost:nitra_bunch", + "criteria": { + "raw": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:raw_surtrum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "block": { + "conditions": { + "items": [ + { + "items": [ + "paradise_lost:surtrum" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "description": { + "translate": "advancements.paradise_lost.surtrum_blast.description" + }, + "frame": "task", + "hidden": false, + "icon": { + "item": "paradise_lost:surtrum" + }, + "show_toast": true, + "title": { + "translate": "advancements.paradise_lost.surtrum_blast.title" + } + }, + "requirements": [ + [ + "raw", + "block" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/paradise_lost/recipes/golden_amber_tile.json b/src/main/resources/data/paradise_lost/recipes/golden_amber_tile.json index b182b5338..22460dfb3 100644 --- a/src/main/resources/data/paradise_lost/recipes/golden_amber_tile.json +++ b/src/main/resources/data/paradise_lost/recipes/golden_amber_tile.json @@ -10,6 +10,7 @@ } }, "result": { + "count": 4, "item": "paradise_lost:golden_amber_tile" } } \ No newline at end of file