From 857e0d4852fbbef60abd52254cfb5f130235df91 Mon Sep 17 00:00:00 2001 From: Andromander Date: Sat, 20 Mar 2021 23:36:34 +1000 Subject: [PATCH] Work on tag gen --- .../data/forge/tags/blocks/dirt.json | 0 .../data/forge/tags/blocks/glass.json | 7 + .../forge/tags/blocks/ore}/blue_opal.json | 0 .../data/forge/tags/blocks/ore}/cinnabar.json | 0 .../forge/tags/blocks/ore}/green_opal.json | 0 .../data/forge/tags/blocks/ore}/hematite.json | 0 .../forge/tags/blocks/ore}/labradorite.json | 0 .../forge/tags/blocks/ore}/moonstone.json | 0 .../data/forge/tags/blocks/ore}/pyrite.json | 0 .../data/forge/tags/blocks/ore}/red_opal.json | 0 .../data/forge/tags/blocks/ore}/sugilite.json | 0 .../forge/tags/blocks/ore}/white_opal.json | 0 .../data/forge/tags/blocks/ores.json | 15 ++ .../forge/tags/blocks/storage_blocks.json | 0 .../tags/blocks/storage_blocks/aura.json | 0 .../tags/blocks/storage_blocks/benitoite.json | 0 .../tags/blocks/storage_blocks/bismuth.json | 0 .../tags/blocks/storage_blocks/blue_opal.json | 0 .../tags/blocks/storage_blocks/carnelian.json | 0 .../blocks/storage_blocks/chalcedony.json | 0 .../tags/blocks/storage_blocks/cinnabar.json | 0 .../tags/blocks/storage_blocks/diopside.json | 0 .../tags/blocks/storage_blocks/euclase.json | 0 .../tags/blocks/storage_blocks/goldstone.json | 0 .../blocks/storage_blocks/green_opal.json | 0 .../tags/blocks/storage_blocks/hematite.json | 0 .../tags/blocks/storage_blocks/ixiolite.json | 0 .../blocks/storage_blocks/labradorite.json | 0 .../tags/blocks/storage_blocks/leucite.json | 0 .../tags/blocks/storage_blocks/moonstone.json | 0 .../tags/blocks/storage_blocks/proustite.json | 0 .../tags/blocks/storage_blocks/pyrite.json | 0 .../tags/blocks/storage_blocks/red_opal.json | 0 .../tags/blocks/storage_blocks/sugilite.json | 0 .../tags/blocks/storage_blocks/tektite.json | 0 .../blocks/storage_blocks/white_opal.json | 0 .../data/forge/tags/items/bones.json | 0 .../data/forge/tags/items/dusts.json | 0 .../data/forge/tags/items/dusts/fine.json | 0 .../forge/tags/items/dusts/goldstone.json | 0 .../data/forge/tags/items/dusts/hot.json | 0 .../resources/data/forge/tags/items/gems.json | 0 .../data/forge/tags/items/gems/aura.json | 0 .../data/forge/tags/items/gems/benitoite.json | 0 .../data/forge/tags/items/gems/bismuth.json | 0 .../data/forge/tags/items/gems/blue_opal.json | 0 .../data/forge/tags/items/gems/carnelian.json | 0 .../forge/tags/items/gems/chalcedony.json | 0 .../data/forge/tags/items/gems/cinnabar.json | 0 .../data/forge/tags/items/gems/diopside.json | 0 .../data/forge/tags/items/gems/euclase.json | 0 .../data/forge/tags/items/gems/goldstone.json | 0 .../forge/tags/items/gems/green_opal.json | 0 .../data/forge/tags/items/gems/hematite.json | 0 .../data/forge/tags/items/gems/ixiolite.json | 0 .../forge/tags/items/gems/labradorite.json | 0 .../data/forge/tags/items/gems/leucite.json | 0 .../data/forge/tags/items/gems/moonstone.json | 0 .../data/forge/tags/items/gems/proustite.json | 0 .../data/forge/tags/items/gems/pyrite.json | 0 .../data/forge/tags/items/gems/red_opal.json | 0 .../data/forge/tags/items/gems/sugilite.json | 0 .../data/forge/tags/items/gems/tektite.json | 0 .../forge/tags/items/gems/white_opal.json | 0 .../data/forge/tags/items/ingots.json | 0 .../data/forge/tags/items/ingots/scaynyx.json | 0 .../data/forge/tags/items/ore}/blue_opal.json | 0 .../data/forge/tags/items/ore}/cinnabar.json | 0 .../forge/tags/items/ore}/green_opal.json | 0 .../data/forge/tags/items/ore}/hematite.json | 0 .../forge/tags/items/ore}/labradorite.json | 0 .../data/forge/tags/items/ore}/moonstone.json | 0 .../data/forge/tags/items/ore}/pyrite.json | 0 .../data/forge/tags/items/ore}/red_opal.json | 0 .../data/forge/tags/items/ore}/sugilite.json | 0 .../forge/tags/items/ore}/white_opal.json | 0 .../resources/data/forge/tags/items/ores.json | 15 ++ .../resources/data/forge/tags/items/rods.json | 0 .../data/forge/tags/items/rods/agate.json | 0 .../data/forge/tags/items/storage_blocks.json | 0 .../forge/tags/items/storage_blocks/aura.json | 0 .../tags/items/storage_blocks/benitoite.json | 0 .../tags/items/storage_blocks/bismuth.json | 0 .../tags/items/storage_blocks/blue_opal.json | 0 .../tags/items/storage_blocks/carnelian.json | 0 .../tags/items/storage_blocks/chalcedony.json | 0 .../tags/items/storage_blocks/cinnabar.json | 0 .../tags/items/storage_blocks/diopside.json | 0 .../tags/items/storage_blocks/euclase.json | 0 .../tags/items/storage_blocks/goldstone.json | 0 .../tags/items/storage_blocks/green_opal.json | 0 .../tags/items/storage_blocks/hematite.json | 0 .../tags/items/storage_blocks/ixiolite.json | 0 .../items/storage_blocks/labradorite.json | 0 .../tags/items/storage_blocks/leucite.json | 0 .../tags/items/storage_blocks/moonstone.json | 0 .../tags/items/storage_blocks/proustite.json | 0 .../tags/items/storage_blocks/pyrite.json | 0 .../tags/items/storage_blocks/red_opal.json | 0 .../tags/items/storage_blocks/sugilite.json | 0 .../tags/items/storage_blocks/tektite.json | 0 .../tags/items/storage_blocks/white_opal.json | 0 .../tags/blocks/agate_tiles.json} | 0 .../tags/blocks}/amethyst_bricks.json | 0 .../gaiadimension/tags/blocks}/aura_logs.json | 2 +- .../tags/blocks/base_stone_static.json | 2 +- .../tags/blocks/base_stone_volcanic.json | 0 .../tags/blocks}/blue_agate_logs.json | 2 +- .../tags/blocks}/burning_logs.json | 2 +- .../tags/blocks}/burnt_logs.json | 2 +- .../tags/blocks}/copal_bricks.json | 0 .../tags/blocks}/corrupted_logs.json | 2 +- .../tags/blocks}/fossilized_logs.json | 2 +- .../tags/blocks}/gaia_bricks.json | 0 .../tags/blocks}/green_agate_logs.json | 2 +- .../tags/blocks}/jade_bricks.json | 0 .../tags/blocks}/jet_bricks.json | 0 .../tags/blocks}/pink_agate_logs.json | 2 +- .../tags/blocks}/purple_agate_logs.json | 2 +- .../gaiadimension/tags/items/agate_tiles.json | 14 ++ .../tags/items/amethyst_bricks.json | 8 + .../gaiadimension/tags/items/aura_logs.json | 9 + .../tags/items/blue_agate_logs.json | 9 + .../tags/items/burning_logs.json | 9 + .../gaiadimension/tags/items/burnt_logs.json | 9 + .../tags/items/copal_bricks.json | 8 + .../tags/items/corrupted_logs.json | 9 + .../tags/items/crude_storage_blacklist.json | 42 ++++ .../tags/items/fossilized_logs.json | 9 + .../gaiadimension/tags/items/gaia_bricks.json | 8 + .../tags/items/gem_pouch_items.json | 4 +- .../tags/items/green_agate_logs.json | 9 + .../gaiadimension/tags/items/jade_bricks.json | 8 + .../gaiadimension/tags/items/jet_bricks.json | 8 + .../tags/items/pink_agate_logs.json | 9 + .../tags/items/purple_agate_logs.json | 9 + .../tags/blocks/beacon_base_blocks.json | 27 +++ .../minecraft/tags/blocks/flower_pots.json | 11 +- .../tags/blocks/guarded_by_piglins.json | 7 + .../minecraft/tags/blocks/impermeable.json | 8 + .../data/minecraft/tags/blocks/leaves.json | 0 .../data/minecraft/tags/blocks/logs.json | 14 ++ .../tags/blocks/non_flammable_wood.json | 14 ++ .../data/minecraft/tags/blocks/portals.json | 6 + .../data/minecraft/tags/blocks/saplings.json | 0 .../data/minecraft/tags/blocks/slabs.json | 30 +++ .../minecraft/tags/blocks/small_flowers.json | 0 .../data/minecraft/tags/blocks/stairs.json | 14 ++ .../data/minecraft}/tags/items/arrows.json | 0 .../tags/items/beacon_payment_items.json} | 12 +- .../data/minecraft/tags/items/leaves.json | 14 ++ .../data/minecraft/tags/items/logs.json | 14 ++ .../tags/items/non_flammable_wood.json | 14 ++ .../data/minecraft/tags/items/saplings.json | 0 .../data/minecraft/tags/items/slabs.json | 30 +++ .../data/minecraft/tags/items/stairs.json | 35 ++++ .../gaiadimension/GaiaDimensionMod.java | 7 +- .../block/container/slots/LargeCrateSlot.java | 7 +- .../block/container/slots/SmallCrateSlot.java | 9 +- .../gaiadimension/data/GaiaBlockTags.java | 198 ++++++++++++++++++ .../gaiadimension/data/GaiaItemTags.java | 165 +++++++++++++++ .../gaiadimension/data/GaiaRecipes.java | 54 ++--- .../data/provider/GaiaBlockTagsProvider.java | 24 +++ .../data/provider/GaiaItemTagsProvider.java | 26 +++ .../item/inventory/GemPouchSlot.java | 2 +- .../registry/GaiaBiomeFeatures.java | 4 +- .../gaiadimension/registry/GaiaTags.java | 164 +++++++++++++-- .../registry/GaiaToolMaterials.java | 2 +- .../data/forge/tags/blocks/ores.json | 15 -- .../resources/data/forge/tags/items/ores.json | 15 -- .../data/minecraft/tags/blocks/logs.json | 14 -- .../data/minecraft/tags/blocks/slabs.json | 16 -- 172 files changed, 1072 insertions(+), 138 deletions(-) rename src/{main => generated}/resources/data/forge/tags/blocks/dirt.json (100%) create mode 100644 src/generated/resources/data/forge/tags/blocks/glass.json rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/blue_opal.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/cinnabar.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/green_opal.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/hematite.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/labradorite.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/moonstone.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/pyrite.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/red_opal.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/sugilite.json (100%) rename src/{main/resources/data/forge/tags/blocks/ores => generated/resources/data/forge/tags/blocks/ore}/white_opal.json (100%) create mode 100644 src/generated/resources/data/forge/tags/blocks/ores.json rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/aura.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/benitoite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/bismuth.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/blue_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/carnelian.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/chalcedony.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/cinnabar.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/diopside.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/euclase.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/goldstone.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/green_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/hematite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/ixiolite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/labradorite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/leucite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/moonstone.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/proustite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/pyrite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/red_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/sugilite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/tektite.json (100%) rename src/{main => generated}/resources/data/forge/tags/blocks/storage_blocks/white_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/bones.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/dusts.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/dusts/fine.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/dusts/goldstone.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/dusts/hot.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/aura.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/benitoite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/bismuth.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/blue_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/carnelian.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/chalcedony.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/cinnabar.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/diopside.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/euclase.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/goldstone.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/green_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/hematite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/ixiolite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/labradorite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/leucite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/moonstone.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/proustite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/pyrite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/red_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/sugilite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/tektite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/gems/white_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/ingots.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/ingots/scaynyx.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/blue_opal.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/cinnabar.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/green_opal.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/hematite.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/labradorite.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/moonstone.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/pyrite.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/red_opal.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/sugilite.json (100%) rename src/{main/resources/data/forge/tags/items/ores => generated/resources/data/forge/tags/items/ore}/white_opal.json (100%) create mode 100644 src/generated/resources/data/forge/tags/items/ores.json rename src/{main => generated}/resources/data/forge/tags/items/rods.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/rods/agate.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/aura.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/benitoite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/bismuth.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/blue_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/carnelian.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/chalcedony.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/cinnabar.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/diopside.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/euclase.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/goldstone.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/green_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/hematite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/ixiolite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/labradorite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/leucite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/moonstone.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/proustite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/pyrite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/red_opal.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/sugilite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/tektite.json (100%) rename src/{main => generated}/resources/data/forge/tags/items/storage_blocks/white_opal.json (100%) rename src/{main/resources/data/gaiadimension/tags/items/agate_planks.json => generated/resources/data/gaiadimension/tags/blocks/agate_tiles.json} (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/amethyst_bricks.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/aura_logs.json (100%) rename src/{main => generated}/resources/data/gaiadimension/tags/blocks/base_stone_static.json (66%) rename src/{main => generated}/resources/data/gaiadimension/tags/blocks/base_stone_volcanic.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/blue_agate_logs.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/burning_logs.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/burnt_logs.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/copal_bricks.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/corrupted_logs.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/fossilized_logs.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/gaia_bricks.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/green_agate_logs.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/jade_bricks.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/jet_bricks.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/pink_agate_logs.json (100%) rename src/{main/resources/data/gaiadimension/tags/items => generated/resources/data/gaiadimension/tags/blocks}/purple_agate_logs.json (100%) create mode 100644 src/generated/resources/data/gaiadimension/tags/items/agate_tiles.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/amethyst_bricks.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/aura_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/blue_agate_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/burning_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/burnt_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/copal_bricks.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/corrupted_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/crude_storage_blacklist.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/fossilized_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/gaia_bricks.json rename src/{main => generated}/resources/data/gaiadimension/tags/items/gem_pouch_items.json (100%) create mode 100644 src/generated/resources/data/gaiadimension/tags/items/green_agate_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/jade_bricks.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/jet_bricks.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/pink_agate_logs.json create mode 100644 src/generated/resources/data/gaiadimension/tags/items/purple_agate_logs.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json rename src/{main => generated}/resources/data/minecraft/tags/blocks/flower_pots.json (59%) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/guarded_by_piglins.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/impermeable.json rename src/{main => generated}/resources/data/minecraft/tags/blocks/leaves.json (100%) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/logs.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/non_flammable_wood.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/portals.json rename src/{main => generated}/resources/data/minecraft/tags/blocks/saplings.json (100%) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/slabs.json rename src/{main => generated}/resources/data/minecraft/tags/blocks/small_flowers.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/stairs.json (54%) rename src/{main/resources/data/forge => generated/resources/data/minecraft}/tags/items/arrows.json (100%) rename src/{main/resources/data/forge/tags/items/beacon_payment.json => generated/resources/data/minecraft/tags/items/beacon_payment_items.json} (90%) create mode 100644 src/generated/resources/data/minecraft/tags/items/leaves.json create mode 100644 src/generated/resources/data/minecraft/tags/items/logs.json create mode 100644 src/generated/resources/data/minecraft/tags/items/non_flammable_wood.json rename src/{main => generated}/resources/data/minecraft/tags/items/saplings.json (100%) create mode 100644 src/generated/resources/data/minecraft/tags/items/slabs.json create mode 100644 src/generated/resources/data/minecraft/tags/items/stairs.json create mode 100644 src/main/java/androsa/gaiadimension/data/GaiaBlockTags.java create mode 100644 src/main/java/androsa/gaiadimension/data/GaiaItemTags.java create mode 100644 src/main/java/androsa/gaiadimension/data/provider/GaiaBlockTagsProvider.java create mode 100644 src/main/java/androsa/gaiadimension/data/provider/GaiaItemTagsProvider.java delete mode 100644 src/main/resources/data/forge/tags/blocks/ores.json delete mode 100644 src/main/resources/data/forge/tags/items/ores.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/logs.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/slabs.json diff --git a/src/main/resources/data/forge/tags/blocks/dirt.json b/src/generated/resources/data/forge/tags/blocks/dirt.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/dirt.json rename to src/generated/resources/data/forge/tags/blocks/dirt.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass.json b/src/generated/resources/data/forge/tags/blocks/glass.json new file mode 100644 index 000000000..7982e49c4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "gaiadimension:foggy_glass", + "gaiadimension:cloudy_glass" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/blue_opal.json b/src/generated/resources/data/forge/tags/blocks/ore/blue_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/blue_opal.json rename to src/generated/resources/data/forge/tags/blocks/ore/blue_opal.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/cinnabar.json b/src/generated/resources/data/forge/tags/blocks/ore/cinnabar.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/cinnabar.json rename to src/generated/resources/data/forge/tags/blocks/ore/cinnabar.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/green_opal.json b/src/generated/resources/data/forge/tags/blocks/ore/green_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/green_opal.json rename to src/generated/resources/data/forge/tags/blocks/ore/green_opal.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/hematite.json b/src/generated/resources/data/forge/tags/blocks/ore/hematite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/hematite.json rename to src/generated/resources/data/forge/tags/blocks/ore/hematite.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/labradorite.json b/src/generated/resources/data/forge/tags/blocks/ore/labradorite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/labradorite.json rename to src/generated/resources/data/forge/tags/blocks/ore/labradorite.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/moonstone.json b/src/generated/resources/data/forge/tags/blocks/ore/moonstone.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/moonstone.json rename to src/generated/resources/data/forge/tags/blocks/ore/moonstone.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/pyrite.json b/src/generated/resources/data/forge/tags/blocks/ore/pyrite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/pyrite.json rename to src/generated/resources/data/forge/tags/blocks/ore/pyrite.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/red_opal.json b/src/generated/resources/data/forge/tags/blocks/ore/red_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/red_opal.json rename to src/generated/resources/data/forge/tags/blocks/ore/red_opal.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/sugilite.json b/src/generated/resources/data/forge/tags/blocks/ore/sugilite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/sugilite.json rename to src/generated/resources/data/forge/tags/blocks/ore/sugilite.json diff --git a/src/main/resources/data/forge/tags/blocks/ores/white_opal.json b/src/generated/resources/data/forge/tags/blocks/ore/white_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/ores/white_opal.json rename to src/generated/resources/data/forge/tags/blocks/ore/white_opal.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/generated/resources/data/forge/tags/blocks/ores.json new file mode 100644 index 000000000..8a7a1bea3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#forge:ore/sugilite", + "#forge:ore/hematite", + "#forge:ore/cinnabar", + "#forge:ore/labradorite", + "#forge:ore/moonstone", + "#forge:ore/red_opal", + "#forge:ore/blue_opal", + "#forge:ore/green_opal", + "#forge:ore/white_opal", + "#forge:ore/pyrite" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/aura.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/aura.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/aura.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/aura.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/benitoite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/benitoite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/benitoite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/benitoite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/bismuth.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/bismuth.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/bismuth.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/bismuth.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/blue_opal.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/blue_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/blue_opal.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/blue_opal.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/carnelian.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/carnelian.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/carnelian.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/carnelian.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/chalcedony.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/chalcedony.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/chalcedony.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/chalcedony.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/cinnabar.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/cinnabar.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/cinnabar.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/cinnabar.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/diopside.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/diopside.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/diopside.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/diopside.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/euclase.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/euclase.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/euclase.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/euclase.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/goldstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/goldstone.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/goldstone.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/goldstone.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/green_opal.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/green_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/green_opal.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/green_opal.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/hematite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/hematite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/hematite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/hematite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/ixiolite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/ixiolite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/ixiolite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/ixiolite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/labradorite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/labradorite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/labradorite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/labradorite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/leucite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/leucite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/leucite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/leucite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/moonstone.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/moonstone.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/moonstone.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/moonstone.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/proustite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/proustite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/proustite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/proustite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/pyrite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/pyrite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/pyrite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/pyrite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/red_opal.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/red_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/red_opal.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/red_opal.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/sugilite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/sugilite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/sugilite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/sugilite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/tektite.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/tektite.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/tektite.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/tektite.json diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/white_opal.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/white_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/white_opal.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/white_opal.json diff --git a/src/main/resources/data/forge/tags/items/bones.json b/src/generated/resources/data/forge/tags/items/bones.json similarity index 100% rename from src/main/resources/data/forge/tags/items/bones.json rename to src/generated/resources/data/forge/tags/items/bones.json diff --git a/src/main/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/items/dusts.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts.json rename to src/generated/resources/data/forge/tags/items/dusts.json diff --git a/src/main/resources/data/forge/tags/items/dusts/fine.json b/src/generated/resources/data/forge/tags/items/dusts/fine.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/fine.json rename to src/generated/resources/data/forge/tags/items/dusts/fine.json diff --git a/src/main/resources/data/forge/tags/items/dusts/goldstone.json b/src/generated/resources/data/forge/tags/items/dusts/goldstone.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/goldstone.json rename to src/generated/resources/data/forge/tags/items/dusts/goldstone.json diff --git a/src/main/resources/data/forge/tags/items/dusts/hot.json b/src/generated/resources/data/forge/tags/items/dusts/hot.json similarity index 100% rename from src/main/resources/data/forge/tags/items/dusts/hot.json rename to src/generated/resources/data/forge/tags/items/dusts/hot.json diff --git a/src/main/resources/data/forge/tags/items/gems.json b/src/generated/resources/data/forge/tags/items/gems.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems.json rename to src/generated/resources/data/forge/tags/items/gems.json diff --git a/src/main/resources/data/forge/tags/items/gems/aura.json b/src/generated/resources/data/forge/tags/items/gems/aura.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/aura.json rename to src/generated/resources/data/forge/tags/items/gems/aura.json diff --git a/src/main/resources/data/forge/tags/items/gems/benitoite.json b/src/generated/resources/data/forge/tags/items/gems/benitoite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/benitoite.json rename to src/generated/resources/data/forge/tags/items/gems/benitoite.json diff --git a/src/main/resources/data/forge/tags/items/gems/bismuth.json b/src/generated/resources/data/forge/tags/items/gems/bismuth.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/bismuth.json rename to src/generated/resources/data/forge/tags/items/gems/bismuth.json diff --git a/src/main/resources/data/forge/tags/items/gems/blue_opal.json b/src/generated/resources/data/forge/tags/items/gems/blue_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/blue_opal.json rename to src/generated/resources/data/forge/tags/items/gems/blue_opal.json diff --git a/src/main/resources/data/forge/tags/items/gems/carnelian.json b/src/generated/resources/data/forge/tags/items/gems/carnelian.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/carnelian.json rename to src/generated/resources/data/forge/tags/items/gems/carnelian.json diff --git a/src/main/resources/data/forge/tags/items/gems/chalcedony.json b/src/generated/resources/data/forge/tags/items/gems/chalcedony.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/chalcedony.json rename to src/generated/resources/data/forge/tags/items/gems/chalcedony.json diff --git a/src/main/resources/data/forge/tags/items/gems/cinnabar.json b/src/generated/resources/data/forge/tags/items/gems/cinnabar.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/cinnabar.json rename to src/generated/resources/data/forge/tags/items/gems/cinnabar.json diff --git a/src/main/resources/data/forge/tags/items/gems/diopside.json b/src/generated/resources/data/forge/tags/items/gems/diopside.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/diopside.json rename to src/generated/resources/data/forge/tags/items/gems/diopside.json diff --git a/src/main/resources/data/forge/tags/items/gems/euclase.json b/src/generated/resources/data/forge/tags/items/gems/euclase.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/euclase.json rename to src/generated/resources/data/forge/tags/items/gems/euclase.json diff --git a/src/main/resources/data/forge/tags/items/gems/goldstone.json b/src/generated/resources/data/forge/tags/items/gems/goldstone.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/goldstone.json rename to src/generated/resources/data/forge/tags/items/gems/goldstone.json diff --git a/src/main/resources/data/forge/tags/items/gems/green_opal.json b/src/generated/resources/data/forge/tags/items/gems/green_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/green_opal.json rename to src/generated/resources/data/forge/tags/items/gems/green_opal.json diff --git a/src/main/resources/data/forge/tags/items/gems/hematite.json b/src/generated/resources/data/forge/tags/items/gems/hematite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/hematite.json rename to src/generated/resources/data/forge/tags/items/gems/hematite.json diff --git a/src/main/resources/data/forge/tags/items/gems/ixiolite.json b/src/generated/resources/data/forge/tags/items/gems/ixiolite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/ixiolite.json rename to src/generated/resources/data/forge/tags/items/gems/ixiolite.json diff --git a/src/main/resources/data/forge/tags/items/gems/labradorite.json b/src/generated/resources/data/forge/tags/items/gems/labradorite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/labradorite.json rename to src/generated/resources/data/forge/tags/items/gems/labradorite.json diff --git a/src/main/resources/data/forge/tags/items/gems/leucite.json b/src/generated/resources/data/forge/tags/items/gems/leucite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/leucite.json rename to src/generated/resources/data/forge/tags/items/gems/leucite.json diff --git a/src/main/resources/data/forge/tags/items/gems/moonstone.json b/src/generated/resources/data/forge/tags/items/gems/moonstone.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/moonstone.json rename to src/generated/resources/data/forge/tags/items/gems/moonstone.json diff --git a/src/main/resources/data/forge/tags/items/gems/proustite.json b/src/generated/resources/data/forge/tags/items/gems/proustite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/proustite.json rename to src/generated/resources/data/forge/tags/items/gems/proustite.json diff --git a/src/main/resources/data/forge/tags/items/gems/pyrite.json b/src/generated/resources/data/forge/tags/items/gems/pyrite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/pyrite.json rename to src/generated/resources/data/forge/tags/items/gems/pyrite.json diff --git a/src/main/resources/data/forge/tags/items/gems/red_opal.json b/src/generated/resources/data/forge/tags/items/gems/red_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/red_opal.json rename to src/generated/resources/data/forge/tags/items/gems/red_opal.json diff --git a/src/main/resources/data/forge/tags/items/gems/sugilite.json b/src/generated/resources/data/forge/tags/items/gems/sugilite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/sugilite.json rename to src/generated/resources/data/forge/tags/items/gems/sugilite.json diff --git a/src/main/resources/data/forge/tags/items/gems/tektite.json b/src/generated/resources/data/forge/tags/items/gems/tektite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/tektite.json rename to src/generated/resources/data/forge/tags/items/gems/tektite.json diff --git a/src/main/resources/data/forge/tags/items/gems/white_opal.json b/src/generated/resources/data/forge/tags/items/gems/white_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/gems/white_opal.json rename to src/generated/resources/data/forge/tags/items/gems/white_opal.json diff --git a/src/main/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ingots.json rename to src/generated/resources/data/forge/tags/items/ingots.json diff --git a/src/main/resources/data/forge/tags/items/ingots/scaynyx.json b/src/generated/resources/data/forge/tags/items/ingots/scaynyx.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ingots/scaynyx.json rename to src/generated/resources/data/forge/tags/items/ingots/scaynyx.json diff --git a/src/main/resources/data/forge/tags/items/ores/blue_opal.json b/src/generated/resources/data/forge/tags/items/ore/blue_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/blue_opal.json rename to src/generated/resources/data/forge/tags/items/ore/blue_opal.json diff --git a/src/main/resources/data/forge/tags/items/ores/cinnabar.json b/src/generated/resources/data/forge/tags/items/ore/cinnabar.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/cinnabar.json rename to src/generated/resources/data/forge/tags/items/ore/cinnabar.json diff --git a/src/main/resources/data/forge/tags/items/ores/green_opal.json b/src/generated/resources/data/forge/tags/items/ore/green_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/green_opal.json rename to src/generated/resources/data/forge/tags/items/ore/green_opal.json diff --git a/src/main/resources/data/forge/tags/items/ores/hematite.json b/src/generated/resources/data/forge/tags/items/ore/hematite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/hematite.json rename to src/generated/resources/data/forge/tags/items/ore/hematite.json diff --git a/src/main/resources/data/forge/tags/items/ores/labradorite.json b/src/generated/resources/data/forge/tags/items/ore/labradorite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/labradorite.json rename to src/generated/resources/data/forge/tags/items/ore/labradorite.json diff --git a/src/main/resources/data/forge/tags/items/ores/moonstone.json b/src/generated/resources/data/forge/tags/items/ore/moonstone.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/moonstone.json rename to src/generated/resources/data/forge/tags/items/ore/moonstone.json diff --git a/src/main/resources/data/forge/tags/items/ores/pyrite.json b/src/generated/resources/data/forge/tags/items/ore/pyrite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/pyrite.json rename to src/generated/resources/data/forge/tags/items/ore/pyrite.json diff --git a/src/main/resources/data/forge/tags/items/ores/red_opal.json b/src/generated/resources/data/forge/tags/items/ore/red_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/red_opal.json rename to src/generated/resources/data/forge/tags/items/ore/red_opal.json diff --git a/src/main/resources/data/forge/tags/items/ores/sugilite.json b/src/generated/resources/data/forge/tags/items/ore/sugilite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/sugilite.json rename to src/generated/resources/data/forge/tags/items/ore/sugilite.json diff --git a/src/main/resources/data/forge/tags/items/ores/white_opal.json b/src/generated/resources/data/forge/tags/items/ore/white_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/ores/white_opal.json rename to src/generated/resources/data/forge/tags/items/ore/white_opal.json diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json new file mode 100644 index 000000000..8a7a1bea3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#forge:ore/sugilite", + "#forge:ore/hematite", + "#forge:ore/cinnabar", + "#forge:ore/labradorite", + "#forge:ore/moonstone", + "#forge:ore/red_opal", + "#forge:ore/blue_opal", + "#forge:ore/green_opal", + "#forge:ore/white_opal", + "#forge:ore/pyrite" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/rods.json b/src/generated/resources/data/forge/tags/items/rods.json similarity index 100% rename from src/main/resources/data/forge/tags/items/rods.json rename to src/generated/resources/data/forge/tags/items/rods.json diff --git a/src/main/resources/data/forge/tags/items/rods/agate.json b/src/generated/resources/data/forge/tags/items/rods/agate.json similarity index 100% rename from src/main/resources/data/forge/tags/items/rods/agate.json rename to src/generated/resources/data/forge/tags/items/rods/agate.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks.json rename to src/generated/resources/data/forge/tags/items/storage_blocks.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/aura.json b/src/generated/resources/data/forge/tags/items/storage_blocks/aura.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/aura.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/aura.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/benitoite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/benitoite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/benitoite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/benitoite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/bismuth.json b/src/generated/resources/data/forge/tags/items/storage_blocks/bismuth.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/bismuth.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/bismuth.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/blue_opal.json b/src/generated/resources/data/forge/tags/items/storage_blocks/blue_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/blue_opal.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/blue_opal.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/carnelian.json b/src/generated/resources/data/forge/tags/items/storage_blocks/carnelian.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/carnelian.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/carnelian.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/chalcedony.json b/src/generated/resources/data/forge/tags/items/storage_blocks/chalcedony.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/chalcedony.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/chalcedony.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/cinnabar.json b/src/generated/resources/data/forge/tags/items/storage_blocks/cinnabar.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/cinnabar.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/cinnabar.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/diopside.json b/src/generated/resources/data/forge/tags/items/storage_blocks/diopside.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/diopside.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/diopside.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/euclase.json b/src/generated/resources/data/forge/tags/items/storage_blocks/euclase.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/euclase.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/euclase.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/goldstone.json b/src/generated/resources/data/forge/tags/items/storage_blocks/goldstone.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/goldstone.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/goldstone.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/green_opal.json b/src/generated/resources/data/forge/tags/items/storage_blocks/green_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/green_opal.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/green_opal.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/hematite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/hematite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/hematite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/hematite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/ixiolite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/ixiolite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/ixiolite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/ixiolite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/labradorite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/labradorite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/labradorite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/labradorite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/leucite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/leucite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/leucite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/leucite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/moonstone.json b/src/generated/resources/data/forge/tags/items/storage_blocks/moonstone.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/moonstone.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/moonstone.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/proustite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/proustite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/proustite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/proustite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/pyrite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/pyrite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/pyrite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/pyrite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/red_opal.json b/src/generated/resources/data/forge/tags/items/storage_blocks/red_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/red_opal.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/red_opal.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/sugilite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/sugilite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/sugilite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/sugilite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/tektite.json b/src/generated/resources/data/forge/tags/items/storage_blocks/tektite.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/tektite.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/tektite.json diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/white_opal.json b/src/generated/resources/data/forge/tags/items/storage_blocks/white_opal.json similarity index 100% rename from src/main/resources/data/forge/tags/items/storage_blocks/white_opal.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/white_opal.json diff --git a/src/main/resources/data/gaiadimension/tags/items/agate_planks.json b/src/generated/resources/data/gaiadimension/tags/blocks/agate_tiles.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/agate_planks.json rename to src/generated/resources/data/gaiadimension/tags/blocks/agate_tiles.json diff --git a/src/main/resources/data/gaiadimension/tags/items/amethyst_bricks.json b/src/generated/resources/data/gaiadimension/tags/blocks/amethyst_bricks.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/amethyst_bricks.json rename to src/generated/resources/data/gaiadimension/tags/blocks/amethyst_bricks.json diff --git a/src/main/resources/data/gaiadimension/tags/items/aura_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/aura_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/aura_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/aura_logs.json index ecb4c40da..01104e292 100644 --- a/src/main/resources/data/gaiadimension/tags/items/aura_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/aura_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:aura_log", - "gaiadimension:aura_wood", "gaiadimension:stripped_aura_log", + "gaiadimension:aura_wood", "gaiadimension:stripped_aura_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/blocks/base_stone_static.json b/src/generated/resources/data/gaiadimension/tags/blocks/base_stone_static.json similarity index 66% rename from src/main/resources/data/gaiadimension/tags/blocks/base_stone_static.json rename to src/generated/resources/data/gaiadimension/tags/blocks/base_stone_static.json index 4a0f533e3..196de1eaa 100644 --- a/src/main/resources/data/gaiadimension/tags/blocks/base_stone_static.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/base_stone_static.json @@ -2,6 +2,6 @@ "replace": false, "values": [ "gaiadimension:gaia_stone", - "gaiadimension:static_stone" + "gaiadimension:wasteland_stone" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/blocks/base_stone_volcanic.json b/src/generated/resources/data/gaiadimension/tags/blocks/base_stone_volcanic.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/blocks/base_stone_volcanic.json rename to src/generated/resources/data/gaiadimension/tags/blocks/base_stone_volcanic.json diff --git a/src/main/resources/data/gaiadimension/tags/items/blue_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/blue_agate_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/blue_agate_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/blue_agate_logs.json index 9b3e19f83..6f9bcd377 100644 --- a/src/main/resources/data/gaiadimension/tags/items/blue_agate_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/blue_agate_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:blue_agate_log", - "gaiadimension:blue_agate_wood", "gaiadimension:stripped_blue_agate_log", + "gaiadimension:blue_agate_wood", "gaiadimension:stripped_blue_agate_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/burning_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/burning_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/burning_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/burning_logs.json index 9cfdaf67b..066b86000 100644 --- a/src/main/resources/data/gaiadimension/tags/items/burning_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/burning_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:burning_log", - "gaiadimension:burning_wood", "gaiadimension:stripped_burning_log", + "gaiadimension:burning_wood", "gaiadimension:stripped_burning_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/burnt_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/burnt_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/burnt_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/burnt_logs.json index 4446c0bce..693833492 100644 --- a/src/main/resources/data/gaiadimension/tags/items/burnt_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/burnt_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:burnt_log", - "gaiadimension:burnt_wood", "gaiadimension:stripped_burnt_log", + "gaiadimension:burnt_wood", "gaiadimension:stripped_burnt_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/copal_bricks.json b/src/generated/resources/data/gaiadimension/tags/blocks/copal_bricks.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/copal_bricks.json rename to src/generated/resources/data/gaiadimension/tags/blocks/copal_bricks.json diff --git a/src/main/resources/data/gaiadimension/tags/items/corrupted_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/corrupted_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/corrupted_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/corrupted_logs.json index 8650a6ff2..893a96509 100644 --- a/src/main/resources/data/gaiadimension/tags/items/corrupted_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/corrupted_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:corrupted_log", - "gaiadimension:corrupted_wood", "gaiadimension:stripped_corrupted_log", + "gaiadimension:corrupted_wood", "gaiadimension:stripped_corrupted_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/fossilized_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/fossilized_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/fossilized_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/fossilized_logs.json index 7544c68c5..039996f61 100644 --- a/src/main/resources/data/gaiadimension/tags/items/fossilized_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/fossilized_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:fossilized_log", - "gaiadimension:fossilized_wood", "gaiadimension:stripped_fossilized_log", + "gaiadimension:fossilized_wood", "gaiadimension:stripped_fossilized_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/gaia_bricks.json b/src/generated/resources/data/gaiadimension/tags/blocks/gaia_bricks.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/gaia_bricks.json rename to src/generated/resources/data/gaiadimension/tags/blocks/gaia_bricks.json diff --git a/src/main/resources/data/gaiadimension/tags/items/green_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/green_agate_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/green_agate_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/green_agate_logs.json index 1c9308a6b..fd17a2aae 100644 --- a/src/main/resources/data/gaiadimension/tags/items/green_agate_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/green_agate_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:green_agate_log", - "gaiadimension:green_agate_wood", "gaiadimension:stripped_green_agate_log", + "gaiadimension:green_agate_wood", "gaiadimension:stripped_green_agate_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/jade_bricks.json b/src/generated/resources/data/gaiadimension/tags/blocks/jade_bricks.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/jade_bricks.json rename to src/generated/resources/data/gaiadimension/tags/blocks/jade_bricks.json diff --git a/src/main/resources/data/gaiadimension/tags/items/jet_bricks.json b/src/generated/resources/data/gaiadimension/tags/blocks/jet_bricks.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/jet_bricks.json rename to src/generated/resources/data/gaiadimension/tags/blocks/jet_bricks.json diff --git a/src/main/resources/data/gaiadimension/tags/items/pink_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/pink_agate_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/pink_agate_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/pink_agate_logs.json index 1440d897f..3520e9b52 100644 --- a/src/main/resources/data/gaiadimension/tags/items/pink_agate_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/pink_agate_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:pink_agate_log", - "gaiadimension:pink_agate_wood", "gaiadimension:stripped_pink_agate_log", + "gaiadimension:pink_agate_wood", "gaiadimension:stripped_pink_agate_wood" ] } \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/purple_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/blocks/purple_agate_logs.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/purple_agate_logs.json rename to src/generated/resources/data/gaiadimension/tags/blocks/purple_agate_logs.json index 46db13dea..0970c99a2 100644 --- a/src/main/resources/data/gaiadimension/tags/items/purple_agate_logs.json +++ b/src/generated/resources/data/gaiadimension/tags/blocks/purple_agate_logs.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "gaiadimension:purple_agate_log", - "gaiadimension:purple_agate_wood", "gaiadimension:stripped_purple_agate_log", + "gaiadimension:purple_agate_wood", "gaiadimension:stripped_purple_agate_wood" ] } \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/agate_tiles.json b/src/generated/resources/data/gaiadimension/tags/items/agate_tiles.json new file mode 100644 index 000000000..914434d0f --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/agate_tiles.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "gaiadimension:pink_agate_planks", + "gaiadimension:blue_agate_planks", + "gaiadimension:green_agate_planks", + "gaiadimension:purple_agate_planks", + "gaiadimension:fossilized_planks", + "gaiadimension:corrupted_planks", + "gaiadimension:burnt_planks", + "gaiadimension:burning_planks", + "gaiadimension:aura_planks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/amethyst_bricks.json b/src/generated/resources/data/gaiadimension/tags/items/amethyst_bricks.json new file mode 100644 index 000000000..68585a9f0 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/amethyst_bricks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "gaiadimension:amethyst_bricks", + "gaiadimension:cracked_amethyst_bricks", + "gaiadimension:crusted_amethyst_bricks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/aura_logs.json b/src/generated/resources/data/gaiadimension/tags/items/aura_logs.json new file mode 100644 index 000000000..01104e292 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/aura_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:aura_log", + "gaiadimension:stripped_aura_log", + "gaiadimension:aura_wood", + "gaiadimension:stripped_aura_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/blue_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/items/blue_agate_logs.json new file mode 100644 index 000000000..6f9bcd377 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/blue_agate_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:blue_agate_log", + "gaiadimension:stripped_blue_agate_log", + "gaiadimension:blue_agate_wood", + "gaiadimension:stripped_blue_agate_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/burning_logs.json b/src/generated/resources/data/gaiadimension/tags/items/burning_logs.json new file mode 100644 index 000000000..066b86000 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/burning_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:burning_log", + "gaiadimension:stripped_burning_log", + "gaiadimension:burning_wood", + "gaiadimension:stripped_burning_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/burnt_logs.json b/src/generated/resources/data/gaiadimension/tags/items/burnt_logs.json new file mode 100644 index 000000000..693833492 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/burnt_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:burnt_log", + "gaiadimension:stripped_burnt_log", + "gaiadimension:burnt_wood", + "gaiadimension:stripped_burnt_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/copal_bricks.json b/src/generated/resources/data/gaiadimension/tags/items/copal_bricks.json new file mode 100644 index 000000000..77efbfce2 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/copal_bricks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "gaiadimension:copal_bricks", + "gaiadimension:cracked_copal_bricks", + "gaiadimension:crusted_copal_bricks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/corrupted_logs.json b/src/generated/resources/data/gaiadimension/tags/items/corrupted_logs.json new file mode 100644 index 000000000..893a96509 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/corrupted_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:corrupted_log", + "gaiadimension:stripped_corrupted_log", + "gaiadimension:corrupted_wood", + "gaiadimension:stripped_corrupted_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/crude_storage_blacklist.json b/src/generated/resources/data/gaiadimension/tags/items/crude_storage_blacklist.json new file mode 100644 index 000000000..d43af31ab --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/crude_storage_blacklist.json @@ -0,0 +1,42 @@ +{ + "replace": false, + "values": [ + "minecraft:shulker_box", + "minecraft:black_shulker_box", + "minecraft:blue_shulker_box", + "minecraft:brown_shulker_box", + "minecraft:cyan_shulker_box", + "minecraft:gray_shulker_box", + "minecraft:green_shulker_box", + "minecraft:light_blue_shulker_box", + "minecraft:light_gray_shulker_box", + "minecraft:lime_shulker_box", + "minecraft:magenta_shulker_box", + "minecraft:orange_shulker_box", + "minecraft:pink_shulker_box", + "minecraft:purple_shulker_box", + "minecraft:red_shulker_box", + "minecraft:white_shulker_box", + "minecraft:yellow_shulker_box", + "gaiadimension:crude_storage_crate", + "gaiadimension:mega_storage_crate", + "minecraft:shulker_box", + "minecraft:black_shulker_box", + "minecraft:blue_shulker_box", + "minecraft:brown_shulker_box", + "minecraft:cyan_shulker_box", + "minecraft:gray_shulker_box", + "minecraft:green_shulker_box", + "minecraft:light_blue_shulker_box", + "minecraft:light_gray_shulker_box", + "minecraft:lime_shulker_box", + "minecraft:magenta_shulker_box", + "minecraft:orange_shulker_box", + "minecraft:pink_shulker_box", + "minecraft:purple_shulker_box", + "minecraft:red_shulker_box", + "minecraft:white_shulker_box", + "minecraft:yellow_shulker_box", + "gaiadimension:mega_storage_crate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/fossilized_logs.json b/src/generated/resources/data/gaiadimension/tags/items/fossilized_logs.json new file mode 100644 index 000000000..039996f61 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/fossilized_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:fossilized_log", + "gaiadimension:stripped_fossilized_log", + "gaiadimension:fossilized_wood", + "gaiadimension:stripped_fossilized_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/gaia_bricks.json b/src/generated/resources/data/gaiadimension/tags/items/gaia_bricks.json new file mode 100644 index 000000000..00968269d --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/gaia_bricks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "gaiadimension:gaia_stone_bricks", + "gaiadimension:cracked_gaia_stone_bricks", + "gaiadimension:crusted_gaia_stone_bricks" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/gaiadimension/tags/items/gem_pouch_items.json b/src/generated/resources/data/gaiadimension/tags/items/gem_pouch_items.json similarity index 100% rename from src/main/resources/data/gaiadimension/tags/items/gem_pouch_items.json rename to src/generated/resources/data/gaiadimension/tags/items/gem_pouch_items.json index bcc93e69d..6495e39a9 100644 --- a/src/main/resources/data/gaiadimension/tags/items/gem_pouch_items.json +++ b/src/generated/resources/data/gaiadimension/tags/items/gem_pouch_items.json @@ -3,10 +3,9 @@ "values": [ "gaiadimension:sugilite", "gaiadimension:hematite", - "gaiadimension:pyrite", + "gaiadimension:cinnabar", "gaiadimension:labradorite", "gaiadimension:moonstone", - "gaiadimension:cinnabar", "gaiadimension:red_opal", "gaiadimension:blue_opal", "gaiadimension:green_opal", @@ -19,6 +18,7 @@ "gaiadimension:benitoite", "gaiadimension:diopside", "gaiadimension:chalcedony", + "gaiadimension:pyrite", "gaiadimension:tektite", "gaiadimension:goldstone", "gaiadimension:aura_cluster", diff --git a/src/generated/resources/data/gaiadimension/tags/items/green_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/items/green_agate_logs.json new file mode 100644 index 000000000..fd17a2aae --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/green_agate_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:green_agate_log", + "gaiadimension:stripped_green_agate_log", + "gaiadimension:green_agate_wood", + "gaiadimension:stripped_green_agate_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/jade_bricks.json b/src/generated/resources/data/gaiadimension/tags/items/jade_bricks.json new file mode 100644 index 000000000..152581ab7 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/jade_bricks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "gaiadimension:jade_bricks", + "gaiadimension:cracked_jade_bricks", + "gaiadimension:crusted_jade_bricks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/jet_bricks.json b/src/generated/resources/data/gaiadimension/tags/items/jet_bricks.json new file mode 100644 index 000000000..4fd78b4f6 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/jet_bricks.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "gaiadimension:jet_bricks", + "gaiadimension:cracked_jet_bricks", + "gaiadimension:crusted_jet_bricks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/pink_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/items/pink_agate_logs.json new file mode 100644 index 000000000..3520e9b52 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/pink_agate_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:pink_agate_log", + "gaiadimension:stripped_pink_agate_log", + "gaiadimension:pink_agate_wood", + "gaiadimension:stripped_pink_agate_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/gaiadimension/tags/items/purple_agate_logs.json b/src/generated/resources/data/gaiadimension/tags/items/purple_agate_logs.json new file mode 100644 index 000000000..0970c99a2 --- /dev/null +++ b/src/generated/resources/data/gaiadimension/tags/items/purple_agate_logs.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "gaiadimension:purple_agate_log", + "gaiadimension:stripped_purple_agate_log", + "gaiadimension:purple_agate_wood", + "gaiadimension:stripped_purple_agate_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json new file mode 100644 index 000000000..9ebbf3982 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "gaiadimension:sugilite_block", + "gaiadimension:hematite_block", + "gaiadimension:cinnabar_block", + "gaiadimension:labradorite_block", + "gaiadimension:moonstone_block", + "gaiadimension:opal_block_red", + "gaiadimension:opal_block_blue", + "gaiadimension:opal_block_green", + "gaiadimension:opal_block_white", + "gaiadimension:pyrite_block", + "gaiadimension:tektite_block", + "gaiadimension:goldstone_block", + "gaiadimension:aura_block", + "gaiadimension:bismuth_block", + "gaiadimension:ixiolite_block", + "gaiadimension:proustite_block", + "gaiadimension:euclase_block", + "gaiadimension:leucite_block", + "gaiadimension:carnelian_block", + "gaiadimension:benitoite_block", + "gaiadimension:diopside_block", + "gaiadimension:chalcedony_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json similarity index 59% rename from src/main/resources/data/minecraft/tags/blocks/flower_pots.json rename to src/generated/resources/data/minecraft/tags/blocks/flower_pots.json index c9f80f2d1..fc92592b7 100644 --- a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json +++ b/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json @@ -16,6 +16,15 @@ "gaiadimension:potted_corrupted_gaia_eye", "gaiadimension:potted_elder_imklia", "gaiadimension:potted_gold_orb_tucher", - "gaiadimension:potted_missingno_fungus" + "gaiadimension:potted_missingno_fungus", + "gaiadimension:potted_pink_agate_sapling", + "gaiadimension:potted_blue_agate_sapling", + "gaiadimension:potted_green_agate_sapling", + "gaiadimension:potted_purple_agate_sapling", + "gaiadimension:potted_fossilized_sapling", + "gaiadimension:potted_corrupted_sapling", + "gaiadimension:potted_burnt_sapling", + "gaiadimension:potted_burning_sapling", + "gaiadimension:potted_aura_sapling" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/guarded_by_piglins.json b/src/generated/resources/data/minecraft/tags/blocks/guarded_by_piglins.json new file mode 100644 index 000000000..6a900adfb --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/guarded_by_piglins.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "gaiadimension:crude_storage_crate", + "gaiadimension:mega_storage_crate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/impermeable.json b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json new file mode 100644 index 000000000..a87574774 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/impermeable.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "gaiadimension:foggy_glass", + "gaiadimension:cloudy_glass", + "gaiadimension:frail_glitter_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/leaves.json b/src/generated/resources/data/minecraft/tags/blocks/leaves.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/leaves.json rename to src/generated/resources/data/minecraft/tags/blocks/leaves.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/logs.json b/src/generated/resources/data/minecraft/tags/blocks/logs.json new file mode 100644 index 000000000..81145fb38 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/logs.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "#gaiadimension:pink_agate_logs", + "#gaiadimension:blue_agate_logs", + "#gaiadimension:green_agate_logs", + "#gaiadimension:purple_agate_logs", + "#gaiadimension:fossilized_logs", + "#gaiadimension:corrupted_logs", + "#gaiadimension:burnt_logs", + "#gaiadimension:burning_logs", + "#gaiadimension:aura_logs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/non_flammable_wood.json b/src/generated/resources/data/minecraft/tags/blocks/non_flammable_wood.json new file mode 100644 index 000000000..81145fb38 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/non_flammable_wood.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "#gaiadimension:pink_agate_logs", + "#gaiadimension:blue_agate_logs", + "#gaiadimension:green_agate_logs", + "#gaiadimension:purple_agate_logs", + "#gaiadimension:fossilized_logs", + "#gaiadimension:corrupted_logs", + "#gaiadimension:burnt_logs", + "#gaiadimension:burning_logs", + "#gaiadimension:aura_logs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/portals.json b/src/generated/resources/data/minecraft/tags/blocks/portals.json new file mode 100644 index 000000000..62f8cdac7 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/portals.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "gaiadimension:gaia_portal" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/saplings.json b/src/generated/resources/data/minecraft/tags/blocks/saplings.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/saplings.json rename to src/generated/resources/data/minecraft/tags/blocks/saplings.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json new file mode 100644 index 000000000..ddbcb94fe --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,30 @@ +{ + "replace": false, + "values": [ + "gaiadimension:pink_agate_plank_slab", + "gaiadimension:blue_agate_plank_slab", + "gaiadimension:green_agate_plank_slab", + "gaiadimension:purple_agate_plank_slab", + "gaiadimension:fossilized_plank_slab", + "gaiadimension:corrupted_plank_slab", + "gaiadimension:burnt_plank_slab", + "gaiadimension:burning_plank_slab", + "gaiadimension:aura_plank_slab", + "gaiadimension:jade_brick_slab", + "gaiadimension:cracked_jade_brick_slab", + "gaiadimension:crusted_jade_brick_slab", + "gaiadimension:copal_brick_slab", + "gaiadimension:cracked_copal_brick_slab", + "gaiadimension:crusted_copal_brick_slab", + "gaiadimension:jet_brick_slab", + "gaiadimension:cracked_jet_brick_slab", + "gaiadimension:crusted_jet_brick_slab", + "gaiadimension:amethyst_brick_slab", + "gaiadimension:cracked_amethyst_brick_slab", + "gaiadimension:crusted_amethyst_brick_slab", + "gaiadimension:malachite_brick_slab", + "gaiadimension:malachite_cracked_brick_slab", + "gaiadimension:malachite_crusted_brick_slab", + "gaiadimension:malachite_floor_slab" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/small_flowers.json rename to src/generated/resources/data/minecraft/tags/blocks/small_flowers.json diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json similarity index 54% rename from src/main/resources/data/minecraft/tags/blocks/stairs.json rename to src/generated/resources/data/minecraft/tags/blocks/stairs.json index 92804e0bc..6b81d287b 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -10,7 +10,21 @@ "gaiadimension:burnt_plank_stairs", "gaiadimension:burning_plank_stairs", "gaiadimension:aura_plank_stairs", + "gaiadimension:jade_brick_stairs", + "gaiadimension:cracked_jade_brick_stairs", + "gaiadimension:crusted_jade_brick_stairs", + "gaiadimension:copal_brick_stairs", + "gaiadimension:cracked_copal_brick_stairs", + "gaiadimension:crusted_copal_brick_stairs", + "gaiadimension:jet_brick_stairs", + "gaiadimension:cracked_jet_brick_stairs", + "gaiadimension:crusted_jet_brick_stairs", + "gaiadimension:amethyst_brick_stairs", + "gaiadimension:cracked_amethyst_brick_stairs", + "gaiadimension:crusted_amethyst_brick_stairs", "gaiadimension:malachite_brick_stairs", + "gaiadimension:malachite_cracked_brick_stairs", + "gaiadimension:malachite_crusted_brick_stairs", "gaiadimension:malachite_floor_stairs", "gaiadimension:malachite_chisel_stairs", "gaiadimension:malachite_pulsing_brick_stairs", diff --git a/src/main/resources/data/forge/tags/items/arrows.json b/src/generated/resources/data/minecraft/tags/items/arrows.json similarity index 100% rename from src/main/resources/data/forge/tags/items/arrows.json rename to src/generated/resources/data/minecraft/tags/items/arrows.json diff --git a/src/main/resources/data/forge/tags/items/beacon_payment.json b/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json similarity index 90% rename from src/main/resources/data/forge/tags/items/beacon_payment.json rename to src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json index d472745e9..6495e39a9 100644 --- a/src/main/resources/data/forge/tags/items/beacon_payment.json +++ b/src/generated/resources/data/minecraft/tags/items/beacon_payment_items.json @@ -10,11 +10,6 @@ "gaiadimension:blue_opal", "gaiadimension:green_opal", "gaiadimension:white_opal", - "gaiadimension:pyrite", - "gaiadimension:tektite", - "gaiadimension:goldstone", - "gaiadimension:aura_cluster", - "gaiadimension:bismuth_crystal", "gaiadimension:ixiolite", "gaiadimension:proustite", "gaiadimension:euclase", @@ -22,6 +17,11 @@ "gaiadimension:carnelian", "gaiadimension:benitoite", "gaiadimension:diopside", - "gaiadimension:chalcedony" + "gaiadimension:chalcedony", + "gaiadimension:pyrite", + "gaiadimension:tektite", + "gaiadimension:goldstone", + "gaiadimension:aura_cluster", + "gaiadimension:bismuth_crystal" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/leaves.json b/src/generated/resources/data/minecraft/tags/items/leaves.json new file mode 100644 index 000000000..3c1571af1 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "gaiadimension:pink_agate_leaves", + "gaiadimension:blue_agate_leaves", + "gaiadimension:green_agate_leaves", + "gaiadimension:purple_agate_leaves", + "gaiadimension:fossilized_leaves", + "gaiadimension:corrupted_leaves", + "gaiadimension:burnt_leaves", + "gaiadimension:burning_leaves", + "gaiadimension:aura_leaves" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/logs.json b/src/generated/resources/data/minecraft/tags/items/logs.json new file mode 100644 index 000000000..81145fb38 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/logs.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "#gaiadimension:pink_agate_logs", + "#gaiadimension:blue_agate_logs", + "#gaiadimension:green_agate_logs", + "#gaiadimension:purple_agate_logs", + "#gaiadimension:fossilized_logs", + "#gaiadimension:corrupted_logs", + "#gaiadimension:burnt_logs", + "#gaiadimension:burning_logs", + "#gaiadimension:aura_logs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/non_flammable_wood.json b/src/generated/resources/data/minecraft/tags/items/non_flammable_wood.json new file mode 100644 index 000000000..81145fb38 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/non_flammable_wood.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "#gaiadimension:pink_agate_logs", + "#gaiadimension:blue_agate_logs", + "#gaiadimension:green_agate_logs", + "#gaiadimension:purple_agate_logs", + "#gaiadimension:fossilized_logs", + "#gaiadimension:corrupted_logs", + "#gaiadimension:burnt_logs", + "#gaiadimension:burning_logs", + "#gaiadimension:aura_logs" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/saplings.json b/src/generated/resources/data/minecraft/tags/items/saplings.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/saplings.json rename to src/generated/resources/data/minecraft/tags/items/saplings.json diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json new file mode 100644 index 000000000..ddbcb94fe --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,30 @@ +{ + "replace": false, + "values": [ + "gaiadimension:pink_agate_plank_slab", + "gaiadimension:blue_agate_plank_slab", + "gaiadimension:green_agate_plank_slab", + "gaiadimension:purple_agate_plank_slab", + "gaiadimension:fossilized_plank_slab", + "gaiadimension:corrupted_plank_slab", + "gaiadimension:burnt_plank_slab", + "gaiadimension:burning_plank_slab", + "gaiadimension:aura_plank_slab", + "gaiadimension:jade_brick_slab", + "gaiadimension:cracked_jade_brick_slab", + "gaiadimension:crusted_jade_brick_slab", + "gaiadimension:copal_brick_slab", + "gaiadimension:cracked_copal_brick_slab", + "gaiadimension:crusted_copal_brick_slab", + "gaiadimension:jet_brick_slab", + "gaiadimension:cracked_jet_brick_slab", + "gaiadimension:crusted_jet_brick_slab", + "gaiadimension:amethyst_brick_slab", + "gaiadimension:cracked_amethyst_brick_slab", + "gaiadimension:crusted_amethyst_brick_slab", + "gaiadimension:malachite_brick_slab", + "gaiadimension:malachite_cracked_brick_slab", + "gaiadimension:malachite_crusted_brick_slab", + "gaiadimension:malachite_floor_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 000000000..6b81d287b --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,35 @@ +{ + "replace": false, + "values": [ + "gaiadimension:pink_agate_plank_stairs", + "gaiadimension:blue_agate_plank_stairs", + "gaiadimension:green_agate_plank_stairs", + "gaiadimension:purple_agate_plank_stairs", + "gaiadimension:fossilized_plank_stairs", + "gaiadimension:corrupted_plank_stairs", + "gaiadimension:burnt_plank_stairs", + "gaiadimension:burning_plank_stairs", + "gaiadimension:aura_plank_stairs", + "gaiadimension:jade_brick_stairs", + "gaiadimension:cracked_jade_brick_stairs", + "gaiadimension:crusted_jade_brick_stairs", + "gaiadimension:copal_brick_stairs", + "gaiadimension:cracked_copal_brick_stairs", + "gaiadimension:crusted_copal_brick_stairs", + "gaiadimension:jet_brick_stairs", + "gaiadimension:cracked_jet_brick_stairs", + "gaiadimension:crusted_jet_brick_stairs", + "gaiadimension:amethyst_brick_stairs", + "gaiadimension:cracked_amethyst_brick_stairs", + "gaiadimension:crusted_amethyst_brick_stairs", + "gaiadimension:malachite_brick_stairs", + "gaiadimension:malachite_cracked_brick_stairs", + "gaiadimension:malachite_crusted_brick_stairs", + "gaiadimension:malachite_floor_stairs", + "gaiadimension:malachite_chisel_stairs", + "gaiadimension:malachite_pulsing_brick_stairs", + "gaiadimension:malachite_pulsing_floor_stairs", + "gaiadimension:malachite_pulsing_chisel_stairs", + "gaiadimension:malachite_pillar_stairs" + ] +} \ No newline at end of file diff --git a/src/main/java/androsa/gaiadimension/GaiaDimensionMod.java b/src/main/java/androsa/gaiadimension/GaiaDimensionMod.java index 8b80a7b87..3bf3230aa 100644 --- a/src/main/java/androsa/gaiadimension/GaiaDimensionMod.java +++ b/src/main/java/androsa/gaiadimension/GaiaDimensionMod.java @@ -5,6 +5,7 @@ import androsa.gaiadimension.client.GaiaSkyRender; import androsa.gaiadimension.data.*; import androsa.gaiadimension.data.provider.GaiaAdvancementProvider; +import androsa.gaiadimension.data.provider.GaiaItemTagsProvider; import androsa.gaiadimension.registry.*; import net.minecraft.block.Block; import net.minecraft.client.world.DimensionRenderInfo; @@ -51,9 +52,6 @@ public class GaiaDimensionMod { public static final DamageSource CORRUPTION = new DamageSource("corruption").setDamageBypassesArmor(); - public static final ITag.INamedTag VOLCANIC = BlockTags.makeWrapperTag(new ResourceLocation(MODID, "base_stone_volcanic").toString()); - public static final ITag.INamedTag STATIC = BlockTags.makeWrapperTag(new ResourceLocation(MODID, "base_stone_static").toString()); - public GaiaDimensionMod() { IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -116,6 +114,7 @@ public void clientSetup(FMLClientSetupEvent event) { public void gatherData(GatherDataEvent event) { DataGenerator generator = event.getGenerator(); + GaiaBlockTags blocktags = new GaiaBlockTags(generator, event.getExistingFileHelper()); if (event.includeClient()) { generator.addProvider(new GaiaBlockStates(generator, event.getExistingFileHelper())); generator.addProvider(new GaiaItemModels(generator, event.getExistingFileHelper())); @@ -126,6 +125,8 @@ public void gatherData(GatherDataEvent event) { generator.addProvider(new GaiaConfiguredFeatures(generator)); generator.addProvider(new GaiaBiomes(generator)); generator.addProvider(new GaiaAdvancements(generator)); + generator.addProvider(blocktags); + generator.addProvider(new GaiaItemTags(generator, blocktags, event.getExistingFileHelper())); } } } \ No newline at end of file diff --git a/src/main/java/androsa/gaiadimension/block/container/slots/LargeCrateSlot.java b/src/main/java/androsa/gaiadimension/block/container/slots/LargeCrateSlot.java index cdbbbf074..243778b90 100644 --- a/src/main/java/androsa/gaiadimension/block/container/slots/LargeCrateSlot.java +++ b/src/main/java/androsa/gaiadimension/block/container/slots/LargeCrateSlot.java @@ -1,8 +1,6 @@ package androsa.gaiadimension.block.container.slots; -import androsa.gaiadimension.block.LargeCrateBlock; -import net.minecraft.block.Block; -import net.minecraft.block.ShulkerBoxBlock; +import androsa.gaiadimension.registry.GaiaTags; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; @@ -14,7 +12,6 @@ public LargeCrateSlot(IInventory inventory, int slotIndexIn, int xPosition, int } public boolean isItemValid(ItemStack stack) { - return !(Block.getBlockFromItem(stack.getItem()) instanceof ShulkerBoxBlock - || Block.getBlockFromItem(stack.getItem()) instanceof LargeCrateBlock); + return GaiaTags.Items.MEGA_STORAGE_BLACKLIST.contains(stack.getItem()); } } diff --git a/src/main/java/androsa/gaiadimension/block/container/slots/SmallCrateSlot.java b/src/main/java/androsa/gaiadimension/block/container/slots/SmallCrateSlot.java index ecb7761f0..cf0ad5dcc 100644 --- a/src/main/java/androsa/gaiadimension/block/container/slots/SmallCrateSlot.java +++ b/src/main/java/androsa/gaiadimension/block/container/slots/SmallCrateSlot.java @@ -1,9 +1,6 @@ package androsa.gaiadimension.block.container.slots; -import androsa.gaiadimension.block.LargeCrateBlock; -import androsa.gaiadimension.block.SmallCrateBlock; -import net.minecraft.block.Block; -import net.minecraft.block.ShulkerBoxBlock; +import androsa.gaiadimension.registry.GaiaTags; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; @@ -15,8 +12,6 @@ public SmallCrateSlot(IInventory inventory, int slotIndexIn, int xPosition, int } public boolean isItemValid(ItemStack stack) { - return !(Block.getBlockFromItem(stack.getItem()) instanceof ShulkerBoxBlock - || Block.getBlockFromItem(stack.getItem()) instanceof SmallCrateBlock - || Block.getBlockFromItem(stack.getItem()) instanceof LargeCrateBlock); + return GaiaTags.Items.CRUDE_STORAGE_BLACKLIST.contains(stack.getItem()); } } diff --git a/src/main/java/androsa/gaiadimension/data/GaiaBlockTags.java b/src/main/java/androsa/gaiadimension/data/GaiaBlockTags.java new file mode 100644 index 000000000..02d4038d2 --- /dev/null +++ b/src/main/java/androsa/gaiadimension/data/GaiaBlockTags.java @@ -0,0 +1,198 @@ +package androsa.gaiadimension.data; + +import androsa.gaiadimension.data.provider.GaiaBlockTagsProvider; +import androsa.gaiadimension.registry.GaiaTags; +import androsa.gaiadimension.registry.ModBlocks; +import com.google.common.collect.ImmutableList; +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.tags.BlockTags; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.data.ExistingFileHelper; + +public class GaiaBlockTags extends GaiaBlockTagsProvider { + + private static final ImmutableList BEACON_BASES = ImmutableList.of( + ModBlocks.sugilite_block, ModBlocks.hematite_block, ModBlocks.cinnabar_block, ModBlocks.labradorite_block, ModBlocks.moonstone_block, ModBlocks.opal_block_red, + ModBlocks.opal_block_blue, ModBlocks.opal_block_green, ModBlocks.opal_block_white, ModBlocks.pyrite_block, ModBlocks.tektite_block, ModBlocks.goldstone_block, + ModBlocks.aura_block, ModBlocks.bismuth_block, ModBlocks.ixiolite_block, ModBlocks.proustite_block, ModBlocks.euclase_block, ModBlocks.leucite_block, + ModBlocks.carnelian_block, ModBlocks.benitoite_block, ModBlocks.diopside_block, ModBlocks.chalcedony_block + ); + private static final ImmutableList FLOWER_POTS = ImmutableList.of( + ModBlocks.potted_thiscus, ModBlocks.potted_ouzium, ModBlocks.potted_agathum, ModBlocks.potted_varloom, ModBlocks.potted_corrupted_varloom, ModBlocks.potted_missingno_plant, + ModBlocks.potted_spotted_kersei, ModBlocks.potted_thorny_wiltha, ModBlocks.potted_roofed_agaric, ModBlocks.potted_bulbous_hobina, ModBlocks.potted_stickly_cupsir, + ModBlocks.potted_mystical_murgni, ModBlocks.potted_corrupted_gaia_eye, ModBlocks.potted_elder_imklia, ModBlocks.potted_gold_orb_tucher, ModBlocks.potted_missingno_fungus, + ModBlocks.potted_pink_agate_sapling, ModBlocks.potted_blue_agate_sapling, ModBlocks.potted_green_agate_sapling, ModBlocks.potted_purple_agate_sapling, + ModBlocks.potted_fossilized_sapling, ModBlocks.potted_corrupted_sapling, ModBlocks.potted_burnt_sapling, ModBlocks.potted_burning_sapling, ModBlocks.potted_aura_sapling + ); + private static final ImmutableList GUARDED_BY_PIGLINS = ImmutableList.of( + ModBlocks.crude_storage_crate, ModBlocks.mega_storage_crate + ); + private static final ImmutableList IMPERMEABLE = ImmutableList.of( + ModBlocks.foggy_glass, ModBlocks.cloudy_glass, ModBlocks.frail_glitter_block + ); + private static final ImmutableList LEAVES = ImmutableList.of( + ModBlocks.pink_agate_leaves, ModBlocks.blue_agate_leaves, ModBlocks.green_agate_leaves, ModBlocks.purple_agate_leaves, ModBlocks.fossilized_leaves, + ModBlocks.corrupted_leaves, ModBlocks.burnt_leaves, ModBlocks.burning_leaves, ModBlocks.aura_leaves + ); + private static final ImmutableList PINK_AGATE_LOGS = ImmutableList.of( + ModBlocks.pink_agate_log, ModBlocks.stripped_pink_agate_log, ModBlocks.pink_agate_wood, ModBlocks.stripped_pink_agate_wood + ); + private static final ImmutableList BLUE_AGATE_LOGS = ImmutableList.of( + ModBlocks.blue_agate_log, ModBlocks.stripped_blue_agate_log, ModBlocks.blue_agate_wood, ModBlocks.stripped_blue_agate_wood + ); + private static final ImmutableList GREEN_AGATE_LOGS = ImmutableList.of( + ModBlocks.green_agate_log, ModBlocks.stripped_green_agate_log, ModBlocks.green_agate_wood, ModBlocks.stripped_green_agate_wood + ); + private static final ImmutableList PURPLE_AGATE_LOGS = ImmutableList.of( + ModBlocks.purple_agate_log, ModBlocks.stripped_purple_agate_log, ModBlocks.purple_agate_wood, ModBlocks.stripped_purple_agate_wood + ); + private static final ImmutableList FOSSILIZED_LOGS = ImmutableList.of( + ModBlocks.fossilized_log, ModBlocks.stripped_fossilized_log, ModBlocks.fossilized_wood, ModBlocks.stripped_fossilized_wood + ); + private static final ImmutableList CORRUPTED_LOGS = ImmutableList.of( + ModBlocks.corrupted_log, ModBlocks.stripped_corrupted_log, ModBlocks.corrupted_wood, ModBlocks.stripped_corrupted_wood + ); + private static final ImmutableList BURNT_LOGS = ImmutableList.of( + ModBlocks.burnt_log, ModBlocks.stripped_burnt_log, ModBlocks.burnt_wood, ModBlocks.stripped_burnt_wood + ); + private static final ImmutableList BURNING_LOGS = ImmutableList.of( + ModBlocks.burning_log, ModBlocks.stripped_burning_log, ModBlocks.burning_wood, ModBlocks.stripped_burning_wood + ); + private static final ImmutableList AURA_LOGS = ImmutableList.of( + ModBlocks.aura_log, ModBlocks.stripped_aura_log, ModBlocks.aura_wood, ModBlocks.stripped_aura_wood + ); + private static final ImmutableList TILES = ImmutableList.of( + ModBlocks.pink_agate_planks, ModBlocks.blue_agate_planks, ModBlocks.green_agate_planks, ModBlocks.purple_agate_planks, + ModBlocks.fossilized_planks, ModBlocks.corrupted_planks, ModBlocks.burnt_planks, ModBlocks.burning_planks, ModBlocks.aura_planks + ); + private static final ImmutableList SAPLINGS = ImmutableList.of( + ModBlocks.pink_agate_sapling, ModBlocks.blue_agate_sapling, ModBlocks.green_agate_sapling, ModBlocks.purple_agate_sapling, + ModBlocks.fossilized_sapling, ModBlocks.corrupted_sapling, ModBlocks.burnt_sapling, ModBlocks.burning_sapling, ModBlocks.aura_sapling + ); + private static final ImmutableList SLABS = ImmutableList.of( + ModBlocks.pink_agate_plank_slab, ModBlocks.blue_agate_plank_slab, ModBlocks.green_agate_plank_slab, ModBlocks.purple_agate_plank_slab, ModBlocks.fossilized_plank_slab, + ModBlocks.corrupted_plank_slab, ModBlocks.burnt_plank_slab, ModBlocks.burning_plank_slab, ModBlocks.aura_plank_slab, ModBlocks.jade_brick_slab, + ModBlocks.cracked_jade_brick_slab, ModBlocks.crusted_jade_brick_slab, ModBlocks.copal_brick_slab, ModBlocks.cracked_copal_brick_slab,ModBlocks.crusted_copal_brick_slab, + ModBlocks.jet_brick_slab, ModBlocks.cracked_jet_brick_slab, ModBlocks.crusted_jet_brick_slab, ModBlocks.amethyst_brick_slab, ModBlocks.cracked_amethyst_brick_slab, + ModBlocks.crusted_amethyst_brick_slab, ModBlocks.malachite_brick_slab, ModBlocks.malachite_cracked_brick_slab, ModBlocks.malachite_crusted_brick_slab, ModBlocks.malachite_floor_slab + ); + private static final ImmutableList SMALL_FLOWERS = ImmutableList.of( + ModBlocks.thiscus, ModBlocks.ouzium, ModBlocks.agathum, ModBlocks.varloom, ModBlocks.corrupted_varloom, ModBlocks.missingno_plant + ); + private static final ImmutableList STAIRS = ImmutableList.of( + ModBlocks.pink_agate_plank_stairs, ModBlocks.blue_agate_plank_stairs, ModBlocks.green_agate_plank_stairs, ModBlocks.purple_agate_plank_stairs, ModBlocks.fossilized_plank_stairs, + ModBlocks.corrupted_plank_stairs, ModBlocks.burnt_plank_stairs, ModBlocks.burning_plank_stairs, ModBlocks.aura_plank_stairs, ModBlocks.jade_brick_stairs, + ModBlocks.cracked_jade_brick_stairs, ModBlocks.crusted_jade_brick_stairs, ModBlocks.copal_brick_stairs, ModBlocks.cracked_copal_brick_stairs,ModBlocks.crusted_copal_brick_stairs, + ModBlocks.jet_brick_stairs, ModBlocks.cracked_jet_brick_stairs, ModBlocks.crusted_jet_brick_stairs, ModBlocks.amethyst_brick_stairs, ModBlocks.cracked_amethyst_brick_stairs, + ModBlocks.crusted_amethyst_brick_stairs, ModBlocks.malachite_brick_stairs, ModBlocks.malachite_cracked_brick_stairs, ModBlocks.malachite_crusted_brick_stairs, ModBlocks.malachite_floor_stairs, + ModBlocks.malachite_chisel_stairs, ModBlocks.malachite_pulsing_brick_stairs, ModBlocks.malachite_pulsing_floor_stairs, ModBlocks.malachite_pulsing_chisel_stairs, ModBlocks.malachite_pillar_stairs + ); + private static final ImmutableList DIRT = ImmutableList.of( + ModBlocks.heavy_soil, ModBlocks.glitter_grass, ModBlocks.corrupt_soil, ModBlocks.corrupt_grass, + ModBlocks.boggy_soil, ModBlocks.murky_grass, ModBlocks.light_soil, ModBlocks.soft_grass + ); + private static final ImmutableList GAIA_BRICKS = ImmutableList.of( + ModBlocks.gaia_stone_bricks, ModBlocks.cracked_gaia_stone_bricks, ModBlocks.crusted_gaia_stone_bricks + ); + private static final ImmutableList AMETHYST_BRICKS = ImmutableList.of( + ModBlocks.amethyst_bricks, ModBlocks.cracked_amethyst_bricks, ModBlocks.crusted_amethyst_bricks + ); + private static final ImmutableList COPAL_BRICKS = ImmutableList.of( + ModBlocks.copal_bricks, ModBlocks.cracked_copal_bricks, ModBlocks.crusted_copal_bricks + ); + private static final ImmutableList JADE_BRICKS = ImmutableList.of( + ModBlocks.jade_bricks, ModBlocks.cracked_jade_bricks, ModBlocks.crusted_jade_bricks + ); + private static final ImmutableList JET_BRICKS = ImmutableList.of( + ModBlocks.jet_bricks, ModBlocks.cracked_jet_bricks, ModBlocks.crusted_jet_bricks + ); + + public GaiaBlockTags(DataGenerator generatorIn, ExistingFileHelper existingFileHelper) { + super(generatorIn, existingFileHelper); + } + + @Override + protected void registerTags() { + addTag(BlockTags.BEACON_BASE_BLOCKS, BEACON_BASES); + addTag(BlockTags.FLOWER_POTS, FLOWER_POTS); + addTag(BlockTags.GUARDED_BY_PIGLINS, GUARDED_BY_PIGLINS); + addTag(BlockTags.IMPERMEABLE, IMPERMEABLE); + addTag(BlockTags.LEAVES, LEAVES); + getOrCreateBuilder(BlockTags.LOGS).addTags( + GaiaTags.Blocks.PINK_AGATE_LOGS, GaiaTags.Blocks.BLUE_AGATE_LOGS, GaiaTags.Blocks.GREEN_AGATE_LOGS, GaiaTags.Blocks.PURPLE_AGATE_LOGS, + GaiaTags.Blocks.FOSSILIZED_LOGS, GaiaTags.Blocks.CORRUPTED_LOGS, GaiaTags.Blocks.BURNT_LOGS, GaiaTags.Blocks.BURNING_LOGS, GaiaTags.Blocks.AURA_LOGS); + getOrCreateBuilder(BlockTags.NON_FLAMMABLE_WOOD).addTags( + GaiaTags.Blocks.PINK_AGATE_LOGS, GaiaTags.Blocks.BLUE_AGATE_LOGS, GaiaTags.Blocks.GREEN_AGATE_LOGS, GaiaTags.Blocks.PURPLE_AGATE_LOGS, + GaiaTags.Blocks.FOSSILIZED_LOGS, GaiaTags.Blocks.CORRUPTED_LOGS, GaiaTags.Blocks.BURNT_LOGS, GaiaTags.Blocks.BURNING_LOGS, GaiaTags.Blocks.AURA_LOGS); + getOrCreateBuilder(BlockTags.PORTALS).add(ModBlocks.gaia_portal); + addTag(BlockTags.SAPLINGS, SAPLINGS); + addTag(BlockTags.SLABS, SLABS); + addTag(BlockTags.SMALL_FLOWERS, SMALL_FLOWERS); + addTag(BlockTags.STAIRS, STAIRS); + + getOrCreateBuilder(GaiaTags.Blocks.ORES_SUGILITE).add(ModBlocks.sugilite_ore); + getOrCreateBuilder(GaiaTags.Blocks.ORES_HEMATITE).add(ModBlocks.hematite_ore); + getOrCreateBuilder(GaiaTags.Blocks.ORES_CINNABAR).add(ModBlocks.cinnabar_ore); + getOrCreateBuilder(GaiaTags.Blocks.ORES_LABRADORITE).add(ModBlocks.labradorite_ore); + getOrCreateBuilder(GaiaTags.Blocks.ORES_MOONSTONE).add(ModBlocks.moonstone_ore); + getOrCreateBuilder(GaiaTags.Blocks.ORES_RED_OPAL).add(ModBlocks.opal_ore_red); + getOrCreateBuilder(GaiaTags.Blocks.ORES_BLUE_OPAL).add(ModBlocks.opal_ore_blue); + getOrCreateBuilder(GaiaTags.Blocks.ORES_GREEN_OPAL).add(ModBlocks.opal_ore_green); + getOrCreateBuilder(GaiaTags.Blocks.ORES_WHITE_OPAL).add(ModBlocks.opal_ore_white); + getOrCreateBuilder(GaiaTags.Blocks.ORES_PYRITE).add(ModBlocks.pyrite_ore); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_SUGILITE).add(ModBlocks.sugilite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_HEMATITE).add(ModBlocks.hematite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_CINNABAR).add(ModBlocks.cinnabar_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_LABRADORITE).add(ModBlocks.labradorite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_MOONSTONE).add(ModBlocks.moonstone_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_RED_OPAL).add(ModBlocks.opal_block_red); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_BLUE_OPAL).add(ModBlocks.opal_block_blue); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_GREEN_OPAL).add(ModBlocks.opal_block_green); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_WHITE_OPAL).add(ModBlocks.opal_block_white); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_PYRITE).add(ModBlocks.pyrite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_TEKTITE).add(ModBlocks.tektite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_GOLDSTONE).add(ModBlocks.goldstone_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_AURA_CRYSTAL).add(ModBlocks.aura_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_BISMUTH).add(ModBlocks.bismuth_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_IXIOLITE).add(ModBlocks.ixiolite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_PROUSTITE).add(ModBlocks.proustite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_EUCLASE).add(ModBlocks.euclase_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_LEUCITE).add(ModBlocks.leucite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_CARNELIAN).add(ModBlocks.carnelian_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_BENITOITE).add(ModBlocks.benitoite_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_DIOPSIDE).add(ModBlocks.diopside_block); + getOrCreateBuilder(GaiaTags.Blocks.STORAGE_BLOCKS_CHALCEDONY).add(ModBlocks.chalcedony_block); + addTag(GaiaTags.Blocks.TILES, TILES); + + addTag(Tags.Blocks.DIRT, DIRT); + getOrCreateBuilder(Tags.Blocks.GLASS).add(ModBlocks.foggy_glass, ModBlocks.cloudy_glass); + getOrCreateBuilder(Tags.Blocks.ORES).addTags( + GaiaTags.Blocks.ORES_SUGILITE, GaiaTags.Blocks.ORES_HEMATITE, GaiaTags.Blocks.ORES_CINNABAR, GaiaTags.Blocks.ORES_LABRADORITE, GaiaTags.Blocks.ORES_MOONSTONE, + GaiaTags.Blocks.ORES_RED_OPAL, GaiaTags.Blocks.ORES_BLUE_OPAL, GaiaTags.Blocks.ORES_GREEN_OPAL, GaiaTags.Blocks.ORES_WHITE_OPAL,GaiaTags.Blocks.ORES_PYRITE); + getOrCreateBuilder(Tags.Blocks.STORAGE_BLOCKS).addTags( + GaiaTags.Blocks.STORAGE_BLOCKS_SUGILITE, GaiaTags.Blocks.STORAGE_BLOCKS_HEMATITE, GaiaTags.Blocks.STORAGE_BLOCKS_CINNABAR,GaiaTags.Blocks.STORAGE_BLOCKS_LABRADORITE, + GaiaTags.Blocks.STORAGE_BLOCKS_MOONSTONE, GaiaTags.Blocks.STORAGE_BLOCKS_RED_OPAL, GaiaTags.Blocks.STORAGE_BLOCKS_BLUE_OPAL,GaiaTags.Blocks.STORAGE_BLOCKS_GREEN_OPAL, + GaiaTags.Blocks.STORAGE_BLOCKS_WHITE_OPAL, GaiaTags.Blocks.STORAGE_BLOCKS_PYRITE, GaiaTags.Blocks.STORAGE_BLOCKS_TEKTITE, GaiaTags.Blocks.STORAGE_BLOCKS_GOLDSTONE, + GaiaTags.Blocks.STORAGE_BLOCKS_AURA_CRYSTAL, GaiaTags.Blocks.STORAGE_BLOCKS_BISMUTH, GaiaTags.Blocks.STORAGE_BLOCKS_IXIOLITE,GaiaTags.Blocks.STORAGE_BLOCKS_PROUSTITE, + GaiaTags.Blocks.STORAGE_BLOCKS_EUCLASE, GaiaTags.Blocks.STORAGE_BLOCKS_LEUCITE, GaiaTags.Blocks.STORAGE_BLOCKS_CARNELIAN, GaiaTags.Blocks.STORAGE_BLOCKS_BENITOITE, + GaiaTags.Blocks.STORAGE_BLOCKS_DIOPSIDE, GaiaTags.Blocks.STORAGE_BLOCKS_CHALCEDONY); + + addTag(GaiaTags.Blocks.PINK_AGATE_LOGS, PINK_AGATE_LOGS); + addTag(GaiaTags.Blocks.BLUE_AGATE_LOGS, BLUE_AGATE_LOGS); + addTag(GaiaTags.Blocks.GREEN_AGATE_LOGS, GREEN_AGATE_LOGS); + addTag(GaiaTags.Blocks.PURPLE_AGATE_LOGS, PURPLE_AGATE_LOGS); + addTag(GaiaTags.Blocks.FOSSILIZED_LOGS, FOSSILIZED_LOGS); + addTag(GaiaTags.Blocks.CORRUPTED_LOGS, CORRUPTED_LOGS); + addTag(GaiaTags.Blocks.BURNT_LOGS, BURNT_LOGS); + addTag(GaiaTags.Blocks.BURNING_LOGS, BURNING_LOGS); + addTag(GaiaTags.Blocks.AURA_LOGS, AURA_LOGS); + getOrCreateBuilder(GaiaTags.Blocks.STATIC).add(ModBlocks.gaia_stone, ModBlocks.wasteland_stone); + getOrCreateBuilder(GaiaTags.Blocks.VOLCANIC).add(ModBlocks.gaia_stone, ModBlocks.volcanic_rock); + addTag(GaiaTags.Blocks.GAIA_BRICKS, GAIA_BRICKS); + addTag(GaiaTags.Blocks.AMETHYST_BRICKS, AMETHYST_BRICKS); + addTag(GaiaTags.Blocks.COPAL_BRICKS, COPAL_BRICKS); + addTag(GaiaTags.Blocks.JADE_BRICKS, JADE_BRICKS); + addTag(GaiaTags.Blocks.JET_BRICKS, JET_BRICKS); + } +} diff --git a/src/main/java/androsa/gaiadimension/data/GaiaItemTags.java b/src/main/java/androsa/gaiadimension/data/GaiaItemTags.java new file mode 100644 index 000000000..778dbab4c --- /dev/null +++ b/src/main/java/androsa/gaiadimension/data/GaiaItemTags.java @@ -0,0 +1,165 @@ +package androsa.gaiadimension.data; + +import androsa.gaiadimension.data.provider.GaiaItemTagsProvider; +import androsa.gaiadimension.registry.GaiaTags; +import androsa.gaiadimension.registry.ModBlocks; +import androsa.gaiadimension.registry.ModItems; +import com.google.common.collect.ImmutableList; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ITag; +import net.minecraft.tags.ItemTags; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.data.ExistingFileHelper; + +import java.util.function.Supplier; + +public class GaiaItemTags extends GaiaItemTagsProvider { + ImmutableList> BEACON_PAYMENTS = ImmutableList.of( + ModItems.sugilite, ModItems.hematite, ModItems.cinnabar, ModItems.labradorite, ModItems.moonstone, ModItems.red_opal, ModItems.blue_opal, ModItems.green_opal, + ModItems.white_opal, ModItems.ixiolite, ModItems.proustite, ModItems.euclase, ModItems.leucite, ModItems.carnelian, ModItems.benitoite, ModItems.diopside, + ModItems.chalcedony, ModItems.pyrite, ModItems.tektite, ModItems.goldstone, ModItems.aura_cluster, ModItems.bismuth_crystal + ); + ImmutableList> GEM_TAGS = ImmutableList.of( + GaiaTags.Items.GEMS_SUGILITE, GaiaTags.Items.GEMS_HEMATITE, GaiaTags.Items.GEMS_CINNABAR, GaiaTags.Items.GEMS_LABRADORITE, GaiaTags.Items.GEMS_MOONSTONE, + GaiaTags.Items.GEMS_RED_OPAL, GaiaTags.Items.GEMS_BLUE_OPAL, GaiaTags.Items.GEMS_GREEN_OPAL, GaiaTags.Items.GEMS_WHITE_OPAL, GaiaTags.Items.GEMS_IXIOLITE, + GaiaTags.Items.GEMS_PROUSTITE, GaiaTags.Items.GEMS_EUCLASE, GaiaTags.Items.GEMS_LEUCITE, GaiaTags.Items.GEMS_CARNELIAN, GaiaTags.Items.GEMS_BENITOITE, + GaiaTags.Items.GEMS_DIOPSIDE, GaiaTags.Items.GEMS_CHALCEDONY, GaiaTags.Items.GEMS_PYRITE, GaiaTags.Items.GEMS_TEKTITE, GaiaTags.Items.GEMS_GOLDSTONE, + GaiaTags.Items.GEMS_AURA, GaiaTags.Items.GEMS_BISMUTH + ); + ImmutableList> ORE_TAGS = ImmutableList.of( + GaiaTags.Items.ORES_SUGILITE, GaiaTags.Items.ORES_HEMATITE, GaiaTags.Items.ORES_CINNABAR, GaiaTags.Items.ORES_LABRADORITE, GaiaTags.Items.ORES_MOONSTONE, + GaiaTags.Items.ORES_RED_OPAL, GaiaTags.Items.ORES_BLUE_OPAL, GaiaTags.Items.ORES_GREEN_OPAL, GaiaTags.Items.ORES_WHITE_OPAL, GaiaTags.Items.ORES_PYRITE + ); + ImmutableList> STORAGE_TAGS = ImmutableList.of( + GaiaTags.Items.STORAGE_BLOCKS_SUGILITE, GaiaTags.Items.STORAGE_BLOCKS_HEMATITE, GaiaTags.Items.STORAGE_BLOCKS_CINNABAR, GaiaTags.Items.STORAGE_BLOCKS_LABRADORITE, + GaiaTags.Items.STORAGE_BLOCKS_MOONSTONE, GaiaTags.Items.STORAGE_BLOCKS_RED_OPAL, GaiaTags.Items.STORAGE_BLOCKS_BLUE_OPAL, GaiaTags.Items.STORAGE_BLOCKS_GREEN_OPAL, + GaiaTags.Items.STORAGE_BLOCKS_WHITE_OPAL, GaiaTags.Items.STORAGE_BLOCKS_PYRITE, GaiaTags.Items.STORAGE_BLOCKS_TEKTITE, GaiaTags.Items.STORAGE_BLOCKS_GOLDSTONE, + GaiaTags.Items.STORAGE_BLOCKS_AURA_CRYSTAL, GaiaTags.Items.STORAGE_BLOCKS_BISMUTH, GaiaTags.Items.STORAGE_BLOCKS_IXIOLITE, GaiaTags.Items.STORAGE_BLOCKS_PROUSTITE, + GaiaTags.Items.STORAGE_BLOCKS_EUCLASE, GaiaTags.Items.STORAGE_BLOCKS_LEUCITE, GaiaTags.Items.STORAGE_BLOCKS_CARNELIAN, GaiaTags.Items.STORAGE_BLOCKS_BENITOITE, + GaiaTags.Items.STORAGE_BLOCKS_DIOPSIDE, GaiaTags.Items.STORAGE_BLOCKS_CHALCEDONY + ); + + public GaiaItemTags(DataGenerator generatorIn, BlockTagsProvider provider, ExistingFileHelper existingFileHelper) { + super(generatorIn, provider, existingFileHelper); + } + + @Override + protected void registerTags() { + getOrCreateBuilder(ItemTags.ARROWS).add(ModItems.agate_arrow.get()); + addTag(ItemTags.BEACON_PAYMENT_ITEMS, BEACON_PAYMENTS); + copy(BlockTags.LEAVES, ItemTags.LEAVES); + copy(BlockTags.LOGS, ItemTags.LOGS); + copy(BlockTags.NON_FLAMMABLE_WOOD, ItemTags.NON_FLAMMABLE_WOOD); + copy(BlockTags.SAPLINGS, ItemTags.SAPLINGS); + copy(BlockTags.SLABS, ItemTags.SLABS); + copy(BlockTags.STAIRS, ItemTags.STAIRS); + + copy(GaiaTags.Blocks.TILES, GaiaTags.Items.TILES); + copy(GaiaTags.Blocks.PINK_AGATE_LOGS, GaiaTags.Items.PINK_AGATE_LOGS); + copy(GaiaTags.Blocks.BLUE_AGATE_LOGS, GaiaTags.Items.BLUE_AGATE_LOGS); + copy(GaiaTags.Blocks.GREEN_AGATE_LOGS, GaiaTags.Items.GREEN_AGATE_LOGS); + copy(GaiaTags.Blocks.PURPLE_AGATE_LOGS, GaiaTags.Items.PURPLE_AGATE_LOGS); + copy(GaiaTags.Blocks.FOSSILIZED_LOGS, GaiaTags.Items.FOSSILIZED_LOGS); + copy(GaiaTags.Blocks.CORRUPTED_LOGS, GaiaTags.Items.CORRUPTED_LOGS); + copy(GaiaTags.Blocks.BURNT_LOGS, GaiaTags.Items.BURNT_LOGS); + copy(GaiaTags.Blocks.BURNING_LOGS, GaiaTags.Items.BURNING_LOGS); + copy(GaiaTags.Blocks.AURA_LOGS, GaiaTags.Items.AURA_LOGS); + copy(GaiaTags.Blocks.GAIA_BRICKS, GaiaTags.Items.GAIA_BRICKS); + copy(GaiaTags.Blocks.AMETHYST_BRICKS, GaiaTags.Items.AMETHYST_BRICKS); + copy(GaiaTags.Blocks.COPAL_BRICKS, GaiaTags.Items.COPAL_BRICKS); + copy(GaiaTags.Blocks.JADE_BRICKS, GaiaTags.Items.JADE_BRICKS); + copy(GaiaTags.Blocks.JET_BRICKS, GaiaTags.Items.JET_BRICKS); + addTag(GaiaTags.Items.GEM_POUCH_ITEMS, BEACON_PAYMENTS); + getOrCreateBuilder(GaiaTags.Items.CRUDE_STORAGE_BLACKLIST).add( + //Mojang, actually fuck you for this. "pls dont be mad, we just work under big corporation" and you can't even make an *Item* Tag for shulker boxes??? + Items.SHULKER_BOX, Items.BLACK_SHULKER_BOX, Items.BLUE_SHULKER_BOX, Items.BROWN_SHULKER_BOX, Items.CYAN_SHULKER_BOX, Items.GRAY_SHULKER_BOX, Items.GREEN_SHULKER_BOX, + Items.LIGHT_BLUE_SHULKER_BOX, Items.LIGHT_GRAY_SHULKER_BOX, Items.LIME_SHULKER_BOX, Items.MAGENTA_SHULKER_BOX, Items.ORANGE_SHULKER_BOX, Items.PINK_SHULKER_BOX, + Items.PURPLE_SHULKER_BOX, Items.RED_SHULKER_BOX, Items.WHITE_SHULKER_BOX, Items.YELLOW_SHULKER_BOX + ).add(ModBlocks.crude_storage_crate.asItem(), ModBlocks.mega_storage_crate.asItem()); + getOrCreateBuilder(GaiaTags.Items.CRUDE_STORAGE_BLACKLIST).add( + //Repeat above. Quit the excuse game, you aren't a bunch of tiny modders anymore. + Items.SHULKER_BOX, Items.BLACK_SHULKER_BOX, Items.BLUE_SHULKER_BOX, Items.BROWN_SHULKER_BOX, Items.CYAN_SHULKER_BOX, Items.GRAY_SHULKER_BOX, Items.GREEN_SHULKER_BOX, + Items.LIGHT_BLUE_SHULKER_BOX, Items.LIGHT_GRAY_SHULKER_BOX, Items.LIME_SHULKER_BOX, Items.MAGENTA_SHULKER_BOX, Items.ORANGE_SHULKER_BOX, Items.PINK_SHULKER_BOX, + Items.PURPLE_SHULKER_BOX, Items.RED_SHULKER_BOX, Items.WHITE_SHULKER_BOX, Items.YELLOW_SHULKER_BOX + ).add(ModBlocks.mega_storage_crate.asItem()); + + getOrCreateBuilder(GaiaTags.Items.DUSTS_FINE).add(ModItems.fine_dust.get()); + getOrCreateBuilder(GaiaTags.Items.DUSTS_GOLDSTONE).add(ModItems.goldstone_dust.get()); + getOrCreateBuilder(GaiaTags.Items.DUSTS_HOT).add(ModItems.hot_dust.get()); + getOrCreateBuilder(GaiaTags.Items.INGOTS_SCAYNYX).add(ModItems.scaynyx_ingot.get()); + getOrCreateBuilder(GaiaTags.Items.RODS_AGATE).add(ModItems.agate_stick.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_SUGILITE).add(ModItems.sugilite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_HEMATITE).add(ModItems.hematite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_CINNABAR).add(ModItems.cinnabar.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_LABRADORITE).add(ModItems.labradorite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_MOONSTONE).add(ModItems.moonstone.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_RED_OPAL).add(ModItems.red_opal.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_BLUE_OPAL).add(ModItems.blue_opal.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_GREEN_OPAL).add(ModItems.green_opal.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_WHITE_OPAL).add(ModItems.white_opal.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_IXIOLITE).add(ModItems.ixiolite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_PROUSTITE).add(ModItems.proustite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_EUCLASE).add(ModItems.euclase.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_LEUCITE).add(ModItems.leucite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_CARNELIAN).add(ModItems.carnelian.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_BENITOITE).add(ModItems.benitoite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_DIOPSIDE).add(ModItems.diopside.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_CHALCEDONY).add(ModItems.chalcedony.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_PYRITE).add(ModItems.pyrite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_TEKTITE).add(ModItems.tektite.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_GOLDSTONE).add(ModItems.goldstone.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_AURA).add(ModItems.aura_cluster.get()); + getOrCreateBuilder(GaiaTags.Items.GEMS_BISMUTH).add(ModItems.bismuth_crystal.get()); + + copy(GaiaTags.Blocks.ORES_SUGILITE, GaiaTags.Items.ORES_SUGILITE); + copy(GaiaTags.Blocks.ORES_HEMATITE, GaiaTags.Items.ORES_HEMATITE); + copy(GaiaTags.Blocks.ORES_CINNABAR, GaiaTags.Items.ORES_CINNABAR); + copy(GaiaTags.Blocks.ORES_LABRADORITE, GaiaTags.Items.ORES_LABRADORITE); + copy(GaiaTags.Blocks.ORES_MOONSTONE, GaiaTags.Items.ORES_MOONSTONE); + copy(GaiaTags.Blocks.ORES_RED_OPAL, GaiaTags.Items.ORES_RED_OPAL); + copy(GaiaTags.Blocks.ORES_BLUE_OPAL, GaiaTags.Items.ORES_BLUE_OPAL); + copy(GaiaTags.Blocks.ORES_GREEN_OPAL, GaiaTags.Items.ORES_GREEN_OPAL); + copy(GaiaTags.Blocks.ORES_WHITE_OPAL, GaiaTags.Items.ORES_WHITE_OPAL); + copy(GaiaTags.Blocks.ORES_PYRITE, GaiaTags.Items.ORES_PYRITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_SUGILITE, GaiaTags.Items.STORAGE_BLOCKS_SUGILITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_HEMATITE, GaiaTags.Items.STORAGE_BLOCKS_HEMATITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_CINNABAR, GaiaTags.Items.STORAGE_BLOCKS_CINNABAR); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_LABRADORITE, GaiaTags.Items.STORAGE_BLOCKS_LABRADORITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_MOONSTONE, GaiaTags.Items.STORAGE_BLOCKS_MOONSTONE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_RED_OPAL, GaiaTags.Items.STORAGE_BLOCKS_RED_OPAL); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_BLUE_OPAL, GaiaTags.Items.STORAGE_BLOCKS_BLUE_OPAL); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_GREEN_OPAL, GaiaTags.Items.STORAGE_BLOCKS_GREEN_OPAL); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_WHITE_OPAL, GaiaTags.Items.STORAGE_BLOCKS_WHITE_OPAL); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_PYRITE, GaiaTags.Items.STORAGE_BLOCKS_PYRITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_TEKTITE, GaiaTags.Items.STORAGE_BLOCKS_TEKTITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_GOLDSTONE, GaiaTags.Items.STORAGE_BLOCKS_GOLDSTONE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_AURA_CRYSTAL, GaiaTags.Items.STORAGE_BLOCKS_AURA_CRYSTAL); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_BISMUTH, GaiaTags.Items.STORAGE_BLOCKS_BISMUTH); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_IXIOLITE, GaiaTags.Items.STORAGE_BLOCKS_IXIOLITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_PROUSTITE, GaiaTags.Items.STORAGE_BLOCKS_PROUSTITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_EUCLASE, GaiaTags.Items.STORAGE_BLOCKS_EUCLASE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_LEUCITE, GaiaTags.Items.STORAGE_BLOCKS_LEUCITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_CARNELIAN, GaiaTags.Items.STORAGE_BLOCKS_CARNELIAN); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_BENITOITE, GaiaTags.Items.STORAGE_BLOCKS_BENITOITE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_DIOPSIDE, GaiaTags.Items.STORAGE_BLOCKS_DIOPSIDE); + copy(GaiaTags.Blocks.STORAGE_BLOCKS_CHALCEDONY, GaiaTags.Items.STORAGE_BLOCKS_CHALCEDONY); + + getOrCreateBuilder(Tags.Items.BONES).add(ModItems.shiny_bone.get()); + getOrCreateBuilder(Tags.Items.DUSTS).addTags(GaiaTags.Items.DUSTS_FINE, GaiaTags.Items.DUSTS_GOLDSTONE, GaiaTags.Items.DUSTS_HOT); + for (ITag.INamedTag tag : GEM_TAGS) { + getOrCreateBuilder(Tags.Items.GEMS).addTag(tag); + } + getOrCreateBuilder(Tags.Items.INGOTS).addTag(GaiaTags.Items.INGOTS_SCAYNYX); + getOrCreateBuilder(Tags.Items.RODS).addTag(GaiaTags.Items.RODS_AGATE); + for (ITag.INamedTag tag : ORE_TAGS) { + getOrCreateBuilder(Tags.Items.ORES).addTag(tag); + } + for (ITag.INamedTag tag : STORAGE_TAGS) { + getOrCreateBuilder(Tags.Items.STORAGE_BLOCKS).addTag(tag); + } + } +} diff --git a/src/main/java/androsa/gaiadimension/data/GaiaRecipes.java b/src/main/java/androsa/gaiadimension/data/GaiaRecipes.java index 99a32327a..262d4a39e 100644 --- a/src/main/java/androsa/gaiadimension/data/GaiaRecipes.java +++ b/src/main/java/androsa/gaiadimension/data/GaiaRecipes.java @@ -20,15 +20,15 @@ public GaiaRecipes(DataGenerator generator) { @Override protected void registerRecipes(Consumer consumer) { - planksRecipe(ModBlocks.pink_agate_planks, GaiaTags.PINK_AGATE_LOGS).build(consumer, locWood("pink_agate_planks")); - planksRecipe(ModBlocks.blue_agate_planks, GaiaTags.BLUE_AGATE_LOGS).build(consumer, locWood("blue_agate_planks")); - planksRecipe(ModBlocks.green_agate_planks, GaiaTags.GREEN_AGATE_LOGS).build(consumer, locWood("green_agate_planks")); - planksRecipe(ModBlocks.purple_agate_planks, GaiaTags.PURPLE_AGATE_LOGS).build(consumer, locWood("purple_agate_planks")); - planksRecipe(ModBlocks.fossilized_planks, GaiaTags.FOSSILIZED_LOGS).build(consumer, locWood("fossilized_planks")); - planksRecipe(ModBlocks.corrupted_planks, GaiaTags.CORRUPTED_LOGS).build(consumer, locWood("corrupted_planks")); - planksRecipe(ModBlocks.burnt_planks, GaiaTags.BURNT_LOGS).build(consumer, locWood("burnt_planks")); - planksRecipe(ModBlocks.burning_planks, GaiaTags.BURNING_LOGS).build(consumer, locWood("burning_planks")); - planksRecipe(ModBlocks.aura_planks, GaiaTags.AURA_LOGS).build(consumer, locWood("aura_planks")); + planksRecipe(ModBlocks.pink_agate_planks, GaiaTags.Items.PINK_AGATE_LOGS).build(consumer, locWood("pink_agate_planks")); + planksRecipe(ModBlocks.blue_agate_planks, GaiaTags.Items.BLUE_AGATE_LOGS).build(consumer, locWood("blue_agate_planks")); + planksRecipe(ModBlocks.green_agate_planks, GaiaTags.Items.GREEN_AGATE_LOGS).build(consumer, locWood("green_agate_planks")); + planksRecipe(ModBlocks.purple_agate_planks, GaiaTags.Items.PURPLE_AGATE_LOGS).build(consumer, locWood("purple_agate_planks")); + planksRecipe(ModBlocks.fossilized_planks, GaiaTags.Items.FOSSILIZED_LOGS).build(consumer, locWood("fossilized_planks")); + planksRecipe(ModBlocks.corrupted_planks, GaiaTags.Items.CORRUPTED_LOGS).build(consumer, locWood("corrupted_planks")); + planksRecipe(ModBlocks.burnt_planks, GaiaTags.Items.BURNT_LOGS).build(consumer, locWood("burnt_planks")); + planksRecipe(ModBlocks.burning_planks, GaiaTags.Items.BURNING_LOGS).build(consumer, locWood("burning_planks")); + planksRecipe(ModBlocks.aura_planks, GaiaTags.Items.AURA_LOGS).build(consumer, locWood("aura_planks")); slabRecipe(ModBlocks.pink_agate_plank_slab, ModBlocks.pink_agate_planks).build(consumer, locWood("pink_agate_plank_slab")); slabRecipe(ModBlocks.blue_agate_plank_slab, ModBlocks.blue_agate_planks).build(consumer, locWood("blue_agate_plank_slab")); slabRecipe(ModBlocks.green_agate_plank_slab, ModBlocks.green_agate_planks).build(consumer, locWood("green_agate_plank_slab")); @@ -128,10 +128,10 @@ protected void registerRecipes(Consumer consumer) { legsRecipe(ModItems.chalcedony_legs, ModItems.chalcedony).build(consumer, locArmor("chalcedony_legs")); bootsRecipe(ModItems.chalcedony_boots, ModItems.chalcedony).build(consumer, locArmor("chalcedony_boots")); - swordRecipeTag(ModItems.agate_sword, GaiaTags.AGATE_PLANKS).build(consumer, locTools("agate_sword")); - pickaxeRecipeTag(ModItems.agate_pickaxe, GaiaTags.AGATE_PLANKS).build(consumer, locTools("agate_pickaxe")); - axeRecipeTag(ModItems.agate_axe, GaiaTags.AGATE_PLANKS).build(consumer, locTools("agate_axe")); - shovelRecipeTag(ModItems.agate_shovel, GaiaTags.AGATE_PLANKS).build(consumer, locTools("agate_shovel")); + swordRecipeTag(ModItems.agate_sword, GaiaTags.Items.AGATE_PLANKS).build(consumer, locTools("agate_sword")); + pickaxeRecipeTag(ModItems.agate_pickaxe, GaiaTags.Items.AGATE_PLANKS).build(consumer, locTools("agate_pickaxe")); + axeRecipeTag(ModItems.agate_axe, GaiaTags.Items.AGATE_PLANKS).build(consumer, locTools("agate_axe")); + shovelRecipeTag(ModItems.agate_shovel, GaiaTags.Items.AGATE_PLANKS).build(consumer, locTools("agate_shovel")); swordRecipe(ModItems.sugilite_sword, ModItems.sugilite).build(consumer, locTools("sugilite_sword")); pickaxeRecipe(ModItems.sugilite_pickaxe, ModItems.sugilite).build(consumer, locTools("sugilite_pickaxe")); axeRecipe(ModItems.sugilite_axe, ModItems.sugilite).build(consumer, locTools("sugilite_axe")); @@ -229,12 +229,12 @@ protected void registerRecipes(Consumer consumer) { ShapedRecipeBuilder.shapedRecipe(ModItems.agate_cup.get(), 8) .patternLine("# #") .patternLine(" # ") - .key('#', GaiaTags.AGATE_PLANKS) - .addCriterion("has_planks", hasItem(GaiaTags.AGATE_PLANKS)) + .key('#', GaiaTags.Items.AGATE_PLANKS) + .addCriterion("has_planks", hasItem(GaiaTags.Items.AGATE_PLANKS)) .build(consumer, loc("agate_cup")); ShapelessRecipeBuilder.shapelessRecipe(ModItems.agate_stick.get(), 4) - .addIngredient(GaiaTags.AGATE_PLANKS) - .addCriterion("has_planks", hasItem(GaiaTags.AGATE_PLANKS)) + .addIngredient(GaiaTags.Items.AGATE_PLANKS) + .addCriterion("has_planks", hasItem(GaiaTags.Items.AGATE_PLANKS)) .build(consumer, loc("agate_stick")); ShapedRecipeBuilder.shapedRecipe(ModBlocks.bolstered_bricks, 2) .patternLine("%#") @@ -279,8 +279,8 @@ protected void registerRecipes(Consumer consumer) { ShapedRecipeBuilder.shapedRecipe(ModBlocks.agate_crafting_table) .patternLine("##") .patternLine("##") - .key('#', GaiaTags.AGATE_PLANKS) - .addCriterion("has_planks", hasItem(GaiaTags.AGATE_PLANKS)) + .key('#', GaiaTags.Items.AGATE_PLANKS) + .addCriterion("has_planks", hasItem(GaiaTags.Items.AGATE_PLANKS)) .build(consumer, loc("crafting_table")); ShapelessRecipeBuilder.shapelessRecipe(ModItems.pearly_geode_elixir.get()) .addIngredient(ModItems.pink_geode_slice.get()) @@ -328,7 +328,7 @@ protected void registerRecipes(Consumer consumer) { .patternLine("*%*") .patternLine("%#%") .patternLine("*%*") - .key('*', GaiaTags.AGATE_PLANKS) + .key('*', GaiaTags.Items.AGATE_PLANKS) .key('%', ModBlocks.thick_glitter_block) .key('#', ModBlocks.crude_storage_crate) .addCriterion("has_crate", hasItem(ModBlocks.crude_storage_crate)) @@ -337,7 +337,7 @@ protected void registerRecipes(Consumer consumer) { .patternLine("*%*") .patternLine("%#%") .patternLine("*%*") - .key('%', GaiaTags.AGATE_PLANKS) + .key('%', GaiaTags.Items.AGATE_PLANKS) .key('*', ModBlocks.thick_glitter_block) .key('#', ModBlocks.crude_storage_crate) .addCriterion("has_crate", hasItem(ModBlocks.crude_storage_crate)) @@ -368,17 +368,17 @@ protected void registerRecipes(Consumer consumer) { ShapedRecipeBuilder.shapedRecipe(ModBlocks.reinforced_bricks, 2) .patternLine("%#") .patternLine("#%") - .key('#', GaiaTags.GAIA_BRICKS) + .key('#', GaiaTags.Items.GAIA_BRICKS) .key('%', ModBlocks.thick_glitter_block) - .addCriterion("has_brick", hasItem(GaiaTags.GAIA_BRICKS)) + .addCriterion("has_brick", hasItem(GaiaTags.Items.GAIA_BRICKS)) .addCriterion("has_goldstone", hasItem(ModBlocks.thick_glitter_block)) .build(consumer, loc("reinforced_bricks")); ShapedRecipeBuilder.shapedRecipe(ModBlocks.reinforced_bricks, 2) .patternLine("#%") .patternLine("%#") - .key('#', GaiaTags.GAIA_BRICKS) + .key('#', GaiaTags.Items.GAIA_BRICKS) .key('%', ModBlocks.thick_glitter_block) - .addCriterion("has_brick", hasItem(GaiaTags.GAIA_BRICKS)) + .addCriterion("has_brick", hasItem(GaiaTags.Items.GAIA_BRICKS)) .addCriterion("has_goldstone", hasItem(ModBlocks.thick_glitter_block)) .build(consumer, loc("reinforced_bricks_2")); ShapedRecipeBuilder.shapedRecipe(ModBlocks.restructurer) @@ -399,8 +399,8 @@ protected void registerRecipes(Consumer consumer) { .patternLine("###") .patternLine("# #") .patternLine("###") - .key('#', GaiaTags.AGATE_PLANKS) - .addCriterion("has_planks", hasItem(GaiaTags.AGATE_PLANKS)) + .key('#', GaiaTags.Items.AGATE_PLANKS) + .addCriterion("has_planks", hasItem(GaiaTags.Items.AGATE_PLANKS)) .build(consumer, loc("small_chest")); ShapelessRecipeBuilder.shapelessRecipe(ModItems.twined_thread.get()) .addIngredient(ModItems.fine_thread.get()) diff --git a/src/main/java/androsa/gaiadimension/data/provider/GaiaBlockTagsProvider.java b/src/main/java/androsa/gaiadimension/data/provider/GaiaBlockTagsProvider.java new file mode 100644 index 000000000..87a7426dd --- /dev/null +++ b/src/main/java/androsa/gaiadimension/data/provider/GaiaBlockTagsProvider.java @@ -0,0 +1,24 @@ +package androsa.gaiadimension.data.provider; + +import androsa.gaiadimension.GaiaDimensionMod; +import com.google.common.collect.ImmutableList; +import net.minecraft.block.Block; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.TagsProvider; +import net.minecraft.tags.ITag; +import net.minecraftforge.common.data.ExistingFileHelper; + +public class GaiaBlockTagsProvider extends BlockTagsProvider { + + public GaiaBlockTagsProvider(DataGenerator generatorIn, ExistingFileHelper existingFileHelper) { + super(generatorIn, GaiaDimensionMod.MODID, existingFileHelper); + } + + protected void addTag(ITag.INamedTag tag, ImmutableList list) { + TagsProvider.Builder builder = this.getOrCreateBuilder(tag); + for (Block block : list) { + builder.add(block); + } + } +} diff --git a/src/main/java/androsa/gaiadimension/data/provider/GaiaItemTagsProvider.java b/src/main/java/androsa/gaiadimension/data/provider/GaiaItemTagsProvider.java new file mode 100644 index 000000000..80c9bc3e9 --- /dev/null +++ b/src/main/java/androsa/gaiadimension/data/provider/GaiaItemTagsProvider.java @@ -0,0 +1,26 @@ +package androsa.gaiadimension.data.provider; + +import androsa.gaiadimension.GaiaDimensionMod; +import com.google.common.collect.ImmutableList; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.ItemTagsProvider; +import net.minecraft.item.Item; +import net.minecraft.tags.ITag; +import net.minecraftforge.common.data.ExistingFileHelper; + +import java.util.function.Supplier; + +public class GaiaItemTagsProvider extends ItemTagsProvider { + + public GaiaItemTagsProvider(DataGenerator generatorIn, BlockTagsProvider provider, ExistingFileHelper existingFileHelper) { + super(generatorIn, provider, GaiaDimensionMod.MODID, existingFileHelper); + } + + protected void addTag(ITag.INamedTag tag, ImmutableList> list) { + Builder builder = this.getOrCreateBuilder(tag); + for (Supplier item : list) { + builder.add(item.get()); + } + } +} diff --git a/src/main/java/androsa/gaiadimension/item/inventory/GemPouchSlot.java b/src/main/java/androsa/gaiadimension/item/inventory/GemPouchSlot.java index 10479a4cd..0cf868eea 100644 --- a/src/main/java/androsa/gaiadimension/item/inventory/GemPouchSlot.java +++ b/src/main/java/androsa/gaiadimension/item/inventory/GemPouchSlot.java @@ -13,6 +13,6 @@ public GemPouchSlot(IInventory inv, int index, int xPosition, int yPosition) { @Override public boolean isItemValid(ItemStack stack) { - return (GaiaTags.GEM_POUCH_ITEMS.contains(stack.getItem())); + return GaiaTags.Items.GEM_POUCH_ITEMS.contains(stack.getItem()); } } diff --git a/src/main/java/androsa/gaiadimension/registry/GaiaBiomeFeatures.java b/src/main/java/androsa/gaiadimension/registry/GaiaBiomeFeatures.java index f74800fee..2919a5ac4 100644 --- a/src/main/java/androsa/gaiadimension/registry/GaiaBiomeFeatures.java +++ b/src/main/java/androsa/gaiadimension/registry/GaiaBiomeFeatures.java @@ -35,8 +35,8 @@ public final class GaiaBiomeFeatures { public static final RuleTest GAIA_STONE = new BlockMatchRuleTest(ModBlocks.gaia_stone); - public static final RuleTest VOLCANIC = new TagMatchRuleTest(GaiaDimensionMod.VOLCANIC); - public static final RuleTest STATIC = new TagMatchRuleTest(GaiaDimensionMod.STATIC); + public static final RuleTest VOLCANIC = new TagMatchRuleTest(GaiaTags.Blocks.VOLCANIC); + public static final RuleTest STATIC = new TagMatchRuleTest(GaiaTags.Blocks.STATIC); public static final BlockState GLITTER_GRASS = ModBlocks.glitter_grass.getDefaultState(); public static final BlockState CORRUPT_GRASS = ModBlocks.corrupt_grass.getDefaultState(); diff --git a/src/main/java/androsa/gaiadimension/registry/GaiaTags.java b/src/main/java/androsa/gaiadimension/registry/GaiaTags.java index 9f38cb483..3597f5a20 100644 --- a/src/main/java/androsa/gaiadimension/registry/GaiaTags.java +++ b/src/main/java/androsa/gaiadimension/registry/GaiaTags.java @@ -1,29 +1,167 @@ package androsa.gaiadimension.registry; import androsa.gaiadimension.GaiaDimensionMod; +import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.versions.forge.ForgeVersion; public class GaiaTags { private static final String ID = GaiaDimensionMod.MODID; - public static final ITag.INamedTag PINK_AGATE_LOGS = tagItem("pink_agate_logs"); - public static final ITag.INamedTag BLUE_AGATE_LOGS = tagItem("blue_agate_logs"); - public static final ITag.INamedTag GREEN_AGATE_LOGS = tagItem("green_agate_logs"); - public static final ITag.INamedTag PURPLE_AGATE_LOGS = tagItem("purple_agate_logs"); - public static final ITag.INamedTag FOSSILIZED_LOGS = tagItem("fossilized_logs"); - public static final ITag.INamedTag CORRUPTED_LOGS = tagItem("corrupted_logs"); - public static final ITag.INamedTag BURNT_LOGS = tagItem("burnt_logs"); - public static final ITag.INamedTag BURNING_LOGS = tagItem("burning_logs"); - public static final ITag.INamedTag AURA_LOGS = tagItem("aura_logs"); - public static final ITag.INamedTag AGATE_PLANKS = tagItem("agate_planks"); - public static final ITag.INamedTag GAIA_BRICKS = tagItem("gaia_bricks"); - public static final ITag.INamedTag GEM_POUCH_ITEMS = tagItem("gem_pouch_items"); - private static ITag.INamedTag tagItem(String name) { return ItemTags.makeWrapperTag(new ResourceLocation(ID, name).toString()); } + + private static ITag.INamedTag tagItemForge(String name) { + return ItemTags.makeWrapperTag(new ResourceLocation(ForgeVersion.MOD_ID, name).toString()); + } + + private static ITag.INamedTag tagBlock(String name) { + return BlockTags.makeWrapperTag(new ResourceLocation(ID, name).toString()); + } + + private static ITag.INamedTag tagBlockForge(String name) { + return BlockTags.makeWrapperTag(new ResourceLocation(ForgeVersion.MOD_ID, name).toString()); + } + + public static class Items { + public static final ITag.INamedTag ORES_SUGILITE = tagItemForge("ore/sugilite"); + public static final ITag.INamedTag ORES_HEMATITE = tagItemForge("ore/hematite"); + public static final ITag.INamedTag ORES_CINNABAR = tagItemForge("ore/cinnabar"); + public static final ITag.INamedTag ORES_LABRADORITE = tagItemForge("ore/labradorite"); + public static final ITag.INamedTag ORES_MOONSTONE = tagItemForge("ore/moonstone"); + public static final ITag.INamedTag ORES_RED_OPAL = tagItemForge("ore/red_opal"); + public static final ITag.INamedTag ORES_BLUE_OPAL = tagItemForge("ore/blue_opal"); + public static final ITag.INamedTag ORES_GREEN_OPAL = tagItemForge("ore/green_opal"); + public static final ITag.INamedTag ORES_WHITE_OPAL = tagItemForge("ore/white_opal"); + public static final ITag.INamedTag ORES_PYRITE = tagItemForge("ore/pyrite"); + public static final ITag.INamedTag STORAGE_BLOCKS_SUGILITE = tagItemForge("storage_blocks/sugilite"); + public static final ITag.INamedTag STORAGE_BLOCKS_HEMATITE = tagItemForge("storage_blocks/hematite"); + public static final ITag.INamedTag STORAGE_BLOCKS_CINNABAR = tagItemForge("storage_blocks/cinnabar"); + public static final ITag.INamedTag STORAGE_BLOCKS_LABRADORITE = tagItemForge("storage_blocks/labradorite"); + public static final ITag.INamedTag STORAGE_BLOCKS_MOONSTONE = tagItemForge("storage_blocks/moonstone"); + public static final ITag.INamedTag STORAGE_BLOCKS_RED_OPAL = tagItemForge("storage_blocks/red_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_BLUE_OPAL = tagItemForge("storage_blocks/blue_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_GREEN_OPAL = tagItemForge("storage_blocks/green_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_WHITE_OPAL = tagItemForge("storage_blocks/white_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_PYRITE = tagItemForge("storage_blocks/pyrite"); + public static final ITag.INamedTag STORAGE_BLOCKS_TEKTITE = tagItemForge("storage_blocks/tektite"); + public static final ITag.INamedTag STORAGE_BLOCKS_GOLDSTONE = tagItemForge("storage_blocks/goldstone"); + public static final ITag.INamedTag STORAGE_BLOCKS_AURA_CRYSTAL = tagItemForge("storage_blocks/aura"); + public static final ITag.INamedTag STORAGE_BLOCKS_BISMUTH = tagItemForge("storage_blocks/bismuth"); + public static final ITag.INamedTag STORAGE_BLOCKS_IXIOLITE = tagItemForge("storage_blocks/ixiolite"); + public static final ITag.INamedTag STORAGE_BLOCKS_PROUSTITE = tagItemForge("storage_blocks/proustite"); + public static final ITag.INamedTag STORAGE_BLOCKS_EUCLASE = tagItemForge("storage_blocks/euclase"); + public static final ITag.INamedTag STORAGE_BLOCKS_LEUCITE = tagItemForge("storage_blocks/leucite"); + public static final ITag.INamedTag STORAGE_BLOCKS_CARNELIAN = tagItemForge("storage_blocks/carnelian"); + public static final ITag.INamedTag STORAGE_BLOCKS_BENITOITE = tagItemForge("storage_blocks/benitoite"); + public static final ITag.INamedTag STORAGE_BLOCKS_DIOPSIDE = tagItemForge("storage_blocks/diopside"); + public static final ITag.INamedTag STORAGE_BLOCKS_CHALCEDONY = tagItemForge("storage_blocks/chalcedony"); + + public static final ITag.INamedTag DUSTS_FINE = tagItemForge("dusts/fine"); + public static final ITag.INamedTag DUSTS_GOLDSTONE = tagItemForge("dusts/goldstone"); + public static final ITag.INamedTag DUSTS_HOT = tagItemForge("dusts/hot"); + public static final ITag.INamedTag INGOTS_SCAYNYX = tagItemForge("ingots/scaynyx"); + public static final ITag.INamedTag RODS_AGATE = tagItemForge("rods/agate"); + public static final ITag.INamedTag GEMS_SUGILITE = tagItemForge("gems/sugilite"); + public static final ITag.INamedTag GEMS_HEMATITE = tagItemForge("gems/hematite"); + public static final ITag.INamedTag GEMS_CINNABAR = tagItemForge("gems/cinnabar"); + public static final ITag.INamedTag GEMS_LABRADORITE = tagItemForge("gems/labradorite"); + public static final ITag.INamedTag GEMS_MOONSTONE = tagItemForge("gems/moonstone"); + public static final ITag.INamedTag GEMS_RED_OPAL = tagItemForge("gems/red_opal"); + public static final ITag.INamedTag GEMS_BLUE_OPAL = tagItemForge("gems/blue_opal"); + public static final ITag.INamedTag GEMS_GREEN_OPAL = tagItemForge("gems/green_opal"); + public static final ITag.INamedTag GEMS_WHITE_OPAL = tagItemForge("gems/white_opal"); + public static final ITag.INamedTag GEMS_IXIOLITE = tagItemForge("gems/ixiolite"); + public static final ITag.INamedTag GEMS_PROUSTITE = tagItemForge("gems/proustite"); + public static final ITag.INamedTag GEMS_EUCLASE = tagItemForge("gems/euclase"); + public static final ITag.INamedTag GEMS_LEUCITE = tagItemForge("gems/leucite"); + public static final ITag.INamedTag GEMS_CARNELIAN = tagItemForge("gems/carnelian"); + public static final ITag.INamedTag GEMS_BENITOITE = tagItemForge("gems/benitoite"); + public static final ITag.INamedTag GEMS_DIOPSIDE = tagItemForge("gems/diopside"); + public static final ITag.INamedTag GEMS_CHALCEDONY = tagItemForge("gems/chalcedony"); + public static final ITag.INamedTag GEMS_PYRITE = tagItemForge("gems/pyrite"); + public static final ITag.INamedTag GEMS_TEKTITE = tagItemForge("gems/tektite"); + public static final ITag.INamedTag GEMS_GOLDSTONE = tagItemForge("gems/goldstone"); + public static final ITag.INamedTag GEMS_AURA = tagItemForge("gems/aura"); + public static final ITag.INamedTag GEMS_BISMUTH = tagItemForge("gems/bismuth"); + + public static final ITag.INamedTag TILES = tagItem("agate_tiles"); + public static final ITag.INamedTag PINK_AGATE_LOGS = tagItem("pink_agate_logs"); + public static final ITag.INamedTag BLUE_AGATE_LOGS = tagItem("blue_agate_logs"); + public static final ITag.INamedTag GREEN_AGATE_LOGS = tagItem("green_agate_logs"); + public static final ITag.INamedTag PURPLE_AGATE_LOGS = tagItem("purple_agate_logs"); + public static final ITag.INamedTag FOSSILIZED_LOGS = tagItem("fossilized_logs"); + public static final ITag.INamedTag CORRUPTED_LOGS = tagItem("corrupted_logs"); + public static final ITag.INamedTag BURNT_LOGS = tagItem("burnt_logs"); + public static final ITag.INamedTag BURNING_LOGS = tagItem("burning_logs"); + public static final ITag.INamedTag AURA_LOGS = tagItem("aura_logs"); + public static final ITag.INamedTag AGATE_PLANKS = tagItem("agate_planks"); + public static final ITag.INamedTag GAIA_BRICKS = tagItem("gaia_bricks"); + public static final ITag.INamedTag AMETHYST_BRICKS = tagItem("amethyst_bricks"); + public static final ITag.INamedTag COPAL_BRICKS = tagItem("copal_bricks"); + public static final ITag.INamedTag JADE_BRICKS = tagItem("jade_bricks"); + public static final ITag.INamedTag JET_BRICKS = tagItem("jet_bricks"); + public static final ITag.INamedTag GEM_POUCH_ITEMS = tagItem("gem_pouch_items"); + public static final ITag.INamedTag CRUDE_STORAGE_BLACKLIST = tagItem("crude_storage_blacklist"); + public static final ITag.INamedTag MEGA_STORAGE_BLACKLIST = tagItem("mega_storage_blacklist"); + } + + public static class Blocks { + public static final ITag.INamedTag VOLCANIC = tagBlock("base_stone_volcanic"); + public static final ITag.INamedTag STATIC = tagBlock("base_stone_static"); + public static final ITag.INamedTag TILES = tagBlock("agate_tiles"); + public static final ITag.INamedTag PINK_AGATE_LOGS = tagBlock("pink_agate_logs"); + public static final ITag.INamedTag BLUE_AGATE_LOGS = tagBlock("blue_agate_logs"); + public static final ITag.INamedTag GREEN_AGATE_LOGS = tagBlock("green_agate_logs"); + public static final ITag.INamedTag PURPLE_AGATE_LOGS = tagBlock("purple_agate_logs"); + public static final ITag.INamedTag FOSSILIZED_LOGS = tagBlock("fossilized_logs"); + public static final ITag.INamedTag CORRUPTED_LOGS = tagBlock("corrupted_logs"); + public static final ITag.INamedTag BURNT_LOGS = tagBlock("burnt_logs"); + public static final ITag.INamedTag BURNING_LOGS = tagBlock("burning_logs"); + public static final ITag.INamedTag AURA_LOGS = tagBlock("aura_logs"); + public static final ITag.INamedTag GAIA_BRICKS = tagBlock("gaia_bricks"); + public static final ITag.INamedTag AMETHYST_BRICKS = tagBlock("amethyst_bricks"); + public static final ITag.INamedTag COPAL_BRICKS = tagBlock("copal_bricks"); + public static final ITag.INamedTag JADE_BRICKS = tagBlock("jade_bricks"); + public static final ITag.INamedTag JET_BRICKS = tagBlock("jet_bricks"); + + public static final ITag.INamedTag ORES_SUGILITE = tagBlockForge("ore/sugilite"); + public static final ITag.INamedTag ORES_HEMATITE = tagBlockForge("ore/hematite"); + public static final ITag.INamedTag ORES_CINNABAR = tagBlockForge("ore/cinnabar"); + public static final ITag.INamedTag ORES_LABRADORITE = tagBlockForge("ore/labradorite"); + public static final ITag.INamedTag ORES_MOONSTONE = tagBlockForge("ore/moonstone"); + public static final ITag.INamedTag ORES_RED_OPAL = tagBlockForge("ore/red_opal"); + public static final ITag.INamedTag ORES_BLUE_OPAL = tagBlockForge("ore/blue_opal"); + public static final ITag.INamedTag ORES_GREEN_OPAL = tagBlockForge("ore/green_opal"); + public static final ITag.INamedTag ORES_WHITE_OPAL = tagBlockForge("ore/white_opal"); + public static final ITag.INamedTag ORES_PYRITE = tagBlockForge("ore/pyrite"); + public static final ITag.INamedTag STORAGE_BLOCKS_SUGILITE = tagBlockForge("storage_blocks/sugilite"); + public static final ITag.INamedTag STORAGE_BLOCKS_HEMATITE = tagBlockForge("storage_blocks/hematite"); + public static final ITag.INamedTag STORAGE_BLOCKS_CINNABAR = tagBlockForge("storage_blocks/cinnabar"); + public static final ITag.INamedTag STORAGE_BLOCKS_LABRADORITE = tagBlockForge("storage_blocks/labradorite"); + public static final ITag.INamedTag STORAGE_BLOCKS_MOONSTONE = tagBlockForge("storage_blocks/moonstone"); + public static final ITag.INamedTag STORAGE_BLOCKS_RED_OPAL = tagBlockForge("storage_blocks/red_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_BLUE_OPAL = tagBlockForge("storage_blocks/blue_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_GREEN_OPAL = tagBlockForge("storage_blocks/green_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_WHITE_OPAL = tagBlockForge("storage_blocks/white_opal"); + public static final ITag.INamedTag STORAGE_BLOCKS_PYRITE = tagBlockForge("storage_blocks/pyrite"); + public static final ITag.INamedTag STORAGE_BLOCKS_TEKTITE = tagBlockForge("storage_blocks/tektite"); + public static final ITag.INamedTag STORAGE_BLOCKS_GOLDSTONE = tagBlockForge("storage_blocks/goldstone"); + public static final ITag.INamedTag STORAGE_BLOCKS_AURA_CRYSTAL = tagBlockForge("storage_blocks/aura"); + public static final ITag.INamedTag STORAGE_BLOCKS_BISMUTH = tagBlockForge("storage_blocks/bismuth"); + public static final ITag.INamedTag STORAGE_BLOCKS_IXIOLITE = tagBlockForge("storage_blocks/ixiolite"); + public static final ITag.INamedTag STORAGE_BLOCKS_PROUSTITE = tagBlockForge("storage_blocks/proustite"); + public static final ITag.INamedTag STORAGE_BLOCKS_EUCLASE = tagBlockForge("storage_blocks/euclase"); + public static final ITag.INamedTag STORAGE_BLOCKS_LEUCITE = tagBlockForge("storage_blocks/leucite"); + public static final ITag.INamedTag STORAGE_BLOCKS_CARNELIAN = tagBlockForge("storage_blocks/carnelian"); + public static final ITag.INamedTag STORAGE_BLOCKS_BENITOITE = tagBlockForge("storage_blocks/benitoite"); + public static final ITag.INamedTag STORAGE_BLOCKS_DIOPSIDE = tagBlockForge("storage_blocks/diopside"); + public static final ITag.INamedTag STORAGE_BLOCKS_CHALCEDONY = tagBlockForge("storage_blocks/chalcedony"); + } } diff --git a/src/main/java/androsa/gaiadimension/registry/GaiaToolMaterials.java b/src/main/java/androsa/gaiadimension/registry/GaiaToolMaterials.java index 424ab56c6..43ef33602 100644 --- a/src/main/java/androsa/gaiadimension/registry/GaiaToolMaterials.java +++ b/src/main/java/androsa/gaiadimension/registry/GaiaToolMaterials.java @@ -7,7 +7,7 @@ import java.util.function.Supplier; public enum GaiaToolMaterials implements IItemTier { - AGATE(1, 150, 2.5F, 1.0F, 5, () -> Ingredient.fromTag(GaiaTags.AGATE_PLANKS)), + AGATE(1, 150, 2.5F, 1.0F, 5, () -> Ingredient.fromTag(GaiaTags.Items.AGATE_PLANKS)), SUGILITE(2, 800, 3.0F, 1.5F, 10, () -> Ingredient.fromItems(ModItems.sugilite.get())), IXIOLITE(2, 1500, 4.0F, 2.0F, 10, () -> Ingredient.fromItems(ModItems.ixiolite.get())), EUCLASE(2, 3000, 4.0F, 2.0F, 10, () -> Ingredient.fromItems(ModItems.euclase.get())), diff --git a/src/main/resources/data/forge/tags/blocks/ores.json b/src/main/resources/data/forge/tags/blocks/ores.json deleted file mode 100644 index 182026efe..000000000 --- a/src/main/resources/data/forge/tags/blocks/ores.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ores/sugilite", - "#forge:ores/hematite", - "#forge:ores/cinnabar", - "#forge:ores/labradorite", - "#forge:ores/moonstone", - "#forge:ores/red_opal", - "#forge:ores/blue_opal", - "#forge:ores/green_opal", - "#forge:ores/white_opal", - "#forge:ores/pyrite" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores.json b/src/main/resources/data/forge/tags/items/ores.json deleted file mode 100644 index 182026efe..000000000 --- a/src/main/resources/data/forge/tags/items/ores.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ores/sugilite", - "#forge:ores/hematite", - "#forge:ores/cinnabar", - "#forge:ores/labradorite", - "#forge:ores/moonstone", - "#forge:ores/red_opal", - "#forge:ores/blue_opal", - "#forge:ores/green_opal", - "#forge:ores/white_opal", - "#forge:ores/pyrite" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/logs.json b/src/main/resources/data/minecraft/tags/blocks/logs.json deleted file mode 100644 index 88bb156bd..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/logs.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "replace": false, - "values": [ - "gaiadimension:pink_agate_log", - "gaiadimension:blue_agate_log", - "gaiadimension:green_agate_log", - "gaiadimension:purple_agate_log", - "gaiadimension:fossilized_log", - "gaiadimension:corrupted_log", - "gaiadimension:burnt_log", - "gaiadimension:burning_log", - "gaiadimension:aura_log" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json deleted file mode 100644 index 43a486343..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - "gaiadimension:pink_agate_plank_slab", - "gaiadimension:blue_agate_plank_slab", - "gaiadimension:green_agate_plank_slab", - "gaiadimension:purple_agate_plank_slab", - "gaiadimension:fossilized_plank_slab", - "gaiadimension:corrupted_plank_slab", - "gaiadimension:burnt_plank_slab", - "gaiadimension:burning_plank_slab", - "gaiadimension:aura_plank_slab", - "gaiadimension:malachite_brick_slab", - "gaiadimension:malachite_floor_slab" - ] -} \ No newline at end of file