From f4755934fe9fdad3bdbb86ca79503f8206351c3b Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Wed, 30 Aug 2023 09:50:38 +0200 Subject: [PATCH] feat: make tallow loot use entity tags improves compatibility with e.g. genetic animals --- .../loot_modifiers/global_loot_modifiers.json | 21 ++++++++-------- .../data/forge/tags/entity_types/donkeys.json | 6 +++++ .../data/forge/tags/entity_types/goats.json | 6 +++++ .../data/forge/tags/entity_types/hoglins.json | 6 +++++ .../data/forge/tags/entity_types/mules.json | 6 +++++ .../data/forge/tags/entity_types/pandas.json | 6 +++++ ...ow_from_cow.json => tallow_from_cows.json} | 2 +- .../loot_modifiers/tallow_from_donkey.json | 25 ------------------- ...rom_mule.json => tallow_from_donkeys.json} | 2 +- ...w_from_pig.json => tallow_from_goats.json} | 2 +- ...m_hoglin.json => tallow_from_hoglins.json} | 2 +- ...rom_panda.json => tallow_from_horses.json} | 2 +- ...rom_llama.json => tallow_from_llamas.json} | 2 +- ...from_horse.json => tallow_from_mules.json} | 2 +- .../loot_modifiers/tallow_from_pandas.json | 25 +++++++++++++++++++ ...w_from_goat.json => tallow_from_pigs.json} | 2 +- .../loot_modifiers/tallow_from_sheep.json | 2 +- .../tallow_from_trader_llama.json | 25 ------------------- 18 files changed, 74 insertions(+), 70 deletions(-) create mode 100644 src/main/resources/data/forge/tags/entity_types/donkeys.json create mode 100644 src/main/resources/data/forge/tags/entity_types/goats.json create mode 100644 src/main/resources/data/forge/tags/entity_types/hoglins.json create mode 100644 src/main/resources/data/forge/tags/entity_types/mules.json create mode 100644 src/main/resources/data/forge/tags/entity_types/pandas.json rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_cow.json => tallow_from_cows.json} (93%) delete mode 100644 src/main/resources/data/occultism/loot_modifiers/tallow_from_donkey.json rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_mule.json => tallow_from_donkeys.json} (93%) rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_pig.json => tallow_from_goats.json} (93%) rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_hoglin.json => tallow_from_hoglins.json} (92%) rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_panda.json => tallow_from_horses.json} (92%) rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_llama.json => tallow_from_llamas.json} (92%) rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_horse.json => tallow_from_mules.json} (92%) create mode 100644 src/main/resources/data/occultism/loot_modifiers/tallow_from_pandas.json rename src/main/resources/data/occultism/loot_modifiers/{tallow_from_goat.json => tallow_from_pigs.json} (93%) delete mode 100644 src/main/resources/data/occultism/loot_modifiers/tallow_from_trader_llama.json diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index 02642da75..afb93fbeb 100644 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -3,16 +3,15 @@ "entries": [ "occultism:datura_seed_from_grass", "occultism:datura_seed_from_tall_grass", - "occultism:tallow_from_cow", - "occultism:tallow_from_donkey", - "occultism:tallow_from_goat", - "occultism:tallow_from_hoglin", - "occultism:tallow_from_horse", - "occultism:tallow_from_llama", - "occultism:tallow_from_mule", - "occultism:tallow_from_panda", - "occultism:tallow_from_pig", - "occultism:tallow_from_sheep", - "occultism:tallow_from_trader_llama" + "occultism:tallow_from_cows", + "occultism:tallow_from_donkeys", + "occultism:tallow_from_goats", + "occultism:tallow_from_hoglins", + "occultism:tallow_from_horses", + "occultism:tallow_from_llamas", + "occultism:tallow_from_mules", + "occultism:tallow_from_pandas", + "occultism:tallow_from_pigs", + "occultism:tallow_from_sheeps" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/donkeys.json b/src/main/resources/data/forge/tags/entity_types/donkeys.json new file mode 100644 index 000000000..56d156083 --- /dev/null +++ b/src/main/resources/data/forge/tags/entity_types/donkeys.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:donkey" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/goats.json b/src/main/resources/data/forge/tags/entity_types/goats.json new file mode 100644 index 000000000..31d634de5 --- /dev/null +++ b/src/main/resources/data/forge/tags/entity_types/goats.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:goat" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/hoglins.json b/src/main/resources/data/forge/tags/entity_types/hoglins.json new file mode 100644 index 000000000..45570e6d7 --- /dev/null +++ b/src/main/resources/data/forge/tags/entity_types/hoglins.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:hoglin" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/mules.json b/src/main/resources/data/forge/tags/entity_types/mules.json new file mode 100644 index 000000000..96c1d718e --- /dev/null +++ b/src/main/resources/data/forge/tags/entity_types/mules.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:mule" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/entity_types/pandas.json b/src/main/resources/data/forge/tags/entity_types/pandas.json new file mode 100644 index 000000000..fae73e32e --- /dev/null +++ b/src/main/resources/data/forge/tags/entity_types/pandas.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:panda" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_cow.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_cows.json similarity index 93% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_cow.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_cows.json index 8e5a4a67c..c7e65c9b7 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_cow.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_cows.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:cow" + "type": "#forge:cows" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_donkey.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_donkey.json deleted file mode 100644 index 949418cb9..000000000 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_donkey.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "occultism:add_item", - "conditions": [ - { - "condition": "minecraft:entity_properties", - "entity": "killer", - "predicate": { - "equipment": { - "mainhand": { - "tag": "occultism:tools/knives" - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type": "minecraft:donkey" - } - } - ], - "item": "occultism:tallow", - "count": 3 -} \ No newline at end of file diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_mule.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_donkeys.json similarity index 93% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_mule.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_donkeys.json index c2ad88c43..f982e9c4a 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_mule.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_donkeys.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:mule" + "type": "#forge:donkeys" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_pig.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_goats.json similarity index 93% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_pig.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_goats.json index 60c87526b..3e5fc8897 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_pig.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_goats.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:pig" + "type": "#forge:goats" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_hoglin.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_hoglins.json similarity index 92% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_hoglin.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_hoglins.json index 95426c426..d971fe63c 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_hoglin.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_hoglins.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:hoglin" + "type": "#forge:hoglins" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_panda.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_horses.json similarity index 92% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_panda.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_horses.json index 9972af612..b7185e628 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_panda.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_horses.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:panda" + "type": "#forge:horses" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_llama.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_llamas.json similarity index 92% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_llama.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_llamas.json index e957a932f..076cdea56 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_llama.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_llamas.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:llama" + "type": "#forge:llamas" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_horse.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_mules.json similarity index 92% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_horse.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_mules.json index 9fa8a3f96..013b50c49 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_horse.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_mules.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:horse" + "type": "#forge:mules" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_pandas.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_pandas.json new file mode 100644 index 000000000..6e1b427fd --- /dev/null +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_pandas.json @@ -0,0 +1,25 @@ +{ + "type": "occultism:add_item", + "conditions": [ + { + "condition": "minecraft:entity_properties", + "entity": "killer", + "predicate": { + "equipment": { + "mainhand": { + "tag": "occultism:tools/knives" + } + } + } + }, + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type": "#forge:pandas" + } + } + ], + "item": "occultism:tallow", + "count": 3 +} \ No newline at end of file diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_goat.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_pigs.json similarity index 93% rename from src/main/resources/data/occultism/loot_modifiers/tallow_from_goat.json rename to src/main/resources/data/occultism/loot_modifiers/tallow_from_pigs.json index deeb7253d..b923e09d8 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_goat.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_pigs.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:goat" + "type": "#forge:pigs" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_sheep.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_sheep.json index 53b908e1e..e2d269bb5 100644 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_sheep.json +++ b/src/main/resources/data/occultism/loot_modifiers/tallow_from_sheep.json @@ -16,7 +16,7 @@ "condition": "minecraft:entity_properties", "entity": "this", "predicate": { - "type": "minecraft:sheep" + "type": "#forge:sheep" } } ], diff --git a/src/main/resources/data/occultism/loot_modifiers/tallow_from_trader_llama.json b/src/main/resources/data/occultism/loot_modifiers/tallow_from_trader_llama.json deleted file mode 100644 index 89bb248cc..000000000 --- a/src/main/resources/data/occultism/loot_modifiers/tallow_from_trader_llama.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "occultism:add_item", - "conditions": [ - { - "condition": "minecraft:entity_properties", - "entity": "killer", - "predicate": { - "equipment": { - "mainhand": { - "tag": "occultism:tools/knives" - } - } - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "type": "minecraft:trader_llama" - } - } - ], - "item": "occultism:tallow", - "count": 3 -} \ No newline at end of file