fix: tallow not dropping

The knife tag change was not reflected in the GLMs, causing the condition to never be met Closes #1207
klikli-dev · Sep 12, 2024 · 986741c · 986741c
1 parent 817de6d
commit 986741c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 11 deletions.
diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_cows.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_cows.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_donkeys.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_donkeys.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_goats.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_goats.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_hoglins.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_hoglins.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_horses.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_horses.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_llamas.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_llamas.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_mules.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_mules.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_pandas.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_pandas.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_pigs.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_pigs.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/generated/resources/data/occultism/loot_modifiers/tallow_from_sheep.json b/src/generated/resources/data/occultism/loot_modifiers/tallow_from_sheep.json
@@ -7,7 +7,7 @@
       "predicate": {
         "equipment": {
           "mainhand": {
-            "items": "#occultism:tools/knives"
+            "items": "#occultism:tools/knife"
           }
         }
       }

diff --git a/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismLootModifiers.java b/src/main/java/com/klikli_dev/occultism/datagen/loot/OccultismLootModifiers.java
@@ -36,7 +36,8 @@ private AddItemModifier tallow(String entityType, int count) {
                         LootItemEntityPropertyCondition
                                 .hasProperties(LootContext.EntityTarget.ATTACKER,
                                         EntityPredicate.Builder.entity()
-                                                .equipment(this.mainHand(ItemPredicate.Builder.item().of(OccultismTags.makeItemTag(ResourceLocation.fromNamespaceAndPath(Occultism.MODID, "tools/knives")))))).build(),
+                                                .equipment(this.mainHand(ItemPredicate.Builder.item().of(
+                                                        OccultismTags.Items.TOOLS_KNIFE)))).build(),
                         LootItemEntityPropertyCondition
                                 .hasProperties(LootContext.EntityTarget.THIS, EntityPredicate.Builder.entity().of(OccultismTags.makeEntityTypeTag(ResourceLocation.fromNamespaceAndPath("c", entityType)))).build()
                 }, OccultismItems.TALLOW.get(), count);