Fixed what items Water Cleansing can be applied to

Glitchfiend · Aug 25, 2024 · f6ae28d · f6ae28d
1 parent 042f5c2
commit f6ae28d
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 5 deletions.
diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,5 +1,5 @@
-// 1.21	2024-06-15T11:33:35.2140093	Registries
+// 1.21	2024-08-25T04:56:09.8876885	Registries
 55b6780cec82f4d4f609e750902d114649d4a8ad data/toughasnails/damage_type/hyperthermia.json
 eae6d7bc6de6b808206268351a4eb97746f013bf data/toughasnails/damage_type/thirst.json
 a532ac48cf501e9d5025919020cae649732b61b0 data/toughasnails/enchantment/thermal_tuning.json
-82349ce5d9533bbc75097c13464c0e4df56b37ed data/toughasnails/enchantment/water_cleansing.json
+c98a3ade2cbc06276713dd4aa533473ba0060618 data/toughasnails/enchantment/water_cleansing.json
diff --git a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3
@@ -1,9 +1,10 @@
-// 1.21	2024-06-14T22:04:30.625402	Tags for minecraft:item mod id toughasnails
+// 1.21	2024-08-25T04:56:09.8876885	Tags for minecraft:item mod id toughasnails
 54fbb602df8fe763300ee759cb3a9fbb72ded2eb data/minecraft/tags/item/dyeable.json
 f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/item/cooling_armor.json
 572f6d0748095755aeef0ca7d602f4ebba9bfd76 data/toughasnails/tags/item/cooling_consumed_items.json
 7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/item/cooling_held_items.json
 d7e37bc0c1468593bf2403c8bab7e97c17edde8e data/toughasnails/tags/item/drinks.json
+2128c434dd823a25c4cb1370f7d09fdbff2e89d8 data/toughasnails/tags/item/enchantable/canteen.json
 eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/item/heating_armor.json
 cf863878a8af4a7e610b91efb2c1d7846d13868b data/toughasnails/tags/item/heating_consumed_items.json
 efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/item/heating_held_items.json

diff --git a/common/src/generated/resources/data/toughasnails/enchantment/water_cleansing.json b/common/src/generated/resources/data/toughasnails/enchantment/water_cleansing.json
@@ -16,6 +16,6 @@
   "slots": [
     "mainhand"
   ],
-  "supported_items": "#minecraft:enchantable/durability",
+  "supported_items": "#toughasnails:enchantable/canteen",
   "weight": 2
 }
diff --git a/common/src/generated/resources/data/toughasnails/tags/item/enchantable/canteen.json b/common/src/generated/resources/data/toughasnails/tags/item/enchantable/canteen.json
@@ -0,0 +1,28 @@
+{
+  "values": [
+    "toughasnails:empty_leather_canteen",
+    "toughasnails:leather_dirty_water_canteen",
+    "toughasnails:leather_water_canteen",
+    "toughasnails:leather_purified_water_canteen",
+    "toughasnails:empty_copper_canteen",
+    "toughasnails:copper_dirty_water_canteen",
+    "toughasnails:copper_water_canteen",
+    "toughasnails:copper_purified_water_canteen",
+    "toughasnails:empty_iron_canteen",
+    "toughasnails:iron_dirty_water_canteen",
+    "toughasnails:iron_water_canteen",
+    "toughasnails:iron_purified_water_canteen",
+    "toughasnails:empty_gold_canteen",
+    "toughasnails:gold_dirty_water_canteen",
+    "toughasnails:gold_water_canteen",
+    "toughasnails:gold_purified_water_canteen",
+    "toughasnails:empty_diamond_canteen",
+    "toughasnails:diamond_dirty_water_canteen",
+    "toughasnails:diamond_water_canteen",
+    "toughasnails:diamond_purified_water_canteen",
+    "toughasnails:empty_netherite_canteen",
+    "toughasnails:netherite_dirty_water_canteen",
+    "toughasnails:netherite_water_canteen",
+    "toughasnails:netherite_purified_water_canteen"
+  ]
+}
diff --git a/common/src/main/java/toughasnails/init/ModEnchantments.java b/common/src/main/java/toughasnails/init/ModEnchantments.java
@@ -34,7 +34,7 @@ public static void bootstrap(BootstrapContext<Enchantment> context)
             context,
             TANEnchantments.WATER_CLEANSING,
             Enchantment.enchantment(
-                Enchantment.definition(itemGetter.getOrThrow(ItemTags.DURABILITY_ENCHANTABLE), 2, 1, Enchantment.dynamicCost(25, 25), Enchantment.dynamicCost(75, 25), 4, EquipmentSlotGroup.MAINHAND)
+                Enchantment.definition(itemGetter.getOrThrow(ModTags.Items.CANTEEN), 2, 1, Enchantment.dynamicCost(25, 25), Enchantment.dynamicCost(75, 25), 4, EquipmentSlotGroup.MAINHAND)
             )
             .exclusiveWith(enchantmentGetter.getOrThrow(EnchantmentTags.DAMAGE_EXCLUSIVE))
         );

