From e94714fa0b5aead6a8bf6b1bbaebcca70694095b Mon Sep 17 00:00:00 2001 From: jakeb072001 Date: Tue, 11 Feb 2025 23:42:05 +1000 Subject: [PATCH] Implemented ore replacement system (world will either have lead or iron, etc). Adjusted size of ore spawns (demonite and crimtane should now spawn in very small amounts, I may also make rarer as bosses are the main source of this material). Added recipes for all iron crafts that use lead and for gold crafts use platinum. Added lead and platinum nuggets for crafts. Added corruption and crimson variants of ores. Added tools to correct tags (also added axe tag because I guess I missed it). --- .../items/corrupted_deepslate_lead_ore.json | 6 + .../corrupted_deepslate_platinum_ore.json | 6 + .../items/corrupted_deepslate_silver_ore.json | 6 + .../items/corrupted_deepslate_tin_ore.json | 6 + .../corrupted_deepslate_tungsten_ore.json | 6 + .../terramine/items/corrupted_lead_ore.json | 6 + .../items/corrupted_platinum_ore.json | 6 + .../terramine/items/corrupted_silver_ore.json | 6 + .../terramine/items/corrupted_tin_ore.json | 6 + .../items/corrupted_tungsten_ore.json | 6 + .../items/crimson_deepslate_lead_ore.json | 6 + .../items/crimson_deepslate_platinum_ore.json | 6 + .../items/crimson_deepslate_silver_ore.json | 6 + .../items/crimson_deepslate_tin_ore.json | 6 + .../items/crimson_deepslate_tungsten_ore.json | 6 + .../terramine/items/crimson_lead_ore.json | 6 + .../terramine/items/crimson_platinum_ore.json | 6 + .../terramine/items/crimson_silver_ore.json | 6 + .../terramine/items/crimson_tin_ore.json | 6 + .../terramine/items/crimson_tungsten_ore.json | 6 + .../assets/terramine/items/lead_nugget.json | 6 + .../terramine/items/platinum_nugget.json | 6 + .../terramine/models/item/lead_nugget.json | 6 + .../models/item/platinum_nugget.json | 6 + .../advancement/recipes/brewing/cauldron.json | 32 +++ .../recipes/building_blocks/chain.json | 43 ++++ .../recipes/building_blocks/copper_door.json | 32 +++ .../building_blocks/copper_trapdoor.json | 32 +++ .../recipes/building_blocks/iron_bars.json | 32 +++ .../recipes/building_blocks/iron_door.json | 32 +++ .../building_blocks/iron_trapdoor.json | 32 +++ .../recipes/building_blocks/lantern.json | 43 ++++ .../building_blocks/lead_ingot_blasting.json | 46 +++- .../building_blocks/lead_ingot_smelting.json | 46 +++- .../platinum_ingot_blasting.json | 46 +++- .../platinum_ingot_smelting.json | 46 +++- .../silver_ingot_blasting.json | 46 +++- .../silver_ingot_smelting.json | 46 +++- .../recipes/building_blocks/soul_lantern.json | 43 ++++ .../building_blocks/tin_ingot_blasting.json | 46 +++- .../building_blocks/tin_ingot_smelting.json | 46 +++- .../tungsten_ingot_blasting.json | 46 +++- .../tungsten_ingot_smelting.json | 46 +++- .../advancement/recipes/combat/crossbow.json | 65 ++++++ .../advancement/recipes/combat/shield.json | 43 ++++ .../recipes/decorations/anvil.json | 43 ++++ .../recipes/decorations/blast_furnace.json | 54 +++++ .../recipes/decorations/smithing_table.json | 43 ++++ .../recipes/decorations/stonecutter.json | 43 ++++ .../recipes/food/glistering_melon_slice.json | 43 ++++ .../recipes/food/golden_apple.json | 43 ++++ .../recipes/food/golden_carrot.json | 43 ++++ .../{clock.json => clock_from_watch.json} | 4 +- .../advancement/recipes/misc/lead_nugget.json | 32 +++ .../recipes/misc/platinum_nugget.json | 32 +++ .../advancement/recipes/redstone/crafter.json | 65 ++++++ .../heavy_weighted_pressure_plate.json | 32 +++ .../advancement/recipes/redstone/hopper.json | 43 ++++ .../light_weighted_pressure_plate.json | 32 +++ .../recipes/redstone/netherite_ingot.json | 43 ++++ .../advancement/recipes/redstone/piston.json | 65 ++++++ .../recipes/redstone/tripwire_hook.json | 54 +++++ .../advancement/recipes/tools/brush.json | 54 +++++ .../advancement/recipes/tools/bucket.json | 32 +++ .../advancement/recipes/tools/clock.json | 43 ++++ .../advancement/recipes/tools/compass.json | 43 ++++ .../recipes/tools/flint_and_steel.json | 43 ++++ .../recipes/tools/lightning_rod.json | 32 +++ .../recipes/tools/magic_mirror.json | 11 + .../advancement/recipes/tools/shears.json | 32 +++ .../advancement/recipes/tools/spyglass.json | 43 ++++ .../transportation/activator_rail.json | 54 +++++ .../recipes/transportation/detector_rail.json | 54 +++++ .../recipes/transportation/minecart.json | 32 +++ .../recipes/transportation/powered_rail.json | 54 +++++ .../recipes/transportation/rail.json | 43 ++++ .../data/terramine/recipe/activator_rail.json | 18 ++ .../data/terramine/recipe/anvil.json | 17 ++ .../data/terramine/recipe/blast_furnace.json | 18 ++ .../data/terramine/recipe/brush.json | 18 ++ .../data/terramine/recipe/bucket.json | 15 ++ .../data/terramine/recipe/cauldron.json | 16 ++ .../data/terramine/recipe/chain.json | 17 ++ .../data/terramine/recipe/clock.json | 14 +- .../terramine/recipe/clock_from_watch.json | 11 + .../data/terramine/recipe/compass.json | 17 ++ .../data/terramine/recipe/copper_door.json | 16 ++ .../terramine/recipe/copper_trapdoor.json | 15 ++ .../data/terramine/recipe/crafter.json | 19 ++ .../data/terramine/recipe/crossbow.json | 19 ++ .../data/terramine/recipe/detector_rail.json | 18 ++ .../terramine/recipe/flint_and_steel.json | 15 ++ .../recipe/glistering_melon_slice.json | 17 ++ .../data/terramine/recipe/golden_apple.json | 17 ++ .../data/terramine/recipe/golden_carrot.json | 17 ++ .../recipe/heavy_weighted_pressure_plate.json | 14 ++ .../data/terramine/recipe/hopper.json | 17 ++ .../data/terramine/recipe/iron_bars.json | 15 ++ .../data/terramine/recipe/iron_door.json | 16 ++ .../data/terramine/recipe/iron_trapdoor.json | 15 ++ .../data/terramine/recipe/lantern.json | 17 ++ .../terramine/recipe/lead_ingot_blasting.json | 6 +- .../terramine/recipe/lead_ingot_smelting.json | 6 +- .../data/terramine/recipe/lead_nugget.json | 11 + .../recipe/light_weighted_pressure_plate.json | 14 ++ .../data/terramine/recipe/lightning_rod.json | 16 ++ .../data/terramine/recipe/magic_mirror.json | 5 +- .../data/terramine/recipe/minecart.json | 15 ++ .../terramine/recipe/netherite_ingot.json | 17 ++ .../data/terramine/recipe/piston.json | 19 ++ .../recipe/platinum_ingot_blasting.json | 6 +- .../recipe/platinum_ingot_smelting.json | 6 +- .../terramine/recipe/platinum_nugget.json | 11 + .../data/terramine/recipe/powered_rail.json | 18 ++ .../generated/data/terramine/recipe/rail.json | 17 ++ .../data/terramine/recipe/shears.json | 15 ++ .../data/terramine/recipe/shield.json | 17 ++ .../recipe/silver_ingot_blasting.json | 6 +- .../recipe/silver_ingot_smelting.json | 6 +- .../data/terramine/recipe/smithing_table.json | 17 ++ .../data/terramine/recipe/soul_lantern.json | 17 ++ .../data/terramine/recipe/spyglass.json | 17 ++ .../data/terramine/recipe/stonecutter.json | 16 ++ .../terramine/recipe/tin_ingot_blasting.json | 6 +- .../terramine/recipe/tin_ingot_smelting.json | 6 +- .../data/terramine/recipe/tripwire_hook.json | 18 ++ .../recipe/tungsten_ingot_blasting.json | 6 +- .../recipe/tungsten_ingot_smelting.json | 6 +- .../terramine/worldgen/biome/corruption.json | 10 - .../worldgen/biome/corruption_desert.json | 10 - .../terramine/worldgen/biome/crimson.json | 10 - .../worldgen/biome/crimson_desert.json | 10 - .../configured_feature/ore_crimtane.json | 2 +- .../ore_crimtane_small.json | 2 +- .../configured_feature/ore_demonite.json | 2 +- .../ore_demonite_small.json | 2 +- .../worldgen/configured_feature/ore_tin.json | 2 +- ...{ore_tin_small.json => ore_tin_large.json} | 2 +- .../java/terramine/common/init/ModBlocks.java | 20 ++ .../terramine/common/init/ModItemGroups.java | 4 +- .../java/terramine/common/init/ModItems.java | 2 + .../common/utility/CorruptionHelper.java | 13 ++ .../common/utility/CrimsonHelper.java | 14 +- .../common/world/biome/CorruptionBiome.java | 2 +- .../world/biome/CorruptionDesertBiome.java | 2 +- .../common/world/biome/CrimsonBiome.java | 2 +- .../world/biome/CrimsonDesertBiome.java | 2 +- .../java/terramine/datagen/ModFeatures.java | 78 ++++++- .../terramine/datagen/ModPlacedFeatures.java | 43 ---- .../java/terramine/datagen/ModRecipes.java | 217 +++++++++++++++++- .../datagen/TerraMineRegistryProvider.java | 2 +- .../corrupted_deepslate_lead_ore.json | 7 + .../corrupted_deepslate_platinum_ore.json | 7 + .../corrupted_deepslate_silver_ore.json | 7 + .../corrupted_deepslate_tin_ore.json | 7 + .../corrupted_deepslate_tungsten_ore.json | 7 + .../blockstates/corrupted_lead_ore.json | 7 + .../blockstates/corrupted_platinum_ore.json | 7 + .../blockstates/corrupted_silver_ore.json | 7 + .../blockstates/corrupted_tin_ore.json | 7 + .../blockstates/corrupted_tungsten_ore.json | 7 + .../crimson_deepslate_lead_ore.json | 7 + .../crimson_deepslate_platinum_ore.json | 7 + .../crimson_deepslate_silver_ore.json | 7 + .../crimson_deepslate_tin_ore.json | 7 + .../crimson_deepslate_tungsten_ore.json | 7 + .../blockstates/crimson_lead_ore.json | 7 + .../blockstates/crimson_platinum_ore.json | 7 + .../blockstates/crimson_silver_ore.json | 7 + .../blockstates/crimson_tin_ore.json | 7 + .../blockstates/crimson_tungsten_ore.json | 7 + .../assets/terramine/lang/en_us.json | 22 ++ .../block/corrupted_deepslate_lead_ore.json | 6 + .../corrupted_deepslate_platinum_ore.json | 6 + .../block/corrupted_deepslate_silver_ore.json | 6 + .../block/corrupted_deepslate_tin_ore.json | 6 + .../corrupted_deepslate_tungsten_ore.json | 6 + .../models/block/corrupted_lead_ore.json | 6 + .../models/block/corrupted_platinum_ore.json | 6 + .../models/block/corrupted_silver_ore.json | 6 + .../models/block/corrupted_tin_ore.json | 6 + .../models/block/corrupted_tungsten_ore.json | 6 + .../block/crimson_deepslate_lead_ore.json | 6 + .../block/crimson_deepslate_platinum_ore.json | 6 + .../block/crimson_deepslate_silver_ore.json | 6 + .../block/crimson_deepslate_tin_ore.json | 6 + .../block/crimson_deepslate_tungsten_ore.json | 6 + .../models/block/crimson_lead_ore.json | 6 + .../models/block/crimson_platinum_ore.json | 6 + .../models/block/crimson_silver_ore.json | 6 + .../models/block/crimson_tin_ore.json | 6 + .../models/block/crimson_tungsten_ore.json | 6 + .../corruption/corrupt_deepslate_lead_ore.png | Bin 0 -> 514 bytes .../corrupt_deepslate_platinum_ore.png | Bin 0 -> 514 bytes .../corrupt_deepslate_silver_ore.png | Bin 0 -> 514 bytes .../corruption/corrupt_deepslate_tin_ore.png | Bin 0 -> 533 bytes .../corrupt_deepslate_tungsten_ore.png | Bin 0 -> 514 bytes .../block/corruption/corrupt_lead_ore.png | Bin 0 -> 504 bytes .../block/corruption/corrupt_platinum_ore.png | Bin 0 -> 504 bytes .../block/corruption/corrupt_silver_ore.png | Bin 0 -> 504 bytes .../block/corruption/corrupt_tin_ore.png | Bin 0 -> 538 bytes .../block/corruption/corrupt_tungsten_ore.png | Bin 0 -> 504 bytes .../crimson/crimson_deepslate_lead_ore.png | Bin 0 -> 514 bytes .../crimson_deepslate_platinum_ore.png | Bin 0 -> 514 bytes .../crimson/crimson_deepslate_silver_ore.png | Bin 0 -> 514 bytes .../crimson/crimson_deepslate_tin_ore.png | Bin 0 -> 533 bytes .../crimson_deepslate_tungsten_ore.png | Bin 0 -> 514 bytes .../block/crimson/crimson_lead_ore.png | Bin 0 -> 504 bytes .../block/crimson/crimson_platinum_ore.png | Bin 0 -> 504 bytes .../block/crimson/crimson_silver_ore.png | Bin 0 -> 504 bytes .../block/crimson/crimson_tin_ore.png | Bin 0 -> 538 bytes .../block/crimson/crimson_tungsten_ore.png | Bin 0 -> 504 bytes .../textures/item/misc/lead_nugget.png | Bin 0 -> 453 bytes .../textures/item/misc/platinum_nugget.png | Bin 0 -> 455 bytes .../data/c/tags/item/nuggets/lead.json | 6 + .../data/c/tags/item/nuggets/platinum.json | 6 + .../tags/block/mineable/pickaxe.json | 20 ++ .../minecraft/tags/block/needs_iron_tool.json | 12 + .../tags/block/needs_stone_tool.json | 8 + .../data/minecraft/tags/item/axes.json | 13 ++ .../data/minecraft/tags/item/hoes.json | 5 + .../data/minecraft/tags/item/pickaxes.json | 5 + .../data/minecraft/tags/item/shovels.json | 5 + .../data/minecraft/tags/item/swords.json | 5 + .../blocks/corrupted_deepslate_lead_ore.json | 51 ++++ .../corrupted_deepslate_platinum_ore.json | 51 ++++ .../corrupted_deepslate_silver_ore.json | 51 ++++ .../blocks/corrupted_deepslate_tin_ore.json | 51 ++++ .../corrupted_deepslate_tungsten_ore.json | 51 ++++ .../loot_table/blocks/corrupted_lead_ore.json | 51 ++++ .../blocks/corrupted_platinum_ore.json | 51 ++++ .../blocks/corrupted_silver_ore.json | 51 ++++ .../loot_table/blocks/corrupted_tin_ore.json | 51 ++++ .../blocks/corrupted_tungsten_ore.json | 51 ++++ .../blocks/crimson_deepslate_lead_ore.json | 51 ++++ .../crimson_deepslate_platinum_ore.json | 51 ++++ .../blocks/crimson_deepslate_silver_ore.json | 51 ++++ .../blocks/crimson_deepslate_tin_ore.json | 51 ++++ .../crimson_deepslate_tungsten_ore.json | 51 ++++ .../loot_table/blocks/crimson_lead_ore.json | 51 ++++ .../blocks/crimson_platinum_ore.json | 51 ++++ .../loot_table/blocks/crimson_silver_ore.json | 51 ++++ .../loot_table/blocks/crimson_tin_ore.json | 51 ++++ .../blocks/crimson_tungsten_ore.json | 51 ++++ 244 files changed, 4745 insertions(+), 140 deletions(-) create mode 100644 src/main/generated/assets/terramine/items/corrupted_deepslate_lead_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_deepslate_platinum_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_deepslate_silver_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_deepslate_tin_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_deepslate_tungsten_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_lead_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_platinum_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_silver_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_tin_ore.json create mode 100644 src/main/generated/assets/terramine/items/corrupted_tungsten_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_deepslate_lead_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_deepslate_platinum_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_deepslate_silver_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_deepslate_tin_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_deepslate_tungsten_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_lead_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_platinum_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_silver_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_tin_ore.json create mode 100644 src/main/generated/assets/terramine/items/crimson_tungsten_ore.json create mode 100644 src/main/generated/assets/terramine/items/lead_nugget.json create mode 100644 src/main/generated/assets/terramine/items/platinum_nugget.json create mode 100644 src/main/generated/assets/terramine/models/item/lead_nugget.json create mode 100644 src/main/generated/assets/terramine/models/item/platinum_nugget.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/brewing/cauldron.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/chain.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_door.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_trapdoor.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_bars.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_door.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_trapdoor.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/lantern.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/building_blocks/soul_lantern.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/combat/crossbow.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/combat/shield.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/decorations/anvil.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/decorations/blast_furnace.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/decorations/smithing_table.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/decorations/stonecutter.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/food/glistering_melon_slice.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/food/golden_apple.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/food/golden_carrot.json rename src/main/generated/data/terramine/advancement/recipes/misc/{clock.json => clock_from_watch.json} (85%) create mode 100644 src/main/generated/data/terramine/advancement/recipes/misc/lead_nugget.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/misc/platinum_nugget.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/redstone/crafter.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/redstone/heavy_weighted_pressure_plate.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/redstone/hopper.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/redstone/light_weighted_pressure_plate.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/redstone/netherite_ingot.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/redstone/piston.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/redstone/tripwire_hook.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/brush.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/bucket.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/clock.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/compass.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/flint_and_steel.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/lightning_rod.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/shears.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/tools/spyglass.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/transportation/activator_rail.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/transportation/detector_rail.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/transportation/minecart.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/transportation/powered_rail.json create mode 100644 src/main/generated/data/terramine/advancement/recipes/transportation/rail.json create mode 100644 src/main/generated/data/terramine/recipe/activator_rail.json create mode 100644 src/main/generated/data/terramine/recipe/anvil.json create mode 100644 src/main/generated/data/terramine/recipe/blast_furnace.json create mode 100644 src/main/generated/data/terramine/recipe/brush.json create mode 100644 src/main/generated/data/terramine/recipe/bucket.json create mode 100644 src/main/generated/data/terramine/recipe/cauldron.json create mode 100644 src/main/generated/data/terramine/recipe/chain.json create mode 100644 src/main/generated/data/terramine/recipe/clock_from_watch.json create mode 100644 src/main/generated/data/terramine/recipe/compass.json create mode 100644 src/main/generated/data/terramine/recipe/copper_door.json create mode 100644 src/main/generated/data/terramine/recipe/copper_trapdoor.json create mode 100644 src/main/generated/data/terramine/recipe/crafter.json create mode 100644 src/main/generated/data/terramine/recipe/crossbow.json create mode 100644 src/main/generated/data/terramine/recipe/detector_rail.json create mode 100644 src/main/generated/data/terramine/recipe/flint_and_steel.json create mode 100644 src/main/generated/data/terramine/recipe/glistering_melon_slice.json create mode 100644 src/main/generated/data/terramine/recipe/golden_apple.json create mode 100644 src/main/generated/data/terramine/recipe/golden_carrot.json create mode 100644 src/main/generated/data/terramine/recipe/heavy_weighted_pressure_plate.json create mode 100644 src/main/generated/data/terramine/recipe/hopper.json create mode 100644 src/main/generated/data/terramine/recipe/iron_bars.json create mode 100644 src/main/generated/data/terramine/recipe/iron_door.json create mode 100644 src/main/generated/data/terramine/recipe/iron_trapdoor.json create mode 100644 src/main/generated/data/terramine/recipe/lantern.json create mode 100644 src/main/generated/data/terramine/recipe/lead_nugget.json create mode 100644 src/main/generated/data/terramine/recipe/light_weighted_pressure_plate.json create mode 100644 src/main/generated/data/terramine/recipe/lightning_rod.json create mode 100644 src/main/generated/data/terramine/recipe/minecart.json create mode 100644 src/main/generated/data/terramine/recipe/netherite_ingot.json create mode 100644 src/main/generated/data/terramine/recipe/piston.json create mode 100644 src/main/generated/data/terramine/recipe/platinum_nugget.json create mode 100644 src/main/generated/data/terramine/recipe/powered_rail.json create mode 100644 src/main/generated/data/terramine/recipe/rail.json create mode 100644 src/main/generated/data/terramine/recipe/shears.json create mode 100644 src/main/generated/data/terramine/recipe/shield.json create mode 100644 src/main/generated/data/terramine/recipe/smithing_table.json create mode 100644 src/main/generated/data/terramine/recipe/soul_lantern.json create mode 100644 src/main/generated/data/terramine/recipe/spyglass.json create mode 100644 src/main/generated/data/terramine/recipe/stonecutter.json create mode 100644 src/main/generated/data/terramine/recipe/tripwire_hook.json rename src/main/generated/data/terramine/worldgen/configured_feature/{ore_tin_small.json => ore_tin_large.json} (97%) create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_deepslate_lead_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_deepslate_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_deepslate_silver_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tin_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_lead_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_silver_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_tin_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/corrupted_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_deepslate_lead_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_deepslate_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_deepslate_silver_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_deepslate_tin_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_deepslate_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_lead_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_silver_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_tin_ore.json create mode 100644 src/main/resources/assets/terramine/blockstates/crimson_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_deepslate_lead_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_deepslate_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_deepslate_silver_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_deepslate_tin_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_deepslate_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_lead_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_silver_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_tin_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/corrupted_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_deepslate_lead_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_deepslate_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_deepslate_silver_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_deepslate_tin_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_deepslate_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_lead_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_platinum_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_silver_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_tin_ore.json create mode 100644 src/main/resources/assets/terramine/models/block/crimson_tungsten_ore.json create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_lead_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_platinum_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_silver_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_tin_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_tungsten_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_lead_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_platinum_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_silver_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_tin_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/corruption/corrupt_tungsten_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_lead_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_platinum_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_silver_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_tin_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_tungsten_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_lead_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_platinum_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_silver_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_tin_ore.png create mode 100644 src/main/resources/assets/terramine/textures/block/crimson/crimson_tungsten_ore.png create mode 100644 src/main/resources/assets/terramine/textures/item/misc/lead_nugget.png create mode 100644 src/main/resources/assets/terramine/textures/item/misc/platinum_nugget.png create mode 100644 src/main/resources/data/c/tags/item/nuggets/lead.json create mode 100644 src/main/resources/data/c/tags/item/nuggets/platinum.json create mode 100644 src/main/resources/data/minecraft/tags/item/axes.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_deepslate_lead_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_deepslate_platinum_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_deepslate_silver_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_deepslate_tin_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_deepslate_tungsten_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_lead_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_platinum_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_silver_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_tin_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/corrupted_tungsten_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_deepslate_lead_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_deepslate_platinum_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_deepslate_silver_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_deepslate_tin_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_deepslate_tungsten_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_lead_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_platinum_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_silver_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_tin_ore.json create mode 100644 src/main/resources/data/terramine/loot_table/blocks/crimson_tungsten_ore.json diff --git a/src/main/generated/assets/terramine/items/corrupted_deepslate_lead_ore.json b/src/main/generated/assets/terramine/items/corrupted_deepslate_lead_ore.json new file mode 100644 index 00000000..039e8ec2 --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_deepslate_lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_deepslate_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_deepslate_platinum_ore.json b/src/main/generated/assets/terramine/items/corrupted_deepslate_platinum_ore.json new file mode 100644 index 00000000..cba3670a --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_deepslate_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_deepslate_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_deepslate_silver_ore.json b/src/main/generated/assets/terramine/items/corrupted_deepslate_silver_ore.json new file mode 100644 index 00000000..4e35890f --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_deepslate_silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_deepslate_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_deepslate_tin_ore.json b/src/main/generated/assets/terramine/items/corrupted_deepslate_tin_ore.json new file mode 100644 index 00000000..3b725aec --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_deepslate_tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_deepslate_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_deepslate_tungsten_ore.json b/src/main/generated/assets/terramine/items/corrupted_deepslate_tungsten_ore.json new file mode 100644 index 00000000..6d5af243 --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_deepslate_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_deepslate_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_lead_ore.json b/src/main/generated/assets/terramine/items/corrupted_lead_ore.json new file mode 100644 index 00000000..fffdf618 --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_platinum_ore.json b/src/main/generated/assets/terramine/items/corrupted_platinum_ore.json new file mode 100644 index 00000000..8aedc677 --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_silver_ore.json b/src/main/generated/assets/terramine/items/corrupted_silver_ore.json new file mode 100644 index 00000000..7cef5e89 --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_tin_ore.json b/src/main/generated/assets/terramine/items/corrupted_tin_ore.json new file mode 100644 index 00000000..ebac2c35 --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/corrupted_tungsten_ore.json b/src/main/generated/assets/terramine/items/corrupted_tungsten_ore.json new file mode 100644 index 00000000..452f8890 --- /dev/null +++ b/src/main/generated/assets/terramine/items/corrupted_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/corrupted_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_deepslate_lead_ore.json b/src/main/generated/assets/terramine/items/crimson_deepslate_lead_ore.json new file mode 100644 index 00000000..b56c49f5 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_deepslate_lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_deepslate_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_deepslate_platinum_ore.json b/src/main/generated/assets/terramine/items/crimson_deepslate_platinum_ore.json new file mode 100644 index 00000000..1974aeb8 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_deepslate_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_deepslate_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_deepslate_silver_ore.json b/src/main/generated/assets/terramine/items/crimson_deepslate_silver_ore.json new file mode 100644 index 00000000..b6ebb5a7 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_deepslate_silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_deepslate_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_deepslate_tin_ore.json b/src/main/generated/assets/terramine/items/crimson_deepslate_tin_ore.json new file mode 100644 index 00000000..abae8844 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_deepslate_tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_deepslate_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_deepslate_tungsten_ore.json b/src/main/generated/assets/terramine/items/crimson_deepslate_tungsten_ore.json new file mode 100644 index 00000000..9eb23a96 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_deepslate_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_deepslate_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_lead_ore.json b/src/main/generated/assets/terramine/items/crimson_lead_ore.json new file mode 100644 index 00000000..2d9afe09 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_lead_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_platinum_ore.json b/src/main/generated/assets/terramine/items/crimson_platinum_ore.json new file mode 100644 index 00000000..56f1abf7 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_silver_ore.json b/src/main/generated/assets/terramine/items/crimson_silver_ore.json new file mode 100644 index 00000000..3be5f6c2 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_silver_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_tin_ore.json b/src/main/generated/assets/terramine/items/crimson_tin_ore.json new file mode 100644 index 00000000..c64ebeed --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_tin_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/crimson_tungsten_ore.json b/src/main/generated/assets/terramine/items/crimson_tungsten_ore.json new file mode 100644 index 00000000..3551b135 --- /dev/null +++ b/src/main/generated/assets/terramine/items/crimson_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:block/crimson_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/lead_nugget.json b/src/main/generated/assets/terramine/items/lead_nugget.json new file mode 100644 index 00000000..00dbd6b9 --- /dev/null +++ b/src/main/generated/assets/terramine/items/lead_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:item/lead_nugget" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/items/platinum_nugget.json b/src/main/generated/assets/terramine/items/platinum_nugget.json new file mode 100644 index 00000000..9912237d --- /dev/null +++ b/src/main/generated/assets/terramine/items/platinum_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "terramine:item/platinum_nugget" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/models/item/lead_nugget.json b/src/main/generated/assets/terramine/models/item/lead_nugget.json new file mode 100644 index 00000000..f5ced196 --- /dev/null +++ b/src/main/generated/assets/terramine/models/item/lead_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "terramine:item/misc/lead_nugget" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/terramine/models/item/platinum_nugget.json b/src/main/generated/assets/terramine/models/item/platinum_nugget.json new file mode 100644 index 00000000..b28f3b8d --- /dev/null +++ b/src/main/generated/assets/terramine/models/item/platinum_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "terramine:item/misc/platinum_nugget" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/brewing/cauldron.json b/src/main/generated/data/terramine/advancement/recipes/brewing/cauldron.json new file mode 100644 index 00000000..30a0b6a7 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/brewing/cauldron.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cauldron" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cauldron" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/chain.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/chain.json new file mode 100644 index 00000000..da8ee37d --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/chain.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lead_nugget": { + "conditions": { + "items": [ + { + "items": "terramine:lead_nugget" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:chain" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_lead_nugget" + ] + ], + "rewards": { + "recipes": [ + "minecraft:chain" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_door.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_door.json new file mode 100644 index 00000000..a0aac599 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_door.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:copper_door" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tin_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:tin_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tin_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:copper_door" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_trapdoor.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_trapdoor.json new file mode 100644 index 00000000..f6d9c910 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/copper_trapdoor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:copper_trapdoor" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tin_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:tin_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tin_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:copper_trapdoor" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_bars.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_bars.json new file mode 100644 index 00000000..9f839493 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_bars.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:iron_bars" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:iron_bars" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_door.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_door.json new file mode 100644 index 00000000..b3c474f6 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_door.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:iron_door" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:iron_door" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_trapdoor.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_trapdoor.json new file mode 100644 index 00000000..bccb03f0 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/iron_trapdoor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:iron_trapdoor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:iron_trapdoor" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/lantern.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/lantern.json new file mode 100644 index 00000000..6ea22348 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/lantern.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_nugget": { + "conditions": { + "items": [ + { + "items": "terramine:lead_nugget" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:lantern" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_torch": { + "conditions": { + "items": [ + { + "items": "minecraft:torch" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_nugget", + "has_torch" + ] + ], + "rewards": { + "recipes": [ + "minecraft:lantern" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_blasting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_blasting.json index 6acf7a5b..25eac9e0 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_blasting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_blasting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_lead_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_lead", "has_lead_ore", - "has_deepslate_lead_ore" + "has_deepslate_lead_ore", + "has_corrupted_lead_ore", + "has_corrupted_deepslate_lead_ore", + "has_crimson_lead_ore", + "has_crimson_deepslate_lead_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_smelting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_smelting.json index b0d06119..24d64fdd 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_smelting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/lead_ingot_smelting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_lead_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_lead_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_lead_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_lead", "has_lead_ore", - "has_deepslate_lead_ore" + "has_deepslate_lead_ore", + "has_corrupted_lead_ore", + "has_corrupted_deepslate_lead_ore", + "has_crimson_lead_ore", + "has_crimson_deepslate_lead_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_blasting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_blasting.json index f448cd5e..ffc53b2a 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_blasting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_blasting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_platinum_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_platinum", "has_platinum_ore", - "has_deepslate_platinum_ore" + "has_deepslate_platinum_ore", + "has_corrupted_platinum_ore", + "has_corrupted_deepslate_platinum_ore", + "has_crimson_platinum_ore", + "has_crimson_deepslate_platinum_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_smelting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_smelting.json index 9ef6f6f5..9285060c 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_smelting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/platinum_ingot_smelting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_platinum_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_platinum_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_platinum_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_platinum", "has_platinum_ore", - "has_deepslate_platinum_ore" + "has_deepslate_platinum_ore", + "has_corrupted_platinum_ore", + "has_corrupted_deepslate_platinum_ore", + "has_crimson_platinum_ore", + "has_crimson_deepslate_platinum_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_blasting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_blasting.json index b0f72971..4507e140 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_blasting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_blasting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_silver_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_silver", "has_silver_ore", - "has_deepslate_silver_ore" + "has_deepslate_silver_ore", + "has_corrupted_silver_ore", + "has_corrupted_deepslate_silver_ore", + "has_crimson_silver_ore", + "has_crimson_deepslate_silver_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_smelting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_smelting.json index 40e34c80..ccef1d84 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_smelting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/silver_ingot_smelting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_silver_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_silver_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_silver_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_silver", "has_silver_ore", - "has_deepslate_silver_ore" + "has_deepslate_silver_ore", + "has_corrupted_silver_ore", + "has_corrupted_deepslate_silver_ore", + "has_crimson_silver_ore", + "has_crimson_deepslate_silver_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/soul_lantern.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/soul_lantern.json new file mode 100644 index 00000000..fbf52239 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/soul_lantern.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_nugget": { + "conditions": { + "items": [ + { + "items": "terramine:lead_nugget" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_soul_torch": { + "conditions": { + "items": [ + { + "items": "minecraft:soul_torch" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:soul_lantern" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_nugget", + "has_soul_torch" + ] + ], + "rewards": { + "recipes": [ + "minecraft:soul_lantern" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_blasting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_blasting.json index 3e7aa7eb..855f71bb 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_blasting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_blasting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_tin_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_tin", "has_tin_ore", - "has_deepslate_tin_ore" + "has_deepslate_tin_ore", + "has_corrupted_tin_ore", + "has_corrupted_deepslate_tin_ore", + "has_crimson_tin_ore", + "has_crimson_deepslate_tin_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_smelting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_smelting.json index b5540cd3..99856252 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_smelting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tin_ingot_smelting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_tin_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_tin_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_tin_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_tin", "has_tin_ore", - "has_deepslate_tin_ore" + "has_deepslate_tin_ore", + "has_corrupted_tin_ore", + "has_corrupted_deepslate_tin_ore", + "has_crimson_tin_ore", + "has_crimson_deepslate_tin_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_blasting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_blasting.json index a06c5ec6..d4c1c0e2 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_blasting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_blasting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_tungsten_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_tungsten", "has_tungsten_ore", - "has_deepslate_tungsten_ore" + "has_deepslate_tungsten_ore", + "has_corrupted_tungsten_ore", + "has_corrupted_deepslate_tungsten_ore", + "has_crimson_tungsten_ore", + "has_crimson_deepslate_tungsten_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_smelting.json b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_smelting.json index 0247edf7..0cd0ebf7 100644 --- a/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_smelting.json +++ b/src/main/generated/data/terramine/advancement/recipes/building_blocks/tungsten_ingot_smelting.json @@ -1,6 +1,46 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_corrupted_deepslate_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_deepslate_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_corrupted_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:corrupted_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_deepslate_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_deepslate_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_crimson_tungsten_ore": { + "conditions": { + "items": [ + { + "items": "terramine:crimson_tungsten_ore" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_deepslate_tungsten_ore": { "conditions": { "items": [ @@ -43,7 +83,11 @@ "has_the_recipe", "has_raw_tungsten", "has_tungsten_ore", - "has_deepslate_tungsten_ore" + "has_deepslate_tungsten_ore", + "has_corrupted_tungsten_ore", + "has_corrupted_deepslate_tungsten_ore", + "has_crimson_tungsten_ore", + "has_crimson_deepslate_tungsten_ore" ] ], "rewards": { diff --git a/src/main/generated/data/terramine/advancement/recipes/combat/crossbow.json b/src/main/generated/data/terramine/advancement/recipes/combat/crossbow.json new file mode 100644 index 00000000..9148567e --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/combat/crossbow.json @@ -0,0 +1,65 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_string": { + "conditions": { + "items": [ + { + "items": "minecraft:string" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:crossbow" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tripwire_hook": { + "conditions": { + "items": [ + { + "items": "minecraft:tripwire_hook" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_stick", + "has_string", + "has_tripwire_hook" + ] + ], + "rewards": { + "recipes": [ + "minecraft:crossbow" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/combat/shield.json b/src/main/generated/data/terramine/advancement/recipes/combat/shield.json new file mode 100644 index 00000000..ea372729 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/combat/shield.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_planks": { + "conditions": { + "items": [ + { + "items": "#minecraft:planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:shield" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_planks" + ] + ], + "rewards": { + "recipes": [ + "minecraft:shield" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/decorations/anvil.json b/src/main/generated/data/terramine/advancement/recipes/decorations/anvil.json new file mode 100644 index 00000000..e3ebbc5e --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/decorations/anvil.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_block": { + "conditions": { + "items": [ + { + "items": "terramine:lead_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:anvil" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_lead_block" + ] + ], + "rewards": { + "recipes": [ + "minecraft:anvil" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/decorations/blast_furnace.json b/src/main/generated/data/terramine/advancement/recipes/decorations/blast_furnace.json new file mode 100644 index 00000000..589d7607 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/decorations/blast_furnace.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_furnace": { + "conditions": { + "items": [ + { + "items": "minecraft:furnace" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_smooth_stone": { + "conditions": { + "items": [ + { + "items": "minecraft:smooth_stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:blast_furnace" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_smooth_stone", + "has_furnace" + ] + ], + "rewards": { + "recipes": [ + "minecraft:blast_furnace" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/decorations/smithing_table.json b/src/main/generated/data/terramine/advancement/recipes/decorations/smithing_table.json new file mode 100644 index 00000000..7372b994 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/decorations/smithing_table.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_planks": { + "conditions": { + "items": [ + { + "items": "#minecraft:planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:smithing_table" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_planks" + ] + ], + "rewards": { + "recipes": [ + "minecraft:smithing_table" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/decorations/stonecutter.json b/src/main/generated/data/terramine/advancement/recipes/decorations/stonecutter.json new file mode 100644 index 00000000..09edaf2a --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/decorations/stonecutter.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stone": { + "conditions": { + "items": [ + { + "items": "minecraft:stone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:stonecutter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_stone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:stonecutter" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/food/glistering_melon_slice.json b/src/main/generated/data/terramine/advancement/recipes/food/glistering_melon_slice.json new file mode 100644 index 00000000..38a52e27 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/food/glistering_melon_slice.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_melon_slice": { + "conditions": { + "items": [ + { + "items": "minecraft:melon_slice" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_platinum_nugget": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_nugget" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:glistering_melon_slice" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_nugget", + "has_melon_slice" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glistering_melon_slice" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/food/golden_apple.json b/src/main/generated/data/terramine/advancement/recipes/food/golden_apple.json new file mode 100644 index 00000000..63397209 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/food/golden_apple.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_apple": { + "conditions": { + "items": [ + { + "items": "minecraft:apple" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_platinum_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:golden_apple" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_ingot", + "has_apple" + ] + ], + "rewards": { + "recipes": [ + "minecraft:golden_apple" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/food/golden_carrot.json b/src/main/generated/data/terramine/advancement/recipes/food/golden_carrot.json new file mode 100644 index 00000000..9f047832 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/food/golden_carrot.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_carrot": { + "conditions": { + "items": [ + { + "items": "minecraft:carrot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_platinum_nugget": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_nugget" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:golden_carrot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_nugget", + "has_carrot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:golden_carrot" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/misc/clock.json b/src/main/generated/data/terramine/advancement/recipes/misc/clock_from_watch.json similarity index 85% rename from src/main/generated/data/terramine/advancement/recipes/misc/clock.json rename to src/main/generated/data/terramine/advancement/recipes/misc/clock_from_watch.json index dd248620..b90e3271 100644 --- a/src/main/generated/data/terramine/advancement/recipes/misc/clock.json +++ b/src/main/generated/data/terramine/advancement/recipes/misc/clock_from_watch.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:clock" + "recipe": "minecraft:clock_from_watch" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:clock" + "minecraft:clock_from_watch" ] } } \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/misc/lead_nugget.json b/src/main/generated/data/terramine/advancement/recipes/misc/lead_nugget.json new file mode 100644 index 00000000..676a3a4d --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/misc/lead_nugget.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "terramine:lead_nugget" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "terramine:lead_nugget" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/misc/platinum_nugget.json b/src/main/generated/data/terramine/advancement/recipes/misc/platinum_nugget.json new file mode 100644 index 00000000..dd9cd4c8 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/misc/platinum_nugget.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_platinum_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "terramine:platinum_nugget" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_ingot" + ] + ], + "rewards": { + "recipes": [ + "terramine:platinum_nugget" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/redstone/crafter.json b/src/main/generated/data/terramine/advancement/recipes/redstone/crafter.json new file mode 100644 index 00000000..0760a5e5 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/redstone/crafter.json @@ -0,0 +1,65 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_table": { + "conditions": { + "items": [ + { + "items": "minecraft:crafting_table" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_dropper": { + "conditions": { + "items": [ + { + "items": "minecraft:dropper" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:crafter" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_crafting_table", + "has_redstone", + "has_dropper" + ] + ], + "rewards": { + "recipes": [ + "minecraft:crafter" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/redstone/heavy_weighted_pressure_plate.json b/src/main/generated/data/terramine/advancement/recipes/redstone/heavy_weighted_pressure_plate.json new file mode 100644 index 00000000..6fc45a57 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/redstone/heavy_weighted_pressure_plate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:heavy_weighted_pressure_plate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:heavy_weighted_pressure_plate" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/redstone/hopper.json b/src/main/generated/data/terramine/advancement/recipes/redstone/hopper.json new file mode 100644 index 00000000..91d819c6 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/redstone/hopper.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "items": "minecraft:chest" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:hopper" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_chest" + ] + ], + "rewards": { + "recipes": [ + "minecraft:hopper" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/redstone/light_weighted_pressure_plate.json b/src/main/generated/data/terramine/advancement/recipes/redstone/light_weighted_pressure_plate.json new file mode 100644 index 00000000..78ffbe85 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/redstone/light_weighted_pressure_plate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_platinum_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:light_weighted_pressure_plate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:light_weighted_pressure_plate" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/redstone/netherite_ingot.json b/src/main/generated/data/terramine/advancement/recipes/redstone/netherite_ingot.json new file mode 100644 index 00000000..bd478ee5 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/redstone/netherite_ingot.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_netherite_scrap": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_scrap" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_platinum_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:netherite_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_ingot", + "has_netherite_scrap" + ] + ], + "rewards": { + "recipes": [ + "minecraft:netherite_ingot" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/redstone/piston.json b/src/main/generated/data/terramine/advancement/recipes/redstone/piston.json new file mode 100644 index 00000000..2e90f6ab --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/redstone/piston.json @@ -0,0 +1,65 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobblestone": { + "conditions": { + "items": [ + { + "items": "minecraft:cobblestone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_planks": { + "conditions": { + "items": [ + { + "items": "#minecraft:planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:piston" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_planks", + "has_cobblestone", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:piston" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/redstone/tripwire_hook.json b/src/main/generated/data/terramine/advancement/recipes/redstone/tripwire_hook.json new file mode 100644 index 00000000..6dc0bf68 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/redstone/tripwire_hook.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_planks": { + "conditions": { + "items": [ + { + "items": "#minecraft:planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:tripwire_hook" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_stick", + "has_planks" + ] + ], + "rewards": { + "recipes": [ + "minecraft:tripwire_hook" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/brush.json b/src/main/generated/data/terramine/advancement/recipes/tools/brush.json new file mode 100644 index 00000000..eaa36adb --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/brush.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_feather": { + "conditions": { + "items": [ + { + "items": "minecraft:feather" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:brush" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tin_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:tin_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tin_ingot", + "has_feather", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "minecraft:brush" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/bucket.json b/src/main/generated/data/terramine/advancement/recipes/tools/bucket.json new file mode 100644 index 00000000..649cab1d --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/bucket.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bucket" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bucket" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/clock.json b/src/main/generated/data/terramine/advancement/recipes/tools/clock.json new file mode 100644 index 00000000..cfcc013b --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/clock.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_platinum_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:clock" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_ingot", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:clock" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/compass.json b/src/main/generated/data/terramine/advancement/recipes/tools/compass.json new file mode 100644 index 00000000..1c2d9bb3 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/compass.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:compass" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:compass" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/flint_and_steel.json b/src/main/generated/data/terramine/advancement/recipes/tools/flint_and_steel.json new file mode 100644 index 00000000..db7f2d1b --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/flint_and_steel.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_flint": { + "conditions": { + "items": [ + { + "items": "minecraft:flint" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:flint_and_steel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_flint" + ] + ], + "rewards": { + "recipes": [ + "minecraft:flint_and_steel" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/lightning_rod.json b/src/main/generated/data/terramine/advancement/recipes/tools/lightning_rod.json new file mode 100644 index 00000000..b2ce25a6 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/lightning_rod.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:lightning_rod" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tin_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:tin_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tin_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:lightning_rod" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/magic_mirror.json b/src/main/generated/data/terramine/advancement/recipes/tools/magic_mirror.json index 0e0dbc15..eb47f486 100644 --- a/src/main/generated/data/terramine/advancement/recipes/tools/magic_mirror.json +++ b/src/main/generated/data/terramine/advancement/recipes/tools/magic_mirror.json @@ -31,6 +31,16 @@ }, "trigger": "minecraft:inventory_changed" }, + "has_platinum_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_the_recipe": { "conditions": { "recipe": "terramine:magic_mirror" @@ -43,6 +53,7 @@ "has_the_recipe", "has_diamond", "has_gold_ingot", + "has_platinum_ingot", "has_glass" ] ], diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/shears.json b/src/main/generated/data/terramine/advancement/recipes/tools/shears.json new file mode 100644 index 00000000..d58bcc7a --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/shears.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:shears" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:shears" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/tools/spyglass.json b/src/main/generated/data/terramine/advancement/recipes/tools/spyglass.json new file mode 100644 index 00000000..b191f7b3 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/tools/spyglass.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amethyst_shard": { + "conditions": { + "items": [ + { + "items": "minecraft:amethyst_shard" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:spyglass" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_tin_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:tin_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_tin_ingot", + "has_amethyst_shard" + ] + ], + "rewards": { + "recipes": [ + "minecraft:spyglass" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/transportation/activator_rail.json b/src/main/generated/data/terramine/advancement/recipes/transportation/activator_rail.json new file mode 100644 index 00000000..58a12ae7 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/transportation/activator_rail.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:activator_rail" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_stick", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:activator_rail" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/transportation/detector_rail.json b/src/main/generated/data/terramine/advancement/recipes/transportation/detector_rail.json new file mode 100644 index 00000000..b3c20945 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/transportation/detector_rail.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stone_pressure_plate": { + "conditions": { + "items": [ + { + "items": "minecraft:stone_pressure_plate" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:detector_rail" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_redstone", + "has_stone_pressure_plate" + ] + ], + "rewards": { + "recipes": [ + "minecraft:detector_rail" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/transportation/minecart.json b/src/main/generated/data/terramine/advancement/recipes/transportation/minecart.json new file mode 100644 index 00000000..3d8a5b46 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/transportation/minecart.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:minecart" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot" + ] + ], + "rewards": { + "recipes": [ + "minecraft:minecart" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/transportation/powered_rail.json b/src/main/generated/data/terramine/advancement/recipes/transportation/powered_rail.json new file mode 100644 index 00000000..03b4085d --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/transportation/powered_rail.json @@ -0,0 +1,54 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_platinum_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:platinum_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:powered_rail" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_platinum_ingot", + "has_stick", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "minecraft:powered_rail" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/advancement/recipes/transportation/rail.json b/src/main/generated/data/terramine/advancement/recipes/transportation/rail.json new file mode 100644 index 00000000..4d48dcd2 --- /dev/null +++ b/src/main/generated/data/terramine/advancement/recipes/transportation/rail.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lead_ingot": { + "conditions": { + "items": [ + { + "items": "terramine:lead_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:rail" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lead_ingot", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "minecraft:rail" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/activator_rail.json b/src/main/generated/data/terramine/recipe/activator_rail.json new file mode 100644 index 00000000..7d425232 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/activator_rail.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "R": "minecraft:redstone", + "S": "minecraft:stick", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XSX", + "XRX", + "XSX" + ], + "result": { + "count": 6, + "id": "minecraft:activator_rail" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/anvil.json b/src/main/generated/data/terramine/recipe/anvil.json new file mode 100644 index 00000000..c0ed930f --- /dev/null +++ b/src/main/generated/data/terramine/recipe/anvil.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": "terramine:lead_block", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "BBB", + " X ", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:anvil" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/blast_furnace.json b/src/main/generated/data/terramine/recipe/blast_furnace.json new file mode 100644 index 00000000..5b72b334 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/blast_furnace.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "F": "minecraft:furnace", + "S": "minecraft:smooth_stone", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XXX", + "XFX", + "SSS" + ], + "result": { + "count": 1, + "id": "minecraft:blast_furnace" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/brush.json b/src/main/generated/data/terramine/recipe/brush.json new file mode 100644 index 00000000..cd1491c2 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/brush.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "F": "minecraft:feather", + "S": "minecraft:stick", + "X": "terramine:tin_ingot" + }, + "pattern": [ + "F", + "X", + "S" + ], + "result": { + "count": 1, + "id": "minecraft:brush" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/bucket.json b/src/main/generated/data/terramine/recipe/bucket.json new file mode 100644 index 00000000..68d3e6bc --- /dev/null +++ b/src/main/generated/data/terramine/recipe/bucket.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + "X X", + " X " + ], + "result": { + "count": 1, + "id": "minecraft:bucket" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/cauldron.json b/src/main/generated/data/terramine/recipe/cauldron.json new file mode 100644 index 00000000..694172c9 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/cauldron.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + "X X", + "X X", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:cauldron" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/chain.json b/src/main/generated/data/terramine/recipe/chain.json new file mode 100644 index 00000000..91c86e68 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/chain.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "N": "terramine:lead_nugget", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "N", + "X", + "N" + ], + "result": { + "count": 1, + "id": "minecraft:chain" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/clock.json b/src/main/generated/data/terramine/recipe/clock.json index 53c840de..509a3ebd 100644 --- a/src/main/generated/data/terramine/recipe/clock.json +++ b/src/main/generated/data/terramine/recipe/clock.json @@ -1,8 +1,14 @@ { - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - "terramine:gold_watch" + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "R": "minecraft:redstone", + "X": "terramine:platinum_ingot" + }, + "pattern": [ + " X ", + "XRX", + " X " ], "result": { "count": 1, diff --git a/src/main/generated/data/terramine/recipe/clock_from_watch.json b/src/main/generated/data/terramine/recipe/clock_from_watch.json new file mode 100644 index 00000000..53c840de --- /dev/null +++ b/src/main/generated/data/terramine/recipe/clock_from_watch.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "terramine:gold_watch" + ], + "result": { + "count": 1, + "id": "minecraft:clock" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/compass.json b/src/main/generated/data/terramine/recipe/compass.json new file mode 100644 index 00000000..30e09d24 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/compass.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "S": "minecraft:redstone", + "X": "terramine:lead_ingot" + }, + "pattern": [ + " X ", + "XSX", + " X " + ], + "result": { + "count": 1, + "id": "minecraft:compass" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/copper_door.json b/src/main/generated/data/terramine/recipe/copper_door.json new file mode 100644 index 00000000..9d9e00be --- /dev/null +++ b/src/main/generated/data/terramine/recipe/copper_door.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "X": "terramine:tin_ingot" + }, + "pattern": [ + "XX", + "XX", + "XX" + ], + "result": { + "count": 1, + "id": "minecraft:copper_door" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/copper_trapdoor.json b/src/main/generated/data/terramine/recipe/copper_trapdoor.json new file mode 100644 index 00000000..19dd27cc --- /dev/null +++ b/src/main/generated/data/terramine/recipe/copper_trapdoor.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "X": "terramine:tin_ingot" + }, + "pattern": [ + "XX", + "XX" + ], + "result": { + "count": 1, + "id": "minecraft:copper_trapdoor" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/crafter.json b/src/main/generated/data/terramine/recipe/crafter.json new file mode 100644 index 00000000..f560b554 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/crafter.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "C": "minecraft:crafting_table", + "D": "minecraft:dropper", + "R": "minecraft:redstone", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XXX", + "XCX", + "RDR" + ], + "result": { + "count": 1, + "id": "minecraft:crafter" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/crossbow.json b/src/main/generated/data/terramine/recipe/crossbow.json new file mode 100644 index 00000000..0d61caa6 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/crossbow.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "R": "minecraft:string", + "S": "minecraft:stick", + "T": "minecraft:tripwire_hook", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "SXS", + "RTR", + " S " + ], + "result": { + "count": 1, + "id": "minecraft:crossbow" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/detector_rail.json b/src/main/generated/data/terramine/recipe/detector_rail.json new file mode 100644 index 00000000..22f88ab7 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/detector_rail.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "P": "minecraft:stone_pressure_plate", + "S": "minecraft:redstone", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "X X", + "XPX", + "XSX" + ], + "result": { + "count": 6, + "id": "minecraft:detector_rail" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/flint_and_steel.json b/src/main/generated/data/terramine/recipe/flint_and_steel.json new file mode 100644 index 00000000..59928d53 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/flint_and_steel.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "S": "minecraft:flint", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XS" + ], + "result": { + "count": 1, + "id": "minecraft:flint_and_steel" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/glistering_melon_slice.json b/src/main/generated/data/terramine/recipe/glistering_melon_slice.json new file mode 100644 index 00000000..d181b8f6 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/glistering_melon_slice.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "minecraft:melon_slice", + "X": "terramine:platinum_nugget" + }, + "pattern": [ + "XXX", + "XCX", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:glistering_melon_slice" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/golden_apple.json b/src/main/generated/data/terramine/recipe/golden_apple.json new file mode 100644 index 00000000..31b71e0b --- /dev/null +++ b/src/main/generated/data/terramine/recipe/golden_apple.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "minecraft:apple", + "X": "terramine:platinum_ingot" + }, + "pattern": [ + "XXX", + "XCX", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:golden_apple" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/golden_carrot.json b/src/main/generated/data/terramine/recipe/golden_carrot.json new file mode 100644 index 00000000..e753b947 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/golden_carrot.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "minecraft:carrot", + "X": "terramine:platinum_nugget" + }, + "pattern": [ + "XXX", + "XCX", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:golden_carrot" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/heavy_weighted_pressure_plate.json b/src/main/generated/data/terramine/recipe/heavy_weighted_pressure_plate.json new file mode 100644 index 00000000..dabc0d3d --- /dev/null +++ b/src/main/generated/data/terramine/recipe/heavy_weighted_pressure_plate.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XX" + ], + "result": { + "count": 1, + "id": "minecraft:heavy_weighted_pressure_plate" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/hopper.json b/src/main/generated/data/terramine/recipe/hopper.json new file mode 100644 index 00000000..8e6168db --- /dev/null +++ b/src/main/generated/data/terramine/recipe/hopper.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "S": "minecraft:chest", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "X X", + "XSX", + " X " + ], + "result": { + "count": 1, + "id": "minecraft:hopper" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/iron_bars.json b/src/main/generated/data/terramine/recipe/iron_bars.json new file mode 100644 index 00000000..6f41eaa9 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/iron_bars.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XXX", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:iron_bars" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/iron_door.json b/src/main/generated/data/terramine/recipe/iron_door.json new file mode 100644 index 00000000..c1be888c --- /dev/null +++ b/src/main/generated/data/terramine/recipe/iron_door.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XX", + "XX", + "XX" + ], + "result": { + "count": 1, + "id": "minecraft:iron_door" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/iron_trapdoor.json b/src/main/generated/data/terramine/recipe/iron_trapdoor.json new file mode 100644 index 00000000..268b095e --- /dev/null +++ b/src/main/generated/data/terramine/recipe/iron_trapdoor.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XX", + "XX" + ], + "result": { + "count": 1, + "id": "minecraft:iron_trapdoor" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/lantern.json b/src/main/generated/data/terramine/recipe/lantern.json new file mode 100644 index 00000000..e8707adc --- /dev/null +++ b/src/main/generated/data/terramine/recipe/lantern.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "T": "minecraft:torch", + "X": "terramine:lead_nugget" + }, + "pattern": [ + "XXX", + "XTX", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:lantern" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/lead_ingot_blasting.json b/src/main/generated/data/terramine/recipe/lead_ingot_blasting.json index cf6aebca..edb2c5c3 100644 --- a/src/main/generated/data/terramine/recipe/lead_ingot_blasting.json +++ b/src/main/generated/data/terramine/recipe/lead_ingot_blasting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_lead", "terramine:lead_ore", - "terramine:deepslate_lead_ore" + "terramine:deepslate_lead_ore", + "terramine:corrupted_lead_ore", + "terramine:corrupted_deepslate_lead_ore", + "terramine:crimson_lead_ore", + "terramine:crimson_deepslate_lead_ore" ], "result": { "id": "terramine:lead_ingot" diff --git a/src/main/generated/data/terramine/recipe/lead_ingot_smelting.json b/src/main/generated/data/terramine/recipe/lead_ingot_smelting.json index ef9a6c05..7e026389 100644 --- a/src/main/generated/data/terramine/recipe/lead_ingot_smelting.json +++ b/src/main/generated/data/terramine/recipe/lead_ingot_smelting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_lead", "terramine:lead_ore", - "terramine:deepslate_lead_ore" + "terramine:deepslate_lead_ore", + "terramine:corrupted_lead_ore", + "terramine:corrupted_deepslate_lead_ore", + "terramine:crimson_lead_ore", + "terramine:crimson_deepslate_lead_ore" ], "result": { "id": "terramine:lead_ingot" diff --git a/src/main/generated/data/terramine/recipe/lead_nugget.json b/src/main/generated/data/terramine/recipe/lead_nugget.json new file mode 100644 index 00000000..d7f2f05b --- /dev/null +++ b/src/main/generated/data/terramine/recipe/lead_nugget.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "terramine:lead_ingot" + ], + "result": { + "count": 1, + "id": "terramine:lead_nugget" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/light_weighted_pressure_plate.json b/src/main/generated/data/terramine/recipe/light_weighted_pressure_plate.json new file mode 100644 index 00000000..e2c0b6f5 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/light_weighted_pressure_plate.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "X": "terramine:platinum_ingot" + }, + "pattern": [ + "XX" + ], + "result": { + "count": 1, + "id": "minecraft:light_weighted_pressure_plate" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/lightning_rod.json b/src/main/generated/data/terramine/recipe/lightning_rod.json new file mode 100644 index 00000000..30c0ea82 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/lightning_rod.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "X": "terramine:tin_ingot" + }, + "pattern": [ + "X", + "X", + "X" + ], + "result": { + "count": 1, + "id": "minecraft:lightning_rod" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/magic_mirror.json b/src/main/generated/data/terramine/recipe/magic_mirror.json index 904aaa4a..d7b1a485 100644 --- a/src/main/generated/data/terramine/recipe/magic_mirror.json +++ b/src/main/generated/data/terramine/recipe/magic_mirror.json @@ -4,7 +4,10 @@ "key": { "D": "minecraft:diamond", "G": "minecraft:glass", - "I": "minecraft:gold_ingot" + "I": [ + "minecraft:gold_ingot", + "terramine:platinum_ingot" + ] }, "pattern": [ "IDI", diff --git a/src/main/generated/data/terramine/recipe/minecart.json b/src/main/generated/data/terramine/recipe/minecart.json new file mode 100644 index 00000000..8ce06987 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/minecart.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + "X X", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:minecart" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/netherite_ingot.json b/src/main/generated/data/terramine/recipe/netherite_ingot.json new file mode 100644 index 00000000..7ba6b0b1 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/netherite_ingot.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "S": "minecraft:netherite_scrap", + "X": "terramine:platinum_ingot" + }, + "pattern": [ + "SSS", + "SXX", + "XX " + ], + "result": { + "count": 1, + "id": "minecraft:netherite_ingot" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/piston.json b/src/main/generated/data/terramine/recipe/piston.json new file mode 100644 index 00000000..ea3a4fe6 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/piston.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "C": "minecraft:cobblestone", + "P": "#minecraft:planks", + "R": "minecraft:redstone", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "PPP", + "CXC", + "CRC" + ], + "result": { + "count": 1, + "id": "minecraft:piston" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/platinum_ingot_blasting.json b/src/main/generated/data/terramine/recipe/platinum_ingot_blasting.json index 882a761c..90b6f56f 100644 --- a/src/main/generated/data/terramine/recipe/platinum_ingot_blasting.json +++ b/src/main/generated/data/terramine/recipe/platinum_ingot_blasting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_platinum", "terramine:platinum_ore", - "terramine:deepslate_platinum_ore" + "terramine:deepslate_platinum_ore", + "terramine:corrupted_platinum_ore", + "terramine:corrupted_deepslate_platinum_ore", + "terramine:crimson_platinum_ore", + "terramine:crimson_deepslate_platinum_ore" ], "result": { "id": "terramine:platinum_ingot" diff --git a/src/main/generated/data/terramine/recipe/platinum_ingot_smelting.json b/src/main/generated/data/terramine/recipe/platinum_ingot_smelting.json index ca13696a..b2191306 100644 --- a/src/main/generated/data/terramine/recipe/platinum_ingot_smelting.json +++ b/src/main/generated/data/terramine/recipe/platinum_ingot_smelting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_platinum", "terramine:platinum_ore", - "terramine:deepslate_platinum_ore" + "terramine:deepslate_platinum_ore", + "terramine:corrupted_platinum_ore", + "terramine:corrupted_deepslate_platinum_ore", + "terramine:crimson_platinum_ore", + "terramine:crimson_deepslate_platinum_ore" ], "result": { "id": "terramine:platinum_ingot" diff --git a/src/main/generated/data/terramine/recipe/platinum_nugget.json b/src/main/generated/data/terramine/recipe/platinum_nugget.json new file mode 100644 index 00000000..ee6dee11 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/platinum_nugget.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "terramine:platinum_ingot" + ], + "result": { + "count": 1, + "id": "terramine:platinum_nugget" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/powered_rail.json b/src/main/generated/data/terramine/recipe/powered_rail.json new file mode 100644 index 00000000..a8b29f19 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/powered_rail.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "C": "minecraft:stick", + "R": "minecraft:redstone", + "X": "terramine:platinum_ingot" + }, + "pattern": [ + "X X", + "XCX", + "XRX" + ], + "result": { + "count": 6, + "id": "minecraft:powered_rail" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/rail.json b/src/main/generated/data/terramine/recipe/rail.json new file mode 100644 index 00000000..2d8b1e78 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/rail.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "minecraft:stick", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "X X", + "XSX", + "X X" + ], + "result": { + "count": 16, + "id": "minecraft:rail" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/shears.json b/src/main/generated/data/terramine/recipe/shears.json new file mode 100644 index 00000000..e2e03a9f --- /dev/null +++ b/src/main/generated/data/terramine/recipe/shears.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "X": "terramine:lead_ingot" + }, + "pattern": [ + " X", + "X " + ], + "result": { + "count": 1, + "id": "minecraft:shears" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/shield.json b/src/main/generated/data/terramine/recipe/shield.json new file mode 100644 index 00000000..2258686c --- /dev/null +++ b/src/main/generated/data/terramine/recipe/shield.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "S": "#minecraft:planks", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "SXS", + "SSS", + " S " + ], + "result": { + "count": 1, + "id": "minecraft:shield" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/silver_ingot_blasting.json b/src/main/generated/data/terramine/recipe/silver_ingot_blasting.json index 82281017..56c7e2a5 100644 --- a/src/main/generated/data/terramine/recipe/silver_ingot_blasting.json +++ b/src/main/generated/data/terramine/recipe/silver_ingot_blasting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_silver", "terramine:silver_ore", - "terramine:deepslate_silver_ore" + "terramine:deepslate_silver_ore", + "terramine:corrupted_silver_ore", + "terramine:corrupted_deepslate_silver_ore", + "terramine:crimson_silver_ore", + "terramine:crimson_deepslate_silver_ore" ], "result": { "id": "terramine:silver_ingot" diff --git a/src/main/generated/data/terramine/recipe/silver_ingot_smelting.json b/src/main/generated/data/terramine/recipe/silver_ingot_smelting.json index 394619b8..35747500 100644 --- a/src/main/generated/data/terramine/recipe/silver_ingot_smelting.json +++ b/src/main/generated/data/terramine/recipe/silver_ingot_smelting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_silver", "terramine:silver_ore", - "terramine:deepslate_silver_ore" + "terramine:deepslate_silver_ore", + "terramine:corrupted_silver_ore", + "terramine:corrupted_deepslate_silver_ore", + "terramine:crimson_silver_ore", + "terramine:crimson_deepslate_silver_ore" ], "result": { "id": "terramine:silver_ingot" diff --git a/src/main/generated/data/terramine/recipe/smithing_table.json b/src/main/generated/data/terramine/recipe/smithing_table.json new file mode 100644 index 00000000..1c93aa53 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/smithing_table.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "#minecraft:planks", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "XX", + "SS", + "SS" + ], + "result": { + "count": 1, + "id": "minecraft:smithing_table" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/soul_lantern.json b/src/main/generated/data/terramine/recipe/soul_lantern.json new file mode 100644 index 00000000..fff62c85 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/soul_lantern.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "T": "minecraft:soul_torch", + "X": "terramine:lead_nugget" + }, + "pattern": [ + "XXX", + "XTX", + "XXX" + ], + "result": { + "count": 1, + "id": "minecraft:soul_lantern" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/spyglass.json b/src/main/generated/data/terramine/recipe/spyglass.json new file mode 100644 index 00000000..78a1d0b1 --- /dev/null +++ b/src/main/generated/data/terramine/recipe/spyglass.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "C": "minecraft:amethyst_shard", + "X": "terramine:tin_ingot" + }, + "pattern": [ + "C", + "X", + "X" + ], + "result": { + "count": 1, + "id": "minecraft:spyglass" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/stonecutter.json b/src/main/generated/data/terramine/recipe/stonecutter.json new file mode 100644 index 00000000..1b84341c --- /dev/null +++ b/src/main/generated/data/terramine/recipe/stonecutter.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "minecraft:stone", + "X": "terramine:lead_ingot" + }, + "pattern": [ + " X ", + "SSS" + ], + "result": { + "count": 1, + "id": "minecraft:stonecutter" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/tin_ingot_blasting.json b/src/main/generated/data/terramine/recipe/tin_ingot_blasting.json index 3432ff1a..5e51e33d 100644 --- a/src/main/generated/data/terramine/recipe/tin_ingot_blasting.json +++ b/src/main/generated/data/terramine/recipe/tin_ingot_blasting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_tin", "terramine:tin_ore", - "terramine:deepslate_tin_ore" + "terramine:deepslate_tin_ore", + "terramine:corrupted_tin_ore", + "terramine:corrupted_deepslate_tin_ore", + "terramine:crimson_tin_ore", + "terramine:crimson_deepslate_tin_ore" ], "result": { "id": "terramine:tin_ingot" diff --git a/src/main/generated/data/terramine/recipe/tin_ingot_smelting.json b/src/main/generated/data/terramine/recipe/tin_ingot_smelting.json index a73b786e..0a645de9 100644 --- a/src/main/generated/data/terramine/recipe/tin_ingot_smelting.json +++ b/src/main/generated/data/terramine/recipe/tin_ingot_smelting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_tin", "terramine:tin_ore", - "terramine:deepslate_tin_ore" + "terramine:deepslate_tin_ore", + "terramine:corrupted_tin_ore", + "terramine:corrupted_deepslate_tin_ore", + "terramine:crimson_tin_ore", + "terramine:crimson_deepslate_tin_ore" ], "result": { "id": "terramine:tin_ingot" diff --git a/src/main/generated/data/terramine/recipe/tripwire_hook.json b/src/main/generated/data/terramine/recipe/tripwire_hook.json new file mode 100644 index 00000000..9b5cc3ea --- /dev/null +++ b/src/main/generated/data/terramine/recipe/tripwire_hook.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "P": "#minecraft:planks", + "S": "minecraft:stick", + "X": "terramine:lead_ingot" + }, + "pattern": [ + "X", + "S", + "P" + ], + "result": { + "count": 1, + "id": "minecraft:tripwire_hook" + } +} \ No newline at end of file diff --git a/src/main/generated/data/terramine/recipe/tungsten_ingot_blasting.json b/src/main/generated/data/terramine/recipe/tungsten_ingot_blasting.json index e2ed7700..6bc84127 100644 --- a/src/main/generated/data/terramine/recipe/tungsten_ingot_blasting.json +++ b/src/main/generated/data/terramine/recipe/tungsten_ingot_blasting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_tungsten", "terramine:tungsten_ore", - "terramine:deepslate_tungsten_ore" + "terramine:deepslate_tungsten_ore", + "terramine:corrupted_tungsten_ore", + "terramine:corrupted_deepslate_tungsten_ore", + "terramine:crimson_tungsten_ore", + "terramine:crimson_deepslate_tungsten_ore" ], "result": { "id": "terramine:tungsten_ingot" diff --git a/src/main/generated/data/terramine/recipe/tungsten_ingot_smelting.json b/src/main/generated/data/terramine/recipe/tungsten_ingot_smelting.json index b11ed962..d18a8839 100644 --- a/src/main/generated/data/terramine/recipe/tungsten_ingot_smelting.json +++ b/src/main/generated/data/terramine/recipe/tungsten_ingot_smelting.json @@ -6,7 +6,11 @@ "ingredient": [ "terramine:raw_tungsten", "terramine:tungsten_ore", - "terramine:deepslate_tungsten_ore" + "terramine:deepslate_tungsten_ore", + "terramine:corrupted_tungsten_ore", + "terramine:corrupted_deepslate_tungsten_ore", + "terramine:crimson_tungsten_ore", + "terramine:crimson_deepslate_tungsten_ore" ], "result": { "id": "terramine:tungsten_ingot" diff --git a/src/main/generated/data/terramine/worldgen/biome/corruption.json b/src/main/generated/data/terramine/worldgen/biome/corruption.json index faa70345..b28b6abf 100644 --- a/src/main/generated/data/terramine/worldgen/biome/corruption.json +++ b/src/main/generated/data/terramine/worldgen/biome/corruption.json @@ -61,17 +61,8 @@ "minecraft:ore_iron_upper", "minecraft:ore_iron_middle", "minecraft:ore_iron_small", - "terramine:ore_silver", - "terramine:ore_silver_small", - "terramine:ore_lead_upper", - "terramine:ore_lead_middle", - "terramine:ore_lead_small", - "terramine:ore_tungsten", - "terramine:ore_tungsten_small", "minecraft:ore_gold", "minecraft:ore_gold_lower", - "terramine:ore_platinum", - "terramine:ore_platinum_lower", "minecraft:ore_redstone", "minecraft:ore_redstone_lower", "minecraft:ore_diamond", @@ -81,7 +72,6 @@ "minecraft:ore_lapis", "minecraft:ore_lapis_buried", "minecraft:ore_copper", - "terramine:ore_tin", "minecraft:underwater_magma", "terramine:ore_demonite_upper", "terramine:ore_demonite_middle", diff --git a/src/main/generated/data/terramine/worldgen/biome/corruption_desert.json b/src/main/generated/data/terramine/worldgen/biome/corruption_desert.json index 9d90604e..3dcfcde6 100644 --- a/src/main/generated/data/terramine/worldgen/biome/corruption_desert.json +++ b/src/main/generated/data/terramine/worldgen/biome/corruption_desert.json @@ -65,17 +65,8 @@ "minecraft:ore_iron_upper", "minecraft:ore_iron_middle", "minecraft:ore_iron_small", - "terramine:ore_silver", - "terramine:ore_silver_small", - "terramine:ore_lead_upper", - "terramine:ore_lead_middle", - "terramine:ore_lead_small", - "terramine:ore_tungsten", - "terramine:ore_tungsten_small", "minecraft:ore_gold", "minecraft:ore_gold_lower", - "terramine:ore_platinum", - "terramine:ore_platinum_lower", "minecraft:ore_redstone", "minecraft:ore_redstone_lower", "minecraft:ore_diamond", @@ -85,7 +76,6 @@ "minecraft:ore_lapis", "minecraft:ore_lapis_buried", "minecraft:ore_copper", - "terramine:ore_tin", "minecraft:underwater_magma", "terramine:ore_demonite_upper", "terramine:ore_demonite_middle", diff --git a/src/main/generated/data/terramine/worldgen/biome/crimson.json b/src/main/generated/data/terramine/worldgen/biome/crimson.json index eb6e1215..a2d6a42f 100644 --- a/src/main/generated/data/terramine/worldgen/biome/crimson.json +++ b/src/main/generated/data/terramine/worldgen/biome/crimson.json @@ -61,17 +61,8 @@ "minecraft:ore_iron_upper", "minecraft:ore_iron_middle", "minecraft:ore_iron_small", - "terramine:ore_silver", - "terramine:ore_silver_small", - "terramine:ore_lead_upper", - "terramine:ore_lead_middle", - "terramine:ore_lead_small", - "terramine:ore_tungsten", - "terramine:ore_tungsten_small", "minecraft:ore_gold", "minecraft:ore_gold_lower", - "terramine:ore_platinum", - "terramine:ore_platinum_lower", "minecraft:ore_redstone", "minecraft:ore_redstone_lower", "minecraft:ore_diamond", @@ -81,7 +72,6 @@ "minecraft:ore_lapis", "minecraft:ore_lapis_buried", "minecraft:ore_copper", - "terramine:ore_tin", "minecraft:underwater_magma", "terramine:ore_crimtane_upper", "terramine:ore_crimtane_middle", diff --git a/src/main/generated/data/terramine/worldgen/biome/crimson_desert.json b/src/main/generated/data/terramine/worldgen/biome/crimson_desert.json index f0b93fad..d6d78d38 100644 --- a/src/main/generated/data/terramine/worldgen/biome/crimson_desert.json +++ b/src/main/generated/data/terramine/worldgen/biome/crimson_desert.json @@ -65,17 +65,8 @@ "minecraft:ore_iron_upper", "minecraft:ore_iron_middle", "minecraft:ore_iron_small", - "terramine:ore_silver", - "terramine:ore_silver_small", - "terramine:ore_lead_upper", - "terramine:ore_lead_middle", - "terramine:ore_lead_small", - "terramine:ore_tungsten", - "terramine:ore_tungsten_small", "minecraft:ore_gold", "minecraft:ore_gold_lower", - "terramine:ore_platinum", - "terramine:ore_platinum_lower", "minecraft:ore_redstone", "minecraft:ore_redstone_lower", "minecraft:ore_diamond", @@ -85,7 +76,6 @@ "minecraft:ore_lapis", "minecraft:ore_lapis_buried", "minecraft:ore_copper", - "terramine:ore_tin", "minecraft:underwater_magma", "terramine:ore_crimtane_upper", "terramine:ore_crimtane_middle", diff --git a/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane.json b/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane.json index 1488b647..94230127 100644 --- a/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane.json +++ b/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 9, + "size": 4, "targets": [ { "state": { diff --git a/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane_small.json b/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane_small.json index 94230127..2365174c 100644 --- a/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane_small.json +++ b/src/main/generated/data/terramine/worldgen/configured_feature/ore_crimtane_small.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 4, + "size": 2, "targets": [ { "state": { diff --git a/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite.json b/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite.json index b0ebf9da..b4a64c59 100644 --- a/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite.json +++ b/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 9, + "size": 4, "targets": [ { "state": { diff --git a/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite_small.json b/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite_small.json index b4a64c59..62d91dcb 100644 --- a/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite_small.json +++ b/src/main/generated/data/terramine/worldgen/configured_feature/ore_demonite_small.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 4, + "size": 2, "targets": [ { "state": { diff --git a/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin.json b/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin.json index 89c21899..ad5e4c98 100644 --- a/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin.json +++ b/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 9, + "size": 10, "targets": [ { "state": { diff --git a/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin_small.json b/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin_large.json similarity index 97% rename from src/main/generated/data/terramine/worldgen/configured_feature/ore_tin_small.json rename to src/main/generated/data/terramine/worldgen/configured_feature/ore_tin_large.json index c322e487..0ec9bbf9 100644 --- a/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin_small.json +++ b/src/main/generated/data/terramine/worldgen/configured_feature/ore_tin_large.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 4, + "size": 20, "targets": [ { "state": { diff --git a/src/main/java/terramine/common/init/ModBlocks.java b/src/main/java/terramine/common/init/ModBlocks.java index 19b72dfa..089b8df5 100644 --- a/src/main/java/terramine/common/init/ModBlocks.java +++ b/src/main/java/terramine/common/init/ModBlocks.java @@ -124,6 +124,11 @@ public class ModBlocks { public static final BlockItemRegister CORRUPTED_REDSTONE_ORE = new BlockItemRegister("corrupted_redstone_ore", key -> new CorruptedRedstoneOreBlock(Properties.ofFullCopy(Blocks.REDSTONE_ORE).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_DIAMOND_ORE = new BlockItemRegister("corrupted_diamond_ore", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.DIAMOND_ORE).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_EMERALD_ORE = new BlockItemRegister("corrupted_emerald_ore", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.EMERALD_ORE).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_TIN_ORE = new BlockItemRegister("corrupted_tin_ore", key -> new CorruptedBlock(Properties.ofFullCopy(TIN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_LEAD_ORE = new BlockItemRegister("corrupted_lead_ore", key -> new CorruptedBlock(Properties.ofFullCopy(LEAD_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_SILVER_ORE = new BlockItemRegister("corrupted_silver_ore", key -> new CorruptedBlock(Properties.ofFullCopy(SILVER_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_TUNGSTEN_ORE = new BlockItemRegister("corrupted_tungsten_ore", key -> new CorruptedBlock(Properties.ofFullCopy(TUNGSTEN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_PLATINUM_ORE = new BlockItemRegister("corrupted_platinum_ore", key -> new CorruptedBlock(Properties.ofFullCopy(PLATINUM_ORE.BLOCK).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_DEEPSLATE_COAL_ORE = new BlockItemRegister("corrupted_deepslate_coal_ore", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_COAL_ORE).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_DEEPSLATE_IRON_ORE = new BlockItemRegister("corrupted_deepslate_iron_ore", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_IRON_ORE).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_DEEPSLATE_COPPER_ORE = new BlockItemRegister("corrupted_deepslate_copper_ore", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_COPPER_ORE).setId(key).randomTicks())); @@ -132,6 +137,11 @@ public class ModBlocks { public static final BlockItemRegister CORRUPTED_DEEPSLATE_REDSTONE_ORE = new BlockItemRegister("corrupted_deepslate_redstone_ore", key -> new CorruptedRedstoneOreBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_REDSTONE_ORE).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_DEEPSLATE_DIAMOND_ORE = new BlockItemRegister("corrupted_deepslate_diamond_ore", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_DIAMOND_ORE).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_DEEPSLATE_EMERALD_ORE = new BlockItemRegister("corrupted_deepslate_emerald_ore", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_EMERALD_ORE).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_DEEPSLATE_TIN_ORE = new BlockItemRegister("corrupted_deepslate_tin_ore", key -> new CorruptedBlock(Properties.ofFullCopy(DEEPSLATE_TIN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_DEEPSLATE_LEAD_ORE = new BlockItemRegister("corrupted_deepslate_lead_ore", key -> new CorruptedBlock(Properties.ofFullCopy(DEEPSLATE_LEAD_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_DEEPSLATE_SILVER_ORE = new BlockItemRegister("corrupted_deepslate_silver_ore", key -> new CorruptedBlock(Properties.ofFullCopy(DEEPSLATE_SILVER_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_DEEPSLATE_TUNGSTEN_ORE = new BlockItemRegister("corrupted_deepslate_tungsten_ore", key -> new CorruptedBlock(Properties.ofFullCopy(DEEPSLATE_TUNGSTEN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CORRUPTED_DEEPSLATE_PLATINUM_ORE = new BlockItemRegister("corrupted_deepslate_platinum_ore", key -> new CorruptedBlock(Properties.ofFullCopy(DEEPSLATE_PLATINUM_ORE.BLOCK).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_SNOW_LAYER = new BlockItemRegister("corrupted_snow_layer", key -> new CorruptedSnowLayer(Properties.ofFullCopy(Blocks.SNOW).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_SNOW = new BlockItemRegister("corrupted_snow", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.SNOW_BLOCK).setId(key).randomTicks())); public static final BlockItemRegister CORRUPTED_ICE = new BlockItemRegister("corrupted_ice", key -> new CorruptedBlock(Properties.ofFullCopy(Blocks.ICE).setId(key).randomTicks())); @@ -159,6 +169,11 @@ public class ModBlocks { public static final BlockItemRegister CRIMSON_REDSTONE_ORE = new BlockItemRegister("crimson_redstone_ore", key -> new CrimsonRedstoneOreBlock(Properties.ofFullCopy(Blocks.REDSTONE_ORE).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_DIAMOND_ORE = new BlockItemRegister("crimson_diamond_ore", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.DIAMOND_ORE).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_EMERALD_ORE = new BlockItemRegister("crimson_emerald_ore", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.EMERALD_ORE).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_TIN_ORE = new BlockItemRegister("crimson_tin_ore", key -> new CrimsonBlock(Properties.ofFullCopy(TIN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_LEAD_ORE = new BlockItemRegister("crimson_lead_ore", key -> new CrimsonBlock(Properties.ofFullCopy(LEAD_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_SILVER_ORE = new BlockItemRegister("crimson_silver_ore", key -> new CrimsonBlock(Properties.ofFullCopy(SILVER_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_TUNGSTEN_ORE = new BlockItemRegister("crimson_tungsten_ore", key -> new CrimsonBlock(Properties.ofFullCopy(TUNGSTEN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_PLATINUM_ORE = new BlockItemRegister("crimson_platinum_ore", key -> new CrimsonBlock(Properties.ofFullCopy(PLATINUM_ORE.BLOCK).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_DEEPSLATE_COAL_ORE = new BlockItemRegister("crimson_deepslate_coal_ore", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_COAL_ORE).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_DEEPSLATE_IRON_ORE = new BlockItemRegister("crimson_deepslate_iron_ore", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_IRON_ORE).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_DEEPSLATE_COPPER_ORE = new BlockItemRegister("crimson_deepslate_copper_ore", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_COPPER_ORE).setId(key).randomTicks())); @@ -167,6 +182,11 @@ public class ModBlocks { public static final BlockItemRegister CRIMSON_DEEPSLATE_REDSTONE_ORE = new BlockItemRegister("crimson_deepslate_redstone_ore", key -> new CrimsonRedstoneOreBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_REDSTONE_ORE).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_DEEPSLATE_DIAMOND_ORE = new BlockItemRegister("crimson_deepslate_diamond_ore", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_DIAMOND_ORE).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_DEEPSLATE_EMERALD_ORE = new BlockItemRegister("crimson_deepslate_emerald_ore", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.DEEPSLATE_EMERALD_ORE).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_DEEPSLATE_TIN_ORE = new BlockItemRegister("crimson_deepslate_tin_ore", key -> new CrimsonBlock(Properties.ofFullCopy(DEEPSLATE_TIN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_DEEPSLATE_LEAD_ORE = new BlockItemRegister("crimson_deepslate_lead_ore", key -> new CrimsonBlock(Properties.ofFullCopy(DEEPSLATE_LEAD_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_DEEPSLATE_SILVER_ORE = new BlockItemRegister("crimson_deepslate_silver_ore", key -> new CrimsonBlock(Properties.ofFullCopy(DEEPSLATE_SILVER_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_DEEPSLATE_TUNGSTEN_ORE = new BlockItemRegister("crimson_deepslate_tungsten_ore", key -> new CrimsonBlock(Properties.ofFullCopy(DEEPSLATE_TUNGSTEN_ORE.BLOCK).setId(key).randomTicks())); + public static final BlockItemRegister CRIMSON_DEEPSLATE_PLATINUM_ORE = new BlockItemRegister("crimson_deepslate_platinum_ore", key -> new CrimsonBlock(Properties.ofFullCopy(DEEPSLATE_PLATINUM_ORE.BLOCK).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_SNOW_LAYER = new BlockItemRegister("crimson_snow_layer", key -> new CrimsonSnowLayer(Properties.ofFullCopy(Blocks.SNOW).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_SNOW = new BlockItemRegister("crimson_snow", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.SNOW_BLOCK).setId(key).randomTicks())); public static final BlockItemRegister CRIMSON_ICE = new BlockItemRegister("crimson_ice", key -> new CrimsonBlock(Properties.ofFullCopy(Blocks.ICE).setId(key).randomTicks())); diff --git a/src/main/java/terramine/common/init/ModItemGroups.java b/src/main/java/terramine/common/init/ModItemGroups.java index 209ca024..2a9e0b7c 100644 --- a/src/main/java/terramine/common/init/ModItemGroups.java +++ b/src/main/java/terramine/common/init/ModItemGroups.java @@ -102,7 +102,9 @@ public static void registerItemGroups() { ItemGroupEvents.modifyEntriesEvent(createKey("terramine_stuff")).register(id("sixth_phase"), entries -> { for (Item item : ModItems.MISC) { - entries.accept(item); + if (!item.equals(ModItems.FAKE_FALLEN_STAR)) { + entries.accept(item); + } } for (Item item : ModBlocks.BLOCK_PLANTS) { entries.accept(item); diff --git a/src/main/java/terramine/common/init/ModItems.java b/src/main/java/terramine/common/init/ModItems.java index 4d6bd012..41c8469e 100644 --- a/src/main/java/terramine/common/init/ModItems.java +++ b/src/main/java/terramine/common/init/ModItems.java @@ -117,12 +117,14 @@ public class ModItems { public static final Item TIN_INGOT = registerMisc("tin_ingot", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item RAW_LEAD = registerMisc("raw_lead", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item LEAD_INGOT = registerMisc("lead_ingot", key -> new CraftingItem(new Item.Properties().setId(key), false)); + public static final Item LEAD_NUGGET = registerMisc("lead_nugget", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item RAW_SILVER = registerMisc("raw_silver", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item SILVER_INGOT = registerMisc("silver_ingot", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item RAW_TUNGSTEN = registerMisc("raw_tungsten", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item TUNGSTEN_INGOT = registerMisc("tungsten_ingot", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item RAW_PLATINUM = registerMisc("raw_platinum", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item PLATINUM_INGOT = registerMisc("platinum_ingot", key -> new CraftingItem(new Item.Properties().setId(key), false)); + public static final Item PLATINUM_NUGGET = registerMisc("platinum_nugget", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item RAW_DEMONITE = registerMisc("raw_demonite", key -> new CraftingItem(new Item.Properties().setId(key), false)); public static final Item DEMONITE_INGOT = registerMisc("demonite_ingot", key -> new CraftingItem(new Item.Properties().setId(key), true)); public static final Item RAW_CRIMTANE = registerMisc("raw_crimtane", key -> new CraftingItem(new Item.Properties().setId(key), false)); diff --git a/src/main/java/terramine/common/utility/CorruptionHelper.java b/src/main/java/terramine/common/utility/CorruptionHelper.java index 2f67c001..194c12f8 100644 --- a/src/main/java/terramine/common/utility/CorruptionHelper.java +++ b/src/main/java/terramine/common/utility/CorruptionHelper.java @@ -85,16 +85,26 @@ public void randomTick(@NotNull BlockState blockState, @NotNull ServerLevel serv spreadBlock(ModBlocks.CORRUPTED_COBBLED_DEEPSLATE, Blocks.COBBLED_DEEPSLATE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_COAL_ORE, Blocks.COAL_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_IRON_ORE, Blocks.IRON_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_LEAD_ORE, ModBlocks.LEAD_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_COPPER_ORE, Blocks.COPPER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_TIN_ORE, ModBlocks.TIN_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_SILVER_ORE, ModBlocks.SILVER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_TUNGSTEN_ORE, ModBlocks.TUNGSTEN_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_GOLD_ORE, Blocks.GOLD_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_PLATINUM_ORE, ModBlocks.PLATINUM_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_LAPIS_ORE, Blocks.LAPIS_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_REDSTONE_ORE, Blocks.REDSTONE_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DIAMOND_ORE, Blocks.DIAMOND_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_EMERALD_ORE, Blocks.EMERALD_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_COAL_ORE, Blocks.DEEPSLATE_COAL_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_IRON_ORE, Blocks.DEEPSLATE_IRON_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_LEAD_ORE, ModBlocks.DEEPSLATE_LEAD_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_COPPER_ORE, Blocks.DEEPSLATE_COPPER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_TIN_ORE, ModBlocks.DEEPSLATE_TIN_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_SILVER_ORE, ModBlocks.DEEPSLATE_SILVER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_TUNGSTEN_ORE, ModBlocks.DEEPSLATE_TUNGSTEN_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_GOLD_ORE, Blocks.DEEPSLATE_GOLD_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_PLATINUM_ORE, ModBlocks.DEEPSLATE_PLATINUM_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_LAPIS_ORE, Blocks.DEEPSLATE_LAPIS_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_REDSTONE_ORE, Blocks.DEEPSLATE_REDSTONE_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CORRUPTED_DEEPSLATE_DIAMOND_ORE, Blocks.DEEPSLATE_DIAMOND_ORE, serverLevel, blockPos, randomSource); @@ -106,6 +116,9 @@ public void randomTick(@NotNull BlockState blockState, @NotNull ServerLevel serv } } + private void spreadBlock(BlockItemRegister toSpread, BlockItemRegister spreadTo, ServerLevel serverLevel, BlockPos blockPos, RandomSource randomSource) { + spreadBlock(toSpread, spreadTo.BLOCK, serverLevel, blockPos, randomSource); + } private void spreadBlock(BlockItemRegister toSpread, Block spreadTo, ServerLevel serverLevel, BlockPos blockPos, RandomSource randomSource) { for (int i = 0; i < 4; ++i) { if (randomSource.nextInt(TerraMine.CONFIG.general.evilSpreadRarity + 1) == 1) { diff --git a/src/main/java/terramine/common/utility/CrimsonHelper.java b/src/main/java/terramine/common/utility/CrimsonHelper.java index 1c3b0227..1e36bf32 100644 --- a/src/main/java/terramine/common/utility/CrimsonHelper.java +++ b/src/main/java/terramine/common/utility/CrimsonHelper.java @@ -78,16 +78,26 @@ public void randomTick(@NotNull BlockState blockState, @NotNull ServerLevel serv spreadBlock(ModBlocks.CRIMSON_COBBLED_DEEPSLATE, Blocks.COBBLED_DEEPSLATE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_COAL_ORE, Blocks.COAL_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_IRON_ORE, Blocks.IRON_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_LEAD_ORE, ModBlocks.LEAD_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_COPPER_ORE, Blocks.COPPER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_TIN_ORE, ModBlocks.TIN_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_SILVER_ORE, ModBlocks.SILVER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_TUNGSTEN_ORE, ModBlocks.TUNGSTEN_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_GOLD_ORE, Blocks.GOLD_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_PLATINUM_ORE, ModBlocks.PLATINUM_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_LAPIS_ORE, Blocks.LAPIS_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_REDSTONE_ORE, Blocks.REDSTONE_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DIAMOND_ORE, Blocks.DIAMOND_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_EMERALD_ORE, Blocks.EMERALD_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_COAL_ORE, Blocks.DEEPSLATE_COAL_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_IRON_ORE, Blocks.DEEPSLATE_IRON_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_LEAD_ORE, ModBlocks.DEEPSLATE_LEAD_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_COPPER_ORE, Blocks.DEEPSLATE_COPPER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_TIN_ORE, ModBlocks.DEEPSLATE_TIN_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_SILVER_ORE, ModBlocks.DEEPSLATE_SILVER_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_TUNGSTEN_ORE, ModBlocks.DEEPSLATE_TUNGSTEN_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_GOLD_ORE, Blocks.DEEPSLATE_GOLD_ORE, serverLevel, blockPos, randomSource); + spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_PLATINUM_ORE, ModBlocks.DEEPSLATE_PLATINUM_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_LAPIS_ORE, Blocks.DEEPSLATE_LAPIS_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_REDSTONE_ORE, Blocks.DEEPSLATE_REDSTONE_ORE, serverLevel, blockPos, randomSource); spreadBlock(ModBlocks.CRIMSON_DEEPSLATE_DIAMOND_ORE, Blocks.DEEPSLATE_DIAMOND_ORE, serverLevel, blockPos, randomSource); @@ -98,7 +108,9 @@ public void randomTick(@NotNull BlockState blockState, @NotNull ServerLevel serv spreadBlock(ModBlocks.CRIMSON_BLUE_ICE, Blocks.BLUE_ICE, serverLevel, blockPos, randomSource); } } - + private void spreadBlock(BlockItemRegister toSpread, BlockItemRegister spreadTo, ServerLevel serverLevel, BlockPos blockPos, RandomSource randomSource) { + spreadBlock(toSpread, spreadTo.BLOCK, serverLevel, blockPos, randomSource); + } private void spreadBlock(BlockItemRegister toSpread, Block spreadTo, ServerLevel serverLevel, BlockPos blockPos, RandomSource randomSource) { for (int i = 0; i < 4; ++i) { if (randomSource.nextInt(TerraMine.CONFIG.general.evilSpreadRarity + 1) == 1) { diff --git a/src/main/java/terramine/common/world/biome/CorruptionBiome.java b/src/main/java/terramine/common/world/biome/CorruptionBiome.java index f9304d85..f63d8a0f 100644 --- a/src/main/java/terramine/common/world/biome/CorruptionBiome.java +++ b/src/main/java/terramine/common/world/biome/CorruptionBiome.java @@ -26,7 +26,7 @@ public static Biome createCorruption(HolderGetter holderGetter, H BiomeDefaultFeatures.addDefaultUndergroundVariety(generationSettings); BiomeDefaultFeatures.addDefaultSprings(generationSettings); BiomeDefaultFeatures.addSurfaceFreezing(generationSettings); - ModPlacedFeatures.addTerrariaCommonOres(generationSettings); + BiomeDefaultFeatures.addDefaultOres(generationSettings); ModPlacedFeatures.addDefaultCorruptOres(generationSettings); ModPlacedFeatures.addDefaultCorruptSoftDisks(generationSettings); BiomeDefaultFeatures.addWaterTrees(generationSettings); diff --git a/src/main/java/terramine/common/world/biome/CorruptionDesertBiome.java b/src/main/java/terramine/common/world/biome/CorruptionDesertBiome.java index 524b4724..f9711db4 100644 --- a/src/main/java/terramine/common/world/biome/CorruptionDesertBiome.java +++ b/src/main/java/terramine/common/world/biome/CorruptionDesertBiome.java @@ -27,7 +27,7 @@ public static Biome createCorruptionDesert(HolderGetter holderGet BiomeDefaultFeatures.addDefaultUndergroundVariety(generationSettings); BiomeDefaultFeatures.addDefaultSprings(generationSettings); BiomeDefaultFeatures.addSurfaceFreezing(generationSettings); - ModPlacedFeatures.addTerrariaCommonOres(generationSettings); + BiomeDefaultFeatures.addDefaultOres(generationSettings); ModPlacedFeatures.addDefaultCorruptOres(generationSettings); ModPlacedFeatures.addDefaultCorruptSoftDisks(generationSettings); BiomeDefaultFeatures.addWaterTrees(generationSettings); diff --git a/src/main/java/terramine/common/world/biome/CrimsonBiome.java b/src/main/java/terramine/common/world/biome/CrimsonBiome.java index 44aac7e5..9d8ddfcc 100644 --- a/src/main/java/terramine/common/world/biome/CrimsonBiome.java +++ b/src/main/java/terramine/common/world/biome/CrimsonBiome.java @@ -25,7 +25,7 @@ public static Biome createCrimson(HolderGetter holderGetter, Hold BiomeDefaultFeatures.addDefaultUndergroundVariety(generationSettings); BiomeDefaultFeatures.addDefaultSprings(generationSettings); BiomeDefaultFeatures.addSurfaceFreezing(generationSettings); - ModPlacedFeatures.addTerrariaCommonOres(generationSettings); + BiomeDefaultFeatures.addDefaultOres(generationSettings); ModPlacedFeatures.addDefaultCrimsonOres(generationSettings); ModPlacedFeatures.addDefaultCrimsonSoftDisks(generationSettings); BiomeDefaultFeatures.addWaterTrees(generationSettings); diff --git a/src/main/java/terramine/common/world/biome/CrimsonDesertBiome.java b/src/main/java/terramine/common/world/biome/CrimsonDesertBiome.java index ffcf72b2..c59cc939 100644 --- a/src/main/java/terramine/common/world/biome/CrimsonDesertBiome.java +++ b/src/main/java/terramine/common/world/biome/CrimsonDesertBiome.java @@ -26,7 +26,7 @@ public static Biome createCrimsonDesert(HolderGetter holderGetter BiomeDefaultFeatures.addDefaultUndergroundVariety(generationSettings); BiomeDefaultFeatures.addDefaultSprings(generationSettings); BiomeDefaultFeatures.addSurfaceFreezing(generationSettings); - ModPlacedFeatures.addTerrariaCommonOres(generationSettings); + BiomeDefaultFeatures.addDefaultOres(generationSettings); ModPlacedFeatures.addDefaultCrimsonOres(generationSettings); ModPlacedFeatures.addDefaultCrimsonSoftDisks(generationSettings); BiomeDefaultFeatures.addWaterTrees(generationSettings); diff --git a/src/main/java/terramine/datagen/ModFeatures.java b/src/main/java/terramine/datagen/ModFeatures.java index 0cbfe732..326c91be 100644 --- a/src/main/java/terramine/datagen/ModFeatures.java +++ b/src/main/java/terramine/datagen/ModFeatures.java @@ -2,18 +2,22 @@ import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; +import net.fabricmc.fabric.api.biome.v1.ModificationPhase; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.data.worldgen.features.FeatureUtils; +import net.minecraft.data.worldgen.placement.OrePlacements; import net.minecraft.data.worldgen.placement.PlacementUtils; import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.util.random.SimpleWeightedRandomList; import net.minecraft.util.valueproviders.UniformInt; +import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.dimension.LevelStem; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; @@ -27,7 +31,9 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import terramine.TerraMine; +import terramine.common.components.OreComponent; import terramine.common.init.ModBlocks; +import terramine.common.init.ModComponents; import terramine.common.world.CaveChestFeature; import terramine.common.world.NetherChestFeature; import terramine.common.world.SurfaceChestFeature; @@ -83,7 +89,7 @@ public class ModFeatures { // Ore public static final List ORE_TIN_TARGET_LIST = List.of(OreConfiguration.target(STONE_ORE_REPLACEABLES, ModBlocks.TIN_ORE.BLOCK.defaultBlockState()), OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, ModBlocks.DEEPSLATE_TIN_ORE.BLOCK.defaultBlockState())); public static final ResourceKey> ORE_TIN_FEATURE = registerConfigured("ore_tin"); - public static final ResourceKey> ORE_TIN_SMALL_FEATURE = registerConfigured("ore_tin_small"); + public static final ResourceKey> ORE_TIN_LARGE_FEATURE = registerConfigured("ore_tin_large"); public static final List ORE_LEAD_TARGET_LIST = List.of(OreConfiguration.target(STONE_ORE_REPLACEABLES, ModBlocks.LEAD_ORE.BLOCK.defaultBlockState()), OreConfiguration.target(DEEPSLATE_ORE_REPLACEABLES, ModBlocks.DEEPSLATE_LEAD_ORE.BLOCK.defaultBlockState())); public static final ResourceKey> ORE_LEAD_FEATURE = registerConfigured("ore_lead"); public static final ResourceKey> ORE_LEAD_SMALL_FEATURE = registerConfigured("ore_lead_small"); @@ -133,6 +139,64 @@ public static void register() { BiomeModifications.addFeature(BiomeSelectors.foundInTheNether(), GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.PLACED_HELLSTONE_ORE); + // todo: replace nether gold (need to make nether platinum ore) + BiomeModifications.create(id("terraria_ores")) + .add(ModificationPhase.REPLACEMENTS, + context -> { + boolean hasCopper = context.hasPlacedFeature(OrePlacements.ORE_COPPER_LARGE); + return context.getBiomeKey().equals(Biomes.DRIPSTONE_CAVES) && context.canGenerateIn(LevelStem.OVERWORLD) && hasCopper; + }, + context -> { + OreComponent oreComponent = ModComponents.ORE_TYPES.get(OreComponent.getLevelData()); + if (!oreComponent.getIfCopper()) { + context.getGenerationSettings().removeFeature(OrePlacements.ORE_COPPER_LARGE); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_TIN_LARGE); + } + } + ) + .add(ModificationPhase.REPLACEMENTS, + context -> { + boolean hasCopper = context.hasPlacedFeature(OrePlacements.ORE_COPPER); + return !context.getBiomeKey().equals(Biomes.DRIPSTONE_CAVES) && context.canGenerateIn(LevelStem.OVERWORLD) && hasCopper; + }, + context -> { + OreComponent oreComponent = ModComponents.ORE_TYPES.get(OreComponent.getLevelData()); + if (!oreComponent.getIfCopper()) { + context.getGenerationSettings().removeFeature(OrePlacements.ORE_COPPER); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_TIN); + } + } + ) + .add(ModificationPhase.REPLACEMENTS, context -> { + boolean hasIron = context.hasPlacedFeature(OrePlacements.ORE_IRON_UPPER) && context.hasPlacedFeature(OrePlacements.ORE_IRON_MIDDLE) && context.hasPlacedFeature(OrePlacements.ORE_IRON_SMALL); + boolean hasGold = context.hasPlacedFeature(OrePlacements.ORE_GOLD) && context.hasPlacedFeature(OrePlacements.ORE_GOLD_LOWER); + return context.canGenerateIn(LevelStem.OVERWORLD) && hasIron && hasGold; + }, context -> { + OreComponent oreComponent = ModComponents.ORE_TYPES.get(OreComponent.getLevelData()); + + if (!oreComponent.getIfIron()) { + context.getGenerationSettings().removeFeature(OrePlacements.ORE_IRON_UPPER); + context.getGenerationSettings().removeFeature(OrePlacements.ORE_IRON_MIDDLE); + context.getGenerationSettings().removeFeature(OrePlacements.ORE_IRON_SMALL); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_LEAD_UPPER); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_LEAD_MIDDLE); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_LEAD_SMALL); + } + if (!oreComponent.getIfSilver()) { + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_TUNGSTEN); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_TUNGSTEN_SMALL); + } else { + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_SILVER); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_SILVER_SMALL); + } + if (!oreComponent.getIfGold()) { + context.getGenerationSettings().removeFeature(OrePlacements.ORE_GOLD); + context.getGenerationSettings().removeFeature(OrePlacements.ORE_GOLD_LOWER); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_PLATINUM); + context.getGenerationSettings().addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModPlacedFeatures.ORE_PLATINUM_LOWER); + } + }); + // Structures Registry.register(BuiltInRegistries.STRUCTURE_TYPE, TerraMine.id("terraria_jigsaw_structure"), TERRARIA_JIGSAW_STRUCTURE); } @@ -143,8 +207,8 @@ public static void bootstrap(BootstrapContext> context) context.register(SURFACE_CHEST_CONFIGURED, new ConfiguredFeature<>(SURFACE_CHEST, FeatureConfiguration.NONE)); context.register(NETHER_CHEST_CONFIGURED, new ConfiguredFeature<>(NETHER_CHEST, FeatureConfiguration.NONE)); - context.register(ORE_TIN_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_TIN_TARGET_LIST, 9))); - context.register(ORE_TIN_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_TIN_TARGET_LIST, 4))); + context.register(ORE_TIN_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_TIN_TARGET_LIST, 10))); + context.register(ORE_TIN_LARGE_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_TIN_TARGET_LIST, 20))); context.register(ORE_LEAD_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_LEAD_TARGET_LIST, 9))); context.register(ORE_LEAD_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_LEAD_TARGET_LIST, 4))); context.register(ORE_SILVER_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_SILVER_TARGET_LIST, 9))); @@ -153,10 +217,10 @@ public static void bootstrap(BootstrapContext> context) context.register(ORE_TUNGSTEN_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_TUNGSTEN_TARGET_LIST, 4))); context.register(ORE_PLATINUM_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_PLATINUM_TARGET_LIST, 9))); context.register(ORE_PLATINUM_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_PLATINUM_TARGET_LIST, 4))); - context.register(ORE_DEMONITE_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_DEMONITE_TARGET_LIST, 9))); - context.register(ORE_DEMONITE_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_DEMONITE_TARGET_LIST, 4))); - context.register(ORE_CRIMTANE_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_CRIMTANE_TARGET_LIST, 9))); - context.register(ORE_CRIMTANE_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_CRIMTANE_TARGET_LIST, 4))); + context.register(ORE_DEMONITE_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_DEMONITE_TARGET_LIST, 4))); + context.register(ORE_DEMONITE_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_DEMONITE_TARGET_LIST, 2))); + context.register(ORE_CRIMTANE_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_CRIMTANE_TARGET_LIST, 4))); + context.register(ORE_CRIMTANE_SMALL_FEATURE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(ORE_CRIMTANE_TARGET_LIST, 2))); context.register(CORRUPTION_PLANTS, new ConfiguredFeature<>(Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.single(ModBlocks.VILE_MUSHROOM.BLOCK.defaultBlockState())), 64))); context.register(CRIMSON_PLANTS, new ConfiguredFeature<>(Feature.FLOWER, grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.single(ModBlocks.VICIOUS_MUSHROOM.BLOCK.defaultBlockState())), 64))); context.register(DISK_CORRUPT_SAND_FEATURE, new ConfiguredFeature<>(Feature.DISK, new DiskConfiguration(RuleBasedBlockStateProvider.simple(ModBlocks.CORRUPTED_SAND.BLOCK), BlockPredicate.matchesBlocks(List.of(Blocks.DIRT, ModBlocks.CORRUPTED_GRASS.BLOCK)), UniformInt.of(2, 6), 2))); diff --git a/src/main/java/terramine/datagen/ModPlacedFeatures.java b/src/main/java/terramine/datagen/ModPlacedFeatures.java index 47c3b9e4..5c633945 100644 --- a/src/main/java/terramine/datagen/ModPlacedFeatures.java +++ b/src/main/java/terramine/datagen/ModPlacedFeatures.java @@ -143,49 +143,6 @@ public static void bootstrap(BootstrapContext context) { context.register(DISK_CRIMSON_SAND, new PlacedFeature(getHolder(holderGetter, ModFeatures.DISK_CRIMSON_SAND_FEATURE), List.of(CountPlacement.of(3), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(Fluids.WATER)), BiomeFilter.biome()))); context.register(DISK_CRIMSON_GRAVEL, new PlacedFeature(getHolder(holderGetter, ModFeatures.DISK_CRIMSON_GRAVEL_FEATURE), List.of(InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_TOP_SOLID, BlockPredicateFilter.forPredicate(BlockPredicate.matchesFluids(Fluids.WATER)), BiomeFilter.biome()))); } - - public static void addTerrariaCommonOres(BiomeGenerationSettings.Builder builder) { - addTerrariaCommonOres(builder, false); - } - // todo: need to find a way to have different ores for worlds like terraria does it, this wont work though as it generates a json file so it cant dynamically change things, need to figure out how the ores are actually placed from that json - // todo: probably remove this once the above is done? - public static void addTerrariaCommonOres(BiomeGenerationSettings.Builder builder, boolean bl) { - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_COAL_UPPER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_COAL_LOWER); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfIron() ? OrePlacements.ORE_IRON_UPPER : ORE_LEAD_UPPER); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfIron() ? OrePlacements.ORE_IRON_MIDDLE : ORE_LEAD_MIDDLE); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfIron() ? OrePlacements.ORE_IRON_SMALL : ORE_LEAD_SMALL); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfSilver() ? ORE_SILVER : ORE_TUNGSTEN); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfSilver() ? ORE_SILVER_SMALL : ORE_TUNGSTEN_SMALL); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfGold() ? OrePlacements.ORE_GOLD : ORE_PLATINUM); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfGold() ? OrePlacements.ORE_GOLD_LOWER : ORE_PLATINUM_LOWER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_IRON_UPPER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_IRON_MIDDLE); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_IRON_SMALL); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_SILVER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_SILVER_SMALL); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_LEAD_UPPER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_LEAD_MIDDLE); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_LEAD_SMALL); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_TUNGSTEN); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_TUNGSTEN_SMALL); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GOLD); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_GOLD_LOWER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_PLATINUM); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ORE_PLATINUM_LOWER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_REDSTONE); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_REDSTONE_LOWER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND_MEDIUM); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND_LARGE); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_DIAMOND_BURIED); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_LAPIS); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, OrePlacements.ORE_LAPIS_BURIED); - //builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, ModComponents.ORE_TYPES.get(OreComponent.getLevelData()).getIfCopper() ? (bl ? OrePlacements.ORE_COPPER_LARGE : OrePlacements.ORE_COPPER) : (bl ? ORE_TIN_LARGE : ORE_TIN)); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, bl ? OrePlacements.ORE_COPPER_LARGE : OrePlacements.ORE_COPPER); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, bl ? ORE_TIN_LARGE : ORE_TIN); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, CavePlacements.UNDERWATER_MAGMA); - } public static void addDefaultCorruptSoftDisks(BiomeGenerationSettings.Builder builder) { builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, DISK_CORRUPT_SAND); builder.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, MiscOverworldPlacements.DISK_CLAY); diff --git a/src/main/java/terramine/datagen/ModRecipes.java b/src/main/java/terramine/datagen/ModRecipes.java index 1f873658..d7d09e4f 100644 --- a/src/main/java/terramine/datagen/ModRecipes.java +++ b/src/main/java/terramine/datagen/ModRecipes.java @@ -6,6 +6,7 @@ import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.recipes.*; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; @@ -50,7 +51,7 @@ public void buildRecipes() { createShapeless(RecipeCategory.MISC, ModItems.FROSTSPARK_BOOTS, ModItems.LIGHTNING_BOOTS, ModItems.ICE_SKATES); createShapeless(RecipeCategory.MISC, ModItems.GOBLIN_TECH, ModItems.METAL_DETECTOR, ModItems.STOPWATCH, ModItems.DPS_METER); createShapeless(RecipeCategory.MISC, ModItems.GOLD_WATCH, Items.CLOCK); - createShapeless(RecipeCategory.MISC, Items.CLOCK, ModItems.GOLD_WATCH); + createShapeless(RecipeCategory.MISC, Items.CLOCK, 1, 1, "clock_from_watch", ModItems.GOLD_WATCH); createShapeless(RecipeCategory.MISC, ModItems.GPS, ModItems.GOLD_WATCH, ModItems.DEPTH_METER, ModItems.COMPASS); createShapeless(RecipeCategory.MISC, ModItems.LAVA_WADERS, 1, 1, Ingredient.of(ModItems.OBSIDIAN_ROSE), Ingredient.of(ModItems.WATER_WALKING_BOOTS, ModItems.OBSIDIAN_WATER_WALKING_BOOTS), Ingredient.of(ModItems.MOLTEN_CHARM, ModItems.LAVA_CHARM)); createShapeless(RecipeCategory.MISC, ModItems.LIGHTNING_BOOTS, ModItems.SPECTRE_BOOTS, ModItems.ANKLET, ModItems.AGLET); @@ -178,7 +179,7 @@ public void buildRecipes() { "IDI", "DGD", "IDI" - }, 'D', Items.DIAMOND, 'I', Items.GOLD_INGOT, 'G', Items.GLASS); + }, 'D', Items.DIAMOND, 'I', Ingredient.of(Items.GOLD_INGOT, ModItems.PLATINUM_INGOT), 'G', Items.GLASS); // Weapons createShaped(RecipeCategory.COMBAT, ModItems.PHASEBLADE_WHITE, new String[]{ @@ -208,15 +209,15 @@ public void buildRecipes() { ///////////////////////////////////// Smelting/Cooking ///////////////////////////////////// // Terraria Ingots - createSmeltingBlasting(ModItems.TIN_INGOT, ModItems.RAW_TIN, ModBlocks.TIN_ORE.getItem(), ModBlocks.DEEPSLATE_TIN_ORE.getItem()); + createSmeltingBlasting(ModItems.TIN_INGOT, ModItems.RAW_TIN, ModBlocks.TIN_ORE.getItem(), ModBlocks.DEEPSLATE_TIN_ORE.getItem(), ModBlocks.CORRUPTED_TIN_ORE.getItem(), ModBlocks.CORRUPTED_DEEPSLATE_TIN_ORE.getItem(), ModBlocks.CRIMSON_TIN_ORE.getItem(), ModBlocks.CRIMSON_DEEPSLATE_TIN_ORE.getItem()); createSmeltingBlasting(ModBlocks.TIN_BLOCK.getItem(), 6F, 900, ModBlocks.RAW_TIN_BLOCK.getItem()); - createSmeltingBlasting(ModItems.LEAD_INGOT, ModItems.RAW_LEAD, ModBlocks.LEAD_ORE.getItem(), ModBlocks.DEEPSLATE_LEAD_ORE.getItem()); + createSmeltingBlasting(ModItems.LEAD_INGOT, ModItems.RAW_LEAD, ModBlocks.LEAD_ORE.getItem(), ModBlocks.DEEPSLATE_LEAD_ORE.getItem(), ModBlocks.CORRUPTED_LEAD_ORE.getItem(), ModBlocks.CORRUPTED_DEEPSLATE_LEAD_ORE.getItem(), ModBlocks.CRIMSON_LEAD_ORE.getItem(), ModBlocks.CRIMSON_DEEPSLATE_LEAD_ORE.getItem()); createSmeltingBlasting(ModBlocks.LEAD_BLOCK.getItem(), 6F, 900, ModBlocks.RAW_LEAD_BLOCK.getItem()); - createSmeltingBlasting(ModItems.SILVER_INGOT, ModItems.RAW_SILVER, ModBlocks.SILVER_ORE.getItem(), ModBlocks.DEEPSLATE_SILVER_ORE.getItem()); + createSmeltingBlasting(ModItems.SILVER_INGOT, ModItems.RAW_SILVER, ModBlocks.SILVER_ORE.getItem(), ModBlocks.DEEPSLATE_SILVER_ORE.getItem(), ModBlocks.CORRUPTED_SILVER_ORE.getItem(), ModBlocks.CORRUPTED_DEEPSLATE_SILVER_ORE.getItem(), ModBlocks.CRIMSON_SILVER_ORE.getItem(), ModBlocks.CRIMSON_DEEPSLATE_SILVER_ORE.getItem()); createSmeltingBlasting(ModBlocks.SILVER_BLOCK.getItem(), 6F, 900, ModBlocks.RAW_SILVER_BLOCK.getItem()); - createSmeltingBlasting(ModItems.TUNGSTEN_INGOT, ModItems.RAW_TUNGSTEN, ModBlocks.TUNGSTEN_ORE.getItem(), ModBlocks.DEEPSLATE_TUNGSTEN_ORE.getItem()); + createSmeltingBlasting(ModItems.TUNGSTEN_INGOT, ModItems.RAW_TUNGSTEN, ModBlocks.TUNGSTEN_ORE.getItem(), ModBlocks.DEEPSLATE_TUNGSTEN_ORE.getItem(), ModBlocks.CORRUPTED_TUNGSTEN_ORE.getItem(), ModBlocks.CORRUPTED_DEEPSLATE_TUNGSTEN_ORE.getItem(), ModBlocks.CRIMSON_TUNGSTEN_ORE.getItem(), ModBlocks.CRIMSON_DEEPSLATE_TUNGSTEN_ORE.getItem()); createSmeltingBlasting(ModBlocks.TUNGSTEN_BLOCK.getItem(), 6F, 900, ModBlocks.RAW_TUNGSTEN_BLOCK.getItem()); - createSmeltingBlasting(ModItems.PLATINUM_INGOT, ModItems.RAW_PLATINUM, ModBlocks.PLATINUM_ORE.getItem(), ModBlocks.DEEPSLATE_PLATINUM_ORE.getItem()); + createSmeltingBlasting(ModItems.PLATINUM_INGOT, ModItems.RAW_PLATINUM, ModBlocks.PLATINUM_ORE.getItem(), ModBlocks.DEEPSLATE_PLATINUM_ORE.getItem(), ModBlocks.CORRUPTED_PLATINUM_ORE.getItem(), ModBlocks.CORRUPTED_DEEPSLATE_PLATINUM_ORE.getItem(), ModBlocks.CRIMSON_PLATINUM_ORE.getItem(), ModBlocks.CRIMSON_DEEPSLATE_PLATINUM_ORE.getItem()); createSmeltingBlasting(ModBlocks.PLATINUM_BLOCK.getItem(), 6F, 900, ModBlocks.RAW_PLATINUM_BLOCK.getItem()); createSmeltingBlasting(ModItems.DEMONITE_INGOT, ModItems.RAW_DEMONITE, ModBlocks.DEMONITE_ORE.getItem(), ModBlocks.DEEPSLATE_DEMONITE_ORE.getItem()); createSmeltingBlasting(ModBlocks.DEMONITE_BLOCK.getItem(), 6F, 900, ModBlocks.RAW_DEMONITE_BLOCK.getItem()); @@ -241,15 +242,208 @@ public void buildRecipes() { createSmeltingBlasting(ModBlocks.CRIMSON_STONE.getItem(), 0.1F, ModBlocks.CRIMSON_COBBLESTONE.getItem()); createSmeltingBlasting(ModBlocks.CRIMSON_DEEPSLATE.getItem(), 0.1F, ModBlocks.CRIMSON_COBBLED_DEEPSLATE.getItem()); createSmeltingBlasting(ModBlocks.CRIMSON_GLASS.getItem(), 0.1F, ModBlocks.CRIMSON_SAND.getItem()); + + ///////////////////////////////////// Vanilla Recipes ///////////////////////////////////// + + // Copper to Tin + createShaped(RecipeCategory.TOOLS, Items.BRUSH, new String[]{ + "F", + "X", + "S" + }, 'X', ModItems.TIN_INGOT, 'F', Items.FEATHER, 'S', Items.STICK); + createShaped(RecipeCategory.TOOLS, Items.SPYGLASS, new String[]{ + "C", + "X", + "X" + }, 'X', ModItems.TIN_INGOT, 'C', Items.AMETHYST_SHARD); + createShaped(RecipeCategory.TOOLS, Items.LIGHTNING_ROD, new String[]{ + "X", + "X", + "X" + }, 'X', ModItems.TIN_INGOT); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.COPPER_DOOR, new String[]{ + "XX", + "XX", + "XX" + }, 'X', ModItems.TIN_INGOT); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.COPPER_TRAPDOOR, new String[]{ + "XX", + "XX" + }, 'X', ModItems.TIN_INGOT); + + // Iron to Lead + createShapeless(RecipeCategory.MISC, ModItems.LEAD_NUGGET, ModItems.LEAD_INGOT); + createShaped(RecipeCategory.DECORATIONS, Items.SMITHING_TABLE, new String[]{ + "XX", + "SS", + "SS" + }, 'X', ModItems.LEAD_INGOT, 'S', ItemTags.PLANKS); + createShaped(RecipeCategory.DECORATIONS, Items.STONECUTTER, new String[]{ + " X ", + "SSS" + }, 'X', ModItems.LEAD_INGOT, 'S', Items.STONE); + createShaped(RecipeCategory.DECORATIONS, Items.ANVIL, new String[]{ + "BBB", + " X ", + "XXX" + }, 'X', ModItems.LEAD_INGOT, 'B', ModBlocks.LEAD_BLOCK.getItem()); + createShaped(RecipeCategory.DECORATIONS, Items.BLAST_FURNACE, new String[]{ + "XXX", + "XFX", + "SSS" + }, 'X', ModItems.LEAD_INGOT, 'S', Items.SMOOTH_STONE, 'F', Items.FURNACE); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.IRON_BARS, new String[]{ + "XXX", + "XXX" + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.IRON_DOOR, new String[]{ + "XX", + "XX", + "XX" + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.IRON_TRAPDOOR, new String[]{ + "XX", + "XX" + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.CHAIN, new String[]{ + "N", + "X", + "N" + }, 'X', ModItems.LEAD_INGOT, 'N', ModItems.LEAD_NUGGET); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.LANTERN, new String[]{ + "XXX", + "XTX", + "XXX" + }, 'X', ModItems.LEAD_NUGGET, 'T', Items.TORCH); + createShaped(RecipeCategory.BUILDING_BLOCKS, Items.SOUL_LANTERN, new String[]{ + "XXX", + "XTX", + "XXX" + }, 'X', ModItems.LEAD_NUGGET, 'T', Items.SOUL_TORCH); + createShaped(RecipeCategory.BREWING, Items.CAULDRON, new String[]{ + "X X", + "X X", + "XXX" + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.REDSTONE, Items.HOPPER, new String[]{ + "X X", + "XSX", + " X " + }, 'X', ModItems.LEAD_INGOT, 'S', Items.CHEST); + createShaped(RecipeCategory.REDSTONE, Items.PISTON, new String[]{ + "PPP", + "CXC", + "CRC" + }, 'X', ModItems.LEAD_INGOT, 'P', ItemTags.PLANKS, 'C', Items.COBBLESTONE, 'R', Items.REDSTONE); + createShaped(RecipeCategory.REDSTONE, Items.TRIPWIRE_HOOK, new String[]{ + "X", + "S", + "P" + }, 'X', ModItems.LEAD_INGOT, 'S', Items.STICK, 'P', ItemTags.PLANKS); + createShaped(RecipeCategory.REDSTONE, Items.HEAVY_WEIGHTED_PRESSURE_PLATE, new String[]{ + "XX" + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.REDSTONE, Items.CRAFTER, new String[]{ + "XXX", + "XCX", + "RDR" + }, 'X', ModItems.LEAD_INGOT, 'C', Items.CRAFTING_TABLE, 'R', Items.REDSTONE, 'D', Items.DROPPER); + createShaped(RecipeCategory.TRANSPORTATION, Items.RAIL, 16, new String[]{ + "X X", + "XSX", + "X X" + }, 'X', ModItems.LEAD_INGOT, 'S', Items.STICK); + createShaped(RecipeCategory.TRANSPORTATION, Items.DETECTOR_RAIL, 6, new String[]{ + "X X", + "XPX", + "XSX" + }, 'X', ModItems.LEAD_INGOT, 'S', Items.REDSTONE, 'P', Items.STONE_PRESSURE_PLATE); + createShaped(RecipeCategory.TRANSPORTATION, Items.ACTIVATOR_RAIL, 6, new String[]{ + "XSX", + "XRX", + "XSX" + }, 'X', ModItems.LEAD_INGOT, 'S', Items.STICK, 'R', Items.REDSTONE); + createShaped(RecipeCategory.TOOLS, Items.COMPASS, new String[]{ + " X ", + "XSX", + " X " + }, 'X', ModItems.LEAD_INGOT, 'S', Items.REDSTONE); + createShaped(RecipeCategory.TOOLS, Items.BUCKET, new String[]{ + "X X", + " X " + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.TOOLS, Items.SHEARS, new String[]{ + " X", + "X " + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.TOOLS, Items.FLINT_AND_STEEL, new String[]{ + "XS" + }, 'X', ModItems.LEAD_INGOT, 'S', Items.FLINT); + createShaped(RecipeCategory.TRANSPORTATION, Items.MINECART, new String[]{ + "X X", + "XXX" + }, 'X', ModItems.LEAD_INGOT); + createShaped(RecipeCategory.COMBAT, Items.SHIELD, new String[]{ + "SXS", + "SSS", + " S " + }, 'X', ModItems.LEAD_INGOT, 'S', ItemTags.PLANKS); + createShaped(RecipeCategory.COMBAT, Items.CROSSBOW, new String[]{ + "SXS", + "RTR", + " S " + }, 'X', ModItems.LEAD_INGOT, 'S', Items.STICK, 'R', Items.STRING, 'T', Items.TRIPWIRE_HOOK); + + // Gold to Platinum + createShapeless(RecipeCategory.MISC, ModItems.PLATINUM_NUGGET, ModItems.PLATINUM_INGOT); + + createShaped(RecipeCategory.FOOD, Items.GOLDEN_CARROT, new String[]{ + "XXX", + "XCX", + "XXX" + }, 'X', ModItems.PLATINUM_NUGGET, 'C', Items.CARROT); + createShaped(RecipeCategory.FOOD, Items.GLISTERING_MELON_SLICE, new String[]{ + "XXX", + "XCX", + "XXX" + }, 'X', ModItems.PLATINUM_NUGGET, 'C', Items.MELON_SLICE); + createShaped(RecipeCategory.FOOD, Items.GOLDEN_APPLE, new String[]{ + "XXX", + "XCX", + "XXX" + }, 'X', ModItems.PLATINUM_INGOT, 'C', Items.APPLE); + createShaped(RecipeCategory.TOOLS, Items.CLOCK, new String[]{ + " X ", + "XRX", + " X " + }, 'X', ModItems.PLATINUM_INGOT, 'R', Items.REDSTONE); + createShaped(RecipeCategory.TRANSPORTATION, Items.POWERED_RAIL, 6, new String[]{ + "X X", + "XCX", + "XRX" + }, 'X', ModItems.PLATINUM_INGOT, 'C', Items.STICK, 'R', Items.REDSTONE); + createShaped(RecipeCategory.REDSTONE, Items.LIGHT_WEIGHTED_PRESSURE_PLATE, new String[]{ + "XX" + }, 'X', ModItems.PLATINUM_INGOT); + createShaped(RecipeCategory.REDSTONE, Items.NETHERITE_INGOT, new String[]{ + "SSS", + "SXX", + "XX " + }, 'X', ModItems.PLATINUM_INGOT, 'S', Items.NETHERITE_SCRAP); } @Unique public void createShapeless(RecipeCategory category, Item result, Item... ingredients) { - createShapeless(category, result, 1, 1, ingredients); + createShapeless(category, result, 1, 1, "", ingredients); } @Unique public void createShapeless(RecipeCategory category, Item result, int count, int ingredientCount, Object... ingredients) { + createShapeless(category, result, count, ingredientCount, "", ingredients); + } + + @Unique + public void createShapeless(RecipeCategory category, Item result, int count, int ingredientCount, String customName, Object... ingredients) { if (ingredients.length == 0) { throw new IllegalArgumentException("A shapeless recipe must have at least one ingredient."); } @@ -291,7 +485,11 @@ public void createShapeless(RecipeCategory category, Item result, int count, int } } - builder.save(recipeOutput); + if (!customName.isEmpty()) { + builder.save(recipeOutput, customName); + } else { + builder.save(recipeOutput); + } } @Unique @@ -310,7 +508,6 @@ public void createShaped(RecipeCategory category, Item result, int count, String } ShapedRecipeBuilder builder = shaped(category, result, count); - ShapedRecipeBuilder builderMirrored = shaped(category, result, count); // Process ingredient pairs for (int i = 0; i < ingredientPairs.length; i += 2) { diff --git a/src/main/java/terramine/datagen/TerraMineRegistryProvider.java b/src/main/java/terramine/datagen/TerraMineRegistryProvider.java index 7ce052c3..56c3624d 100644 --- a/src/main/java/terramine/datagen/TerraMineRegistryProvider.java +++ b/src/main/java/terramine/datagen/TerraMineRegistryProvider.java @@ -42,7 +42,7 @@ protected void configure(HolderLookup.Provider registries, Entries entries) { entries.add(ModFeatures.ORE_CRIMTANE_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_CRIMTANE_FEATURE).value()); entries.add(ModFeatures.ORE_CRIMTANE_SMALL_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_CRIMTANE_SMALL_FEATURE).value()); entries.add(ModFeatures.ORE_TIN_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_TIN_FEATURE).value()); - entries.add(ModFeatures.ORE_TIN_SMALL_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_TIN_SMALL_FEATURE).value()); + entries.add(ModFeatures.ORE_TIN_LARGE_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_TIN_LARGE_FEATURE).value()); entries.add(ModFeatures.ORE_LEAD_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_LEAD_FEATURE).value()); entries.add(ModFeatures.ORE_LEAD_SMALL_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_LEAD_SMALL_FEATURE).value()); entries.add(ModFeatures.ORE_SILVER_FEATURE, configuredFeatureRegistry.getOrThrow(ModFeatures.ORE_SILVER_FEATURE).value()); diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_lead_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_lead_ore.json new file mode 100644 index 00000000..36ac429a --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_lead_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_deepslate_lead_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_platinum_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_platinum_ore.json new file mode 100644 index 00000000..c3f91a15 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_platinum_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_deepslate_platinum_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_silver_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_silver_ore.json new file mode 100644 index 00000000..f2fdafca --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_silver_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_deepslate_silver_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tin_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tin_ore.json new file mode 100644 index 00000000..f15f06d2 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tin_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_deepslate_tin_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tungsten_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tungsten_ore.json new file mode 100644 index 00000000..d4c55b10 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_deepslate_tungsten_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_deepslate_tungsten_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_lead_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_lead_ore.json new file mode 100644 index 00000000..4dc166ac --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_lead_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_lead_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_platinum_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_platinum_ore.json new file mode 100644 index 00000000..a0113375 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_platinum_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_platinum_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_silver_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_silver_ore.json new file mode 100644 index 00000000..85857bca --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_silver_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_silver_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_tin_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_tin_ore.json new file mode 100644 index 00000000..b7d615a4 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_tin_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_tin_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/corrupted_tungsten_ore.json b/src/main/resources/assets/terramine/blockstates/corrupted_tungsten_ore.json new file mode 100644 index 00000000..5f999907 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/corrupted_tungsten_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/corrupted_tungsten_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_deepslate_lead_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_lead_ore.json new file mode 100644 index 00000000..5a75a1f0 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_lead_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_deepslate_lead_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_deepslate_platinum_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_platinum_ore.json new file mode 100644 index 00000000..df1e34be --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_platinum_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_deepslate_platinum_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_deepslate_silver_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_silver_ore.json new file mode 100644 index 00000000..586435e3 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_silver_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_deepslate_silver_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_deepslate_tin_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_tin_ore.json new file mode 100644 index 00000000..2dc95634 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_tin_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_deepslate_tin_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_deepslate_tungsten_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_tungsten_ore.json new file mode 100644 index 00000000..7b5c8a27 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_deepslate_tungsten_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_deepslate_tungsten_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_lead_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_lead_ore.json new file mode 100644 index 00000000..b35272c0 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_lead_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_lead_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_platinum_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_platinum_ore.json new file mode 100644 index 00000000..a353b4d9 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_platinum_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_platinum_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_silver_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_silver_ore.json new file mode 100644 index 00000000..eb50fecd --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_silver_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_silver_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_tin_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_tin_ore.json new file mode 100644 index 00000000..bba599d3 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_tin_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_tin_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/blockstates/crimson_tungsten_ore.json b/src/main/resources/assets/terramine/blockstates/crimson_tungsten_ore.json new file mode 100644 index 00000000..27ac4160 --- /dev/null +++ b/src/main/resources/assets/terramine/blockstates/crimson_tungsten_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "terramine:block/crimson_tungsten_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/lang/en_us.json b/src/main/resources/assets/terramine/lang/en_us.json index 1a3a59f8..c0ad1ee0 100644 --- a/src/main/resources/assets/terramine/lang/en_us.json +++ b/src/main/resources/assets/terramine/lang/en_us.json @@ -110,12 +110,14 @@ "item.terramine.tin_ingot": "Tin Ingot", "item.terramine.raw_lead": "Raw Lead", "item.terramine.lead_ingot": "Lead Ingot", + "item.terramine.lead_nugget": "Lead Nugget", "item.terramine.raw_silver": "Raw Silver", "item.terramine.silver_ingot": "Silver Ingot", "item.terramine.raw_tungsten": "Raw Tungsten", "item.terramine.tungsten_ingot": "Tungsten Ingot", "item.terramine.raw_platinum": "Raw Platinum", "item.terramine.platinum_ingot": "Platinum Ingot", + "item.terramine.platinum_nugget": "Platinum Nugget", "item.terramine.raw_demonite": "Raw Demonite", "item.terramine.demonite_ingot": "Demonite Ingot", "item.terramine.raw_crimtane": "Raw Crimtane", @@ -584,6 +586,11 @@ "block.terramine.corrupted_redstone_ore": "Corrupted Redstone Ore", "block.terramine.corrupted_diamond_ore": "Corrupted Diamond Ore", "block.terramine.corrupted_emerald_ore": "Corrupted Emerald Ore", + "block.terramine.corrupted_tin_ore": "Corrupted Tin Ore", + "block.terramine.corrupted_lead_ore": "Corrupted Lead Ore", + "block.terramine.corrupted_silver_ore": "Corrupted Silver Ore", + "block.terramine.corrupted_tungsten_ore": "Corrupted Tungsten Ore", + "block.terramine.corrupted_platinum_ore": "Corrupted Platinum Ore", "block.terramine.corrupted_deepslate_coal_ore": "Corrupted Deepslate Coal Ore", "block.terramine.corrupted_deepslate_iron_ore": "Corrupted Deepslate Iron Ore", "block.terramine.deepslate_demonite_ore": "Deepslate Demonite Ore", @@ -593,6 +600,11 @@ "block.terramine.corrupted_deepslate_redstone_ore": "Corrupted Deepslate Redstone Ore", "block.terramine.corrupted_deepslate_diamond_ore": "Corrupted Deepslate Diamond Ore", "block.terramine.corrupted_deepslate_emerald_ore": "Corrupted Deepslate Emerald Ore", + "block.terramine.corrupted_deepslate_tin_ore": "Corrupted Deepslate Tin Ore", + "block.terramine.corrupted_deepslate_lead_ore": "Corrupted Deepslate Lead Ore", + "block.terramine.corrupted_deepslate_silver_ore": "Corrupted Deepslate Silver Ore", + "block.terramine.corrupted_deepslate_tungsten_ore": "Corrupted Deepslate Tungsten Ore", + "block.terramine.corrupted_deepslate_platinum_ore": "Corrupted Deepslate Platinum Ore", "block.terramine.corrupted_snow_layer": "Corrupted Snow", "block.terramine.corrupted_snow": "Corrupted Snow Block", "block.terramine.corrupted_ice": "Corrupted Ice", @@ -621,6 +633,11 @@ "block.terramine.crimson_redstone_ore": "Crimson Redstone Ore", "block.terramine.crimson_diamond_ore": "Crimson Diamond Ore", "block.terramine.crimson_emerald_ore": "Crimson Emerald Ore", + "block.terramine.crimson_tin_ore": "Crimson Tin Ore", + "block.terramine.crimson_lead_ore": "Crimson Lead Ore", + "block.terramine.crimson_silver_ore": "Crimson Silver Ore", + "block.terramine.crimson_tungsten_ore": "Crimson Tungsten Ore", + "block.terramine.crimson_platinum_ore": "Crimson Platinum Ore", "block.terramine.crimson_deepslate_coal_ore": "Crimson Deepslate Coal Ore", "block.terramine.crimson_deepslate_iron_ore": "Crimson Deepslate Iron Ore", "block.terramine.deepslate_crimtane_ore": "Deepslate Crimtane Ore", @@ -630,6 +647,11 @@ "block.terramine.crimson_deepslate_redstone_ore": "Crimson Deepslate Redstone Ore", "block.terramine.crimson_deepslate_diamond_ore": "Crimson Deepslate Diamond Ore", "block.terramine.crimson_deepslate_emerald_ore": "Crimson Deepslate Emerald Ore", + "block.terramine.crimson_deepslate_tin_ore": "Crimson Deepslate Tin Ore", + "block.terramine.crimson_deepslate_lead_ore": "Crimson Deepslate Lead Ore", + "block.terramine.crimson_deepslate_silver_ore": "Crimson Deepslate Silver Ore", + "block.terramine.crimson_deepslate_tungsten_ore": "Crimson Deepslate Tungsten Ore", + "block.terramine.crimson_deepslate_platinum_ore": "Crimson Deepslate Platinum Ore", "block.terramine.crimson_snow_layer": "Crimson Snow", "block.terramine.crimson_snow": "Crimson Snow Block", "block.terramine.crimson_ice": "Crimson Ice", diff --git a/src/main/resources/assets/terramine/models/block/corrupted_deepslate_lead_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_lead_ore.json new file mode 100644 index 00000000..6afbe3ae --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_lead_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_deepslate_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_deepslate_platinum_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_platinum_ore.json new file mode 100644 index 00000000..fc363154 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_deepslate_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_deepslate_silver_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_silver_ore.json new file mode 100644 index 00000000..c1828d9b --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_silver_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_deepslate_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_deepslate_tin_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_tin_ore.json new file mode 100644 index 00000000..09959694 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_tin_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_deepslate_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_deepslate_tungsten_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_tungsten_ore.json new file mode 100644 index 00000000..fa116778 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_deepslate_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_deepslate_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_lead_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_lead_ore.json new file mode 100644 index 00000000..35778539 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_lead_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_platinum_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_platinum_ore.json new file mode 100644 index 00000000..4a663b97 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_silver_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_silver_ore.json new file mode 100644 index 00000000..dc181293 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_silver_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_tin_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_tin_ore.json new file mode 100644 index 00000000..58016ee6 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_tin_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/corrupted_tungsten_ore.json b/src/main/resources/assets/terramine/models/block/corrupted_tungsten_ore.json new file mode 100644 index 00000000..be9220e7 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/corrupted_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/corruption/corrupt_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_deepslate_lead_ore.json b/src/main/resources/assets/terramine/models/block/crimson_deepslate_lead_ore.json new file mode 100644 index 00000000..a2965935 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_deepslate_lead_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_deepslate_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_deepslate_platinum_ore.json b/src/main/resources/assets/terramine/models/block/crimson_deepslate_platinum_ore.json new file mode 100644 index 00000000..bb3be042 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_deepslate_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_deepslate_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_deepslate_silver_ore.json b/src/main/resources/assets/terramine/models/block/crimson_deepslate_silver_ore.json new file mode 100644 index 00000000..84f87c7c --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_deepslate_silver_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_deepslate_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_deepslate_tin_ore.json b/src/main/resources/assets/terramine/models/block/crimson_deepslate_tin_ore.json new file mode 100644 index 00000000..1878fbc6 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_deepslate_tin_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_deepslate_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_deepslate_tungsten_ore.json b/src/main/resources/assets/terramine/models/block/crimson_deepslate_tungsten_ore.json new file mode 100644 index 00000000..95608a66 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_deepslate_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_deepslate_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_lead_ore.json b/src/main/resources/assets/terramine/models/block/crimson_lead_ore.json new file mode 100644 index 00000000..3c9900aa --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_lead_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_lead_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_platinum_ore.json b/src/main/resources/assets/terramine/models/block/crimson_platinum_ore.json new file mode 100644 index 00000000..8082afad --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_platinum_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_platinum_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_silver_ore.json b/src/main/resources/assets/terramine/models/block/crimson_silver_ore.json new file mode 100644 index 00000000..4bfb6e47 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_silver_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_silver_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_tin_ore.json b/src/main/resources/assets/terramine/models/block/crimson_tin_ore.json new file mode 100644 index 00000000..747d4c40 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_tin_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/models/block/crimson_tungsten_ore.json b/src/main/resources/assets/terramine/models/block/crimson_tungsten_ore.json new file mode 100644 index 00000000..0d6df891 --- /dev/null +++ b/src/main/resources/assets/terramine/models/block/crimson_tungsten_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "terramine:block/crimson/crimson_tungsten_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_lead_ore.png b/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_lead_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..89fe9083f35fbfaf7aa06917a92bd9c7c29c2064 GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFU^m7E10 zk;M!Qd*AN9$JwrX?p54X@KsDP^ zBRtbQJ+&A(fE-o^DMnTXMj*=zh^3)ykTW$HnZe>rK(-+x6WAY7Kz3$33s^i0$OeI% zWsD3jfZl`AXqGYnr6#a5umDvW7#SNdE`XQ{vXONG#H1-eHV7~Q&1C|s46?KUvY@&Q z4GciC4(ahwzv@6(mZ z{K`y67k+xTEpoXtzvZ;)+NT*VpQ&nK{x{+F=2gW($(8dTykBs4j;X=N4eePD2GQPq Yb(Sg;=Z!^Mr9sZ~boFyt=akR{0Dnb|A^-pY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_platinum_ore.png b/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_platinum_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..0eded7af2761f9abf12158a8d79a533228cce8a1 GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFII{Na>Ae@vAGv&S-@4f!fGRl) zJR*x382Ao=Fk{xWPEMepM2TxeNpOBzNqJ&XDnmeGW?qS&pKFMMsh**panEjJ1)!R3 zsS%!Oo}O9^96$~$gA^kx10#^-1;o-&HprP8jLcwhCLr68kqPXNC?GqtodqnO1!RN3 z{xU{}7eMd9Xf#V1fKn6K8CZZS4UCKp7#BcH1=+~D0AkV zPD%x;EcUx){-Ln<^~0KgbDWZ84>XdFcRIclI;_QA6S*OGietl%FA8iqziNuhU3;Id zOy*Z+I=b-FyKRxno%t=NP1ionaQRGC1M|NLw>PgU4oa?^|KRuI>8|?K^VJh;`#6pi0gH zkH}&M2EGFz%$RkplM^T?QQ{g=5}cn_Ql40p$`Fv4nOCCc=Nh75s%NNY+_T$Q0jOqM zYJ_K+r>7PJ2av3CK2NWCHsm3dqiEX90_60ofq1 zzl@RL1<-pi8qHD$pwt9*1{R=710!Pt#sv^lK{m23fS5D|$OZu>pt($7l|hykKo(S& zp@9KN_GQtO&QG&9+5?&Go-U3d5|>3!Z{#{;AmaAW-fd1b^EGXXMW3R)3r}CTs~9P!2EB*?aix-gOV%fKX||3?i^Etj~m*v91Nnp Z`|2!JB+eU)wn~GX=jrO_vd$@?2>_Y4kNW@s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_tin_ore.png b/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_tin_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ac9359797824fc20a68385c39b6cf513a7df16 GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF8eR=RL5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemk zJ>#C;#tJ|++fpMu(>y)37&w3&Rt70XRt82O%L|C5p=^+QH5i$};!HrcAtMvmLs39> zW;+X5JPXJMflpx>8!#?_m$Nv;eZ8x(p2rK(d)73Oq~Mf{y{26FprVLnJQCo;Kt<(2d*eqi@mWJ{wDa#6ZRn;*EZy4bi@ tCQpp>+S*;YS@#%To+)HF5W^z$i%EE^B;)lzb9+G!^>p=fS?83{1OTOjlYjsK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_tungsten_ore.png b/src/main/resources/assets/terramine/textures/block/corruption/corrupt_deepslate_tungsten_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..de46817edce55f37ff341ba53d563109664a5db0 GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFKW=8_v|)S0IJ!R z8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgPf_s$P5-|0MzfRwC^dndfd#12z{uEuaRJ0skd3ShASO)#vO$0eXf6|2Wss!>kOkFc zXkY-6eOWZ6^V95&_CRL4r;B5V#AVUb8@Ub{h`2qpcbikq{7&uqwVU@QiF@30Sh3mb zq*S2FV!vDF9}0V4KdcEj$0=F%KqKjRr{hbZ!&=-mksETSI5zzFqQI8(tERZzwfE`D zWPW9)qYFR1+ZMUpncs5SbnVj&m(Nr+F#nryd-JN|pybN=58f}hJIB=EW^~720XD{x_04n1w@Q5sC zVBk9l!i+m6X1@grN|d-plmzFem6RtIr7{F0X6BXX`MHKDnCcno8TafqRsgEmmKx!i z=IN=$zyaj2GDtD9GB5&JUO+4jWrN(P!N?32X9BVf8JWPIhyt=R+gZTkSwJ=j+$>{c zcmebqj7GDR0Vp+roq+|Y(!j{rfN=rDRFI9V3m_&<0kT1W31}`8SY?o<1&{^RWoTdk zl66Rr|JuuG>h{rS80I_oiw*+vIvvv37A zJe+!~CiuhNoEV3W8~ts!T(ffId3=8wOgrCldGgmi`YiK&B~(_#EcnEJ*jV_oO3Ne* Pkh?rx{an^LB{Ts5nHh+4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/corruption/corrupt_platinum_ore.png b/src/main/resources/assets/terramine/textures/block/corruption/corrupt_platinum_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..ac29ac94a2ad73130ae23fb4b4b86c7b794ae66a GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFc)ci`suKNdc8{7I;J! zGcfQS0Aa?gYn_}xL5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemkJ>#C;#tJ|++fpMu z(>y)37&w3&Rt70XRt82O%L|C5p=^*FH5i$};!HrcAtMvm6H!2RW;+X5JPXJMf&FES z3@?CwgVAV~G61C}ursg#RT>x>8!#?_m$Nv;eZ8x(p2r zK(a53rgVOqz0n@XZ18k(43W6Zd)koikO2?tg?xcC+it(RA;|8rDvn|0nH8&ywku58 zD*S~lX7-D-{3=-oWhV&CJQlgIGHXvXYwW@cv#s`*Z=?k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/corruption/corrupt_silver_ore.png b/src/main/resources/assets/terramine/textures/block/corruption/corrupt_silver_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..7bdcd66339cbda0a4f5e43b932dfb2e36d97d5eb GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF#C;#tJ|++fpMu z(>y)37&w3&Rt70XRt82O%L|C5p=^*FH5i$};!HrcAtMvm6H!2RW;+X5JPXJMf&FES z3@?CwgVAV~G61C}ursg#RT>x>8!#?_m$Nv;eZ8x(p2r zK(a53rgVOqz0n@XZ18k(43W6Zd)koikO2?tg?xcC+it(RA;|8rDvn|0nH8&ywku58 zD*S~lX7-D-{3=-oWhV&CJQlgIGHXvXYwW@cv#s5g*SwwU`xj3*uwz~CnWJl$%*fxh zaniAUOEj$0Re-uU3p^r=85sBufiR<}hF1enP@=>&q9iy!t)x7$D3u`~F*C13&(AeP z!Bo#s&$wr|u>w%dw$upEG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!Kt4Mt|LI1`X<$jAit zQxuS$+0FtM&jPYR;8PhR!waBSVKkbh3_z&~>vp@3Xlx~ zOh9v)z$$|*Er2YjE<*zYkZfj&0?$&m;A24MWKS2z5Q)pYXB7DkIS8;`*w4GD=%1N} zz}=f7z6)C(C@$p8Gn~WVE%0LP>LXji8=N0-GBrQfdk`Nt(VR?#~@|!BbXOky4 zovbsSdd#u=SH)7HO}p+)R(ew4v)I0bZy!hAm%3>VSEp8dN$=UOzp?q6!u_L(n!T)- zb0jlF!dCx#_E-M;#(T3~F=zTp{nyV}J0Ynqvrk%e?~5B6Ag6k|`njxgN@xNAcmtbp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/corruption/corrupt_tungsten_ore.png b/src/main/resources/assets/terramine/textures/block/corruption/corrupt_tungsten_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..c28f371ee61abcaeb9ad4ba9d2e22f7ef1d7fae2 GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFTcK0bT)nU(9$ZQpTzpV5tN>w(HR3p^r= z85sBufG}g$wN6f;phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUNo^j7^V+Ej^ZK)BS zX`Y^13>-iXD}xjxD+42t5&GyBC^ewD0)vJ(Vm9*bO9nYAaHHFn{J*;aZS&UN3}rv3T5_B!h^joC&AXR~kx zHawhqt0wrv-kcbRjvM`Lw_LMwR|DNig)We7;j%q!9Ja}7~2)icyH?%8du093Or zHNrE^(^HFq1IS@zkYZ$IU<9(ffLI#J202rMkr^z`1Y{dBGJ*XO1!QNovw+33fNT)B zS;oll0_Z&$jbyRG*wUF@{cJtmOagTcrD>i$b zlnPW??03ujLt*dhhcyA`I3>#-Xe1r)bbKjvSc|(RazpME$A%wY6xecp)fAVz_C8&i z%&*LJbm6CW+ai}c^IJ}vu6>%}@|mgz=6@4zZ(da#lw3Lg!TSYw=a?FN+|ZuoU=Z!y YS7)grao$+8RT|_xPgg&ebxsLQ0A5p#s{jB1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_platinum_ore.png b/src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_platinum_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..6fbc65123ace2494458a8b988d4f4d0df2f48679 GIT binary patch literal 514 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFbHv>3X~G0#$Mr zctjR6Fz_7!VaBX$ot!{Hi4xa{lHmNblJdl&REB`W%)AmkKi3ciQ$0gH+cG7@5K1OhC3FBNNykQ9yQPI}2Dm3&;k6 z{bh^{FM!^I(P)-30Hr3dGq3QV0J5OE z3=IrGvM-CKbbgw>(H_Wb_jGX#k+>{+dL!2%0};1}_HJ{knct~hzjpK9Byo>>4l6c$ zosxVS~=Qt(H9%v*T?{s`AbXbeKCUQgW6vu`iUliDKe$^D0yY@a^ znar=ubadgTciSSDJM&vko34GD;qsZP2IhYgZf{;y9F$x+|H1nOcjuTIeB98UHIW%qdkz>?&;zfB5_&t^hT~j1|n_`?cL^7Grv>2e(mPHN#Y*&99C@h zIw=*Xve@sI`G>;Z*AHs~&T&eXJFB~w@3uuQcjmX8HeLHP!{swo4b1;0+}^yZI4HSt{)6`m?#?ka__(1x%fTSp ZyRXhtMdG}%Xsa~Hd7iF*F6*2UngEpZku(4R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_tin_ore.png b/src/main/resources/assets/terramine/textures/block/crimson/crimson_deepslate_tin_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..40b3de575f3e2a9c06b88339450044823b5bb21d GIT binary patch literal 533 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF!Yu?WF{X5q6o;kX9$&CD68z&vx zw?yVy#4Ml|&H|6fVg?4jLmP^E#9u>s=(h^ZhOSr{&803@4PqQJA1E%+FaInmR_F+}3B>}f-;Lk3wE2Pis*87PJ2av3CK2NWCHsm3dqiEX90_60ofq1 zzl@RL1<-pi8qHD$pwt9*1{R=710!Pt#sv^lK{m23fS5D|$OZu>pt($7l|hykKo(S& zp@9KN_GQtO&QG&9+5?&Go-U3d5|>3!Z{#{;AmaAW-fd1b^EGXXMW3R)3r}CTs~9P!2EB*?aix-gOV%fKX||3?i^Etj~m*v91Nnp Z`|2!JB+eU)wn~GX=jrO_vd$@?2>{Z`kRAX4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/block/crimson/crimson_lead_ore.png b/src/main/resources/assets/terramine/textures/block/crimson/crimson_lead_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..f81d9db70001966bdb3417a5dd818082b8efbf9c GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFLEN!qzXRcRu5r@?(r0B{c zcmebqj7GDR0Vp+roq+|Y(!j{rfN=rDRFI9V3m_&<0kT1W31}`8SY?o<1&{^RWoTdk zl66Rr|JuuG>h{rS80I_oiw*+vIvvv37A zJe+!~CiuhNoEV3W8~ts!T(ffId3=8wOgrCldGgmi`YiK&B~(_#EcnEJ*jV_oO3Ne* Pkh?rx{an^LB{Ts5nsLEN!qzXRcRvyUBKc;d*~v#0l7Jb&c!#r(dywLoQ@1s;*b z3=Dh+K$tP>S|=w^P@=>&q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s&$wr|u>w%dw$upE zG*3@01`Z&Hl|hP;m4Ok+@&aOMC>!KP4Mt|LI1`X<$jAitL==#n+0FtM&jPYRV1F4S z!waC_U^JSg3_z&~>vp@3Xlx~Oh9v)z$$|*Er2YjE<*zY zknGE%DV?8YZ?p$88$4YcLnJQqo;Kt=WWd9EAz$Fkw%hM+2(o*uiep%LX2mL_?Fv)2 z3V&gXnf>A{ze?6Y*$DzOk3}x5%-R#p8oThqY%4tu=eqA~)BgNjd!6-|#%!a5vst(T z8y-%*RTKPSZ%&Lu$Bq8BTdr9-@;tsj4W^xMxjgyn9(|U1z7i@cVitU2KWr>~S*2x? P1;|~Vu6{1-oD!MLEN!qzXRcR)0eNCvwGvot-H4GKeX@2vB#<*=Yh&N3p^r= z85sBufG}g$wN6f;phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUNo^j7^V+Ej^ZK)BS zX`Y^13>-iXD}xjxD+42t5&GyBC^ewD0)vJ(Vm9*bO9nYAaHHFn{J*;aZS&UN3}rv3T5_B!h^joC&AXR~kx zHawhqt0wrv-kcbRjvM`Lw_LMwLEN!qzXRcRtLByM@iaKJYu?WF{Wqs|>{!=(=IGibGxB$B zoOEp85-|<#5}+>50*}aI1_r)EAj~ML;ne^XlqhkHC<)F_D=AMbN@WO0%*-p%^K%VR zFx4~EGw#`KtN>KAEj7Y3&C^qhfdj~4WsqWIWncudynt95$_6=EgOM35&IDu|GBSbv z6a{2wwzGi6vw&<6_*BNo@B-*n7>#Br15j!LI|B<)rGb&L0pkLQsURC!7eGv!0%U^# z6VO~Hu*x7y3m^-s%h138B%4{Hz_XMs_!y8m+0(@_MB*~<8AZNB4g#zf_VX?(`e&vg zaQCK&@4}V`iVHdO4CgR-3%ppn`pA~>2ImKyOwG^r9>mKr7{LEN!qzXRcREyt#JAD=z@%*yrWw(mHKAEj7Y3 z&C^qhfdj~4WsqWIWncudynt95$_BYngOM35&IDu|GBSZZ5d~ytwzGi6vw&<6*k8uT z@B-*J7>#Br15j!LI|B<)rGb&L0pkLQsURC!7eGv!0%U^#6VO~Hu*x7y3m^-s%h138 zB>S>xO6RB98|{J222U5q5Q)pYrw#cI8St=P$QL-X?e@DHg6tlv;uuz*S+UA!yTX*M z!e7{8X1_Sguab38c7njnW04Chv-U)@#xA@t+e(kax$ZmLv_F5>US~a~G27_iY!HftN1tV$uY}5qm<6BM4;u?#R%w}J P0dkk8tDnm{r-UW|f7pvP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/terramine/textures/item/misc/lead_nugget.png b/src/main/resources/assets/terramine/textures/item/misc/lead_nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..426f9502b9795111ca6a41593401fc7957634406 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|s0G|+76Fa|*o@spxS8Uz3JG7`;OH0cxs0b*zn0HNS%G|s0G|+756_~lhi+aw`^d^M_S=ou4byj|6ifw5=1)(H1X3I&L4LviA%Njt z^Inh`XMsm#F#`kNVGw3Kp1&dmWLSx7L`iUdT1k0gQ7S_~VrE{6o}X)of~lUNo^j7^ zV+Ej^ZK)BSX`Y^13>-iXD}xjxD+42t2!0mM|04%P(_lcoUKAixAPhY74Q$kGDH zg6c9fFaXK&%@R-EbGrExkZI@X;uxY4JolU-AA|NoQOuXG%9jP&SV!gz=6 zK0}XpPKTH0f>mNh2W=W>UKiz9$-X2=$TnWSx{)m+g)P+7