Fixed what items Water Cleansing can be applied to (On the right bran…

…ch this time)
Glitchfiend · Aug 25, 2024 · 31a0215 · 31a0215
1 parent 8cf8272
commit 31a0215
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 17 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.1	2024-08-25T05:09:20.7510417	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
+776078f24c4c010fd0186baa0a3b13d7cef2ac12 data/toughasnails/enchantment/water_cleansing.json
diff --git a/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c b/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c
@@ -1,2 +1,2 @@
-// 1.21	2024-06-15T11:33:35.2160079	Tags for minecraft:enchantment mod id vanilla
+// 1.21.1	2024-08-25T05:09:20.7545617	Tags for minecraft:enchantment mod id vanilla
 0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/treasure.json
diff --git a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9
@@ -1,4 +1,4 @@
-// 1.21	2024-06-15T11:33:35.2140093	Tags for minecraft:worldgen/biome mod id toughasnails
+// 1.21.1	2024-08-25T05:09:20.7510417	Tags for minecraft:worldgen/biome mod id toughasnails
 2b52a1f084a28479a2e448b5ca6be229c52b6aa9 data/toughasnails/tags/worldgen/biome/cold_biomes.json
 92158999e9537d3b7c9cd1a65cc1aa65bf673c2d data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json
 8548cd9e18e161a303323283cb2c7ab2f2ff2cb0 data/toughasnails/tags/worldgen/biome/hot_biomes.json

diff --git a/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb b/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb
@@ -1,3 +1,3 @@
-// 1.21	2024-06-15T11:33:35.2130083	Tags for minecraft:trim_material mod id toughasnails
+// 1.21.1	2024-08-25T05:09:20.7500434	Tags for minecraft:trim_material mod id toughasnails
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/trim_material/cooling_trims.json
 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/trim_material/heating_trims.json
diff --git a/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 b/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3
@@ -1,2 +1,2 @@
-// 1.21	2024-06-15T11:33:35.2160079	Tags for minecraft:point_of_interest_type mod id toughasnails
+// 1.21.1	2024-08-25T05:09:20.7535554	Tags for minecraft:point_of_interest_type mod id toughasnails
 7ccb22b62459a1c793d38a6fafc772b5d19837e0 data/minecraft/tags/point_of_interest_type/acquirable_job_site.json
diff --git a/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.21	2024-06-15T11:33:35.2140093	Loot Tables
+// 1.21.1	2024-08-25T05:09:20.7510417	Loot Tables
 8fca2e50f9df3893ec7ecb84fb15e5f83b33508a data/toughasnails/loot_table/blocks/rain_collector.json
 5b982875ef4148c8acb507e82e690b7ffd814749 data/toughasnails/loot_table/blocks/temperature_gauge.json
 3014cc41e7b43922f50ec3eb6c2eb83fbf3201d2 data/toughasnails/loot_table/blocks/thermoregulator.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.1	2024-08-25T05:09:20.7525498	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/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.21	2024-06-15T11:33:35.2140093	Recipes
+// 1.21.1	2024-08-25T05:09:20.7520438	Recipes
 538aa9aa354f6743d9832c0ec7a8642b70f515f2 data/toughasnails/advancement/recipes/combat/leaf_boots.json
 2cb6e078f817b17b47c66d6ca824b44751c06ecd data/toughasnails/advancement/recipes/combat/leaf_chestplate.json
 4a11700a18931f1f67270bef246e6b57d1cf5a5b data/toughasnails/advancement/recipes/combat/leaf_helmet.json

diff --git a/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 b/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91
@@ -1,4 +1,4 @@
-// 1.21	2024-06-15T11:33:35.2160079	Item Models: toughasnails
+// 1.21.1	2024-08-25T05:09:20.7535554	Item Models: toughasnails
 ce273d4a6776e0951a77c06d990ff960e28f66f5 assets/toughasnails/models/item/thermometer.json
 0fbb3edc334b05d5f3657d01ad0444da28d830ec assets/toughasnails/models/item/thermometer_00.json
 f90715b0138223634226f703377c9210440ebba4 assets/toughasnails/models/item/thermometer_01.json

diff --git a/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b b/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b
@@ -1,3 +1,3 @@
-// 1.21	2024-06-15T11:33:35.2150083	Tags for minecraft:damage_type mod id toughasnails
+// 1.21.1	2024-08-25T05:09:20.7525498	Tags for minecraft:damage_type mod id toughasnails
 114a24c8e8dfc4dca5477ef3ceb9cdce6f35c49d data/minecraft/tags/damage_type/bypasses_armor.json
 7bc5233723c7bfc14215cd1f26c7fd14f2da6c81 data/minecraft/tags/damage_type/bypasses_effects.json
diff --git a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0
@@ -1,4 +1,4 @@
-// 1.21	2024-06-15T11:33:35.2140093	Tags for minecraft:block mod id toughasnails
+// 1.21.1	2024-08-25T05:09:20.7510417	Tags for minecraft:block mod id toughasnails
 bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/block/mineable/axe.json
 0342cd45a4d6f790afda91090de45871d9b0ef63 data/minecraft/tags/block/mineable/pickaxe.json
 eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/block/cooling_blocks.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
@@ -3,7 +3,6 @@
   "description": {
     "translate": "enchantment.toughasnails.water_cleansing"
   },
-  "exclusive_set": "#minecraft:exclusive_set/damage",
   "max_cost": {
     "base": 75,
     "per_level_above_first": 25
@@ -16,6 +15,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,9 +34,8 @@ 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,7 +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)
         {
             if (drink.is(ModTags.Items.ONE_THIRST_DRINKS)) { return 1; }

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,