From 6dee3d6c425529509c4049ced37963d98c402d7c Mon Sep 17 00:00:00 2001 From: Forstride Date: Tue, 2 Jan 2024 07:59:39 -0500 Subject: [PATCH] Added tiered canteens made of different ores than can hold more water --- .../9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 | 18 ++-- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 36 ++++++- .../recipes/tools/empty_copper_canteen.json | 34 ++++++ .../recipes/tools/empty_diamond_canteen.json | 34 ++++++ .../recipes/tools/empty_gold_canteen.json | 34 ++++++ .../recipes/tools/empty_iron_canteen.json | 34 ++++++ ...anteen.json => empty_leather_canteen.json} | 4 +- .../empty_netherite_canteen_smithing.json | 34 ++++++ ...etherite_dirty_water_canteen_smithing.json | 34 ++++++ ...erite_purified_water_canteen_smithing.json | 34 ++++++ .../netherite_water_canteen_smithing.json | 34 ++++++ .../copper_purified_water_canteen.json | 18 ++++ .../recipes/copper_water_canteen.json | 18 ++++ .../diamond_purified_water_canteen.json | 18 ++++ .../recipes/diamond_water_canteen.json | 18 ++++ .../recipes/empty_copper_canteen.json | 17 +++ .../recipes/empty_diamond_canteen.json | 17 +++ .../recipes/empty_gold_canteen.json | 17 +++ .../recipes/empty_iron_canteen.json | 17 +++ ...anteen.json => empty_leather_canteen.json} | 2 +- .../empty_netherite_canteen_smithing.json | 15 +++ ....json => gold_purified_water_canteen.json} | 4 +- ...r_canteen.json => gold_water_canteen.json} | 4 +- .../recipes/iron_purified_water_canteen.json | 18 ++++ .../recipes/iron_water_canteen.json | 18 ++++ .../leather_purified_water_canteen.json | 18 ++++ .../recipes/leather_water_canteen.json | 18 ++++ ...etherite_dirty_water_canteen_smithing.json | 15 +++ .../netherite_purified_water_canteen.json | 18 ++++ ...erite_purified_water_canteen_smithing.json | 15 +++ .../recipes/netherite_water_canteen.json | 18 ++++ .../netherite_water_canteen_smithing.json | 15 +++ .../items/hydration/10_hydration_drinks.json | 7 +- .../items/hydration/20_hydration_drinks.json | 7 +- .../items/hydration/50_hydration_drinks.json | 7 +- .../25_poison_chance_drinks.json | 7 +- .../75_poison_chance_drinks.json | 7 +- .../tags/items/thirst/1_thirst_drinks.json | 7 +- .../tags/items/thirst/3_thirst_drinks.json | 7 +- .../tags/items/thirst/5_thirst_drinks.json | 7 +- .../java/toughasnails/api/item/TANItems.java | 33 +++++- .../main/java/toughasnails/init/ModItems.java | 34 +++++- .../item/EmptyCopperCanteenItem.java | 97 +++++++++++++++++ .../item/EmptyDiamondCanteenItem.java | 97 +++++++++++++++++ ...eenItem.java => EmptyGoldCanteenItem.java} | 12 +-- .../item/EmptyIronCanteenItem.java | 97 +++++++++++++++++ .../item/EmptyLeatherCanteenItem.java | 97 +++++++++++++++++ .../item/EmptyNetheriteCanteenItem.java | 97 +++++++++++++++++ ...Item.java => FilledCopperCanteenItem.java} | 9 +- .../item/FilledDiamondCanteenItem.java | 101 ++++++++++++++++++ .../item/FilledGoldCanteenItem.java | 101 ++++++++++++++++++ .../item/FilledIronCanteenItem.java | 101 ++++++++++++++++++ .../item/FilledLeatherCanteenItem.java | 101 ++++++++++++++++++ .../item/FilledNetheriteCanteenItem.java | 101 ++++++++++++++++++ .../assets/toughasnails/lang/en_us.json | 28 ++++- .../item/copper_dirty_water_canteen.json | 6 ++ .../item/copper_purified_water_canteen.json | 6 ++ .../models/item/copper_water_canteen.json | 6 ++ .../item/diamond_dirty_water_canteen.json | 6 ++ .../item/diamond_purified_water_canteen.json | 6 ++ .../models/item/diamond_water_canteen.json | 6 ++ .../models/item/empty_copper_canteen.json | 6 ++ .../models/item/empty_diamond_canteen.json | 6 ++ ...y_canteen.json => empty_gold_canteen.json} | 2 +- ...r_canteen.json => empty_iron_canteen.json} | 2 +- .../models/item/empty_leather_canteen.json | 6 ++ .../models/item/empty_netherite_canteen.json | 6 ++ .../models/item/gold_dirty_water_canteen.json | 6 ++ .../item/gold_purified_water_canteen.json | 6 ++ ...r_canteen.json => gold_water_canteen.json} | 2 +- .../models/item/iron_dirty_water_canteen.json | 6 ++ .../item/iron_purified_water_canteen.json | 6 ++ .../models/item/iron_water_canteen.json | 6 ++ .../item/leather_dirty_water_canteen.json | 6 ++ .../item/leather_purified_water_canteen.json | 6 ++ .../models/item/leather_water_canteen.json | 6 ++ .../item/netherite_dirty_water_canteen.json | 6 ++ .../netherite_purified_water_canteen.json | 6 ++ .../models/item/netherite_water_canteen.json | 6 ++ .../models/item/purified_water_canteen.json | 6 -- .../item/copper_dirty_water_canteen.png | Bin 0 -> 296 bytes .../item/copper_purified_water_canteen.png | Bin 0 -> 296 bytes .../textures/item/copper_water_canteen.png | Bin 0 -> 296 bytes .../item/diamond_dirty_water_canteen.png | Bin 0 -> 297 bytes .../item/diamond_purified_water_canteen.png | Bin 0 -> 297 bytes .../textures/item/diamond_water_canteen.png | Bin 0 -> 297 bytes .../textures/item/dirty_water_canteen.png | Bin 391 -> 0 bytes .../textures/item/empty_canteen.png | Bin 391 -> 0 bytes .../textures/item/empty_copper_canteen.png | Bin 0 -> 271 bytes .../textures/item/empty_diamond_canteen.png | Bin 0 -> 271 bytes .../textures/item/empty_gold_canteen.png | Bin 0 -> 271 bytes .../textures/item/empty_iron_canteen.png | Bin 0 -> 271 bytes .../textures/item/empty_leather_canteen.png | Bin 0 -> 265 bytes .../textures/item/empty_netherite_canteen.png | Bin 0 -> 284 bytes .../item/gold_dirty_water_canteen.png | Bin 0 -> 297 bytes .../item/gold_purified_water_canteen.png | Bin 0 -> 297 bytes .../textures/item/gold_water_canteen.png | Bin 0 -> 297 bytes .../item/iron_dirty_water_canteen.png | Bin 0 -> 297 bytes .../item/iron_purified_water_canteen.png | Bin 0 -> 297 bytes .../textures/item/iron_water_canteen.png | Bin 0 -> 297 bytes .../item/leather_dirty_water_canteen.png | Bin 0 -> 291 bytes .../item/leather_purified_water_canteen.png | Bin 0 -> 291 bytes .../textures/item/leather_water_canteen.png | Bin 0 -> 291 bytes .../item/netherite_dirty_water_canteen.png | Bin 0 -> 308 bytes .../item/netherite_purified_water_canteen.png | Bin 0 -> 308 bytes .../textures/item/netherite_water_canteen.png | Bin 0 -> 308 bytes .../textures/item/purified_water_canteen.png | Bin 390 -> 0 bytes .../textures/item/water_canteen.png | Bin 393 -> 0 bytes .../datagen/provider/TANItemTagsProvider.java | 16 +-- .../datagen/provider/TANRecipeProvider.java | 36 ++++++- 110 files changed, 1928 insertions(+), 72 deletions(-) create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json rename common/src/generated/resources/data/toughasnails/advancements/recipes/tools/{empty_canteen.json => empty_leather_canteen.json} (84%) create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json create mode 100644 common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/copper_purified_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/copper_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/diamond_purified_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/diamond_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/empty_copper_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/empty_diamond_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/empty_gold_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/empty_iron_canteen.json rename common/src/generated/resources/data/toughasnails/recipes/{empty_canteen.json => empty_leather_canteen.json} (80%) create mode 100644 common/src/generated/resources/data/toughasnails/recipes/empty_netherite_canteen_smithing.json rename common/src/generated/resources/data/toughasnails/recipes/{purified_water_canteen.json => gold_purified_water_canteen.json} (67%) rename common/src/generated/resources/data/toughasnails/recipes/{water_canteen.json => gold_water_canteen.json} (68%) create mode 100644 common/src/generated/resources/data/toughasnails/recipes/iron_purified_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/iron_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/leather_purified_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/leather_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen.json create mode 100644 common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen_smithing.json create mode 100644 common/src/main/java/toughasnails/item/EmptyCopperCanteenItem.java create mode 100644 common/src/main/java/toughasnails/item/EmptyDiamondCanteenItem.java rename common/src/main/java/toughasnails/item/{EmptyCanteenItem.java => EmptyGoldCanteenItem.java} (90%) create mode 100644 common/src/main/java/toughasnails/item/EmptyIronCanteenItem.java create mode 100644 common/src/main/java/toughasnails/item/EmptyLeatherCanteenItem.java create mode 100644 common/src/main/java/toughasnails/item/EmptyNetheriteCanteenItem.java rename common/src/main/java/toughasnails/item/{FilledCanteenItem.java => FilledCopperCanteenItem.java} (91%) create mode 100644 common/src/main/java/toughasnails/item/FilledDiamondCanteenItem.java create mode 100644 common/src/main/java/toughasnails/item/FilledGoldCanteenItem.java create mode 100644 common/src/main/java/toughasnails/item/FilledIronCanteenItem.java create mode 100644 common/src/main/java/toughasnails/item/FilledLeatherCanteenItem.java create mode 100644 common/src/main/java/toughasnails/item/FilledNetheriteCanteenItem.java create mode 100644 common/src/main/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/copper_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/diamond_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/empty_copper_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/empty_diamond_canteen.json rename common/src/main/resources/assets/toughasnails/models/item/{empty_canteen.json => empty_gold_canteen.json} (51%) rename common/src/main/resources/assets/toughasnails/models/item/{water_canteen.json => empty_iron_canteen.json} (51%) create mode 100644 common/src/main/resources/assets/toughasnails/models/item/empty_leather_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/empty_netherite_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json rename common/src/main/resources/assets/toughasnails/models/item/{dirty_water_canteen.json => gold_water_canteen.json} (50%) create mode 100644 common/src/main/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/iron_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/leather_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/models/item/netherite_water_canteen.json delete mode 100644 common/src/main/resources/assets/toughasnails/models/item/purified_water_canteen.json create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/copper_dirty_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/copper_purified_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/copper_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/diamond_dirty_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/diamond_purified_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/diamond_water_canteen.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/item/dirty_water_canteen.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/item/empty_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/empty_copper_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/empty_diamond_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/empty_gold_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/empty_iron_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/empty_leather_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/empty_netherite_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/gold_dirty_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/gold_purified_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/gold_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/iron_dirty_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/iron_purified_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/iron_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/leather_dirty_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/leather_purified_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/leather_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/netherite_dirty_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/netherite_purified_water_canteen.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/item/netherite_water_canteen.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/item/purified_water_canteen.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/item/water_canteen.png diff --git a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 index 514a4bf3..c5d89458 100644 --- a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 +++ b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 @@ -1,4 +1,4 @@ -// 1.20.4 2024-01-02T11:01:06.4961003 Tags for minecraft:item mod id toughasnails +// 1.20.4 2024-01-02T07:25:05.8559215 Tags for minecraft:item mod id toughasnails f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/items/cooling_armor.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/cooling_consumed_items.json 7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/items/cooling_held_items.json @@ -7,19 +7,19 @@ eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/items/heating_ar 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/heating_consumed_items.json efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/items/heating_held_items.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/100_hydration_drinks.json -9c0dc65d9f036f654b10088e08368b1a58a41237 data/toughasnails/tags/items/hydration/10_hydration_drinks.json -80da436d00c60f0926a75bfc6452ef3e03d0e4cf data/toughasnails/tags/items/hydration/20_hydration_drinks.json +67139859406093c4ec7fb2563184a349cd422c65 data/toughasnails/tags/items/hydration/10_hydration_drinks.json +afb65ee4d43ae8f9cb63112f16629e0e59db5e3d data/toughasnails/tags/items/hydration/20_hydration_drinks.json c3717474b5903bcc644087abd9758494594dc09b data/toughasnails/tags/items/hydration/30_hydration_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/40_hydration_drinks.json -4fa41e9b41dd839136206b5935757ba390f588a8 data/toughasnails/tags/items/hydration/50_hydration_drinks.json +7fd9471261d08e940601fdecd379217eb90622d1 data/toughasnails/tags/items/hydration/50_hydration_drinks.json a485e913b63b0237e95ef2af66ed886ba820154a data/toughasnails/tags/items/hydration/60_hydration_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/70_hydration_drinks.json d7b753d45aecdc84f69d294a00dc5271088c2abc data/toughasnails/tags/items/hydration/80_hydration_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/hydration/90_hydration_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json -fc698dddd5a4b2d4d0ef9438b45036416c380b0f data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json +f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json -ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json +cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json 0395ed7d6e3d7510a25d2f4ef8b498b0d8c6c9eb data/toughasnails/tags/items/thirst/10_thirst_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/11_thirst_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/12_thirst_drinks.json @@ -30,12 +30,12 @@ ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/poison_cha 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/17_thirst_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/18_thirst_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/19_thirst_drinks.json -ab761c277e9e318f660c08eb4da51946e028f083 data/toughasnails/tags/items/thirst/1_thirst_drinks.json +cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/items/thirst/1_thirst_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/20_thirst_drinks.json edb5947f84984a39ab47c98c6fb0b3c3a9a8cc39 data/toughasnails/tags/items/thirst/2_thirst_drinks.json -fc698dddd5a4b2d4d0ef9438b45036416c380b0f data/toughasnails/tags/items/thirst/3_thirst_drinks.json +f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/thirst/3_thirst_drinks.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/4_thirst_drinks.json -4fa41e9b41dd839136206b5935757ba390f588a8 data/toughasnails/tags/items/thirst/5_thirst_drinks.json +7fd9471261d08e940601fdecd379217eb90622d1 data/toughasnails/tags/items/thirst/5_thirst_drinks.json 24b02d22d0e3e4abbeed0c96fc20b8dc05dc5f6e data/toughasnails/tags/items/thirst/6_thirst_drinks.json a90844d1583073e1a3538fe5afe6e279aa3073b8 data/toughasnails/tags/items/thirst/7_thirst_drinks.json a8d4693f32c2dabe2f0ff10cb6ccae93882c8530 data/toughasnails/tags/items/thirst/8_thirst_drinks.json diff --git a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index b53ba22d..c40aacc5 100644 --- a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.4 2024-01-02T04:23:10.697763 Recipes +// 1.20.4 2024-01-02T07:25:05.8549215 Recipes 09252bd5a872203de304820e8d5c5493afe96cf4 data/toughasnails/advancements/recipes/combat/leaf_boots.json 2da825265e95f5dfc0dd4026e0dafee70c17512c data/toughasnails/advancements/recipes/combat/leaf_chestplate.json 6d96cd4baff66d426c9405852ceed3aa8a3cde8f data/toughasnails/advancements/recipes/combat/leaf_helmet.json @@ -17,27 +17,53 @@ db0a08a7c6ccc69ca4625db57d678ce644fdfe49 data/toughasnails/advancements/recipes/ 1441a8289dbc285c34bf874d6976315fb41001f0 data/toughasnails/advancements/recipes/food/pumpkin_juice.json 1b3828862b65dcfb0a1e6d99070287e896379558 data/toughasnails/advancements/recipes/food/sweet_berry_juice.json 0c2aa5f66f00c9bb358dcfd2b7b1dd149bdec7ad data/toughasnails/advancements/recipes/redstone/temperature_gauge.json -8b0e1899a965cbcf725172709f9f7f7062c43a5c data/toughasnails/advancements/recipes/tools/empty_canteen.json +44869876c5d15da0418d9a179911a93296cb8f8a data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json +72921dc876362e365bcaa765291ec84bf02b6eeb data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json +710c937eb23f7b4dcbc915d904fc6a9cb9ca52e1 data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json +c49718f4f3b3c8a7f432c1bd4fa107df604a47f2 data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json +42091e54a271bc4e256aca31c6c0f5f179bd7ecd data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json +2807acbbeb51586ea606fe256b07cf3dfebef97c data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json +eb6859b0a41b94e3003405965dadf8f49b465ce0 data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json +2ae629d1e33be1d1c4e0b2796298afa806d9246c data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json +98ac50cc499f0c47fdfdfb9b307120626116a6bb data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json 9ce52988e0ffa4ebd960125423c6dc331a72aadd data/toughasnails/advancements/recipes/tools/thermometer.json 715184d6dfbadc65234a787d2e8271dce076e7b1 data/toughasnails/recipes/apple_juice.json 7aefc36c9cb1e7393660e57c9bfe2f47e9c472b9 data/toughasnails/recipes/cactus_juice.json c03137fedf80a5cea96fa69ecc23ddcc733b02bf data/toughasnails/recipes/chorus_fruit_juice.json -4d4f65571791ddb5a8ec9f7c271eaf51cf0df667 data/toughasnails/recipes/empty_canteen.json +621a931c624e91f393ca22939253186876e40873 data/toughasnails/recipes/copper_purified_water_canteen.json +96da20c9eb64283df7947e6272c2286d8b8f2af7 data/toughasnails/recipes/copper_water_canteen.json +0f57768f3726aecdb416ccd231a8603dfb52ede3 data/toughasnails/recipes/diamond_purified_water_canteen.json +af7978ffe03960df8f3f685e994be96fcc5009ac data/toughasnails/recipes/diamond_water_canteen.json +69fa128d3bbc0aa152b4c9c248e8ed5d31227e52 data/toughasnails/recipes/empty_copper_canteen.json +eeec0fb0459e002edf6be30744d90f731da6c1aa data/toughasnails/recipes/empty_diamond_canteen.json +fd9753fb1e2dcfee3a36ce1356defc58785f31ee data/toughasnails/recipes/empty_gold_canteen.json +c2f1aadc3c947308ddb2ffa99ff481d3c2702ee3 data/toughasnails/recipes/empty_iron_canteen.json +7be0520988081ed809cf89cf0f9b2c556a020951 data/toughasnails/recipes/empty_leather_canteen.json +6693eef90bf6bdcdfcf4f50e0df05573fd9df858 data/toughasnails/recipes/empty_netherite_canteen_smithing.json af1b982b9d1cc7246035fc73abfd1b34fbb1394d data/toughasnails/recipes/glow_berry_juice.json +20abd8e2a4e8172968eab10fe809720fc0160118 data/toughasnails/recipes/gold_purified_water_canteen.json +a2a23e956fe154b4db870456e6e06b3fb6c0e121 data/toughasnails/recipes/gold_water_canteen.json +11beca7698ade01aa272b18b3314a42e552746b0 data/toughasnails/recipes/iron_purified_water_canteen.json +aa5d7b846a2b506c4d93d2f094834d16d8aeded9 data/toughasnails/recipes/iron_water_canteen.json 6cd4c90a0ccbc67304b76d8fd1890c7559bd3289 data/toughasnails/recipes/leaf_boots.json 0dd60dff91f95a5a821842815b45b8ac48d1d554 data/toughasnails/recipes/leaf_chestplate.json f6b8afa3f1d888f8ae0b390281d275a988a85da5 data/toughasnails/recipes/leaf_helmet.json 124270ddfb0dae3e3c31cdaa521b00047bd8e401 data/toughasnails/recipes/leaf_leggings.json +2b22d9d76f45be7994c9409c236635423ccdf340 data/toughasnails/recipes/leather_purified_water_canteen.json +34ba5d07ce9d0643c108bcf6a6e7d440f672336a data/toughasnails/recipes/leather_water_canteen.json 3832d3998e8c69d60fbd12ae52965337708eddb3 data/toughasnails/recipes/melon_juice.json +9fc8d88fda45a7d46bf4ea80c0f72d88526ce044 data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json +ad1a5bb6b263d7837b4a30c843cffb7339797487 data/toughasnails/recipes/netherite_purified_water_canteen.json +ce6043b5272c9c6e1dec865399f04e46b038be41 data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json +f67d6861f1202177c42f0d6bf6a1b5b5c54fb59e data/toughasnails/recipes/netherite_water_canteen.json +d15aa59d2053ceaa472b5fad409ca720d37766a5 data/toughasnails/recipes/netherite_water_canteen_smithing.json 23d01cbd22f68c4a24a36a57a11401e9c42d9477 data/toughasnails/recipes/potion.json e4a98b0325be4fb27194eb56a079871cdc8d4114 data/toughasnails/recipes/pumpkin_juice.json 1ed5721002714ae4029126d79a7b73ac58fa755d data/toughasnails/recipes/purified_water_bottle.json -351a2d892d1bc8eaf091aa41c732953c85b661b0 data/toughasnails/recipes/purified_water_canteen.json 454a67d0df9042690154a1b3b372a5fff586b47d data/toughasnails/recipes/rain_collector.json 2512026dc3a027f39db7e77e023a7017de386b9c data/toughasnails/recipes/sweet_berry_juice.json e636bfd4fab8d516083454e872c8115f5c15cf27 data/toughasnails/recipes/temperature_gauge.json b75d1caa0b1dcb9ae14dc02e47bba2a3c4b4a4dc data/toughasnails/recipes/thermometer.json -9e06d792260bac7da2725c0b4ab95e165f6ffbec data/toughasnails/recipes/water_canteen.json 26985bc2361f55479fce0f342c9c2b7573237c7f data/toughasnails/recipes/water_purifier.json 30229579a58927cae7011781b0936f7ca87888a4 data/toughasnails/recipes/wool_boots.json 25ff54ef0230fd94b0f881f7866b571f4729d254 data/toughasnails/recipes/wool_chestplate.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json new file mode 100644 index 00000000..8467513e --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:empty_copper_canteen" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_copper_ingot" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:empty_copper_canteen" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json new file mode 100644 index 00000000..d11bafe3 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_diamond": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:diamond" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:empty_diamond_canteen" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_diamond" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:empty_diamond_canteen" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json new file mode 100644 index 00000000..a62245d4 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gold_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gold_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:empty_gold_canteen" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:empty_gold_canteen" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json new file mode 100644 index 00000000..fe12beb0 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:empty_iron_canteen" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_iron_ingot" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:empty_iron_canteen" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_canteen.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json similarity index 84% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_canteen.json rename to common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json index c3a5bf3a..64d58f3f 100644 --- a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_canteen.json +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "toughasnails:empty_canteen" + "recipe": "toughasnails:empty_leather_canteen" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "toughasnails:empty_canteen" + "toughasnails:empty_leather_canteen" ] } } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json new file mode 100644 index 00000000..c14cd342 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_netherite_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:netherite_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:empty_netherite_canteen_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_ingot" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:empty_netherite_canteen_smithing" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json new file mode 100644 index 00000000..ab89a8b8 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_netherite_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:netherite_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:netherite_dirty_water_canteen_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_ingot" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:netherite_dirty_water_canteen_smithing" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json new file mode 100644 index 00000000..6ce514cd --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_netherite_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:netherite_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:netherite_purified_water_canteen_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_ingot" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:netherite_purified_water_canteen_smithing" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json new file mode 100644 index 00000000..0986d2d6 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_netherite_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:netherite_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "toughasnails:netherite_water_canteen_smithing" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_netherite_ingot" + ] + ], + "rewards": { + "recipes": [ + "toughasnails:netherite_water_canteen_smithing" + ] + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/copper_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/copper_purified_water_canteen.json new file mode 100644 index 00000000..9df77c55 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/copper_purified_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:copper_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 200, + "result": { + "Count": 1, + "id": "toughasnails:copper_purified_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/copper_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/copper_water_canteen.json new file mode 100644 index 00000000..a9f000af --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/copper_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:copper_dirty_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 400, + "result": { + "Count": 1, + "id": "toughasnails:copper_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/diamond_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/diamond_purified_water_canteen.json new file mode 100644 index 00000000..5e735834 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/diamond_purified_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:diamond_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 200, + "result": { + "Count": 1, + "id": "toughasnails:diamond_purified_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/diamond_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/diamond_water_canteen.json new file mode 100644 index 00000000..94ef6bde --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/diamond_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:diamond_dirty_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 400, + "result": { + "Count": 1, + "id": "toughasnails:diamond_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_copper_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/empty_copper_canteen.json new file mode 100644 index 00000000..a6181aa0 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/empty_copper_canteen.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "minecraft:copper_ingot" + } + }, + "pattern": [ + " # ", + "# #", + " # " + ], + "result": { + "item": "toughasnails:empty_copper_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_diamond_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/empty_diamond_canteen.json new file mode 100644 index 00000000..54c3ffa5 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/empty_diamond_canteen.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "minecraft:diamond" + } + }, + "pattern": [ + " # ", + "# #", + " # " + ], + "result": { + "item": "toughasnails:empty_diamond_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_gold_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/empty_gold_canteen.json new file mode 100644 index 00000000..bc81b0f6 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/empty_gold_canteen.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "minecraft:gold_ingot" + } + }, + "pattern": [ + " # ", + "# #", + " # " + ], + "result": { + "item": "toughasnails:empty_gold_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_iron_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/empty_iron_canteen.json new file mode 100644 index 00000000..f7bc3ee6 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/empty_iron_canteen.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "minecraft:iron_ingot" + } + }, + "pattern": [ + " # ", + "# #", + " # " + ], + "result": { + "item": "toughasnails:empty_iron_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/empty_leather_canteen.json similarity index 80% rename from common/src/generated/resources/data/toughasnails/recipes/empty_canteen.json rename to common/src/generated/resources/data/toughasnails/recipes/empty_leather_canteen.json index 7f558b1e..5fb2a5c0 100644 --- a/common/src/generated/resources/data/toughasnails/recipes/empty_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipes/empty_leather_canteen.json @@ -12,6 +12,6 @@ " # " ], "result": { - "item": "toughasnails:empty_canteen" + "item": "toughasnails:empty_leather_canteen" } } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_netherite_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipes/empty_netherite_canteen_smithing.json new file mode 100644 index 00000000..096be2f6 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/empty_netherite_canteen_smithing.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "toughasnails:empty_diamond_canteen" + }, + "result": { + "item": "toughasnails:empty_netherite_canteen" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/gold_purified_water_canteen.json similarity index 67% rename from common/src/generated/resources/data/toughasnails/recipes/purified_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipes/gold_purified_water_canteen.json index a7c5bc6e..8fa127fe 100644 --- a/common/src/generated/resources/data/toughasnails/recipes/purified_water_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipes/gold_purified_water_canteen.json @@ -2,7 +2,7 @@ "type": "toughasnails:water_purifying", "input": { "Count": 1, - "id": "toughasnails:water_canteen", + "id": "toughasnails:gold_water_canteen", "tag": { "Damage": 0 } @@ -10,7 +10,7 @@ "purifytime": 200, "result": { "Count": 1, - "id": "toughasnails:purified_water_canteen", + "id": "toughasnails:gold_purified_water_canteen", "tag": { "Damage": 0 } diff --git a/common/src/generated/resources/data/toughasnails/recipes/water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/gold_water_canteen.json similarity index 68% rename from common/src/generated/resources/data/toughasnails/recipes/water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipes/gold_water_canteen.json index fb8ec135..7016299b 100644 --- a/common/src/generated/resources/data/toughasnails/recipes/water_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipes/gold_water_canteen.json @@ -2,7 +2,7 @@ "type": "toughasnails:water_purifying", "input": { "Count": 1, - "id": "toughasnails:dirty_water_canteen", + "id": "toughasnails:gold_dirty_water_canteen", "tag": { "Damage": 0 } @@ -10,7 +10,7 @@ "purifytime": 400, "result": { "Count": 1, - "id": "toughasnails:water_canteen", + "id": "toughasnails:gold_water_canteen", "tag": { "Damage": 0 } diff --git a/common/src/generated/resources/data/toughasnails/recipes/iron_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/iron_purified_water_canteen.json new file mode 100644 index 00000000..0fedeb55 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/iron_purified_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:iron_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 200, + "result": { + "Count": 1, + "id": "toughasnails:iron_purified_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/iron_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/iron_water_canteen.json new file mode 100644 index 00000000..04e9a28c --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/iron_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:iron_dirty_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 400, + "result": { + "Count": 1, + "id": "toughasnails:iron_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/leather_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/leather_purified_water_canteen.json new file mode 100644 index 00000000..09e381a5 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/leather_purified_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:leather_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 200, + "result": { + "Count": 1, + "id": "toughasnails:leather_purified_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/leather_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/leather_water_canteen.json new file mode 100644 index 00000000..1057b4e6 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/leather_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:leather_dirty_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 400, + "result": { + "Count": 1, + "id": "toughasnails:leather_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json new file mode 100644 index 00000000..f528d3ec --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "toughasnails:diamond_dirty_water_canteen" + }, + "result": { + "item": "toughasnails:netherite_dirty_water_canteen" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen.json new file mode 100644 index 00000000..f4322111 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:netherite_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 200, + "result": { + "Count": 1, + "id": "toughasnails:netherite_purified_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json new file mode 100644 index 00000000..c89000a5 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "toughasnails:diamond_purified_water_canteen" + }, + "result": { + "item": "toughasnails:netherite_purified_water_canteen" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen.json new file mode 100644 index 00000000..77293010 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen.json @@ -0,0 +1,18 @@ +{ + "type": "toughasnails:water_purifying", + "input": { + "Count": 1, + "id": "toughasnails:netherite_dirty_water_canteen", + "tag": { + "Damage": 0 + } + }, + "purifytime": 400, + "result": { + "Count": 1, + "id": "toughasnails:netherite_water_canteen", + "tag": { + "Damage": 0 + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen_smithing.json new file mode 100644 index 00000000..a9b8f01f --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen_smithing.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "toughasnails:diamond_water_canteen" + }, + "result": { + "item": "toughasnails:netherite_water_canteen" + }, + "template": { + "item": "minecraft:netherite_upgrade_smithing_template" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json index c4abd7b2..aa8bb305 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json @@ -1,7 +1,12 @@ { "values": [ "toughasnails:dirty_water_bottle", - "toughasnails:dirty_water_canteen", + "toughasnails:leather_dirty_water_canteen", + "toughasnails:copper_dirty_water_canteen", + "toughasnails:iron_dirty_water_canteen", + "toughasnails:gold_dirty_water_canteen", + "toughasnails:diamond_dirty_water_canteen", + "toughasnails:netherite_dirty_water_canteen", "toughasnails:glow_berry_juice", "toughasnails:sweet_berry_juice" ] diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json index 350e0fdb..53c546be 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json @@ -1,7 +1,12 @@ { "values": [ "minecraft:potion", - "toughasnails:water_canteen", + "toughasnails:leather_water_canteen", + "toughasnails:copper_water_canteen", + "toughasnails:iron_water_canteen", + "toughasnails:gold_water_canteen", + "toughasnails:diamond_water_canteen", + "toughasnails:netherite_water_canteen", "toughasnails:chorus_fruit_juice" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json index 28a987be..bd8dcd0d 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json @@ -1,6 +1,11 @@ { "values": [ "toughasnails:purified_water_bottle", - "toughasnails:purified_water_canteen" + "toughasnails:leather_purified_water_canteen", + "toughasnails:copper_purified_water_canteen", + "toughasnails:iron_purified_water_canteen", + "toughasnails:gold_purified_water_canteen", + "toughasnails:diamond_purified_water_canteen", + "toughasnails:netherite_purified_water_canteen" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json index 2969560b..dc7a42d5 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json @@ -1,6 +1,11 @@ { "values": [ "minecraft:potion", - "toughasnails:water_canteen" + "toughasnails:leather_water_canteen", + "toughasnails:copper_water_canteen", + "toughasnails:iron_water_canteen", + "toughasnails:gold_water_canteen", + "toughasnails:diamond_water_canteen", + "toughasnails:netherite_water_canteen" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json index 09a98c04..1fd832cc 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json @@ -1,6 +1,11 @@ { "values": [ "toughasnails:dirty_water_bottle", - "toughasnails:dirty_water_canteen" + "toughasnails:leather_dirty_water_canteen", + "toughasnails:copper_dirty_water_canteen", + "toughasnails:iron_dirty_water_canteen", + "toughasnails:gold_dirty_water_canteen", + "toughasnails:diamond_dirty_water_canteen", + "toughasnails:netherite_dirty_water_canteen" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json index 09a98c04..1fd832cc 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json @@ -1,6 +1,11 @@ { "values": [ "toughasnails:dirty_water_bottle", - "toughasnails:dirty_water_canteen" + "toughasnails:leather_dirty_water_canteen", + "toughasnails:copper_dirty_water_canteen", + "toughasnails:iron_dirty_water_canteen", + "toughasnails:gold_dirty_water_canteen", + "toughasnails:diamond_dirty_water_canteen", + "toughasnails:netherite_dirty_water_canteen" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json index 2969560b..dc7a42d5 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json @@ -1,6 +1,11 @@ { "values": [ "minecraft:potion", - "toughasnails:water_canteen" + "toughasnails:leather_water_canteen", + "toughasnails:copper_water_canteen", + "toughasnails:iron_water_canteen", + "toughasnails:gold_water_canteen", + "toughasnails:diamond_water_canteen", + "toughasnails:netherite_water_canteen" ] } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json index 28a987be..bd8dcd0d 100644 --- a/common/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json +++ b/common/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json @@ -1,6 +1,11 @@ { "values": [ "toughasnails:purified_water_bottle", - "toughasnails:purified_water_canteen" + "toughasnails:leather_purified_water_canteen", + "toughasnails:copper_purified_water_canteen", + "toughasnails:iron_purified_water_canteen", + "toughasnails:gold_purified_water_canteen", + "toughasnails:diamond_purified_water_canteen", + "toughasnails:netherite_purified_water_canteen" ] } \ No newline at end of file diff --git a/common/src/main/java/toughasnails/api/item/TANItems.java b/common/src/main/java/toughasnails/api/item/TANItems.java index 0abfdaa9..9d7dc4ce 100644 --- a/common/src/main/java/toughasnails/api/item/TANItems.java +++ b/common/src/main/java/toughasnails/api/item/TANItems.java @@ -9,10 +9,35 @@ public class TANItems { - public static Item EMPTY_CANTEEN; - public static Item WATER_CANTEEN; - public static Item DIRTY_WATER_CANTEEN; - public static Item PURIFIED_WATER_CANTEEN; + public static Item EMPTY_LEATHER_CANTEEN; + public static Item LEATHER_DIRTY_WATER_CANTEEN; + public static Item LEATHER_WATER_CANTEEN; + public static Item LEATHER_PURIFIED_WATER_CANTEEN; + + public static Item EMPTY_COPPER_CANTEEN; + public static Item COPPER_DIRTY_WATER_CANTEEN; + public static Item COPPER_WATER_CANTEEN; + public static Item COPPER_PURIFIED_WATER_CANTEEN; + + public static Item EMPTY_IRON_CANTEEN; + public static Item IRON_DIRTY_WATER_CANTEEN; + public static Item IRON_WATER_CANTEEN; + public static Item IRON_PURIFIED_WATER_CANTEEN; + + public static Item EMPTY_GOLD_CANTEEN; + public static Item GOLD_DIRTY_WATER_CANTEEN; + public static Item GOLD_WATER_CANTEEN; + public static Item GOLD_PURIFIED_WATER_CANTEEN; + + public static Item EMPTY_DIAMOND_CANTEEN; + public static Item DIAMOND_DIRTY_WATER_CANTEEN; + public static Item DIAMOND_WATER_CANTEEN; + public static Item DIAMOND_PURIFIED_WATER_CANTEEN; + + public static Item EMPTY_NETHERITE_CANTEEN; + public static Item NETHERITE_DIRTY_WATER_CANTEEN; + public static Item NETHERITE_WATER_CANTEEN; + public static Item NETHERITE_PURIFIED_WATER_CANTEEN; public static Item DIRTY_WATER_BOTTLE; public static Item PURIFIED_WATER_BOTTLE; diff --git a/common/src/main/java/toughasnails/init/ModItems.java b/common/src/main/java/toughasnails/init/ModItems.java index 43fa74ab..6ed1d51e 100644 --- a/common/src/main/java/toughasnails/init/ModItems.java +++ b/common/src/main/java/toughasnails/init/ModItems.java @@ -34,10 +34,36 @@ public class ModItems { public static void registerItems(BiConsumer func) { - TANItems.EMPTY_CANTEEN = register(func, "empty_canteen", new EmptyCanteenItem((new Item.Properties()).stacksTo(1))); - TANItems.DIRTY_WATER_CANTEEN = register(func, "dirty_water_canteen", new FilledCanteenItem((new Item.Properties()).durability(5))); - TANItems.WATER_CANTEEN = register(func, "water_canteen", new FilledCanteenItem((new Item.Properties()).durability(5))); - TANItems.PURIFIED_WATER_CANTEEN = register(func, "purified_water_canteen", new FilledCanteenItem((new Item.Properties()).durability(5))); + TANItems.EMPTY_LEATHER_CANTEEN = register(func, "empty_leather_canteen", new EmptyLeatherCanteenItem((new Item.Properties()).stacksTo(1))); + TANItems.LEATHER_DIRTY_WATER_CANTEEN = register(func, "leather_dirty_water_canteen", new FilledLeatherCanteenItem((new Item.Properties()).durability(5))); + TANItems.LEATHER_WATER_CANTEEN = register(func, "leather_water_canteen", new FilledLeatherCanteenItem((new Item.Properties()).durability(5))); + TANItems.LEATHER_PURIFIED_WATER_CANTEEN = register(func, "leather_purified_water_canteen", new FilledLeatherCanteenItem((new Item.Properties()).durability(5))); + + TANItems.EMPTY_COPPER_CANTEEN = register(func, "empty_copper_canteen", new EmptyCopperCanteenItem((new Item.Properties()).stacksTo(1))); + TANItems.COPPER_DIRTY_WATER_CANTEEN = register(func, "copper_dirty_water_canteen", new FilledCopperCanteenItem((new Item.Properties()).durability(6))); + TANItems.COPPER_WATER_CANTEEN = register(func, "copper_water_canteen", new FilledCopperCanteenItem((new Item.Properties()).durability(6))); + TANItems.COPPER_PURIFIED_WATER_CANTEEN = register(func, "copper_purified_water_canteen", new FilledCopperCanteenItem((new Item.Properties()).durability(6))); + + TANItems.EMPTY_IRON_CANTEEN = register(func, "empty_iron_canteen", new EmptyIronCanteenItem((new Item.Properties()).stacksTo(1))); + TANItems.IRON_DIRTY_WATER_CANTEEN = register(func, "iron_dirty_water_canteen", new FilledIronCanteenItem((new Item.Properties()).durability(7))); + TANItems.IRON_WATER_CANTEEN = register(func, "iron_water_canteen", new FilledIronCanteenItem((new Item.Properties()).durability(7))); + TANItems.IRON_PURIFIED_WATER_CANTEEN = register(func, "iron_purified_water_canteen", new FilledIronCanteenItem((new Item.Properties()).durability(7))); + + TANItems.EMPTY_GOLD_CANTEEN = register(func, "empty_gold_canteen", new EmptyGoldCanteenItem((new Item.Properties()).stacksTo(1))); + TANItems.GOLD_DIRTY_WATER_CANTEEN = register(func, "gold_dirty_water_canteen", new FilledGoldCanteenItem((new Item.Properties()).durability(10))); + TANItems.GOLD_WATER_CANTEEN = register(func, "gold_water_canteen", new FilledGoldCanteenItem((new Item.Properties()).durability(10))); + TANItems.GOLD_PURIFIED_WATER_CANTEEN = register(func, "gold_purified_water_canteen", new FilledGoldCanteenItem((new Item.Properties()).durability(10))); + + TANItems.EMPTY_DIAMOND_CANTEEN = register(func, "empty_diamond_canteen", new EmptyDiamondCanteenItem((new Item.Properties()).stacksTo(1))); + TANItems.DIAMOND_DIRTY_WATER_CANTEEN = register(func, "diamond_dirty_water_canteen", new FilledDiamondCanteenItem((new Item.Properties()).durability(15))); + TANItems.DIAMOND_WATER_CANTEEN = register(func, "diamond_water_canteen", new FilledDiamondCanteenItem((new Item.Properties()).durability(15))); + TANItems.DIAMOND_PURIFIED_WATER_CANTEEN = register(func, "diamond_purified_water_canteen", new FilledDiamondCanteenItem((new Item.Properties()).durability(15))); + + TANItems.EMPTY_NETHERITE_CANTEEN = register(func, "empty_netherite_canteen", new EmptyNetheriteCanteenItem((new Item.Properties()).stacksTo(1))); + TANItems.NETHERITE_DIRTY_WATER_CANTEEN = register(func, "netherite_dirty_water_canteen", new FilledNetheriteCanteenItem((new Item.Properties()).durability(25))); + TANItems.NETHERITE_WATER_CANTEEN = register(func, "netherite_water_canteen", new FilledNetheriteCanteenItem((new Item.Properties()).durability(25))); + TANItems.NETHERITE_PURIFIED_WATER_CANTEEN = register(func, "netherite_purified_water_canteen", new FilledNetheriteCanteenItem((new Item.Properties()).durability(25))); + TANItems.DIRTY_WATER_BOTTLE = register(func, "dirty_water_bottle", new DirtyWaterBottleItem((new Item.Properties()).stacksTo(1))); TANItems.PURIFIED_WATER_BOTTLE = register(func, "purified_water_bottle", new PurifiedWaterBottleItem((new Item.Properties()).stacksTo(1))); diff --git a/common/src/main/java/toughasnails/item/EmptyCopperCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyCopperCanteenItem.java new file mode 100644 index 00000000..9ca86d58 --- /dev/null +++ b/common/src/main/java/toughasnails/item/EmptyCopperCanteenItem.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.block.TANBlocks; +import toughasnails.api.item.TANItems; +import toughasnails.block.RainCollectorBlock; +import toughasnails.init.ModTags; + +public class EmptyCopperCanteenItem extends Item +{ + public EmptyCopperCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos)) + { + BlockState state = world.getBlockState(pos); + + if (state.getBlock() instanceof RainCollectorBlock) + { + // Fill the canteen from purified water from a rain collector + int waterLevel = state.getValue(RainCollectorBlock.LEVEL); + + if (waterLevel > 0 && !world.isClientSide()) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + ((RainCollectorBlock) TANBlocks.RAIN_COLLECTOR).setWaterLevel(world, pos, state, waterLevel - 1); + return InteractionResultHolder.success(this.replaceCanteen(stack, player, new ItemStack(TANItems.COPPER_PURIFIED_WATER_CANTEEN))); + } + } + else if (world.getFluidState(pos).is(FluidTags.WATER)) + { + // Fill the canteen with water in the world + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + + Holder biome = player.level().getBiome(player.blockPosition()); + Item canteenItem; + + if (biome.is(ModTags.Biomes.DIRTY_WATER_BIOMES)) + { + canteenItem = TANItems.COPPER_DIRTY_WATER_CANTEEN; + } + else if (biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) + { + canteenItem = TANItems.COPPER_PURIFIED_WATER_CANTEEN; + } + else + { + canteenItem = TANItems.COPPER_WATER_CANTEEN; + } + + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(canteenItem)), world.isClientSide()); + } + } + } + + return InteractionResultHolder.pass(stack); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } +} diff --git a/common/src/main/java/toughasnails/item/EmptyDiamondCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyDiamondCanteenItem.java new file mode 100644 index 00000000..50cf14f0 --- /dev/null +++ b/common/src/main/java/toughasnails/item/EmptyDiamondCanteenItem.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.block.TANBlocks; +import toughasnails.api.item.TANItems; +import toughasnails.block.RainCollectorBlock; +import toughasnails.init.ModTags; + +public class EmptyDiamondCanteenItem extends Item +{ + public EmptyDiamondCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos)) + { + BlockState state = world.getBlockState(pos); + + if (state.getBlock() instanceof RainCollectorBlock) + { + // Fill the canteen from purified water from a rain collector + int waterLevel = state.getValue(RainCollectorBlock.LEVEL); + + if (waterLevel > 0 && !world.isClientSide()) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + ((RainCollectorBlock) TANBlocks.RAIN_COLLECTOR).setWaterLevel(world, pos, state, waterLevel - 1); + return InteractionResultHolder.success(this.replaceCanteen(stack, player, new ItemStack(TANItems.DIAMOND_PURIFIED_WATER_CANTEEN))); + } + } + else if (world.getFluidState(pos).is(FluidTags.WATER)) + { + // Fill the canteen with water in the world + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + + Holder biome = player.level().getBiome(player.blockPosition()); + Item canteenItem; + + if (biome.is(ModTags.Biomes.DIRTY_WATER_BIOMES)) + { + canteenItem = TANItems.DIAMOND_DIRTY_WATER_CANTEEN; + } + else if (biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) + { + canteenItem = TANItems.DIAMOND_PURIFIED_WATER_CANTEEN; + } + else + { + canteenItem = TANItems.DIAMOND_WATER_CANTEEN; + } + + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(canteenItem)), world.isClientSide()); + } + } + } + + return InteractionResultHolder.pass(stack); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } +} diff --git a/common/src/main/java/toughasnails/item/EmptyCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyGoldCanteenItem.java similarity index 90% rename from common/src/main/java/toughasnails/item/EmptyCanteenItem.java rename to common/src/main/java/toughasnails/item/EmptyGoldCanteenItem.java index 25e4c072..b785b560 100644 --- a/common/src/main/java/toughasnails/item/EmptyCanteenItem.java +++ b/common/src/main/java/toughasnails/item/EmptyGoldCanteenItem.java @@ -27,9 +27,9 @@ import toughasnails.block.RainCollectorBlock; import toughasnails.init.ModTags; -public class EmptyCanteenItem extends Item +public class EmptyGoldCanteenItem extends Item { - public EmptyCanteenItem(Properties properties) + public EmptyGoldCanteenItem(Properties properties) { super(properties); } @@ -57,7 +57,7 @@ public InteractionResultHolder use(Level world, Player player, Intera { world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); ((RainCollectorBlock) TANBlocks.RAIN_COLLECTOR).setWaterLevel(world, pos, state, waterLevel - 1); - return InteractionResultHolder.success(this.replaceCanteen(stack, player, new ItemStack(TANItems.PURIFIED_WATER_CANTEEN))); + return InteractionResultHolder.success(this.replaceCanteen(stack, player, new ItemStack(TANItems.GOLD_PURIFIED_WATER_CANTEEN))); } } else if (world.getFluidState(pos).is(FluidTags.WATER)) @@ -70,15 +70,15 @@ else if (world.getFluidState(pos).is(FluidTags.WATER)) if (biome.is(ModTags.Biomes.DIRTY_WATER_BIOMES)) { - canteenItem = TANItems.DIRTY_WATER_CANTEEN; + canteenItem = TANItems.GOLD_DIRTY_WATER_CANTEEN; } else if (biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) { - canteenItem = TANItems.PURIFIED_WATER_CANTEEN; + canteenItem = TANItems.GOLD_PURIFIED_WATER_CANTEEN; } else { - canteenItem = TANItems.WATER_CANTEEN; + canteenItem = TANItems.GOLD_WATER_CANTEEN; } return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(canteenItem)), world.isClientSide()); diff --git a/common/src/main/java/toughasnails/item/EmptyIronCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyIronCanteenItem.java new file mode 100644 index 00000000..bb2c4c03 --- /dev/null +++ b/common/src/main/java/toughasnails/item/EmptyIronCanteenItem.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.block.TANBlocks; +import toughasnails.api.item.TANItems; +import toughasnails.block.RainCollectorBlock; +import toughasnails.init.ModTags; + +public class EmptyIronCanteenItem extends Item +{ + public EmptyIronCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos)) + { + BlockState state = world.getBlockState(pos); + + if (state.getBlock() instanceof RainCollectorBlock) + { + // Fill the canteen from purified water from a rain collector + int waterLevel = state.getValue(RainCollectorBlock.LEVEL); + + if (waterLevel > 0 && !world.isClientSide()) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + ((RainCollectorBlock) TANBlocks.RAIN_COLLECTOR).setWaterLevel(world, pos, state, waterLevel - 1); + return InteractionResultHolder.success(this.replaceCanteen(stack, player, new ItemStack(TANItems.IRON_PURIFIED_WATER_CANTEEN))); + } + } + else if (world.getFluidState(pos).is(FluidTags.WATER)) + { + // Fill the canteen with water in the world + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + + Holder biome = player.level().getBiome(player.blockPosition()); + Item canteenItem; + + if (biome.is(ModTags.Biomes.DIRTY_WATER_BIOMES)) + { + canteenItem = TANItems.IRON_DIRTY_WATER_CANTEEN; + } + else if (biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) + { + canteenItem = TANItems.IRON_PURIFIED_WATER_CANTEEN; + } + else + { + canteenItem = TANItems.IRON_WATER_CANTEEN; + } + + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(canteenItem)), world.isClientSide()); + } + } + } + + return InteractionResultHolder.pass(stack); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } +} diff --git a/common/src/main/java/toughasnails/item/EmptyLeatherCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyLeatherCanteenItem.java new file mode 100644 index 00000000..b6a8f895 --- /dev/null +++ b/common/src/main/java/toughasnails/item/EmptyLeatherCanteenItem.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.block.TANBlocks; +import toughasnails.api.item.TANItems; +import toughasnails.block.RainCollectorBlock; +import toughasnails.init.ModTags; + +public class EmptyLeatherCanteenItem extends Item +{ + public EmptyLeatherCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos)) + { + BlockState state = world.getBlockState(pos); + + if (state.getBlock() instanceof RainCollectorBlock) + { + // Fill the canteen from purified water from a rain collector + int waterLevel = state.getValue(RainCollectorBlock.LEVEL); + + if (waterLevel > 0 && !world.isClientSide()) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + ((RainCollectorBlock) TANBlocks.RAIN_COLLECTOR).setWaterLevel(world, pos, state, waterLevel - 1); + return InteractionResultHolder.success(this.replaceCanteen(stack, player, new ItemStack(TANItems.LEATHER_PURIFIED_WATER_CANTEEN))); + } + } + else if (world.getFluidState(pos).is(FluidTags.WATER)) + { + // Fill the canteen with water in the world + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + + Holder biome = player.level().getBiome(player.blockPosition()); + Item canteenItem; + + if (biome.is(ModTags.Biomes.DIRTY_WATER_BIOMES)) + { + canteenItem = TANItems.LEATHER_DIRTY_WATER_CANTEEN; + } + else if (biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) + { + canteenItem = TANItems.LEATHER_PURIFIED_WATER_CANTEEN; + } + else + { + canteenItem = TANItems.LEATHER_WATER_CANTEEN; + } + + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(canteenItem)), world.isClientSide()); + } + } + } + + return InteractionResultHolder.pass(stack); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } +} diff --git a/common/src/main/java/toughasnails/item/EmptyNetheriteCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyNetheriteCanteenItem.java new file mode 100644 index 00000000..fe27b107 --- /dev/null +++ b/common/src/main/java/toughasnails/item/EmptyNetheriteCanteenItem.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.block.TANBlocks; +import toughasnails.api.item.TANItems; +import toughasnails.block.RainCollectorBlock; +import toughasnails.init.ModTags; + +public class EmptyNetheriteCanteenItem extends Item +{ + public EmptyNetheriteCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos)) + { + BlockState state = world.getBlockState(pos); + + if (state.getBlock() instanceof RainCollectorBlock) + { + // Fill the canteen from purified water from a rain collector + int waterLevel = state.getValue(RainCollectorBlock.LEVEL); + + if (waterLevel > 0 && !world.isClientSide()) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + ((RainCollectorBlock) TANBlocks.RAIN_COLLECTOR).setWaterLevel(world, pos, state, waterLevel - 1); + return InteractionResultHolder.success(this.replaceCanteen(stack, player, new ItemStack(TANItems.NETHERITE_PURIFIED_WATER_CANTEEN))); + } + } + else if (world.getFluidState(pos).is(FluidTags.WATER)) + { + // Fill the canteen with water in the world + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + + Holder biome = player.level().getBiome(player.blockPosition()); + Item canteenItem; + + if (biome.is(ModTags.Biomes.DIRTY_WATER_BIOMES)) + { + canteenItem = TANItems.NETHERITE_DIRTY_WATER_CANTEEN; + } + else if (biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) + { + canteenItem = TANItems.NETHERITE_PURIFIED_WATER_CANTEEN; + } + else + { + canteenItem = TANItems.NETHERITE_WATER_CANTEEN; + } + + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(canteenItem)), world.isClientSide()); + } + } + } + + return InteractionResultHolder.pass(stack); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } +} diff --git a/common/src/main/java/toughasnails/item/FilledCanteenItem.java b/common/src/main/java/toughasnails/item/FilledCopperCanteenItem.java similarity index 91% rename from common/src/main/java/toughasnails/item/FilledCanteenItem.java rename to common/src/main/java/toughasnails/item/FilledCopperCanteenItem.java index 4a4cdf7b..cc6dedcc 100644 --- a/common/src/main/java/toughasnails/item/FilledCanteenItem.java +++ b/common/src/main/java/toughasnails/item/FilledCopperCanteenItem.java @@ -17,16 +17,15 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemUtils; import net.minecraft.world.item.UseAnim; -import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import toughasnails.api.item.TANItems; -public class FilledCanteenItem extends Item +public class FilledCopperCanteenItem extends Item { - public FilledCanteenItem(Properties properties) + public FilledCopperCanteenItem(Properties properties) { super(properties); } @@ -44,7 +43,7 @@ public InteractionResultHolder use(Level world, Player player, Intera if (world.mayInteract(player, pos) && world.getFluidState(pos).is(FluidTags.WATER)) { world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); - return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(TANItems.WATER_CANTEEN)), world.isClientSide()); + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(TANItems.COPPER_WATER_CANTEEN)), world.isClientSide()); } } @@ -75,7 +74,7 @@ public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity en stack.hurtAndBreak(1, player, (entity) -> broken[0] = true); if (broken[0]) { - return new ItemStack(TANItems.EMPTY_CANTEEN); + return new ItemStack(TANItems.EMPTY_COPPER_CANTEEN); } } diff --git a/common/src/main/java/toughasnails/item/FilledDiamondCanteenItem.java b/common/src/main/java/toughasnails/item/FilledDiamondCanteenItem.java new file mode 100644 index 00000000..92140d90 --- /dev/null +++ b/common/src/main/java/toughasnails/item/FilledDiamondCanteenItem.java @@ -0,0 +1,101 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.item.TANItems; + +public class FilledDiamondCanteenItem extends Item +{ + public FilledDiamondCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos) && world.getFluidState(pos).is(FluidTags.WATER)) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(TANItems.DIAMOND_WATER_CANTEEN)), world.isClientSide()); + } + } + + return ItemUtils.startUsingInstantly(world, player, hand); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity entityLiving) + { + Player player = entityLiving instanceof Player ? (Player)entityLiving : null; + + // Do nothing if this isn't a player + if (player == null) + return stack; + + player.awardStat(Stats.ITEM_USED.get(this)); + + // Damage the item if we're on the server and the player isn't in creative mode + if (!worldIn.isClientSide && !player.getAbilities().instabuild) + { + boolean[] broken = new boolean[]{false}; + stack.hurtAndBreak(1, player, (entity) -> broken[0] = true); + if (broken[0]) + { + return new ItemStack(TANItems.EMPTY_DIAMOND_CANTEEN); + } + } + + return stack; + } + + @Override + public int getUseDuration(ItemStack stack) + { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) + { + return UseAnim.DRINK; + } + + @Override + public boolean isEnchantable(ItemStack stack) + { + return false; + } +} diff --git a/common/src/main/java/toughasnails/item/FilledGoldCanteenItem.java b/common/src/main/java/toughasnails/item/FilledGoldCanteenItem.java new file mode 100644 index 00000000..a6f5b942 --- /dev/null +++ b/common/src/main/java/toughasnails/item/FilledGoldCanteenItem.java @@ -0,0 +1,101 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.item.TANItems; + +public class FilledGoldCanteenItem extends Item +{ + public FilledGoldCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos) && world.getFluidState(pos).is(FluidTags.WATER)) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(TANItems.GOLD_WATER_CANTEEN)), world.isClientSide()); + } + } + + return ItemUtils.startUsingInstantly(world, player, hand); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity entityLiving) + { + Player player = entityLiving instanceof Player ? (Player)entityLiving : null; + + // Do nothing if this isn't a player + if (player == null) + return stack; + + player.awardStat(Stats.ITEM_USED.get(this)); + + // Damage the item if we're on the server and the player isn't in creative mode + if (!worldIn.isClientSide && !player.getAbilities().instabuild) + { + boolean[] broken = new boolean[]{false}; + stack.hurtAndBreak(1, player, (entity) -> broken[0] = true); + if (broken[0]) + { + return new ItemStack(TANItems.EMPTY_GOLD_CANTEEN); + } + } + + return stack; + } + + @Override + public int getUseDuration(ItemStack stack) + { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) + { + return UseAnim.DRINK; + } + + @Override + public boolean isEnchantable(ItemStack stack) + { + return false; + } +} diff --git a/common/src/main/java/toughasnails/item/FilledIronCanteenItem.java b/common/src/main/java/toughasnails/item/FilledIronCanteenItem.java new file mode 100644 index 00000000..a0fe8f3d --- /dev/null +++ b/common/src/main/java/toughasnails/item/FilledIronCanteenItem.java @@ -0,0 +1,101 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.item.TANItems; + +public class FilledIronCanteenItem extends Item +{ + public FilledIronCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos) && world.getFluidState(pos).is(FluidTags.WATER)) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(TANItems.IRON_WATER_CANTEEN)), world.isClientSide()); + } + } + + return ItemUtils.startUsingInstantly(world, player, hand); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity entityLiving) + { + Player player = entityLiving instanceof Player ? (Player)entityLiving : null; + + // Do nothing if this isn't a player + if (player == null) + return stack; + + player.awardStat(Stats.ITEM_USED.get(this)); + + // Damage the item if we're on the server and the player isn't in creative mode + if (!worldIn.isClientSide && !player.getAbilities().instabuild) + { + boolean[] broken = new boolean[]{false}; + stack.hurtAndBreak(1, player, (entity) -> broken[0] = true); + if (broken[0]) + { + return new ItemStack(TANItems.EMPTY_IRON_CANTEEN); + } + } + + return stack; + } + + @Override + public int getUseDuration(ItemStack stack) + { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) + { + return UseAnim.DRINK; + } + + @Override + public boolean isEnchantable(ItemStack stack) + { + return false; + } +} diff --git a/common/src/main/java/toughasnails/item/FilledLeatherCanteenItem.java b/common/src/main/java/toughasnails/item/FilledLeatherCanteenItem.java new file mode 100644 index 00000000..6d203f5e --- /dev/null +++ b/common/src/main/java/toughasnails/item/FilledLeatherCanteenItem.java @@ -0,0 +1,101 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.item.TANItems; + +public class FilledLeatherCanteenItem extends Item +{ + public FilledLeatherCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos) && world.getFluidState(pos).is(FluidTags.WATER)) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(TANItems.LEATHER_WATER_CANTEEN)), world.isClientSide()); + } + } + + return ItemUtils.startUsingInstantly(world, player, hand); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity entityLiving) + { + Player player = entityLiving instanceof Player ? (Player)entityLiving : null; + + // Do nothing if this isn't a player + if (player == null) + return stack; + + player.awardStat(Stats.ITEM_USED.get(this)); + + // Damage the item if we're on the server and the player isn't in creative mode + if (!worldIn.isClientSide && !player.getAbilities().instabuild) + { + boolean[] broken = new boolean[]{false}; + stack.hurtAndBreak(1, player, (entity) -> broken[0] = true); + if (broken[0]) + { + return new ItemStack(TANItems.EMPTY_LEATHER_CANTEEN); + } + } + + return stack; + } + + @Override + public int getUseDuration(ItemStack stack) + { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) + { + return UseAnim.DRINK; + } + + @Override + public boolean isEnchantable(ItemStack stack) + { + return false; + } +} diff --git a/common/src/main/java/toughasnails/item/FilledNetheriteCanteenItem.java b/common/src/main/java/toughasnails/item/FilledNetheriteCanteenItem.java new file mode 100644 index 00000000..40fb4295 --- /dev/null +++ b/common/src/main/java/toughasnails/item/FilledNetheriteCanteenItem.java @@ -0,0 +1,101 @@ +/******************************************************************************* + * Copyright 2021, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; +import net.minecraft.tags.FluidTags; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemUtils; +import net.minecraft.world.item.UseAnim; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import toughasnails.api.item.TANItems; + +public class FilledNetheriteCanteenItem extends Item +{ + public FilledNetheriteCanteenItem(Properties properties) + { + super(properties); + } + + @Override + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) + { + ItemStack stack = player.getItemInHand(hand); + HitResult rayTraceResult = getPlayerPOVHitResult(world, player, ClipContext.Fluid.SOURCE_ONLY); + + if (rayTraceResult.getType() == HitResult.Type.BLOCK) + { + BlockPos pos = ((BlockHitResult)rayTraceResult).getBlockPos(); + + if (world.mayInteract(player, pos) && world.getFluidState(pos).is(FluidTags.WATER)) + { + world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BOTTLE_FILL, SoundSource.NEUTRAL, 1.0F, 1.0F); + return InteractionResultHolder.sidedSuccess(this.replaceCanteen(stack, player, new ItemStack(TANItems.NETHERITE_WATER_CANTEEN)), world.isClientSide()); + } + } + + return ItemUtils.startUsingInstantly(world, player, hand); + } + + protected ItemStack replaceCanteen(ItemStack oldStack, Player player, ItemStack newStack) + { + player.awardStat(Stats.ITEM_USED.get(this)); + return ItemUtils.createFilledResult(oldStack, player, newStack); + } + + @Override + public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity entityLiving) + { + Player player = entityLiving instanceof Player ? (Player)entityLiving : null; + + // Do nothing if this isn't a player + if (player == null) + return stack; + + player.awardStat(Stats.ITEM_USED.get(this)); + + // Damage the item if we're on the server and the player isn't in creative mode + if (!worldIn.isClientSide && !player.getAbilities().instabuild) + { + boolean[] broken = new boolean[]{false}; + stack.hurtAndBreak(1, player, (entity) -> broken[0] = true); + if (broken[0]) + { + return new ItemStack(TANItems.EMPTY_NETHERITE_CANTEEN); + } + } + + return stack; + } + + @Override + public int getUseDuration(ItemStack stack) + { + return 32; + } + + @Override + public UseAnim getUseAnimation(ItemStack stack) + { + return UseAnim.DRINK; + } + + @Override + public boolean isEnchantable(ItemStack stack) + { + return false; + } +} diff --git a/common/src/main/resources/assets/toughasnails/lang/en_us.json b/common/src/main/resources/assets/toughasnails/lang/en_us.json index b2b4e786..fff5d4fe 100644 --- a/common/src/main/resources/assets/toughasnails/lang/en_us.json +++ b/common/src/main/resources/assets/toughasnails/lang/en_us.json @@ -33,22 +33,42 @@ "item.toughasnails.apple_juice": "Apple Juice", "item.toughasnails.cactus_juice": "Cactus Juice", "item.toughasnails.chorus_fruit_juice": "Chorus Fruit Juice", + "item.toughasnails.copper_dirty_water_canteen": "Copper Dirty Water Canteen", + "item.toughasnails.copper_purified_water_canteen": "Copper Purified Water Canteen", + "item.toughasnails.copper_water_canteen": "Copper Water Canteen", + "item.toughasnails.diamond_dirty_water_canteen": "Diamond Dirty Water Canteen", + "item.toughasnails.diamond_purified_water_canteen": "Diamond Purified Water Canteen", + "item.toughasnails.diamond_water_canteen": "Diamond Water Canteen", "item.toughasnails.dirty_water_bottle": "Dirty Water Bottle", - "item.toughasnails.dirty_water_canteen": "Dirty Water Canteen", - "item.toughasnails.empty_canteen": "Empty Canteen", + "item.toughasnails.empty_copper_canteen": "Empty Copper Canteen", + "item.toughasnails.empty_diamond_canteen": "Empty Diamond Canteen", + "item.toughasnails.empty_gold_canteen": "Empty Gold Canteen", + "item.toughasnails.empty_iron_canteen": "Empty Iron Canteen", + "item.toughasnails.empty_leather_canteen": "Empty Leather Canteen", + "item.toughasnails.empty_netherite_canteen": "Empty Netherite Canteen", "item.toughasnails.glow_berry_juice": "Glow Berry Juice", + "item.toughasnails.gold_dirty_water_canteen": "Gold Dirty Water Canteen", + "item.toughasnails.gold_purified_water_canteen": "Gold Purified Water Canteen", + "item.toughasnails.gold_water_canteen": "Gold Water Canteen", + "item.toughasnails.iron_dirty_water_canteen": "Iron Dirty Water Canteen", + "item.toughasnails.iron_purified_water_canteen": "Iron Purified Water Canteen", + "item.toughasnails.iron_water_canteen": "Iron Water Canteen", "item.toughasnails.leaf_boots": "Leaf Greaves", "item.toughasnails.leaf_chestplate": "Leaf Poncho", "item.toughasnails.leaf_helmet": "Leaf Veil", "item.toughasnails.leaf_leggings": "Leaf Pants", + "item.toughasnails.leather_dirty_water_canteen": "Leather Dirty Water Canteen", + "item.toughasnails.leather_purified_water_canteen": "Leather Purified Water Canteen", + "item.toughasnails.leather_water_canteen": "Leather Water Canteen", "item.toughasnails.melon_juice": "Melon Juice", + "item.toughasnails.netherite_dirty_water_canteen": "Netherite Dirty Water Canteen", + "item.toughasnails.netherite_purified_water_canteen": "Netherite Purified Water Canteen", + "item.toughasnails.netherite_water_canteen": "Netherite Water Canteen", "item.toughasnails.pumpkin_juice": "Pumpkin Juice", "item.toughasnails.purified_water_bottle": "Purified Water Bottle", - "item.toughasnails.purified_water_canteen": "Purified Water Canteen", "item.toughasnails.sweet_berry_juice": "Sweet Berry Juice", "item.toughasnails.tan_icon": "TAN Icon", "item.toughasnails.thermometer": "Thermometer", - "item.toughasnails.water_canteen": "Water Canteen", "item.toughasnails.wool_boots": "Wool Boots", "item.toughasnails.wool_chestplate": "Wool Parka", "item.toughasnails.wool_helmet": "Wool Hood", diff --git a/common/src/main/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json new file mode 100644 index 00000000..9c7dd43a --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/copper_dirty_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json new file mode 100644 index 00000000..892cece4 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/copper_purified_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/copper_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/copper_water_canteen.json new file mode 100644 index 00000000..0f46a2c5 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/copper_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/copper_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json new file mode 100644 index 00000000..8e7e09d4 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/diamond_dirty_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json new file mode 100644 index 00000000..28dcf268 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/diamond_purified_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/diamond_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/diamond_water_canteen.json new file mode 100644 index 00000000..b5de79a6 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/diamond_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/diamond_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_copper_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_copper_canteen.json new file mode 100644 index 00000000..60e53d9a --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/empty_copper_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/empty_copper_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_diamond_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_diamond_canteen.json new file mode 100644 index 00000000..4b46aec1 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/empty_diamond_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/empty_diamond_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_gold_canteen.json similarity index 51% rename from common/src/main/resources/assets/toughasnails/models/item/empty_canteen.json rename to common/src/main/resources/assets/toughasnails/models/item/empty_gold_canteen.json index 456420b0..3e22f982 100644 --- a/common/src/main/resources/assets/toughasnails/models/item/empty_canteen.json +++ b/common/src/main/resources/assets/toughasnails/models/item/empty_gold_canteen.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "toughasnails:item/empty_canteen" + "layer0": "toughasnails:item/empty_gold_canteen" } } diff --git a/common/src/main/resources/assets/toughasnails/models/item/water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_iron_canteen.json similarity index 51% rename from common/src/main/resources/assets/toughasnails/models/item/water_canteen.json rename to common/src/main/resources/assets/toughasnails/models/item/empty_iron_canteen.json index ba7d92f5..a7ec0b2e 100644 --- a/common/src/main/resources/assets/toughasnails/models/item/water_canteen.json +++ b/common/src/main/resources/assets/toughasnails/models/item/empty_iron_canteen.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "toughasnails:item/water_canteen" + "layer0": "toughasnails:item/empty_iron_canteen" } } diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_leather_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_leather_canteen.json new file mode 100644 index 00000000..bf3dc11b --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/empty_leather_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/empty_leather_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_netherite_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_netherite_canteen.json new file mode 100644 index 00000000..dc640366 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/empty_netherite_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/empty_netherite_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json new file mode 100644 index 00000000..3a4faf16 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/gold_dirty_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json new file mode 100644 index 00000000..e2f3e700 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/gold_purified_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/gold_water_canteen.json similarity index 50% rename from common/src/main/resources/assets/toughasnails/models/item/dirty_water_canteen.json rename to common/src/main/resources/assets/toughasnails/models/item/gold_water_canteen.json index 52e7064e..1fc35061 100644 --- a/common/src/main/resources/assets/toughasnails/models/item/dirty_water_canteen.json +++ b/common/src/main/resources/assets/toughasnails/models/item/gold_water_canteen.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "toughasnails:item/dirty_water_canteen" + "layer0": "toughasnails:item/gold_water_canteen" } } diff --git a/common/src/main/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json new file mode 100644 index 00000000..45aae4f2 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/iron_dirty_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json new file mode 100644 index 00000000..f208f844 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/iron_purified_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/iron_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/iron_water_canteen.json new file mode 100644 index 00000000..b7f8312c --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/iron_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/iron_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json new file mode 100644 index 00000000..de876127 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/leather_dirty_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json new file mode 100644 index 00000000..b6875529 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/leather_purified_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/leather_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/leather_water_canteen.json new file mode 100644 index 00000000..66fd603d --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/leather_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/leather_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json new file mode 100644 index 00000000..2e07b5a9 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/netherite_dirty_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json new file mode 100644 index 00000000..8d023cc3 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/netherite_purified_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/netherite_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/netherite_water_canteen.json new file mode 100644 index 00000000..f1d76fe5 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/models/item/netherite_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "toughasnails:item/netherite_water_canteen" + } +} diff --git a/common/src/main/resources/assets/toughasnails/models/item/purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/purified_water_canteen.json deleted file mode 100644 index 435c4374..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/purified_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/purified_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/textures/item/copper_dirty_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/copper_dirty_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..9009a95d924cbd455ad6e1f086351c4a5d2b0d68 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|-ody}m8W@*H0OPq`|T@WU?)Kl$cRgjN@K!?5BpP5b8UN&k5>WS4U z-toRb9i?4`GC+#IB*-uLKMG*Da%aXupcH3;M`SSr1K)lSX0%`pRsjlTdb&7zYwM{kQz~zzv%(|M9rDU|Yr0#<0t5^JGoed|^oOVrpQvx+26Nx;5?G zyamYtyF@q4e?H~0)&!RSHQ(Dla2>2;U3bVYA-;c>_Tf0`#Aj!IDJKS9<*l!DJi=Q! Xm8<@d%lB(QOBp;}{an^LB{Ts5EbnYz literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/copper_purified_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/copper_purified_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..fa5ee61b527f8bb21a4d433da7712db61af2ed51 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|-ody}m8W@*H0OPq`|T@WU?)Kl$cRgjN@K!?5BpP5bCEwf}olihFq zH(zlSs6#w%!xJFIUlQaO{2v7{T)8u2AyA65z$3Dlfq`#72s2u+2CD!CGd*1#Lo|Y8 z&jtz|QQ%+>;C0O?pZ;5Zd*Fu6m;ZR&Td=L-X=B)Bwt2FqYrZg~cri6FTU`-i5Z#(~ zZr+0AfL)>+=0BhESZe~y|C;Y@AGi+Iv93Ghmk{4SOZ#w~bmFr!zmyY$uJYDbIv(Mz XoXS=I$mRPrprs6+u6{1-oD!MNS%G}r0G|-ody}m8W@*H0OPq`|T@WU?)Kl$cRgjN@K!?5BpP5Zc78PPDz80~^ zv^{15b?o01vH(c&mjw9*|3?7~SMJPM2$bS1@Q5sCVBp&i!i*NI!74z(Oivfb5RKs2 zvw=cK6gZdzcwIBfr~j7U9=Kui9gFQx`&t1ChbqFd9> z&0CNhuuF8q{O401YfWJJU-O;!A=kk=)^&&c65{)3X&;W$PJDLemvUmzRo?na$0NLz XzFc)(#}XC;EoJa@^>bP0l+XkK%O7kC literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/diamond_dirty_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/diamond_dirty_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..5bea68a5b2f6421b788bf2ac96529dab04557347 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|-o`Lh@f?c?IJH}iUXGe3u4;pon7$}Pb7_Quzu@ET5S>O>_%)r36AA}h#Sc6r7f?1v}jv*Ss zv1bE?S`0Xt19*Z8?mqo@+*EYe;~Da^%(qOfdCI@(>zavcnkpj{IA2U*VzADcA?x&ELx%xgY&m$NN;Y>A%#WDRU3h*}qEUsm@NS%G}r0G|-o`Lh@f?c?IJH}iUXGe3u4;po#I z{+q8j3e@o|M!611@s|Yo1p{S~0K=6#GZq4+I14-?iy0XB_Jc5^1#7ShP%z8W#W6%9 zIQDFyP>TTva{y0J!QH3-j+=_^dOSmZmid;cHBb3BeO)tgO;crr0_Tev*4vHvN}6G-d9AI{R0NJk|M2stvx&vrgWnSMh{( Zrg-Hku6oZ%18JbG44$rjF6*2UngDtdZy5jp literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/diamond_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/diamond_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..87a2b676015a99574fe00d38758f3851d0d86a0e GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|-o`Lh@f?c?IJH}iUXGe3u4;po?k zW7-}wfjay)9Jc~e{3Stt!9ZCgz;NZxjDz3)qFF-QR6@sgNLAx@QJhuGp0}CXjZV7pRsMK zV1x7_j->|~(yTltwi%co?%f_Q`7FNf*oKTsUFVn--=LZwR&%vzn*d~nu9#yct#-Wr@e@!;=q|AOf|B32r_`E}@ELCI~wH+l>= zJGdL>?Ei8toz2vlcLfK_0ttpqoGHpY3Y#4r{+#u03-^z6suXBQI`G+Ia?M3=PZk}%um%>1g(eaQL>ff0If{+%RQ#Tr`0r^tPxrLzMn_!DjDMWyHp;2| zG3()n$@~Si5_$}o+d?L#2t0YtEInz3HtV&RP-&iPJ$w(;8gtq+-PqpS*EQ`va@31e zr|jn=oFAlo0nXEU{<%!Q^}lEmIL=(4H;5|Pq;}qq#b5BF;(Gx z;~qAn7D=sh3seu?RXA|w)Q7+KNS%G}T0G|-ocx{OVVS-CN)lSBl`X~t8n`G5tulBMkXm6IrpP5ZSRgcpm#eo!e zNswRge>h<9@@M=66y_}Oh%9Dc;M)(vj25iHDnP*mPZ!4!jo_(g1Njapa4-k7@R`4_ zf3S7Y$w&94k{-AoJvPxk;p)1}Yi6F0YoFQv*eR*`yWh@@4WB=IL|s18)zrfJ%I!nv zf!)p%NS%G}T0G|+7K6|tL9DaqPTfN@ipMb)g1s;*b3=Dh+K$tP>S|=w^Fu~KsF+?MH>e)cP0}33>0WEyy z@9Q6IU3Bu%eW|1eu1Akev`@IY?(&+M=i}OEwm)`CYX0uGb7RBj&mK{ik90M)u)cEp z(0O3D^8~p$oWG_SOgNXpp3O9ArZtyK_MHzW8I$+0_Os^&MV*oW+Qs1M>gTe~DWM4f D=1*om literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/empty_gold_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/empty_gold_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..529d4d7171c680a66d941726aafec95f81c842a2 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}T0G|-ordY8|dBv9-MPI!Ox7Xua%Fb|Sn(*KMWlh|y|Ns97s&ak2KORVN zmjw9*14W>K!ONfV6Hu75z$3Dlfr0M;2s36~>*NFqCV09yhG+y&JsZe(K!JlfpoP!; zef@*2i%veeFO~Gb_2{vQ_6b+lU0yTud|dm?_Qy_1&ENfYZfyAc*(2)mk*=l|)>m#H zIuGo2o**}e^Vc+k3Fk7{vzaE%wB~ZjzVqQEWAYx>e)hbes8bR^yBIuO{an^LB{Ts5 Dtutlj literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/empty_iron_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/empty_iron_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..180047a999369b621bbc2aa45a42c1995a496670 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}T0G|+7U0q#UGmmN0rX4$WOj1%ZIkY@GJNw3s8@`Tl|Ns97s)}>ECJUsv zOM?7@fg(`A;N{Qw2`J22;1OBOz`(a3gc&VZgH?cn37#&FAsWF`&j#`xP~cz=XyG$| zU;kk1qLYvAOC>#UJ$h`SeZtjsm)FcZAJ;y!{jpP0^LM|U8yh}<_K3QCq^qfg^_AO) z&I7xhC&XZb~E(T9mKbLh*2~7av C9b{|( literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/empty_leather_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/empty_leather_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..dde1eedeb22861b4cf9016d15bc606cd69c7ad72 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}H0G|+7V+GO1Fq2qo)qFP{MN!`ShkM<1Wg7yGx6e!lD)DWPngOJ^N`m}? z|HA;orZYO{fufuR9+AZi415Pbm@(^GCnr!a&eO#)L?d|W*+8xX1{}-*t7p#rzW;;J z?L#;2yBx9c+WPB?{D!UXGR@9ZUpM$%5aS{9!BW%QOk;b`!XtgGoZM@~rwIHg;keX1 wb3s05Yss{{4bl_V?Az$D<#A(p?SfZ~tCq2yaTh-w4z!8E)78&qol`;+0M3(LkN^Mx literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/empty_netherite_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/empty_netherite_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..84c16d80242a9a40b5ad67f0c182c21d62fb4e84 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}@0G|+76?p}BEiH3Xb9Xy?Ur%3gLBV2IXH#9>*s$0H6Qi=MG9O20pxV!G z8b1Ij-jX1{;QvT~!S;nx8&HC?z$3Dlfq`#72s2u+2CD!CQ$1ZALo|Y?_TJ`eFyL^O z448T9fBpK@=|_H~IeSzm_EgpbkC-mF8=!FIZm)FdGzGz|sV|T9K53Dv_X)^2${Y8q;SBqYQykwp*w?WEEoAU? L^>bP0l+XkK6whLb literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/gold_dirty_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/gold_dirty_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..16a5717137a91eedcc2651f0d435b7a9acbb3dd0 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|-oCT`ZH>bU2*b}^9RFA4Gs2FfANS%G}r0G|-oCT`ZH>8+#oE^Aqg*G=DF5; Z6t6tRRqq*TAPuyY!PC{xWt~$(69Cs(ZfpPm literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/gold_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/gold_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..4f61bac52c1093cea4e696566f5bbe8ece61d851 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|-oCT`ZH>3p^r=85sEXgD|57Yp@DXFw4`$F+?Lc z_H3X~ivb6708dcC-KYPKn~LswJVSn#`O>L1Px&`}T{Ce_Q)Pq#=Zh&!4Awa_#2J=7 zo6TO`*y|{mpJ3mo`Fpt|_oF}Sq)&-9{g*m4W$uAG`&WrP)$5m38+?~%oxDr0;tA_a Z@yaHyx+tGREkIitJYD@<);T3K0RWv(Y%u@; literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/iron_dirty_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/iron_dirty_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..d820642b4d28258a27af41847f3c56c74252a64c GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|+7U&pxQ&~jZ}-DAg&*_wGwn>OvnjT@4ZlG)kW|NsBD_OekkP*1E* z@s9Te>Uh_}xdKS>mjw9*17(o_!<9QT76PR>3p^r=85sEXgD|57Yp@DXFw4`$F+?Lc z_H3X~ivb6708dcC-KYPKn~LswJVSn#`If0QPx&`}T{Ce_Q)Pq#=Zh&!4Awa_#2J=7 zo6TO`*y|{mpJ3mo`Fpt|_oF}Sc%OPTr+g@q~4z Yc;zXsde2A$X`rnPp00i_>zopr09{3FTmS$7 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/iron_purified_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/iron_purified_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..f206fbe74ac92179bd2174e073a0e3b4f0925883 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|+7U&pxQ&~jZ}-DAg&*_wGwn>OvnjT@4ZlG)kW|NsBjZkZ($n(Th- zzxj%zKpi~+Cjx*Je@T#EFi;i=FkHDaVL!4pR zv)Sy`jlGV7`3d%Yn!lGjazFaBj`yi((|@T$Q|2D1vwxMyQ=Px0+Tgo9>*QT}6;D`a ZidUZEs`rdEkOtby;OXk;vd$@?2>=KfZkYf8 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/iron_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/iron_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..16fe2924204be17d37c269853ffec78165815de4 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}r0G|+7U&pxQ&~jZ}-DAg&*_wGwn>OvnjT@4ZlG)kW|NsA2vZxSK@wJFO zrtL8ks6%CsjtG$AFA4Gs2FfAU$ literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/leather_dirty_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/leather_dirty_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..c33d4362c95691bbf82706e6fc804bd9b81d23f6 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}50G|-o?K6|_AMQ0)5Y2bfX$&)owN`BiG*%Slb=Q@(_OekkP*1E*@s9Te zDlhuMtOca_N`m}?|04qi*8_J>0A)A}JR*yM3ig9AqXlcQ3Q#b^)5S4FBRKYKAm3pF z4(5O?uLW;+{4agZV&wak|D!P1r1gIs`sSHV3N?_IR$-hQ#PFbn_cPOhD}O#D=x;F8 zc*MI|-*P>hZpZJN(juxqmMi+)K5v%ExnF)iGo7 Q1KP>p>FVdQ&MBb@01^seu>b%7 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/leather_purified_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/leather_purified_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..0a410e3d1c32d9de8857f4f05db8ff442479b2bd GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}50G|-o?K6|_AMQ0)5Y2bfX$&)owN`BiG*%Slb=Q^EZkZ($n(Th-zxj%z zK;;5Dhb{przLFrn;Qz>g!S%qM6F?cx0*}aIpo0A%%xJ+HtO69w@N{tu(Fl$`8_0Lq zfP*<8%WJ{g9sf(8vl#h)<^L$mHEI1HhrW5HlR^#TrBxW`1~EKn;r+~X;L4v53Hloh zH6HP9*0)^GrrYuRrnHFakL8L!H#y(D4(3n3QLTKpIntaEbDMjPmiES9Q!- R{D5{cc)I$ztaD0e0s#DHWL5wG literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/leather_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/leather_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..22288891fcb7c6f8f333bd2603f45cf5ac8a90da GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}50G|-o?K6|_AMQ0)5Y2bfX$&)owN`BiG*%Slb=Q?uvZxSK@wJFOrtL8k zsC>r(wP`?#uO!GX_&+jWa6NG61W<;vz$3C4s9-+`Gg`0)s{jQvJY5_^G=gK#1_~Wf z;9w4r>bg+2^M9#1*Sj|+_A|`8CawSD&^OO?Qm6sHv0}ML4Sjx z#v|U%`j+e2bUS|EG}rL@;O{(Rlkkn}LHx-#etYg>-~3Nw#+A~;@o^J=vdW8dUP;TD RVFI+1!PC{xWt~$(69D|WWsLv; literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/netherite_dirty_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/netherite_dirty_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..56a24f300dc58c5f9380a7e04e8071db4642507c GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}x0G|-o1QVlTS7#M@1s_LecP%Y*Q}fucSa&;naX~>}PhV4A-LkAQYcCr$ z1NFq}6z_OnpgtS#=uRLdSQ6wH{2vW4sIHxv1eD|~@Q5sCVBp&i!i*NI!74z(Tu&Fr z5RKs2v(ZA$1{|ybdrTiLT>GYe>m&!OzCRPH+ZcYX{^t<=HAilufgJaV#`6G~&iVu&s|Mi2_K#LhXUHx3vIVCg!0HaH6WdHyG literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/netherite_purified_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/netherite_purified_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..551d02efa0e90881692d764d0896e9461135cbe2 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}x0G|-o1QVlTS7#M@1s_LecP%Y*Q}fucSa&;naX~>}PhV4A-LkAQ?Uq?G zp~>#I{+q8j3e*=je^w!o5-bVw3;vG=7*yBJOae-B7I;J!GcfS&2Vq7F)?gK&V6LZ& zV~9p@?Ad6cW&;k^fIX%U7p{F%zjcy>Ro|Zp)olzvSO0T}{+c5<(Lj#-MC17hEDY9B z>7EP`k!BlDaNeor@N|6gSYp$B)>#Sn@6WpMW6{|sS{s(FI#c{SM(bL|vsnd#-LuSv g*g|7ItPtOEKgEZ~+yDB(YM{jop00i_>zopr0PYKKZU6uP literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/item/netherite_water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/netherite_water_canteen.png new file mode 100644 index 0000000000000000000000000000000000000000..92ec041b88549240366d4d5adb74cd3a50bdeb3e GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}x0G|-o1QVlTS7#M@1s_LecP%Y*Q}fucSa&;naX~>}PhV4A-LkAQC5s9% z6<>?kW7-}wf%?7`*O>w-!IB`q;QwfVL3QoSB%mZ`fk$L90|VcF5N5Ps4ORgP=6bp~ zhG+!Go{bi2HsD|l*kk%|;o3L#TPHbK_5GPpt;Xz3)qFF-QR6@sgNLAx@QJhuGp0}CXjZV7pRsMK zV1x7_j->|~(yTltwi%co?%f_Q`7FNf*oKTsUFVn--=LZwR&%vzn*d~nu9#yct#-Wr@e@!;=q|AOf|B32r#x#XR^BWiNnT~-C@ zLdFT7)Bj&jpTOze+U3B|#i%gb!R!!&ku-})|N7J)1@9!Lurq3~?fLgbI*-H0xTBxP z&n;pxiwzgMh^@l%u1_1CToo8n40OJn4VU@bpTp6{s34WXVbsuSSM=o|LmLB!g1U&n hfn|jo7}(etxIWgdnmkc+DlqIAJYD@<);T3K0RS-)i?09x diff --git a/common/src/main/resources/assets/toughasnails/textures/item/water_canteen.png b/common/src/main/resources/assets/toughasnails/textures/item/water_canteen.png deleted file mode 100644 index 0e5522203d369a73fd45432b31d9d61dd1beb27b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engPf;}V~B-+@&d~p^*g@Xb2#r@!kE%~J6-KR zf1vnbgAPuwWLEQavCNkhdW(OX8H>z3)qFF-QR6@sgNLAx@QJhuGp0}CXjZV7pRsMK zV1x7_j->|~(yTltwi%co?%f_Q`7FNf*oKTsUFVn--=LZwR&%vzn*d~nu9#yct#-Wr@e@!;=q|AOf|B32sc)I2#<@ZN>JOuQlI z2&==n`Bi?C9DT0xYcVluur=f`-Q-|Cks}cBzi`IG&#zAh$gwPt`0(p;{tiWhvkG=b zJ9a6{sy+y`Snz_;GIUD6C{UL|bK=5$!Rj~vJCBAH)Jm{5WK2*z!65eQ#6@;y2_}Vx jIROp~vyUBQl8|8Nb*oqGJhR0B7<>$#u6{1-oD!M