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..e952dd532 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:ores/iesnium", + "#forge:ores/silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/iesnium.json b/src/generated/resources/data/forge/tags/blocks/ores/iesnium.json similarity index 71% rename from src/main/resources/data/forge/tags/items/ores/iesnium.json rename to src/generated/resources/data/forge/tags/blocks/ores/iesnium.json index 9b121c978..ce2f53a25 100644 --- a/src/main/resources/data/forge/tags/items/ores/iesnium.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_ore" ] diff --git a/src/main/resources/data/forge/tags/items/ores/silver.json b/src/generated/resources/data/forge/tags/blocks/ores/silver.json similarity index 81% rename from src/main/resources/data/forge/tags/items/ores/silver.json rename to src/generated/resources/data/forge/tags/blocks/ores/silver.json index b96f68cf8..fe9a06d32 100644 --- a/src/main/resources/data/forge/tags/items/ores/silver.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_ore", "occultism:silver_ore_deepslate" diff --git a/src/main/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json similarity index 74% rename from src/main/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json rename to src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json index 51b567762..134213faa 100644 --- a/src/main/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json +++ b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_ore_deepslate" ] diff --git a/src/main/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json similarity index 71% rename from src/main/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json rename to src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json index 9b121c978..ce2f53a25 100644 --- a/src/main/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json +++ b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_ore" ] diff --git a/src/main/resources/data/forge/tags/blocks/ores_in_ground/stone.json b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json similarity index 70% rename from src/main/resources/data/forge/tags/blocks/ores_in_ground/stone.json rename to src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json index b686f8316..381913809 100644 --- a/src/main/resources/data/forge/tags/blocks/ores_in_ground/stone.json +++ b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_ore" ] diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json similarity index 89% rename from src/main/resources/data/forge/tags/items/storage_blocks.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks.json index a97f28f97..365de01e1 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -1,9 +1,8 @@ { - "replace": false, "values": [ "#forge:storage_blocks/iesnium", - "#forge:storage_blocks/raw_iesnium", "#forge:storage_blocks/silver", + "#forge:storage_blocks/raw_iesnium", "#forge:storage_blocks/raw_silver" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/iesnium.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/iesnium.json similarity index 71% rename from src/main/resources/data/forge/tags/items/storage_blocks/iesnium.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/iesnium.json index 4c4af689f..3dd670f76 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/iesnium.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_block" ] diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json similarity index 73% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json index fa2036f61..bf98078d0 100644 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:raw_iesnium_block" ] diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json similarity index 72% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json index ce4313e1c..fb7ca8263 100644 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:raw_silver_block" ] diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/silver.json similarity index 71% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/silver.json rename to src/generated/resources/data/forge/tags/blocks/storage_blocks/silver.json index 2e24b7c88..df080950e 100644 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/silver.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_block" ] diff --git a/src/main/resources/data/forge/tags/entity_types/axolotls.json b/src/generated/resources/data/forge/tags/entity_types/axolotls.json similarity index 69% rename from src/main/resources/data/forge/tags/entity_types/axolotls.json rename to src/generated/resources/data/forge/tags/entity_types/axolotls.json index 8815fc5ab..2301f7baf 100644 --- a/src/main/resources/data/forge/tags/entity_types/axolotls.json +++ b/src/generated/resources/data/forge/tags/entity_types/axolotls.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:axolotl" ] diff --git a/src/main/resources/data/forge/tags/entity_types/bats.json b/src/generated/resources/data/forge/tags/entity_types/bats.json similarity index 67% rename from src/main/resources/data/forge/tags/entity_types/bats.json rename to src/generated/resources/data/forge/tags/entity_types/bats.json index e820b7830..3bf83f77e 100644 --- a/src/main/resources/data/forge/tags/entity_types/bats.json +++ b/src/generated/resources/data/forge/tags/entity_types/bats.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:bat" ] diff --git a/src/main/resources/data/forge/tags/entity_types/chicken.json b/src/generated/resources/data/forge/tags/entity_types/chicken.json similarity index 69% rename from src/main/resources/data/forge/tags/entity_types/chicken.json rename to src/generated/resources/data/forge/tags/entity_types/chicken.json index 6e2748308..d60366198 100644 --- a/src/main/resources/data/forge/tags/entity_types/chicken.json +++ b/src/generated/resources/data/forge/tags/entity_types/chicken.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:chicken" ] diff --git a/src/generated/resources/data/forge/tags/entity_types/cows.json b/src/generated/resources/data/forge/tags/entity_types/cows.json new file mode 100644 index 000000000..bf9682c8f --- /dev/null +++ b/src/generated/resources/data/forge/tags/entity_types/cows.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cow" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/donkeys.json b/src/generated/resources/data/forge/tags/entity_types/donkeys.json similarity index 68% rename from src/main/resources/data/forge/tags/entity_types/donkeys.json rename to src/generated/resources/data/forge/tags/entity_types/donkeys.json index 56d156083..00d634a3a 100644 --- a/src/main/resources/data/forge/tags/entity_types/donkeys.json +++ b/src/generated/resources/data/forge/tags/entity_types/donkeys.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:donkey" ] diff --git a/src/generated/resources/data/forge/tags/entity_types/fish.json b/src/generated/resources/data/forge/tags/entity_types/fish.json new file mode 100644 index 000000000..83d056aa4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/entity_types/fish.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:cod", + "minecraft:salmon", + "minecraft:tropical_fish", + "minecraft:pufferfish" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/goats.json b/src/generated/resources/data/forge/tags/entity_types/goats.json similarity index 67% rename from src/main/resources/data/forge/tags/entity_types/goats.json rename to src/generated/resources/data/forge/tags/entity_types/goats.json index 31d634de5..f59c77bcd 100644 --- a/src/main/resources/data/forge/tags/entity_types/goats.json +++ b/src/generated/resources/data/forge/tags/entity_types/goats.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:goat" ] diff --git a/src/main/resources/data/forge/tags/entity_types/golems/snow.json b/src/generated/resources/data/forge/tags/entity_types/golems/snow.json similarity index 70% rename from src/main/resources/data/forge/tags/entity_types/golems/snow.json rename to src/generated/resources/data/forge/tags/entity_types/golems/snow.json index f30ced8a2..036acdd8b 100644 --- a/src/main/resources/data/forge/tags/entity_types/golems/snow.json +++ b/src/generated/resources/data/forge/tags/entity_types/golems/snow.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:snow_golem" ] diff --git a/src/main/resources/data/forge/tags/entity_types/hoglins.json b/src/generated/resources/data/forge/tags/entity_types/hoglins.json similarity index 68% rename from src/main/resources/data/forge/tags/entity_types/hoglins.json rename to src/generated/resources/data/forge/tags/entity_types/hoglins.json index 45570e6d7..16a1fa6a2 100644 --- a/src/main/resources/data/forge/tags/entity_types/hoglins.json +++ b/src/generated/resources/data/forge/tags/entity_types/hoglins.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:hoglin" ] diff --git a/src/main/resources/data/forge/tags/entity_types/horses.json b/src/generated/resources/data/forge/tags/entity_types/horses.json similarity index 68% rename from src/main/resources/data/forge/tags/entity_types/horses.json rename to src/generated/resources/data/forge/tags/entity_types/horses.json index d77cd76a9..b68478207 100644 --- a/src/main/resources/data/forge/tags/entity_types/horses.json +++ b/src/generated/resources/data/forge/tags/entity_types/horses.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:horse" ] diff --git a/src/main/resources/data/forge/tags/entity_types/llamas.json b/src/generated/resources/data/forge/tags/entity_types/llamas.json similarity index 78% rename from src/main/resources/data/forge/tags/entity_types/llamas.json rename to src/generated/resources/data/forge/tags/entity_types/llamas.json index f18311646..d0a0809b9 100644 --- a/src/main/resources/data/forge/tags/entity_types/llamas.json +++ b/src/generated/resources/data/forge/tags/entity_types/llamas.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:llama", "minecraft:trader_llama" diff --git a/src/main/resources/data/forge/tags/entity_types/mules.json b/src/generated/resources/data/forge/tags/entity_types/mules.json similarity index 67% rename from src/main/resources/data/forge/tags/entity_types/mules.json rename to src/generated/resources/data/forge/tags/entity_types/mules.json index 96c1d718e..ce32c3a63 100644 --- a/src/main/resources/data/forge/tags/entity_types/mules.json +++ b/src/generated/resources/data/forge/tags/entity_types/mules.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:mule" ] diff --git a/src/main/resources/data/forge/tags/entity_types/pandas.json b/src/generated/resources/data/forge/tags/entity_types/pandas.json similarity index 68% rename from src/main/resources/data/forge/tags/entity_types/pandas.json rename to src/generated/resources/data/forge/tags/entity_types/pandas.json index fae73e32e..c6bacda00 100644 --- a/src/main/resources/data/forge/tags/entity_types/pandas.json +++ b/src/generated/resources/data/forge/tags/entity_types/pandas.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:panda" ] diff --git a/src/main/resources/data/forge/tags/entity_types/parrots.json b/src/generated/resources/data/forge/tags/entity_types/parrots.json similarity index 68% rename from src/main/resources/data/forge/tags/entity_types/parrots.json rename to src/generated/resources/data/forge/tags/entity_types/parrots.json index 0e6987699..e3b06375f 100644 --- a/src/main/resources/data/forge/tags/entity_types/parrots.json +++ b/src/generated/resources/data/forge/tags/entity_types/parrots.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:parrot" ] diff --git a/src/main/resources/data/forge/tags/entity_types/pigs.json b/src/generated/resources/data/forge/tags/entity_types/pigs.json similarity index 67% rename from src/main/resources/data/forge/tags/entity_types/pigs.json rename to src/generated/resources/data/forge/tags/entity_types/pigs.json index a63b82020..bbaf9b30a 100644 --- a/src/main/resources/data/forge/tags/entity_types/pigs.json +++ b/src/generated/resources/data/forge/tags/entity_types/pigs.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:pig" ] diff --git a/src/main/resources/data/forge/tags/entity_types/sheep.json b/src/generated/resources/data/forge/tags/entity_types/sheep.json similarity index 68% rename from src/main/resources/data/forge/tags/entity_types/sheep.json rename to src/generated/resources/data/forge/tags/entity_types/sheep.json index d636122bc..838c1af07 100644 --- a/src/main/resources/data/forge/tags/entity_types/sheep.json +++ b/src/generated/resources/data/forge/tags/entity_types/sheep.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:sheep" ] diff --git a/src/generated/resources/data/forge/tags/entity_types/spiders.json b/src/generated/resources/data/forge/tags/entity_types/spiders.json new file mode 100644 index 000000000..16a677d7e --- /dev/null +++ b/src/generated/resources/data/forge/tags/entity_types/spiders.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:spider", + "minecraft:cave_spider" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/entity_types/squid.json b/src/generated/resources/data/forge/tags/entity_types/squid.json new file mode 100644 index 000000000..ecf07a450 --- /dev/null +++ b/src/generated/resources/data/forge/tags/entity_types/squid.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:squid", + "minecraft:glow_squid" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/entity_types/villagers.json b/src/generated/resources/data/forge/tags/entity_types/villagers.json new file mode 100644 index 000000000..eaacec435 --- /dev/null +++ b/src/generated/resources/data/forge/tags/entity_types/villagers.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:villager", + "minecraft:wandering_trader" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/zombies.json b/src/generated/resources/data/forge/tags/entity_types/zombies.json similarity index 86% rename from src/main/resources/data/forge/tags/entity_types/zombies.json rename to src/generated/resources/data/forge/tags/entity_types/zombies.json index f870dd92a..8264c1acd 100644 --- a/src/main/resources/data/forge/tags/entity_types/zombies.json +++ b/src/generated/resources/data/forge/tags/entity_types/zombies.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:zombie", "minecraft:zombie_villager", diff --git a/src/main/resources/data/forge/tags/items/books.json b/src/generated/resources/data/forge/tags/items/books.json similarity index 74% rename from src/main/resources/data/forge/tags/items/books.json rename to src/generated/resources/data/forge/tags/items/books.json index 8ebe15ac9..16d91033f 100644 --- a/src/main/resources/data/forge/tags/items/books.json +++ b/src/generated/resources/data/forge/tags/items/books.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:dictionary_of_spirits" ] diff --git a/src/main/resources/data/forge/tags/items/crops.json b/src/generated/resources/data/forge/tags/items/crops.json similarity index 70% rename from src/main/resources/data/forge/tags/items/crops.json rename to src/generated/resources/data/forge/tags/items/crops.json index cabaf579f..5169e8bef 100644 --- a/src/main/resources/data/forge/tags/items/crops.json +++ b/src/generated/resources/data/forge/tags/items/crops.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#forge:crops/datura" ] diff --git a/src/main/resources/data/forge/tags/items/crops/datura.json b/src/generated/resources/data/forge/tags/items/crops/datura.json similarity index 68% rename from src/main/resources/data/forge/tags/items/crops/datura.json rename to src/generated/resources/data/forge/tags/items/crops/datura.json index 7c7a82c95..805b05f84 100644 --- a/src/main/resources/data/forge/tags/items/crops/datura.json +++ b/src/generated/resources/data/forge/tags/items/crops/datura.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:datura" ] diff --git a/src/main/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/items/dusts.json similarity index 72% rename from src/main/resources/data/forge/tags/items/dusts.json rename to src/generated/resources/data/forge/tags/items/dusts.json index a7b00d3d6..426090948 100644 --- a/src/main/resources/data/forge/tags/items/dusts.json +++ b/src/generated/resources/data/forge/tags/items/dusts.json @@ -1,14 +1,13 @@ { - "replace": false, "values": [ - "occultism:burnt_otherstone", - "occultism:otherworld_ashes", - "#forge:dusts/obsidian", "#forge:dusts/copper", - "#forge:dusts/silver", - "#forge:dusts/iesnium", - "#forge:dusts/iron", + "#forge:dusts/end_stone", "#forge:dusts/gold", - "#forge:dusts/end_stone" + "#forge:dusts/iron", + "#forge:dusts/iesnium", + "#forge:dusts/silver", + "#forge:dusts/obsidian", + "occultism:burnt_otherstone", + "occultism:otherworld_ashes" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/copper.json b/src/generated/resources/data/forge/tags/items/dusts/copper.json similarity index 71% rename from src/main/resources/data/forge/tags/items/dusts/copper.json rename to src/generated/resources/data/forge/tags/items/dusts/copper.json index 4d4740c15..158b553ee 100644 --- a/src/main/resources/data/forge/tags/items/dusts/copper.json +++ b/src/generated/resources/data/forge/tags/items/dusts/copper.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:copper_dust" ] diff --git a/src/main/resources/data/forge/tags/items/dusts/end_stone.json b/src/generated/resources/data/forge/tags/items/dusts/end_stone.json similarity index 73% rename from src/main/resources/data/forge/tags/items/dusts/end_stone.json rename to src/generated/resources/data/forge/tags/items/dusts/end_stone.json index 29879c104..29ecce073 100644 --- a/src/main/resources/data/forge/tags/items/dusts/end_stone.json +++ b/src/generated/resources/data/forge/tags/items/dusts/end_stone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:crushed_end_stone" ] diff --git a/src/main/resources/data/forge/tags/items/dusts/gold.json b/src/generated/resources/data/forge/tags/items/dusts/gold.json similarity index 70% rename from src/main/resources/data/forge/tags/items/dusts/gold.json rename to src/generated/resources/data/forge/tags/items/dusts/gold.json index 667035099..5d6bc64d4 100644 --- a/src/main/resources/data/forge/tags/items/dusts/gold.json +++ b/src/generated/resources/data/forge/tags/items/dusts/gold.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:gold_dust" ] diff --git a/src/main/resources/data/forge/tags/items/dusts/iesnium.json b/src/generated/resources/data/forge/tags/items/dusts/iesnium.json similarity index 71% rename from src/main/resources/data/forge/tags/items/dusts/iesnium.json rename to src/generated/resources/data/forge/tags/items/dusts/iesnium.json index 2a82411e8..b8e3c8254 100644 --- a/src/main/resources/data/forge/tags/items/dusts/iesnium.json +++ b/src/generated/resources/data/forge/tags/items/dusts/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_dust" ] diff --git a/src/main/resources/data/forge/tags/items/dusts/iron.json b/src/generated/resources/data/forge/tags/items/dusts/iron.json similarity index 70% rename from src/main/resources/data/forge/tags/items/dusts/iron.json rename to src/generated/resources/data/forge/tags/items/dusts/iron.json index b5fac1720..88b83a104 100644 --- a/src/main/resources/data/forge/tags/items/dusts/iron.json +++ b/src/generated/resources/data/forge/tags/items/dusts/iron.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iron_dust" ] diff --git a/src/main/resources/data/forge/tags/items/dusts/obsidian.json b/src/generated/resources/data/forge/tags/items/dusts/obsidian.json similarity index 71% rename from src/main/resources/data/forge/tags/items/dusts/obsidian.json rename to src/generated/resources/data/forge/tags/items/dusts/obsidian.json index 362167831..4eb37487a 100644 --- a/src/main/resources/data/forge/tags/items/dusts/obsidian.json +++ b/src/generated/resources/data/forge/tags/items/dusts/obsidian.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:obsidian_dust" ] diff --git a/src/main/resources/data/forge/tags/items/dusts/silver.json b/src/generated/resources/data/forge/tags/items/dusts/silver.json similarity index 71% rename from src/main/resources/data/forge/tags/items/dusts/silver.json rename to src/generated/resources/data/forge/tags/items/dusts/silver.json index 1fbc86424..2c16077da 100644 --- a/src/main/resources/data/forge/tags/items/dusts/silver.json +++ b/src/generated/resources/data/forge/tags/items/dusts/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_dust" ] diff --git a/src/main/resources/data/forge/tags/items/fruits.json b/src/generated/resources/data/forge/tags/items/fruits.json similarity index 68% rename from src/main/resources/data/forge/tags/items/fruits.json rename to src/generated/resources/data/forge/tags/items/fruits.json index ebc9d7fa9..8f7c958e5 100644 --- a/src/main/resources/data/forge/tags/items/fruits.json +++ b/src/generated/resources/data/forge/tags/items/fruits.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:apple" ] diff --git a/src/main/resources/data/forge/tags/items/gems.json b/src/generated/resources/data/forge/tags/items/gems.json similarity index 73% rename from src/main/resources/data/forge/tags/items/gems.json rename to src/generated/resources/data/forge/tags/items/gems.json index 06e10c167..96c8022db 100644 --- a/src/main/resources/data/forge/tags/items/gems.json +++ b/src/generated/resources/data/forge/tags/items/gems.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:spirit_attuned_gem" ] diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json new file mode 100644 index 000000000..5d0c5c95a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:ingots/iesnium", + "#forge:ingots/silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/iesnium.json b/src/generated/resources/data/forge/tags/items/ingots/iesnium.json similarity index 71% rename from src/main/resources/data/forge/tags/items/ingots/iesnium.json rename to src/generated/resources/data/forge/tags/items/ingots/iesnium.json index 2f1b4451d..ebac5c208 100644 --- a/src/main/resources/data/forge/tags/items/ingots/iesnium.json +++ b/src/generated/resources/data/forge/tags/items/ingots/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_ingot" ] diff --git a/src/main/resources/data/forge/tags/items/ingots/silver.json b/src/generated/resources/data/forge/tags/items/ingots/silver.json similarity index 71% rename from src/main/resources/data/forge/tags/items/ingots/silver.json rename to src/generated/resources/data/forge/tags/items/ingots/silver.json index 9d4ff7f7d..ff3496b44 100644 --- a/src/main/resources/data/forge/tags/items/ingots/silver.json +++ b/src/generated/resources/data/forge/tags/items/ingots/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_ingot" ] diff --git a/src/main/resources/data/forge/tags/items/magma.json b/src/generated/resources/data/forge/tags/items/magma.json similarity index 71% rename from src/main/resources/data/forge/tags/items/magma.json rename to src/generated/resources/data/forge/tags/items/magma.json index 4b0720b67..3bf0a87c2 100644 --- a/src/main/resources/data/forge/tags/items/magma.json +++ b/src/generated/resources/data/forge/tags/items/magma.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:magma_block" ] diff --git a/src/main/resources/data/forge/tags/items/manuals.json b/src/generated/resources/data/forge/tags/items/manuals.json similarity index 74% rename from src/main/resources/data/forge/tags/items/manuals.json rename to src/generated/resources/data/forge/tags/items/manuals.json index 8ebe15ac9..16d91033f 100644 --- a/src/main/resources/data/forge/tags/items/manuals.json +++ b/src/generated/resources/data/forge/tags/items/manuals.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:dictionary_of_spirits" ] diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json new file mode 100644 index 000000000..d52c49ef2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:nuggets/iesnium", + "#forge:nuggets/silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/nuggets/iesnium.json b/src/generated/resources/data/forge/tags/items/nuggets/iesnium.json similarity index 72% rename from src/main/resources/data/forge/tags/items/nuggets/iesnium.json rename to src/generated/resources/data/forge/tags/items/nuggets/iesnium.json index ad33cffe5..f6ffa8f3e 100644 --- a/src/main/resources/data/forge/tags/items/nuggets/iesnium.json +++ b/src/generated/resources/data/forge/tags/items/nuggets/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_nugget" ] diff --git a/src/main/resources/data/forge/tags/items/nuggets/silver.json b/src/generated/resources/data/forge/tags/items/nuggets/silver.json similarity index 71% rename from src/main/resources/data/forge/tags/items/nuggets/silver.json rename to src/generated/resources/data/forge/tags/items/nuggets/silver.json index ce528f14f..63a8ffd74 100644 --- a/src/main/resources/data/forge/tags/items/nuggets/silver.json +++ b/src/generated/resources/data/forge/tags/items/nuggets/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_nugget" ] 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..e952dd532 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:ores/iesnium", + "#forge:ores/silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/iesnium.json b/src/generated/resources/data/forge/tags/items/ores/iesnium.json similarity index 71% rename from src/main/resources/data/forge/tags/blocks/ores/iesnium.json rename to src/generated/resources/data/forge/tags/items/ores/iesnium.json index 9b121c978..ce2f53a25 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/iesnium.json +++ b/src/generated/resources/data/forge/tags/items/ores/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_ore" ] diff --git a/src/main/resources/data/forge/tags/blocks/ores/silver.json b/src/generated/resources/data/forge/tags/items/ores/silver.json similarity index 81% rename from src/main/resources/data/forge/tags/blocks/ores/silver.json rename to src/generated/resources/data/forge/tags/items/ores/silver.json index b96f68cf8..fe9a06d32 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/silver.json +++ b/src/generated/resources/data/forge/tags/items/ores/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_ore", "occultism:silver_ore_deepslate" diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/generated/resources/data/forge/tags/items/raw_materials.json new file mode 100644 index 000000000..b6abd1e21 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:raw_materials/iesnium", + "#forge:raw_materials/silver" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_materials/iesnium.json b/src/generated/resources/data/forge/tags/items/raw_materials/iesnium.json similarity index 71% rename from src/main/resources/data/forge/tags/items/raw_materials/iesnium.json rename to src/generated/resources/data/forge/tags/items/raw_materials/iesnium.json index 302349f01..c6833f5a3 100644 --- a/src/main/resources/data/forge/tags/items/raw_materials/iesnium.json +++ b/src/generated/resources/data/forge/tags/items/raw_materials/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:raw_iesnium" ] diff --git a/src/main/resources/data/forge/tags/items/raw_materials/silver.json b/src/generated/resources/data/forge/tags/items/raw_materials/silver.json similarity index 70% rename from src/main/resources/data/forge/tags/items/raw_materials/silver.json rename to src/generated/resources/data/forge/tags/items/raw_materials/silver.json index 4ca004b00..453967776 100644 --- a/src/main/resources/data/forge/tags/items/raw_materials/silver.json +++ b/src/generated/resources/data/forge/tags/items/raw_materials/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:raw_silver" ] diff --git a/src/main/resources/data/forge/tags/items/seeds.json b/src/generated/resources/data/forge/tags/items/seeds.json similarity index 70% rename from src/main/resources/data/forge/tags/items/seeds.json rename to src/generated/resources/data/forge/tags/items/seeds.json index 1c08a758f..9d4f97a4c 100644 --- a/src/main/resources/data/forge/tags/items/seeds.json +++ b/src/generated/resources/data/forge/tags/items/seeds.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#forge:seeds/datura" ] diff --git a/src/generated/resources/data/forge/tags/items/seeds/datura.json b/src/generated/resources/data/forge/tags/items/seeds/datura.json new file mode 100644 index 000000000..805b05f84 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/seeds/datura.json @@ -0,0 +1,5 @@ +{ + "values": [ + "occultism:datura" + ] +} \ 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/items/storage_blocks.json similarity index 89% rename from src/main/resources/data/forge/tags/blocks/storage_blocks.json rename to src/generated/resources/data/forge/tags/items/storage_blocks.json index a97f28f97..365de01e1 100644 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json @@ -1,9 +1,8 @@ { - "replace": false, "values": [ "#forge:storage_blocks/iesnium", - "#forge:storage_blocks/raw_iesnium", "#forge:storage_blocks/silver", + "#forge:storage_blocks/raw_iesnium", "#forge:storage_blocks/raw_silver" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks/iesnium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/iesnium.json similarity index 71% rename from src/main/resources/data/forge/tags/blocks/storage_blocks/iesnium.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/iesnium.json index 4c4af689f..3dd670f76 100644 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks/iesnium.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:iesnium_block" ] diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json similarity index 73% rename from src/main/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json index fa2036f61..bf98078d0 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_iesnium.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:raw_iesnium_block" ] diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/raw_silver.json b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_silver.json similarity index 72% rename from src/main/resources/data/forge/tags/items/storage_blocks/raw_silver.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/raw_silver.json index ce4313e1c..fb7ca8263 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/raw_silver.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:raw_silver_block" ] diff --git a/src/main/resources/data/forge/tags/items/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json similarity index 71% rename from src/main/resources/data/forge/tags/items/storage_blocks/silver.json rename to src/generated/resources/data/forge/tags/items/storage_blocks/silver.json index 2e24b7c88..df080950e 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks/silver.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:silver_block" ] diff --git a/src/main/resources/data/forge/tags/items/tallow.json b/src/generated/resources/data/forge/tags/items/tallow.json similarity index 68% rename from src/main/resources/data/forge/tags/items/tallow.json rename to src/generated/resources/data/forge/tags/items/tallow.json index b19b80fab..b4cab55a7 100644 --- a/src/main/resources/data/forge/tags/items/tallow.json +++ b/src/generated/resources/data/forge/tags/items/tallow.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "occultism:tallow" ] diff --git a/src/main/resources/data/forge/tags/items/tools/metal/axes.json b/src/generated/resources/data/forge/tags/items/tools/metal/axes.json similarity index 87% rename from src/main/resources/data/forge/tags/items/tools/metal/axes.json rename to src/generated/resources/data/forge/tags/items/tools/metal/axes.json index 6388f1e68..b816fe276 100644 --- a/src/main/resources/data/forge/tags/items/tools/metal/axes.json +++ b/src/generated/resources/data/forge/tags/items/tools/metal/axes.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:iron_axe", "minecraft:golden_axe", diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java index 55f3adf73..729cf4b05 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java @@ -43,7 +43,7 @@ public NearestTreeSensor() { } public static boolean isTreeSoil(Level level, BlockPos pos) { - return level.getBlockState(pos).is(OccultismTags.TREE_SOIL); + return level.getBlockState(pos).is(OccultismTags.Blocks.TREE_SOIL); } public static boolean isLog(Level level, BlockPos pos) { diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/job/LumberjackJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/LumberjackJob.java index ca5233512..46287ea3a 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/job/LumberjackJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/LumberjackJob.java @@ -23,19 +23,14 @@ package com.klikli_dev.occultism.common.entity.job; import com.google.common.collect.ImmutableList; -import com.klikli_dev.occultism.api.common.container.IItemStackComparator; import com.klikli_dev.occultism.common.entity.ai.behaviour.*; import com.klikli_dev.occultism.common.entity.ai.sensor.NearestJobItemSensor; import com.klikli_dev.occultism.common.entity.ai.sensor.NearestTreeSensor; import com.klikli_dev.occultism.common.entity.ai.sensor.UnreachableTreeWalkTargetSensor; import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.klikli_dev.occultism.common.misc.ItemStackComparator; -import com.klikli_dev.occultism.common.misc.ItemTagComparator; import com.klikli_dev.occultism.registry.OccultismMemoryTypes; import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.EntityDimensions; -import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.ai.Brain; import net.minecraft.world.entity.ai.behavior.LookAtTargetSink; import net.minecraft.world.entity.item.ItemEntity; @@ -118,7 +113,7 @@ public void onInit() { this.itemsToPickUp.add(Ingredient.of(ItemTags.LOGS)); this.itemsToPickUp.add(Ingredient.of(ItemTags.LEAVES)); this.itemsToPickUp.add(Ingredient.of(ItemTags.SAPLINGS)); - this.itemsToPickUp.add(Ingredient.of(OccultismTags.FRUITS)); + this.itemsToPickUp.add(Ingredient.of(OccultismTags.Items.FRUITS)); this.itemsToPickUp.add(Ingredient.of(Items.STICK)); } diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java index 78f08f5ea..3fd2da884 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java @@ -117,7 +117,7 @@ protected void playStepSound(BlockPos pPos, BlockState pBlock) { public boolean isInvulnerableTo(DamageSource source) { if (source.is(DamageTypeTags.IS_FIRE)) return true; - TagKey> alliesTags = OccultismTags.AFRIT_ALLIES; + TagKey> alliesTags = OccultismTags.Entities.AFRIT_ALLIES; //alliesTags should never be null - should in fact be impossible - but somehow for some people sometimes is. if (alliesTags != null) { diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java index e2c927203..c616439a1 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java @@ -89,7 +89,7 @@ public void remove(RemovalReason reason) { @Override public boolean isInvulnerableTo(DamageSource source) { - TagKey> wildHuntTag = OccultismTags.WILD_HUNT; + TagKey> wildHuntTag = OccultismTags.Entities.WILD_HUNT; Entity trueSource = source.getEntity(); if (trueSource != null && trueSource.getType().is(wildHuntTag)) diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java index 56fa84d48..c58e827c1 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java @@ -96,7 +96,7 @@ protected boolean isSunBurnTick() { @Override public boolean isInvulnerableTo(DamageSource source) { - TagKey> wildHuntTag = OccultismTags.WILD_HUNT; + TagKey> wildHuntTag = OccultismTags.Entities.WILD_HUNT; Entity trueSource = source.getEntity(); if (trueSource != null && trueSource.getType().is(wildHuntTag)) diff --git a/src/main/java/com/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java b/src/main/java/com/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java index 130604314..e99529447 100644 --- a/src/main/java/com/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java @@ -46,7 +46,7 @@ public OtherworldGogglesItem(ArmorMaterial materialIn, public static boolean isGogglesItem(ItemStack stack) { return stack.getItem() instanceof OtherworldGogglesItem || - stack.is(OccultismTags.OTHERWORLD_GOGGLES) || + stack.is(OccultismTags.Items.OTHERWORLD_GOGGLES) || (stack.hasTag() && stack.getTag().getBoolean(NBT_GOGGLES)); } diff --git a/src/main/java/com/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java index ddd01e61f..2313e5f26 100644 --- a/src/main/java/com/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java @@ -38,7 +38,7 @@ public SpiritHealingItem(Properties pProperties) { @Override public InteractionResult interactLivingEntity(ItemStack pStack, Player pPlayer, LivingEntity pInteractionTarget, InteractionHand pUsedHand) { - if (pInteractionTarget.getType().is(OccultismTags.HEALED_BY_DEMONS_DREAM_FRUIT) && pInteractionTarget.getHealth() < pInteractionTarget.getMaxHealth()) { + if (pInteractionTarget.getType().is(OccultismTags.Entities.HEALED_BY_DEMONS_DREAM_FRUIT) && pInteractionTarget.getHealth() < pInteractionTarget.getMaxHealth()) { pInteractionTarget.heal(this.getHealAmount(pStack)); pStack.shrink(1); return InteractionResult.sidedSuccess(pPlayer.level().isClientSide); diff --git a/src/main/java/com/klikli_dev/occultism/common/item/tool/SoulGemItem.java b/src/main/java/com/klikli_dev/occultism/common/item/tool/SoulGemItem.java index 24a74c79a..f7e34a75d 100644 --- a/src/main/java/com/klikli_dev/occultism/common/item/tool/SoulGemItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/tool/SoulGemItem.java @@ -139,7 +139,7 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player player, Li return InteractionResult.FAIL; //do not capture entities on deny lists - if (target.getType().is(OccultismTags.SOUL_GEM_DENY_LIST)) { + if (target.getType().is(OccultismTags.Entities.SOUL_GEM_DENY_LIST)) { player.sendSystemMessage( Component.translatable(this.getDescriptionId() + ".message.entity_type_denied")); return InteractionResult.FAIL; diff --git a/src/main/java/com/klikli_dev/occultism/common/level/cave/CaveDecorator.java b/src/main/java/com/klikli_dev/occultism/common/level/cave/CaveDecorator.java index 91f56b452..eb3425ff7 100644 --- a/src/main/java/com/klikli_dev/occultism/common/level/cave/CaveDecorator.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/cave/CaveDecorator.java @@ -160,7 +160,7 @@ public boolean isInside(BlockState state) { public boolean isStone(BlockState state) { if (state != null) { - return state.is(OccultismTags.CAVE_WALL_BLOCKS); + return state.is(OccultismTags.Blocks.CAVE_WALL_BLOCKS); } return false; } diff --git a/src/main/java/com/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java b/src/main/java/com/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java index dca085673..9cf150097 100644 --- a/src/main/java/com/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java @@ -150,7 +150,7 @@ protected void decorateSphere(WorldGenLevel reader, ChunkGenerator generator, Ra } protected void setBlockSafely(WorldGenLevel level, BlockPos pPos, BlockState pCurrentState, BlockState pNewState, int pFlags) { - if (pCurrentState.hasBlockEntity() || pCurrentState.getBlock() == Blocks.BEDROCK || pCurrentState.is(OccultismTags.WORLDGEN_BLACKLIST)) { + if (pCurrentState.hasBlockEntity() || pCurrentState.getBlock() == Blocks.BEDROCK || pCurrentState.is(OccultismTags.Blocks.WORLDGEN_BLACKLIST)) { return; } level.setBlock(pPos, pNewState, pFlags); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java b/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java index 316fdb043..c5089f0d1 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java @@ -27,6 +27,9 @@ import com.klikli_dev.occultism.datagen.loot.OccultismBlockLoot; import com.klikli_dev.occultism.datagen.loot.OccultismEntityLoot; import com.klikli_dev.occultism.datagen.loot.OccultismLootModifiers; +import com.klikli_dev.occultism.datagen.tags.OccultismForgeEntityTypeTagProvider; +import com.klikli_dev.occultism.datagen.tags.OccultismForgeBlockTagProvider; +import com.klikli_dev.occultism.datagen.tags.OccultismForgeItemTagProvider; import com.klikli_dev.occultism.datagen.worldgen.OccultismRegistries; import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; @@ -55,6 +58,10 @@ public static void gatherData(GatherDataEvent event) { generator.addProvider(event.includeServer(), new OccultismAdvancementProvider(generator)); generator.addProvider(event.includeServer(), new CrushingRecipeProvider(generator.getPackOutput())); generator.addProvider(event.includeServer(), new MinerRecipeProvider(generator.getPackOutput())); + OccultismForgeBlockTagProvider forgeBlockProvider=new OccultismForgeBlockTagProvider(generator.getPackOutput(),event.getLookupProvider() ,event.getExistingFileHelper()); + generator.addProvider(event.includeServer(), forgeBlockProvider); + generator.addProvider(event.includeServer(),new OccultismForgeEntityTypeTagProvider(generator.getPackOutput(),event.getLookupProvider(),event.getExistingFileHelper())); + generator.addProvider(event.includeServer(), new OccultismForgeItemTagProvider(generator.getPackOutput(), event.getLookupProvider(), forgeBlockProvider.contentsGetter(),event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new ItemModelsGenerator(generator.getPackOutput(), event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new StandardBlockStateProvider(generator.getPackOutput(), event.getExistingFileHelper())); generator.addProvider(event.includeClient(), new OccultismLootModifiers(generator.getPackOutput())); diff --git a/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java index 63e98d237..03aa9c17b 100644 --- a/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java @@ -368,7 +368,7 @@ private MappingBuilder bowl() { } private MappingBuilder candle() { - return this.tag('C', OccultismTags.CANDLES); + return this.tag('C', OccultismTags.Blocks.CANDLES); } private MappingBuilder whiteChalk() { diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeBlockTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeBlockTagProvider.java new file mode 100644 index 000000000..fd3494f52 --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeBlockTagProvider.java @@ -0,0 +1,51 @@ +package com.klikli_dev.occultism.datagen.tags; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class OccultismForgeBlockTagProvider extends BlockTagsProvider { + public OccultismForgeBlockTagProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, Occultism.MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + + this.tag(OccultismTags.Blocks.IESNIUM_ORE) + .add(OccultismBlocks.IESNIUM_ORE.get()).replace(false); + this.tag(Tags.Blocks.ORES).addTags(OccultismTags.Blocks.IESNIUM_ORE).replace(false); + this.tag(Tags.Blocks.ORES_IN_GROUND_NETHERRACK).add(OccultismBlocks.IESNIUM_ORE.get()).replace(false); + + + this.tag(OccultismTags.Blocks.SILVER_ORE) + .add(OccultismBlocks.SILVER_ORE.get()).add(OccultismBlocks.SILVER_ORE_DEEPSLATE.get()).replace(false); + this.tag(Tags.Blocks.ORES).addTags(OccultismTags.Blocks.SILVER_ORE).replace(false); + this.tag(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE).add(OccultismBlocks.SILVER_ORE_DEEPSLATE.get()).replace(false); + this.tag(Tags.Blocks.ORES_IN_GROUND_STONE).add(OccultismBlocks.SILVER_ORE.get()).replace(false); + + + addStorageBlock(OccultismTags.Blocks.STORAGE_BLOCKS_IESNIUM,OccultismBlocks.IESNIUM_BLOCK.get()); + addStorageBlock(OccultismTags.Blocks.STORAGE_BLOCKS_SILVER,OccultismBlocks.SILVER_BLOCK.get()); + addStorageBlock(OccultismTags.Blocks.STORAGE_BLOCKS_RAW_IESNIUM,OccultismBlocks.RAW_IESNIUM_BLOCK.get()); + addStorageBlock(OccultismTags.Blocks.STORAGE_BLOCKS_RAW_SILVER,OccultismBlocks.RAW_SILVER_BLOCK.get()); + + } + private void addStorageBlock(TagKey tag, Block block) { + this.tag(tag) + .add(block).replace(false); + this.tag(Tags.Blocks.STORAGE_BLOCKS).addTags(tag).replace(false); + } + + +} diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeEntityTypeTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeEntityTypeTagProvider.java new file mode 100644 index 000000000..7c791c238 --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeEntityTypeTagProvider.java @@ -0,0 +1,44 @@ +package com.klikli_dev.occultism.datagen.tags; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.EntityTypeTagsProvider; +import net.minecraft.world.entity.EntityType; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class OccultismForgeEntityTypeTagProvider extends EntityTypeTagsProvider { + public OccultismForgeEntityTypeTagProvider(PackOutput p_256095_, CompletableFuture p_256572_, @Nullable ExistingFileHelper existingFileHelper) { + super(p_256095_, p_256572_, Occultism.MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + this.tag(OccultismTags.Entities.SNOW_GOLEM).add(EntityType.SNOW_GOLEM).replace(false); + this.tag(OccultismTags.Entities.AXOLOTL).add(EntityType.AXOLOTL).replace(false); + this.tag(OccultismTags.Entities.BATS).add(EntityType.BAT).replace(false); + this.tag(OccultismTags.Entities.CHICKEN).add(EntityType.CHICKEN).replace(false); + this.tag(OccultismTags.Entities.COWS).add(EntityType.COW).replace(false); + this.tag(OccultismTags.Entities.DONKEYS).add(EntityType.DONKEY).replace(false); + this.tag(OccultismTags.Entities.FISH).add(EntityType.COD).add(EntityType.SALMON).add(EntityType.TROPICAL_FISH).add(EntityType.PUFFERFISH).replace(false); + this.tag(OccultismTags.Entities.GOATS).add(EntityType.GOAT).replace(false); + this.tag(OccultismTags.Entities.HOGLINS).add(EntityType.HOGLIN).replace(false); + this.tag(OccultismTags.Entities.HORSES).add(EntityType.HORSE).replace(false); + this.tag(OccultismTags.Entities.LLAMAS).add(EntityType.LLAMA).add(EntityType.TRADER_LLAMA).replace(false); + this.tag(OccultismTags.Entities.MULES).add(EntityType.MULE).replace(false); + this.tag(OccultismTags.Entities.PANDAS).add(EntityType.PANDA).replace(false); + this.tag(OccultismTags.Entities.PARROTS).add(EntityType.PARROT).replace(false); + this.tag(OccultismTags.Entities.PIGS).add(EntityType.PIG).replace(false); + this.tag(OccultismTags.Entities.SHEEP).add(EntityType.SHEEP).replace(false); + this.tag(OccultismTags.Entities.SPIDERS).add(EntityType.SPIDER).add(EntityType.CAVE_SPIDER).replace(false); + this.tag(OccultismTags.Entities.SQUID).add(EntityType.SQUID).add(EntityType.GLOW_SQUID).replace(false); + this.tag(OccultismTags.Entities.VILLAGERS).add(EntityType.VILLAGER).add(EntityType.WANDERING_TRADER).replace(false); + this.tag(OccultismTags.Entities.ZOMBIES).add(EntityType.ZOMBIE).add(EntityType.ZOMBIE_VILLAGER).add(EntityType.HUSK).add(EntityType.DROWNED).replace(false); + + + } +} diff --git a/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeItemTagProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeItemTagProvider.java new file mode 100644 index 000000000..6d0fccdc2 --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/datagen/tags/OccultismForgeItemTagProvider.java @@ -0,0 +1,103 @@ +package com.klikli_dev.occultism.datagen.tags; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.registry.OccultismTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class OccultismForgeItemTagProvider extends ItemTagsProvider { + public OccultismForgeItemTagProvider(PackOutput p_275343_, CompletableFuture p_275729_, CompletableFuture> p_275322_, @Nullable ExistingFileHelper existingFileHelper) { + super(p_275343_, p_275729_, p_275322_, Occultism.MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + // Ore Blocks + this.copy(OccultismTags.Blocks.IESNIUM_ORE,OccultismTags.Items.IESNIUM_ORE); + this.copy(OccultismTags.Blocks.SILVER_ORE,OccultismTags.Items.SILVER_ORE); + this.tag(Tags.Items.ORES).addTags(OccultismTags.Items.IESNIUM_ORE,OccultismTags.Items.SILVER_ORE).replace(false); + + // Raw Materials + this.tag(OccultismTags.Items.RAW_SILVER).add(OccultismItems.RAW_SILVER.get()).replace(false); + this.tag(OccultismTags.Items.RAW_IESNIUM).add(OccultismItems.RAW_IESNIUM.get()).replace(false); + this.tag(Tags.Items.RAW_MATERIALS).addTags(OccultismTags.Items.RAW_IESNIUM,OccultismTags.Items.RAW_SILVER).replace(false); + + // Dusts + addDusts(provider); + + // Crops + this.tag(OccultismTags.Items.DATURA_CROP).add(OccultismItems.DATURA.get()).replace(false); + this.tag(Tags.Items.CROPS).addTags(OccultismTags.Items.DATURA_CROP).replace(false); + + // Ingots + this.tag(OccultismTags.Items.IESNIUM_INGOT).add(OccultismItems.IESNIUM_INGOT.get()).replace(false); + this.tag(OccultismTags.Items.SILVER_INGOT).add(OccultismItems.SILVER_INGOT.get()).replace(false); + this.tag(Tags.Items.INGOTS).addTags(OccultismTags.Items.IESNIUM_INGOT,OccultismTags.Items.SILVER_INGOT).replace(false); + + // Nuggets + this.tag(OccultismTags.Items.IESNIUM_NUGGET).add(OccultismItems.IESNIUM_NUGGET.get()).replace(false); + this.tag(OccultismTags.Items.SILVER_NUGGET).add(OccultismItems.SILVER_NUGGET.get()).replace(false); + this.tag(Tags.Items.NUGGETS).addTags(OccultismTags.Items.IESNIUM_NUGGET,OccultismTags.Items.SILVER_NUGGET).replace(false); + + // Seeds + this.tag(OccultismTags.Items.DATURA_SEEDS).add(OccultismItems.DATURA.get()).replace(false); + this.tag(Tags.Items.SEEDS).addTags(OccultismTags.Items.DATURA_SEEDS).replace(false); + + // Storage Blocks + this.copy(OccultismTags.Blocks.STORAGE_BLOCKS_IESNIUM,OccultismTags.Items.STORAGE_BLOCK_IESNIUM); + this.copy(OccultismTags.Blocks.STORAGE_BLOCKS_SILVER,OccultismTags.Items.STORAGE_BLOCK_SILVER); + this.copy(OccultismTags.Blocks.STORAGE_BLOCKS_RAW_IESNIUM,OccultismTags.Items.STORAGE_BLOCK_RAW_IESNIUM); + this.copy(OccultismTags.Blocks.STORAGE_BLOCKS_RAW_SILVER,OccultismTags.Items.STORAGE_BLOCK_RAW_SILVER); + this.tag(Tags.Items.STORAGE_BLOCKS).addTags(OccultismTags.Items.STORAGE_BLOCK_IESNIUM,OccultismTags.Items.STORAGE_BLOCK_SILVER, + OccultismTags.Items.STORAGE_BLOCK_RAW_IESNIUM,OccultismTags.Items.STORAGE_BLOCK_RAW_SILVER).replace(false); + + // Metal Axes Tag + this.tag(OccultismTags.Items.METAL_AXES).add(Items.IRON_AXE,Items.GOLDEN_AXE,Items.DIAMOND_AXE,Items.NETHERITE_AXE).replace(false); + + // Books + this.tag(OccultismTags.Items.BOOKS).add(OccultismItems.DICTIONARY_OF_SPIRITS.get()).replace(false); + + // Fruits + this.tag(OccultismTags.Items.FRUITS).add(Items.APPLE).replace(false); + + // Gems + this.tag(Tags.Items.GEMS).add(OccultismItems.SPIRIT_ATTUNED_GEM.get()).replace(false); + + // Magma + this.tag(OccultismTags.Items.MAGMA).add(Items.MAGMA_BLOCK).replace(false); + + // Manuals + this.tag(OccultismTags.Items.MANUALS).add(OccultismItems.DICTIONARY_OF_SPIRITS.get()).replace(false); + + // Tallow + this.tag(OccultismTags.Items.TALLOW).add(OccultismItems.TALLOW.get()).replace(false); + + + } + + private void addDusts(HolderLookup.Provider provider) { + this.tag(OccultismTags.Items.COPPER_DUST).add(OccultismItems.COPPER_DUST.get()).replace(false); + this.tag(OccultismTags.Items.END_STONE_DUST).add(OccultismItems.CRUSHED_END_STONE.get()).replace(false); + this.tag(OccultismTags.Items.GOLD_DUST).add(OccultismItems.GOLD_DUST.get()).replace(false); + this.tag(OccultismTags.Items.IRON_DUST).add(OccultismItems.IRON_DUST.get()).replace(false); + this.tag(OccultismTags.Items.IESNIUM_DUST).add(OccultismItems.IESNIUM_DUST.get()).replace(false); + this.tag(OccultismTags.Items.SILVER_DUST).add(OccultismItems.SILVER_DUST.get()).replace(false); + this.tag(OccultismTags.Items.OBSIDIAN_DUST).add(OccultismItems.OBSIDIAN_DUST.get()).replace(false); + this.tag(Tags.Items.DUSTS) + .addTags(OccultismTags.Items.COPPER_DUST,OccultismTags.Items.END_STONE_DUST, + OccultismTags.Items.GOLD_DUST,OccultismTags.Items.IRON_DUST,OccultismTags.Items.IESNIUM_DUST, + OccultismTags.Items.SILVER_DUST,OccultismTags.Items.OBSIDIAN_DUST) + .add(OccultismItems.BURNT_OTHERSTONE.get(),OccultismItems.OTHERWORLD_ASHES.get()).replace(false); + + } +} diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java index 931f850fb..cfade4f27 100644 --- a/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java @@ -32,33 +32,101 @@ import net.minecraft.world.level.block.Block; public class OccultismTags { - // Block Tags - public static final TagKey TREE_SOIL = makeBlockTag(new ResourceLocation(Occultism.MODID, "tree_soil")); - public static final TagKey CAVE_WALL_BLOCKS = makeBlockTag(new ResourceLocation(Occultism.MODID, "cave_wall_blocks")); - public static final TagKey WORLDGEN_BLACKLIST = makeBlockTag(new ResourceLocation(Occultism.MODID, "worldgen_blacklist")); - public static final TagKey NETHERRACK = makeBlockTag(new ResourceLocation(Occultism.MODID, "netherrack")); - public static final TagKey CANDLES = makeBlockTag(new ResourceLocation("minecraft", "candles")); - - //Item Tags - public static final TagKey OTHERWORLD_GOGGLES = makeItemTag(new ResourceLocation(Occultism.MODID, "otherworld_goggles")); - public static final TagKey ELYTRA = makeItemTag(new ResourceLocation(Occultism.MODID, "elytra")); - public static final TagKey FRUITS = makeItemTag(new ResourceLocation("forge", "fruits")); - - //Entity Tags - public static final TagKey> SOUL_GEM_DENY_LIST = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "soul_gem_deny_list")); - public static final TagKey> AFRIT_ALLIES = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "afrit_allies")); - public static final TagKey> WILD_HUNT = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "wild_hunt")); - - public static final TagKey> HEALED_BY_DEMONS_DREAM_FRUIT = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "healed_by_demons_dream_fruit")); - - - public static final TagKey> CHICKEN = makeEntityTypeTag(new ResourceLocation("forge", "chicken")); - public static final TagKey> PARROTS = makeEntityTypeTag(new ResourceLocation("forge", "parrots")); - public static final TagKey> PIGS = makeEntityTypeTag(new ResourceLocation("forge", "pigs")); - public static final TagKey> COWS = makeEntityTypeTag(new ResourceLocation("forge", "cows")); - public static final TagKey> VILLAGERS = makeEntityTypeTag(new ResourceLocation("forge", "villagers")); - public static final TagKey> ZOMBIES = makeEntityTypeTag(new ResourceLocation("forge", "zombies")); - public static final TagKey> BATS = makeEntityTypeTag(new ResourceLocation("forge", "bats")); + public static class Blocks { + + // Block Tags + public static final TagKey TREE_SOIL = makeBlockTag(new ResourceLocation(Occultism.MODID, "tree_soil")); + public static final TagKey CAVE_WALL_BLOCKS = makeBlockTag(new ResourceLocation(Occultism.MODID, "cave_wall_blocks")); + public static final TagKey WORLDGEN_BLACKLIST = makeBlockTag(new ResourceLocation(Occultism.MODID, "worldgen_blacklist")); + public static final TagKey NETHERRACK = makeBlockTag(new ResourceLocation(Occultism.MODID, "netherrack")); + public static final TagKey CANDLES = makeBlockTag(new ResourceLocation("minecraft", "candles")); + public static final TagKey IESNIUM_ORE = makeBlockTag(new ResourceLocation("forge", "ores/iesnium")); + public static final TagKey SILVER_ORE = makeBlockTag(new ResourceLocation("forge", "ores/silver")); + // Storage Bock Tags + public static final TagKey STORAGE_BLOCKS_IESNIUM = makeBlockTag(new ResourceLocation("forge", "storage_blocks/iesnium")); + public static final TagKey STORAGE_BLOCKS_SILVER = makeBlockTag(new ResourceLocation("forge", "storage_blocks/silver")); + public static final TagKey STORAGE_BLOCKS_RAW_IESNIUM = makeBlockTag(new ResourceLocation("forge", "storage_blocks/raw_iesnium")); + public static final TagKey STORAGE_BLOCKS_RAW_SILVER = makeBlockTag(new ResourceLocation("forge", "storage_blocks/raw_silver")); + + } + + public static class Items { + + + + public static final TagKey IESNIUM_ORE = makeItemTag(new ResourceLocation("forge", "ores/iesnium")); + public static final TagKey SILVER_ORE = makeItemTag(new ResourceLocation("forge", "ores/silver")); + public static final TagKey RAW_IESNIUM = makeItemTag(new ResourceLocation("forge", "raw_materials/iesnium")); + public static final TagKey RAW_SILVER = makeItemTag(new ResourceLocation("forge", "raw_materials/silver")); + public static final TagKey STORAGE_BLOCK_IESNIUM = makeItemTag(new ResourceLocation("forge", "storage_blocks/iesnium")); + public static final TagKey STORAGE_BLOCK_SILVER = makeItemTag(new ResourceLocation("forge", "storage_blocks/silver")); + public static final TagKey STORAGE_BLOCK_RAW_IESNIUM = makeItemTag(new ResourceLocation("forge", "storage_blocks/raw_iesnium")); + public static final TagKey STORAGE_BLOCK_RAW_SILVER = makeItemTag(new ResourceLocation("forge", "storage_blocks/raw_silver")); + + // Dusts + public static final TagKey COPPER_DUST=makeItemTag(new ResourceLocation("forge","dusts/copper")); + public static final TagKey END_STONE_DUST=makeItemTag(new ResourceLocation("forge","dusts/end_stone")); + public static final TagKey GOLD_DUST=makeItemTag(new ResourceLocation("forge","dusts/gold")); + public static final TagKey IRON_DUST=makeItemTag(new ResourceLocation("forge","dusts/iron")); + public static final TagKey IESNIUM_DUST=makeItemTag(new ResourceLocation("forge","dusts/iesnium")); + public static final TagKey SILVER_DUST=makeItemTag(new ResourceLocation("forge","dusts/silver")); + public static final TagKey OBSIDIAN_DUST=makeItemTag(new ResourceLocation("forge","dusts/obsidian")); + + public static final TagKey DATURA_CROP = makeItemTag(new ResourceLocation("forge", "crops/datura")); + + // Ingots + public static final TagKey IESNIUM_INGOT = makeItemTag(new ResourceLocation("forge", "ingots/iesnium")); + public static final TagKey SILVER_INGOT = makeItemTag(new ResourceLocation("forge", "ingots/silver")); + + // Nuggets + public static final TagKey IESNIUM_NUGGET = makeItemTag(new ResourceLocation("forge", "nuggets/iesnium")); + public static final TagKey SILVER_NUGGET = makeItemTag(new ResourceLocation("forge", "nuggets/silver")); + + // Seeds + public static final TagKey DATURA_SEEDS = makeItemTag(new ResourceLocation("forge", "seeds/datura")); + + //Item Tags + public static final TagKey OTHERWORLD_GOGGLES = makeItemTag(new ResourceLocation(Occultism.MODID, "otherworld_goggles")); + public static final TagKey ELYTRA = makeItemTag(new ResourceLocation(Occultism.MODID, "elytra")); + public static final TagKey BOOKS = makeItemTag(new ResourceLocation("forge", "books")); + public static final TagKey FRUITS = makeItemTag(new ResourceLocation("forge", "fruits")); + public static final TagKey TALLOW = makeItemTag(new ResourceLocation("forge", "tallow")); + + + public static final TagKey MAGMA = makeItemTag(new ResourceLocation("forge", "magma")); + + public static final TagKey MANUALS = makeItemTag(new ResourceLocation("forge", "manuals")); + + public static final TagKey METAL_AXES = makeItemTag(new ResourceLocation("forge", "tools/metal/axes")); + } + + public static class Entities { + public static final TagKey> AXOLOTL = makeEntityTypeTag(new ResourceLocation("forge", "axolotls")); + public static final TagKey> CHICKEN = makeEntityTypeTag(new ResourceLocation("forge", "chicken")); + public static final TagKey> PARROTS = makeEntityTypeTag(new ResourceLocation("forge", "parrots")); + public static final TagKey> PIGS = makeEntityTypeTag(new ResourceLocation("forge", "pigs")); + public static final TagKey> COWS = makeEntityTypeTag(new ResourceLocation("forge", "cows")); + public static final TagKey> VILLAGERS = makeEntityTypeTag(new ResourceLocation("forge", "villagers")); + public static final TagKey> ZOMBIES = makeEntityTypeTag(new ResourceLocation("forge", "zombies")); + public static final TagKey> BATS = makeEntityTypeTag(new ResourceLocation("forge", "bats")); + public static final TagKey> SNOW_GOLEM=makeEntityTypeTag(new ResourceLocation("forge", "golems/snow")); + public static final TagKey> DONKEYS = makeEntityTypeTag(new ResourceLocation("forge", "donkeys")); + public static final TagKey> FISH = makeEntityTypeTag(new ResourceLocation("forge", "fish")); + public static final TagKey> GOATS = makeEntityTypeTag(new ResourceLocation("forge", "goats")); + public static final TagKey> HOGLINS = makeEntityTypeTag(new ResourceLocation("forge", "hoglins")); + public static final TagKey> HORSES = makeEntityTypeTag(new ResourceLocation("forge", "horses")); + public static final TagKey> LLAMAS = makeEntityTypeTag(new ResourceLocation("forge", "llamas")); + public static final TagKey> MULES = makeEntityTypeTag(new ResourceLocation("forge", "mules")); + public static final TagKey> PANDAS = makeEntityTypeTag(new ResourceLocation("forge", "pandas")); + public static final TagKey> SHEEP = makeEntityTypeTag(new ResourceLocation("forge", "sheep")); + public static final TagKey> SPIDERS = makeEntityTypeTag(new ResourceLocation("forge", "spiders")); + public static final TagKey> SQUID = makeEntityTypeTag(new ResourceLocation("forge", "squid")); + //Entity Tags + public static final TagKey> SOUL_GEM_DENY_LIST = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "soul_gem_deny_list")); + public static final TagKey> AFRIT_ALLIES = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "afrit_allies")); + public static final TagKey> WILD_HUNT = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "wild_hunt")); + public static final TagKey> HEALED_BY_DEMONS_DREAM_FRUIT = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "healed_by_demons_dream_fruit")); + } //Biome Tags diff --git a/src/main/java/com/klikli_dev/occultism/util/MovementUtil.java b/src/main/java/com/klikli_dev/occultism/util/MovementUtil.java index a6c2e05b5..5a2264da7 100644 --- a/src/main/java/com/klikli_dev/occultism/util/MovementUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/MovementUtil.java @@ -59,6 +59,6 @@ public static boolean allowDoubleJump(Player player) { ItemStack itemstack = player.getItemBySlot(EquipmentSlot.CHEST); //If player - return !itemstack.is(OccultismTags.ELYTRA) || (itemstack.getDamageValue() > 0 && !ElytraItem.isFlyEnabled(itemstack)); + return !itemstack.is(OccultismTags.Items.ELYTRA) || (itemstack.getDamageValue() > 0 && !ElytraItem.isFlyEnabled(itemstack)); } } 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 aa0d4b980..000000000 --- a/src/main/resources/data/forge/tags/blocks/ores.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ores/copper", - "#forge:ores/silver", - "#forge:ores/iesnium" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/ores/copper.json b/src/main/resources/data/forge/tags/blocks/ores/copper.json deleted file mode 100644 index ae1505805..000000000 --- a/src/main/resources/data/forge/tags/blocks/ores/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:copper_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/cows.json b/src/main/resources/data/forge/tags/entity_types/cows.json deleted file mode 100644 index b04714605..000000000 --- a/src/main/resources/data/forge/tags/entity_types/cows.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cow", - "minecraft:mooshroom" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/fish.json b/src/main/resources/data/forge/tags/entity_types/fish.json deleted file mode 100644 index 44eb0bc23..000000000 --- a/src/main/resources/data/forge/tags/entity_types/fish.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cod", - "minecraft:salmon", - "minecraft:pufferfish", - "minecraft:tropical_fish" - ] -} diff --git a/src/main/resources/data/forge/tags/entity_types/spiders.json b/src/main/resources/data/forge/tags/entity_types/spiders.json deleted file mode 100644 index cd49be427..000000000 --- a/src/main/resources/data/forge/tags/entity_types/spiders.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:spider" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/squid.json b/src/main/resources/data/forge/tags/entity_types/squid.json deleted file mode 100644 index b2d5e7c81..000000000 --- a/src/main/resources/data/forge/tags/entity_types/squid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:squid" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/villagers.json b/src/main/resources/data/forge/tags/entity_types/villagers.json deleted file mode 100644 index af10c66ed..000000000 --- a/src/main/resources/data/forge/tags/entity_types/villagers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:villager" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/copper.json b/src/main/resources/data/forge/tags/items/ingots/copper.json deleted file mode 100644 index 4b0daa0db..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:copper_ingot" - ] -} \ 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 aa0d4b980..000000000 --- a/src/main/resources/data/forge/tags/items/ores.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:ores/copper", - "#forge:ores/silver", - "#forge:ores/iesnium" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_materials.json b/src/main/resources/data/forge/tags/items/raw_materials.json deleted file mode 100644 index 4a57ac663..000000000 --- a/src/main/resources/data/forge/tags/items/raw_materials.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#forge:raw_materials/silver", - "#forge:raw_materials/iesnium" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/seeds/datura.json b/src/main/resources/data/forge/tags/items/seeds/datura.json deleted file mode 100644 index 517669795..000000000 --- a/src/main/resources/data/forge/tags/items/seeds/datura.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "occultism:datura_seeds" - ] -} \ No newline at end of file