Skip to content

Commit

Permalink
feat: make tallow loot use entity tags
Browse files Browse the repository at this point in the history
improves compatibility with e.g. genetic animals
  • Loading branch information
klikli-dev committed Aug 30, 2023
1 parent 2d077a4 commit f475593
Show file tree
Hide file tree
Showing 18 changed files with 74 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
6 changes: 6 additions & 0 deletions src/main/resources/data/forge/tags/entity_types/donkeys.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:donkey"
]
}
6 changes: 6 additions & 0 deletions src/main/resources/data/forge/tags/entity_types/goats.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:goat"
]
}
6 changes: 6 additions & 0 deletions src/main/resources/data/forge/tags/entity_types/hoglins.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:hoglin"
]
}
6 changes: 6 additions & 0 deletions src/main/resources/data/forge/tags/entity_types/mules.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:mule"
]
}
6 changes: 6 additions & 0 deletions src/main/resources/data/forge/tags/entity_types/pandas.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:panda"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:cow"
"type": "#forge:cows"
}
}
],
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:mule"
"type": "#forge:donkeys"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:pig"
"type": "#forge:goats"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:hoglin"
"type": "#forge:hoglins"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:panda"
"type": "#forge:horses"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:llama"
"type": "#forge:llamas"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:horse"
"type": "#forge:mules"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:goat"
"type": "#forge:pigs"
}
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "minecraft:sheep"
"type": "#forge:sheep"
}
}
],
Expand Down

This file was deleted.

0 comments on commit f475593

Please sign in to comment.