From c70b094a23497cbbfdd4931bc19a7563a2bbb755 Mon Sep 17 00:00:00 2001 From: Cassian Godsted Date: Sat, 28 Dec 2024 22:38:36 -0500 Subject: [PATCH] Fix tag issues --- .../models/block/template_wall_gate.json | 117 ++++++++++++++++++ .../models/block/template_wall_gate_open.json | 105 ++++++++++++++++ .../tags/block/bamboo_plantable_on.json | 1 - .../tags/block/beacon_base_blocks.json | 1 - .../data/minecraft/tags/block/climbable.json | 1 - .../minecraft/tags/block/dragon_immune.json | 1 - .../tags/block/enderman_holdable.json | 1 - .../minecraft/tags/block/infiniburn_end.json | 1 - .../tags/block/infiniburn_nether.json | 1 - .../tags/block/infiniburn_overworld.json | 1 - .../minecraft/tags/block/mineable/axe.json | 1 - .../minecraft/tags/block/mineable/hoe.json | 1 - .../tags/block/mineable/pickaxe.json | 1 - .../minecraft/tags/block/mineable/shovel.json | 1 - .../tags/block/needs_diamond_tool.json | 1 - .../minecraft/tags/block/needs_iron_tool.json | 1 - .../tags/block/needs_stone_tool.json | 1 - .../minecraft/tags/block/needs_wood_tool.json | 1 - .../minecraft/tags/block/pressure_plates.json | 1 - .../data/minecraft/tags/block/slabs.json | 1 - .../minecraft/tags/block/small_flowers.json | 1 - .../minecraft/tags/block/sword_efficient.json | 1 - .../minecraft/tags/block/wooden_buttons.json | 1 - .../minecraft/tags/block/wooden_fences.json | 1 - .../tags/block/wooden_pressure_plates.json | 1 - .../minecraft/tags/block/wooden_slabs.json | 1 - .../minecraft/tags/block/wooden_stairs.json | 1 - .../data/minecraft/tags/block/wool.json | 1 - .../tags/blocks/bamboo_plantable_on.json | 9 +- .../tags/blocks/beacon_base_blocks.json | 13 +- .../ceiling_hanging_signs.json | 0 .../data/minecraft/tags/blocks/climbable.json | 8 +- .../combination_step_sound_blocks.json | 0 .../data/minecraft/tags/blocks/dirt.json | 11 +- .../tags/{block => blocks}/doors.json | 0 .../minecraft/tags/blocks/dragon_immune.json | 8 +- .../tags/blocks/enderman_holdable.json | 9 +- .../tags/{block => blocks}/fence_gates.json | 0 .../tags/{block => blocks}/flower_pots.json | 0 .../minecraft/tags/blocks/infiniburn_end.json | 9 +- .../tags/blocks/infiniburn_nether.json | 9 +- .../tags/blocks/infiniburn_overworld.json | 9 +- .../tags/{block => blocks}/logs.json | 0 .../minecraft/tags/blocks/mineable/axe.json | 19 +-- .../minecraft/tags/blocks/mineable/hoe.json | 7 +- .../tags/blocks/mineable/pickaxe.json | 36 +----- .../tags/blocks/mineable/shovel.json | 10 +- .../tags/blocks/needs_diamond_tool.json | 10 +- .../tags/blocks/needs_iron_tool.json | 11 +- .../tags/blocks/needs_stone_tool.json | 10 +- .../tags/blocks/needs_wood_tool.json | 9 +- .../tags/{block => blocks}/planks.json | 0 .../tags/blocks/pressure_plates.json | 6 +- .../tags/{block => blocks}/signs.json | 0 .../data/minecraft/tags/blocks/slabs.json | 10 +- .../minecraft/tags/blocks/small_flowers.json | 15 +-- .../data/minecraft/tags/blocks/stairs.json | 10 +- .../tags/blocks/sword_efficient.json | 7 +- .../minecraft/tags/blocks/terracotta.json | 8 +- .../{block => blocks}/wall_hanging_signs.json | 0 .../tags/{block => blocks}/wall_signs.json | 0 .../data/minecraft/tags/blocks/walls.json | 11 +- .../minecraft/tags/blocks/wooden_buttons.json | 7 +- .../minecraft/tags/blocks/wooden_doors.json | 8 +- .../minecraft/tags/blocks/wooden_fences.json | 12 +- .../tags/blocks/wooden_pressure_plates.json | 7 +- .../minecraft/tags/blocks/wooden_slabs.json | 8 +- .../minecraft/tags/blocks/wooden_stairs.json | 8 +- .../{block => blocks}/wooden_trapdoors.json | 0 .../data/minecraft/tags/blocks/wool.json | 6 +- .../tags/{block => blocks}/wool_carpets.json | 0 .../data/minecraft/tags/item/dirt.json | 1 - .../data/minecraft/tags/item/doors.json | 1 - .../data/minecraft/tags/item/fence_gates.json | 1 - .../data/minecraft/tags/item/logs.json | 1 - .../data/minecraft/tags/item/planks.json | 1 - .../minecraft/tags/item/small_flowers.json | 1 - .../data/minecraft/tags/item/stairs.json | 1 - .../data/minecraft/tags/item/walls.json | 1 - .../minecraft/tags/item/wooden_buttons.json | 1 - .../minecraft/tags/item/wooden_doors.json | 1 - .../minecraft/tags/item/wooden_fences.json | 1 - .../tags/item/wooden_pressure_plates.json | 1 - .../minecraft/tags/item/wooden_slabs.json | 1 - .../minecraft/tags/item/wooden_stairs.json | 1 - .../data/minecraft/tags/item/wool.json | 1 - .../minecraft/tags/item/wool_carpets.json | 1 - .../minecraft/tags/{block => items}/dirt.json | 0 .../data/minecraft/tags/items/doors.json | 36 +----- .../minecraft/tags/items/fence_gates.json | 32 +---- .../tags/{item => items}/hanging_signs.json | 0 .../data/minecraft/tags/items/logs.json | 9 +- .../tags/{item => items}/piglin_loved.json | 0 .../data/minecraft/tags/items/planks.json | 31 +---- .../minecraft/tags/{item => items}/signs.json | 0 .../minecraft/tags/{item => items}/slabs.json | 0 .../minecraft/tags/items/small_flowers.json | 15 +-- .../tags/{block => items}/stairs.json | 0 .../tags/{block => items}/terracotta.json | 0 .../tags/{block => items}/walls.json | 0 .../minecraft/tags/items/wooden_buttons.json | 31 +---- .../tags/{block => items}/wooden_doors.json | 0 .../minecraft/tags/items/wooden_fences.json | 32 +---- .../tags/items/wooden_pressure_plates.json | 31 +---- .../minecraft/tags/items/wooden_slabs.json | 32 +---- .../minecraft/tags/items/wooden_stairs.json | 32 +---- .../{item => items}/wooden_trapdoors.json | 0 .../data/minecraft/tags/items/wool.json | 13 +- .../minecraft/tags/items/wool_carpets.json | 12 +- .../data/pyrite/tags/block/amethyst.json | 1 - .../data/pyrite/tags/block/brick_slabs.json | 1 - .../data/pyrite/tags/block/bricks.json | 1 - .../data/pyrite/tags/block/carpet.json | 1 - .../data/pyrite/tags/block/copper.json | 1 - .../pyrite/tags/block/crafting_tables.json | 1 - .../data/pyrite/tags/block/cut_blocks.json | 1 - .../data/pyrite/tags/block/diamond.json | 1 - .../data/pyrite/tags/block/emerald.json | 1 - .../data/pyrite/tags/block/gold.json | 1 - .../data/pyrite/tags/block/iron.json | 1 - .../data/pyrite/tags/block/ladders.json | 1 - .../data/pyrite/tags/block/lapis.json | 1 - .../data/pyrite/tags/block/mushroom_stem.json | 1 - .../data/pyrite/tags/block/netherite.json | 1 - .../data/pyrite/tags/block/obsidian.json | 1 - .../data/pyrite/tags/block/quartz.json | 1 - .../data/pyrite/tags/block/redstone.json | 1 - .../data/pyrite/tags/block/terracotta.json | 1 - .../pyrite/tags/block/terracotta_bricks.json | 1 - .../data/pyrite/tags/block/turf_blocks.json | 1 - .../data/pyrite/tags/block/turf_slabs.json | 1 - .../data/pyrite/tags/block/turf_stairs.json | 1 - .../data/pyrite/tags/blocks/amethyst.json | 23 +--- .../data/pyrite/tags/blocks/brick_slabs.json | 36 +----- .../data/pyrite/tags/blocks/brick_stairs.json | 36 +----- .../data/pyrite/tags/blocks/brick_walls.json | 36 +----- .../data/pyrite/tags/blocks/bricks.json | 41 +----- .../data/pyrite/tags/blocks/carpet.json | 9 +- .../{block => blocks}/concrete_slabs.json | 0 .../{block => blocks}/concrete_stairs.json | 0 .../data/pyrite/tags/blocks/copper.json | 46 +------ .../pyrite/tags/blocks/crafting_tables.json | 41 +----- .../data/pyrite/tags/blocks/cut_blocks.json | 14 +-- .../data/pyrite/tags/blocks/diamond.json | 23 +--- .../tags/{block => blocks}/dyed_bricks.json | 0 .../data/pyrite/tags/blocks/emerald.json | 23 +--- .../{block => blocks}/exposed_copper.json | 0 .../pyrite/tags/{block => blocks}/fences.json | 0 .../data/pyrite/tags/blocks/gold.json | 23 +--- .../data/pyrite/tags/blocks/iron.json | 21 +--- .../data/pyrite/tags/blocks/ladders.json | 31 +---- .../data/pyrite/tags/blocks/lamps.json | 32 +---- .../data/pyrite/tags/blocks/lapis.json | 23 +--- .../data/pyrite/tags/blocks/metal_bars.json | 19 +-- .../pyrite/tags/blocks/metal_buttons.json | 18 +-- .../pyrite/tags/blocks/metal_trapdoors.json | 16 +-- .../pyrite/tags/blocks/mushroom_stem.json | 8 +- .../data/pyrite/tags/blocks/netherite.json | 23 +--- .../data/pyrite/tags/blocks/obsidian.json | 11 +- .../{block => blocks}/oxidized_copper.json | 0 .../data/pyrite/tags/blocks/quartz.json | 17 +-- .../data/pyrite/tags/blocks/redstone.json | 23 +--- .../tags/{block => blocks}/smooth_blocks.json | 0 .../stained_framed_glass.json | 0 .../tags/{block => blocks}/stained_glass.json | 0 .../data/pyrite/tags/blocks/terracotta.json | 12 +- .../pyrite/tags/blocks/terracotta_bricks.json | 28 +---- .../data/pyrite/tags/blocks/turf_blocks.json | 11 +- .../data/pyrite/tags/blocks/turf_slabs.json | 13 +- .../data/pyrite/tags/blocks/turf_stairs.json | 13 +- .../data/pyrite/tags/blocks/wall_gates.json | 55 +------- .../{block => blocks}/weathered_copper.json | 0 .../data/pyrite/tags/item/brick_stairs.json | 1 - .../data/pyrite/tags/item/brick_walls.json | 1 - .../pyrite/tags/item/crafting_tables.json | 1 - .../data/pyrite/tags/item/lamps.json | 1 - .../data/pyrite/tags/item/metal_bars.json | 1 - .../data/pyrite/tags/item/metal_buttons.json | 1 - .../pyrite/tags/item/metal_trapdoors.json | 1 - .../data/pyrite/tags/item/mushroom_stem.json | 1 - .../data/pyrite/tags/item/terracotta.json | 1 - .../data/pyrite/tags/item/wall_gates.json | 1 - .../pyrite/tags/{item => items}/amethyst.json | 0 .../tags/{item => items}/azalea_logs.json | 0 .../tags/{block => items}/brick_stairs.json | 0 .../tags/{block => items}/brick_walls.json | 0 .../pyrite/tags/{item => items}/bricks.json | 0 .../tags/{item => items}/concrete_slabs.json | 0 .../tags/{item => items}/concrete_stairs.json | 0 .../pyrite/tags/{item => items}/copper.json | 0 .../pyrite/tags/items/crafting_tables.json | 41 +----- .../pyrite/tags/{item => items}/diamond.json | 0 .../tags/{item => items}/dyed_bricks.json | 0 .../pyrite/tags/{item => items}/emerald.json | 0 .../tags/{item => items}/exposed_copper.json | 0 .../pyrite/tags/{item => items}/fences.json | 0 .../pyrite/tags/{item => items}/gold.json | 0 .../pyrite/tags/{item => items}/iron.json | 0 .../pyrite/tags/{block => items}/lamps.json | 0 .../pyrite/tags/{item => items}/lapis.json | 0 .../tags/{block => items}/metal_bars.json | 0 .../tags/{block => items}/metal_buttons.json | 0 .../{block => items}/metal_trapdoors.json | 0 .../data/pyrite/tags/items/mushroom_stem.json | 8 +- .../tags/{item => items}/netherite.json | 0 .../tags/{item => items}/oxidized_copper.json | 0 .../pyrite/tags/{item => items}/quartz.json | 0 .../pyrite/tags/{item => items}/redstone.json | 0 .../{item => items}/stained_framed_glass.json | 0 .../tags/{item => items}/stained_glass.json | 0 .../tags/items}/terracotta.json | 0 .../tags/{block => items}/wall_gates.json | 0 .../{item => items}/weathered_copper.json | 0 .../functions/fabric/BlockCreatorImpl.java | 5 + .../cc/cassian/pyrite/forge/PyriteForge.java | 1 + .../functions/forge/BlockCreatorImpl.java | 22 +++- .../data/forge/tags/blocks/glass.json | 1 + gradle.properties | 2 +- 218 files changed, 326 insertions(+), 1402 deletions(-) create mode 100644 common/src/main/resources/assets/pyrite/models/block/template_wall_gate.json create mode 100644 common/src/main/resources/assets/pyrite/models/block/template_wall_gate_open.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/bamboo_plantable_on.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/climbable.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/dragon_immune.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/enderman_holdable.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/infiniburn_end.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/infiniburn_nether.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/infiniburn_overworld.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/mineable/axe.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/needs_wood_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/pressure_plates.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/slabs.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/small_flowers.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/sword_efficient.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/wooden_buttons.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/wooden_fences.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/wooden_slabs.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/wooden_stairs.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/wool.json rename common/src/main/resources/data/minecraft/tags/{block => blocks}/ceiling_hanging_signs.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/combination_step_sound_blocks.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/doors.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/fence_gates.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/flower_pots.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/logs.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/planks.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/signs.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/wall_hanging_signs.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/wall_signs.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/wooden_trapdoors.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => blocks}/wool_carpets.json (100%) delete mode 100644 common/src/main/resources/data/minecraft/tags/item/dirt.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/doors.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/fence_gates.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/logs.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/planks.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/small_flowers.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/stairs.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/walls.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wooden_buttons.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wooden_doors.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wooden_fences.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wooden_slabs.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wooden_stairs.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/wool_carpets.json rename common/src/main/resources/data/minecraft/tags/{block => items}/dirt.json (100%) rename common/src/main/resources/data/minecraft/tags/{item => items}/hanging_signs.json (100%) rename common/src/main/resources/data/minecraft/tags/{item => items}/piglin_loved.json (100%) rename common/src/main/resources/data/minecraft/tags/{item => items}/signs.json (100%) rename common/src/main/resources/data/minecraft/tags/{item => items}/slabs.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => items}/stairs.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => items}/terracotta.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => items}/walls.json (100%) rename common/src/main/resources/data/minecraft/tags/{block => items}/wooden_doors.json (100%) rename common/src/main/resources/data/minecraft/tags/{item => items}/wooden_trapdoors.json (100%) delete mode 100644 common/src/main/resources/data/pyrite/tags/block/amethyst.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/brick_slabs.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/bricks.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/carpet.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/copper.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/crafting_tables.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/cut_blocks.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/diamond.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/emerald.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/gold.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/iron.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/ladders.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/lapis.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/mushroom_stem.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/netherite.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/obsidian.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/quartz.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/redstone.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/terracotta.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/terracotta_bricks.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/turf_blocks.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/turf_slabs.json delete mode 100644 common/src/main/resources/data/pyrite/tags/block/turf_stairs.json rename common/src/main/resources/data/pyrite/tags/{block => blocks}/concrete_slabs.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/concrete_stairs.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/dyed_bricks.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/exposed_copper.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/fences.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/oxidized_copper.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/smooth_blocks.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/stained_framed_glass.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/stained_glass.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => blocks}/weathered_copper.json (100%) delete mode 100644 common/src/main/resources/data/pyrite/tags/item/brick_stairs.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/brick_walls.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/crafting_tables.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/lamps.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/metal_bars.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/metal_buttons.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/metal_trapdoors.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/mushroom_stem.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/terracotta.json delete mode 100644 common/src/main/resources/data/pyrite/tags/item/wall_gates.json rename common/src/main/resources/data/pyrite/tags/{item => items}/amethyst.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/azalea_logs.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => items}/brick_stairs.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => items}/brick_walls.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/bricks.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/concrete_slabs.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/concrete_stairs.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/copper.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/diamond.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/dyed_bricks.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/emerald.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/exposed_copper.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/fences.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/gold.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/iron.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => items}/lamps.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/lapis.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => items}/metal_bars.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => items}/metal_buttons.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => items}/metal_trapdoors.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/netherite.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/oxidized_copper.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/quartz.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/redstone.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/stained_framed_glass.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/stained_glass.json (100%) rename common/src/main/resources/data/{minecraft/tags/item => pyrite/tags/items}/terracotta.json (100%) rename common/src/main/resources/data/pyrite/tags/{block => items}/wall_gates.json (100%) rename common/src/main/resources/data/pyrite/tags/{item => items}/weathered_copper.json (100%) create mode 100644 forge/src/main/resources/data/forge/tags/blocks/glass.json diff --git a/common/src/main/resources/assets/pyrite/models/block/template_wall_gate.json b/common/src/main/resources/assets/pyrite/models/block/template_wall_gate.json new file mode 100644 index 000000000..f4ff4c6e6 --- /dev/null +++ b/common/src/main/resources/assets/pyrite/models/block/template_wall_gate.json @@ -0,0 +1,117 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "#texture" + }, + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, -1, 0], + "scale":[ 0.8, 0.8, 0.8 ] + }, + "head": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, -3, -6], + "scale":[ 1, 1, 1] + } + }, + "elements": [ + { + "name": "Left-hand post", + "from": [0, 2, 5], + "to": [2, 13, 11], + "faces": { + "north": {"uv": [14, 2, 16, 16], "texture": "#texture"}, + "east": {"uv": [5, 2, 11, 16], "texture": "#texture"}, + "south": {"uv": [0, 2, 2, 16], "texture": "#texture"}, + "west": {"uv": [7, 0, 9, 11], "texture": "#texture", "cullface": "west"}, + "up": {"uv": [0, 5, 2, 11], "texture": "#texture"}, + "down": {"uv": [0, 5, 2, 11], "texture": "#texture"} + } + }, + { + "name": "Right-hand post", + "from": [14, 2, 5], + "to": [16, 13, 11], + "faces": { + "north": {"uv": [1, 2, 3, 16], "texture": "#texture"}, + "east": {"uv": [7, 0, 9, 11], "texture": "#texture", "cullface": "east"}, + "south": {"uv": [14, 2, 16, 16], "texture": "#texture"}, + "west": {"uv": [5, 2, 11, 16], "texture": "#texture"}, + "up": {"uv": [14, 5, 16, 11], "texture": "#texture"}, + "down": {"uv": [14, 5, 16, 11], "texture": "#texture"} + } + }, + { + "name": "Inner vertical post of left-hand gate door", + "from": [6, 3, 6], + "to": [8, 12, 10], + "faces": { + "north": {"uv": [6, 1, 8, 10], "texture": "#texture"}, + "east": {"uv": [7, 1, 9, 10], "texture": "#texture"}, + "south": {"uv": [6, 1, 8, 10], "texture": "#texture"}, + "west": {"uv": [7, 1, 11, 10], "texture": "#texture"}, + "up": {"uv": [6, 6, 8, 10], "texture": "#texture"}, + "down": {"uv": [6, 7, 8, 9], "texture": "#texture"} + } + }, + { + "name": "Inner vertical post of right-hand gate door", + "from": [8, 3, 6], + "to": [10, 12, 10], + "faces": { + "north": {"uv": [8, 1, 10, 10], "texture": "#texture"}, + "east": {"uv": [7, 1, 9, 10], "texture": "#texture"}, + "south": {"uv": [8, 1, 10, 10], "texture": "#texture"}, + "west": {"uv": [7, 1, 9, 10], "texture": "#texture"}, + "up": {"uv": [8, 6, 10, 10], "texture": "#texture"}, + "down": {"uv": [8, 7, 10, 9], "texture": "#texture"} + } + }, + { + "name": "Lower horizontal bar of left-hand gate door", + "from": [2, 3, 6], + "to": [6, 6, 10], + "faces": { + "north": {"uv": [2, 7, 6, 10], "texture": "#texture"}, + "south": {"uv": [2, 7, 6, 10], "texture": "#texture"}, + "up": {"uv": [2, 6, 6, 10], "texture": "#texture"}, + "down": {"uv": [2, 6, 6, 10], "texture": "#texture"} + } + }, + { + "name": "Upper horizontal bar of left-hand gate door", + "from": [2, 9, 6], + "to": [6, 12, 10], + "faces": { + "north": {"uv": [2, 1, 6, 4], "texture": "#texture"}, + "south": {"uv": [2, 1, 6, 4], "texture": "#texture"}, + "up": {"uv": [2, 6, 6, 10], "texture": "#texture"}, + "down": {"uv": [2, 6, 6, 10], "texture": "#texture"} + } + }, + { + "name": "Lower horizontal bar of right-hand gate door", + "from": [10, 3, 6], + "to": [14, 6, 10], + "faces": { + "north": {"uv": [10, 7, 14, 10], "texture": "#texture"}, + "south": {"uv": [10, 7, 14, 10], "texture": "#texture"}, + "up": {"uv": [10, 6, 14, 10], "texture": "#texture"}, + "down": {"uv": [10, 6, 14, 10], "texture": "#texture"} + } + }, + { + "name": "Upper horizontal bar of right-hand gate door", + "from": [10, 9, 6], + "to": [14, 12, 10], + "faces": { + "north": {"uv": [10, 1, 14, 4], "texture": "#texture"}, + "south": {"uv": [8, 1, 12, 4], "texture": "#texture"}, + "up": {"uv": [10, 6, 14, 10], "texture": "#texture"}, + "down": {"uv": [10, 6, 14, 10], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/pyrite/models/block/template_wall_gate_open.json b/common/src/main/resources/assets/pyrite/models/block/template_wall_gate_open.json new file mode 100644 index 000000000..2ce2f7f18 --- /dev/null +++ b/common/src/main/resources/assets/pyrite/models/block/template_wall_gate_open.json @@ -0,0 +1,105 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "#texture" + }, + "elements": [ + { + "name": "Left-hand post", + "from": [0, 2, 5], + "to": [2, 13, 11], + "faces": { + "north": {"uv": [14, 2, 16, 16], "texture": "#texture"}, + "east": {"uv": [5, 2, 11, 16], "texture": "#texture"}, + "south": {"uv": [0, 2, 2, 16], "texture": "#texture"}, + "west": {"uv": [5, 2, 11, 16], "texture": "#texture", "cullface": "west"}, + "up": {"uv": [0, 5, 2, 11], "texture": "#texture"}, + "down": {"uv": [0, 7, 2, 9], "texture": "#texture"} + } + }, + { + "name": "Right-hand post", + "from": [14, 2, 5], + "to": [16, 13, 11], + "faces": { + "north": {"uv": [1, 2, 3, 16], "texture": "#texture"}, + "east": {"uv": [5, 2, 11, 16], "texture": "#texture", "cullface": "east"}, + "south": {"uv": [14, 2, 16, 16], "texture": "#texture"}, + "west": {"uv": [5, 2, 11, 16], "texture": "#texture"}, + "up": {"uv": [14, 5, 16, 11], "texture": "#texture"}, + "down": {"uv": [14, 7, 16, 9], "texture": "#texture"} + } + }, + { + "name": "Inner vertical post of left-hand gate door", + "from": [0, 3, 13], + "to": [2, 12, 15], + "faces": { + "north": {"uv": [0, 1, 2, 10], "texture": "#texture"}, + "east": {"uv": [13, 1, 15, 10], "texture": "#texture"}, + "south": {"uv": [0, 1, 2, 10], "texture": "#texture"}, + "west": {"uv": [13, 1, 15, 10], "texture": "#texture"}, + "up": {"uv": [0, 13, 2, 15], "texture": "#texture"}, + "down": {"uv": [0, 13, 2, 15], "texture": "#texture"} + } + }, + { + "name": "Inner vertical post of right-hand gate door", + "from": [14, 3, 13], + "to": [16, 12, 15], + "faces": { + "north": {"uv": [14, 1, 16, 10], "texture": "#texture"}, + "east": {"uv": [13, 1, 15, 10], "texture": "#texture"}, + "south": {"uv": [14, 1, 16, 10], "texture": "#texture"}, + "west": {"uv": [13, 1, 15, 10], "texture": "#texture"}, + "up": {"uv": [14, 13, 16, 15], "texture": "#texture"}, + "down": {"uv": [14, 13, 16, 15], "texture": "#texture"} + } + }, + { + "name": "Lower horizontal bar of left-hand gate door", + "from": [0, 3, 11], + "to": [2, 6, 13], + "faces": { + "east": {"uv": [13, 7, 15, 10], "texture": "#texture"}, + "west": {"uv": [13, 7, 15, 10], "texture": "#texture"}, + "up": {"uv": [0, 11, 2, 13], "texture": "#texture"}, + "down": {"uv": [0, 3, 2, 5], "texture": "#texture"} + } + }, + { + "name": "Upper horizontal bar of left-hand gate door", + "from": [0, 9, 11], + "to": [2, 12, 13], + "faces": { + "east": {"uv": [13, 1, 15, 4], "texture": "#texture"}, + "west": {"uv": [13, 1, 15, 4], "texture": "#texture"}, + "up": {"uv": [0, 11, 2, 13], "texture": "#texture"}, + "down": {"uv": [0, 9, 2, 13], "texture": "#texture"} + } + }, + { + "name": "Lower horizontal bar of left-hand gate door", + "from": [14, 3, 11], + "to": [16, 6, 13], + "faces": { + "east": {"uv": [13, 7, 15, 10], "texture": "#texture"}, + "west": {"uv": [13, 7, 15, 10], "texture": "#texture"}, + "up": {"uv": [14, 11, 16, 13], "texture": "#texture"}, + "down": {"uv": [14, 3, 16, 5], "texture": "#texture"} + } + }, + { + "name": "Upper horizontal bar of left-hand gate door", + "from": [14, 9, 11], + "to": [16, 12, 13], + "faces": { + "east": {"uv": [13, 1, 15, 4], "texture": "#texture"}, + "west": {"uv": [13, 1, 15, 4], "texture": "#texture"}, + "up": {"uv": [14, 11, 16, 13], "texture": "#texture"}, + "down": {"uv": [14, 9, 16, 13], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/bamboo_plantable_on.json b/common/src/main/resources/data/minecraft/tags/block/bamboo_plantable_on.json deleted file mode 100644 index 639f70c36..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/bamboo_plantable_on.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:nostalgia_gravel","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json b/common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json deleted file mode 100644 index 9bacd49d2..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_iron","pyrite:smooth_iron","pyrite:iron_bricks","pyrite:iron_pillar","pyrite:chiseled_iron_block","pyrite:cut_gold","pyrite:smooth_gold","pyrite:gold_bricks","pyrite:gold_pillar","pyrite:chiseled_gold_block","pyrite:cut_emerald","pyrite:smooth_emerald","pyrite:emerald_bricks","pyrite:emerald_pillar","pyrite:chiseled_emerald_block","pyrite:cut_diamond","pyrite:smooth_diamond","pyrite:diamond_bricks","pyrite:diamond_pillar","pyrite:chiseled_diamond_block","pyrite:cut_netherite","pyrite:smooth_netherite","pyrite:netherite_bricks","pyrite:netherite_pillar","pyrite:chiseled_netherite_block","pyrite:nostalgia_iron_block","pyrite:nostalgia_gold_block","pyrite:nostalgia_emerald_block","pyrite:nostalgia_diamond_block","pyrite:nostalgia_netherite_block"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/climbable.json b/common/src/main/resources/data/minecraft/tags/block/climbable.json deleted file mode 100644 index b08e66a35..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/climbable.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:ladders"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/dragon_immune.json b/common/src/main/resources/data/minecraft/tags/block/dragon_immune.json deleted file mode 100644 index 66a2d4a07..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/dragon_immune.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:obsidian"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/enderman_holdable.json b/common/src/main/resources/data/minecraft/tags/block/enderman_holdable.json deleted file mode 100644 index 639f70c36..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/enderman_holdable.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:nostalgia_gravel","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/infiniburn_end.json b/common/src/main/resources/data/minecraft/tags/block/infiniburn_end.json deleted file mode 100644 index e90861d2c..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/infiniburn_end.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:nostalgia_netherrack","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/infiniburn_nether.json b/common/src/main/resources/data/minecraft/tags/block/infiniburn_nether.json deleted file mode 100644 index e90861d2c..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/infiniburn_nether.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:nostalgia_netherrack","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/infiniburn_overworld.json b/common/src/main/resources/data/minecraft/tags/block/infiniburn_overworld.json deleted file mode 100644 index e90861d2c..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/infiniburn_overworld.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:nostalgia_netherrack","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/axe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/axe.json deleted file mode 100644 index 16346d727..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/axe.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_fence_gate","required":false},{"id":"pyrite:orange_stained_fence_gate","required":false},{"id":"pyrite:magenta_stained_fence_gate","required":false},{"id":"pyrite:light_blue_stained_fence_gate","required":false},{"id":"pyrite:yellow_stained_fence_gate","required":false},{"id":"pyrite:lime_stained_fence_gate","required":false},{"id":"pyrite:pink_stained_fence_gate","required":false},{"id":"pyrite:gray_stained_fence_gate","required":false},{"id":"pyrite:light_gray_stained_fence_gate","required":false},{"id":"pyrite:cyan_stained_fence_gate","required":false},{"id":"pyrite:purple_stained_fence_gate","required":false},{"id":"pyrite:blue_stained_fence_gate","required":false},{"id":"pyrite:brown_stained_fence_gate","required":false},{"id":"pyrite:green_stained_fence_gate","required":false},{"id":"pyrite:red_stained_fence_gate","required":false},{"id":"pyrite:black_stained_fence_gate","required":false},{"id":"pyrite:glow_stained_fence_gate","required":false},{"id":"pyrite:dragon_stained_fence_gate","required":false},{"id":"pyrite:star_stained_fence_gate","required":false},{"id":"pyrite:honey_stained_fence_gate","required":false},{"id":"pyrite:nostalgia_stained_fence_gate","required":false},{"id":"pyrite:rose_stained_fence_gate","required":false},{"id":"pyrite:poisonous_stained_fence_gate","required":false},{"id":"pyrite:red_mushroom_fence_gate","required":false},{"id":"pyrite:brown_mushroom_fence_gate","required":false},"pyrite:locked_chest","#pyrite:mushroom_stem","#pyrite:crafting_tables",{"id":"pyrite:azalea_fence_gate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json deleted file mode 100644 index d6ba76e82..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/hoe.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json deleted file mode 100644 index a9c936308..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glow_concrete","pyrite:dragon_concrete","pyrite:star_concrete","pyrite:honey_concrete","pyrite:nostalgia_concrete","pyrite:rose_concrete","pyrite:poisonous_concrete",{"id":"pyrite:nether_brick_fence_gate","required":false},"pyrite:framed_glass","pyrite:framed_glass_pane","#pyrite:bricks","#pyrite:brick_slabs","#pyrite:brick_stairs","#pyrite:brick_walls","#pyrite:wall_gates","#pyrite:obsidian","#pyrite:amethyst","#pyrite:quartz","#pyrite:netherite","#pyrite:diamond","#pyrite:lapis","#pyrite:emerald","#pyrite:gold","#pyrite:iron","#pyrite:copper","#pyrite:redstone","#pyrite:metal_trapdoors","#pyrite:metal_buttons","pyrite:blue_nether_bricks","pyrite:charred_nether_bricks","pyrite:nostalgia_netherrack","pyrite:nostalgia_cobblestone","pyrite:nostalgia_mossy_cobblestone","#pyrite:stained_framed_glass","#pyrite:metal_bars","#pyrite:concrete_slabs","#pyrite:concrete_stairs","#pyrite:terracotta"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json b/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json deleted file mode 100644 index da278e0bf..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glow_concrete_powder","pyrite:dragon_concrete_powder","pyrite:star_concrete_powder","pyrite:honey_concrete_powder","pyrite:nostalgia_concrete_powder","pyrite:rose_concrete_powder","pyrite:poisonous_concrete_powder","pyrite:nostalgia_gravel","#pyrite:turf_blocks","#pyrite:turf_slabs","#pyrite:turf_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json b/common/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json deleted file mode 100644 index ab13fdfbc..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:obsidian","#pyrite:netherite"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json b/common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json deleted file mode 100644 index 4780c476e..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:gold","#pyrite:diamond","#pyrite:emerald"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json b/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json deleted file mode 100644 index c89fe63b1..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:iron","#pyrite:lapis","#pyrite:copper","#pyrite:exposed_copper","#pyrite:weathered_copper","#pyrite:oxidized_copper"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/needs_wood_tool.json b/common/src/main/resources/data/minecraft/tags/block/needs_wood_tool.json deleted file mode 100644 index dfb19050e..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/needs_wood_tool.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:wall_gates","#pyrite:bricks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/pressure_plates.json b/common/src/main/resources/data/minecraft/tags/block/pressure_plates.json deleted file mode 100644 index 818acdbed..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/pressure_plates.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:emerald_pressure_plate","required":false},{"id":"pyrite:diamond_pressure_plate","required":false},{"id":"pyrite:netherite_pressure_plate","required":false},{"id":"pyrite:quartz_pressure_plate","required":false},{"id":"pyrite:amethyst_pressure_plate","required":false},{"id":"pyrite:lapis_pressure_plate","required":false},{"id":"pyrite:redstone_pressure_plate","required":false},{"id":"pyrite:copper_pressure_plate","required":false},{"id":"pyrite:exposed_copper_pressure_plate","required":false},{"id":"pyrite:weathered_copper_pressure_plate","required":false},{"id":"pyrite:oxidized_copper_pressure_plate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/slabs.json b/common/src/main/resources/data/minecraft/tags/block/slabs.json deleted file mode 100644 index e24cf0d08..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/slabs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_slab","pyrite:white_brick_slab","pyrite:white_terracotta_brick_slab","pyrite:orange_stained_slab","pyrite:orange_brick_slab","pyrite:orange_terracotta_brick_slab","pyrite:magenta_stained_slab","pyrite:magenta_brick_slab","pyrite:magenta_terracotta_brick_slab","pyrite:light_blue_stained_slab","pyrite:light_blue_brick_slab","pyrite:light_blue_terracotta_brick_slab","pyrite:yellow_stained_slab","pyrite:yellow_brick_slab","pyrite:yellow_terracotta_brick_slab","pyrite:lime_stained_slab","pyrite:lime_brick_slab","pyrite:lime_terracotta_brick_slab","pyrite:pink_stained_slab","pyrite:pink_brick_slab","pyrite:pink_terracotta_brick_slab","pyrite:gray_stained_slab","pyrite:gray_brick_slab","pyrite:gray_terracotta_brick_slab","pyrite:light_gray_stained_slab","pyrite:light_gray_brick_slab","pyrite:light_gray_terracotta_brick_slab","pyrite:cyan_stained_slab","pyrite:cyan_brick_slab","pyrite:cyan_terracotta_brick_slab","pyrite:purple_stained_slab","pyrite:purple_brick_slab","pyrite:purple_terracotta_brick_slab","pyrite:blue_stained_slab","pyrite:blue_brick_slab","pyrite:blue_terracotta_brick_slab","pyrite:brown_stained_slab","pyrite:brown_brick_slab","pyrite:brown_terracotta_brick_slab","pyrite:green_stained_slab","pyrite:green_brick_slab","pyrite:green_terracotta_brick_slab","pyrite:red_stained_slab","pyrite:red_brick_slab","pyrite:red_terracotta_brick_slab","pyrite:black_stained_slab","pyrite:black_brick_slab","pyrite:black_terracotta_brick_slab","pyrite:glow_stained_slab","pyrite:glow_brick_slab","pyrite:glow_terracotta_brick_slab","pyrite:dragon_stained_slab","pyrite:dragon_brick_slab","pyrite:dragon_terracotta_brick_slab","pyrite:star_stained_slab","pyrite:star_brick_slab","pyrite:star_terracotta_brick_slab","pyrite:honey_stained_slab","pyrite:honey_brick_slab","pyrite:honey_terracotta_brick_slab","pyrite:nostalgia_stained_slab","pyrite:nostalgia_brick_slab","pyrite:nostalgia_terracotta_brick_slab","pyrite:rose_stained_slab","pyrite:rose_brick_slab","pyrite:rose_terracotta_brick_slab","pyrite:poisonous_stained_slab","pyrite:poisonous_brick_slab","pyrite:poisonous_terracotta_brick_slab","pyrite:red_mushroom_slab","pyrite:brown_mushroom_slab","pyrite:cobblestone_brick_slab","pyrite:mossy_cobblestone_brick_slab","pyrite:smooth_stone_brick_slab","pyrite:nostalgia_grass_slab","pyrite:podzol_slab","pyrite:grass_slab","pyrite:mycelium_slab","pyrite:path_slab","pyrite:white_concrete_slab","pyrite:orange_concrete_slab","pyrite:magenta_concrete_slab","pyrite:light_blue_concrete_slab","pyrite:yellow_concrete_slab","pyrite:lime_concrete_slab","pyrite:pink_concrete_slab","pyrite:gray_concrete_slab","pyrite:light_gray_concrete_slab","pyrite:cyan_concrete_slab","pyrite:purple_concrete_slab","pyrite:blue_concrete_slab","pyrite:brown_concrete_slab","pyrite:green_concrete_slab","pyrite:red_concrete_slab","pyrite:black_concrete_slab","pyrite:glow_concrete_slab","pyrite:dragon_concrete_slab","pyrite:star_concrete_slab","pyrite:honey_concrete_slab","pyrite:nostalgia_concrete_slab","pyrite:rose_concrete_slab","pyrite:poisonous_concrete_slab","pyrite:charred_nether_brick_slab","pyrite:blue_nether_brick_slab","pyrite:cut_iron_slab","pyrite:smooth_iron_slab","pyrite:cut_gold_slab","pyrite:smooth_gold_slab","pyrite:cut_emerald_slab","pyrite:smooth_emerald_slab","pyrite:cut_diamond_slab","pyrite:smooth_diamond_slab","pyrite:cut_netherite_slab","pyrite:smooth_netherite_slab","pyrite:cut_quartz_slab","pyrite:cut_amethyst_slab","pyrite:smooth_amethyst_slab","pyrite:cut_lapis_slab","pyrite:smooth_lapis_slab","pyrite:cut_redstone_slab","pyrite:smooth_redstone_slab","pyrite:smooth_copper_slab","pyrite:smooth_exposed_copper_slab","pyrite:smooth_weathered_copper_slab","pyrite:smooth_oxidized_copper_slab","pyrite:mossy_smooth_stone_brick_slab","pyrite:granite_brick_slab","pyrite:mossy_granite_brick_slab","pyrite:andesite_brick_slab","pyrite:mossy_andesite_brick_slab","pyrite:diorite_brick_slab","pyrite:mossy_diorite_brick_slab","pyrite:calcite_brick_slab","pyrite:mossy_calcite_brick_slab","pyrite:mossy_deepslate_brick_slab","pyrite:sandstone_brick_slab","pyrite:azalea_slab","pyrite:terracotta_brick_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/small_flowers.json b/common/src/main/resources/data/minecraft/tags/block/small_flowers.json deleted file mode 100644 index 591c73fd0..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/small_flowers.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:rose","pyrite:blue_rose","pyrite:orange_rose","pyrite:white_rose","pyrite:pink_rose","pyrite:paeonia","pyrite:pink_daisy","pyrite:buttercup"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/sword_efficient.json b/common/src/main/resources/data/minecraft/tags/block/sword_efficient.json deleted file mode 100644 index d6ba76e82..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/sword_efficient.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["#pyrite:carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wooden_buttons.json b/common/src/main/resources/data/minecraft/tags/block/wooden_buttons.json deleted file mode 100644 index 78c946eb3..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/wooden_buttons.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_button","required":false},{"id":"pyrite:orange_stained_button","required":false},{"id":"pyrite:magenta_stained_button","required":false},{"id":"pyrite:light_blue_stained_button","required":false},{"id":"pyrite:yellow_stained_button","required":false},{"id":"pyrite:lime_stained_button","required":false},{"id":"pyrite:pink_stained_button","required":false},{"id":"pyrite:gray_stained_button","required":false},{"id":"pyrite:light_gray_stained_button","required":false},{"id":"pyrite:cyan_stained_button","required":false},{"id":"pyrite:purple_stained_button","required":false},{"id":"pyrite:blue_stained_button","required":false},{"id":"pyrite:brown_stained_button","required":false},{"id":"pyrite:green_stained_button","required":false},{"id":"pyrite:red_stained_button","required":false},{"id":"pyrite:black_stained_button","required":false},{"id":"pyrite:glow_stained_button","required":false},{"id":"pyrite:dragon_stained_button","required":false},{"id":"pyrite:star_stained_button","required":false},{"id":"pyrite:honey_stained_button","required":false},{"id":"pyrite:nostalgia_stained_button","required":false},{"id":"pyrite:rose_stained_button","required":false},{"id":"pyrite:poisonous_stained_button","required":false},{"id":"pyrite:red_mushroom_button","required":false},{"id":"pyrite:brown_mushroom_button","required":false},{"id":"pyrite:azalea_button","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wooden_fences.json b/common/src/main/resources/data/minecraft/tags/block/wooden_fences.json deleted file mode 100644 index c7255201f..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/wooden_fences.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_fence","required":false},{"id":"pyrite:orange_stained_fence","required":false},{"id":"pyrite:magenta_stained_fence","required":false},{"id":"pyrite:light_blue_stained_fence","required":false},{"id":"pyrite:yellow_stained_fence","required":false},{"id":"pyrite:lime_stained_fence","required":false},{"id":"pyrite:pink_stained_fence","required":false},{"id":"pyrite:gray_stained_fence","required":false},{"id":"pyrite:light_gray_stained_fence","required":false},{"id":"pyrite:cyan_stained_fence","required":false},{"id":"pyrite:purple_stained_fence","required":false},{"id":"pyrite:blue_stained_fence","required":false},{"id":"pyrite:brown_stained_fence","required":false},{"id":"pyrite:green_stained_fence","required":false},{"id":"pyrite:red_stained_fence","required":false},{"id":"pyrite:black_stained_fence","required":false},{"id":"pyrite:glow_stained_fence","required":false},{"id":"pyrite:dragon_stained_fence","required":false},{"id":"pyrite:star_stained_fence","required":false},{"id":"pyrite:honey_stained_fence","required":false},{"id":"pyrite:nostalgia_stained_fence","required":false},{"id":"pyrite:rose_stained_fence","required":false},{"id":"pyrite:poisonous_stained_fence","required":false},{"id":"pyrite:red_mushroom_fence","required":false},{"id":"pyrite:brown_mushroom_fence","required":false},{"id":"pyrite:azalea_fence","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json b/common/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json deleted file mode 100644 index da21742f6..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_pressure_plate","required":false},{"id":"pyrite:orange_stained_pressure_plate","required":false},{"id":"pyrite:magenta_stained_pressure_plate","required":false},{"id":"pyrite:light_blue_stained_pressure_plate","required":false},{"id":"pyrite:yellow_stained_pressure_plate","required":false},{"id":"pyrite:lime_stained_pressure_plate","required":false},{"id":"pyrite:pink_stained_pressure_plate","required":false},{"id":"pyrite:gray_stained_pressure_plate","required":false},{"id":"pyrite:light_gray_stained_pressure_plate","required":false},{"id":"pyrite:cyan_stained_pressure_plate","required":false},{"id":"pyrite:purple_stained_pressure_plate","required":false},{"id":"pyrite:blue_stained_pressure_plate","required":false},{"id":"pyrite:brown_stained_pressure_plate","required":false},{"id":"pyrite:green_stained_pressure_plate","required":false},{"id":"pyrite:red_stained_pressure_plate","required":false},{"id":"pyrite:black_stained_pressure_plate","required":false},{"id":"pyrite:glow_stained_pressure_plate","required":false},{"id":"pyrite:dragon_stained_pressure_plate","required":false},{"id":"pyrite:star_stained_pressure_plate","required":false},{"id":"pyrite:honey_stained_pressure_plate","required":false},{"id":"pyrite:nostalgia_stained_pressure_plate","required":false},{"id":"pyrite:rose_stained_pressure_plate","required":false},{"id":"pyrite:poisonous_stained_pressure_plate","required":false},{"id":"pyrite:red_mushroom_pressure_plate","required":false},{"id":"pyrite:brown_mushroom_pressure_plate","required":false},{"id":"pyrite:azalea_pressure_plate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wooden_slabs.json b/common/src/main/resources/data/minecraft/tags/block/wooden_slabs.json deleted file mode 100644 index 56399af5c..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/wooden_slabs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_slab","pyrite:orange_stained_slab","pyrite:magenta_stained_slab","pyrite:light_blue_stained_slab","pyrite:yellow_stained_slab","pyrite:lime_stained_slab","pyrite:pink_stained_slab","pyrite:gray_stained_slab","pyrite:light_gray_stained_slab","pyrite:cyan_stained_slab","pyrite:purple_stained_slab","pyrite:blue_stained_slab","pyrite:brown_stained_slab","pyrite:green_stained_slab","pyrite:red_stained_slab","pyrite:black_stained_slab","pyrite:glow_stained_slab","pyrite:dragon_stained_slab","pyrite:star_stained_slab","pyrite:honey_stained_slab","pyrite:nostalgia_stained_slab","pyrite:rose_stained_slab","pyrite:poisonous_stained_slab","pyrite:red_mushroom_slab","pyrite:brown_mushroom_slab","pyrite:azalea_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wooden_stairs.json b/common/src/main/resources/data/minecraft/tags/block/wooden_stairs.json deleted file mode 100644 index 875f77b91..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/wooden_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_stairs","pyrite:orange_stained_stairs","pyrite:magenta_stained_stairs","pyrite:light_blue_stained_stairs","pyrite:yellow_stained_stairs","pyrite:lime_stained_stairs","pyrite:pink_stained_stairs","pyrite:gray_stained_stairs","pyrite:light_gray_stained_stairs","pyrite:cyan_stained_stairs","pyrite:purple_stained_stairs","pyrite:blue_stained_stairs","pyrite:brown_stained_stairs","pyrite:green_stained_stairs","pyrite:red_stained_stairs","pyrite:black_stained_stairs","pyrite:glow_stained_stairs","pyrite:dragon_stained_stairs","pyrite:star_stained_stairs","pyrite:honey_stained_stairs","pyrite:nostalgia_stained_stairs","pyrite:rose_stained_stairs","pyrite:poisonous_stained_stairs","pyrite:red_mushroom_stairs","pyrite:brown_mushroom_stairs","pyrite:azalea_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wool.json b/common/src/main/resources/data/minecraft/tags/block/wool.json deleted file mode 100644 index 4aa409fa4..000000000 --- a/common/src/main/resources/data/minecraft/tags/block/wool.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glow_wool","pyrite:dragon_wool","pyrite:star_wool","pyrite:honey_wool","pyrite:nostalgia_wool","pyrite:rose_wool","pyrite:poisonous_wool"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/bamboo_plantable_on.json b/common/src/main/resources/data/minecraft/tags/blocks/bamboo_plantable_on.json index 499eb8cda..639f70c36 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/bamboo_plantable_on.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/bamboo_plantable_on.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:nostalgia_gravel" - - ] -} - +{"replace":false,"values":[{"id":"pyrite:nostalgia_gravel","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/common/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json index e649504e7..9bacd49d2 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json @@ -1,12 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:diamond", - "#pyrite:netherite", - "#pyrite:gold", - "#pyrite:emerald", - "#pyrite:iron" - - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_iron","pyrite:smooth_iron","pyrite:iron_bricks","pyrite:iron_pillar","pyrite:chiseled_iron_block","pyrite:cut_gold","pyrite:smooth_gold","pyrite:gold_bricks","pyrite:gold_pillar","pyrite:chiseled_gold_block","pyrite:cut_emerald","pyrite:smooth_emerald","pyrite:emerald_bricks","pyrite:emerald_pillar","pyrite:chiseled_emerald_block","pyrite:cut_diamond","pyrite:smooth_diamond","pyrite:diamond_bricks","pyrite:diamond_pillar","pyrite:chiseled_diamond_block","pyrite:cut_netherite","pyrite:smooth_netherite","pyrite:netherite_bricks","pyrite:netherite_pillar","pyrite:chiseled_netherite_block","pyrite:nostalgia_iron_block","pyrite:nostalgia_gold_block","pyrite:nostalgia_emerald_block","pyrite:nostalgia_diamond_block","pyrite:nostalgia_netherite_block"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json b/common/src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json rename to common/src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/climbable.json b/common/src/main/resources/data/minecraft/tags/blocks/climbable.json index 7fb8e1654..b08e66a35 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/climbable.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/climbable.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:ladders" - ] -} - +{"replace":false,"values":["#pyrite:ladders"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/combination_step_sound_blocks.json b/common/src/main/resources/data/minecraft/tags/blocks/combination_step_sound_blocks.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/combination_step_sound_blocks.json rename to common/src/main/resources/data/minecraft/tags/blocks/combination_step_sound_blocks.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/dirt.json b/common/src/main/resources/data/minecraft/tags/blocks/dirt.json index fc81906ee..2d98574a0 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/dirt.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/dirt.json @@ -1,10 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:nostalgia_grass_block", - "pyrite:grass_turf", - "pyrite:mycelium_turf" - - ] -} - +{"replace":false,"values":[{"id":"pyrite:nostalgia_grass_turf","required":false},{"id":"pyrite:podzol_turf","required":false},{"id":"pyrite:grass_turf","required":false},{"id":"pyrite:mycelium_turf","required":false},{"id":"pyrite:path_turf","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/doors.json b/common/src/main/resources/data/minecraft/tags/blocks/doors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/doors.json rename to common/src/main/resources/data/minecraft/tags/blocks/doors.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json b/common/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json index 8f406b91e..66a2d4a07 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:obsidian" - ] -} - +{"replace":false,"values":["#pyrite:obsidian"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json b/common/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json index 499eb8cda..639f70c36 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:nostalgia_gravel" - - ] -} - +{"replace":false,"values":[{"id":"pyrite:nostalgia_gravel","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/fence_gates.json b/common/src/main/resources/data/minecraft/tags/blocks/fence_gates.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/fence_gates.json rename to common/src/main/resources/data/minecraft/tags/blocks/fence_gates.json diff --git a/common/src/main/resources/data/minecraft/tags/block/flower_pots.json b/common/src/main/resources/data/minecraft/tags/blocks/flower_pots.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/flower_pots.json rename to common/src/main/resources/data/minecraft/tags/blocks/flower_pots.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_end.json b/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_end.json index 521763db6..e90861d2c 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_end.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_end.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:nostalgia_netherrack" - - ] -} - +{"replace":false,"values":[{"id":"pyrite:nostalgia_netherrack","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_nether.json b/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_nether.json index 521763db6..e90861d2c 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_nether.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_nether.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:nostalgia_netherrack" - - ] -} - +{"replace":false,"values":[{"id":"pyrite:nostalgia_netherrack","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_overworld.json b/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_overworld.json index 521763db6..e90861d2c 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_overworld.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/infiniburn_overworld.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:nostalgia_netherrack" - - ] -} - +{"replace":false,"values":[{"id":"pyrite:nostalgia_netherrack","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/logs.json b/common/src/main/resources/data/minecraft/tags/blocks/logs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/logs.json rename to common/src/main/resources/data/minecraft/tags/blocks/logs.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json index 0fa973511..16346d727 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -1,18 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:locked_chest", - "#pyrite:doors", - "#pyrite:trapdoors", - "#pyrite:mushroom_stem", - "#pyrite:wooden_fences", - "#pyrite:wooden_slabs", - "#pyrite:wooden_stairs", - "#pyrite:wooden_fence_gates", - "#pyrite:planks", - "#pyrite:crafting_tables" - - - - ] -} \ No newline at end of file +{"replace":false,"values":[{"id":"pyrite:white_stained_fence_gate","required":false},{"id":"pyrite:orange_stained_fence_gate","required":false},{"id":"pyrite:magenta_stained_fence_gate","required":false},{"id":"pyrite:light_blue_stained_fence_gate","required":false},{"id":"pyrite:yellow_stained_fence_gate","required":false},{"id":"pyrite:lime_stained_fence_gate","required":false},{"id":"pyrite:pink_stained_fence_gate","required":false},{"id":"pyrite:gray_stained_fence_gate","required":false},{"id":"pyrite:light_gray_stained_fence_gate","required":false},{"id":"pyrite:cyan_stained_fence_gate","required":false},{"id":"pyrite:purple_stained_fence_gate","required":false},{"id":"pyrite:blue_stained_fence_gate","required":false},{"id":"pyrite:brown_stained_fence_gate","required":false},{"id":"pyrite:green_stained_fence_gate","required":false},{"id":"pyrite:red_stained_fence_gate","required":false},{"id":"pyrite:black_stained_fence_gate","required":false},{"id":"pyrite:glow_stained_fence_gate","required":false},{"id":"pyrite:dragon_stained_fence_gate","required":false},{"id":"pyrite:star_stained_fence_gate","required":false},{"id":"pyrite:honey_stained_fence_gate","required":false},{"id":"pyrite:nostalgia_stained_fence_gate","required":false},{"id":"pyrite:rose_stained_fence_gate","required":false},{"id":"pyrite:poisonous_stained_fence_gate","required":false},{"id":"pyrite:red_mushroom_fence_gate","required":false},{"id":"pyrite:brown_mushroom_fence_gate","required":false},"pyrite:locked_chest","#pyrite:mushroom_stem","#pyrite:crafting_tables",{"id":"pyrite:azalea_fence_gate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json index b3e52b837..d6ba76e82 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -1,6 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:carpet" - ] -} \ No newline at end of file +{"replace":false,"values":["#pyrite:carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 24e6ec7b3..a9c936308 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,35 +1 @@ - { - "replace": false, - "values": [ - "pyrite:framed_glass", - "pyrite:framed_glass_pane", - "#pyrite:bricks", - "#pyrite:brick_slabs", - "#pyrite:brick_stairs", - "#pyrite:brick_walls", - "#pyrite:brick_wall_gates", - "#pyrite:wall_gates", - "#pyrite:obsidian", - "#pyrite:amethyst", - "#pyrite:quartz", - "#pyrite:netherite", - "#pyrite:diamond", - "#pyrite:lapis", - "#pyrite:emerald", - "#pyrite:gold", - "#pyrite:iron", - "#pyrite:copper", - "#pyrite:redstone", - "#pyrite:metal_trapdoors", - "#pyrite:metal_pressure_plates", - "#pyrite:metal_buttons", - "pyrite:blue_nether_bricks", - "pyrite:charred_nether_bricks", - "pyrite:nostalgia_netherrack", - "pyrite:nostalgia_cobblestone", - "pyrite:nostalgia_mossy_cobblestone" - - - ] - } - +{"replace":false,"values":["pyrite:glow_concrete","pyrite:dragon_concrete","pyrite:star_concrete","pyrite:honey_concrete","pyrite:nostalgia_concrete","pyrite:rose_concrete","pyrite:poisonous_concrete",{"id":"pyrite:nether_brick_fence_gate","required":false},"pyrite:framed_glass","pyrite:framed_glass_pane","#pyrite:bricks","#pyrite:brick_slabs","#pyrite:brick_stairs","#pyrite:brick_walls","#pyrite:wall_gates","#pyrite:obsidian","#pyrite:amethyst","#pyrite:quartz","#pyrite:netherite","#pyrite:diamond","#pyrite:lapis","#pyrite:emerald","#pyrite:gold","#pyrite:iron","#pyrite:copper","#pyrite:redstone","#pyrite:metal_trapdoors","#pyrite:metal_buttons","pyrite:blue_nether_bricks","pyrite:charred_nether_bricks","pyrite:nostalgia_netherrack","pyrite:nostalgia_cobblestone","pyrite:nostalgia_mossy_cobblestone","#pyrite:stained_framed_glass","#pyrite:metal_bars","#pyrite:concrete_slabs","#pyrite:concrete_stairs","#pyrite:terracotta"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json index 84c9ac889..da278e0bf 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -1,9 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:nostalgia_gravel", - "#pyrite:turf_blocks" - - ] -} - +{"replace":false,"values":["pyrite:glow_concrete_powder","pyrite:dragon_concrete_powder","pyrite:star_concrete_powder","pyrite:honey_concrete_powder","pyrite:nostalgia_concrete_powder","pyrite:rose_concrete_powder","pyrite:poisonous_concrete_powder","pyrite:nostalgia_gravel","#pyrite:turf_blocks","#pyrite:turf_slabs","#pyrite:turf_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/common/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json index 0370d427b..ab13fdfbc 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json @@ -1,9 +1 @@ - { - "replace": false, - "values": [ - "#pyrite:obsidian", - "#pyrite:netherite" - - ] - } - +{"replace":false,"values":["#pyrite:obsidian","#pyrite:netherite"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/common/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json index 003afe526..4780c476e 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -1,10 +1 @@ - { - "replace": false, - "values": [ - "#pyrite:emerald", - "#pyrite:diamond", - "#pyrite:gold" - - ] - } - +{"replace":false,"values":["#pyrite:gold","#pyrite:diamond","#pyrite:emerald"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/common/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json index cc5f87409..c89fe63b1 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -1,9 +1 @@ - { - "replace": false, - "values": [ - "#pyrite:iron", - "#pyrite:lapis" - - ] - } - +{"replace":false,"values":["#pyrite:iron","#pyrite:lapis","#pyrite:copper","#pyrite:exposed_copper","#pyrite:weathered_copper","#pyrite:oxidized_copper"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/needs_wood_tool.json b/common/src/main/resources/data/minecraft/tags/blocks/needs_wood_tool.json index e2bbb35d8..dfb19050e 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/needs_wood_tool.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/needs_wood_tool.json @@ -1,8 +1 @@ - { - "replace": false, - "values": [ - "#pyrite:bricks", - "#pyrite:wall_gates" - ] - } - +{"replace":false,"values":["#pyrite:wall_gates","#pyrite:bricks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/planks.json b/common/src/main/resources/data/minecraft/tags/blocks/planks.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/planks.json rename to common/src/main/resources/data/minecraft/tags/blocks/planks.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/pressure_plates.json b/common/src/main/resources/data/minecraft/tags/blocks/pressure_plates.json index 5470cb056..818acdbed 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/pressure_plates.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/pressure_plates.json @@ -1,5 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:metal_pressure_plates" - ]} \ No newline at end of file +{"replace":false,"values":[{"id":"pyrite:emerald_pressure_plate","required":false},{"id":"pyrite:diamond_pressure_plate","required":false},{"id":"pyrite:netherite_pressure_plate","required":false},{"id":"pyrite:quartz_pressure_plate","required":false},{"id":"pyrite:amethyst_pressure_plate","required":false},{"id":"pyrite:lapis_pressure_plate","required":false},{"id":"pyrite:redstone_pressure_plate","required":false},{"id":"pyrite:copper_pressure_plate","required":false},{"id":"pyrite:exposed_copper_pressure_plate","required":false},{"id":"pyrite:weathered_copper_pressure_plate","required":false},{"id":"pyrite:oxidized_copper_pressure_plate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/signs.json b/common/src/main/resources/data/minecraft/tags/blocks/signs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/signs.json rename to common/src/main/resources/data/minecraft/tags/blocks/signs.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/slabs.json b/common/src/main/resources/data/minecraft/tags/blocks/slabs.json index 1d1a32ffc..e24cf0d08 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -1,9 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:brick_slabs", - "#pyrite:metal_slabs", - "#pyrite:turf_slabs" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:white_stained_slab","pyrite:white_brick_slab","pyrite:white_terracotta_brick_slab","pyrite:orange_stained_slab","pyrite:orange_brick_slab","pyrite:orange_terracotta_brick_slab","pyrite:magenta_stained_slab","pyrite:magenta_brick_slab","pyrite:magenta_terracotta_brick_slab","pyrite:light_blue_stained_slab","pyrite:light_blue_brick_slab","pyrite:light_blue_terracotta_brick_slab","pyrite:yellow_stained_slab","pyrite:yellow_brick_slab","pyrite:yellow_terracotta_brick_slab","pyrite:lime_stained_slab","pyrite:lime_brick_slab","pyrite:lime_terracotta_brick_slab","pyrite:pink_stained_slab","pyrite:pink_brick_slab","pyrite:pink_terracotta_brick_slab","pyrite:gray_stained_slab","pyrite:gray_brick_slab","pyrite:gray_terracotta_brick_slab","pyrite:light_gray_stained_slab","pyrite:light_gray_brick_slab","pyrite:light_gray_terracotta_brick_slab","pyrite:cyan_stained_slab","pyrite:cyan_brick_slab","pyrite:cyan_terracotta_brick_slab","pyrite:purple_stained_slab","pyrite:purple_brick_slab","pyrite:purple_terracotta_brick_slab","pyrite:blue_stained_slab","pyrite:blue_brick_slab","pyrite:blue_terracotta_brick_slab","pyrite:brown_stained_slab","pyrite:brown_brick_slab","pyrite:brown_terracotta_brick_slab","pyrite:green_stained_slab","pyrite:green_brick_slab","pyrite:green_terracotta_brick_slab","pyrite:red_stained_slab","pyrite:red_brick_slab","pyrite:red_terracotta_brick_slab","pyrite:black_stained_slab","pyrite:black_brick_slab","pyrite:black_terracotta_brick_slab","pyrite:glow_stained_slab","pyrite:glow_brick_slab","pyrite:glow_terracotta_brick_slab","pyrite:dragon_stained_slab","pyrite:dragon_brick_slab","pyrite:dragon_terracotta_brick_slab","pyrite:star_stained_slab","pyrite:star_brick_slab","pyrite:star_terracotta_brick_slab","pyrite:honey_stained_slab","pyrite:honey_brick_slab","pyrite:honey_terracotta_brick_slab","pyrite:nostalgia_stained_slab","pyrite:nostalgia_brick_slab","pyrite:nostalgia_terracotta_brick_slab","pyrite:rose_stained_slab","pyrite:rose_brick_slab","pyrite:rose_terracotta_brick_slab","pyrite:poisonous_stained_slab","pyrite:poisonous_brick_slab","pyrite:poisonous_terracotta_brick_slab","pyrite:red_mushroom_slab","pyrite:brown_mushroom_slab","pyrite:cobblestone_brick_slab","pyrite:mossy_cobblestone_brick_slab","pyrite:smooth_stone_brick_slab","pyrite:nostalgia_grass_slab","pyrite:podzol_slab","pyrite:grass_slab","pyrite:mycelium_slab","pyrite:path_slab","pyrite:white_concrete_slab","pyrite:orange_concrete_slab","pyrite:magenta_concrete_slab","pyrite:light_blue_concrete_slab","pyrite:yellow_concrete_slab","pyrite:lime_concrete_slab","pyrite:pink_concrete_slab","pyrite:gray_concrete_slab","pyrite:light_gray_concrete_slab","pyrite:cyan_concrete_slab","pyrite:purple_concrete_slab","pyrite:blue_concrete_slab","pyrite:brown_concrete_slab","pyrite:green_concrete_slab","pyrite:red_concrete_slab","pyrite:black_concrete_slab","pyrite:glow_concrete_slab","pyrite:dragon_concrete_slab","pyrite:star_concrete_slab","pyrite:honey_concrete_slab","pyrite:nostalgia_concrete_slab","pyrite:rose_concrete_slab","pyrite:poisonous_concrete_slab","pyrite:charred_nether_brick_slab","pyrite:blue_nether_brick_slab","pyrite:cut_iron_slab","pyrite:smooth_iron_slab","pyrite:cut_gold_slab","pyrite:smooth_gold_slab","pyrite:cut_emerald_slab","pyrite:smooth_emerald_slab","pyrite:cut_diamond_slab","pyrite:smooth_diamond_slab","pyrite:cut_netherite_slab","pyrite:smooth_netherite_slab","pyrite:cut_quartz_slab","pyrite:cut_amethyst_slab","pyrite:smooth_amethyst_slab","pyrite:cut_lapis_slab","pyrite:smooth_lapis_slab","pyrite:cut_redstone_slab","pyrite:smooth_redstone_slab","pyrite:smooth_copper_slab","pyrite:smooth_exposed_copper_slab","pyrite:smooth_weathered_copper_slab","pyrite:smooth_oxidized_copper_slab","pyrite:mossy_smooth_stone_brick_slab","pyrite:granite_brick_slab","pyrite:mossy_granite_brick_slab","pyrite:andesite_brick_slab","pyrite:mossy_andesite_brick_slab","pyrite:diorite_brick_slab","pyrite:mossy_diorite_brick_slab","pyrite:calcite_brick_slab","pyrite:mossy_calcite_brick_slab","pyrite:mossy_deepslate_brick_slab","pyrite:sandstone_brick_slab","pyrite:azalea_slab","pyrite:terracotta_brick_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/common/src/main/resources/data/minecraft/tags/blocks/small_flowers.json index bb9b2b569..591c73fd0 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/small_flowers.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/small_flowers.json @@ -1,14 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:rose", - "pyrite:blue_rose", - "pyrite:orange_rose", - "pyrite:white_rose", - "pyrite:pink_rose", - "pyrite:paeonia", - "pyrite:buttercup", - "pyrite:pink_daisy" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:rose","pyrite:blue_rose","pyrite:orange_rose","pyrite:white_rose","pyrite:pink_rose","pyrite:paeonia","pyrite:pink_daisy","pyrite:buttercup"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/stairs.json b/common/src/main/resources/data/minecraft/tags/blocks/stairs.json index 27503216d..b876344c3 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -1,9 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:brick_stairs", - "#pyrite:metal_stairs", - "#pyrite:turf_stairs" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:white_stained_stairs","pyrite:white_brick_stairs","pyrite:white_terracotta_brick_stairs","pyrite:orange_stained_stairs","pyrite:orange_brick_stairs","pyrite:orange_terracotta_brick_stairs","pyrite:magenta_stained_stairs","pyrite:magenta_brick_stairs","pyrite:magenta_terracotta_brick_stairs","pyrite:light_blue_stained_stairs","pyrite:light_blue_brick_stairs","pyrite:light_blue_terracotta_brick_stairs","pyrite:yellow_stained_stairs","pyrite:yellow_brick_stairs","pyrite:yellow_terracotta_brick_stairs","pyrite:lime_stained_stairs","pyrite:lime_brick_stairs","pyrite:lime_terracotta_brick_stairs","pyrite:pink_stained_stairs","pyrite:pink_brick_stairs","pyrite:pink_terracotta_brick_stairs","pyrite:gray_stained_stairs","pyrite:gray_brick_stairs","pyrite:gray_terracotta_brick_stairs","pyrite:light_gray_stained_stairs","pyrite:light_gray_brick_stairs","pyrite:light_gray_terracotta_brick_stairs","pyrite:cyan_stained_stairs","pyrite:cyan_brick_stairs","pyrite:cyan_terracotta_brick_stairs","pyrite:purple_stained_stairs","pyrite:purple_brick_stairs","pyrite:purple_terracotta_brick_stairs","pyrite:blue_stained_stairs","pyrite:blue_brick_stairs","pyrite:blue_terracotta_brick_stairs","pyrite:brown_stained_stairs","pyrite:brown_brick_stairs","pyrite:brown_terracotta_brick_stairs","pyrite:green_stained_stairs","pyrite:green_brick_stairs","pyrite:green_terracotta_brick_stairs","pyrite:red_stained_stairs","pyrite:red_brick_stairs","pyrite:red_terracotta_brick_stairs","pyrite:black_stained_stairs","pyrite:black_brick_stairs","pyrite:black_terracotta_brick_stairs","pyrite:glow_stained_stairs","pyrite:glow_brick_stairs","pyrite:glow_terracotta_brick_stairs","pyrite:dragon_stained_stairs","pyrite:dragon_brick_stairs","pyrite:dragon_terracotta_brick_stairs","pyrite:star_stained_stairs","pyrite:star_brick_stairs","pyrite:star_terracotta_brick_stairs","pyrite:honey_stained_stairs","pyrite:honey_brick_stairs","pyrite:honey_terracotta_brick_stairs","pyrite:nostalgia_stained_stairs","pyrite:nostalgia_brick_stairs","pyrite:nostalgia_terracotta_brick_stairs","pyrite:rose_stained_stairs","pyrite:rose_brick_stairs","pyrite:rose_terracotta_brick_stairs","pyrite:poisonous_stained_stairs","pyrite:poisonous_brick_stairs","pyrite:poisonous_terracotta_brick_stairs","pyrite:red_mushroom_stairs","pyrite:brown_mushroom_stairs","pyrite:cobblestone_brick_stairs","pyrite:mossy_cobblestone_brick_stairs","pyrite:smooth_stone_brick_stairs","pyrite:nostalgia_grass_stairs","pyrite:podzol_stairs","pyrite:grass_stairs","pyrite:mycelium_stairs","pyrite:path_stairs","pyrite:white_concrete_stairs","pyrite:orange_concrete_stairs","pyrite:magenta_concrete_stairs","pyrite:light_blue_concrete_stairs","pyrite:yellow_concrete_stairs","pyrite:lime_concrete_stairs","pyrite:pink_concrete_stairs","pyrite:gray_concrete_stairs","pyrite:light_gray_concrete_stairs","pyrite:cyan_concrete_stairs","pyrite:purple_concrete_stairs","pyrite:blue_concrete_stairs","pyrite:brown_concrete_stairs","pyrite:green_concrete_stairs","pyrite:red_concrete_stairs","pyrite:black_concrete_stairs","pyrite:glow_concrete_stairs","pyrite:dragon_concrete_stairs","pyrite:star_concrete_stairs","pyrite:honey_concrete_stairs","pyrite:nostalgia_concrete_stairs","pyrite:rose_concrete_stairs","pyrite:poisonous_concrete_stairs","pyrite:charred_nether_brick_stairs","pyrite:blue_nether_brick_stairs","pyrite:cut_iron_stairs","pyrite:smooth_iron_stairs","pyrite:cut_gold_stairs","pyrite:smooth_gold_stairs","pyrite:cut_emerald_stairs","pyrite:smooth_emerald_stairs","pyrite:cut_diamond_stairs","pyrite:smooth_diamond_stairs","pyrite:cut_netherite_stairs","pyrite:smooth_netherite_stairs","pyrite:cut_quartz_stairs","pyrite:cut_amethyst_stairs","pyrite:smooth_amethyst_stairs","pyrite:cut_lapis_stairs","pyrite:smooth_lapis_stairs","pyrite:cut_redstone_stairs","pyrite:smooth_redstone_stairs","pyrite:smooth_copper_stairs","pyrite:smooth_exposed_copper_stairs","pyrite:smooth_weathered_copper_stairs","pyrite:smooth_oxidized_copper_stairs","pyrite:mossy_smooth_stone_brick_stairs","pyrite:granite_brick_stairs","pyrite:mossy_granite_brick_stairs","pyrite:andesite_brick_stairs","pyrite:mossy_andesite_brick_stairs","pyrite:diorite_brick_stairs","pyrite:mossy_diorite_brick_stairs","pyrite:calcite_brick_stairs","pyrite:mossy_calcite_brick_stairs","pyrite:mossy_deepslate_brick_stairs","pyrite:sandstone_brick_stairs","pyrite:azalea_stairs","pyrite:smooth_stone_stairs","pyrite:terracotta_brick_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/sword_efficient.json b/common/src/main/resources/data/minecraft/tags/blocks/sword_efficient.json index 37a564826..d6ba76e82 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/sword_efficient.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/sword_efficient.json @@ -1,6 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:carpet" - ] - } \ No newline at end of file +{"replace":false,"values":["#pyrite:carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/terracotta.json b/common/src/main/resources/data/minecraft/tags/blocks/terracotta.json index 9bd4daec0..ecf6cfd69 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/terracotta.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/terracotta.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:terracotta" - ] -} - +{"replace":false,"values":["pyrite:glow_terracotta","pyrite:dragon_terracotta","pyrite:star_terracotta","pyrite:honey_terracotta","pyrite:nostalgia_terracotta","pyrite:rose_terracotta","pyrite:poisonous_terracotta"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json b/common/src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json rename to common/src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json diff --git a/common/src/main/resources/data/minecraft/tags/block/wall_signs.json b/common/src/main/resources/data/minecraft/tags/blocks/wall_signs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/wall_signs.json rename to common/src/main/resources/data/minecraft/tags/blocks/wall_signs.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/walls.json b/common/src/main/resources/data/minecraft/tags/blocks/walls.json index 1013f35e5..e4a8261e8 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -1,10 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:walls" - - - - ] -} - +{"replace":false,"values":["pyrite:white_brick_wall","pyrite:white_terracotta_brick_wall","pyrite:orange_brick_wall","pyrite:orange_terracotta_brick_wall","pyrite:magenta_brick_wall","pyrite:magenta_terracotta_brick_wall","pyrite:light_blue_brick_wall","pyrite:light_blue_terracotta_brick_wall","pyrite:yellow_brick_wall","pyrite:yellow_terracotta_brick_wall","pyrite:lime_brick_wall","pyrite:lime_terracotta_brick_wall","pyrite:pink_brick_wall","pyrite:pink_terracotta_brick_wall","pyrite:gray_brick_wall","pyrite:gray_terracotta_brick_wall","pyrite:light_gray_brick_wall","pyrite:light_gray_terracotta_brick_wall","pyrite:cyan_brick_wall","pyrite:cyan_terracotta_brick_wall","pyrite:purple_brick_wall","pyrite:purple_terracotta_brick_wall","pyrite:blue_brick_wall","pyrite:blue_terracotta_brick_wall","pyrite:brown_brick_wall","pyrite:brown_terracotta_brick_wall","pyrite:green_brick_wall","pyrite:green_terracotta_brick_wall","pyrite:red_brick_wall","pyrite:red_terracotta_brick_wall","pyrite:black_brick_wall","pyrite:black_terracotta_brick_wall","pyrite:glow_brick_wall","pyrite:glow_terracotta_brick_wall","pyrite:dragon_brick_wall","pyrite:dragon_terracotta_brick_wall","pyrite:star_brick_wall","pyrite:star_terracotta_brick_wall","pyrite:honey_brick_wall","pyrite:honey_terracotta_brick_wall","pyrite:nostalgia_brick_wall","pyrite:nostalgia_terracotta_brick_wall","pyrite:rose_brick_wall","pyrite:rose_terracotta_brick_wall","pyrite:poisonous_brick_wall","pyrite:poisonous_terracotta_brick_wall","pyrite:cobblestone_brick_wall","pyrite:mossy_cobblestone_brick_wall","pyrite:smooth_stone_brick_wall","pyrite:charred_nether_brick_wall","pyrite:blue_nether_brick_wall","pyrite:cut_iron_wall","pyrite:smooth_iron_wall","pyrite:cut_gold_wall","pyrite:smooth_gold_wall","pyrite:cut_emerald_wall","pyrite:smooth_emerald_wall","pyrite:cut_diamond_wall","pyrite:smooth_diamond_wall","pyrite:cut_netherite_wall","pyrite:smooth_netherite_wall","pyrite:cut_quartz_wall","pyrite:smooth_quartz_wall","pyrite:cut_amethyst_wall","pyrite:smooth_amethyst_wall","pyrite:cut_lapis_wall","pyrite:smooth_lapis_wall","pyrite:cut_redstone_wall","pyrite:smooth_redstone_wall","pyrite:cut_copper_wall","pyrite:smooth_copper_wall","pyrite:cut_exposed_copper_wall","pyrite:smooth_exposed_copper_wall","pyrite:cut_weathered_copper_wall","pyrite:smooth_weathered_copper_wall","pyrite:cut_oxidized_copper_wall","pyrite:smooth_oxidized_copper_wall","pyrite:mossy_smooth_stone_brick_wall","pyrite:granite_brick_wall","pyrite:mossy_granite_brick_wall","pyrite:andesite_brick_wall","pyrite:mossy_andesite_brick_wall","pyrite:diorite_brick_wall","pyrite:mossy_diorite_brick_wall","pyrite:calcite_brick_wall","pyrite:mossy_calcite_brick_wall","pyrite:mossy_deepslate_brick_wall","pyrite:sandstone_brick_wall","pyrite:terracotta_brick_wall"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json b/common/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json index 3ddc6fa1c..78c946eb3 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json @@ -1,6 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:wooden_buttons" - - ]} \ No newline at end of file +{"replace":false,"values":[{"id":"pyrite:white_stained_button","required":false},{"id":"pyrite:orange_stained_button","required":false},{"id":"pyrite:magenta_stained_button","required":false},{"id":"pyrite:light_blue_stained_button","required":false},{"id":"pyrite:yellow_stained_button","required":false},{"id":"pyrite:lime_stained_button","required":false},{"id":"pyrite:pink_stained_button","required":false},{"id":"pyrite:gray_stained_button","required":false},{"id":"pyrite:light_gray_stained_button","required":false},{"id":"pyrite:cyan_stained_button","required":false},{"id":"pyrite:purple_stained_button","required":false},{"id":"pyrite:blue_stained_button","required":false},{"id":"pyrite:brown_stained_button","required":false},{"id":"pyrite:green_stained_button","required":false},{"id":"pyrite:red_stained_button","required":false},{"id":"pyrite:black_stained_button","required":false},{"id":"pyrite:glow_stained_button","required":false},{"id":"pyrite:dragon_stained_button","required":false},{"id":"pyrite:star_stained_button","required":false},{"id":"pyrite:honey_stained_button","required":false},{"id":"pyrite:nostalgia_stained_button","required":false},{"id":"pyrite:rose_stained_button","required":false},{"id":"pyrite:poisonous_stained_button","required":false},{"id":"pyrite:red_mushroom_button","required":false},{"id":"pyrite:brown_mushroom_button","required":false},{"id":"pyrite:azalea_button","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json index f03b231d7..75ffb8b5d 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:doors" - ] -} - +{"replace":false,"values":["pyrite:white_stained_door","pyrite:orange_stained_door","pyrite:magenta_stained_door","pyrite:light_blue_stained_door","pyrite:yellow_stained_door","pyrite:lime_stained_door","pyrite:pink_stained_door","pyrite:gray_stained_door","pyrite:light_gray_stained_door","pyrite:cyan_stained_door","pyrite:purple_stained_door","pyrite:blue_stained_door","pyrite:brown_stained_door","pyrite:green_stained_door","pyrite:red_stained_door","pyrite:black_stained_door","pyrite:glow_stained_door","pyrite:dragon_stained_door","pyrite:star_stained_door","pyrite:honey_stained_door","pyrite:nostalgia_stained_door","pyrite:rose_stained_door","pyrite:poisonous_stained_door","pyrite:red_mushroom_door","pyrite:brown_mushroom_door","pyrite:azalea_door"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json b/common/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json index f04a1410e..c7255201f 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json @@ -1,11 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:wooden_fences" - - - - - ] -} - +{"replace":false,"values":[{"id":"pyrite:white_stained_fence","required":false},{"id":"pyrite:orange_stained_fence","required":false},{"id":"pyrite:magenta_stained_fence","required":false},{"id":"pyrite:light_blue_stained_fence","required":false},{"id":"pyrite:yellow_stained_fence","required":false},{"id":"pyrite:lime_stained_fence","required":false},{"id":"pyrite:pink_stained_fence","required":false},{"id":"pyrite:gray_stained_fence","required":false},{"id":"pyrite:light_gray_stained_fence","required":false},{"id":"pyrite:cyan_stained_fence","required":false},{"id":"pyrite:purple_stained_fence","required":false},{"id":"pyrite:blue_stained_fence","required":false},{"id":"pyrite:brown_stained_fence","required":false},{"id":"pyrite:green_stained_fence","required":false},{"id":"pyrite:red_stained_fence","required":false},{"id":"pyrite:black_stained_fence","required":false},{"id":"pyrite:glow_stained_fence","required":false},{"id":"pyrite:dragon_stained_fence","required":false},{"id":"pyrite:star_stained_fence","required":false},{"id":"pyrite:honey_stained_fence","required":false},{"id":"pyrite:nostalgia_stained_fence","required":false},{"id":"pyrite:rose_stained_fence","required":false},{"id":"pyrite:poisonous_stained_fence","required":false},{"id":"pyrite:red_mushroom_fence","required":false},{"id":"pyrite:brown_mushroom_fence","required":false},{"id":"pyrite:azalea_fence","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/common/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json index aa3b20400..da21742f6 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json @@ -1,6 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:wooden_pressure_plates" - - ]} \ No newline at end of file +{"replace":false,"values":[{"id":"pyrite:white_stained_pressure_plate","required":false},{"id":"pyrite:orange_stained_pressure_plate","required":false},{"id":"pyrite:magenta_stained_pressure_plate","required":false},{"id":"pyrite:light_blue_stained_pressure_plate","required":false},{"id":"pyrite:yellow_stained_pressure_plate","required":false},{"id":"pyrite:lime_stained_pressure_plate","required":false},{"id":"pyrite:pink_stained_pressure_plate","required":false},{"id":"pyrite:gray_stained_pressure_plate","required":false},{"id":"pyrite:light_gray_stained_pressure_plate","required":false},{"id":"pyrite:cyan_stained_pressure_plate","required":false},{"id":"pyrite:purple_stained_pressure_plate","required":false},{"id":"pyrite:blue_stained_pressure_plate","required":false},{"id":"pyrite:brown_stained_pressure_plate","required":false},{"id":"pyrite:green_stained_pressure_plate","required":false},{"id":"pyrite:red_stained_pressure_plate","required":false},{"id":"pyrite:black_stained_pressure_plate","required":false},{"id":"pyrite:glow_stained_pressure_plate","required":false},{"id":"pyrite:dragon_stained_pressure_plate","required":false},{"id":"pyrite:star_stained_pressure_plate","required":false},{"id":"pyrite:honey_stained_pressure_plate","required":false},{"id":"pyrite:nostalgia_stained_pressure_plate","required":false},{"id":"pyrite:rose_stained_pressure_plate","required":false},{"id":"pyrite:poisonous_stained_pressure_plate","required":false},{"id":"pyrite:red_mushroom_pressure_plate","required":false},{"id":"pyrite:brown_mushroom_pressure_plate","required":false},{"id":"pyrite:azalea_pressure_plate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json index 339c5aca3..56399af5c 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:wooden_slabs" - ] -} - +{"replace":false,"values":["pyrite:white_stained_slab","pyrite:orange_stained_slab","pyrite:magenta_stained_slab","pyrite:light_blue_stained_slab","pyrite:yellow_stained_slab","pyrite:lime_stained_slab","pyrite:pink_stained_slab","pyrite:gray_stained_slab","pyrite:light_gray_stained_slab","pyrite:cyan_stained_slab","pyrite:purple_stained_slab","pyrite:blue_stained_slab","pyrite:brown_stained_slab","pyrite:green_stained_slab","pyrite:red_stained_slab","pyrite:black_stained_slab","pyrite:glow_stained_slab","pyrite:dragon_stained_slab","pyrite:star_stained_slab","pyrite:honey_stained_slab","pyrite:nostalgia_stained_slab","pyrite:rose_stained_slab","pyrite:poisonous_stained_slab","pyrite:red_mushroom_slab","pyrite:brown_mushroom_slab","pyrite:azalea_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json index 1aa2bf9cb..875f77b91 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:wooden_stairs" - ] -} - +{"replace":false,"values":["pyrite:white_stained_stairs","pyrite:orange_stained_stairs","pyrite:magenta_stained_stairs","pyrite:light_blue_stained_stairs","pyrite:yellow_stained_stairs","pyrite:lime_stained_stairs","pyrite:pink_stained_stairs","pyrite:gray_stained_stairs","pyrite:light_gray_stained_stairs","pyrite:cyan_stained_stairs","pyrite:purple_stained_stairs","pyrite:blue_stained_stairs","pyrite:brown_stained_stairs","pyrite:green_stained_stairs","pyrite:red_stained_stairs","pyrite:black_stained_stairs","pyrite:glow_stained_stairs","pyrite:dragon_stained_stairs","pyrite:star_stained_stairs","pyrite:honey_stained_stairs","pyrite:nostalgia_stained_stairs","pyrite:rose_stained_stairs","pyrite:poisonous_stained_stairs","pyrite:red_mushroom_stairs","pyrite:brown_mushroom_stairs","pyrite:azalea_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json b/common/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json rename to common/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wool.json b/common/src/main/resources/data/minecraft/tags/blocks/wool.json index cacd46c80..4aa409fa4 100644 --- a/common/src/main/resources/data/minecraft/tags/blocks/wool.json +++ b/common/src/main/resources/data/minecraft/tags/blocks/wool.json @@ -1,5 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:wool" - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:glow_wool","pyrite:dragon_wool","pyrite:star_wool","pyrite:honey_wool","pyrite:nostalgia_wool","pyrite:rose_wool","pyrite:poisonous_wool"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wool_carpets.json b/common/src/main/resources/data/minecraft/tags/blocks/wool_carpets.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/wool_carpets.json rename to common/src/main/resources/data/minecraft/tags/blocks/wool_carpets.json diff --git a/common/src/main/resources/data/minecraft/tags/item/dirt.json b/common/src/main/resources/data/minecraft/tags/item/dirt.json deleted file mode 100644 index 2d98574a0..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/dirt.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:nostalgia_grass_turf","required":false},{"id":"pyrite:podzol_turf","required":false},{"id":"pyrite:grass_turf","required":false},{"id":"pyrite:mycelium_turf","required":false},{"id":"pyrite:path_turf","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/doors.json b/common/src/main/resources/data/minecraft/tags/item/doors.json deleted file mode 100644 index 1bd43dd52..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/doors.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_door","pyrite:orange_stained_door","pyrite:magenta_stained_door","pyrite:light_blue_stained_door","pyrite:yellow_stained_door","pyrite:lime_stained_door","pyrite:pink_stained_door","pyrite:gray_stained_door","pyrite:light_gray_stained_door","pyrite:cyan_stained_door","pyrite:purple_stained_door","pyrite:blue_stained_door","pyrite:brown_stained_door","pyrite:green_stained_door","pyrite:red_stained_door","pyrite:black_stained_door","pyrite:glow_stained_door","pyrite:dragon_stained_door","pyrite:star_stained_door","pyrite:honey_stained_door","pyrite:nostalgia_stained_door","pyrite:rose_stained_door","pyrite:poisonous_stained_door","pyrite:red_mushroom_door","pyrite:brown_mushroom_door","pyrite:gold_door","pyrite:emerald_door","pyrite:diamond_door","pyrite:netherite_door","pyrite:quartz_door","pyrite:amethyst_door","pyrite:lapis_door","pyrite:redstone_door","pyrite:copper_door","pyrite:exposed_copper_door","pyrite:weathered_copper_door","pyrite:oxidized_copper_door","pyrite:azalea_door"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/fence_gates.json b/common/src/main/resources/data/minecraft/tags/item/fence_gates.json deleted file mode 100644 index 1f8775f7a..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/fence_gates.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_fence_gate","required":false},{"id":"pyrite:orange_stained_fence_gate","required":false},{"id":"pyrite:magenta_stained_fence_gate","required":false},{"id":"pyrite:light_blue_stained_fence_gate","required":false},{"id":"pyrite:yellow_stained_fence_gate","required":false},{"id":"pyrite:lime_stained_fence_gate","required":false},{"id":"pyrite:pink_stained_fence_gate","required":false},{"id":"pyrite:gray_stained_fence_gate","required":false},{"id":"pyrite:light_gray_stained_fence_gate","required":false},{"id":"pyrite:cyan_stained_fence_gate","required":false},{"id":"pyrite:purple_stained_fence_gate","required":false},{"id":"pyrite:blue_stained_fence_gate","required":false},{"id":"pyrite:brown_stained_fence_gate","required":false},{"id":"pyrite:green_stained_fence_gate","required":false},{"id":"pyrite:red_stained_fence_gate","required":false},{"id":"pyrite:black_stained_fence_gate","required":false},{"id":"pyrite:glow_stained_fence_gate","required":false},{"id":"pyrite:dragon_stained_fence_gate","required":false},{"id":"pyrite:star_stained_fence_gate","required":false},{"id":"pyrite:honey_stained_fence_gate","required":false},{"id":"pyrite:nostalgia_stained_fence_gate","required":false},{"id":"pyrite:rose_stained_fence_gate","required":false},{"id":"pyrite:poisonous_stained_fence_gate","required":false},{"id":"pyrite:red_mushroom_fence_gate","required":false},{"id":"pyrite:brown_mushroom_fence_gate","required":false},{"id":"pyrite:nether_brick_fence_gate","required":false},{"id":"pyrite:azalea_fence_gate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/logs.json b/common/src/main/resources/data/minecraft/tags/item/logs.json deleted file mode 100644 index 47d1b02c9..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/logs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:red_mushroom_stem","pyrite:brown_mushroom_stem","pyrite:azalea_log","pyrite:stripped_azalea_log"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/planks.json b/common/src/main/resources/data/minecraft/tags/item/planks.json deleted file mode 100644 index 8c3fbf57b..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/planks.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_planks","pyrite:orange_stained_planks","pyrite:magenta_stained_planks","pyrite:light_blue_stained_planks","pyrite:yellow_stained_planks","pyrite:lime_stained_planks","pyrite:pink_stained_planks","pyrite:gray_stained_planks","pyrite:light_gray_stained_planks","pyrite:cyan_stained_planks","pyrite:purple_stained_planks","pyrite:blue_stained_planks","pyrite:brown_stained_planks","pyrite:green_stained_planks","pyrite:red_stained_planks","pyrite:black_stained_planks","pyrite:glow_stained_planks","pyrite:dragon_stained_planks","pyrite:star_stained_planks","pyrite:honey_stained_planks","pyrite:nostalgia_stained_planks","pyrite:rose_stained_planks","pyrite:poisonous_stained_planks","pyrite:red_mushroom_planks","pyrite:brown_mushroom_planks","pyrite:azalea_planks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/small_flowers.json b/common/src/main/resources/data/minecraft/tags/item/small_flowers.json deleted file mode 100644 index 591c73fd0..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/small_flowers.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:rose","pyrite:blue_rose","pyrite:orange_rose","pyrite:white_rose","pyrite:pink_rose","pyrite:paeonia","pyrite:pink_daisy","pyrite:buttercup"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/stairs.json b/common/src/main/resources/data/minecraft/tags/item/stairs.json deleted file mode 100644 index b876344c3..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/stairs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_stairs","pyrite:white_brick_stairs","pyrite:white_terracotta_brick_stairs","pyrite:orange_stained_stairs","pyrite:orange_brick_stairs","pyrite:orange_terracotta_brick_stairs","pyrite:magenta_stained_stairs","pyrite:magenta_brick_stairs","pyrite:magenta_terracotta_brick_stairs","pyrite:light_blue_stained_stairs","pyrite:light_blue_brick_stairs","pyrite:light_blue_terracotta_brick_stairs","pyrite:yellow_stained_stairs","pyrite:yellow_brick_stairs","pyrite:yellow_terracotta_brick_stairs","pyrite:lime_stained_stairs","pyrite:lime_brick_stairs","pyrite:lime_terracotta_brick_stairs","pyrite:pink_stained_stairs","pyrite:pink_brick_stairs","pyrite:pink_terracotta_brick_stairs","pyrite:gray_stained_stairs","pyrite:gray_brick_stairs","pyrite:gray_terracotta_brick_stairs","pyrite:light_gray_stained_stairs","pyrite:light_gray_brick_stairs","pyrite:light_gray_terracotta_brick_stairs","pyrite:cyan_stained_stairs","pyrite:cyan_brick_stairs","pyrite:cyan_terracotta_brick_stairs","pyrite:purple_stained_stairs","pyrite:purple_brick_stairs","pyrite:purple_terracotta_brick_stairs","pyrite:blue_stained_stairs","pyrite:blue_brick_stairs","pyrite:blue_terracotta_brick_stairs","pyrite:brown_stained_stairs","pyrite:brown_brick_stairs","pyrite:brown_terracotta_brick_stairs","pyrite:green_stained_stairs","pyrite:green_brick_stairs","pyrite:green_terracotta_brick_stairs","pyrite:red_stained_stairs","pyrite:red_brick_stairs","pyrite:red_terracotta_brick_stairs","pyrite:black_stained_stairs","pyrite:black_brick_stairs","pyrite:black_terracotta_brick_stairs","pyrite:glow_stained_stairs","pyrite:glow_brick_stairs","pyrite:glow_terracotta_brick_stairs","pyrite:dragon_stained_stairs","pyrite:dragon_brick_stairs","pyrite:dragon_terracotta_brick_stairs","pyrite:star_stained_stairs","pyrite:star_brick_stairs","pyrite:star_terracotta_brick_stairs","pyrite:honey_stained_stairs","pyrite:honey_brick_stairs","pyrite:honey_terracotta_brick_stairs","pyrite:nostalgia_stained_stairs","pyrite:nostalgia_brick_stairs","pyrite:nostalgia_terracotta_brick_stairs","pyrite:rose_stained_stairs","pyrite:rose_brick_stairs","pyrite:rose_terracotta_brick_stairs","pyrite:poisonous_stained_stairs","pyrite:poisonous_brick_stairs","pyrite:poisonous_terracotta_brick_stairs","pyrite:red_mushroom_stairs","pyrite:brown_mushroom_stairs","pyrite:cobblestone_brick_stairs","pyrite:mossy_cobblestone_brick_stairs","pyrite:smooth_stone_brick_stairs","pyrite:nostalgia_grass_stairs","pyrite:podzol_stairs","pyrite:grass_stairs","pyrite:mycelium_stairs","pyrite:path_stairs","pyrite:white_concrete_stairs","pyrite:orange_concrete_stairs","pyrite:magenta_concrete_stairs","pyrite:light_blue_concrete_stairs","pyrite:yellow_concrete_stairs","pyrite:lime_concrete_stairs","pyrite:pink_concrete_stairs","pyrite:gray_concrete_stairs","pyrite:light_gray_concrete_stairs","pyrite:cyan_concrete_stairs","pyrite:purple_concrete_stairs","pyrite:blue_concrete_stairs","pyrite:brown_concrete_stairs","pyrite:green_concrete_stairs","pyrite:red_concrete_stairs","pyrite:black_concrete_stairs","pyrite:glow_concrete_stairs","pyrite:dragon_concrete_stairs","pyrite:star_concrete_stairs","pyrite:honey_concrete_stairs","pyrite:nostalgia_concrete_stairs","pyrite:rose_concrete_stairs","pyrite:poisonous_concrete_stairs","pyrite:charred_nether_brick_stairs","pyrite:blue_nether_brick_stairs","pyrite:cut_iron_stairs","pyrite:smooth_iron_stairs","pyrite:cut_gold_stairs","pyrite:smooth_gold_stairs","pyrite:cut_emerald_stairs","pyrite:smooth_emerald_stairs","pyrite:cut_diamond_stairs","pyrite:smooth_diamond_stairs","pyrite:cut_netherite_stairs","pyrite:smooth_netherite_stairs","pyrite:cut_quartz_stairs","pyrite:cut_amethyst_stairs","pyrite:smooth_amethyst_stairs","pyrite:cut_lapis_stairs","pyrite:smooth_lapis_stairs","pyrite:cut_redstone_stairs","pyrite:smooth_redstone_stairs","pyrite:smooth_copper_stairs","pyrite:smooth_exposed_copper_stairs","pyrite:smooth_weathered_copper_stairs","pyrite:smooth_oxidized_copper_stairs","pyrite:mossy_smooth_stone_brick_stairs","pyrite:granite_brick_stairs","pyrite:mossy_granite_brick_stairs","pyrite:andesite_brick_stairs","pyrite:mossy_andesite_brick_stairs","pyrite:diorite_brick_stairs","pyrite:mossy_diorite_brick_stairs","pyrite:calcite_brick_stairs","pyrite:mossy_calcite_brick_stairs","pyrite:mossy_deepslate_brick_stairs","pyrite:sandstone_brick_stairs","pyrite:azalea_stairs","pyrite:smooth_stone_stairs","pyrite:terracotta_brick_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/walls.json b/common/src/main/resources/data/minecraft/tags/item/walls.json deleted file mode 100644 index e4a8261e8..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/walls.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_brick_wall","pyrite:white_terracotta_brick_wall","pyrite:orange_brick_wall","pyrite:orange_terracotta_brick_wall","pyrite:magenta_brick_wall","pyrite:magenta_terracotta_brick_wall","pyrite:light_blue_brick_wall","pyrite:light_blue_terracotta_brick_wall","pyrite:yellow_brick_wall","pyrite:yellow_terracotta_brick_wall","pyrite:lime_brick_wall","pyrite:lime_terracotta_brick_wall","pyrite:pink_brick_wall","pyrite:pink_terracotta_brick_wall","pyrite:gray_brick_wall","pyrite:gray_terracotta_brick_wall","pyrite:light_gray_brick_wall","pyrite:light_gray_terracotta_brick_wall","pyrite:cyan_brick_wall","pyrite:cyan_terracotta_brick_wall","pyrite:purple_brick_wall","pyrite:purple_terracotta_brick_wall","pyrite:blue_brick_wall","pyrite:blue_terracotta_brick_wall","pyrite:brown_brick_wall","pyrite:brown_terracotta_brick_wall","pyrite:green_brick_wall","pyrite:green_terracotta_brick_wall","pyrite:red_brick_wall","pyrite:red_terracotta_brick_wall","pyrite:black_brick_wall","pyrite:black_terracotta_brick_wall","pyrite:glow_brick_wall","pyrite:glow_terracotta_brick_wall","pyrite:dragon_brick_wall","pyrite:dragon_terracotta_brick_wall","pyrite:star_brick_wall","pyrite:star_terracotta_brick_wall","pyrite:honey_brick_wall","pyrite:honey_terracotta_brick_wall","pyrite:nostalgia_brick_wall","pyrite:nostalgia_terracotta_brick_wall","pyrite:rose_brick_wall","pyrite:rose_terracotta_brick_wall","pyrite:poisonous_brick_wall","pyrite:poisonous_terracotta_brick_wall","pyrite:cobblestone_brick_wall","pyrite:mossy_cobblestone_brick_wall","pyrite:smooth_stone_brick_wall","pyrite:charred_nether_brick_wall","pyrite:blue_nether_brick_wall","pyrite:cut_iron_wall","pyrite:smooth_iron_wall","pyrite:cut_gold_wall","pyrite:smooth_gold_wall","pyrite:cut_emerald_wall","pyrite:smooth_emerald_wall","pyrite:cut_diamond_wall","pyrite:smooth_diamond_wall","pyrite:cut_netherite_wall","pyrite:smooth_netherite_wall","pyrite:cut_quartz_wall","pyrite:smooth_quartz_wall","pyrite:cut_amethyst_wall","pyrite:smooth_amethyst_wall","pyrite:cut_lapis_wall","pyrite:smooth_lapis_wall","pyrite:cut_redstone_wall","pyrite:smooth_redstone_wall","pyrite:cut_copper_wall","pyrite:smooth_copper_wall","pyrite:cut_exposed_copper_wall","pyrite:smooth_exposed_copper_wall","pyrite:cut_weathered_copper_wall","pyrite:smooth_weathered_copper_wall","pyrite:cut_oxidized_copper_wall","pyrite:smooth_oxidized_copper_wall","pyrite:mossy_smooth_stone_brick_wall","pyrite:granite_brick_wall","pyrite:mossy_granite_brick_wall","pyrite:andesite_brick_wall","pyrite:mossy_andesite_brick_wall","pyrite:diorite_brick_wall","pyrite:mossy_diorite_brick_wall","pyrite:calcite_brick_wall","pyrite:mossy_calcite_brick_wall","pyrite:mossy_deepslate_brick_wall","pyrite:sandstone_brick_wall","pyrite:terracotta_brick_wall"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wooden_buttons.json b/common/src/main/resources/data/minecraft/tags/item/wooden_buttons.json deleted file mode 100644 index 78c946eb3..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wooden_buttons.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_button","required":false},{"id":"pyrite:orange_stained_button","required":false},{"id":"pyrite:magenta_stained_button","required":false},{"id":"pyrite:light_blue_stained_button","required":false},{"id":"pyrite:yellow_stained_button","required":false},{"id":"pyrite:lime_stained_button","required":false},{"id":"pyrite:pink_stained_button","required":false},{"id":"pyrite:gray_stained_button","required":false},{"id":"pyrite:light_gray_stained_button","required":false},{"id":"pyrite:cyan_stained_button","required":false},{"id":"pyrite:purple_stained_button","required":false},{"id":"pyrite:blue_stained_button","required":false},{"id":"pyrite:brown_stained_button","required":false},{"id":"pyrite:green_stained_button","required":false},{"id":"pyrite:red_stained_button","required":false},{"id":"pyrite:black_stained_button","required":false},{"id":"pyrite:glow_stained_button","required":false},{"id":"pyrite:dragon_stained_button","required":false},{"id":"pyrite:star_stained_button","required":false},{"id":"pyrite:honey_stained_button","required":false},{"id":"pyrite:nostalgia_stained_button","required":false},{"id":"pyrite:rose_stained_button","required":false},{"id":"pyrite:poisonous_stained_button","required":false},{"id":"pyrite:red_mushroom_button","required":false},{"id":"pyrite:brown_mushroom_button","required":false},{"id":"pyrite:azalea_button","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wooden_doors.json b/common/src/main/resources/data/minecraft/tags/item/wooden_doors.json deleted file mode 100644 index 75ffb8b5d..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wooden_doors.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_door","pyrite:orange_stained_door","pyrite:magenta_stained_door","pyrite:light_blue_stained_door","pyrite:yellow_stained_door","pyrite:lime_stained_door","pyrite:pink_stained_door","pyrite:gray_stained_door","pyrite:light_gray_stained_door","pyrite:cyan_stained_door","pyrite:purple_stained_door","pyrite:blue_stained_door","pyrite:brown_stained_door","pyrite:green_stained_door","pyrite:red_stained_door","pyrite:black_stained_door","pyrite:glow_stained_door","pyrite:dragon_stained_door","pyrite:star_stained_door","pyrite:honey_stained_door","pyrite:nostalgia_stained_door","pyrite:rose_stained_door","pyrite:poisonous_stained_door","pyrite:red_mushroom_door","pyrite:brown_mushroom_door","pyrite:azalea_door"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wooden_fences.json b/common/src/main/resources/data/minecraft/tags/item/wooden_fences.json deleted file mode 100644 index c7255201f..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wooden_fences.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_fence","required":false},{"id":"pyrite:orange_stained_fence","required":false},{"id":"pyrite:magenta_stained_fence","required":false},{"id":"pyrite:light_blue_stained_fence","required":false},{"id":"pyrite:yellow_stained_fence","required":false},{"id":"pyrite:lime_stained_fence","required":false},{"id":"pyrite:pink_stained_fence","required":false},{"id":"pyrite:gray_stained_fence","required":false},{"id":"pyrite:light_gray_stained_fence","required":false},{"id":"pyrite:cyan_stained_fence","required":false},{"id":"pyrite:purple_stained_fence","required":false},{"id":"pyrite:blue_stained_fence","required":false},{"id":"pyrite:brown_stained_fence","required":false},{"id":"pyrite:green_stained_fence","required":false},{"id":"pyrite:red_stained_fence","required":false},{"id":"pyrite:black_stained_fence","required":false},{"id":"pyrite:glow_stained_fence","required":false},{"id":"pyrite:dragon_stained_fence","required":false},{"id":"pyrite:star_stained_fence","required":false},{"id":"pyrite:honey_stained_fence","required":false},{"id":"pyrite:nostalgia_stained_fence","required":false},{"id":"pyrite:rose_stained_fence","required":false},{"id":"pyrite:poisonous_stained_fence","required":false},{"id":"pyrite:red_mushroom_fence","required":false},{"id":"pyrite:brown_mushroom_fence","required":false},{"id":"pyrite:azalea_fence","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json b/common/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json deleted file mode 100644 index da21742f6..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_pressure_plate","required":false},{"id":"pyrite:orange_stained_pressure_plate","required":false},{"id":"pyrite:magenta_stained_pressure_plate","required":false},{"id":"pyrite:light_blue_stained_pressure_plate","required":false},{"id":"pyrite:yellow_stained_pressure_plate","required":false},{"id":"pyrite:lime_stained_pressure_plate","required":false},{"id":"pyrite:pink_stained_pressure_plate","required":false},{"id":"pyrite:gray_stained_pressure_plate","required":false},{"id":"pyrite:light_gray_stained_pressure_plate","required":false},{"id":"pyrite:cyan_stained_pressure_plate","required":false},{"id":"pyrite:purple_stained_pressure_plate","required":false},{"id":"pyrite:blue_stained_pressure_plate","required":false},{"id":"pyrite:brown_stained_pressure_plate","required":false},{"id":"pyrite:green_stained_pressure_plate","required":false},{"id":"pyrite:red_stained_pressure_plate","required":false},{"id":"pyrite:black_stained_pressure_plate","required":false},{"id":"pyrite:glow_stained_pressure_plate","required":false},{"id":"pyrite:dragon_stained_pressure_plate","required":false},{"id":"pyrite:star_stained_pressure_plate","required":false},{"id":"pyrite:honey_stained_pressure_plate","required":false},{"id":"pyrite:nostalgia_stained_pressure_plate","required":false},{"id":"pyrite:rose_stained_pressure_plate","required":false},{"id":"pyrite:poisonous_stained_pressure_plate","required":false},{"id":"pyrite:red_mushroom_pressure_plate","required":false},{"id":"pyrite:brown_mushroom_pressure_plate","required":false},{"id":"pyrite:azalea_pressure_plate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wooden_slabs.json b/common/src/main/resources/data/minecraft/tags/item/wooden_slabs.json deleted file mode 100644 index 56399af5c..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wooden_slabs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_slab","pyrite:orange_stained_slab","pyrite:magenta_stained_slab","pyrite:light_blue_stained_slab","pyrite:yellow_stained_slab","pyrite:lime_stained_slab","pyrite:pink_stained_slab","pyrite:gray_stained_slab","pyrite:light_gray_stained_slab","pyrite:cyan_stained_slab","pyrite:purple_stained_slab","pyrite:blue_stained_slab","pyrite:brown_stained_slab","pyrite:green_stained_slab","pyrite:red_stained_slab","pyrite:black_stained_slab","pyrite:glow_stained_slab","pyrite:dragon_stained_slab","pyrite:star_stained_slab","pyrite:honey_stained_slab","pyrite:nostalgia_stained_slab","pyrite:rose_stained_slab","pyrite:poisonous_stained_slab","pyrite:red_mushroom_slab","pyrite:brown_mushroom_slab","pyrite:azalea_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wooden_stairs.json b/common/src/main/resources/data/minecraft/tags/item/wooden_stairs.json deleted file mode 100644 index 875f77b91..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wooden_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_stairs","pyrite:orange_stained_stairs","pyrite:magenta_stained_stairs","pyrite:light_blue_stained_stairs","pyrite:yellow_stained_stairs","pyrite:lime_stained_stairs","pyrite:pink_stained_stairs","pyrite:gray_stained_stairs","pyrite:light_gray_stained_stairs","pyrite:cyan_stained_stairs","pyrite:purple_stained_stairs","pyrite:blue_stained_stairs","pyrite:brown_stained_stairs","pyrite:green_stained_stairs","pyrite:red_stained_stairs","pyrite:black_stained_stairs","pyrite:glow_stained_stairs","pyrite:dragon_stained_stairs","pyrite:star_stained_stairs","pyrite:honey_stained_stairs","pyrite:nostalgia_stained_stairs","pyrite:rose_stained_stairs","pyrite:poisonous_stained_stairs","pyrite:red_mushroom_stairs","pyrite:brown_mushroom_stairs","pyrite:azalea_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wool.json b/common/src/main/resources/data/minecraft/tags/item/wool.json deleted file mode 100644 index 4aa409fa4..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wool.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glow_wool","pyrite:dragon_wool","pyrite:star_wool","pyrite:honey_wool","pyrite:nostalgia_wool","pyrite:rose_wool","pyrite:poisonous_wool"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wool_carpets.json b/common/src/main/resources/data/minecraft/tags/item/wool_carpets.json deleted file mode 100644 index e2538984b..000000000 --- a/common/src/main/resources/data/minecraft/tags/item/wool_carpets.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glow_carpet","pyrite:dragon_carpet","pyrite:star_carpet","pyrite:honey_carpet","pyrite:nostalgia_carpet","pyrite:rose_carpet","pyrite:poisonous_carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/dirt.json b/common/src/main/resources/data/minecraft/tags/items/dirt.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/dirt.json rename to common/src/main/resources/data/minecraft/tags/items/dirt.json diff --git a/common/src/main/resources/data/minecraft/tags/items/doors.json b/common/src/main/resources/data/minecraft/tags/items/doors.json index cfee92f68..1bd43dd52 100644 --- a/common/src/main/resources/data/minecraft/tags/items/doors.json +++ b/common/src/main/resources/data/minecraft/tags/items/doors.json @@ -1,35 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_door", - "pyrite:orange_stained_door", - "pyrite:magenta_stained_door", - "pyrite:light_blue_stained_door", - "pyrite:yellow_stained_door", - "pyrite:lime_stained_door", - "pyrite:pink_stained_door", - "pyrite:gray_stained_door", - "pyrite:light_gray_stained_door", - "pyrite:cyan_stained_door", - "pyrite:purple_stained_door", - "pyrite:blue_stained_door", - "pyrite:brown_stained_door", - "pyrite:green_stained_door", - "pyrite:red_stained_door", - "pyrite:black_stained_door", - "pyrite:glow_stained_door", - "pyrite:dragon_stained_door", - "pyrite:star_stained_door", - "pyrite:honey_stained_door", - "pyrite:nostalgia_stained_door", - "pyrite:rose_stained_door", - "pyrite:poisonous_stained_door", - "pyrite:red_mushroom_door", - "pyrite:brown_mushroom_door", - { - "id": "#pyrite:metal_doors", - "required": false - } - ] -} - +{"replace":false,"values":["pyrite:white_stained_door","pyrite:orange_stained_door","pyrite:magenta_stained_door","pyrite:light_blue_stained_door","pyrite:yellow_stained_door","pyrite:lime_stained_door","pyrite:pink_stained_door","pyrite:gray_stained_door","pyrite:light_gray_stained_door","pyrite:cyan_stained_door","pyrite:purple_stained_door","pyrite:blue_stained_door","pyrite:brown_stained_door","pyrite:green_stained_door","pyrite:red_stained_door","pyrite:black_stained_door","pyrite:glow_stained_door","pyrite:dragon_stained_door","pyrite:star_stained_door","pyrite:honey_stained_door","pyrite:nostalgia_stained_door","pyrite:rose_stained_door","pyrite:poisonous_stained_door","pyrite:red_mushroom_door","pyrite:brown_mushroom_door","pyrite:gold_door","pyrite:emerald_door","pyrite:diamond_door","pyrite:netherite_door","pyrite:quartz_door","pyrite:amethyst_door","pyrite:lapis_door","pyrite:redstone_door","pyrite:copper_door","pyrite:exposed_copper_door","pyrite:weathered_copper_door","pyrite:oxidized_copper_door","pyrite:azalea_door"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/fence_gates.json b/common/src/main/resources/data/minecraft/tags/items/fence_gates.json index cf67ec7a6..1f8775f7a 100644 --- a/common/src/main/resources/data/minecraft/tags/items/fence_gates.json +++ b/common/src/main/resources/data/minecraft/tags/items/fence_gates.json @@ -1,31 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_fence_gate", - "pyrite:orange_stained_fence_gate", - "pyrite:magenta_stained_fence_gate", - "pyrite:light_blue_stained_fence_gate", - "pyrite:yellow_stained_fence_gate", - "pyrite:lime_stained_fence_gate", - "pyrite:pink_stained_fence_gate", - "pyrite:gray_stained_fence_gate", - "pyrite:light_gray_stained_fence_gate", - "pyrite:cyan_stained_fence_gate", - "pyrite:purple_stained_fence_gate", - "pyrite:blue_stained_fence_gate", - "pyrite:brown_stained_fence_gate", - "pyrite:green_stained_fence_gate", - "pyrite:red_stained_fence_gate", - "pyrite:black_stained_fence_gate", - "pyrite:glow_stained_fence_gate", - "pyrite:dragon_stained_fence_gate", - "pyrite:star_stained_fence_gate", - "pyrite:honey_stained_fence_gate", - "pyrite:nostalgia_stained_fence_gate", - "pyrite:rose_stained_fence_gate", - "pyrite:poisonous_stained_fence_gate", - "pyrite:red_mushroom_fence_gate", - "pyrite:brown_mushroom_fence_gate" - ] -} - +{"replace":false,"values":[{"id":"pyrite:white_stained_fence_gate","required":false},{"id":"pyrite:orange_stained_fence_gate","required":false},{"id":"pyrite:magenta_stained_fence_gate","required":false},{"id":"pyrite:light_blue_stained_fence_gate","required":false},{"id":"pyrite:yellow_stained_fence_gate","required":false},{"id":"pyrite:lime_stained_fence_gate","required":false},{"id":"pyrite:pink_stained_fence_gate","required":false},{"id":"pyrite:gray_stained_fence_gate","required":false},{"id":"pyrite:light_gray_stained_fence_gate","required":false},{"id":"pyrite:cyan_stained_fence_gate","required":false},{"id":"pyrite:purple_stained_fence_gate","required":false},{"id":"pyrite:blue_stained_fence_gate","required":false},{"id":"pyrite:brown_stained_fence_gate","required":false},{"id":"pyrite:green_stained_fence_gate","required":false},{"id":"pyrite:red_stained_fence_gate","required":false},{"id":"pyrite:black_stained_fence_gate","required":false},{"id":"pyrite:glow_stained_fence_gate","required":false},{"id":"pyrite:dragon_stained_fence_gate","required":false},{"id":"pyrite:star_stained_fence_gate","required":false},{"id":"pyrite:honey_stained_fence_gate","required":false},{"id":"pyrite:nostalgia_stained_fence_gate","required":false},{"id":"pyrite:rose_stained_fence_gate","required":false},{"id":"pyrite:poisonous_stained_fence_gate","required":false},{"id":"pyrite:red_mushroom_fence_gate","required":false},{"id":"pyrite:brown_mushroom_fence_gate","required":false},{"id":"pyrite:nether_brick_fence_gate","required":false},{"id":"pyrite:azalea_fence_gate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/hanging_signs.json b/common/src/main/resources/data/minecraft/tags/items/hanging_signs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/item/hanging_signs.json rename to common/src/main/resources/data/minecraft/tags/items/hanging_signs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/logs.json b/common/src/main/resources/data/minecraft/tags/items/logs.json index caa13a02f..47d1b02c9 100644 --- a/common/src/main/resources/data/minecraft/tags/items/logs.json +++ b/common/src/main/resources/data/minecraft/tags/items/logs.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "#pyrite:mushroom_stem" - ] - } - - \ No newline at end of file +{"replace":false,"values":["pyrite:red_mushroom_stem","pyrite:brown_mushroom_stem","pyrite:azalea_log","pyrite:stripped_azalea_log"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/piglin_loved.json b/common/src/main/resources/data/minecraft/tags/items/piglin_loved.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/item/piglin_loved.json rename to common/src/main/resources/data/minecraft/tags/items/piglin_loved.json diff --git a/common/src/main/resources/data/minecraft/tags/items/planks.json b/common/src/main/resources/data/minecraft/tags/items/planks.json index 1c6a0737c..8c3fbf57b 100644 --- a/common/src/main/resources/data/minecraft/tags/items/planks.json +++ b/common/src/main/resources/data/minecraft/tags/items/planks.json @@ -1,30 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_planks", - "pyrite:orange_stained_planks", - "pyrite:magenta_stained_planks", - "pyrite:light_blue_stained_planks", - "pyrite:yellow_stained_planks", - "pyrite:lime_stained_planks", - "pyrite:pink_stained_planks", - "pyrite:gray_stained_planks", - "pyrite:light_gray_stained_planks", - "pyrite:cyan_stained_planks", - "pyrite:purple_stained_planks", - "pyrite:blue_stained_planks", - "pyrite:brown_stained_planks", - "pyrite:green_stained_planks", - "pyrite:red_stained_planks", - "pyrite:black_stained_planks", - "pyrite:glow_stained_planks", - "pyrite:dragon_stained_planks", - "pyrite:star_stained_planks", - "pyrite:honey_stained_planks", - "pyrite:nostalgia_stained_planks", - "pyrite:rose_stained_planks", - "pyrite:poisonous_stained_planks", - "pyrite:red_mushroom_planks", - "pyrite:brown_mushroom_planks" - - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:white_stained_planks","pyrite:orange_stained_planks","pyrite:magenta_stained_planks","pyrite:light_blue_stained_planks","pyrite:yellow_stained_planks","pyrite:lime_stained_planks","pyrite:pink_stained_planks","pyrite:gray_stained_planks","pyrite:light_gray_stained_planks","pyrite:cyan_stained_planks","pyrite:purple_stained_planks","pyrite:blue_stained_planks","pyrite:brown_stained_planks","pyrite:green_stained_planks","pyrite:red_stained_planks","pyrite:black_stained_planks","pyrite:glow_stained_planks","pyrite:dragon_stained_planks","pyrite:star_stained_planks","pyrite:honey_stained_planks","pyrite:nostalgia_stained_planks","pyrite:rose_stained_planks","pyrite:poisonous_stained_planks","pyrite:red_mushroom_planks","pyrite:brown_mushroom_planks","pyrite:azalea_planks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/signs.json b/common/src/main/resources/data/minecraft/tags/items/signs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/item/signs.json rename to common/src/main/resources/data/minecraft/tags/items/signs.json diff --git a/common/src/main/resources/data/minecraft/tags/item/slabs.json b/common/src/main/resources/data/minecraft/tags/items/slabs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/item/slabs.json rename to common/src/main/resources/data/minecraft/tags/items/slabs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/small_flowers.json b/common/src/main/resources/data/minecraft/tags/items/small_flowers.json index bb9b2b569..591c73fd0 100644 --- a/common/src/main/resources/data/minecraft/tags/items/small_flowers.json +++ b/common/src/main/resources/data/minecraft/tags/items/small_flowers.json @@ -1,14 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:rose", - "pyrite:blue_rose", - "pyrite:orange_rose", - "pyrite:white_rose", - "pyrite:pink_rose", - "pyrite:paeonia", - "pyrite:buttercup", - "pyrite:pink_daisy" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:rose","pyrite:blue_rose","pyrite:orange_rose","pyrite:white_rose","pyrite:pink_rose","pyrite:paeonia","pyrite:pink_daisy","pyrite:buttercup"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/stairs.json b/common/src/main/resources/data/minecraft/tags/items/stairs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/stairs.json rename to common/src/main/resources/data/minecraft/tags/items/stairs.json diff --git a/common/src/main/resources/data/minecraft/tags/block/terracotta.json b/common/src/main/resources/data/minecraft/tags/items/terracotta.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/terracotta.json rename to common/src/main/resources/data/minecraft/tags/items/terracotta.json diff --git a/common/src/main/resources/data/minecraft/tags/block/walls.json b/common/src/main/resources/data/minecraft/tags/items/walls.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/walls.json rename to common/src/main/resources/data/minecraft/tags/items/walls.json diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_buttons.json b/common/src/main/resources/data/minecraft/tags/items/wooden_buttons.json index 5720e1e32..78c946eb3 100644 --- a/common/src/main/resources/data/minecraft/tags/items/wooden_buttons.json +++ b/common/src/main/resources/data/minecraft/tags/items/wooden_buttons.json @@ -1,30 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_button", - "pyrite:orange_stained_button", - "pyrite:magenta_stained_button", - "pyrite:light_blue_stained_button", - "pyrite:yellow_stained_button", - "pyrite:lime_stained_button", - "pyrite:pink_stained_button", - "pyrite:gray_stained_button", - "pyrite:light_gray_stained_button", - "pyrite:cyan_stained_button", - "pyrite:purple_stained_button", - "pyrite:blue_stained_button", - "pyrite:brown_stained_button", - "pyrite:green_stained_button", - "pyrite:red_stained_button", - "pyrite:black_stained_button", - "pyrite:glow_stained_button", - "pyrite:dragon_stained_button", - "pyrite:star_stained_button", - "pyrite:honey_stained_button", - "pyrite:nostalgia_stained_button", - "pyrite:rose_stained_button", - "pyrite:poisonous_stained_button", - "pyrite:red_mushroom_button", - "pyrite:brown_mushroom_button" - - ]} \ No newline at end of file +{"replace":false,"values":[{"id":"pyrite:white_stained_button","required":false},{"id":"pyrite:orange_stained_button","required":false},{"id":"pyrite:magenta_stained_button","required":false},{"id":"pyrite:light_blue_stained_button","required":false},{"id":"pyrite:yellow_stained_button","required":false},{"id":"pyrite:lime_stained_button","required":false},{"id":"pyrite:pink_stained_button","required":false},{"id":"pyrite:gray_stained_button","required":false},{"id":"pyrite:light_gray_stained_button","required":false},{"id":"pyrite:cyan_stained_button","required":false},{"id":"pyrite:purple_stained_button","required":false},{"id":"pyrite:blue_stained_button","required":false},{"id":"pyrite:brown_stained_button","required":false},{"id":"pyrite:green_stained_button","required":false},{"id":"pyrite:red_stained_button","required":false},{"id":"pyrite:black_stained_button","required":false},{"id":"pyrite:glow_stained_button","required":false},{"id":"pyrite:dragon_stained_button","required":false},{"id":"pyrite:star_stained_button","required":false},{"id":"pyrite:honey_stained_button","required":false},{"id":"pyrite:nostalgia_stained_button","required":false},{"id":"pyrite:rose_stained_button","required":false},{"id":"pyrite:poisonous_stained_button","required":false},{"id":"pyrite:red_mushroom_button","required":false},{"id":"pyrite:brown_mushroom_button","required":false},{"id":"pyrite:azalea_button","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/wooden_doors.json b/common/src/main/resources/data/minecraft/tags/items/wooden_doors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/block/wooden_doors.json rename to common/src/main/resources/data/minecraft/tags/items/wooden_doors.json diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_fences.json b/common/src/main/resources/data/minecraft/tags/items/wooden_fences.json index 319efe180..c7255201f 100644 --- a/common/src/main/resources/data/minecraft/tags/items/wooden_fences.json +++ b/common/src/main/resources/data/minecraft/tags/items/wooden_fences.json @@ -1,31 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_fence", - "pyrite:orange_stained_fence", - "pyrite:magenta_stained_fence", - "pyrite:light_blue_stained_fence", - "pyrite:yellow_stained_fence", - "pyrite:lime_stained_fence", - "pyrite:pink_stained_fence", - "pyrite:gray_stained_fence", - "pyrite:light_gray_stained_fence", - "pyrite:cyan_stained_fence", - "pyrite:purple_stained_fence", - "pyrite:blue_stained_fence", - "pyrite:brown_stained_fence", - "pyrite:green_stained_fence", - "pyrite:red_stained_fence", - "pyrite:black_stained_fence", - "pyrite:glow_stained_fence", - "pyrite:dragon_stained_fence", - "pyrite:star_stained_fence", - "pyrite:honey_stained_fence", - "pyrite:nostalgia_stained_fence", - "pyrite:rose_stained_fence", - "pyrite:poisonous_stained_fence", - "pyrite:red_mushroom_fence", - "pyrite:brown_mushroom_fence" - ] -} - +{"replace":false,"values":[{"id":"pyrite:white_stained_fence","required":false},{"id":"pyrite:orange_stained_fence","required":false},{"id":"pyrite:magenta_stained_fence","required":false},{"id":"pyrite:light_blue_stained_fence","required":false},{"id":"pyrite:yellow_stained_fence","required":false},{"id":"pyrite:lime_stained_fence","required":false},{"id":"pyrite:pink_stained_fence","required":false},{"id":"pyrite:gray_stained_fence","required":false},{"id":"pyrite:light_gray_stained_fence","required":false},{"id":"pyrite:cyan_stained_fence","required":false},{"id":"pyrite:purple_stained_fence","required":false},{"id":"pyrite:blue_stained_fence","required":false},{"id":"pyrite:brown_stained_fence","required":false},{"id":"pyrite:green_stained_fence","required":false},{"id":"pyrite:red_stained_fence","required":false},{"id":"pyrite:black_stained_fence","required":false},{"id":"pyrite:glow_stained_fence","required":false},{"id":"pyrite:dragon_stained_fence","required":false},{"id":"pyrite:star_stained_fence","required":false},{"id":"pyrite:honey_stained_fence","required":false},{"id":"pyrite:nostalgia_stained_fence","required":false},{"id":"pyrite:rose_stained_fence","required":false},{"id":"pyrite:poisonous_stained_fence","required":false},{"id":"pyrite:red_mushroom_fence","required":false},{"id":"pyrite:brown_mushroom_fence","required":false},{"id":"pyrite:azalea_fence","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/common/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json index 163d4fca2..da21742f6 100644 --- a/common/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json +++ b/common/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json @@ -1,30 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_pressure_plate", - "pyrite:orange_stained_pressure_plate", - "pyrite:magenta_stained_pressure_plate", - "pyrite:light_blue_stained_pressure_plate", - "pyrite:yellow_stained_pressure_plate", - "pyrite:lime_stained_pressure_plate", - "pyrite:pink_stained_pressure_plate", - "pyrite:gray_stained_pressure_plate", - "pyrite:light_gray_stained_pressure_plate", - "pyrite:cyan_stained_pressure_plate", - "pyrite:purple_stained_pressure_plate", - "pyrite:blue_stained_pressure_plate", - "pyrite:brown_stained_pressure_plate", - "pyrite:green_stained_pressure_plate", - "pyrite:red_stained_pressure_plate", - "pyrite:black_stained_pressure_plate", - "pyrite:glow_stained_pressure_plate", - "pyrite:dragon_stained_pressure_plate", - "pyrite:star_stained_pressure_plate", - "pyrite:honey_stained_pressure_plate", - "pyrite:nostalgia_stained_pressure_plate", - "pyrite:rose_stained_pressure_plate", - "pyrite:poisonous_stained_pressure_plate", - "pyrite:red_mushroom_pressure_plate", - "pyrite:brown_mushroom_pressure_plate" - - ]} \ No newline at end of file +{"replace":false,"values":[{"id":"pyrite:white_stained_pressure_plate","required":false},{"id":"pyrite:orange_stained_pressure_plate","required":false},{"id":"pyrite:magenta_stained_pressure_plate","required":false},{"id":"pyrite:light_blue_stained_pressure_plate","required":false},{"id":"pyrite:yellow_stained_pressure_plate","required":false},{"id":"pyrite:lime_stained_pressure_plate","required":false},{"id":"pyrite:pink_stained_pressure_plate","required":false},{"id":"pyrite:gray_stained_pressure_plate","required":false},{"id":"pyrite:light_gray_stained_pressure_plate","required":false},{"id":"pyrite:cyan_stained_pressure_plate","required":false},{"id":"pyrite:purple_stained_pressure_plate","required":false},{"id":"pyrite:blue_stained_pressure_plate","required":false},{"id":"pyrite:brown_stained_pressure_plate","required":false},{"id":"pyrite:green_stained_pressure_plate","required":false},{"id":"pyrite:red_stained_pressure_plate","required":false},{"id":"pyrite:black_stained_pressure_plate","required":false},{"id":"pyrite:glow_stained_pressure_plate","required":false},{"id":"pyrite:dragon_stained_pressure_plate","required":false},{"id":"pyrite:star_stained_pressure_plate","required":false},{"id":"pyrite:honey_stained_pressure_plate","required":false},{"id":"pyrite:nostalgia_stained_pressure_plate","required":false},{"id":"pyrite:rose_stained_pressure_plate","required":false},{"id":"pyrite:poisonous_stained_pressure_plate","required":false},{"id":"pyrite:red_mushroom_pressure_plate","required":false},{"id":"pyrite:brown_mushroom_pressure_plate","required":false},{"id":"pyrite:azalea_pressure_plate","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json index 128025bdb..56399af5c 100644 --- a/common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json +++ b/common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json @@ -1,31 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_slab", - "pyrite:orange_stained_slab", - "pyrite:magenta_stained_slab", - "pyrite:light_blue_stained_slab", - "pyrite:yellow_stained_slab", - "pyrite:lime_stained_slab", - "pyrite:pink_stained_slab", - "pyrite:gray_stained_slab", - "pyrite:light_gray_stained_slab", - "pyrite:cyan_stained_slab", - "pyrite:purple_stained_slab", - "pyrite:blue_stained_slab", - "pyrite:brown_stained_slab", - "pyrite:green_stained_slab", - "pyrite:red_stained_slab", - "pyrite:black_stained_slab", - "pyrite:glow_stained_slab", - "pyrite:dragon_stained_slab", - "pyrite:star_stained_slab", - "pyrite:honey_stained_slab", - "pyrite:nostalgia_stained_slab", - "pyrite:rose_stained_slab", - "pyrite:poisonous_stained_slab", - "pyrite:red_mushroom_slab", - "pyrite:brown_mushroom_slab" - ] -} - +{"replace":false,"values":["pyrite:white_stained_slab","pyrite:orange_stained_slab","pyrite:magenta_stained_slab","pyrite:light_blue_stained_slab","pyrite:yellow_stained_slab","pyrite:lime_stained_slab","pyrite:pink_stained_slab","pyrite:gray_stained_slab","pyrite:light_gray_stained_slab","pyrite:cyan_stained_slab","pyrite:purple_stained_slab","pyrite:blue_stained_slab","pyrite:brown_stained_slab","pyrite:green_stained_slab","pyrite:red_stained_slab","pyrite:black_stained_slab","pyrite:glow_stained_slab","pyrite:dragon_stained_slab","pyrite:star_stained_slab","pyrite:honey_stained_slab","pyrite:nostalgia_stained_slab","pyrite:rose_stained_slab","pyrite:poisonous_stained_slab","pyrite:red_mushroom_slab","pyrite:brown_mushroom_slab","pyrite:azalea_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json index 61be362f9..875f77b91 100644 --- a/common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json +++ b/common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json @@ -1,31 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_stairs", - "pyrite:orange_stained_stairs", - "pyrite:magenta_stained_stairs", - "pyrite:light_blue_stained_stairs", - "pyrite:yellow_stained_stairs", - "pyrite:lime_stained_stairs", - "pyrite:pink_stained_stairs", - "pyrite:gray_stained_stairs", - "pyrite:light_gray_stained_stairs", - "pyrite:cyan_stained_stairs", - "pyrite:purple_stained_stairs", - "pyrite:blue_stained_stairs", - "pyrite:brown_stained_stairs", - "pyrite:green_stained_stairs", - "pyrite:red_stained_stairs", - "pyrite:black_stained_stairs", - "pyrite:glow_stained_stairs", - "pyrite:dragon_stained_stairs", - "pyrite:star_stained_stairs", - "pyrite:honey_stained_stairs", - "pyrite:nostalgia_stained_stairs", - "pyrite:rose_stained_stairs", - "pyrite:poisonous_stained_stairs", - "pyrite:red_mushroom_stairs", - "pyrite:brown_mushroom_stairs" - ] -} - +{"replace":false,"values":["pyrite:white_stained_stairs","pyrite:orange_stained_stairs","pyrite:magenta_stained_stairs","pyrite:light_blue_stained_stairs","pyrite:yellow_stained_stairs","pyrite:lime_stained_stairs","pyrite:pink_stained_stairs","pyrite:gray_stained_stairs","pyrite:light_gray_stained_stairs","pyrite:cyan_stained_stairs","pyrite:purple_stained_stairs","pyrite:blue_stained_stairs","pyrite:brown_stained_stairs","pyrite:green_stained_stairs","pyrite:red_stained_stairs","pyrite:black_stained_stairs","pyrite:glow_stained_stairs","pyrite:dragon_stained_stairs","pyrite:star_stained_stairs","pyrite:honey_stained_stairs","pyrite:nostalgia_stained_stairs","pyrite:rose_stained_stairs","pyrite:poisonous_stained_stairs","pyrite:red_mushroom_stairs","pyrite:brown_mushroom_stairs","pyrite:azalea_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json b/common/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json rename to common/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json diff --git a/common/src/main/resources/data/minecraft/tags/items/wool.json b/common/src/main/resources/data/minecraft/tags/items/wool.json index ddd90afb2..4aa409fa4 100644 --- a/common/src/main/resources/data/minecraft/tags/items/wool.json +++ b/common/src/main/resources/data/minecraft/tags/items/wool.json @@ -1,12 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:glow_wool", - "pyrite:dragon_wool", - "pyrite:star_wool", - "pyrite:honey_wool", - "pyrite:nostalgia_wool", - "pyrite:rose_wool", - "pyrite:poisonous_wool" - - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:glow_wool","pyrite:dragon_wool","pyrite:star_wool","pyrite:honey_wool","pyrite:nostalgia_wool","pyrite:rose_wool","pyrite:poisonous_wool"]} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/wool_carpets.json b/common/src/main/resources/data/minecraft/tags/items/wool_carpets.json index 2562bb7a4..e2538984b 100644 --- a/common/src/main/resources/data/minecraft/tags/items/wool_carpets.json +++ b/common/src/main/resources/data/minecraft/tags/items/wool_carpets.json @@ -1,11 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:glow_carpet", - "pyrite:dragon_carpet", - "pyrite:star_carpet", - "pyrite:honey_carpet", - "pyrite:nostalgia_carpet", - "pyrite:rose_carpet", - "pyrite:poisonous_carpet" - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:glow_carpet","pyrite:dragon_carpet","pyrite:star_carpet","pyrite:honey_carpet","pyrite:nostalgia_carpet","pyrite:rose_carpet","pyrite:poisonous_carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/amethyst.json b/common/src/main/resources/data/pyrite/tags/block/amethyst.json deleted file mode 100644 index b44245e67..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/amethyst.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_amethyst","pyrite:cut_amethyst_slab","pyrite:cut_amethyst_stairs","pyrite:smooth_amethyst","pyrite:smooth_amethyst_slab","pyrite:smooth_amethyst_stairs","pyrite:amethyst_bricks","pyrite:amethyst_pillar","pyrite:chiseled_amethyst_block","pyrite:amethyst_door","pyrite:nostalgia_amethyst_block","pyrite:cut_amethyst_wall","pyrite:cut_amethyst_wall_gate","pyrite:smooth_amethyst_wall","pyrite:smooth_amethyst_wall_gate","pyrite:amethyst_bars","pyrite:amethyst_trapdoor","pyrite:amethyst_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/brick_slabs.json b/common/src/main/resources/data/pyrite/tags/block/brick_slabs.json deleted file mode 100644 index 1cbd0f925..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/brick_slabs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_brick_slab","pyrite:white_terracotta_brick_slab","pyrite:orange_brick_slab","pyrite:orange_terracotta_brick_slab","pyrite:magenta_brick_slab","pyrite:magenta_terracotta_brick_slab","pyrite:light_blue_brick_slab","pyrite:light_blue_terracotta_brick_slab","pyrite:yellow_brick_slab","pyrite:yellow_terracotta_brick_slab","pyrite:lime_brick_slab","pyrite:lime_terracotta_brick_slab","pyrite:pink_brick_slab","pyrite:pink_terracotta_brick_slab","pyrite:gray_brick_slab","pyrite:gray_terracotta_brick_slab","pyrite:light_gray_brick_slab","pyrite:light_gray_terracotta_brick_slab","pyrite:cyan_brick_slab","pyrite:cyan_terracotta_brick_slab","pyrite:purple_brick_slab","pyrite:purple_terracotta_brick_slab","pyrite:blue_brick_slab","pyrite:blue_terracotta_brick_slab","pyrite:brown_brick_slab","pyrite:brown_terracotta_brick_slab","pyrite:green_brick_slab","pyrite:green_terracotta_brick_slab","pyrite:red_brick_slab","pyrite:red_terracotta_brick_slab","pyrite:black_brick_slab","pyrite:black_terracotta_brick_slab","pyrite:glow_brick_slab","pyrite:glow_terracotta_brick_slab","pyrite:dragon_brick_slab","pyrite:dragon_terracotta_brick_slab","pyrite:star_brick_slab","pyrite:star_terracotta_brick_slab","pyrite:honey_brick_slab","pyrite:honey_terracotta_brick_slab","pyrite:nostalgia_brick_slab","pyrite:nostalgia_terracotta_brick_slab","pyrite:rose_brick_slab","pyrite:rose_terracotta_brick_slab","pyrite:poisonous_brick_slab","pyrite:poisonous_terracotta_brick_slab","pyrite:cobblestone_brick_slab","pyrite:mossy_cobblestone_brick_slab","pyrite:smooth_stone_brick_slab","pyrite:mossy_smooth_stone_brick_slab","pyrite:granite_brick_slab","pyrite:mossy_granite_brick_slab","pyrite:andesite_brick_slab","pyrite:mossy_andesite_brick_slab","pyrite:diorite_brick_slab","pyrite:mossy_diorite_brick_slab","pyrite:calcite_brick_slab","pyrite:mossy_calcite_brick_slab","pyrite:mossy_deepslate_brick_slab","pyrite:charred_nether_brick_slab","pyrite:blue_nether_brick_slab","pyrite:sandstone_brick_slab","pyrite:terracotta_brick_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/bricks.json b/common/src/main/resources/data/pyrite/tags/block/bricks.json deleted file mode 100644 index a58c089de..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/bricks.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_bricks","pyrite:orange_bricks","pyrite:magenta_bricks","pyrite:light_blue_bricks","pyrite:yellow_bricks","pyrite:lime_bricks","pyrite:pink_bricks","pyrite:gray_bricks","pyrite:light_gray_bricks","pyrite:cyan_bricks","pyrite:purple_bricks","pyrite:blue_bricks","pyrite:brown_bricks","pyrite:green_bricks","pyrite:red_bricks","pyrite:black_bricks","pyrite:glow_bricks","pyrite:dragon_bricks","pyrite:star_bricks","pyrite:honey_bricks","pyrite:nostalgia_bricks","pyrite:rose_bricks","pyrite:poisonous_bricks","pyrite:cobblestone_bricks","pyrite:mossy_cobblestone_bricks","pyrite:smooth_stone_bricks","pyrite:mossy_smooth_stone_bricks","pyrite:granite_bricks","pyrite:mossy_granite_bricks","pyrite:andesite_bricks","pyrite:mossy_andesite_bricks","pyrite:diorite_bricks","pyrite:mossy_diorite_bricks","pyrite:calcite_bricks","pyrite:mossy_calcite_bricks","pyrite:mossy_deepslate_bricks","pyrite:charred_nether_bricks","pyrite:blue_nether_bricks","#pyrite:terracotta_bricks","pyrite:sandstone_bricks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/carpet.json b/common/src/main/resources/data/pyrite/tags/block/carpet.json deleted file mode 100644 index 587b201f4..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/carpet.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:nostalgia_grass_carpet","pyrite:podzol_carpet","pyrite:grass_carpet","pyrite:mycelium_carpet","pyrite:path_carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/copper.json b/common/src/main/resources/data/pyrite/tags/block/copper.json deleted file mode 100644 index c04fd1b60..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/copper.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:smooth_copper","pyrite:smooth_copper_slab","pyrite:smooth_copper_stairs","pyrite:copper_bricks","pyrite:copper_pillar","pyrite:chiseled_copper_block","pyrite:copper_door","pyrite:nostalgia_copper_block","pyrite:exposed_copper_bricks","pyrite:weathered_copper_bricks","pyrite:oxidized_copper_bricks","pyrite:cut_copper_wall","pyrite:cut_copper_wall_gate","pyrite:smooth_copper_wall","pyrite:smooth_copper_wall_gate","pyrite:copper_bars","pyrite:copper_trapdoor","pyrite:copper_button","pyrite:cut_exposed_copper_wall","pyrite:cut_exposed_copper_wall_gate","pyrite:exposed_copper_bars","pyrite:cut_weathered_copper_wall","pyrite:cut_weathered_copper_wall_gate","pyrite:weathered_copper_bars","pyrite:cut_oxidized_copper_wall","pyrite:cut_oxidized_copper_wall_gate","pyrite:oxidized_copper_bars"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/crafting_tables.json b/common/src/main/resources/data/pyrite/tags/block/crafting_tables.json deleted file mode 100644 index af1cdfeda..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/crafting_tables.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_crafting_table","required":false},{"id":"pyrite:orange_stained_crafting_table","required":false},{"id":"pyrite:magenta_stained_crafting_table","required":false},{"id":"pyrite:light_blue_stained_crafting_table","required":false},{"id":"pyrite:yellow_stained_crafting_table","required":false},{"id":"pyrite:lime_stained_crafting_table","required":false},{"id":"pyrite:pink_stained_crafting_table","required":false},{"id":"pyrite:gray_stained_crafting_table","required":false},{"id":"pyrite:light_gray_stained_crafting_table","required":false},{"id":"pyrite:cyan_stained_crafting_table","required":false},{"id":"pyrite:purple_stained_crafting_table","required":false},{"id":"pyrite:blue_stained_crafting_table","required":false},{"id":"pyrite:brown_stained_crafting_table","required":false},{"id":"pyrite:green_stained_crafting_table","required":false},{"id":"pyrite:red_stained_crafting_table","required":false},{"id":"pyrite:black_stained_crafting_table","required":false},{"id":"pyrite:glow_stained_crafting_table","required":false},{"id":"pyrite:dragon_stained_crafting_table","required":false},{"id":"pyrite:star_stained_crafting_table","required":false},{"id":"pyrite:honey_stained_crafting_table","required":false},{"id":"pyrite:nostalgia_stained_crafting_table","required":false},{"id":"pyrite:rose_stained_crafting_table","required":false},{"id":"pyrite:poisonous_stained_crafting_table","required":false},{"id":"pyrite:spruce_crafting_table","required":false},{"id":"pyrite:birch_crafting_table","required":false},{"id":"pyrite:jungle_crafting_table","required":false},{"id":"pyrite:acacia_crafting_table","required":false},{"id":"pyrite:dark_oak_crafting_table","required":false},{"id":"pyrite:mangrove_crafting_table","required":false},{"id":"pyrite:cherry_crafting_table","required":false},{"id":"pyrite:bamboo_crafting_table","required":false},{"id":"pyrite:crimson_crafting_table","required":false},{"id":"pyrite:warped_crafting_table","required":false},{"id":"pyrite:skyroot_crafting_table","required":false},{"id":"pyrite:red_mushroom_crafting_table","required":false},{"id":"pyrite:brown_mushroom_crafting_table","required":false},{"id":"pyrite:azalea_crafting_table","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/cut_blocks.json b/common/src/main/resources/data/pyrite/tags/block/cut_blocks.json deleted file mode 100644 index 25a7de234..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/cut_blocks.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_iron","pyrite:cut_gold","pyrite:cut_emerald","pyrite:cut_diamond","pyrite:cut_netherite","pyrite:cut_quartz","pyrite:cut_amethyst","pyrite:cut_lapis","pyrite:cut_redstone"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/diamond.json b/common/src/main/resources/data/pyrite/tags/block/diamond.json deleted file mode 100644 index 0365deaf2..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/diamond.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_diamond","pyrite:cut_diamond_slab","pyrite:cut_diamond_stairs","pyrite:smooth_diamond","pyrite:smooth_diamond_slab","pyrite:smooth_diamond_stairs","pyrite:diamond_bricks","pyrite:diamond_pillar","pyrite:chiseled_diamond_block","pyrite:diamond_door","pyrite:nostalgia_diamond_block","pyrite:cut_diamond_wall","pyrite:cut_diamond_wall_gate","pyrite:smooth_diamond_wall","pyrite:smooth_diamond_wall_gate","pyrite:diamond_bars","pyrite:diamond_trapdoor","pyrite:diamond_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/emerald.json b/common/src/main/resources/data/pyrite/tags/block/emerald.json deleted file mode 100644 index a846140b0..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/emerald.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_emerald","pyrite:cut_emerald_slab","pyrite:cut_emerald_stairs","pyrite:smooth_emerald","pyrite:smooth_emerald_slab","pyrite:smooth_emerald_stairs","pyrite:emerald_bricks","pyrite:emerald_pillar","pyrite:chiseled_emerald_block","pyrite:emerald_door","pyrite:nostalgia_emerald_block","pyrite:cut_emerald_wall","pyrite:cut_emerald_wall_gate","pyrite:smooth_emerald_wall","pyrite:smooth_emerald_wall_gate","pyrite:emerald_bars","pyrite:emerald_trapdoor","pyrite:emerald_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/gold.json b/common/src/main/resources/data/pyrite/tags/block/gold.json deleted file mode 100644 index d9129810b..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/gold.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_gold","pyrite:cut_gold_slab","pyrite:cut_gold_stairs","pyrite:smooth_gold","pyrite:smooth_gold_slab","pyrite:smooth_gold_stairs","pyrite:gold_bricks","pyrite:gold_pillar","pyrite:chiseled_gold_block","pyrite:gold_door","pyrite:nostalgia_gold_block","pyrite:cut_gold_wall","pyrite:cut_gold_wall_gate","pyrite:smooth_gold_wall","pyrite:smooth_gold_wall_gate","pyrite:gold_bars","pyrite:gold_trapdoor","pyrite:gold_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/iron.json b/common/src/main/resources/data/pyrite/tags/block/iron.json deleted file mode 100644 index 0c3f7403d..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/iron.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_iron","pyrite:cut_iron_slab","pyrite:cut_iron_stairs","pyrite:smooth_iron","pyrite:smooth_iron_slab","pyrite:smooth_iron_stairs","pyrite:iron_bricks","pyrite:iron_pillar","pyrite:chiseled_iron_block","pyrite:nostalgia_iron_block","pyrite:cut_iron_wall","pyrite:cut_iron_wall_gate","pyrite:smooth_iron_wall","pyrite:smooth_iron_wall_gate","pyrite:iron_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/ladders.json b/common/src/main/resources/data/pyrite/tags/block/ladders.json deleted file mode 100644 index 2ab7be6b2..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/ladders.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_stained_ladder","pyrite:orange_stained_ladder","pyrite:magenta_stained_ladder","pyrite:light_blue_stained_ladder","pyrite:yellow_stained_ladder","pyrite:lime_stained_ladder","pyrite:pink_stained_ladder","pyrite:gray_stained_ladder","pyrite:light_gray_stained_ladder","pyrite:cyan_stained_ladder","pyrite:purple_stained_ladder","pyrite:blue_stained_ladder","pyrite:brown_stained_ladder","pyrite:green_stained_ladder","pyrite:red_stained_ladder","pyrite:black_stained_ladder","pyrite:glow_stained_ladder","pyrite:dragon_stained_ladder","pyrite:star_stained_ladder","pyrite:honey_stained_ladder","pyrite:nostalgia_stained_ladder","pyrite:rose_stained_ladder","pyrite:poisonous_stained_ladder","pyrite:red_mushroom_ladder","pyrite:brown_mushroom_ladder","pyrite:azalea_ladder"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/lapis.json b/common/src/main/resources/data/pyrite/tags/block/lapis.json deleted file mode 100644 index 0ac94e651..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/lapis.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_lapis","pyrite:cut_lapis_slab","pyrite:cut_lapis_stairs","pyrite:smooth_lapis","pyrite:smooth_lapis_slab","pyrite:smooth_lapis_stairs","pyrite:lapis_bricks","pyrite:lapis_pillar","pyrite:chiseled_lapis_block","pyrite:lapis_door","pyrite:nostalgia_lapis_block","pyrite:cut_lapis_wall","pyrite:cut_lapis_wall_gate","pyrite:smooth_lapis_wall","pyrite:smooth_lapis_wall_gate","pyrite:lapis_bars","pyrite:lapis_trapdoor","pyrite:lapis_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/mushroom_stem.json b/common/src/main/resources/data/pyrite/tags/block/mushroom_stem.json deleted file mode 100644 index 587406cc3..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/mushroom_stem.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:red_mushroom_stem","pyrite:brown_mushroom_stem"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/netherite.json b/common/src/main/resources/data/pyrite/tags/block/netherite.json deleted file mode 100644 index 5b665a8b1..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/netherite.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_netherite","pyrite:cut_netherite_slab","pyrite:cut_netherite_stairs","pyrite:smooth_netherite","pyrite:smooth_netherite_slab","pyrite:smooth_netherite_stairs","pyrite:netherite_bricks","pyrite:netherite_pillar","pyrite:chiseled_netherite_block","pyrite:netherite_door","pyrite:nostalgia_netherite_block","pyrite:cut_netherite_wall","pyrite:cut_netherite_wall_gate","pyrite:smooth_netherite_wall","pyrite:smooth_netherite_wall_gate","pyrite:netherite_bars","pyrite:netherite_trapdoor","pyrite:netherite_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/obsidian.json b/common/src/main/resources/data/pyrite/tags/block/obsidian.json deleted file mode 100644 index 11b6f03ed..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/obsidian.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glowing_obsidian","pyrite:nostalgia_glowing_obsidian"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/quartz.json b/common/src/main/resources/data/pyrite/tags/block/quartz.json deleted file mode 100644 index 648c414ef..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/quartz.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_quartz","pyrite:cut_quartz_slab","pyrite:cut_quartz_stairs","pyrite:quartz_door","pyrite:nostalgia_quartz_block","pyrite:cut_quartz_wall","pyrite:cut_quartz_wall_gate","pyrite:smooth_quartz_wall","pyrite:smooth_quartz_wall_gate","pyrite:quartz_bars","pyrite:quartz_trapdoor","pyrite:quartz_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/redstone.json b/common/src/main/resources/data/pyrite/tags/block/redstone.json deleted file mode 100644 index f9b95023c..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/redstone.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:cut_redstone","pyrite:cut_redstone_slab","pyrite:cut_redstone_stairs","pyrite:smooth_redstone","pyrite:smooth_redstone_slab","pyrite:smooth_redstone_stairs","pyrite:redstone_bricks","pyrite:redstone_pillar","pyrite:chiseled_redstone_block","pyrite:redstone_door","pyrite:nostalgia_redstone_block","pyrite:cut_redstone_wall","pyrite:cut_redstone_wall_gate","pyrite:smooth_redstone_wall","pyrite:smooth_redstone_wall_gate","pyrite:redstone_bars","pyrite:redstone_trapdoor","pyrite:redstone_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/terracotta.json b/common/src/main/resources/data/pyrite/tags/block/terracotta.json deleted file mode 100644 index ecf6cfd69..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/terracotta.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glow_terracotta","pyrite:dragon_terracotta","pyrite:star_terracotta","pyrite:honey_terracotta","pyrite:nostalgia_terracotta","pyrite:rose_terracotta","pyrite:poisonous_terracotta"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/terracotta_bricks.json b/common/src/main/resources/data/pyrite/tags/block/terracotta_bricks.json deleted file mode 100644 index 09386232f..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/terracotta_bricks.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_terracotta_bricks","pyrite:orange_terracotta_bricks","pyrite:magenta_terracotta_bricks","pyrite:light_blue_terracotta_bricks","pyrite:yellow_terracotta_bricks","pyrite:lime_terracotta_bricks","pyrite:pink_terracotta_bricks","pyrite:gray_terracotta_bricks","pyrite:light_gray_terracotta_bricks","pyrite:cyan_terracotta_bricks","pyrite:purple_terracotta_bricks","pyrite:blue_terracotta_bricks","pyrite:brown_terracotta_bricks","pyrite:green_terracotta_bricks","pyrite:red_terracotta_bricks","pyrite:black_terracotta_bricks","pyrite:glow_terracotta_bricks","pyrite:dragon_terracotta_bricks","pyrite:star_terracotta_bricks","pyrite:honey_terracotta_bricks","pyrite:nostalgia_terracotta_bricks","pyrite:rose_terracotta_bricks","pyrite:poisonous_terracotta_bricks","pyrite:terracotta_bricks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/turf_blocks.json b/common/src/main/resources/data/pyrite/tags/block/turf_blocks.json deleted file mode 100644 index c03c58802..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/turf_blocks.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:nostalgia_grass_turf","pyrite:podzol_turf","pyrite:grass_turf","pyrite:mycelium_turf","pyrite:path_turf"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/turf_slabs.json b/common/src/main/resources/data/pyrite/tags/block/turf_slabs.json deleted file mode 100644 index f3edc5613..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/turf_slabs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:nostalgia_grass_slab","pyrite:podzol_slab","pyrite:grass_slab","pyrite:mycelium_slab","pyrite:path_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/turf_stairs.json b/common/src/main/resources/data/pyrite/tags/block/turf_stairs.json deleted file mode 100644 index a9acdacf7..000000000 --- a/common/src/main/resources/data/pyrite/tags/block/turf_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:nostalgia_grass_stairs","pyrite:podzol_stairs","pyrite:grass_stairs","pyrite:mycelium_stairs","pyrite:path_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/amethyst.json b/common/src/main/resources/data/pyrite/tags/blocks/amethyst.json index 0d2b3379b..b44245e67 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/amethyst.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/amethyst.json @@ -1,22 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_amethyst", - "pyrite:cut_amethyst_stairs", - "pyrite:cut_amethyst_slab", - "pyrite:cut_amethyst_wall", - "pyrite:cut_amethyst_wall_gate", - "pyrite:amethyst_bricks", - "pyrite:chiseled_amethyst_block", - "pyrite:amethyst_pillar", - "pyrite:smooth_amethyst", - "pyrite:smooth_amethyst_slab", - "pyrite:smooth_amethyst_stairs", - "pyrite:smooth_amethyst_wall_gate", - "pyrite:smooth_amethyst_wall", - "pyrite:amethyst_bars", - "pyrite:amethyst_door", - "pyrite:nostalgia_amethyst_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_amethyst","pyrite:cut_amethyst_slab","pyrite:cut_amethyst_stairs","pyrite:smooth_amethyst","pyrite:smooth_amethyst_slab","pyrite:smooth_amethyst_stairs","pyrite:amethyst_bricks","pyrite:amethyst_pillar","pyrite:chiseled_amethyst_block","pyrite:amethyst_door","pyrite:nostalgia_amethyst_block","pyrite:cut_amethyst_wall","pyrite:cut_amethyst_wall_gate","pyrite:smooth_amethyst_wall","pyrite:smooth_amethyst_wall_gate","pyrite:amethyst_bars","pyrite:amethyst_trapdoor","pyrite:amethyst_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/brick_slabs.json b/common/src/main/resources/data/pyrite/tags/blocks/brick_slabs.json index 0e32520b7..1cbd0f925 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/brick_slabs.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/brick_slabs.json @@ -1,35 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cobblestone_brick_slab", - "pyrite:smooth_stone_brick_slab", - "pyrite:mossy_cobblestone_brick_slab", - "pyrite:charred_nether_brick_slab", - "pyrite:blue_nether_brick_slab", - "pyrite:white_brick_slab", - "pyrite:orange_brick_slab", - "pyrite:magenta_brick_slab", - "pyrite:light_blue_brick_slab", - "pyrite:yellow_brick_slab", - "pyrite:lime_brick_slab", - "pyrite:pink_brick_slab", - "pyrite:gray_brick_slab", - "pyrite:light_gray_brick_slab", - "pyrite:cyan_brick_slab", - "pyrite:purple_brick_slab", - "pyrite:blue_brick_slab", - "pyrite:brown_brick_slab", - "pyrite:green_brick_slab", - "pyrite:red_brick_slab", - "pyrite:black_brick_slab", - "pyrite:glow_brick_slab", - "pyrite:dragon_brick_slab", - "pyrite:star_brick_slab", - "pyrite:honey_brick_slab", - "pyrite:nostalgia_brick_slab", - "pyrite:rose_brick_slab", - "pyrite:poisonous_brick_slab", - "#pyrite:terracotta_brick_slabs" - ] - } - +{"replace":false,"values":["pyrite:white_brick_slab","pyrite:white_terracotta_brick_slab","pyrite:orange_brick_slab","pyrite:orange_terracotta_brick_slab","pyrite:magenta_brick_slab","pyrite:magenta_terracotta_brick_slab","pyrite:light_blue_brick_slab","pyrite:light_blue_terracotta_brick_slab","pyrite:yellow_brick_slab","pyrite:yellow_terracotta_brick_slab","pyrite:lime_brick_slab","pyrite:lime_terracotta_brick_slab","pyrite:pink_brick_slab","pyrite:pink_terracotta_brick_slab","pyrite:gray_brick_slab","pyrite:gray_terracotta_brick_slab","pyrite:light_gray_brick_slab","pyrite:light_gray_terracotta_brick_slab","pyrite:cyan_brick_slab","pyrite:cyan_terracotta_brick_slab","pyrite:purple_brick_slab","pyrite:purple_terracotta_brick_slab","pyrite:blue_brick_slab","pyrite:blue_terracotta_brick_slab","pyrite:brown_brick_slab","pyrite:brown_terracotta_brick_slab","pyrite:green_brick_slab","pyrite:green_terracotta_brick_slab","pyrite:red_brick_slab","pyrite:red_terracotta_brick_slab","pyrite:black_brick_slab","pyrite:black_terracotta_brick_slab","pyrite:glow_brick_slab","pyrite:glow_terracotta_brick_slab","pyrite:dragon_brick_slab","pyrite:dragon_terracotta_brick_slab","pyrite:star_brick_slab","pyrite:star_terracotta_brick_slab","pyrite:honey_brick_slab","pyrite:honey_terracotta_brick_slab","pyrite:nostalgia_brick_slab","pyrite:nostalgia_terracotta_brick_slab","pyrite:rose_brick_slab","pyrite:rose_terracotta_brick_slab","pyrite:poisonous_brick_slab","pyrite:poisonous_terracotta_brick_slab","pyrite:cobblestone_brick_slab","pyrite:mossy_cobblestone_brick_slab","pyrite:smooth_stone_brick_slab","pyrite:mossy_smooth_stone_brick_slab","pyrite:granite_brick_slab","pyrite:mossy_granite_brick_slab","pyrite:andesite_brick_slab","pyrite:mossy_andesite_brick_slab","pyrite:diorite_brick_slab","pyrite:mossy_diorite_brick_slab","pyrite:calcite_brick_slab","pyrite:mossy_calcite_brick_slab","pyrite:mossy_deepslate_brick_slab","pyrite:charred_nether_brick_slab","pyrite:blue_nether_brick_slab","pyrite:sandstone_brick_slab","pyrite:terracotta_brick_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/brick_stairs.json b/common/src/main/resources/data/pyrite/tags/blocks/brick_stairs.json index 31bc92cb2..c89d449f9 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/brick_stairs.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/brick_stairs.json @@ -1,35 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cobblestone_brick_stairs", - "pyrite:smooth_stone_brick_stairs", - "pyrite:mossy_cobblestone_brick_stairs", - "pyrite:charred_nether_brick_stairs", - "pyrite:blue_nether_brick_stairs", - "pyrite:white_brick_stairs", - "pyrite:orange_brick_stairs", - "pyrite:magenta_brick_stairs", - "pyrite:light_blue_brick_stairs", - "pyrite:yellow_brick_stairs", - "pyrite:lime_brick_stairs", - "pyrite:pink_brick_stairs", - "pyrite:gray_brick_stairs", - "pyrite:light_gray_brick_stairs", - "pyrite:cyan_brick_stairs", - "pyrite:purple_brick_stairs", - "pyrite:blue_brick_stairs", - "pyrite:brown_brick_stairs", - "pyrite:green_brick_stairs", - "pyrite:red_brick_stairs", - "pyrite:black_brick_stairs", - "pyrite:glow_brick_stairs", - "pyrite:dragon_brick_stairs", - "pyrite:star_brick_stairs", - "pyrite:honey_brick_stairs", - "pyrite:nostalgia_brick_stairs", - "pyrite:rose_brick_stairs", - "pyrite:poisonous_brick_stairs", - "#pyrite:terracotta_brick_stairs" - ] - } - +{"replace":false,"values":["pyrite:white_brick_stairs","pyrite:white_terracotta_brick_stairs","pyrite:orange_brick_stairs","pyrite:orange_terracotta_brick_stairs","pyrite:magenta_brick_stairs","pyrite:magenta_terracotta_brick_stairs","pyrite:light_blue_brick_stairs","pyrite:light_blue_terracotta_brick_stairs","pyrite:yellow_brick_stairs","pyrite:yellow_terracotta_brick_stairs","pyrite:lime_brick_stairs","pyrite:lime_terracotta_brick_stairs","pyrite:pink_brick_stairs","pyrite:pink_terracotta_brick_stairs","pyrite:gray_brick_stairs","pyrite:gray_terracotta_brick_stairs","pyrite:light_gray_brick_stairs","pyrite:light_gray_terracotta_brick_stairs","pyrite:cyan_brick_stairs","pyrite:cyan_terracotta_brick_stairs","pyrite:purple_brick_stairs","pyrite:purple_terracotta_brick_stairs","pyrite:blue_brick_stairs","pyrite:blue_terracotta_brick_stairs","pyrite:brown_brick_stairs","pyrite:brown_terracotta_brick_stairs","pyrite:green_brick_stairs","pyrite:green_terracotta_brick_stairs","pyrite:red_brick_stairs","pyrite:red_terracotta_brick_stairs","pyrite:black_brick_stairs","pyrite:black_terracotta_brick_stairs","pyrite:glow_brick_stairs","pyrite:glow_terracotta_brick_stairs","pyrite:dragon_brick_stairs","pyrite:dragon_terracotta_brick_stairs","pyrite:star_brick_stairs","pyrite:star_terracotta_brick_stairs","pyrite:honey_brick_stairs","pyrite:honey_terracotta_brick_stairs","pyrite:nostalgia_brick_stairs","pyrite:nostalgia_terracotta_brick_stairs","pyrite:rose_brick_stairs","pyrite:rose_terracotta_brick_stairs","pyrite:poisonous_brick_stairs","pyrite:poisonous_terracotta_brick_stairs","pyrite:cobblestone_brick_stairs","pyrite:mossy_cobblestone_brick_stairs","pyrite:smooth_stone_brick_stairs","pyrite:mossy_smooth_stone_brick_stairs","pyrite:granite_brick_stairs","pyrite:mossy_granite_brick_stairs","pyrite:andesite_brick_stairs","pyrite:mossy_andesite_brick_stairs","pyrite:diorite_brick_stairs","pyrite:mossy_diorite_brick_stairs","pyrite:calcite_brick_stairs","pyrite:mossy_calcite_brick_stairs","pyrite:mossy_deepslate_brick_stairs","pyrite:charred_nether_brick_stairs","pyrite:blue_nether_brick_stairs","pyrite:sandstone_brick_stairs","pyrite:terracotta_brick_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/brick_walls.json b/common/src/main/resources/data/pyrite/tags/blocks/brick_walls.json index 8cfd1285a..c323d8431 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/brick_walls.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/brick_walls.json @@ -1,35 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cobblestone_brick_wall", - "pyrite:smooth_stone_brick_wall", - "pyrite:mossy_cobblestone_brick_wall", - "pyrite:charred_nether_brick_wall", - "pyrite:blue_nether_brick_wall", - "pyrite:white_brick_wall", - "pyrite:orange_brick_wall", - "pyrite:magenta_brick_wall", - "pyrite:light_blue_brick_wall", - "pyrite:yellow_brick_wall", - "pyrite:lime_brick_wall", - "pyrite:pink_brick_wall", - "pyrite:gray_brick_wall", - "pyrite:light_gray_brick_wall", - "pyrite:cyan_brick_wall", - "pyrite:purple_brick_wall", - "pyrite:blue_brick_wall", - "pyrite:brown_brick_wall", - "pyrite:green_brick_wall", - "pyrite:red_brick_wall", - "pyrite:black_brick_wall", - "pyrite:glow_brick_wall", - "pyrite:dragon_brick_wall", - "pyrite:star_brick_wall", - "pyrite:honey_brick_wall", - "pyrite:nostalgia_brick_wall", - "pyrite:rose_brick_wall", - "pyrite:poisonous_brick_wall", - "#pyrite:terracotta_brick_walls" - ] - } - +{"replace":false,"values":["pyrite:white_brick_wall","pyrite:white_terracotta_brick_wall","pyrite:orange_brick_wall","pyrite:orange_terracotta_brick_wall","pyrite:magenta_brick_wall","pyrite:magenta_terracotta_brick_wall","pyrite:light_blue_brick_wall","pyrite:light_blue_terracotta_brick_wall","pyrite:yellow_brick_wall","pyrite:yellow_terracotta_brick_wall","pyrite:lime_brick_wall","pyrite:lime_terracotta_brick_wall","pyrite:pink_brick_wall","pyrite:pink_terracotta_brick_wall","pyrite:gray_brick_wall","pyrite:gray_terracotta_brick_wall","pyrite:light_gray_brick_wall","pyrite:light_gray_terracotta_brick_wall","pyrite:cyan_brick_wall","pyrite:cyan_terracotta_brick_wall","pyrite:purple_brick_wall","pyrite:purple_terracotta_brick_wall","pyrite:blue_brick_wall","pyrite:blue_terracotta_brick_wall","pyrite:brown_brick_wall","pyrite:brown_terracotta_brick_wall","pyrite:green_brick_wall","pyrite:green_terracotta_brick_wall","pyrite:red_brick_wall","pyrite:red_terracotta_brick_wall","pyrite:black_brick_wall","pyrite:black_terracotta_brick_wall","pyrite:glow_brick_wall","pyrite:glow_terracotta_brick_wall","pyrite:dragon_brick_wall","pyrite:dragon_terracotta_brick_wall","pyrite:star_brick_wall","pyrite:star_terracotta_brick_wall","pyrite:honey_brick_wall","pyrite:honey_terracotta_brick_wall","pyrite:nostalgia_brick_wall","pyrite:nostalgia_terracotta_brick_wall","pyrite:rose_brick_wall","pyrite:rose_terracotta_brick_wall","pyrite:poisonous_brick_wall","pyrite:poisonous_terracotta_brick_wall","pyrite:cobblestone_brick_wall","pyrite:mossy_cobblestone_brick_wall","pyrite:smooth_stone_brick_wall","pyrite:mossy_smooth_stone_brick_wall","pyrite:granite_brick_wall","pyrite:mossy_granite_brick_wall","pyrite:andesite_brick_wall","pyrite:mossy_andesite_brick_wall","pyrite:diorite_brick_wall","pyrite:mossy_diorite_brick_wall","pyrite:calcite_brick_wall","pyrite:mossy_calcite_brick_wall","pyrite:mossy_deepslate_brick_wall","pyrite:charred_nether_brick_wall","pyrite:blue_nether_brick_wall","pyrite:sandstone_brick_wall","pyrite:terracotta_brick_wall"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/bricks.json b/common/src/main/resources/data/pyrite/tags/blocks/bricks.json index b8328c6d3..a58c089de 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/bricks.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/bricks.json @@ -1,40 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cobblestone_bricks", - "pyrite:cobblestone_brick_slab", - "pyrite:cobblestone_brick_stairs", - "pyrite:smooth_stone_bricks", - "pyrite:smooth_stone_brick_slab", - "pyrite:smooth_stone_brick_stairs", - "pyrite:mossy_cobblestone_bricks", - "pyrite:mossy_cobblestone_brick_slab", - "pyrite:mossy_cobblestone_brick_stairs", - "pyrite:white_bricks", - "pyrite:orange_bricks", - "pyrite:magenta_bricks", - "pyrite:light_blue_bricks", - "pyrite:yellow_bricks", - "pyrite:lime_bricks", - "pyrite:pink_bricks", - "pyrite:gray_bricks", - "pyrite:light_gray_bricks", - "pyrite:cyan_bricks", - "pyrite:purple_bricks", - "pyrite:blue_bricks", - "pyrite:brown_bricks", - "pyrite:green_bricks", - "pyrite:red_bricks", - "pyrite:black_bricks", - "pyrite:glow_bricks", - "pyrite:dragon_bricks", - "pyrite:star_bricks", - "pyrite:honey_bricks", - "pyrite:nostalgia_bricks", - "pyrite:rose_bricks", - "pyrite:poisonous_bricks", - "#pyrite:terracotta_bricks" - - ] - } - +{"replace":false,"values":["pyrite:white_bricks","pyrite:orange_bricks","pyrite:magenta_bricks","pyrite:light_blue_bricks","pyrite:yellow_bricks","pyrite:lime_bricks","pyrite:pink_bricks","pyrite:gray_bricks","pyrite:light_gray_bricks","pyrite:cyan_bricks","pyrite:purple_bricks","pyrite:blue_bricks","pyrite:brown_bricks","pyrite:green_bricks","pyrite:red_bricks","pyrite:black_bricks","pyrite:glow_bricks","pyrite:dragon_bricks","pyrite:star_bricks","pyrite:honey_bricks","pyrite:nostalgia_bricks","pyrite:rose_bricks","pyrite:poisonous_bricks","pyrite:cobblestone_bricks","pyrite:mossy_cobblestone_bricks","pyrite:smooth_stone_bricks","pyrite:mossy_smooth_stone_bricks","pyrite:granite_bricks","pyrite:mossy_granite_bricks","pyrite:andesite_bricks","pyrite:mossy_andesite_bricks","pyrite:diorite_bricks","pyrite:mossy_diorite_bricks","pyrite:calcite_bricks","pyrite:mossy_calcite_bricks","pyrite:mossy_deepslate_bricks","pyrite:charred_nether_bricks","pyrite:blue_nether_bricks","#pyrite:terracotta_bricks","pyrite:sandstone_bricks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/carpet.json b/common/src/main/resources/data/pyrite/tags/blocks/carpet.json index 4b2452e06..587b201f4 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/carpet.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/carpet.json @@ -1,8 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:grass_carpet", - "pyrite:mycelium_carpet", - "pyrite:podzol_carpet" - ] - } \ No newline at end of file +{"replace":false,"values":["pyrite:nostalgia_grass_carpet","pyrite:podzol_carpet","pyrite:grass_carpet","pyrite:mycelium_carpet","pyrite:path_carpet"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/concrete_slabs.json b/common/src/main/resources/data/pyrite/tags/blocks/concrete_slabs.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/concrete_slabs.json rename to common/src/main/resources/data/pyrite/tags/blocks/concrete_slabs.json diff --git a/common/src/main/resources/data/pyrite/tags/block/concrete_stairs.json b/common/src/main/resources/data/pyrite/tags/blocks/concrete_stairs.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/concrete_stairs.json rename to common/src/main/resources/data/pyrite/tags/blocks/concrete_stairs.json diff --git a/common/src/main/resources/data/pyrite/tags/blocks/copper.json b/common/src/main/resources/data/pyrite/tags/blocks/copper.json index fb20f7dcb..c04fd1b60 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/copper.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/copper.json @@ -1,45 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:copper_bricks", - "pyrite:copper_pillar", - "pyrite:smooth_copper", - "pyrite:smooth_copper_slab", - "pyrite:smooth_copper_stairs", - "pyrite:smooth_copper_wall_gate", - "pyrite:smooth_copper_wall", - "pyrite:copper_bars", - "pyrite:oxidized_copper_bricks", - "pyrite:oxidized_copper_pillar", - "pyrite:smooth_oxidized_copper", - "pyrite:smooth_oxidized_copper_slab", - "pyrite:smooth_oxidized_copper_stairs", - "pyrite:smooth_oxidized_copper_wall_gate", - "pyrite:smooth_oxidized_copper_wall", - "pyrite:oxidized_copper_bars", - "pyrite:exposed_copper_bricks", - "pyrite:exposed_copper_pillar", - "pyrite:smooth_exposed_copper", - "pyrite:smooth_exposed_copper_slab", - "pyrite:smooth_exposed_copper_stairs", - "pyrite:smooth_exposed_copper_wall_gate", - "pyrite:smooth_exposed_copper_wall", - "pyrite:exposed_copper_bars", - "pyrite:weathered_copper_bricks", - "pyrite:weathered_copper_pillar", - "pyrite:smooth_weathered_copper", - "pyrite:smooth_weathered_copper_slab", - "pyrite:smooth_weathered_copper_stairs", - "pyrite:smooth_weathered_copper_wall_gate", - "pyrite:smooth_weathered_copper_wall", - "pyrite:weathered_copper_bars", - "pyrite:nostalgia_copper_block", - "pyrite:nostalgia_exposed_copper_block", - "pyrite:nostalgia_weathered_copper_block", - "pyrite:nostalgia_oxidized_copper_block", - "#pyrite:chiseled_copper", - "#pyrite:copper_doors" - - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:smooth_copper","pyrite:smooth_copper_slab","pyrite:smooth_copper_stairs","pyrite:copper_bricks","pyrite:copper_pillar","pyrite:chiseled_copper_block","pyrite:copper_door","pyrite:nostalgia_copper_block","pyrite:exposed_copper_bricks","pyrite:weathered_copper_bricks","pyrite:oxidized_copper_bricks","pyrite:cut_copper_wall","pyrite:cut_copper_wall_gate","pyrite:smooth_copper_wall","pyrite:smooth_copper_wall_gate","pyrite:copper_bars","pyrite:copper_trapdoor","pyrite:copper_button","pyrite:cut_exposed_copper_wall","pyrite:cut_exposed_copper_wall_gate","pyrite:exposed_copper_bars","pyrite:cut_weathered_copper_wall","pyrite:cut_weathered_copper_wall_gate","pyrite:weathered_copper_bars","pyrite:cut_oxidized_copper_wall","pyrite:cut_oxidized_copper_wall_gate","pyrite:oxidized_copper_bars"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/crafting_tables.json b/common/src/main/resources/data/pyrite/tags/blocks/crafting_tables.json index 205da841b..af1cdfeda 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/crafting_tables.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/crafting_tables.json @@ -1,40 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_crafting_table", - "pyrite:orange_stained_crafting_table", - "pyrite:magenta_stained_crafting_table", - "pyrite:light_blue_stained_crafting_table", - "pyrite:yellow_stained_crafting_table", - "pyrite:lime_stained_crafting_table", - "pyrite:pink_stained_crafting_table", - "pyrite:gray_stained_crafting_table", - "pyrite:light_gray_stained_crafting_table", - "pyrite:cyan_stained_crafting_table", - "pyrite:purple_stained_crafting_table", - "pyrite:blue_stained_crafting_table", - "pyrite:brown_stained_crafting_table", - "pyrite:green_stained_crafting_table", - "pyrite:red_stained_crafting_table", - "pyrite:black_stained_crafting_table", - "pyrite:glow_stained_crafting_table", - "pyrite:dragon_stained_crafting_table", - "pyrite:star_stained_crafting_table", - "pyrite:honey_stained_crafting_table", - "pyrite:nostalgia_stained_crafting_table", - "pyrite:rose_stained_crafting_table", - "pyrite:poisonous_stained_crafting_table", - "pyrite:red_mushroom_crafting_table", - "pyrite:brown_mushroom_crafting_table", - "pyrite:spruce_crafting_table", - "pyrite:birch_crafting_table", - "pyrite:jungle_crafting_table", - "pyrite:acacia_crafting_table", - "pyrite:dark_oak_crafting_table", - "pyrite:mangrove_crafting_table", - "pyrite:cherry_crafting_table", - "pyrite:bamboo_crafting_table", - "pyrite:crimson_crafting_table", - "pyrite:warped_crafting_table" - ] -} +{"replace":false,"values":[{"id":"pyrite:white_stained_crafting_table","required":false},{"id":"pyrite:orange_stained_crafting_table","required":false},{"id":"pyrite:magenta_stained_crafting_table","required":false},{"id":"pyrite:light_blue_stained_crafting_table","required":false},{"id":"pyrite:yellow_stained_crafting_table","required":false},{"id":"pyrite:lime_stained_crafting_table","required":false},{"id":"pyrite:pink_stained_crafting_table","required":false},{"id":"pyrite:gray_stained_crafting_table","required":false},{"id":"pyrite:light_gray_stained_crafting_table","required":false},{"id":"pyrite:cyan_stained_crafting_table","required":false},{"id":"pyrite:purple_stained_crafting_table","required":false},{"id":"pyrite:blue_stained_crafting_table","required":false},{"id":"pyrite:brown_stained_crafting_table","required":false},{"id":"pyrite:green_stained_crafting_table","required":false},{"id":"pyrite:red_stained_crafting_table","required":false},{"id":"pyrite:black_stained_crafting_table","required":false},{"id":"pyrite:glow_stained_crafting_table","required":false},{"id":"pyrite:dragon_stained_crafting_table","required":false},{"id":"pyrite:star_stained_crafting_table","required":false},{"id":"pyrite:honey_stained_crafting_table","required":false},{"id":"pyrite:nostalgia_stained_crafting_table","required":false},{"id":"pyrite:rose_stained_crafting_table","required":false},{"id":"pyrite:poisonous_stained_crafting_table","required":false},{"id":"pyrite:spruce_crafting_table","required":false},{"id":"pyrite:birch_crafting_table","required":false},{"id":"pyrite:jungle_crafting_table","required":false},{"id":"pyrite:acacia_crafting_table","required":false},{"id":"pyrite:dark_oak_crafting_table","required":false},{"id":"pyrite:mangrove_crafting_table","required":false},{"id":"pyrite:cherry_crafting_table","required":false},{"id":"pyrite:bamboo_crafting_table","required":false},{"id":"pyrite:crimson_crafting_table","required":false},{"id":"pyrite:warped_crafting_table","required":false},{"id":"pyrite:skyroot_crafting_table","required":false},{"id":"pyrite:red_mushroom_crafting_table","required":false},{"id":"pyrite:brown_mushroom_crafting_table","required":false},{"id":"pyrite:azalea_crafting_table","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/cut_blocks.json b/common/src/main/resources/data/pyrite/tags/blocks/cut_blocks.json index ae46bc28a..25a7de234 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/cut_blocks.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/cut_blocks.json @@ -1,13 +1 @@ - { - "replace": false, - "values": [ - "pyrite:cut_iron", - "pyrite:cut_gold", - "pyrite:cut_emerald", - "pyrite:cut_diamond", - "pyrite:cut_netherite", - "pyrite:cut_quartz", - "pyrite:cut_amethyst", - "pyrite:cut_lapis" - ] - } +{"replace":false,"values":["pyrite:cut_iron","pyrite:cut_gold","pyrite:cut_emerald","pyrite:cut_diamond","pyrite:cut_netherite","pyrite:cut_quartz","pyrite:cut_amethyst","pyrite:cut_lapis","pyrite:cut_redstone"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/diamond.json b/common/src/main/resources/data/pyrite/tags/blocks/diamond.json index 49db58ba8..0365deaf2 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/diamond.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/diamond.json @@ -1,22 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_diamond", - "pyrite:cut_diamond_stairs", - "pyrite:cut_diamond_slab", - "pyrite:cut_diamond_wall", - "pyrite:cut_diamond_wall_gate", - "pyrite:diamond_bricks", - "pyrite:chiseled_diamond_block", - "pyrite:diamond_pillar", - "pyrite:smooth_diamond", - "pyrite:smooth_diamond_slab", - "pyrite:smooth_diamond_stairs", - "pyrite:smooth_diamond_wall_gate", - "pyrite:smooth_diamond_wall", - "pyrite:diamond_bars", - "pyrite:diamond_door", - "pyrite:nostalgia_diamond_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_diamond","pyrite:cut_diamond_slab","pyrite:cut_diamond_stairs","pyrite:smooth_diamond","pyrite:smooth_diamond_slab","pyrite:smooth_diamond_stairs","pyrite:diamond_bricks","pyrite:diamond_pillar","pyrite:chiseled_diamond_block","pyrite:diamond_door","pyrite:nostalgia_diamond_block","pyrite:cut_diamond_wall","pyrite:cut_diamond_wall_gate","pyrite:smooth_diamond_wall","pyrite:smooth_diamond_wall_gate","pyrite:diamond_bars","pyrite:diamond_trapdoor","pyrite:diamond_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/dyed_bricks.json b/common/src/main/resources/data/pyrite/tags/blocks/dyed_bricks.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/dyed_bricks.json rename to common/src/main/resources/data/pyrite/tags/blocks/dyed_bricks.json diff --git a/common/src/main/resources/data/pyrite/tags/blocks/emerald.json b/common/src/main/resources/data/pyrite/tags/blocks/emerald.json index 483aa9ce1..a846140b0 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/emerald.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/emerald.json @@ -1,22 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_emerald", - "pyrite:cut_emerald_stairs", - "pyrite:cut_emerald_slab", - "pyrite:cut_emerald_wall", - "pyrite:cut_emerald_wall_gate", - "pyrite:emerald_bricks", - "pyrite:chiseled_emerald_block", - "pyrite:emerald_pillar", - "pyrite:smooth_emerald", - "pyrite:smooth_emerald_slab", - "pyrite:smooth_emerald_stairs", - "pyrite:smooth_emerald_wall_gate", - "pyrite:smooth_emerald_wall", - "pyrite:emerald_bars", - "pyrite:emerald_door", - "pyrite:nostalgia_emerald_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_emerald","pyrite:cut_emerald_slab","pyrite:cut_emerald_stairs","pyrite:smooth_emerald","pyrite:smooth_emerald_slab","pyrite:smooth_emerald_stairs","pyrite:emerald_bricks","pyrite:emerald_pillar","pyrite:chiseled_emerald_block","pyrite:emerald_door","pyrite:nostalgia_emerald_block","pyrite:cut_emerald_wall","pyrite:cut_emerald_wall_gate","pyrite:smooth_emerald_wall","pyrite:smooth_emerald_wall_gate","pyrite:emerald_bars","pyrite:emerald_trapdoor","pyrite:emerald_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/exposed_copper.json b/common/src/main/resources/data/pyrite/tags/blocks/exposed_copper.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/exposed_copper.json rename to common/src/main/resources/data/pyrite/tags/blocks/exposed_copper.json diff --git a/common/src/main/resources/data/pyrite/tags/block/fences.json b/common/src/main/resources/data/pyrite/tags/blocks/fences.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/fences.json rename to common/src/main/resources/data/pyrite/tags/blocks/fences.json diff --git a/common/src/main/resources/data/pyrite/tags/blocks/gold.json b/common/src/main/resources/data/pyrite/tags/blocks/gold.json index 69dcabf70..d9129810b 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/gold.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/gold.json @@ -1,22 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_gold", - "pyrite:cut_gold_stairs", - "pyrite:cut_gold_slab", - "pyrite:cut_gold_wall", - "pyrite:cut_gold_wall_gate", - "pyrite:gold_bricks", - "pyrite:chiseled_gold_block", - "pyrite:gold_pillar", - "pyrite:smooth_gold", - "pyrite:smooth_gold_slab", - "pyrite:smooth_gold_stairs", - "pyrite:smooth_gold_wall_gate", - "pyrite:smooth_gold_wall", - "pyrite:gold_bars", - "pyrite:gold_door", - "pyrite:nostalgia_gold_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_gold","pyrite:cut_gold_slab","pyrite:cut_gold_stairs","pyrite:smooth_gold","pyrite:smooth_gold_slab","pyrite:smooth_gold_stairs","pyrite:gold_bricks","pyrite:gold_pillar","pyrite:chiseled_gold_block","pyrite:gold_door","pyrite:nostalgia_gold_block","pyrite:cut_gold_wall","pyrite:cut_gold_wall_gate","pyrite:smooth_gold_wall","pyrite:smooth_gold_wall_gate","pyrite:gold_bars","pyrite:gold_trapdoor","pyrite:gold_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/iron.json b/common/src/main/resources/data/pyrite/tags/blocks/iron.json index 5f3035a6d..0c3f7403d 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/iron.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/iron.json @@ -1,20 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_iron", - "pyrite:cut_iron_stairs", - "pyrite:cut_iron_slab", - "pyrite:cut_iron_wall", - "pyrite:cut_iron_wall_gate", - "pyrite:iron_bricks", - "pyrite:chiseled_iron_block", - "pyrite:iron_pillar", - "pyrite:smooth_iron", - "pyrite:smooth_iron_slab", - "pyrite:smooth_iron_stairs", - "pyrite:smooth_iron_wall_gate", - "pyrite:smooth_iron_wall", - "pyrite:nostalgia_iron_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_iron","pyrite:cut_iron_slab","pyrite:cut_iron_stairs","pyrite:smooth_iron","pyrite:smooth_iron_slab","pyrite:smooth_iron_stairs","pyrite:iron_bricks","pyrite:iron_pillar","pyrite:chiseled_iron_block","pyrite:nostalgia_iron_block","pyrite:cut_iron_wall","pyrite:cut_iron_wall_gate","pyrite:smooth_iron_wall","pyrite:smooth_iron_wall_gate","pyrite:iron_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/ladders.json b/common/src/main/resources/data/pyrite/tags/blocks/ladders.json index 208786f9e..2ab7be6b2 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/ladders.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/ladders.json @@ -1,30 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_ladder", - "pyrite:orange_stained_ladder", - "pyrite:magenta_stained_ladder", - "pyrite:light_blue_stained_ladder", - "pyrite:yellow_stained_ladder", - "pyrite:lime_stained_ladder", - "pyrite:pink_stained_ladder", - "pyrite:gray_stained_ladder", - "pyrite:light_gray_stained_ladder", - "pyrite:cyan_stained_ladder", - "pyrite:purple_stained_ladder", - "pyrite:blue_stained_ladder", - "pyrite:brown_stained_ladder", - "pyrite:green_stained_ladder", - "pyrite:red_stained_ladder", - "pyrite:black_stained_ladder", - "pyrite:glow_stained_ladder", - "pyrite:dragon_stained_ladder", - "pyrite:star_stained_ladder", - "pyrite:honey_stained_ladder", - "pyrite:nostalgia_stained_ladder", - "pyrite:rose_stained_ladder", - "pyrite:poisonous_stained_ladder", - "pyrite:red_mushroom_ladder", - "pyrite:brown_mushroom_ladder" - - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:white_stained_ladder","pyrite:orange_stained_ladder","pyrite:magenta_stained_ladder","pyrite:light_blue_stained_ladder","pyrite:yellow_stained_ladder","pyrite:lime_stained_ladder","pyrite:pink_stained_ladder","pyrite:gray_stained_ladder","pyrite:light_gray_stained_ladder","pyrite:cyan_stained_ladder","pyrite:purple_stained_ladder","pyrite:blue_stained_ladder","pyrite:brown_stained_ladder","pyrite:green_stained_ladder","pyrite:red_stained_ladder","pyrite:black_stained_ladder","pyrite:glow_stained_ladder","pyrite:dragon_stained_ladder","pyrite:star_stained_ladder","pyrite:honey_stained_ladder","pyrite:nostalgia_stained_ladder","pyrite:rose_stained_ladder","pyrite:poisonous_stained_ladder","pyrite:red_mushroom_ladder","pyrite:brown_mushroom_ladder","pyrite:azalea_ladder"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/lamps.json b/common/src/main/resources/data/pyrite/tags/blocks/lamps.json index fe5c09ff9..8e0824c5f 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/lamps.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/lamps.json @@ -1,31 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:glowstone_lamp", - "pyrite:white_lamp", - "pyrite:orange_lamp", - "pyrite:magenta_lamp", - "pyrite:light_blue_lamp", - "pyrite:yellow_lamp", - "pyrite:lime_lamp", - "pyrite:pink_lamp", - "pyrite:gray_lamp", - "pyrite:light_gray_lamp", - "pyrite:cyan_lamp", - "pyrite:purple_lamp", - "pyrite:blue_lamp", - "pyrite:brown_lamp", - "pyrite:green_lamp", - "pyrite:red_lamp", - "pyrite:black_lamp", - "pyrite:glow_lamp", - "pyrite:dragon_lamp", - "pyrite:star_lamp", - "pyrite:honey_lamp", - "pyrite:nostalgia_lamp", - "pyrite:rose_lamp", - "pyrite:poisonous_lamp" - - ] -} - +{"replace":false,"values":["pyrite:white_lamp","pyrite:orange_lamp","pyrite:magenta_lamp","pyrite:light_blue_lamp","pyrite:yellow_lamp","pyrite:lime_lamp","pyrite:pink_lamp","pyrite:gray_lamp","pyrite:light_gray_lamp","pyrite:cyan_lamp","pyrite:purple_lamp","pyrite:blue_lamp","pyrite:brown_lamp","pyrite:green_lamp","pyrite:red_lamp","pyrite:black_lamp","pyrite:glow_lamp","pyrite:dragon_lamp","pyrite:star_lamp","pyrite:honey_lamp","pyrite:nostalgia_lamp","pyrite:rose_lamp","pyrite:poisonous_lamp","pyrite:glowstone_lamp","pyrite:lit_redstone_lamp"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/lapis.json b/common/src/main/resources/data/pyrite/tags/blocks/lapis.json index ec16ff97d..0ac94e651 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/lapis.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/lapis.json @@ -1,22 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_lapis", - "pyrite:cut_lapis_stairs", - "pyrite:cut_lapis_slab", - "pyrite:cut_lapis_wall", - "pyrite:cut_lapis_wall_gate", - "pyrite:lapis_bricks", - "pyrite:chiseled_lapis_block", - "pyrite:lapis_pillar", - "pyrite:smooth_lapis", - "pyrite:smooth_lapis_slab", - "pyrite:smooth_lapis_stairs", - "pyrite:smooth_lapis_wall_gate", - "pyrite:smooth_lapis_wall", - "pyrite:lapis_bars", - "pyrite:lapis_door", - "pyrite:nostalgia_lapis_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_lapis","pyrite:cut_lapis_slab","pyrite:cut_lapis_stairs","pyrite:smooth_lapis","pyrite:smooth_lapis_slab","pyrite:smooth_lapis_stairs","pyrite:lapis_bricks","pyrite:lapis_pillar","pyrite:chiseled_lapis_block","pyrite:lapis_door","pyrite:nostalgia_lapis_block","pyrite:cut_lapis_wall","pyrite:cut_lapis_wall_gate","pyrite:smooth_lapis_wall","pyrite:smooth_lapis_wall_gate","pyrite:lapis_bars","pyrite:lapis_trapdoor","pyrite:lapis_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/metal_bars.json b/common/src/main/resources/data/pyrite/tags/blocks/metal_bars.json index 67dd40d88..8a5a022f4 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/metal_bars.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/metal_bars.json @@ -1,18 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:diamond_bars", - "pyrite:amethyst_bars", - "pyrite:emerald_bars", - "pyrite:redstone_bars", - "pyrite:gold_bars", - "pyrite:copper_bars", - "pyrite:exposed_copper_bars", - "pyrite:weathered_copper_bars", - "pyrite:oxidized_copper_bars", - "pyrite:quartz_bars", - "pyrite:lapis_bars", - "pyrite:netherite_bars" - ] - } - +{"replace":false,"values":["pyrite:gold_bars","pyrite:emerald_bars","pyrite:diamond_bars","pyrite:netherite_bars","pyrite:quartz_bars","pyrite:amethyst_bars","pyrite:lapis_bars","pyrite:redstone_bars","pyrite:copper_bars","pyrite:exposed_copper_bars","pyrite:weathered_copper_bars","pyrite:oxidized_copper_bars"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/metal_buttons.json b/common/src/main/resources/data/pyrite/tags/blocks/metal_buttons.json index 0b5d019a6..3760444f7 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/metal_buttons.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/metal_buttons.json @@ -1,17 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:iron_button", - "pyrite:gold_button", - "pyrite:emerald_button", - "pyrite:diamond_button", - "pyrite:netherite_button", - "pyrite:quartz_button", - "pyrite:amethyst_button", - "pyrite:redstone_button", - "pyrite:lapis_button", - "pyrite:copper_button", - "pyrite:exposed_copper_button", - "pyrite:weathered_copper_button", - "pyrite:oxidized_copper_button" - ]} \ No newline at end of file +{"replace":false,"values":[{"id":"pyrite:iron_button","required":false},{"id":"pyrite:gold_button","required":false},{"id":"pyrite:emerald_button","required":false},{"id":"pyrite:diamond_button","required":false},{"id":"pyrite:netherite_button","required":false},{"id":"pyrite:quartz_button","required":false},{"id":"pyrite:amethyst_button","required":false},{"id":"pyrite:lapis_button","required":false},{"id":"pyrite:redstone_button","required":false},{"id":"pyrite:copper_button","required":false},{"id":"pyrite:exposed_copper_button","required":false},{"id":"pyrite:weathered_copper_button","required":false},{"id":"pyrite:oxidized_copper_button","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/metal_trapdoors.json b/common/src/main/resources/data/pyrite/tags/blocks/metal_trapdoors.json index 6e5bfa99d..00321b3e6 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/metal_trapdoors.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/metal_trapdoors.json @@ -1,15 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:gold_trapdoor", - "pyrite:emerald_trapdoor", - "pyrite:diamond_trapdoor", - "pyrite:netherite_trapdoor", - "pyrite:quartz_trapdoor", - "pyrite:amethyst_trapdoor", - "pyrite:lapis_trapdoor", - "pyrite:copper_trapdoor", - "pyrite:exposed_copper_trapdoor", - "pyrite:weathered_copper_trapdoor", - "pyrite:oxidized_copper_trapdoor" - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:gold_trapdoor","pyrite:emerald_trapdoor","pyrite:diamond_trapdoor","pyrite:netherite_trapdoor","pyrite:quartz_trapdoor","pyrite:amethyst_trapdoor","pyrite:lapis_trapdoor","pyrite:redstone_trapdoor","pyrite:copper_trapdoor","pyrite:exposed_copper_trapdoor","pyrite:weathered_copper_trapdoor","pyrite:oxidized_copper_trapdoor"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/mushroom_stem.json b/common/src/main/resources/data/pyrite/tags/blocks/mushroom_stem.json index 0de5b63ce..587406cc3 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/mushroom_stem.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/mushroom_stem.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:red_mushroom_stem", - "pyrite:brown_mushroom_stem" ] - } - +{"replace":false,"values":["pyrite:red_mushroom_stem","pyrite:brown_mushroom_stem"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/netherite.json b/common/src/main/resources/data/pyrite/tags/blocks/netherite.json index 84e40a0d2..5b665a8b1 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/netherite.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/netherite.json @@ -1,22 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_netherite", - "pyrite:cut_netherite_stairs", - "pyrite:cut_netherite_slab", - "pyrite:cut_netherite_wall", - "pyrite:cut_netherite_wall_gate", - "pyrite:netherite_bricks", - "pyrite:chiseled_netherite_block", - "pyrite:netherite_pillar", - "pyrite:smooth_netherite", - "pyrite:smooth_netherite_slab", - "pyrite:smooth_netherite_stairs", - "pyrite:smooth_netherite_wall_gate", - "pyrite:smooth_netherite_wall", - "pyrite:netherite_bars", - "pyrite:netherite_door", - "pyrite:nostalgia_netherite_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_netherite","pyrite:cut_netherite_slab","pyrite:cut_netherite_stairs","pyrite:smooth_netherite","pyrite:smooth_netherite_slab","pyrite:smooth_netherite_stairs","pyrite:netherite_bricks","pyrite:netherite_pillar","pyrite:chiseled_netherite_block","pyrite:netherite_door","pyrite:nostalgia_netherite_block","pyrite:cut_netherite_wall","pyrite:cut_netherite_wall_gate","pyrite:smooth_netherite_wall","pyrite:smooth_netherite_wall_gate","pyrite:netherite_bars","pyrite:netherite_trapdoor","pyrite:netherite_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/obsidian.json b/common/src/main/resources/data/pyrite/tags/blocks/obsidian.json index cb8700ad4..11b6f03ed 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/obsidian.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/obsidian.json @@ -1,10 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:glowing_obsidian", - "pyrite:nostalgia_glowing_obsidian" - - - ] -} - +{"replace":false,"values":["pyrite:glowing_obsidian","pyrite:nostalgia_glowing_obsidian"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/oxidized_copper.json b/common/src/main/resources/data/pyrite/tags/blocks/oxidized_copper.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/oxidized_copper.json rename to common/src/main/resources/data/pyrite/tags/blocks/oxidized_copper.json diff --git a/common/src/main/resources/data/pyrite/tags/blocks/quartz.json b/common/src/main/resources/data/pyrite/tags/blocks/quartz.json index b3793be78..648c414ef 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/quartz.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/quartz.json @@ -1,16 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_quartz", - "pyrite:cut_quartz_stairs", - "pyrite:cut_quartz_slab", - "pyrite:cut_quartz_wall", - "pyrite:cut_quartz_wall_gate", - "pyrite:quartz_bars", - "pyrite:quartz_door", - "pyrite:smooth_quartz_wall_gate", - "pyrite:smooth_quartz_wall", - "pyrite:nostalgia_quartz_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_quartz","pyrite:cut_quartz_slab","pyrite:cut_quartz_stairs","pyrite:quartz_door","pyrite:nostalgia_quartz_block","pyrite:cut_quartz_wall","pyrite:cut_quartz_wall_gate","pyrite:smooth_quartz_wall","pyrite:smooth_quartz_wall_gate","pyrite:quartz_bars","pyrite:quartz_trapdoor","pyrite:quartz_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/redstone.json b/common/src/main/resources/data/pyrite/tags/blocks/redstone.json index 4ff3df94e..f9b95023c 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/redstone.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/redstone.json @@ -1,22 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cut_redstone", - "pyrite:cut_redstone_stairs", - "pyrite:cut_redstone_slab", - "pyrite:cut_redstone_wall", - "pyrite:cut_redstone_wall_gate", - "pyrite:redstone_bricks", - "pyrite:chiseled_redstone_block", - "pyrite:redstone_pillar", - "pyrite:smooth_redstone", - "pyrite:smooth_redstone_slab", - "pyrite:smooth_redstone_stairs", - "pyrite:smooth_redstone_wall_gate", - "pyrite:smooth_redstone_wall", - "pyrite:redstone_bars", - "pyrite:redstone_door", - "pyrite:nostalgia_redstone_block" - - ] -} \ No newline at end of file +{"replace":false,"values":["pyrite:cut_redstone","pyrite:cut_redstone_slab","pyrite:cut_redstone_stairs","pyrite:smooth_redstone","pyrite:smooth_redstone_slab","pyrite:smooth_redstone_stairs","pyrite:redstone_bricks","pyrite:redstone_pillar","pyrite:chiseled_redstone_block","pyrite:redstone_door","pyrite:nostalgia_redstone_block","pyrite:cut_redstone_wall","pyrite:cut_redstone_wall_gate","pyrite:smooth_redstone_wall","pyrite:smooth_redstone_wall_gate","pyrite:redstone_bars","pyrite:redstone_trapdoor","pyrite:redstone_button"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/smooth_blocks.json b/common/src/main/resources/data/pyrite/tags/blocks/smooth_blocks.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/smooth_blocks.json rename to common/src/main/resources/data/pyrite/tags/blocks/smooth_blocks.json diff --git a/common/src/main/resources/data/pyrite/tags/block/stained_framed_glass.json b/common/src/main/resources/data/pyrite/tags/blocks/stained_framed_glass.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/stained_framed_glass.json rename to common/src/main/resources/data/pyrite/tags/blocks/stained_framed_glass.json diff --git a/common/src/main/resources/data/pyrite/tags/block/stained_glass.json b/common/src/main/resources/data/pyrite/tags/blocks/stained_glass.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/stained_glass.json rename to common/src/main/resources/data/pyrite/tags/blocks/stained_glass.json diff --git a/common/src/main/resources/data/pyrite/tags/blocks/terracotta.json b/common/src/main/resources/data/pyrite/tags/blocks/terracotta.json index 85485ce0d..ecf6cfd69 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/terracotta.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/terracotta.json @@ -1,11 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:glow_terracotta", - "pyrite:dragon_terracotta", - "pyrite:star_terracotta", - "pyrite:honey_terracotta", - "pyrite:nostalgia_terracotta", - "pyrite:rose_terracotta", - "pyrite:poisonous_terracotta" - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:glow_terracotta","pyrite:dragon_terracotta","pyrite:star_terracotta","pyrite:honey_terracotta","pyrite:nostalgia_terracotta","pyrite:rose_terracotta","pyrite:poisonous_terracotta"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/terracotta_bricks.json b/common/src/main/resources/data/pyrite/tags/blocks/terracotta_bricks.json index 760237acb..09386232f 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/terracotta_bricks.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/terracotta_bricks.json @@ -1,27 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_terracotta_bricks", - "pyrite:orange_terracotta_bricks", - "pyrite:magenta_terracotta_bricks", - "pyrite:light_blue_terracotta_bricks", - "pyrite:yellow_terracotta_bricks", - "pyrite:lime_terracotta_bricks", - "pyrite:pink_terracotta_bricks", - "pyrite:gray_terracotta_bricks", - "pyrite:light_gray_terracotta_bricks", - "pyrite:cyan_terracotta_bricks", - "pyrite:purple_terracotta_bricks", - "pyrite:blue_terracotta_bricks", - "pyrite:brown_terracotta_bricks", - "pyrite:green_terracotta_bricks", - "pyrite:red_terracotta_bricks", - "pyrite:black_terracotta_bricks", - "pyrite:glow_terracotta_bricks", - "pyrite:dragon_terracotta_bricks", - "pyrite:star_terracotta_bricks", - "pyrite:honey_terracotta_bricks", - "pyrite:nostalgia_terracotta_bricks", - "pyrite:rose_terracotta_bricks", - "pyrite:poisonous_terracotta_bricks" - ]} \ No newline at end of file +{"replace":false,"values":["pyrite:white_terracotta_bricks","pyrite:orange_terracotta_bricks","pyrite:magenta_terracotta_bricks","pyrite:light_blue_terracotta_bricks","pyrite:yellow_terracotta_bricks","pyrite:lime_terracotta_bricks","pyrite:pink_terracotta_bricks","pyrite:gray_terracotta_bricks","pyrite:light_gray_terracotta_bricks","pyrite:cyan_terracotta_bricks","pyrite:purple_terracotta_bricks","pyrite:blue_terracotta_bricks","pyrite:brown_terracotta_bricks","pyrite:green_terracotta_bricks","pyrite:red_terracotta_bricks","pyrite:black_terracotta_bricks","pyrite:glow_terracotta_bricks","pyrite:dragon_terracotta_bricks","pyrite:star_terracotta_bricks","pyrite:honey_terracotta_bricks","pyrite:nostalgia_terracotta_bricks","pyrite:rose_terracotta_bricks","pyrite:poisonous_terracotta_bricks","pyrite:terracotta_bricks"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/turf_blocks.json b/common/src/main/resources/data/pyrite/tags/blocks/turf_blocks.json index 279e4868c..c03c58802 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/turf_blocks.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/turf_blocks.json @@ -1,10 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:grass_turf", - "pyrite:path_turf", - "#pyrite:turf_stairs", - "#pyrite:turf_slabs" - ] -} - +{"replace":false,"values":["pyrite:nostalgia_grass_turf","pyrite:podzol_turf","pyrite:grass_turf","pyrite:mycelium_turf","pyrite:path_turf"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/turf_slabs.json b/common/src/main/resources/data/pyrite/tags/blocks/turf_slabs.json index b0107488b..f3edc5613 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/turf_slabs.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/turf_slabs.json @@ -1,12 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:grass_slab", - "pyrite:mycelium_slab", - "pyrite:podzol_slab", - "pyrite:path_slab", - "pyrite:nostalgia_grass_slab" - - ] -} - +{"replace":false,"values":["pyrite:nostalgia_grass_slab","pyrite:podzol_slab","pyrite:grass_slab","pyrite:mycelium_slab","pyrite:path_slab"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/turf_stairs.json b/common/src/main/resources/data/pyrite/tags/blocks/turf_stairs.json index 6dbcbb673..a9acdacf7 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/turf_stairs.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/turf_stairs.json @@ -1,12 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:grass_stairs", - "pyrite:nostalgia_grass_stairs", - "pyrite:mycelium_stairs", - "pyrite:podzol_stairs", - "pyrite:path_stairs" - - ] -} - +{"replace":false,"values":["pyrite:nostalgia_grass_stairs","pyrite:podzol_stairs","pyrite:grass_stairs","pyrite:mycelium_stairs","pyrite:path_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/blocks/wall_gates.json b/common/src/main/resources/data/pyrite/tags/blocks/wall_gates.json index 5fae297c8..4b05fa186 100644 --- a/common/src/main/resources/data/pyrite/tags/blocks/wall_gates.json +++ b/common/src/main/resources/data/pyrite/tags/blocks/wall_gates.json @@ -1,54 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:cobblestone_wall_gate", - "pyrite:smooth_stone_brick_wall_gate", - "pyrite:mossy_cobblestone_wall_gate", - "pyrite:stone_brick_wall_gate", - "pyrite:mossy_stone_brick_wall_gate", - "pyrite:granite_wall_gate", - "pyrite:diorite_wall_gate", - "pyrite:andesite_wall_gate", - "pyrite:cobbled_deepslate_wall_gate", - "pyrite:polished_deepslate_wall_gate", - "pyrite:deepslate_brick_wall_gate", - "pyrite:deepslate_tile_wall_gate", - "pyrite:brick_wall_gate", - "pyrite:mud_brick_wall_gate", - "pyrite:sandstone_wall_gate", - "pyrite:red_sandstone_wall_gate", - "pyrite:prismarine_wall_gate", - "pyrite:nether_brick_wall_gate", - "pyrite:red_nether_brick_wall_gate", - "pyrite:blackstone_wall_gate", - "pyrite:polished_blackstone_wall_gate", - "pyrite:polished_blackstone_brick_wall_gate", - "pyrite:end_stone_brick_wall_gate", - "pyrite:blue_nether_brick_wall_gate", - "pyrite:charred_nether_brick_wall_gate", - "pyrite:white_brick_wall_gate", - "pyrite:orange_brick_wall_gate", - "pyrite:magenta_brick_wall_gate", - "pyrite:light_blue_brick_wall_gate", - "pyrite:yellow_brick_wall_gate", - "pyrite:lime_brick_wall_gate", - "pyrite:pink_brick_wall_gate", - "pyrite:gray_brick_wall_gate", - "pyrite:light_gray_brick_wall_gate", - "pyrite:cyan_brick_wall_gate", - "pyrite:purple_brick_wall_gate", - "pyrite:blue_brick_wall_gate", - "pyrite:brown_brick_wall_gate", - "pyrite:green_brick_wall_gate", - "pyrite:red_brick_wall_gate", - "pyrite:black_brick_wall_gate", - "pyrite:glow_brick_wall_gate", - "pyrite:dragon_brick_wall_gate", - "pyrite:star_brick_wall_gate", - "pyrite:honey_brick_wall_gate", - "pyrite:nostalgia_brick_wall_gate", - "pyrite:rose_brick_wall_gate", - "#pyrite:terracotta_brick_wall_gates", - "#pyrite:metal_wall_gates" - ] - } \ No newline at end of file +{"replace":false,"values":["pyrite:white_brick_wall_gate","pyrite:white_terracotta_brick_wall_gate","pyrite:orange_brick_wall_gate","pyrite:orange_terracotta_brick_wall_gate","pyrite:magenta_brick_wall_gate","pyrite:magenta_terracotta_brick_wall_gate","pyrite:light_blue_brick_wall_gate","pyrite:light_blue_terracotta_brick_wall_gate","pyrite:yellow_brick_wall_gate","pyrite:yellow_terracotta_brick_wall_gate","pyrite:lime_brick_wall_gate","pyrite:lime_terracotta_brick_wall_gate","pyrite:pink_brick_wall_gate","pyrite:pink_terracotta_brick_wall_gate","pyrite:gray_brick_wall_gate","pyrite:gray_terracotta_brick_wall_gate","pyrite:light_gray_brick_wall_gate","pyrite:light_gray_terracotta_brick_wall_gate","pyrite:cyan_brick_wall_gate","pyrite:cyan_terracotta_brick_wall_gate","pyrite:purple_brick_wall_gate","pyrite:purple_terracotta_brick_wall_gate","pyrite:blue_brick_wall_gate","pyrite:blue_terracotta_brick_wall_gate","pyrite:brown_brick_wall_gate","pyrite:brown_terracotta_brick_wall_gate","pyrite:green_brick_wall_gate","pyrite:green_terracotta_brick_wall_gate","pyrite:red_brick_wall_gate","pyrite:red_terracotta_brick_wall_gate","pyrite:black_brick_wall_gate","pyrite:black_terracotta_brick_wall_gate","pyrite:glow_brick_wall_gate","pyrite:glow_terracotta_brick_wall_gate","pyrite:dragon_brick_wall_gate","pyrite:dragon_terracotta_brick_wall_gate","pyrite:star_brick_wall_gate","pyrite:star_terracotta_brick_wall_gate","pyrite:honey_brick_wall_gate","pyrite:honey_terracotta_brick_wall_gate","pyrite:nostalgia_brick_wall_gate","pyrite:nostalgia_terracotta_brick_wall_gate","pyrite:rose_brick_wall_gate","pyrite:rose_terracotta_brick_wall_gate","pyrite:poisonous_brick_wall_gate","pyrite:poisonous_terracotta_brick_wall_gate",{"id":"pyrite:holystone_wall_gate","required":false},{"id":"pyrite:mossy_holystone_wall_gate","required":false},{"id":"pyrite:holystone_brick_wall_gate","required":false},{"id":"pyrite:icestone_wall_gate","required":false},{"id":"pyrite:aerogel_wall_gate","required":false},{"id":"pyrite:carved_wall_gate","required":false},{"id":"pyrite:angelic_wall_gate","required":false},{"id":"pyrite:hellfire_wall_gate","required":false},"pyrite:cobblestone_brick_wall_gate","pyrite:mossy_cobblestone_brick_wall_gate","pyrite:smooth_stone_brick_wall_gate","pyrite:mossy_smooth_stone_brick_wall_gate","pyrite:granite_brick_wall_gate","pyrite:mossy_granite_brick_wall_gate","pyrite:andesite_brick_wall_gate","pyrite:mossy_andesite_brick_wall_gate","pyrite:diorite_brick_wall_gate","pyrite:mossy_diorite_brick_wall_gate","pyrite:calcite_brick_wall_gate","pyrite:mossy_calcite_brick_wall_gate","pyrite:mossy_deepslate_brick_wall_gate","pyrite:charred_nether_brick_wall_gate","pyrite:blue_nether_brick_wall_gate","pyrite:cobblestone_wall_gate","pyrite:mossy_cobblestone_wall_gate","pyrite:stone_brick_wall_gate","pyrite:mossy_stone_brick_wall_gate","pyrite:granite_wall_gate","pyrite:diorite_wall_gate","pyrite:andesite_wall_gate","pyrite:cobbled_deepslate_wall_gate","pyrite:polished_deepslate_wall_gate","pyrite:deepslate_brick_wall_gate","pyrite:deepslate_tile_wall_gate","pyrite:brick_wall_gate","pyrite:mud_brick_wall_gate","pyrite:sandstone_wall_gate","pyrite:red_sandstone_wall_gate","pyrite:prismarine_wall_gate","pyrite:nether_brick_wall_gate","pyrite:red_nether_brick_wall_gate","pyrite:blackstone_wall_gate","pyrite:polished_blackstone_wall_gate","pyrite:polished_blackstone_brick_wall_gate","pyrite:end_stone_brick_wall_gate","pyrite:cut_iron_wall_gate","pyrite:smooth_iron_wall_gate","pyrite:cut_gold_wall_gate","pyrite:smooth_gold_wall_gate","pyrite:cut_emerald_wall_gate","pyrite:smooth_emerald_wall_gate","pyrite:cut_diamond_wall_gate","pyrite:smooth_diamond_wall_gate","pyrite:cut_netherite_wall_gate","pyrite:smooth_netherite_wall_gate","pyrite:cut_quartz_wall_gate","pyrite:smooth_quartz_wall_gate","pyrite:cut_amethyst_wall_gate","pyrite:smooth_amethyst_wall_gate","pyrite:cut_lapis_wall_gate","pyrite:smooth_lapis_wall_gate","pyrite:cut_redstone_wall_gate","pyrite:smooth_redstone_wall_gate","pyrite:cut_copper_wall_gate","pyrite:smooth_copper_wall_gate","pyrite:cut_exposed_copper_wall_gate","pyrite:smooth_exposed_copper_wall_gate","pyrite:cut_weathered_copper_wall_gate","pyrite:smooth_weathered_copper_wall_gate","pyrite:cut_oxidized_copper_wall_gate","pyrite:smooth_oxidized_copper_wall_gate","pyrite:sandstone_brick_wall_gate","pyrite:terracotta_brick_wall_gate"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/block/weathered_copper.json b/common/src/main/resources/data/pyrite/tags/blocks/weathered_copper.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/weathered_copper.json rename to common/src/main/resources/data/pyrite/tags/blocks/weathered_copper.json diff --git a/common/src/main/resources/data/pyrite/tags/item/brick_stairs.json b/common/src/main/resources/data/pyrite/tags/item/brick_stairs.json deleted file mode 100644 index c89d449f9..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/brick_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_brick_stairs","pyrite:white_terracotta_brick_stairs","pyrite:orange_brick_stairs","pyrite:orange_terracotta_brick_stairs","pyrite:magenta_brick_stairs","pyrite:magenta_terracotta_brick_stairs","pyrite:light_blue_brick_stairs","pyrite:light_blue_terracotta_brick_stairs","pyrite:yellow_brick_stairs","pyrite:yellow_terracotta_brick_stairs","pyrite:lime_brick_stairs","pyrite:lime_terracotta_brick_stairs","pyrite:pink_brick_stairs","pyrite:pink_terracotta_brick_stairs","pyrite:gray_brick_stairs","pyrite:gray_terracotta_brick_stairs","pyrite:light_gray_brick_stairs","pyrite:light_gray_terracotta_brick_stairs","pyrite:cyan_brick_stairs","pyrite:cyan_terracotta_brick_stairs","pyrite:purple_brick_stairs","pyrite:purple_terracotta_brick_stairs","pyrite:blue_brick_stairs","pyrite:blue_terracotta_brick_stairs","pyrite:brown_brick_stairs","pyrite:brown_terracotta_brick_stairs","pyrite:green_brick_stairs","pyrite:green_terracotta_brick_stairs","pyrite:red_brick_stairs","pyrite:red_terracotta_brick_stairs","pyrite:black_brick_stairs","pyrite:black_terracotta_brick_stairs","pyrite:glow_brick_stairs","pyrite:glow_terracotta_brick_stairs","pyrite:dragon_brick_stairs","pyrite:dragon_terracotta_brick_stairs","pyrite:star_brick_stairs","pyrite:star_terracotta_brick_stairs","pyrite:honey_brick_stairs","pyrite:honey_terracotta_brick_stairs","pyrite:nostalgia_brick_stairs","pyrite:nostalgia_terracotta_brick_stairs","pyrite:rose_brick_stairs","pyrite:rose_terracotta_brick_stairs","pyrite:poisonous_brick_stairs","pyrite:poisonous_terracotta_brick_stairs","pyrite:cobblestone_brick_stairs","pyrite:mossy_cobblestone_brick_stairs","pyrite:smooth_stone_brick_stairs","pyrite:mossy_smooth_stone_brick_stairs","pyrite:granite_brick_stairs","pyrite:mossy_granite_brick_stairs","pyrite:andesite_brick_stairs","pyrite:mossy_andesite_brick_stairs","pyrite:diorite_brick_stairs","pyrite:mossy_diorite_brick_stairs","pyrite:calcite_brick_stairs","pyrite:mossy_calcite_brick_stairs","pyrite:mossy_deepslate_brick_stairs","pyrite:charred_nether_brick_stairs","pyrite:blue_nether_brick_stairs","pyrite:sandstone_brick_stairs","pyrite:terracotta_brick_stairs"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/brick_walls.json b/common/src/main/resources/data/pyrite/tags/item/brick_walls.json deleted file mode 100644 index c323d8431..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/brick_walls.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_brick_wall","pyrite:white_terracotta_brick_wall","pyrite:orange_brick_wall","pyrite:orange_terracotta_brick_wall","pyrite:magenta_brick_wall","pyrite:magenta_terracotta_brick_wall","pyrite:light_blue_brick_wall","pyrite:light_blue_terracotta_brick_wall","pyrite:yellow_brick_wall","pyrite:yellow_terracotta_brick_wall","pyrite:lime_brick_wall","pyrite:lime_terracotta_brick_wall","pyrite:pink_brick_wall","pyrite:pink_terracotta_brick_wall","pyrite:gray_brick_wall","pyrite:gray_terracotta_brick_wall","pyrite:light_gray_brick_wall","pyrite:light_gray_terracotta_brick_wall","pyrite:cyan_brick_wall","pyrite:cyan_terracotta_brick_wall","pyrite:purple_brick_wall","pyrite:purple_terracotta_brick_wall","pyrite:blue_brick_wall","pyrite:blue_terracotta_brick_wall","pyrite:brown_brick_wall","pyrite:brown_terracotta_brick_wall","pyrite:green_brick_wall","pyrite:green_terracotta_brick_wall","pyrite:red_brick_wall","pyrite:red_terracotta_brick_wall","pyrite:black_brick_wall","pyrite:black_terracotta_brick_wall","pyrite:glow_brick_wall","pyrite:glow_terracotta_brick_wall","pyrite:dragon_brick_wall","pyrite:dragon_terracotta_brick_wall","pyrite:star_brick_wall","pyrite:star_terracotta_brick_wall","pyrite:honey_brick_wall","pyrite:honey_terracotta_brick_wall","pyrite:nostalgia_brick_wall","pyrite:nostalgia_terracotta_brick_wall","pyrite:rose_brick_wall","pyrite:rose_terracotta_brick_wall","pyrite:poisonous_brick_wall","pyrite:poisonous_terracotta_brick_wall","pyrite:cobblestone_brick_wall","pyrite:mossy_cobblestone_brick_wall","pyrite:smooth_stone_brick_wall","pyrite:mossy_smooth_stone_brick_wall","pyrite:granite_brick_wall","pyrite:mossy_granite_brick_wall","pyrite:andesite_brick_wall","pyrite:mossy_andesite_brick_wall","pyrite:diorite_brick_wall","pyrite:mossy_diorite_brick_wall","pyrite:calcite_brick_wall","pyrite:mossy_calcite_brick_wall","pyrite:mossy_deepslate_brick_wall","pyrite:charred_nether_brick_wall","pyrite:blue_nether_brick_wall","pyrite:sandstone_brick_wall","pyrite:terracotta_brick_wall"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/crafting_tables.json b/common/src/main/resources/data/pyrite/tags/item/crafting_tables.json deleted file mode 100644 index af1cdfeda..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/crafting_tables.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:white_stained_crafting_table","required":false},{"id":"pyrite:orange_stained_crafting_table","required":false},{"id":"pyrite:magenta_stained_crafting_table","required":false},{"id":"pyrite:light_blue_stained_crafting_table","required":false},{"id":"pyrite:yellow_stained_crafting_table","required":false},{"id":"pyrite:lime_stained_crafting_table","required":false},{"id":"pyrite:pink_stained_crafting_table","required":false},{"id":"pyrite:gray_stained_crafting_table","required":false},{"id":"pyrite:light_gray_stained_crafting_table","required":false},{"id":"pyrite:cyan_stained_crafting_table","required":false},{"id":"pyrite:purple_stained_crafting_table","required":false},{"id":"pyrite:blue_stained_crafting_table","required":false},{"id":"pyrite:brown_stained_crafting_table","required":false},{"id":"pyrite:green_stained_crafting_table","required":false},{"id":"pyrite:red_stained_crafting_table","required":false},{"id":"pyrite:black_stained_crafting_table","required":false},{"id":"pyrite:glow_stained_crafting_table","required":false},{"id":"pyrite:dragon_stained_crafting_table","required":false},{"id":"pyrite:star_stained_crafting_table","required":false},{"id":"pyrite:honey_stained_crafting_table","required":false},{"id":"pyrite:nostalgia_stained_crafting_table","required":false},{"id":"pyrite:rose_stained_crafting_table","required":false},{"id":"pyrite:poisonous_stained_crafting_table","required":false},{"id":"pyrite:spruce_crafting_table","required":false},{"id":"pyrite:birch_crafting_table","required":false},{"id":"pyrite:jungle_crafting_table","required":false},{"id":"pyrite:acacia_crafting_table","required":false},{"id":"pyrite:dark_oak_crafting_table","required":false},{"id":"pyrite:mangrove_crafting_table","required":false},{"id":"pyrite:cherry_crafting_table","required":false},{"id":"pyrite:bamboo_crafting_table","required":false},{"id":"pyrite:crimson_crafting_table","required":false},{"id":"pyrite:warped_crafting_table","required":false},{"id":"pyrite:skyroot_crafting_table","required":false},{"id":"pyrite:red_mushroom_crafting_table","required":false},{"id":"pyrite:brown_mushroom_crafting_table","required":false},{"id":"pyrite:azalea_crafting_table","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/lamps.json b/common/src/main/resources/data/pyrite/tags/item/lamps.json deleted file mode 100644 index 8e0824c5f..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/lamps.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_lamp","pyrite:orange_lamp","pyrite:magenta_lamp","pyrite:light_blue_lamp","pyrite:yellow_lamp","pyrite:lime_lamp","pyrite:pink_lamp","pyrite:gray_lamp","pyrite:light_gray_lamp","pyrite:cyan_lamp","pyrite:purple_lamp","pyrite:blue_lamp","pyrite:brown_lamp","pyrite:green_lamp","pyrite:red_lamp","pyrite:black_lamp","pyrite:glow_lamp","pyrite:dragon_lamp","pyrite:star_lamp","pyrite:honey_lamp","pyrite:nostalgia_lamp","pyrite:rose_lamp","pyrite:poisonous_lamp","pyrite:glowstone_lamp","pyrite:lit_redstone_lamp"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/metal_bars.json b/common/src/main/resources/data/pyrite/tags/item/metal_bars.json deleted file mode 100644 index 8a5a022f4..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/metal_bars.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:gold_bars","pyrite:emerald_bars","pyrite:diamond_bars","pyrite:netherite_bars","pyrite:quartz_bars","pyrite:amethyst_bars","pyrite:lapis_bars","pyrite:redstone_bars","pyrite:copper_bars","pyrite:exposed_copper_bars","pyrite:weathered_copper_bars","pyrite:oxidized_copper_bars"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/metal_buttons.json b/common/src/main/resources/data/pyrite/tags/item/metal_buttons.json deleted file mode 100644 index 3760444f7..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/metal_buttons.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":[{"id":"pyrite:iron_button","required":false},{"id":"pyrite:gold_button","required":false},{"id":"pyrite:emerald_button","required":false},{"id":"pyrite:diamond_button","required":false},{"id":"pyrite:netherite_button","required":false},{"id":"pyrite:quartz_button","required":false},{"id":"pyrite:amethyst_button","required":false},{"id":"pyrite:lapis_button","required":false},{"id":"pyrite:redstone_button","required":false},{"id":"pyrite:copper_button","required":false},{"id":"pyrite:exposed_copper_button","required":false},{"id":"pyrite:weathered_copper_button","required":false},{"id":"pyrite:oxidized_copper_button","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/metal_trapdoors.json b/common/src/main/resources/data/pyrite/tags/item/metal_trapdoors.json deleted file mode 100644 index 00321b3e6..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/metal_trapdoors.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:gold_trapdoor","pyrite:emerald_trapdoor","pyrite:diamond_trapdoor","pyrite:netherite_trapdoor","pyrite:quartz_trapdoor","pyrite:amethyst_trapdoor","pyrite:lapis_trapdoor","pyrite:redstone_trapdoor","pyrite:copper_trapdoor","pyrite:exposed_copper_trapdoor","pyrite:weathered_copper_trapdoor","pyrite:oxidized_copper_trapdoor"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/mushroom_stem.json b/common/src/main/resources/data/pyrite/tags/item/mushroom_stem.json deleted file mode 100644 index 587406cc3..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/mushroom_stem.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:red_mushroom_stem","pyrite:brown_mushroom_stem"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/terracotta.json b/common/src/main/resources/data/pyrite/tags/item/terracotta.json deleted file mode 100644 index ecf6cfd69..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/terracotta.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:glow_terracotta","pyrite:dragon_terracotta","pyrite:star_terracotta","pyrite:honey_terracotta","pyrite:nostalgia_terracotta","pyrite:rose_terracotta","pyrite:poisonous_terracotta"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/wall_gates.json b/common/src/main/resources/data/pyrite/tags/item/wall_gates.json deleted file mode 100644 index 4b05fa186..000000000 --- a/common/src/main/resources/data/pyrite/tags/item/wall_gates.json +++ /dev/null @@ -1 +0,0 @@ -{"replace":false,"values":["pyrite:white_brick_wall_gate","pyrite:white_terracotta_brick_wall_gate","pyrite:orange_brick_wall_gate","pyrite:orange_terracotta_brick_wall_gate","pyrite:magenta_brick_wall_gate","pyrite:magenta_terracotta_brick_wall_gate","pyrite:light_blue_brick_wall_gate","pyrite:light_blue_terracotta_brick_wall_gate","pyrite:yellow_brick_wall_gate","pyrite:yellow_terracotta_brick_wall_gate","pyrite:lime_brick_wall_gate","pyrite:lime_terracotta_brick_wall_gate","pyrite:pink_brick_wall_gate","pyrite:pink_terracotta_brick_wall_gate","pyrite:gray_brick_wall_gate","pyrite:gray_terracotta_brick_wall_gate","pyrite:light_gray_brick_wall_gate","pyrite:light_gray_terracotta_brick_wall_gate","pyrite:cyan_brick_wall_gate","pyrite:cyan_terracotta_brick_wall_gate","pyrite:purple_brick_wall_gate","pyrite:purple_terracotta_brick_wall_gate","pyrite:blue_brick_wall_gate","pyrite:blue_terracotta_brick_wall_gate","pyrite:brown_brick_wall_gate","pyrite:brown_terracotta_brick_wall_gate","pyrite:green_brick_wall_gate","pyrite:green_terracotta_brick_wall_gate","pyrite:red_brick_wall_gate","pyrite:red_terracotta_brick_wall_gate","pyrite:black_brick_wall_gate","pyrite:black_terracotta_brick_wall_gate","pyrite:glow_brick_wall_gate","pyrite:glow_terracotta_brick_wall_gate","pyrite:dragon_brick_wall_gate","pyrite:dragon_terracotta_brick_wall_gate","pyrite:star_brick_wall_gate","pyrite:star_terracotta_brick_wall_gate","pyrite:honey_brick_wall_gate","pyrite:honey_terracotta_brick_wall_gate","pyrite:nostalgia_brick_wall_gate","pyrite:nostalgia_terracotta_brick_wall_gate","pyrite:rose_brick_wall_gate","pyrite:rose_terracotta_brick_wall_gate","pyrite:poisonous_brick_wall_gate","pyrite:poisonous_terracotta_brick_wall_gate",{"id":"pyrite:holystone_wall_gate","required":false},{"id":"pyrite:mossy_holystone_wall_gate","required":false},{"id":"pyrite:holystone_brick_wall_gate","required":false},{"id":"pyrite:icestone_wall_gate","required":false},{"id":"pyrite:aerogel_wall_gate","required":false},{"id":"pyrite:carved_wall_gate","required":false},{"id":"pyrite:angelic_wall_gate","required":false},{"id":"pyrite:hellfire_wall_gate","required":false},"pyrite:cobblestone_brick_wall_gate","pyrite:mossy_cobblestone_brick_wall_gate","pyrite:smooth_stone_brick_wall_gate","pyrite:mossy_smooth_stone_brick_wall_gate","pyrite:granite_brick_wall_gate","pyrite:mossy_granite_brick_wall_gate","pyrite:andesite_brick_wall_gate","pyrite:mossy_andesite_brick_wall_gate","pyrite:diorite_brick_wall_gate","pyrite:mossy_diorite_brick_wall_gate","pyrite:calcite_brick_wall_gate","pyrite:mossy_calcite_brick_wall_gate","pyrite:mossy_deepslate_brick_wall_gate","pyrite:charred_nether_brick_wall_gate","pyrite:blue_nether_brick_wall_gate","pyrite:cobblestone_wall_gate","pyrite:mossy_cobblestone_wall_gate","pyrite:stone_brick_wall_gate","pyrite:mossy_stone_brick_wall_gate","pyrite:granite_wall_gate","pyrite:diorite_wall_gate","pyrite:andesite_wall_gate","pyrite:cobbled_deepslate_wall_gate","pyrite:polished_deepslate_wall_gate","pyrite:deepslate_brick_wall_gate","pyrite:deepslate_tile_wall_gate","pyrite:brick_wall_gate","pyrite:mud_brick_wall_gate","pyrite:sandstone_wall_gate","pyrite:red_sandstone_wall_gate","pyrite:prismarine_wall_gate","pyrite:nether_brick_wall_gate","pyrite:red_nether_brick_wall_gate","pyrite:blackstone_wall_gate","pyrite:polished_blackstone_wall_gate","pyrite:polished_blackstone_brick_wall_gate","pyrite:end_stone_brick_wall_gate","pyrite:cut_iron_wall_gate","pyrite:smooth_iron_wall_gate","pyrite:cut_gold_wall_gate","pyrite:smooth_gold_wall_gate","pyrite:cut_emerald_wall_gate","pyrite:smooth_emerald_wall_gate","pyrite:cut_diamond_wall_gate","pyrite:smooth_diamond_wall_gate","pyrite:cut_netherite_wall_gate","pyrite:smooth_netherite_wall_gate","pyrite:cut_quartz_wall_gate","pyrite:smooth_quartz_wall_gate","pyrite:cut_amethyst_wall_gate","pyrite:smooth_amethyst_wall_gate","pyrite:cut_lapis_wall_gate","pyrite:smooth_lapis_wall_gate","pyrite:cut_redstone_wall_gate","pyrite:smooth_redstone_wall_gate","pyrite:cut_copper_wall_gate","pyrite:smooth_copper_wall_gate","pyrite:cut_exposed_copper_wall_gate","pyrite:smooth_exposed_copper_wall_gate","pyrite:cut_weathered_copper_wall_gate","pyrite:smooth_weathered_copper_wall_gate","pyrite:cut_oxidized_copper_wall_gate","pyrite:smooth_oxidized_copper_wall_gate","pyrite:sandstone_brick_wall_gate","pyrite:terracotta_brick_wall_gate"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/amethyst.json b/common/src/main/resources/data/pyrite/tags/items/amethyst.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/amethyst.json rename to common/src/main/resources/data/pyrite/tags/items/amethyst.json diff --git a/common/src/main/resources/data/pyrite/tags/item/azalea_logs.json b/common/src/main/resources/data/pyrite/tags/items/azalea_logs.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/azalea_logs.json rename to common/src/main/resources/data/pyrite/tags/items/azalea_logs.json diff --git a/common/src/main/resources/data/pyrite/tags/block/brick_stairs.json b/common/src/main/resources/data/pyrite/tags/items/brick_stairs.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/brick_stairs.json rename to common/src/main/resources/data/pyrite/tags/items/brick_stairs.json diff --git a/common/src/main/resources/data/pyrite/tags/block/brick_walls.json b/common/src/main/resources/data/pyrite/tags/items/brick_walls.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/brick_walls.json rename to common/src/main/resources/data/pyrite/tags/items/brick_walls.json diff --git a/common/src/main/resources/data/pyrite/tags/item/bricks.json b/common/src/main/resources/data/pyrite/tags/items/bricks.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/bricks.json rename to common/src/main/resources/data/pyrite/tags/items/bricks.json diff --git a/common/src/main/resources/data/pyrite/tags/item/concrete_slabs.json b/common/src/main/resources/data/pyrite/tags/items/concrete_slabs.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/concrete_slabs.json rename to common/src/main/resources/data/pyrite/tags/items/concrete_slabs.json diff --git a/common/src/main/resources/data/pyrite/tags/item/concrete_stairs.json b/common/src/main/resources/data/pyrite/tags/items/concrete_stairs.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/concrete_stairs.json rename to common/src/main/resources/data/pyrite/tags/items/concrete_stairs.json diff --git a/common/src/main/resources/data/pyrite/tags/item/copper.json b/common/src/main/resources/data/pyrite/tags/items/copper.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/copper.json rename to common/src/main/resources/data/pyrite/tags/items/copper.json diff --git a/common/src/main/resources/data/pyrite/tags/items/crafting_tables.json b/common/src/main/resources/data/pyrite/tags/items/crafting_tables.json index 60bf97cf5..af1cdfeda 100644 --- a/common/src/main/resources/data/pyrite/tags/items/crafting_tables.json +++ b/common/src/main/resources/data/pyrite/tags/items/crafting_tables.json @@ -1,40 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:white_stained_crafting_table", - "pyrite:orange_stained_crafting_table", - "pyrite:magenta_stained_crafting_table", - "pyrite:light_blue_stained_crafting_table", - "pyrite:yellow_stained_crafting_table", - "pyrite:lime_stained_crafting_table", - "pyrite:pink_stained_crafting_table", - "pyrite:gray_stained_crafting_table", - "pyrite:light_gray_stained_crafting_table", - "pyrite:cyan_stained_crafting_table", - "pyrite:purple_stained_crafting_table", - "pyrite:blue_stained_crafting_table", - "pyrite:brown_stained_crafting_table", - "pyrite:green_stained_crafting_table", - "pyrite:red_stained_crafting_table", - "pyrite:black_stained_crafting_table", - "pyrite:glow_stained_crafting_table", - "pyrite:dragon_stained_crafting_table", - "pyrite:star_stained_crafting_table", - "pyrite:honey_stained_crafting_table", - "pyrite:nostalgia_stained_crafting_table", - "pyrite:rose_stained_crafting_table", - "pyrite:red_mushroom_crafting_table", - "pyrite:poisonous_stained_crafting_table", - "pyrite:brown_mushroom_crafting_table", - "pyrite:spruce_crafting_table", - "pyrite:birch_crafting_table", - "pyrite:jungle_crafting_table", - "pyrite:acacia_crafting_table", - "pyrite:dark_oak_crafting_table", - "pyrite:mangrove_crafting_table", - "pyrite:cherry_crafting_table", - "pyrite:bamboo_crafting_table", - "pyrite:crimson_crafting_table", - "pyrite:warped_crafting_table" - ] -} +{"replace":false,"values":[{"id":"pyrite:white_stained_crafting_table","required":false},{"id":"pyrite:orange_stained_crafting_table","required":false},{"id":"pyrite:magenta_stained_crafting_table","required":false},{"id":"pyrite:light_blue_stained_crafting_table","required":false},{"id":"pyrite:yellow_stained_crafting_table","required":false},{"id":"pyrite:lime_stained_crafting_table","required":false},{"id":"pyrite:pink_stained_crafting_table","required":false},{"id":"pyrite:gray_stained_crafting_table","required":false},{"id":"pyrite:light_gray_stained_crafting_table","required":false},{"id":"pyrite:cyan_stained_crafting_table","required":false},{"id":"pyrite:purple_stained_crafting_table","required":false},{"id":"pyrite:blue_stained_crafting_table","required":false},{"id":"pyrite:brown_stained_crafting_table","required":false},{"id":"pyrite:green_stained_crafting_table","required":false},{"id":"pyrite:red_stained_crafting_table","required":false},{"id":"pyrite:black_stained_crafting_table","required":false},{"id":"pyrite:glow_stained_crafting_table","required":false},{"id":"pyrite:dragon_stained_crafting_table","required":false},{"id":"pyrite:star_stained_crafting_table","required":false},{"id":"pyrite:honey_stained_crafting_table","required":false},{"id":"pyrite:nostalgia_stained_crafting_table","required":false},{"id":"pyrite:rose_stained_crafting_table","required":false},{"id":"pyrite:poisonous_stained_crafting_table","required":false},{"id":"pyrite:spruce_crafting_table","required":false},{"id":"pyrite:birch_crafting_table","required":false},{"id":"pyrite:jungle_crafting_table","required":false},{"id":"pyrite:acacia_crafting_table","required":false},{"id":"pyrite:dark_oak_crafting_table","required":false},{"id":"pyrite:mangrove_crafting_table","required":false},{"id":"pyrite:cherry_crafting_table","required":false},{"id":"pyrite:bamboo_crafting_table","required":false},{"id":"pyrite:crimson_crafting_table","required":false},{"id":"pyrite:warped_crafting_table","required":false},{"id":"pyrite:skyroot_crafting_table","required":false},{"id":"pyrite:red_mushroom_crafting_table","required":false},{"id":"pyrite:brown_mushroom_crafting_table","required":false},{"id":"pyrite:azalea_crafting_table","required":false}]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/diamond.json b/common/src/main/resources/data/pyrite/tags/items/diamond.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/diamond.json rename to common/src/main/resources/data/pyrite/tags/items/diamond.json diff --git a/common/src/main/resources/data/pyrite/tags/item/dyed_bricks.json b/common/src/main/resources/data/pyrite/tags/items/dyed_bricks.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/dyed_bricks.json rename to common/src/main/resources/data/pyrite/tags/items/dyed_bricks.json diff --git a/common/src/main/resources/data/pyrite/tags/item/emerald.json b/common/src/main/resources/data/pyrite/tags/items/emerald.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/emerald.json rename to common/src/main/resources/data/pyrite/tags/items/emerald.json diff --git a/common/src/main/resources/data/pyrite/tags/item/exposed_copper.json b/common/src/main/resources/data/pyrite/tags/items/exposed_copper.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/exposed_copper.json rename to common/src/main/resources/data/pyrite/tags/items/exposed_copper.json diff --git a/common/src/main/resources/data/pyrite/tags/item/fences.json b/common/src/main/resources/data/pyrite/tags/items/fences.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/fences.json rename to common/src/main/resources/data/pyrite/tags/items/fences.json diff --git a/common/src/main/resources/data/pyrite/tags/item/gold.json b/common/src/main/resources/data/pyrite/tags/items/gold.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/gold.json rename to common/src/main/resources/data/pyrite/tags/items/gold.json diff --git a/common/src/main/resources/data/pyrite/tags/item/iron.json b/common/src/main/resources/data/pyrite/tags/items/iron.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/iron.json rename to common/src/main/resources/data/pyrite/tags/items/iron.json diff --git a/common/src/main/resources/data/pyrite/tags/block/lamps.json b/common/src/main/resources/data/pyrite/tags/items/lamps.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/lamps.json rename to common/src/main/resources/data/pyrite/tags/items/lamps.json diff --git a/common/src/main/resources/data/pyrite/tags/item/lapis.json b/common/src/main/resources/data/pyrite/tags/items/lapis.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/lapis.json rename to common/src/main/resources/data/pyrite/tags/items/lapis.json diff --git a/common/src/main/resources/data/pyrite/tags/block/metal_bars.json b/common/src/main/resources/data/pyrite/tags/items/metal_bars.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/metal_bars.json rename to common/src/main/resources/data/pyrite/tags/items/metal_bars.json diff --git a/common/src/main/resources/data/pyrite/tags/block/metal_buttons.json b/common/src/main/resources/data/pyrite/tags/items/metal_buttons.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/metal_buttons.json rename to common/src/main/resources/data/pyrite/tags/items/metal_buttons.json diff --git a/common/src/main/resources/data/pyrite/tags/block/metal_trapdoors.json b/common/src/main/resources/data/pyrite/tags/items/metal_trapdoors.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/metal_trapdoors.json rename to common/src/main/resources/data/pyrite/tags/items/metal_trapdoors.json diff --git a/common/src/main/resources/data/pyrite/tags/items/mushroom_stem.json b/common/src/main/resources/data/pyrite/tags/items/mushroom_stem.json index 0de5b63ce..587406cc3 100644 --- a/common/src/main/resources/data/pyrite/tags/items/mushroom_stem.json +++ b/common/src/main/resources/data/pyrite/tags/items/mushroom_stem.json @@ -1,7 +1 @@ -{ - "replace": false, - "values": [ - "pyrite:red_mushroom_stem", - "pyrite:brown_mushroom_stem" ] - } - +{"replace":false,"values":["pyrite:red_mushroom_stem","pyrite:brown_mushroom_stem"]} \ No newline at end of file diff --git a/common/src/main/resources/data/pyrite/tags/item/netherite.json b/common/src/main/resources/data/pyrite/tags/items/netherite.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/netherite.json rename to common/src/main/resources/data/pyrite/tags/items/netherite.json diff --git a/common/src/main/resources/data/pyrite/tags/item/oxidized_copper.json b/common/src/main/resources/data/pyrite/tags/items/oxidized_copper.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/oxidized_copper.json rename to common/src/main/resources/data/pyrite/tags/items/oxidized_copper.json diff --git a/common/src/main/resources/data/pyrite/tags/item/quartz.json b/common/src/main/resources/data/pyrite/tags/items/quartz.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/quartz.json rename to common/src/main/resources/data/pyrite/tags/items/quartz.json diff --git a/common/src/main/resources/data/pyrite/tags/item/redstone.json b/common/src/main/resources/data/pyrite/tags/items/redstone.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/redstone.json rename to common/src/main/resources/data/pyrite/tags/items/redstone.json diff --git a/common/src/main/resources/data/pyrite/tags/item/stained_framed_glass.json b/common/src/main/resources/data/pyrite/tags/items/stained_framed_glass.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/stained_framed_glass.json rename to common/src/main/resources/data/pyrite/tags/items/stained_framed_glass.json diff --git a/common/src/main/resources/data/pyrite/tags/item/stained_glass.json b/common/src/main/resources/data/pyrite/tags/items/stained_glass.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/stained_glass.json rename to common/src/main/resources/data/pyrite/tags/items/stained_glass.json diff --git a/common/src/main/resources/data/minecraft/tags/item/terracotta.json b/common/src/main/resources/data/pyrite/tags/items/terracotta.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/item/terracotta.json rename to common/src/main/resources/data/pyrite/tags/items/terracotta.json diff --git a/common/src/main/resources/data/pyrite/tags/block/wall_gates.json b/common/src/main/resources/data/pyrite/tags/items/wall_gates.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/block/wall_gates.json rename to common/src/main/resources/data/pyrite/tags/items/wall_gates.json diff --git a/common/src/main/resources/data/pyrite/tags/item/weathered_copper.json b/common/src/main/resources/data/pyrite/tags/items/weathered_copper.json similarity index 100% rename from common/src/main/resources/data/pyrite/tags/item/weathered_copper.json rename to common/src/main/resources/data/pyrite/tags/items/weathered_copper.json diff --git a/fabric/src/main/java/cc/cassian/pyrite/functions/fabric/BlockCreatorImpl.java b/fabric/src/main/java/cc/cassian/pyrite/functions/fabric/BlockCreatorImpl.java index d90913eb4..c8042c9bd 100644 --- a/fabric/src/main/java/cc/cassian/pyrite/functions/fabric/BlockCreatorImpl.java +++ b/fabric/src/main/java/cc/cassian/pyrite/functions/fabric/BlockCreatorImpl.java @@ -168,6 +168,11 @@ else if (power == 15) case "flower": newBlock = new FlowerBlock(StatusEffects.NIGHT_VISION, 5, blockSettings); addTransparentBlock(newBlock); + // register flower pot + final Block FLOWER_POTTED = Blocks.createFlowerPotBlock(newBlock); + BLOCKS_ITEMLESS.add(FLOWER_POTTED); + BLOCK_IDS_ITEMLESS.add("potted_"+blockID); + addTransparentBlock(FLOWER_POTTED); break; case "fence_gate": newBlock = new FenceGateBlock(blockSettings, woodType); diff --git a/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java b/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java index acd8787ad..eceb261e0 100644 --- a/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java +++ b/forge/src/main/java/cc/cassian/pyrite/forge/PyriteForge.java @@ -21,6 +21,7 @@ public PyriteForge() { modEventBus.addListener(PyriteForgeClient::registerBlockColors); modEventBus.addListener(PyriteForgeClient::registerItemColorHandlers); } + modEventBus.addListener(BlockCreatorImpl::commonSetup); diff --git a/forge/src/main/java/cc/cassian/pyrite/functions/forge/BlockCreatorImpl.java b/forge/src/main/java/cc/cassian/pyrite/functions/forge/BlockCreatorImpl.java index 8af48bc98..408b5a771 100644 --- a/forge/src/main/java/cc/cassian/pyrite/functions/forge/BlockCreatorImpl.java +++ b/forge/src/main/java/cc/cassian/pyrite/functions/forge/BlockCreatorImpl.java @@ -3,6 +3,7 @@ import cc.cassian.pyrite.blocks.*; import cc.cassian.pyrite.functions.ModLists; import net.minecraft.block.*; +import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.*; import net.minecraft.particle.ParticleEffect; @@ -10,11 +11,16 @@ import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKeys; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.Map; import java.util.Objects; import java.util.function.Supplier; @@ -46,6 +52,7 @@ public class BlockCreatorImpl { public static final ArrayList> REDSTONE_BLOCKS = new ArrayList<>(); public static final ArrayList> MISC_BLOCKS = new ArrayList<>(); public static final ArrayList MISC_BLOCKS_UNSORTED = new ArrayList<>(); + public static final LinkedHashMap> POTTED_FLOWERS = new LinkedHashMap<>(); /** @@ -151,7 +158,9 @@ else if (power == 15) newBlock = BLOCKS.register(blockID, () -> new FallingBlock(blockSettings)); break; case "flower": - newBlock = BLOCKS.register(blockID, () -> new FlowerBlock(StatusEffects.NIGHT_VISION, 5, blockSettings)); + newBlock = BLOCKS.register(blockID, () -> new FlowerBlock(() -> StatusEffects.NIGHT_VISION, 5, blockSettings)); + var pot = BLOCKS.register("potted_"+blockID, () -> new FlowerPotBlock(() -> (FlowerPotBlock) Blocks.FLOWER_POT, newBlock, AbstractBlock.Settings.create().breakInstantly().nonOpaque().pistonBehavior(PistonBehavior.DESTROY))); + POTTED_FLOWERS.put(blockID, pot); break; case "fence_gate": newBlock = BLOCKS.register(blockID, () -> new FenceGateBlock(blockSettings, woodType)); @@ -301,4 +310,15 @@ public static void register(IEventBus eventBus) { addItemGroup("redstone_group", REDSTONE_ICON, REDSTONE_BLOCKS); addItemGroup("pyrite_group", MISC_ICON, MISC_BLOCKS); } + + // Adds Pyrite's flowers to the flower pot block. + @SubscribeEvent + public static void commonSetup(FMLCommonSetupEvent event) { + FlowerPotBlock pot = (FlowerPotBlock) Blocks.FLOWER_POT; + for (Map.Entry> entry : POTTED_FLOWERS.entrySet()) { + String flowerID = entry.getKey(); + Supplier flowerPot = entry.getValue(); + pot.addPlant(Identifier.of(MOD_ID, flowerID), flowerPot); + } + } } \ No newline at end of file diff --git a/forge/src/main/resources/data/forge/tags/blocks/glass.json b/forge/src/main/resources/data/forge/tags/blocks/glass.json new file mode 100644 index 000000000..0e8d592c1 --- /dev/null +++ b/forge/src/main/resources/data/forge/tags/blocks/glass.json @@ -0,0 +1 @@ +{"replace":false,"values":["pyrite:white_framed_glass","pyrite:orange_framed_glass","pyrite:magenta_framed_glass","pyrite:light_blue_framed_glass","pyrite:yellow_framed_glass","pyrite:lime_framed_glass","pyrite:pink_framed_glass","pyrite:gray_framed_glass","pyrite:light_gray_framed_glass","pyrite:cyan_framed_glass","pyrite:purple_framed_glass","pyrite:blue_framed_glass","pyrite:brown_framed_glass","pyrite:green_framed_glass","pyrite:red_framed_glass","pyrite:black_framed_glass","pyrite:glow_framed_glass","pyrite:dragon_framed_glass","pyrite:star_framed_glass","pyrite:honey_framed_glass","pyrite:nostalgia_framed_glass","pyrite:rose_framed_glass","pyrite:poisonous_framed_glass","pyrite:glow_stained_glass","pyrite:dragon_stained_glass","pyrite:star_stained_glass","pyrite:honey_stained_glass","pyrite:nostalgia_stained_glass","pyrite:rose_stained_glass","pyrite:poisonous_stained_glass"]} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 152c7823a..cb05c3249 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 0.15.9 +mod_version = 0.15.10 maven_group = cc.cassian archives_name = pyrite enabled_platforms = fabric,forge