diff --git a/common/src/main/java/toughasnails/init/ModTags.java b/common/src/main/java/toughasnails/init/ModTags.java
@@ -90,6 +90,7 @@ private static void init() {}
         public static final TagKey<Item> ONE_HUNDRED_POISON_CHANCE_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "poison_chance/100_poison_chance_drinks"));
 
         public static final TagKey<Item> DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "drinks"));
+        public static final TagKey<Item> CANTEEN = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "enchantable/canteen"));
 
         public static int getThirstRestored(ItemStack drink)
         {

diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemTagsProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemTagsProvider.java
@@ -46,6 +46,9 @@ protected void addTags(HolderLookup.Provider provider)
         this.tag(ModTags.Items.THERMOREGULATOR_COOLING_FUEL).add(TANItems.ICE_CREAM, Items.ICE, Items.PACKED_ICE, Items.BLUE_ICE, Items.BREEZE_ROD, Items.WIND_CHARGE, Items.SNOWBALL, Items.SNOW, Items.SNOW_BLOCK, Items.POWDER_SNOW_BUCKET);
         this.tag(ModTags.Items.THERMOREGULATOR_HEATING_FUEL).add(TANItems.CHARC_0S, Items.MAGMA_BLOCK, Items.MAGMA_CREAM, Items.BLAZE_POWDER, Items.BLAZE_ROD, Items.FIRE_CHARGE, Items.COAL, Items.CHARCOAL, Items.COAL_BLOCK, Items.LAVA_BUCKET);
 
+        // Canteens
+        this.tag(ModTags.Items.CANTEEN).add(TANItems.EMPTY_LEATHER_CANTEEN, TANItems.LEATHER_DIRTY_WATER_CANTEEN, TANItems.LEATHER_WATER_CANTEEN, TANItems.LEATHER_PURIFIED_WATER_CANTEEN, TANItems.EMPTY_COPPER_CANTEEN, TANItems.COPPER_DIRTY_WATER_CANTEEN, TANItems.COPPER_WATER_CANTEEN, TANItems.COPPER_PURIFIED_WATER_CANTEEN, TANItems.EMPTY_IRON_CANTEEN, TANItems.IRON_DIRTY_WATER_CANTEEN, TANItems.IRON_WATER_CANTEEN, TANItems.IRON_PURIFIED_WATER_CANTEEN, TANItems.EMPTY_GOLD_CANTEEN, TANItems.GOLD_DIRTY_WATER_CANTEEN, TANItems.GOLD_WATER_CANTEEN, TANItems.GOLD_PURIFIED_WATER_CANTEEN, TANItems.EMPTY_DIAMOND_CANTEEN, TANItems.DIAMOND_DIRTY_WATER_CANTEEN, TANItems.DIAMOND_WATER_CANTEEN, TANItems.DIAMOND_PURIFIED_WATER_CANTEEN, TANItems.EMPTY_NETHERITE_CANTEEN, TANItems.NETHERITE_DIRTY_WATER_CANTEEN, TANItems.NETHERITE_WATER_CANTEEN, TANItems.NETHERITE_PURIFIED_WATER_CANTEEN);
+
         // Drinks
         this.tag(ModTags.Items.DRINKS).addTags(
             ModTags.Items.ONE_THIRST_DRINKS,