diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 159078bb..44e82e5f 100644 --- a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,3 +1,5 @@ -// 1.20.6 2024-05-12T09:45:42.581552 Registries +// 1.21 2024-06-15T11:33:35.2140093 Registries 55b6780cec82f4d4f609e750902d114649d4a8ad data/toughasnails/damage_type/hyperthermia.json eae6d7bc6de6b808206268351a4eb97746f013bf data/toughasnails/damage_type/thirst.json +a532ac48cf501e9d5025919020cae649732b61b0 data/toughasnails/enchantment/thermal_tuning.json +82349ce5d9533bbc75097c13464c0e4df56b37ed data/toughasnails/enchantment/water_cleansing.json diff --git a/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c b/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c new file mode 100644 index 00000000..7ce71016 --- /dev/null +++ b/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c @@ -0,0 +1,2 @@ +// 1.21 2024-06-15T11:33:35.2160079 Tags for minecraft:enchantment mod id vanilla +0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/treasure.json diff --git a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 index fbb6b689..e954dd3c 100644 --- a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 +++ b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 @@ -1,4 +1,4 @@ -// 1.20.6 2024-05-12T09:45:42.5810522 Tags for minecraft:worldgen/biome mod id toughasnails +// 1.21 2024-06-15T11:33:35.2140093 Tags for minecraft:worldgen/biome mod id toughasnails 2b52a1f084a28479a2e448b5ca6be229c52b6aa9 data/toughasnails/tags/worldgen/biome/cold_biomes.json 92158999e9537d3b7c9cd1a65cc1aa65bf673c2d data/toughasnails/tags/worldgen/biome/dirty_water_biomes.json 8548cd9e18e161a303323283cb2c7ab2f2ff2cb0 data/toughasnails/tags/worldgen/biome/hot_biomes.json diff --git a/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb b/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb index 25bbb87e..a4b755c2 100644 --- a/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb +++ b/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb @@ -1,3 +1,3 @@ -// 1.20.6 2024-05-12T09:45:42.5800516 Tags for minecraft:trim_material mod id toughasnails +// 1.21 2024-06-15T11:33:35.2130083 Tags for minecraft:trim_material mod id toughasnails 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/trim_material/cooling_trims.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/trim_material/heating_trims.json diff --git a/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 b/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 index c186fb1e..dab536e6 100644 --- a/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 +++ b/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 @@ -1,2 +1,2 @@ -// 1.20.6 2024-05-12T09:45:42.5835518 Tags for minecraft:point_of_interest_type mod id toughasnails +// 1.21 2024-06-15T11:33:35.2160079 Tags for minecraft:point_of_interest_type mod id toughasnails 7ccb22b62459a1c793d38a6fafc772b5d19837e0 data/minecraft/tags/point_of_interest_type/acquirable_job_site.json diff --git a/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index cb16d85a..4c7c614d 100644 --- a/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,5 +1,5 @@ -// 1.20.6 2024-05-12T09:45:42.5810522 Loot Tables -8fca2e50f9df3893ec7ecb84fb15e5f83b33508a data/toughasnails/loot_tables/blocks/rain_collector.json -5b982875ef4148c8acb507e82e690b7ffd814749 data/toughasnails/loot_tables/blocks/temperature_gauge.json -3014cc41e7b43922f50ec3eb6c2eb83fbf3201d2 data/toughasnails/loot_tables/blocks/thermoregulator.json -1410cb58946442b13107a7153298bdcdc8ccaacc data/toughasnails/loot_tables/blocks/water_purifier.json +// 1.21 2024-06-15T11:33:35.2140093 Loot Tables +8fca2e50f9df3893ec7ecb84fb15e5f83b33508a data/toughasnails/loot_table/blocks/rain_collector.json +5b982875ef4148c8acb507e82e690b7ffd814749 data/toughasnails/loot_table/blocks/temperature_gauge.json +3014cc41e7b43922f50ec3eb6c2eb83fbf3201d2 data/toughasnails/loot_table/blocks/thermoregulator.json +1410cb58946442b13107a7153298bdcdc8ccaacc data/toughasnails/loot_table/blocks/water_purifier.json diff --git a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 index d3dc9089..f47a360d 100644 --- a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 +++ b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 @@ -1,45 +1,45 @@ -// 1.20.6 2024-05-12T10:33:15.5464032 Tags for minecraft:item mod id toughasnails -54fbb602df8fe763300ee759cb3a9fbb72ded2eb data/minecraft/tags/items/dyeable.json -f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/items/cooling_armor.json -572f6d0748095755aeef0ca7d602f4ebba9bfd76 data/toughasnails/tags/items/cooling_consumed_items.json -7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/items/cooling_held_items.json -d7e37bc0c1468593bf2403c8bab7e97c17edde8e data/toughasnails/tags/items/drinks.json -eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/items/heating_armor.json -cf863878a8af4a7e610b91efb2c1d7846d13868b data/toughasnails/tags/items/heating_consumed_items.json -efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/items/heating_held_items.json -d7b753d45aecdc84f69d294a00dc5271088c2abc data/toughasnails/tags/items/hydration/100_hydration_drinks.json -cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/items/hydration/10_hydration_drinks.json -6ca6b5a2b8cffea21f6112afc30cc32fa4a4e2d7 data/toughasnails/tags/items/hydration/20_hydration_drinks.json -edb5947f84984a39ab47c98c6fb0b3c3a9a8cc39 data/toughasnails/tags/items/hydration/30_hydration_drinks.json -f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/hydration/40_hydration_drinks.json -4f7422a225cdc6c2f193883f99997942060a44fb data/toughasnails/tags/items/hydration/50_hydration_drinks.json -ce37a9edf9fd513131ff36c4478e629a45057d38 data/toughasnails/tags/items/hydration/60_hydration_drinks.json -a8d4693f32c2dabe2f0ff10cb6ccae93882c8530 data/toughasnails/tags/items/hydration/70_hydration_drinks.json -7fd9471261d08e940601fdecd379217eb90622d1 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 -f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json -cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json -627e9bc41cc7ba0daa135e904539d4645fc1226e data/toughasnails/tags/items/thermoregulator_cooling_fuel.json -4eba53176c4c88b96590e24041f1fe66e24a4d6e data/toughasnails/tags/items/thermoregulator_heating_fuel.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 -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/13_thirst_drinks.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/14_thirst_drinks.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/15_thirst_drinks.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/16_thirst_drinks.json -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 -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 -f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/items/thirst/3_thirst_drinks.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/4_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 -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/items/thirst/9_thirst_drinks.json +// 1.21 2024-06-15T11:33:35.2150083 Tags for minecraft:item mod id toughasnails +54fbb602df8fe763300ee759cb3a9fbb72ded2eb data/minecraft/tags/item/dyeable.json +f05342856fe99891fa5e94bbe8db82a4f75ac41e data/toughasnails/tags/item/cooling_armor.json +572f6d0748095755aeef0ca7d602f4ebba9bfd76 data/toughasnails/tags/item/cooling_consumed_items.json +7c304628a9c17ca3ba6cd13e199fcf73ad9c974f data/toughasnails/tags/item/cooling_held_items.json +d7e37bc0c1468593bf2403c8bab7e97c17edde8e data/toughasnails/tags/item/drinks.json +eb101cb126ebd917a2c240ff53e1e6e16ba3bf83 data/toughasnails/tags/item/heating_armor.json +cf863878a8af4a7e610b91efb2c1d7846d13868b data/toughasnails/tags/item/heating_consumed_items.json +efe9e0caf089100a228c46379f3aa70d7f602ddc data/toughasnails/tags/item/heating_held_items.json +d7b753d45aecdc84f69d294a00dc5271088c2abc data/toughasnails/tags/item/hydration/100_hydration_drinks.json +cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/item/hydration/10_hydration_drinks.json +6ca6b5a2b8cffea21f6112afc30cc32fa4a4e2d7 data/toughasnails/tags/item/hydration/20_hydration_drinks.json +edb5947f84984a39ab47c98c6fb0b3c3a9a8cc39 data/toughasnails/tags/item/hydration/30_hydration_drinks.json +f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/item/hydration/40_hydration_drinks.json +4f7422a225cdc6c2f193883f99997942060a44fb data/toughasnails/tags/item/hydration/50_hydration_drinks.json +ce37a9edf9fd513131ff36c4478e629a45057d38 data/toughasnails/tags/item/hydration/60_hydration_drinks.json +a8d4693f32c2dabe2f0ff10cb6ccae93882c8530 data/toughasnails/tags/item/hydration/70_hydration_drinks.json +7fd9471261d08e940601fdecd379217eb90622d1 data/toughasnails/tags/item/hydration/80_hydration_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/hydration/90_hydration_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/poison_chance/100_poison_chance_drinks.json +f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/item/poison_chance/25_poison_chance_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/poison_chance/50_poison_chance_drinks.json +cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/item/poison_chance/75_poison_chance_drinks.json +627e9bc41cc7ba0daa135e904539d4645fc1226e data/toughasnails/tags/item/thermoregulator_cooling_fuel.json +4eba53176c4c88b96590e24041f1fe66e24a4d6e data/toughasnails/tags/item/thermoregulator_heating_fuel.json +0395ed7d6e3d7510a25d2f4ef8b498b0d8c6c9eb data/toughasnails/tags/item/thirst/10_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/11_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/12_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/13_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/14_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/15_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/16_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/17_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/18_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/19_thirst_drinks.json +cc0aa3bf437ed849deda4e4b64aff3665160dae6 data/toughasnails/tags/item/thirst/1_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/20_thirst_drinks.json +edb5947f84984a39ab47c98c6fb0b3c3a9a8cc39 data/toughasnails/tags/item/thirst/2_thirst_drinks.json +f87a1c4dc42b16f1628cfca591895d987e5dc6ca data/toughasnails/tags/item/thirst/3_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/4_thirst_drinks.json +7fd9471261d08e940601fdecd379217eb90622d1 data/toughasnails/tags/item/thirst/5_thirst_drinks.json +24b02d22d0e3e4abbeed0c96fc20b8dc05dc5f6e data/toughasnails/tags/item/thirst/6_thirst_drinks.json +a90844d1583073e1a3538fe5afe6e279aa3073b8 data/toughasnails/tags/item/thirst/7_thirst_drinks.json +a8d4693f32c2dabe2f0ff10cb6ccae93882c8530 data/toughasnails/tags/item/thirst/8_thirst_drinks.json +35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/toughasnails/tags/item/thirst/9_thirst_drinks.json diff --git a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index f2ca82b3..7457eb30 100644 --- a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,77 +1,77 @@ -// 1.20.6 2024-05-12T09:45:42.581552 Recipes -538aa9aa354f6743d9832c0ec7a8642b70f515f2 data/toughasnails/advancements/recipes/combat/leaf_boots.json -2cb6e078f817b17b47c66d6ca824b44751c06ecd data/toughasnails/advancements/recipes/combat/leaf_chestplate.json -4a11700a18931f1f67270bef246e6b57d1cf5a5b data/toughasnails/advancements/recipes/combat/leaf_helmet.json -92732ab3d75844d388eea763c654120903b2df4e data/toughasnails/advancements/recipes/combat/leaf_leggings.json -c6798fc2c097b87d061820015eef0c14aaaaf1c3 data/toughasnails/advancements/recipes/combat/wool_boots.json -b735e388f317f827951e1fcd71f7d7076d846019 data/toughasnails/advancements/recipes/combat/wool_chestplate.json -5678da96edd184f098392efb1d8aa82740551b18 data/toughasnails/advancements/recipes/combat/wool_helmet.json -584e5f5d4d842b1b059a566fb58dd5643ec6a6b8 data/toughasnails/advancements/recipes/combat/wool_leggings.json -898c7abddb9f6e89481a42f140367c9cf5e6ea4a data/toughasnails/advancements/recipes/decorations/rain_collector.json -20a1c603ca73d6fb93e294c4620bb1f002208d2a data/toughasnails/advancements/recipes/decorations/thermoregulator.json -441400bda4d19c989e62a7fbf1b3bb5bd43064a9 data/toughasnails/advancements/recipes/decorations/water_purifier.json -ec99cbc4bc7d858443bbfa259626570a34d515e5 data/toughasnails/advancements/recipes/food/apple_juice.json -2b251232b3322008c7bc03741646d58e54c3ce67 data/toughasnails/advancements/recipes/food/cactus_juice.json -2ceff39e198a3570692b3f953b4d994042643d78 data/toughasnails/advancements/recipes/food/charc_os.json -20d67b977fc7ce355c862cc5c1f6434cb2249226 data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json -a386c8045141bcae0b7ccdeaff8c687cf1e12f52 data/toughasnails/advancements/recipes/food/glow_berry_juice.json -fd44b7c77b809c029e4195348910c74f641b20f6 data/toughasnails/advancements/recipes/food/ice_cream.json -43ed15141145d7471daea21cb4227b401502d948 data/toughasnails/advancements/recipes/food/melon_juice.json -dc4821d6d28c6f0625dce5384be24487789a37f3 data/toughasnails/advancements/recipes/food/pumpkin_juice.json -2801d661cf1f6531a5e3a3268ac4b31699b43b2d data/toughasnails/advancements/recipes/food/sweet_berry_juice.json -0c7c1277d2b67363ae24c7899b12d98f6acf6490 data/toughasnails/advancements/recipes/redstone/temperature_gauge.json -4d97de66b3303ab60f18c2d8c5662021130d8099 data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json -4bd9339ef899c3d4c422f7ca077ff0e527a524b7 data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json -8a21f07c3a0d6daa40362b6873c2b95c34dd10cd data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json -b7cae73d49989fb2ca8a9b5d5967d2a673230968 data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json -02f22c09e9d0862258897ad74a03f89cb0a7ea48 data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json -f1cc178cdd820a87e997cc32feab7c35dcef76b8 data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json -0e1fe6941ec0892c378d8c49a9760c4fa1a12863 data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json -2e24e29003f3c7c1640a560a6e592cfba4d4e0f6 data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json -f52d954a9a4287b320ce5a2bb6434e4513b22691 data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json -72085fcf1772fab81d8dc3723424bdc1c5c6dd00 data/toughasnails/advancements/recipes/tools/thermometer.json -a0a72377006924baac363a28dc7ce36fdb9adaf8 data/toughasnails/recipes/apple_juice.json -0387ca60540b2a02540e6864d58d466ed92fe034 data/toughasnails/recipes/cactus_juice.json -a9fafe9f803ed25cb183b42e3fd1621dc622dfcc data/toughasnails/recipes/charc_os.json -7446ec0bdd1ce5508e361ce60904833f273ed89d data/toughasnails/recipes/chorus_fruit_juice.json -ccd406e9a079e1e84d06314aac77085f1f5fa342 data/toughasnails/recipes/copper_purified_water_canteen.json -65c58665c421c80ac28018938d0567c7b1ee9ba6 data/toughasnails/recipes/copper_water_canteen.json -c25c5e89aa3a8074615615176ba3f1b217ca2faa data/toughasnails/recipes/diamond_purified_water_canteen.json -ec714b56d629a6546550cedb66650e949e51fcc4 data/toughasnails/recipes/diamond_water_canteen.json -62e0d241e62aa5b2bb715b043d34234974776db6 data/toughasnails/recipes/empty_copper_canteen.json -19f1a0986bb3f143c30afafc12b4b7f0f39f899d data/toughasnails/recipes/empty_diamond_canteen.json -5482916928f042cf03bdd779b30f25086f78a2dc data/toughasnails/recipes/empty_gold_canteen.json -4bf7de4ba4eb266d57ae8c6934a717a71d977e02 data/toughasnails/recipes/empty_iron_canteen.json -12c5c624f56242b740c913aadf109b5c8549bbbf data/toughasnails/recipes/empty_leather_canteen.json -94ae3874a82f3403ebf87fa59712731d6d865b7e data/toughasnails/recipes/empty_netherite_canteen_smithing.json -797b3d9fe7bdcab1ae99216f97dcfb188f72a9e8 data/toughasnails/recipes/glow_berry_juice.json -69be74e00404672ee28fd5c87655a27244c5062f data/toughasnails/recipes/gold_purified_water_canteen.json -dc05d85c895b0e41c1fbd20e85a0107b216b97a6 data/toughasnails/recipes/gold_water_canteen.json -da19289ac8fa84fa689395d820e95e5d9bb9c738 data/toughasnails/recipes/ice_cream.json -7afd5591286be697309a4bb85a7beead2ae8362a data/toughasnails/recipes/iron_purified_water_canteen.json -d71f13ff24d6b8c5967ccfb00e77e177ce3fc3d2 data/toughasnails/recipes/iron_water_canteen.json -76573351f4f6688a3238d0280bc3b50b04b35251 data/toughasnails/recipes/leaf_boots.json -cbdc36a7a5ec7b7a313d441bfa09089abf1c8cfb data/toughasnails/recipes/leaf_chestplate.json -2bd505e226668012423d79616fb5c1d51bb7848c data/toughasnails/recipes/leaf_helmet.json -247e5ddce9502cea4a57c9a582d53206246ac27a data/toughasnails/recipes/leaf_leggings.json -5e0ccfb780bbe271863f1feff90d20553dcefba4 data/toughasnails/recipes/leather_purified_water_canteen.json -3c87d0c96c709a0dcf7954c2f7b831678afeb8b0 data/toughasnails/recipes/leather_water_canteen.json -69083f5c0f45feb90898106c51a7eceb69f36a3e data/toughasnails/recipes/melon_juice.json -6c246dfcbb405c68dbf5d1f6f85750a90482414a data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json -908a02215fb93a13be152f3f09ce105ff7b12fde data/toughasnails/recipes/netherite_purified_water_canteen.json -8e71c0e1226cfc5092c4fffd01903e6f190ba2e8 data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json -8b8ee7a534d61dbc1060dafdc4a244987d6de619 data/toughasnails/recipes/netherite_water_canteen.json -9a00a3a6da0ddade366c5bfd1f05f957c67ffb1b data/toughasnails/recipes/netherite_water_canteen_smithing.json -ceedf2e2958333f02b577fb673e60e3a605113a5 data/toughasnails/recipes/potion.json -05cad50ed7457dd7b71cff72212a92f73d50ae02 data/toughasnails/recipes/pumpkin_juice.json -c85c37688386d19ebb8a03dab0281fe4bead3bca data/toughasnails/recipes/purified_water_bottle.json -3cd631699a79af699050721839385d1a2c8bef38 data/toughasnails/recipes/rain_collector.json -2a71b9b9b2749ecac1888637a39cd2721da4d071 data/toughasnails/recipes/sweet_berry_juice.json -0fd545c66761d349484690dd72b01e0fb0036ecb data/toughasnails/recipes/temperature_gauge.json -dc0929b6ce59ee9946299d8cf7f31cf3d9a6b3ce data/toughasnails/recipes/thermometer.json -f16c2c82449cb0adef5ba44a9ab16b5de05894df data/toughasnails/recipes/thermoregulator.json -7a21c78924c769050fae68ebfa13c24008a7ceb1 data/toughasnails/recipes/water_purifier.json -2257aee0b9373bbee0804ebf995604f1da7d85d9 data/toughasnails/recipes/wool_boots.json -c34bf84ecf8300b34a91b70554fc71794f04b16b data/toughasnails/recipes/wool_chestplate.json -da8945c992bc284fc6ebb24c8702eb7514f22434 data/toughasnails/recipes/wool_helmet.json -47891cf51de5b6a15fbde6fcb0a34429ac067e63 data/toughasnails/recipes/wool_leggings.json +// 1.21 2024-06-15T11:33:35.2140093 Recipes +538aa9aa354f6743d9832c0ec7a8642b70f515f2 data/toughasnails/advancement/recipes/combat/leaf_boots.json +2cb6e078f817b17b47c66d6ca824b44751c06ecd data/toughasnails/advancement/recipes/combat/leaf_chestplate.json +4a11700a18931f1f67270bef246e6b57d1cf5a5b data/toughasnails/advancement/recipes/combat/leaf_helmet.json +92732ab3d75844d388eea763c654120903b2df4e data/toughasnails/advancement/recipes/combat/leaf_leggings.json +c6798fc2c097b87d061820015eef0c14aaaaf1c3 data/toughasnails/advancement/recipes/combat/wool_boots.json +b735e388f317f827951e1fcd71f7d7076d846019 data/toughasnails/advancement/recipes/combat/wool_chestplate.json +5678da96edd184f098392efb1d8aa82740551b18 data/toughasnails/advancement/recipes/combat/wool_helmet.json +584e5f5d4d842b1b059a566fb58dd5643ec6a6b8 data/toughasnails/advancement/recipes/combat/wool_leggings.json +898c7abddb9f6e89481a42f140367c9cf5e6ea4a data/toughasnails/advancement/recipes/decorations/rain_collector.json +20a1c603ca73d6fb93e294c4620bb1f002208d2a data/toughasnails/advancement/recipes/decorations/thermoregulator.json +441400bda4d19c989e62a7fbf1b3bb5bd43064a9 data/toughasnails/advancement/recipes/decorations/water_purifier.json +ec99cbc4bc7d858443bbfa259626570a34d515e5 data/toughasnails/advancement/recipes/food/apple_juice.json +2b251232b3322008c7bc03741646d58e54c3ce67 data/toughasnails/advancement/recipes/food/cactus_juice.json +2ceff39e198a3570692b3f953b4d994042643d78 data/toughasnails/advancement/recipes/food/charc_os.json +20d67b977fc7ce355c862cc5c1f6434cb2249226 data/toughasnails/advancement/recipes/food/chorus_fruit_juice.json +a386c8045141bcae0b7ccdeaff8c687cf1e12f52 data/toughasnails/advancement/recipes/food/glow_berry_juice.json +fd44b7c77b809c029e4195348910c74f641b20f6 data/toughasnails/advancement/recipes/food/ice_cream.json +43ed15141145d7471daea21cb4227b401502d948 data/toughasnails/advancement/recipes/food/melon_juice.json +dc4821d6d28c6f0625dce5384be24487789a37f3 data/toughasnails/advancement/recipes/food/pumpkin_juice.json +2801d661cf1f6531a5e3a3268ac4b31699b43b2d data/toughasnails/advancement/recipes/food/sweet_berry_juice.json +0c7c1277d2b67363ae24c7899b12d98f6acf6490 data/toughasnails/advancement/recipes/redstone/temperature_gauge.json +4d97de66b3303ab60f18c2d8c5662021130d8099 data/toughasnails/advancement/recipes/tools/empty_copper_canteen.json +4bd9339ef899c3d4c422f7ca077ff0e527a524b7 data/toughasnails/advancement/recipes/tools/empty_diamond_canteen.json +8a21f07c3a0d6daa40362b6873c2b95c34dd10cd data/toughasnails/advancement/recipes/tools/empty_gold_canteen.json +b7cae73d49989fb2ca8a9b5d5967d2a673230968 data/toughasnails/advancement/recipes/tools/empty_iron_canteen.json +02f22c09e9d0862258897ad74a03f89cb0a7ea48 data/toughasnails/advancement/recipes/tools/empty_leather_canteen.json +f1cc178cdd820a87e997cc32feab7c35dcef76b8 data/toughasnails/advancement/recipes/tools/empty_netherite_canteen_smithing.json +0e1fe6941ec0892c378d8c49a9760c4fa1a12863 data/toughasnails/advancement/recipes/tools/netherite_dirty_water_canteen_smithing.json +2e24e29003f3c7c1640a560a6e592cfba4d4e0f6 data/toughasnails/advancement/recipes/tools/netherite_purified_water_canteen_smithing.json +f52d954a9a4287b320ce5a2bb6434e4513b22691 data/toughasnails/advancement/recipes/tools/netherite_water_canteen_smithing.json +72085fcf1772fab81d8dc3723424bdc1c5c6dd00 data/toughasnails/advancement/recipes/tools/thermometer.json +a0a72377006924baac363a28dc7ce36fdb9adaf8 data/toughasnails/recipe/apple_juice.json +0387ca60540b2a02540e6864d58d466ed92fe034 data/toughasnails/recipe/cactus_juice.json +a9fafe9f803ed25cb183b42e3fd1621dc622dfcc data/toughasnails/recipe/charc_os.json +7446ec0bdd1ce5508e361ce60904833f273ed89d data/toughasnails/recipe/chorus_fruit_juice.json +ccd406e9a079e1e84d06314aac77085f1f5fa342 data/toughasnails/recipe/copper_purified_water_canteen.json +65c58665c421c80ac28018938d0567c7b1ee9ba6 data/toughasnails/recipe/copper_water_canteen.json +c25c5e89aa3a8074615615176ba3f1b217ca2faa data/toughasnails/recipe/diamond_purified_water_canteen.json +ec714b56d629a6546550cedb66650e949e51fcc4 data/toughasnails/recipe/diamond_water_canteen.json +62e0d241e62aa5b2bb715b043d34234974776db6 data/toughasnails/recipe/empty_copper_canteen.json +19f1a0986bb3f143c30afafc12b4b7f0f39f899d data/toughasnails/recipe/empty_diamond_canteen.json +5482916928f042cf03bdd779b30f25086f78a2dc data/toughasnails/recipe/empty_gold_canteen.json +4bf7de4ba4eb266d57ae8c6934a717a71d977e02 data/toughasnails/recipe/empty_iron_canteen.json +12c5c624f56242b740c913aadf109b5c8549bbbf data/toughasnails/recipe/empty_leather_canteen.json +94ae3874a82f3403ebf87fa59712731d6d865b7e data/toughasnails/recipe/empty_netherite_canteen_smithing.json +797b3d9fe7bdcab1ae99216f97dcfb188f72a9e8 data/toughasnails/recipe/glow_berry_juice.json +69be74e00404672ee28fd5c87655a27244c5062f data/toughasnails/recipe/gold_purified_water_canteen.json +dc05d85c895b0e41c1fbd20e85a0107b216b97a6 data/toughasnails/recipe/gold_water_canteen.json +da19289ac8fa84fa689395d820e95e5d9bb9c738 data/toughasnails/recipe/ice_cream.json +7afd5591286be697309a4bb85a7beead2ae8362a data/toughasnails/recipe/iron_purified_water_canteen.json +d71f13ff24d6b8c5967ccfb00e77e177ce3fc3d2 data/toughasnails/recipe/iron_water_canteen.json +76573351f4f6688a3238d0280bc3b50b04b35251 data/toughasnails/recipe/leaf_boots.json +cbdc36a7a5ec7b7a313d441bfa09089abf1c8cfb data/toughasnails/recipe/leaf_chestplate.json +2bd505e226668012423d79616fb5c1d51bb7848c data/toughasnails/recipe/leaf_helmet.json +247e5ddce9502cea4a57c9a582d53206246ac27a data/toughasnails/recipe/leaf_leggings.json +5e0ccfb780bbe271863f1feff90d20553dcefba4 data/toughasnails/recipe/leather_purified_water_canteen.json +3c87d0c96c709a0dcf7954c2f7b831678afeb8b0 data/toughasnails/recipe/leather_water_canteen.json +69083f5c0f45feb90898106c51a7eceb69f36a3e data/toughasnails/recipe/melon_juice.json +6c246dfcbb405c68dbf5d1f6f85750a90482414a data/toughasnails/recipe/netherite_dirty_water_canteen_smithing.json +908a02215fb93a13be152f3f09ce105ff7b12fde data/toughasnails/recipe/netherite_purified_water_canteen.json +8e71c0e1226cfc5092c4fffd01903e6f190ba2e8 data/toughasnails/recipe/netherite_purified_water_canteen_smithing.json +8b8ee7a534d61dbc1060dafdc4a244987d6de619 data/toughasnails/recipe/netherite_water_canteen.json +9a00a3a6da0ddade366c5bfd1f05f957c67ffb1b data/toughasnails/recipe/netherite_water_canteen_smithing.json +ceedf2e2958333f02b577fb673e60e3a605113a5 data/toughasnails/recipe/potion.json +05cad50ed7457dd7b71cff72212a92f73d50ae02 data/toughasnails/recipe/pumpkin_juice.json +c85c37688386d19ebb8a03dab0281fe4bead3bca data/toughasnails/recipe/purified_water_bottle.json +3cd631699a79af699050721839385d1a2c8bef38 data/toughasnails/recipe/rain_collector.json +2a71b9b9b2749ecac1888637a39cd2721da4d071 data/toughasnails/recipe/sweet_berry_juice.json +0fd545c66761d349484690dd72b01e0fb0036ecb data/toughasnails/recipe/temperature_gauge.json +dc0929b6ce59ee9946299d8cf7f31cf3d9a6b3ce data/toughasnails/recipe/thermometer.json +f16c2c82449cb0adef5ba44a9ab16b5de05894df data/toughasnails/recipe/thermoregulator.json +7a21c78924c769050fae68ebfa13c24008a7ceb1 data/toughasnails/recipe/water_purifier.json +db8822d9a58a9a098977aab2142244b01f8b2947 data/toughasnails/recipe/wool_boots.json +ab6d2e4b557a3e35045b44f89b60da4857caae9a data/toughasnails/recipe/wool_chestplate.json +d220c2bba8e10e45f5eb737f12e6848fec6195cc data/toughasnails/recipe/wool_helmet.json +26551b0c3deb22320245ad8258fecb17f219faa2 data/toughasnails/recipe/wool_leggings.json diff --git a/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 b/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 index 703dc424..da66eb48 100644 --- a/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 +++ b/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 @@ -1,4 +1,4 @@ -// 1.20.6 2024-05-12T09:45:42.5830519 Item Models: toughasnails +// 1.21 2024-06-15T11:33:35.2160079 Item Models: toughasnails ce273d4a6776e0951a77c06d990ff960e28f66f5 assets/toughasnails/models/item/thermometer.json 0fbb3edc334b05d5f3657d01ad0444da28d830ec assets/toughasnails/models/item/thermometer_00.json f90715b0138223634226f703377c9210440ebba4 assets/toughasnails/models/item/thermometer_01.json diff --git a/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b b/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b index 481917d8..65daad2e 100644 --- a/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b +++ b/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b @@ -1,3 +1,3 @@ -// 1.20.6 2024-05-12T09:45:42.5820522 Tags for minecraft:damage_type mod id toughasnails +// 1.21 2024-06-15T11:33:35.2150083 Tags for minecraft:damage_type mod id toughasnails 114a24c8e8dfc4dca5477ef3ceb9cdce6f35c49d data/minecraft/tags/damage_type/bypasses_armor.json 7bc5233723c7bfc14215cd1f26c7fd14f2da6c81 data/minecraft/tags/damage_type/bypasses_effects.json diff --git a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 index 9f876bed..ea8d6917 100644 --- a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 +++ b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 @@ -1,6 +1,6 @@ -// 1.20.6 2024-05-12T09:45:42.5805528 Tags for minecraft:block mod id toughasnails -bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/blocks/mineable/axe.json -0342cd45a4d6f790afda91090de45871d9b0ef63 data/minecraft/tags/blocks/mineable/pickaxe.json -eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/blocks/cooling_blocks.json -658fab0118eb1ac9896e1b9ab89f2d5ed055a967 data/toughasnails/tags/blocks/heating_blocks.json -e31d0ccf1dd374df5d89a102ae1829d4411012f6 data/toughasnails/tags/blocks/passable_blocks.json +// 1.21 2024-06-15T11:33:35.2140093 Tags for minecraft:block mod id toughasnails +bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/block/mineable/axe.json +0342cd45a4d6f790afda91090de45871d9b0ef63 data/minecraft/tags/block/mineable/pickaxe.json +eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/block/cooling_blocks.json +658fab0118eb1ac9896e1b9ab89f2d5ed055a967 data/toughasnails/tags/block/heating_blocks.json +e31d0ccf1dd374df5d89a102ae1829d4411012f6 data/toughasnails/tags/block/passable_blocks.json diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/generated/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from common/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json rename to common/src/generated/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to common/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/common/src/generated/resources/data/minecraft/tags/enchantment/treasure.json b/common/src/generated/resources/data/minecraft/tags/enchantment/treasure.json new file mode 100644 index 00000000..edb0a16d --- /dev/null +++ b/common/src/generated/resources/data/minecraft/tags/enchantment/treasure.json @@ -0,0 +1,6 @@ +{ + "values": [ + "toughasnails:thermal_tuning", + "toughasnails:water_cleansing" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/minecraft/tags/items/dyeable.json b/common/src/generated/resources/data/minecraft/tags/item/dyeable.json similarity index 100% rename from common/src/generated/resources/data/minecraft/tags/items/dyeable.json rename to common/src/generated/resources/data/minecraft/tags/item/dyeable.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_boots.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_boots.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_boots.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_chestplate.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_chestplate.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_chestplate.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_helmet.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_helmet.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_helmet.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_leggings.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/leaf_leggings.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/leaf_leggings.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_boots.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_boots.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_boots.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_chestplate.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_chestplate.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_chestplate.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_helmet.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_helmet.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_helmet.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_leggings.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/combat/wool_leggings.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/combat/wool_leggings.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/decorations/rain_collector.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/decorations/rain_collector.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/decorations/rain_collector.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/decorations/thermoregulator.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/decorations/thermoregulator.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/decorations/thermoregulator.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/decorations/thermoregulator.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/decorations/water_purifier.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/decorations/water_purifier.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/decorations/water_purifier.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/apple_juice.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/apple_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/apple_juice.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/apple_juice.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/cactus_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/cactus_juice.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/cactus_juice.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/charc_os.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/charc_os.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/charc_os.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/charc_os.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/chorus_fruit_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/chorus_fruit_juice.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/chorus_fruit_juice.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/glow_berry_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/glow_berry_juice.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/glow_berry_juice.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/ice_cream.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/ice_cream.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/ice_cream.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/ice_cream.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/melon_juice.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/melon_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/melon_juice.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/melon_juice.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/pumpkin_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/pumpkin_juice.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/pumpkin_juice.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/food/sweet_berry_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/food/sweet_berry_juice.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/food/sweet_berry_juice.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/redstone/temperature_gauge.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/redstone/temperature_gauge.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/redstone/temperature_gauge.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/redstone/temperature_gauge.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_copper_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_copper_canteen.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_copper_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_diamond_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_diamond_canteen.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_diamond_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_gold_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_gold_canteen.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_gold_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_iron_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_iron_canteen.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_iron_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_leather_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_leather_canteen.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_leather_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_netherite_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/empty_netherite_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/empty_netherite_canteen_smithing.json 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/advancement/recipes/tools/netherite_dirty_water_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_dirty_water_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/netherite_dirty_water_canteen_smithing.json 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/advancement/recipes/tools/netherite_purified_water_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_purified_water_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/netherite_purified_water_canteen_smithing.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/netherite_water_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/netherite_water_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/netherite_water_canteen_smithing.json diff --git a/common/src/generated/resources/data/toughasnails/advancements/recipes/tools/thermometer.json b/common/src/generated/resources/data/toughasnails/advancement/recipes/tools/thermometer.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/advancements/recipes/tools/thermometer.json rename to common/src/generated/resources/data/toughasnails/advancement/recipes/tools/thermometer.json diff --git a/common/src/generated/resources/data/toughasnails/enchantment/thermal_tuning.json b/common/src/generated/resources/data/toughasnails/enchantment/thermal_tuning.json new file mode 100644 index 00000000..d2153d39 --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/enchantment/thermal_tuning.json @@ -0,0 +1,21 @@ +{ + "anvil_cost": 4, + "description": { + "translate": "enchantment.toughasnails.thermal_tuning" + }, + "exclusive_set": "#minecraft:exclusive_set/armor", + "max_cost": { + "base": 75, + "per_level_above_first": 25 + }, + "max_level": 1, + "min_cost": { + "base": 25, + "per_level_above_first": 25 + }, + "slots": [ + "chest" + ], + "supported_items": "#minecraft:enchantable/chest_armor", + "weight": 2 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/enchantment/water_cleansing.json b/common/src/generated/resources/data/toughasnails/enchantment/water_cleansing.json new file mode 100644 index 00000000..63f3d49d --- /dev/null +++ b/common/src/generated/resources/data/toughasnails/enchantment/water_cleansing.json @@ -0,0 +1,21 @@ +{ + "anvil_cost": 4, + "description": { + "translate": "enchantment.toughasnails.water_cleansing" + }, + "exclusive_set": "#minecraft:exclusive_set/damage", + "max_cost": { + "base": 75, + "per_level_above_first": 25 + }, + "max_level": 1, + "min_cost": { + "base": 25, + "per_level_above_first": 25 + }, + "slots": [ + "mainhand" + ], + "supported_items": "#minecraft:enchantable/durability", + "weight": 2 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/loot_tables/blocks/rain_collector.json b/common/src/generated/resources/data/toughasnails/loot_table/blocks/rain_collector.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/loot_tables/blocks/rain_collector.json rename to common/src/generated/resources/data/toughasnails/loot_table/blocks/rain_collector.json diff --git a/common/src/generated/resources/data/toughasnails/loot_tables/blocks/temperature_gauge.json b/common/src/generated/resources/data/toughasnails/loot_table/blocks/temperature_gauge.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/loot_tables/blocks/temperature_gauge.json rename to common/src/generated/resources/data/toughasnails/loot_table/blocks/temperature_gauge.json diff --git a/common/src/generated/resources/data/toughasnails/loot_tables/blocks/thermoregulator.json b/common/src/generated/resources/data/toughasnails/loot_table/blocks/thermoregulator.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/loot_tables/blocks/thermoregulator.json rename to common/src/generated/resources/data/toughasnails/loot_table/blocks/thermoregulator.json diff --git a/common/src/generated/resources/data/toughasnails/loot_tables/blocks/water_purifier.json b/common/src/generated/resources/data/toughasnails/loot_table/blocks/water_purifier.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/loot_tables/blocks/water_purifier.json rename to common/src/generated/resources/data/toughasnails/loot_table/blocks/water_purifier.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/apple_juice.json b/common/src/generated/resources/data/toughasnails/recipe/apple_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/apple_juice.json rename to common/src/generated/resources/data/toughasnails/recipe/apple_juice.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/cactus_juice.json b/common/src/generated/resources/data/toughasnails/recipe/cactus_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/cactus_juice.json rename to common/src/generated/resources/data/toughasnails/recipe/cactus_juice.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/charc_os.json b/common/src/generated/resources/data/toughasnails/recipe/charc_os.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/charc_os.json rename to common/src/generated/resources/data/toughasnails/recipe/charc_os.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/chorus_fruit_juice.json b/common/src/generated/resources/data/toughasnails/recipe/chorus_fruit_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/chorus_fruit_juice.json rename to common/src/generated/resources/data/toughasnails/recipe/chorus_fruit_juice.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/copper_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/copper_purified_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/copper_purified_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/copper_purified_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/copper_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/copper_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/copper_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/copper_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/diamond_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/diamond_purified_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/diamond_purified_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/diamond_purified_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/diamond_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/diamond_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/diamond_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/diamond_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_copper_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_copper_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/empty_copper_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/empty_copper_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_diamond_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_diamond_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/empty_diamond_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/empty_diamond_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_gold_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_gold_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/empty_gold_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/empty_gold_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_iron_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_iron_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/empty_iron_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/empty_iron_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_leather_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_leather_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/empty_leather_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/empty_leather_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/empty_netherite_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/empty_netherite_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/empty_netherite_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/recipe/empty_netherite_canteen_smithing.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/glow_berry_juice.json b/common/src/generated/resources/data/toughasnails/recipe/glow_berry_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/glow_berry_juice.json rename to common/src/generated/resources/data/toughasnails/recipe/glow_berry_juice.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/gold_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/gold_purified_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/gold_purified_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/gold_purified_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/gold_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/gold_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/gold_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/gold_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/ice_cream.json b/common/src/generated/resources/data/toughasnails/recipe/ice_cream.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/ice_cream.json rename to common/src/generated/resources/data/toughasnails/recipe/ice_cream.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/iron_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/iron_purified_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/iron_purified_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/iron_purified_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/iron_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/iron_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/iron_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/iron_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/leaf_boots.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_boots.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/leaf_boots.json rename to common/src/generated/resources/data/toughasnails/recipe/leaf_boots.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/leaf_chestplate.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_chestplate.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/leaf_chestplate.json rename to common/src/generated/resources/data/toughasnails/recipe/leaf_chestplate.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/leaf_helmet.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_helmet.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/leaf_helmet.json rename to common/src/generated/resources/data/toughasnails/recipe/leaf_helmet.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/leaf_leggings.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_leggings.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/leaf_leggings.json rename to common/src/generated/resources/data/toughasnails/recipe/leaf_leggings.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/leather_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/leather_purified_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/leather_purified_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/leather_purified_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/leather_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/leather_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/leather_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/leather_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/melon_juice.json b/common/src/generated/resources/data/toughasnails/recipe/melon_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/melon_juice.json rename to common/src/generated/resources/data/toughasnails/recipe/melon_juice.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_dirty_water_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/netherite_dirty_water_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/recipe/netherite_dirty_water_canteen_smithing.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/netherite_purified_water_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen_smithing.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen.json rename to common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen_smithing.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/netherite_water_canteen_smithing.json rename to common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen_smithing.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/potion.json b/common/src/generated/resources/data/toughasnails/recipe/potion.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/potion.json rename to common/src/generated/resources/data/toughasnails/recipe/potion.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/pumpkin_juice.json b/common/src/generated/resources/data/toughasnails/recipe/pumpkin_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/pumpkin_juice.json rename to common/src/generated/resources/data/toughasnails/recipe/pumpkin_juice.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/purified_water_bottle.json b/common/src/generated/resources/data/toughasnails/recipe/purified_water_bottle.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/purified_water_bottle.json rename to common/src/generated/resources/data/toughasnails/recipe/purified_water_bottle.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/rain_collector.json b/common/src/generated/resources/data/toughasnails/recipe/rain_collector.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/rain_collector.json rename to common/src/generated/resources/data/toughasnails/recipe/rain_collector.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/sweet_berry_juice.json b/common/src/generated/resources/data/toughasnails/recipe/sweet_berry_juice.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/sweet_berry_juice.json rename to common/src/generated/resources/data/toughasnails/recipe/sweet_berry_juice.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/temperature_gauge.json b/common/src/generated/resources/data/toughasnails/recipe/temperature_gauge.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/temperature_gauge.json rename to common/src/generated/resources/data/toughasnails/recipe/temperature_gauge.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/thermometer.json b/common/src/generated/resources/data/toughasnails/recipe/thermometer.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/thermometer.json rename to common/src/generated/resources/data/toughasnails/recipe/thermometer.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/thermoregulator.json b/common/src/generated/resources/data/toughasnails/recipe/thermoregulator.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/thermoregulator.json rename to common/src/generated/resources/data/toughasnails/recipe/thermoregulator.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/water_purifier.json b/common/src/generated/resources/data/toughasnails/recipe/water_purifier.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/recipes/water_purifier.json rename to common/src/generated/resources/data/toughasnails/recipe/water_purifier.json diff --git a/common/src/generated/resources/data/toughasnails/recipes/wool_boots.json b/common/src/generated/resources/data/toughasnails/recipe/wool_boots.json similarity index 66% rename from common/src/generated/resources/data/toughasnails/recipes/wool_boots.json rename to common/src/generated/resources/data/toughasnails/recipe/wool_boots.json index 9fa12774..48ccff56 100644 --- a/common/src/generated/resources/data/toughasnails/recipes/wool_boots.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_boots.json @@ -11,6 +11,12 @@ "X X" ], "result": { + "components": { + "minecraft:dyed_color": { + "rgb": 16777215, + "show_in_tooltip": false + } + }, "count": 1, "id": "toughasnails:wool_boots" } diff --git a/common/src/generated/resources/data/toughasnails/recipes/wool_chestplate.json b/common/src/generated/resources/data/toughasnails/recipe/wool_chestplate.json similarity index 67% rename from common/src/generated/resources/data/toughasnails/recipes/wool_chestplate.json rename to common/src/generated/resources/data/toughasnails/recipe/wool_chestplate.json index 98d52336..f7be0956 100644 --- a/common/src/generated/resources/data/toughasnails/recipes/wool_chestplate.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_chestplate.json @@ -12,6 +12,12 @@ "XXX" ], "result": { + "components": { + "minecraft:dyed_color": { + "rgb": 16777215, + "show_in_tooltip": false + } + }, "count": 1, "id": "toughasnails:wool_chestplate" } diff --git a/common/src/generated/resources/data/toughasnails/recipes/wool_helmet.json b/common/src/generated/resources/data/toughasnails/recipe/wool_helmet.json similarity index 66% rename from common/src/generated/resources/data/toughasnails/recipes/wool_helmet.json rename to common/src/generated/resources/data/toughasnails/recipe/wool_helmet.json index fab79ca0..3356c443 100644 --- a/common/src/generated/resources/data/toughasnails/recipes/wool_helmet.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_helmet.json @@ -11,6 +11,12 @@ "X X" ], "result": { + "components": { + "minecraft:dyed_color": { + "rgb": 16777215, + "show_in_tooltip": false + } + }, "count": 1, "id": "toughasnails:wool_helmet" } diff --git a/common/src/generated/resources/data/toughasnails/recipes/wool_leggings.json b/common/src/generated/resources/data/toughasnails/recipe/wool_leggings.json similarity index 67% rename from common/src/generated/resources/data/toughasnails/recipes/wool_leggings.json rename to common/src/generated/resources/data/toughasnails/recipe/wool_leggings.json index 259172bd..758c7bea 100644 --- a/common/src/generated/resources/data/toughasnails/recipes/wool_leggings.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_leggings.json @@ -12,6 +12,12 @@ "X X" ], "result": { + "components": { + "minecraft:dyed_color": { + "rgb": 16777215, + "show_in_tooltip": false + } + }, "count": 1, "id": "toughasnails:wool_leggings" } diff --git a/common/src/generated/resources/data/toughasnails/tags/blocks/cooling_blocks.json b/common/src/generated/resources/data/toughasnails/tags/block/cooling_blocks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/blocks/cooling_blocks.json rename to common/src/generated/resources/data/toughasnails/tags/block/cooling_blocks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/blocks/heating_blocks.json b/common/src/generated/resources/data/toughasnails/tags/block/heating_blocks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/blocks/heating_blocks.json rename to common/src/generated/resources/data/toughasnails/tags/block/heating_blocks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/blocks/passable_blocks.json b/common/src/generated/resources/data/toughasnails/tags/block/passable_blocks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/blocks/passable_blocks.json rename to common/src/generated/resources/data/toughasnails/tags/block/passable_blocks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/cooling_armor.json b/common/src/generated/resources/data/toughasnails/tags/item/cooling_armor.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/cooling_armor.json rename to common/src/generated/resources/data/toughasnails/tags/item/cooling_armor.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json b/common/src/generated/resources/data/toughasnails/tags/item/cooling_consumed_items.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json rename to common/src/generated/resources/data/toughasnails/tags/item/cooling_consumed_items.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/cooling_held_items.json b/common/src/generated/resources/data/toughasnails/tags/item/cooling_held_items.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/cooling_held_items.json rename to common/src/generated/resources/data/toughasnails/tags/item/cooling_held_items.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/heating_armor.json b/common/src/generated/resources/data/toughasnails/tags/item/heating_armor.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/heating_armor.json rename to common/src/generated/resources/data/toughasnails/tags/item/heating_armor.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json b/common/src/generated/resources/data/toughasnails/tags/item/heating_consumed_items.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json rename to common/src/generated/resources/data/toughasnails/tags/item/heating_consumed_items.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/heating_held_items.json b/common/src/generated/resources/data/toughasnails/tags/item/heating_held_items.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/heating_held_items.json rename to common/src/generated/resources/data/toughasnails/tags/item/heating_held_items.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/100_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/100_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/100_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/10_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/10_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/10_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/20_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/20_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/20_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/30_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/30_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/30_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/40_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/40_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/40_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/50_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/50_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/50_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/60_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/60_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/60_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/70_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/70_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/70_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/80_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/80_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/80_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/hydration/90_hydration_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/hydration/90_hydration_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/hydration/90_hydration_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/poison_chance/100_poison_chance_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/poison_chance/100_poison_chance_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/poison_chance/100_poison_chance_drinks.json 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/item/poison_chance/25_poison_chance_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/poison_chance/25_poison_chance_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/poison_chance/25_poison_chance_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/poison_chance/50_poison_chance_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/poison_chance/50_poison_chance_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/poison_chance/50_poison_chance_drinks.json 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/item/poison_chance/75_poison_chance_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/poison_chance/75_poison_chance_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/poison_chance/75_poison_chance_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thermoregulator_cooling_fuel.json b/common/src/generated/resources/data/toughasnails/tags/item/thermoregulator_cooling_fuel.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thermoregulator_cooling_fuel.json rename to common/src/generated/resources/data/toughasnails/tags/item/thermoregulator_cooling_fuel.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thermoregulator_heating_fuel.json b/common/src/generated/resources/data/toughasnails/tags/item/thermoregulator_heating_fuel.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thermoregulator_heating_fuel.json rename to common/src/generated/resources/data/toughasnails/tags/item/thermoregulator_heating_fuel.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/10_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/10_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/10_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/11_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/11_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/11_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/12_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/12_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/12_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/13_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/13_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/13_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/14_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/14_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/14_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/15_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/15_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/15_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/16_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/16_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/16_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/17_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/17_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/17_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/18_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/18_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/18_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/19_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/19_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/19_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/1_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/1_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/1_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/20_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/20_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/20_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/2_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/2_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/2_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/3_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/3_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/3_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/4_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/4_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/4_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/5_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/5_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/5_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/6_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/6_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/6_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/7_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/7_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/7_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/8_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/8_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/8_thirst_drinks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json b/common/src/generated/resources/data/toughasnails/tags/item/thirst/9_thirst_drinks.json similarity index 100% rename from common/src/generated/resources/data/toughasnails/tags/items/thirst/9_thirst_drinks.json rename to common/src/generated/resources/data/toughasnails/tags/item/thirst/9_thirst_drinks.json diff --git a/common/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java b/common/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java index 04a40414..3592bcf6 100644 --- a/common/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java +++ b/common/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java @@ -17,6 +17,6 @@ public class TANDamageTypes private static ResourceKey register(String name) { - return ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(TANAPI.MOD_ID, name)); + return ResourceKey.create(Registries.DAMAGE_TYPE, ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name)); } } diff --git a/common/src/main/java/toughasnails/api/enchantment/TANEnchantments.java b/common/src/main/java/toughasnails/api/enchantment/TANEnchantments.java index 5085097c..41679e86 100644 --- a/common/src/main/java/toughasnails/api/enchantment/TANEnchantments.java +++ b/common/src/main/java/toughasnails/api/enchantment/TANEnchantments.java @@ -4,10 +4,19 @@ ******************************************************************************/ package toughasnails.api.enchantment; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.enchantment.Enchantment; +import toughasnails.core.ToughAsNails; public class TANEnchantments { - public static Enchantment THERMAL_TUNING; - public static Enchantment WATER_CLEANSING; + public static ResourceKey THERMAL_TUNING = key("thermal_tuning"); + public static ResourceKey WATER_CLEANSING = key("water_cleansing"); + + private static ResourceKey key(String name) + { + return ResourceKey.create(Registries.ENCHANTMENT, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name)); + } } diff --git a/common/src/main/java/toughasnails/api/village/TANPoiTypes.java b/common/src/main/java/toughasnails/api/village/TANPoiTypes.java index 17cb4bf1..e9d2edaf 100644 --- a/common/src/main/java/toughasnails/api/village/TANPoiTypes.java +++ b/common/src/main/java/toughasnails/api/village/TANPoiTypes.java @@ -16,6 +16,6 @@ public class TANPoiTypes private static ResourceKey createKey(String name) { - return ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, new ResourceLocation(TANAPI.MOD_ID, name)); + return ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name)); } } diff --git a/common/src/main/java/toughasnails/block/entity/WaterPurifierBlockEntity.java b/common/src/main/java/toughasnails/block/entity/WaterPurifierBlockEntity.java index 2c24bc86..adfb3219 100644 --- a/common/src/main/java/toughasnails/block/entity/WaterPurifierBlockEntity.java +++ b/common/src/main/java/toughasnails/block/entity/WaterPurifierBlockEntity.java @@ -24,6 +24,7 @@ import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -145,7 +146,7 @@ public static void serverTick(Level level, BlockPos pos, BlockState state, Water ItemStack filterStack = blockEntity.items.get(1); boolean hasFilter = !filterStack.isEmpty(); if (blockEntity.isFiltering() || hasFilter && !blockEntity.items.get(0).isEmpty()) { - RecipeHolder recipe = blockEntity.level.getRecipeManager().getRecipeFor((RecipeType) TANRecipeTypes.WATER_PURIFYING, blockEntity, blockEntity.level).orElse(null); + RecipeHolder recipe = blockEntity.level.getRecipeManager().getRecipeFor((RecipeType) TANRecipeTypes.WATER_PURIFYING, new SingleRecipeInput(blockEntity.items.get(0)), blockEntity.level).orElse(null); if (recipe != null) { @@ -376,7 +377,7 @@ protected boolean canFilter(@Nullable Recipe recipe) /** Get the time taken for an input item to be purified. */ protected int getTotalPurifyTime() { - return this.level.getRecipeManager().getRecipeFor((RecipeType) TANRecipeTypes.WATER_PURIFYING, this, this.level).map(r -> r.value().getPurifyTime()).orElse(200); + return this.level.getRecipeManager().getRecipeFor((RecipeType) TANRecipeTypes.WATER_PURIFYING, new SingleRecipeInput(this.items.get(0)), this.level).map(r -> r.value().getPurifyTime()).orElse(200); } private void filter(@Nullable Recipe recipe) diff --git a/common/src/main/java/toughasnails/client/gui/ThermoregulatorScreen.java b/common/src/main/java/toughasnails/client/gui/ThermoregulatorScreen.java index b8ba2774..981dd8d3 100644 --- a/common/src/main/java/toughasnails/client/gui/ThermoregulatorScreen.java +++ b/common/src/main/java/toughasnails/client/gui/ThermoregulatorScreen.java @@ -15,7 +15,7 @@ public class ThermoregulatorScreen extends AbstractContainerScreen { - private static final ResourceLocation TEXTURE = new ResourceLocation(TANAPI.MOD_ID, "textures/gui/container/thermoregulator.png"); + private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "textures/gui/container/thermoregulator.png"); public ThermoregulatorScreen(ThermoregulatorContainer screenContainer, Inventory inv, Component titleIn) { diff --git a/common/src/main/java/toughasnails/client/gui/WaterPurifierScreen.java b/common/src/main/java/toughasnails/client/gui/WaterPurifierScreen.java index 36fc1da8..45a06176 100644 --- a/common/src/main/java/toughasnails/client/gui/WaterPurifierScreen.java +++ b/common/src/main/java/toughasnails/client/gui/WaterPurifierScreen.java @@ -14,7 +14,7 @@ public class WaterPurifierScreen extends AbstractContainerScreen { - private static final ResourceLocation TEXTURE = new ResourceLocation(TANAPI.MOD_ID, "textures/gui/container/water_purifier.png"); + private static final ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "textures/gui/container/water_purifier.png"); public WaterPurifierScreen(WaterPurifierContainer screenContainer, Inventory inv, Component titleIn) { diff --git a/common/src/main/java/toughasnails/client/handler/LevelRenderHandler.java b/common/src/main/java/toughasnails/client/handler/LevelRenderHandler.java index e6c913e8..22d728b7 100644 --- a/common/src/main/java/toughasnails/client/handler/LevelRenderHandler.java +++ b/common/src/main/java/toughasnails/client/handler/LevelRenderHandler.java @@ -215,8 +215,8 @@ private void drawLine(VertexConsumer vertexConsumer, Matrix4f poseMatrix, PoseSt float normalY = Math.signum(fromY - toY); float normalZ = Math.signum(fromZ - toZ); - vertexConsumer.vertex(poseMatrix, fromX, fromY, fromZ).color(r, g, b, a).normal(lastPose, normalX, normalY, normalZ).endVertex(); - vertexConsumer.vertex(poseMatrix, toX, toY, toZ).color(r, g, b, a).normal(lastPose, normalX, normalY, normalZ).endVertex(); + vertexConsumer.addVertex(poseMatrix, fromX, fromY, fromZ).setColor(r, g, b, a).setNormal(lastPose, normalX, normalY, normalZ); + vertexConsumer.addVertex(poseMatrix, toX, toY, toZ).setColor(r, g, b, a).setNormal(lastPose, normalX, normalY, normalZ); } } } diff --git a/common/src/main/java/toughasnails/container/WaterPurifierContainer.java b/common/src/main/java/toughasnails/container/WaterPurifierContainer.java index 395fc315..92cb55df 100644 --- a/common/src/main/java/toughasnails/container/WaterPurifierContainer.java +++ b/common/src/main/java/toughasnails/container/WaterPurifierContainer.java @@ -14,6 +14,7 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.level.Level; import toughasnails.api.crafting.TANRecipeTypes; import toughasnails.api.container.TANContainerTypes; @@ -146,7 +147,7 @@ else if (!this.moveItemStackTo(slotItem, 3, 39, false)) // Move from purifier to protected boolean canPurify(ItemStack stack) { - return this.level.getRecipeManager().getRecipeFor((RecipeType)TANRecipeTypes.WATER_PURIFYING, new SimpleContainer(stack), this.level).isPresent(); + return this.level.getRecipeManager().getRecipeFor((RecipeType)TANRecipeTypes.WATER_PURIFYING, new SingleRecipeInput(stack), this.level).isPresent(); } protected boolean isFilter(ItemStack stack) diff --git a/common/src/main/java/toughasnails/core/ToughAsNails.java b/common/src/main/java/toughasnails/core/ToughAsNails.java index feb93d29..5ba1f022 100644 --- a/common/src/main/java/toughasnails/core/ToughAsNails.java +++ b/common/src/main/java/toughasnails/core/ToughAsNails.java @@ -57,7 +57,6 @@ private static void addRegistrars() regHelper.addRegistrar(Registries.BLOCK_ENTITY_TYPE, ModBlockEntities::registerBlockEntities); regHelper.addRegistrar(Registries.RECIPE_SERIALIZER, ModCrafting::registerRecipeSerializers); regHelper.addRegistrar(Registries.RECIPE_TYPE, ModCrafting::registerRecipeTypes); - regHelper.addRegistrar(Registries.ENCHANTMENT, ModEnchantments::registerEnchantments); regHelper.addRegistrar(Registries.MOB_EFFECT, ModPotions::registerEffects); regHelper.addRegistrar(Registries.POTION, ModPotions::registerPotions); regHelper.addRegistrar(Registries.CREATIVE_MODE_TAB, ModCreativeTab::registerCreativeTabs); diff --git a/common/src/main/java/toughasnails/crafting/WaterPurifierRecipe.java b/common/src/main/java/toughasnails/crafting/WaterPurifierRecipe.java index 8da5f2ff..dac35e4e 100644 --- a/common/src/main/java/toughasnails/crafting/WaterPurifierRecipe.java +++ b/common/src/main/java/toughasnails/crafting/WaterPurifierRecipe.java @@ -17,11 +17,12 @@ import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.level.Level; import toughasnails.api.crafting.TANRecipeSerializers; import toughasnails.api.crafting.TANRecipeTypes; -public class WaterPurifierRecipe implements Recipe +public class WaterPurifierRecipe implements Recipe { protected final ItemStack input; protected final ItemStack result; @@ -35,17 +36,17 @@ public WaterPurifierRecipe(ItemStack input, ItemStack result, int purifyTime) } @Override - public boolean matches(Container inv, Level worldIn) + public boolean matches(SingleRecipeInput input, Level var2) { if (this.input == null) return false; - ItemStack containerInput = inv.getItem(0); + ItemStack containerInput = input.getItem(0); return ItemStack.isSameItemSameComponents(this.input, containerInput) && this.input.getDamageValue() == containerInput.getDamageValue(); } @Override - public ItemStack assemble(Container inv, HolderLookup.Provider lookup) + public ItemStack assemble(SingleRecipeInput var1, HolderLookup.Provider var2) { return this.result.copy(); } diff --git a/common/src/main/java/toughasnails/enchantment/ThermalTuningEnchantment.java b/common/src/main/java/toughasnails/enchantment/ThermalTuningEnchantment.java deleted file mode 100644 index 7cf6f118..00000000 --- a/common/src/main/java/toughasnails/enchantment/ThermalTuningEnchantment.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright 2021, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.enchantment; - -import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.enchantment.Enchantment; - -public class ThermalTuningEnchantment extends Enchantment -{ - public ThermalTuningEnchantment() - { - super(Enchantment.definition(ItemTags.CHEST_ARMOR_ENCHANTABLE, 2, 1, Enchantment.dynamicCost(25, 25), Enchantment.dynamicCost(75, 25), 4, EquipmentSlot.CHEST)); - } - - @Override - public boolean isTreasureOnly() - { - return true; - } -} diff --git a/common/src/main/java/toughasnails/enchantment/WaterCleansingEnchantment.java b/common/src/main/java/toughasnails/enchantment/WaterCleansingEnchantment.java deleted file mode 100644 index 76a9b908..00000000 --- a/common/src/main/java/toughasnails/enchantment/WaterCleansingEnchantment.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright 2023, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.enchantment; - -import net.minecraft.tags.ItemTags; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.enchantment.Enchantment; -import toughasnails.item.EmptyCanteenItem; - -public class WaterCleansingEnchantment extends Enchantment -{ - public WaterCleansingEnchantment() - { - super(Enchantment.definition(ItemTags.DURABILITY_ENCHANTABLE, 2, 1, Enchantment.dynamicCost(25, 25), Enchantment.dynamicCost(75, 25), 4, EquipmentSlot.MAINHAND)); - } - - @Override - public boolean isTreasureOnly() - { - return true; - } - - @Override - public boolean canEnchant(ItemStack stack) - { - return stack.getItem() instanceof EmptyCanteenItem; - } -} diff --git a/common/src/main/java/toughasnails/init/ModArmorMaterials.java b/common/src/main/java/toughasnails/init/ModArmorMaterials.java index 9caee377..962d4024 100644 --- a/common/src/main/java/toughasnails/init/ModArmorMaterials.java +++ b/common/src/main/java/toughasnails/init/ModArmorMaterials.java @@ -35,7 +35,7 @@ public class ModArmorMaterials private static Holder register(String name, EnumMap map, int enchantmentValue, Holder equipSound, float toughness, float knockbackResistance, Supplier repairIngredient, boolean dyeable) { - List layers = List.of(new ArmorMaterial.Layer(new ResourceLocation(ToughAsNails.MOD_ID, name), "", dyeable)); - return Registry.registerForHolder(BuiltInRegistries.ARMOR_MATERIAL, new ResourceLocation(ToughAsNails.MOD_ID, name), new ArmorMaterial(map, enchantmentValue, equipSound, repairIngredient, layers, toughness, knockbackResistance)); + List layers = List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name), "", dyeable)); + return Registry.registerForHolder(BuiltInRegistries.ARMOR_MATERIAL, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name), new ArmorMaterial(map, enchantmentValue, equipSound, repairIngredient, layers, toughness, knockbackResistance)); } } diff --git a/common/src/main/java/toughasnails/init/ModBlockEntities.java b/common/src/main/java/toughasnails/init/ModBlockEntities.java index 9aac6909..691dba38 100644 --- a/common/src/main/java/toughasnails/init/ModBlockEntities.java +++ b/common/src/main/java/toughasnails/init/ModBlockEntities.java @@ -33,7 +33,7 @@ public static void registerBlockEntities(BiConsumer BlockEntityType register(BiConsumer> func, String name, BlockEntityType.Builder builder) { var type = builder.build(Util.fetchChoiceType(References.BLOCK_ENTITY, name)); - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), type); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), type); return type; } } diff --git a/common/src/main/java/toughasnails/init/ModBlocks.java b/common/src/main/java/toughasnails/init/ModBlocks.java index 626c07cc..9e846829 100644 --- a/common/src/main/java/toughasnails/init/ModBlocks.java +++ b/common/src/main/java/toughasnails/init/ModBlocks.java @@ -32,7 +32,7 @@ public static void registerBlocks(BiConsumer func) private static Block register(BiConsumer func, String name, Block block) { - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), block); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), block); return block; } } diff --git a/common/src/main/java/toughasnails/init/ModClient.java b/common/src/main/java/toughasnails/init/ModClient.java index a84cfde9..f6333c85 100644 --- a/common/src/main/java/toughasnails/init/ModClient.java +++ b/common/src/main/java/toughasnails/init/ModClient.java @@ -42,7 +42,7 @@ public class ModClient { static void registerItemProperties() { - ItemProperties.register(TANItems.THERMOMETER, new ResourceLocation(ToughAsNails.MOD_ID, "temperature"), new ClampedItemPropertyFunction() { + ItemProperties.register(TANItems.THERMOMETER, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "temperature"), new ClampedItemPropertyFunction() { final Map deltas = new HashMap<>(); @Override diff --git a/common/src/main/java/toughasnails/init/ModContainerTypes.java b/common/src/main/java/toughasnails/init/ModContainerTypes.java index 05a2c7df..47ae5509 100644 --- a/common/src/main/java/toughasnails/init/ModContainerTypes.java +++ b/common/src/main/java/toughasnails/init/ModContainerTypes.java @@ -36,7 +36,7 @@ public static void registerContainers(BiConsumer> public static MenuType register(BiConsumer> func, String name, MenuType.MenuSupplier factory) { var menuType = new MenuType<>(factory, FeatureFlags.DEFAULT_FLAGS); - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), menuType); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), menuType); return menuType; } } diff --git a/common/src/main/java/toughasnails/init/ModCrafting.java b/common/src/main/java/toughasnails/init/ModCrafting.java index 67f71a7c..14007d1d 100644 --- a/common/src/main/java/toughasnails/init/ModCrafting.java +++ b/common/src/main/java/toughasnails/init/ModCrafting.java @@ -41,13 +41,13 @@ public String toString() private static RecipeSerializer registerSerializer(BiConsumer> func, String name, RecipeSerializer serializer) { - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), serializer); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), serializer); return serializer; } private static RecipeType registerRecipe(BiConsumer> func, String name, RecipeType type) { - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), type); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), type); return type; } } diff --git a/common/src/main/java/toughasnails/init/ModCreativeTab.java b/common/src/main/java/toughasnails/init/ModCreativeTab.java index cea13515..39e13414 100644 --- a/common/src/main/java/toughasnails/init/ModCreativeTab.java +++ b/common/src/main/java/toughasnails/init/ModCreativeTab.java @@ -49,7 +49,7 @@ public static void registerCreativeTabs(BiConsumer func, String name, CreativeModeTab tab) { - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), tab); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), tab); return tab; } } \ No newline at end of file diff --git a/common/src/main/java/toughasnails/init/ModEnchantments.java b/common/src/main/java/toughasnails/init/ModEnchantments.java index 208c8423..f496edef 100644 --- a/common/src/main/java/toughasnails/init/ModEnchantments.java +++ b/common/src/main/java/toughasnails/init/ModEnchantments.java @@ -4,26 +4,44 @@ ******************************************************************************/ package toughasnails.init; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstrapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.EnchantmentTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.entity.EquipmentSlotGroup; +import net.minecraft.world.item.Item; import net.minecraft.world.item.enchantment.Enchantment; -import toughasnails.api.TANAPI; import toughasnails.api.enchantment.TANEnchantments; -import toughasnails.enchantment.ThermalTuningEnchantment; -import toughasnails.enchantment.WaterCleansingEnchantment; - -import java.util.function.BiConsumer; public class ModEnchantments { - public static void registerEnchantments(BiConsumer func) + public static void bootstrap(BootstrapContext context) { - TANEnchantments.THERMAL_TUNING = register(func, "thermal_tuning", new ThermalTuningEnchantment()); - TANEnchantments.WATER_CLEANSING = register(func, "water_cleansing", new WaterCleansingEnchantment()); + HolderGetter enchantmentGetter = context.lookup(Registries.ENCHANTMENT); + HolderGetter itemGetter = context.lookup(Registries.ITEM); + register( + context, + TANEnchantments.THERMAL_TUNING, + Enchantment.enchantment( + Enchantment.definition(itemGetter.getOrThrow(ItemTags.CHEST_ARMOR_ENCHANTABLE), 2, 1, Enchantment.dynamicCost(25, 25), Enchantment.dynamicCost(75, 25), 4, EquipmentSlotGroup.CHEST) + ) + .exclusiveWith(enchantmentGetter.getOrThrow(EnchantmentTags.ARMOR_EXCLUSIVE)) + ); + + register( + context, + TANEnchantments.WATER_CLEANSING, + Enchantment.enchantment( + Enchantment.definition(itemGetter.getOrThrow(ItemTags.DURABILITY_ENCHANTABLE), 2, 1, Enchantment.dynamicCost(25, 25), Enchantment.dynamicCost(75, 25), 4, EquipmentSlotGroup.MAINHAND) + ) + .exclusiveWith(enchantmentGetter.getOrThrow(EnchantmentTags.DAMAGE_EXCLUSIVE)) + ); } - private static Enchantment register(BiConsumer func, String name, Enchantment enchantment) + private static void register(BootstrapContext context, ResourceKey key, Enchantment.Builder builder) { - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), enchantment); - return enchantment; + context.register(key, builder.build(key.location())); } } diff --git a/common/src/main/java/toughasnails/init/ModItems.java b/common/src/main/java/toughasnails/init/ModItems.java index ba33a5ab..e7dea20e 100644 --- a/common/src/main/java/toughasnails/init/ModItems.java +++ b/common/src/main/java/toughasnails/init/ModItems.java @@ -94,7 +94,7 @@ public static void registerItems(BiConsumer func) private static Item register(BiConsumer func, String name, Item item) { - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), item); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), item); return item; } } diff --git a/common/src/main/java/toughasnails/init/ModPackets.java b/common/src/main/java/toughasnails/init/ModPackets.java index a19be538..d6d5379e 100644 --- a/common/src/main/java/toughasnails/init/ModPackets.java +++ b/common/src/main/java/toughasnails/init/ModPackets.java @@ -15,7 +15,7 @@ public class ModPackets { - private static final ResourceLocation CHANNEL = new ResourceLocation(TANAPI.MOD_ID, "main"); + private static final ResourceLocation CHANNEL = ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "main"); public static final PacketHandler HANDLER = new PacketHandler(CHANNEL); public static void init() { @@ -26,6 +26,6 @@ public static void init() public static void register(String name, CustomPacket packet) { - HANDLER.register(new ResourceLocation(ToughAsNails.MOD_ID, name), packet); + HANDLER.register(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name), packet); } } diff --git a/common/src/main/java/toughasnails/init/ModParticles.java b/common/src/main/java/toughasnails/init/ModParticles.java index a70a1446..acceb69d 100644 --- a/common/src/main/java/toughasnails/init/ModParticles.java +++ b/common/src/main/java/toughasnails/init/ModParticles.java @@ -24,7 +24,7 @@ public static void registerParticles(BiConsumer> T register(BiConsumer> func, String name, T particle) { - func.accept(new ResourceLocation(TANAPI.MOD_ID, name), particle); + func.accept(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, name), particle); return particle; } } diff --git a/common/src/main/java/toughasnails/init/ModPotions.java b/common/src/main/java/toughasnails/init/ModPotions.java index 1ff14855..2e1214f8 100644 --- a/common/src/main/java/toughasnails/init/ModPotions.java +++ b/common/src/main/java/toughasnails/init/ModPotions.java @@ -44,7 +44,7 @@ public static void registerPotions(BiConsumer func) private static Holder registerEffect(BiConsumer func, String name, MobEffect effect) { - ResourceLocation location = new ResourceLocation(ToughAsNails.MOD_ID, name); + ResourceLocation location = ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name); ResourceKey key = ResourceKey.create(Registries.MOB_EFFECT, location); func.accept(location, effect); return BuiltInRegistries.MOB_EFFECT.getHolder(key).orElseThrow(); @@ -52,7 +52,7 @@ private static Holder registerEffect(BiConsumer registerPotion(BiConsumer func, String name, Potion potion) { - ResourceLocation location = new ResourceLocation(ToughAsNails.MOD_ID, name); + ResourceLocation location = ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name); ResourceKey key = ResourceKey.create(Registries.POTION, location); func.accept(location, potion); return BuiltInRegistries.POTION.getHolder(key).orElseThrow(); diff --git a/common/src/main/java/toughasnails/init/ModTags.java b/common/src/main/java/toughasnails/init/ModTags.java index 3bc3753b..b1da1811 100644 --- a/common/src/main/java/toughasnails/init/ModTags.java +++ b/common/src/main/java/toughasnails/init/ModTags.java @@ -28,9 +28,9 @@ public static class Blocks { private static void init() {} - public static final TagKey COOLING_BLOCKS = create(new ResourceLocation(TANAPI.MOD_ID, "cooling_blocks")); - public static final TagKey HEATING_BLOCKS = create(new ResourceLocation(TANAPI.MOD_ID, "heating_blocks")); - public static final TagKey PASSABLE_BLOCKS = create(new ResourceLocation(TANAPI.MOD_ID, "passable_blocks")); + public static final TagKey COOLING_BLOCKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "cooling_blocks")); + public static final TagKey HEATING_BLOCKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "heating_blocks")); + public static final TagKey PASSABLE_BLOCKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "passable_blocks")); public static TagKey create(ResourceLocation name) { @@ -42,54 +42,54 @@ public static class Items { private static void init() {} - public static final TagKey COOLING_ARMOR = create(new ResourceLocation(TANAPI.MOD_ID, "cooling_armor")); - public static final TagKey HEATING_ARMOR = create(new ResourceLocation(TANAPI.MOD_ID, "heating_armor")); - public static final TagKey COOLING_HELD_ITEMS = create(new ResourceLocation(TANAPI.MOD_ID, "cooling_held_items")); - public static final TagKey HEATING_HELD_ITEMS = create(new ResourceLocation(TANAPI.MOD_ID, "heating_held_items")); - public static final TagKey COOLING_CONSUMED_ITEMS = create(new ResourceLocation(TANAPI.MOD_ID, "cooling_consumed_items")); - public static final TagKey HEATING_CONSUMED_ITEMS = create(new ResourceLocation(TANAPI.MOD_ID, "heating_consumed_items")); - - public static final TagKey THERMOREGULATOR_COOLING_FUEL = create(new ResourceLocation(TANAPI.MOD_ID, "thermoregulator_cooling_fuel")); - public static final TagKey THERMOREGULATOR_HEATING_FUEL = create(new ResourceLocation(TANAPI.MOD_ID, "thermoregulator_heating_fuel")); - - public static final TagKey ONE_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/1_thirst_drinks")); - public static final TagKey TWO_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/2_thirst_drinks")); - public static final TagKey THREE_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/3_thirst_drinks")); - public static final TagKey FOUR_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/4_thirst_drinks")); - public static final TagKey FIVE_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/5_thirst_drinks")); - public static final TagKey SIX_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/6_thirst_drinks")); - public static final TagKey SEVEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/7_thirst_drinks")); - public static final TagKey EIGHT_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/8_thirst_drinks")); - public static final TagKey NINE_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/9_thirst_drinks")); - public static final TagKey TEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/10_thirst_drinks")); - public static final TagKey ELEVEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/11_thirst_drinks")); - public static final TagKey TWELVE_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/12_thirst_drinks")); - public static final TagKey THIRTEEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/13_thirst_drinks")); - public static final TagKey FOURTEEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/14_thirst_drinks")); - public static final TagKey FIFTEEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/15_thirst_drinks")); - public static final TagKey SIXTEEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/16_thirst_drinks")); - public static final TagKey SEVENTEEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/17_thirst_drinks")); - public static final TagKey EIGHTEEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/18_thirst_drinks")); - public static final TagKey NINETEEN_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/19_thirst_drinks")); - public static final TagKey TWENTY_THIRST_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "thirst/20_thirst_drinks")); - - public static final TagKey TEN_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/10_hydration_drinks")); - public static final TagKey TWENTY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/20_hydration_drinks")); - public static final TagKey THIRTY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/30_hydration_drinks")); - public static final TagKey FOURTY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/40_hydration_drinks")); - public static final TagKey FIFTY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/50_hydration_drinks")); - public static final TagKey SIXTY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/60_hydration_drinks")); - public static final TagKey SEVENTY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/70_hydration_drinks")); - public static final TagKey EIGHTY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/80_hydration_drinks")); - public static final TagKey NINETY_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/90_hydration_drinks")); - public static final TagKey ONE_HUNDRED_HYDRATION_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "hydration/100_hydration_drinks")); - - public static final TagKey TWENTY_FIVE_POISON_CHANCE_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "poison_chance/25_poison_chance_drinks")); - public static final TagKey FIFTY_POISON_CHANCE_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "poison_chance/50_poison_chance_drinks")); - public static final TagKey SEVENTY_FIVE_POISON_CHANCE_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "poison_chance/75_poison_chance_drinks")); - public static final TagKey ONE_HUNDRED_POISON_CHANCE_DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "poison_chance/100_poison_chance_drinks")); - - public static final TagKey DRINKS = create(new ResourceLocation(TANAPI.MOD_ID, "drinks")); + public static final TagKey COOLING_ARMOR = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "cooling_armor")); + public static final TagKey HEATING_ARMOR = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "heating_armor")); + public static final TagKey COOLING_HELD_ITEMS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "cooling_held_items")); + public static final TagKey HEATING_HELD_ITEMS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "heating_held_items")); + public static final TagKey COOLING_CONSUMED_ITEMS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "cooling_consumed_items")); + public static final TagKey HEATING_CONSUMED_ITEMS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "heating_consumed_items")); + + public static final TagKey THERMOREGULATOR_COOLING_FUEL = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thermoregulator_cooling_fuel")); + public static final TagKey THERMOREGULATOR_HEATING_FUEL = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thermoregulator_heating_fuel")); + + public static final TagKey ONE_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/1_thirst_drinks")); + public static final TagKey TWO_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/2_thirst_drinks")); + public static final TagKey THREE_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/3_thirst_drinks")); + public static final TagKey FOUR_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/4_thirst_drinks")); + public static final TagKey FIVE_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/5_thirst_drinks")); + public static final TagKey SIX_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/6_thirst_drinks")); + public static final TagKey SEVEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/7_thirst_drinks")); + public static final TagKey EIGHT_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/8_thirst_drinks")); + public static final TagKey NINE_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/9_thirst_drinks")); + public static final TagKey TEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/10_thirst_drinks")); + public static final TagKey ELEVEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/11_thirst_drinks")); + public static final TagKey TWELVE_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/12_thirst_drinks")); + public static final TagKey THIRTEEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/13_thirst_drinks")); + public static final TagKey FOURTEEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/14_thirst_drinks")); + public static final TagKey FIFTEEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/15_thirst_drinks")); + public static final TagKey SIXTEEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/16_thirst_drinks")); + public static final TagKey SEVENTEEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/17_thirst_drinks")); + public static final TagKey EIGHTEEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/18_thirst_drinks")); + public static final TagKey NINETEEN_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/19_thirst_drinks")); + public static final TagKey TWENTY_THIRST_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "thirst/20_thirst_drinks")); + + public static final TagKey TEN_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/10_hydration_drinks")); + public static final TagKey TWENTY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/20_hydration_drinks")); + public static final TagKey THIRTY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/30_hydration_drinks")); + public static final TagKey FOURTY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/40_hydration_drinks")); + public static final TagKey FIFTY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/50_hydration_drinks")); + public static final TagKey SIXTY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/60_hydration_drinks")); + public static final TagKey SEVENTY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/70_hydration_drinks")); + public static final TagKey EIGHTY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/80_hydration_drinks")); + public static final TagKey NINETY_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/90_hydration_drinks")); + public static final TagKey ONE_HUNDRED_HYDRATION_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hydration/100_hydration_drinks")); + + public static final TagKey TWENTY_FIVE_POISON_CHANCE_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "poison_chance/25_poison_chance_drinks")); + public static final TagKey FIFTY_POISON_CHANCE_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "poison_chance/50_poison_chance_drinks")); + public static final TagKey SEVENTY_FIVE_POISON_CHANCE_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "poison_chance/75_poison_chance_drinks")); + public static final TagKey ONE_HUNDRED_POISON_CHANCE_DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "poison_chance/100_poison_chance_drinks")); + + public static final TagKey DRINKS = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "drinks")); public static int getThirstRestored(ItemStack drink) { @@ -126,13 +126,13 @@ public static class Biomes { private static void init() {} - public static final TagKey ICY_BIOMES = create(new ResourceLocation(TANAPI.MOD_ID, "icy_biomes")); - public static final TagKey COLD_BIOMES = create(new ResourceLocation(TANAPI.MOD_ID, "cold_biomes")); - public static final TagKey NEUTRAL_BIOMES = create(new ResourceLocation(TANAPI.MOD_ID, "neutral_biomes")); - public static final TagKey WARM_BIOMES = create(new ResourceLocation(TANAPI.MOD_ID, "warm_biomes")); - public static final TagKey HOT_BIOMES = create(new ResourceLocation(TANAPI.MOD_ID, "hot_biomes")); - public static final TagKey DIRTY_WATER_BIOMES = create(new ResourceLocation(TANAPI.MOD_ID, "dirty_water_biomes")); - public static final TagKey PURIFIED_WATER_BIOMES = create(new ResourceLocation(TANAPI.MOD_ID, "purified_water_biomes")); + public static final TagKey ICY_BIOMES = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "icy_biomes")); + public static final TagKey COLD_BIOMES = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "cold_biomes")); + public static final TagKey NEUTRAL_BIOMES = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "neutral_biomes")); + public static final TagKey WARM_BIOMES = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "warm_biomes")); + public static final TagKey HOT_BIOMES = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "hot_biomes")); + public static final TagKey DIRTY_WATER_BIOMES = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "dirty_water_biomes")); + public static final TagKey PURIFIED_WATER_BIOMES = create(ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "purified_water_biomes")); private static TagKey create(ResourceLocation loc) { @@ -159,7 +159,7 @@ public static void init() {} private static TagKey create(String name) { - return TagKey.create(Registries.TRIM_MATERIAL, new ResourceLocation(ToughAsNails.MOD_ID, name)); + return TagKey.create(Registries.TRIM_MATERIAL, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name)); } } } diff --git a/common/src/main/java/toughasnails/init/ModVillages.java b/common/src/main/java/toughasnails/init/ModVillages.java index 5855f4ed..9d790663 100644 --- a/common/src/main/java/toughasnails/init/ModVillages.java +++ b/common/src/main/java/toughasnails/init/ModVillages.java @@ -130,11 +130,11 @@ public static void addBuildings(RegistryAccess registryAccess) Registry templatePools = registryAccess.registry(Registries.TEMPLATE_POOL).get(); Registry processorLists = registryAccess.registry(Registries.PROCESSOR_LIST).get(); - addBuildingToPool(templatePools, processorLists, new ResourceLocation("minecraft:village/desert/houses"), ToughAsNails.MOD_ID + ":village/desert/houses/desert_climatologist_1", 1); - addBuildingToPool(templatePools, processorLists, new ResourceLocation("minecraft:village/savanna/houses"), ToughAsNails.MOD_ID + ":village/savanna/houses/savanna_climatologist_1", 2); - addBuildingToPool(templatePools, processorLists, new ResourceLocation("minecraft:village/plains/houses"), ToughAsNails.MOD_ID + ":village/plains/houses/plains_climatologist_1", 2); - addBuildingToPool(templatePools, processorLists, new ResourceLocation("minecraft:village/taiga/houses"), ToughAsNails.MOD_ID + ":village/taiga/houses/taiga_climatologist_1", 3); - addBuildingToPool(templatePools, processorLists, new ResourceLocation("minecraft:village/snowy/houses"), ToughAsNails.MOD_ID + ":village/snowy/houses/snowy_climatologist_1", 2); + addBuildingToPool(templatePools, processorLists, ResourceLocation.parse("minecraft:village/desert/houses"), ToughAsNails.MOD_ID + ":village/desert/houses/desert_climatologist_1", 1); + addBuildingToPool(templatePools, processorLists, ResourceLocation.parse("minecraft:village/savanna/houses"), ToughAsNails.MOD_ID + ":village/savanna/houses/savanna_climatologist_1", 2); + addBuildingToPool(templatePools, processorLists, ResourceLocation.parse("minecraft:village/plains/houses"), ToughAsNails.MOD_ID + ":village/plains/houses/plains_climatologist_1", 2); + addBuildingToPool(templatePools, processorLists, ResourceLocation.parse("minecraft:village/taiga/houses"), ToughAsNails.MOD_ID + ":village/taiga/houses/taiga_climatologist_1", 3); + addBuildingToPool(templatePools, processorLists, ResourceLocation.parse("minecraft:village/snowy/houses"), ToughAsNails.MOD_ID + ":village/snowy/houses/snowy_climatologist_1", 2); } public static void registerPointsOfInterest(BiConsumer func) @@ -207,7 +207,7 @@ public static void addBuildingToPool(Registry templatePoo StructureTemplatePool pool = templatePoolRegistry.get(poolRL); if (pool == null) return; - ResourceLocation emptyProcessor = new ResourceLocation("minecraft", "empty"); + ResourceLocation emptyProcessor = ResourceLocation.fromNamespaceAndPath("minecraft", "empty"); Holder processorHolder = processorListRegistry.getHolderOrThrow(ResourceKey.create(Registries.PROCESSOR_LIST, emptyProcessor)); SinglePoolElement piece = SinglePoolElement.single(nbtPieceRL, processorHolder).apply(StructureTemplatePool.Projection.RIGID); @@ -249,7 +249,7 @@ private static VillagerProfession register(BiConsumer func, String name, VillagerProfession profession) { - func.accept(new ResourceLocation(ToughAsNails.MOD_ID, name), profession); + func.accept(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name), profession); return profession; } diff --git a/common/src/main/java/toughasnails/item/DrinkItem.java b/common/src/main/java/toughasnails/item/DrinkItem.java index b8a84766..f20b6ac8 100644 --- a/common/src/main/java/toughasnails/item/DrinkItem.java +++ b/common/src/main/java/toughasnails/item/DrinkItem.java @@ -54,7 +54,7 @@ public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity en } @Override - public int getUseDuration(ItemStack stack) + public int getUseDuration(ItemStack stack, LivingEntity entity) { return 32; } diff --git a/common/src/main/java/toughasnails/item/EmptyCanteenItem.java b/common/src/main/java/toughasnails/item/EmptyCanteenItem.java index a65eb242..11c28981 100644 --- a/common/src/main/java/toughasnails/item/EmptyCanteenItem.java +++ b/common/src/main/java/toughasnails/item/EmptyCanteenItem.java @@ -6,6 +6,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; @@ -97,7 +98,8 @@ else if (level.getFluidState(pos).is(FluidTags.WATER)) Holder biome = player.level().getBiome(player.blockPosition()); Item canteenItem; - if (EnchantmentHelper.getItemEnchantmentLevel(TANEnchantments.WATER_CLEANSING, stack) > 0 || biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) + var enchantmentRegistry = level.registryAccess().registryOrThrow(Registries.ENCHANTMENT); + if (EnchantmentHelper.getItemEnchantmentLevel(enchantmentRegistry.getHolderOrThrow(TANEnchantments.WATER_CLEANSING), stack) > 0 || biome.is(ModTags.Biomes.PURIFIED_WATER_BIOMES)) { canteenItem = getPurifiedWaterCanteen(); } diff --git a/common/src/main/java/toughasnails/item/FilledCanteenItem.java b/common/src/main/java/toughasnails/item/FilledCanteenItem.java index 80a4c983..49b55e61 100644 --- a/common/src/main/java/toughasnails/item/FilledCanteenItem.java +++ b/common/src/main/java/toughasnails/item/FilledCanteenItem.java @@ -4,6 +4,7 @@ ******************************************************************************/ package toughasnails.item; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; @@ -38,7 +39,7 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, // Create a new stack with the same damage value, except purified ItemStack newStack = new ItemStack(getPurifiedWaterCanteen()); newStack.setDamageValue(stack.getDamageValue()); - stack.getEnchantments().entrySet().forEach(e -> newStack.enchant(e.getKey().value(), e.getIntValue())); + stack.getEnchantments().entrySet().forEach(e -> newStack.enchant(e.getKey(), e.getIntValue())); // Replace the current stack in the player's inventory player.getInventory().setItem(slot, newStack); @@ -78,10 +79,10 @@ public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity en if (!worldIn.isClientSide && !player.getAbilities().instabuild) { ItemStack emptyStack = new ItemStack(getEmptyCanteen()); - stack.getEnchantments().entrySet().forEach(e -> emptyStack.enchant(e.getKey().value(), e.getIntValue())); + stack.getEnchantments().entrySet().forEach(e -> emptyStack.enchant(e.getKey(), e.getIntValue())); AtomicBoolean broken = new AtomicBoolean(false); - stack.hurtAndBreak(1, player.getRandom(), (ServerPlayer)player, () -> broken.set(true)); + stack.hurtAndBreak(1, (ServerLevel)worldIn, (ServerPlayer)player, item -> broken.set(true)); if (broken.get()) { return emptyStack; @@ -92,7 +93,7 @@ public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity en } @Override - public int getUseDuration(ItemStack stack) + public int getUseDuration(ItemStack stack, LivingEntity entity) { return 32; } diff --git a/common/src/main/java/toughasnails/temperature/TemperatureHandler.java b/common/src/main/java/toughasnails/temperature/TemperatureHandler.java index 79aff76e..aaa22281 100644 --- a/common/src/main/java/toughasnails/temperature/TemperatureHandler.java +++ b/common/src/main/java/toughasnails/temperature/TemperatureHandler.java @@ -6,7 +6,7 @@ import glitchcore.event.entity.LivingEntityUseItemEvent; import glitchcore.event.player.PlayerEvent; -import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; import net.minecraft.util.Tuple; @@ -18,7 +18,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import toughasnails.api.damagesource.TANDamageTypes; import toughasnails.api.potion.TANEffects; import toughasnails.api.temperature.ITemperature; @@ -31,11 +30,10 @@ import toughasnails.network.UpdateTemperaturePacket; import java.util.HashSet; -import java.util.UUID; public class TemperatureHandler { - private static final UUID SPEED_MODIFIER_HYPERTHERMIA_UUID = UUID.fromString("30b6ca4e-c6df-4532-80db-1d024765b56b"); + protected static final ResourceLocation SPEED_MODIFIER_ID = ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "speed_modifier"); public static void onPlayerTick(Player player) { @@ -171,9 +169,9 @@ private static void removeHeatExhaustion(Player player) if (attribute != null) { - if (attribute.getModifier(SPEED_MODIFIER_HYPERTHERMIA_UUID) != null) + if (attribute.getModifier(SPEED_MODIFIER_ID) != null) { - attribute.removeModifier(SPEED_MODIFIER_HYPERTHERMIA_UUID); + attribute.removeModifier(SPEED_MODIFIER_ID); } } } @@ -190,7 +188,7 @@ protected static void tryAddHeatExhaustion(Player player) return; float f = 0.015F * TemperatureHelper.getPercentHyperthermic(player); - attributeinstance.addTransientModifier(new AttributeModifier(SPEED_MODIFIER_HYPERTHERMIA_UUID, "Hyperthermia slow", f, AttributeModifier.Operation.ADD_VALUE)); + attributeinstance.addTransientModifier(new AttributeModifier(SPEED_MODIFIER_ID, f, AttributeModifier.Operation.ADD_VALUE)); } } } diff --git a/common/src/main/java/toughasnails/temperature/TemperatureHelperImpl.java b/common/src/main/java/toughasnails/temperature/TemperatureHelperImpl.java index 763b8390..84a1ff38 100644 --- a/common/src/main/java/toughasnails/temperature/TemperatureHelperImpl.java +++ b/common/src/main/java/toughasnails/temperature/TemperatureHelperImpl.java @@ -8,6 +8,7 @@ import com.google.common.collect.Sets; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; import net.minecraft.tags.FluidTags; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.vehicle.Boat; @@ -326,8 +327,10 @@ protected static TemperatureLevel armorModifier(Player player, TemperatureLevel else if (armorAdjTemp == TemperatureLevel.ICY && current != TemperatureLevel.ICY) current = armorAdjTemp.increment(1); else current = armorAdjTemp; + var enchantmentRegistry = player.registryAccess().registryOrThrow(Registries.ENCHANTMENT); + // Armor enchantments - if (EnchantmentHelper.getEnchantmentLevel(TANEnchantments.THERMAL_TUNING, player) > 0) + if (EnchantmentHelper.getEnchantmentLevel(enchantmentRegistry.getHolderOrThrow(TANEnchantments.THERMAL_TUNING), player) > 0) current = TemperatureLevel.NEUTRAL; return current; diff --git a/common/src/main/java/toughasnails/temperature/TemperatureHooksClient.java b/common/src/main/java/toughasnails/temperature/TemperatureHooksClient.java index f8995b5d..a23b63c7 100644 --- a/common/src/main/java/toughasnails/temperature/TemperatureHooksClient.java +++ b/common/src/main/java/toughasnails/temperature/TemperatureHooksClient.java @@ -15,14 +15,14 @@ public class TemperatureHooksClient { - private static final ResourceLocation OVERHEATED_HEART_FULL = new ResourceLocation("toughasnails:hud/heart/overheated_full"); - private static final ResourceLocation OVERHEATED_HEART_FULL_BLINKING = new ResourceLocation("toughasnails:hud/heart/overheated_full_blinking"); - private static final ResourceLocation OVERHEATED_HEART_HALF = new ResourceLocation("toughasnails:hud/heart/overheated_half"); - private static final ResourceLocation OVERHEATED_HEART_HALF_BLINKING = new ResourceLocation("toughasnails:hud/heart/overheated_half_blinking"); - private static final ResourceLocation OVERHEATED_HEART_HARDCORE_FULL = new ResourceLocation("toughasnails:hud/heart/overheated_hardcore_full"); - private static final ResourceLocation OVERHEATED_HEART_HARDCORE_FULL_BLINKING = new ResourceLocation("toughasnails:hud/heart/overheated_hardcore_full_blinking"); - private static final ResourceLocation OVERHEATED_HEART_HARDCORE_HALF = new ResourceLocation("toughasnails:hud/heart/overheated_hardcore_half"); - private static final ResourceLocation OVERHEATED_HEART_HARDCORE_HALF_BLINKING = new ResourceLocation("toughasnails:hud/heart/overheated_hardcore_half_blinking"); + private static final ResourceLocation OVERHEATED_HEART_FULL = ResourceLocation.parse("toughasnails:hud/heart/overheated_full"); + private static final ResourceLocation OVERHEATED_HEART_FULL_BLINKING = ResourceLocation.parse("toughasnails:hud/heart/overheated_full_blinking"); + private static final ResourceLocation OVERHEATED_HEART_HALF = ResourceLocation.parse("toughasnails:hud/heart/overheated_half"); + private static final ResourceLocation OVERHEATED_HEART_HALF_BLINKING = ResourceLocation.parse("toughasnails:hud/heart/overheated_half_blinking"); + private static final ResourceLocation OVERHEATED_HEART_HARDCORE_FULL = ResourceLocation.parse("toughasnails:hud/heart/overheated_hardcore_full"); + private static final ResourceLocation OVERHEATED_HEART_HARDCORE_FULL_BLINKING = ResourceLocation.parse("toughasnails:hud/heart/overheated_hardcore_full_blinking"); + private static final ResourceLocation OVERHEATED_HEART_HARDCORE_HALF = ResourceLocation.parse("toughasnails:hud/heart/overheated_hardcore_half"); + private static final ResourceLocation OVERHEATED_HEART_HARDCORE_HALF_BLINKING = ResourceLocation.parse("toughasnails:hud/heart/overheated_hardcore_half_blinking"); public static void heartBlit(GuiGraphics gui, Gui.HeartType heartType, int x, int y, boolean isHardcore, boolean isBlinking, boolean isHalf) { diff --git a/common/src/main/java/toughasnails/temperature/TemperatureOverlayRenderer.java b/common/src/main/java/toughasnails/temperature/TemperatureOverlayRenderer.java index ecb2f5ad..4875979b 100644 --- a/common/src/main/java/toughasnails/temperature/TemperatureOverlayRenderer.java +++ b/common/src/main/java/toughasnails/temperature/TemperatureOverlayRenderer.java @@ -23,8 +23,8 @@ public class TemperatureOverlayRenderer { private static final Random RANDOM = new Random(); - public static final ResourceLocation OVERLAY = new ResourceLocation("toughasnails:textures/gui/icons.png"); - private static final ResourceLocation HYPERTHERMIA_OUTLINE_LOCATION = new ResourceLocation(TANAPI.MOD_ID, "textures/misc/hyperthermia_outline.png"); + public static final ResourceLocation OVERLAY = ResourceLocation.parse("toughasnails:textures/gui/icons.png"); + private static final ResourceLocation HYPERTHERMIA_OUTLINE_LOCATION = ResourceLocation.fromNamespaceAndPath(TANAPI.MOD_ID, "textures/misc/hyperthermia_outline.png"); private static long updateCounter; private static long flashCounter; private static long arrowCounter; @@ -41,7 +41,7 @@ public static void onBeginRenderFood(RenderGuiEvent.Pre event) if (!minecraft.options.hideGui && GuiUtils.shouldDrawSurvivalElements()) { GuiUtils.setupOverlayRenderState(true, false); - renderTemperature(event.getGuiGraphics(), event.getPartialTicks(), event.getScreenWidth(), event.getScreenHeight()); + renderTemperature(event.getGuiGraphics(), event.getDeltaTracker().getRealtimeDeltaTicks(), event.getScreenWidth(), event.getScreenHeight()); } } diff --git a/common/src/main/java/toughasnails/thirst/ThirstOverlayRenderer.java b/common/src/main/java/toughasnails/thirst/ThirstOverlayRenderer.java index a54e0625..ae49d168 100644 --- a/common/src/main/java/toughasnails/thirst/ThirstOverlayRenderer.java +++ b/common/src/main/java/toughasnails/thirst/ThirstOverlayRenderer.java @@ -22,7 +22,7 @@ public class ThirstOverlayRenderer { private static final Random RANDOM = new Random(); - public static final ResourceLocation OVERLAY = new ResourceLocation("toughasnails:textures/gui/icons.png"); + public static final ResourceLocation OVERLAY = ResourceLocation.parse("toughasnails:textures/gui/icons.png"); private static int updateCounter; diff --git a/common/src/main/resources/data/toughasnails/loot_tables/chests/village/village_climatologist.json b/common/src/main/resources/data/toughasnails/loot_table/chests/village/village_climatologist.json similarity index 100% rename from common/src/main/resources/data/toughasnails/loot_tables/chests/village/village_climatologist.json rename to common/src/main/resources/data/toughasnails/loot_table/chests/village/village_climatologist.json diff --git a/common/src/main/resources/data/toughasnails/structures/village/desert/houses/desert_climatologist_1.nbt b/common/src/main/resources/data/toughasnails/structure/village/desert/houses/desert_climatologist_1.nbt similarity index 100% rename from common/src/main/resources/data/toughasnails/structures/village/desert/houses/desert_climatologist_1.nbt rename to common/src/main/resources/data/toughasnails/structure/village/desert/houses/desert_climatologist_1.nbt diff --git a/common/src/main/resources/data/toughasnails/structures/village/plains/houses/plains_climatologist_1.nbt b/common/src/main/resources/data/toughasnails/structure/village/plains/houses/plains_climatologist_1.nbt similarity index 100% rename from common/src/main/resources/data/toughasnails/structures/village/plains/houses/plains_climatologist_1.nbt rename to common/src/main/resources/data/toughasnails/structure/village/plains/houses/plains_climatologist_1.nbt diff --git a/common/src/main/resources/data/toughasnails/structures/village/savanna/houses/savanna_climatologist_1.nbt b/common/src/main/resources/data/toughasnails/structure/village/savanna/houses/savanna_climatologist_1.nbt similarity index 100% rename from common/src/main/resources/data/toughasnails/structures/village/savanna/houses/savanna_climatologist_1.nbt rename to common/src/main/resources/data/toughasnails/structure/village/savanna/houses/savanna_climatologist_1.nbt diff --git a/common/src/main/resources/data/toughasnails/structures/village/snowy/houses/snowy_climatologist_1.nbt b/common/src/main/resources/data/toughasnails/structure/village/snowy/houses/snowy_climatologist_1.nbt similarity index 100% rename from common/src/main/resources/data/toughasnails/structures/village/snowy/houses/snowy_climatologist_1.nbt rename to common/src/main/resources/data/toughasnails/structure/village/snowy/houses/snowy_climatologist_1.nbt diff --git a/common/src/main/resources/data/toughasnails/structures/village/taiga/houses/taiga_climatologist_1.nbt b/common/src/main/resources/data/toughasnails/structure/village/taiga/houses/taiga_climatologist_1.nbt similarity index 100% rename from common/src/main/resources/data/toughasnails/structures/village/taiga/houses/taiga_climatologist_1.nbt rename to common/src/main/resources/data/toughasnails/structure/village/taiga/houses/taiga_climatologist_1.nbt diff --git a/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java b/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java index 564caf39..ff63298c 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java +++ b/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java @@ -22,6 +22,7 @@ import toughasnails.core.ToughAsNails; import toughasnails.forge.datagen.loot.TANLootTableProvider; import toughasnails.forge.datagen.provider.*; +import toughasnails.init.ModEnchantments; import java.util.HashSet; import java.util.Set; @@ -30,7 +31,8 @@ public class DataGenerationHandler { private static final RegistrySetBuilder REG_BUILDER = new RegistrySetBuilder() - .add(Registries.DAMAGE_TYPE, ModDamageTypes::bootstrap); + .add(Registries.DAMAGE_TYPE, ModDamageTypes::bootstrap) + .add(Registries.ENCHANTMENT, ModEnchantments::bootstrap); @SubscribeEvent public static void onGatherData(GatherDataEvent event) @@ -54,6 +56,7 @@ public static void onGatherData(GatherDataEvent event) generator.addProvider(event.includeServer(), new TANDamageTypeTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); generator.addProvider(event.includeServer(), new TANTrimMaterialTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); generator.addProvider(event.includeServer(), new TANPoiTypesTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(event.includeServer(), new TANEnchantmentTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); // Client generator.addProvider(event.includeClient(), new TANItemModelProvider(output, existingFileHelper)); diff --git a/forge/src/main/java/toughasnails/forge/datagen/loot/TANBlockLoot.java b/forge/src/main/java/toughasnails/forge/datagen/loot/TANBlockLoot.java index 7000cbbf..52301bbf 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/loot/TANBlockLoot.java +++ b/forge/src/main/java/toughasnails/forge/datagen/loot/TANBlockLoot.java @@ -4,6 +4,7 @@ ******************************************************************************/ package toughasnails.forge.datagen.loot; +import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.world.flag.FeatureFlags; @@ -19,9 +20,9 @@ public class TANBlockLoot extends BlockLootSubProvider { private static final Set EXPLOSION_RESISTANT = Set.of(); - public TANBlockLoot() + public TANBlockLoot(HolderLookup.Provider provider) { - super(EXPLOSION_RESISTANT, FeatureFlags.REGISTRY.allFlags()); + super(EXPLOSION_RESISTANT, FeatureFlags.REGISTRY.allFlags(), provider); } @Override diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANEnchantmentTagsProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANEnchantmentTagsProvider.java new file mode 100644 index 00000000..f5c5d7ee --- /dev/null +++ b/forge/src/main/java/toughasnails/forge/datagen/provider/TANEnchantmentTagsProvider.java @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright 2022, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.forge.datagen.provider; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.EnchantmentTagsProvider; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.EnchantmentTags; +import net.minecraft.world.level.block.Blocks; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import toughasnails.api.block.TANBlocks; +import toughasnails.api.enchantment.TANEnchantments; +import toughasnails.core.ToughAsNails; +import toughasnails.init.ModTags; + +import java.util.concurrent.CompletableFuture; + +public class TANEnchantmentTagsProvider extends EnchantmentTagsProvider +{ + public TANEnchantmentTagsProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) + { + super(output, lookupProvider); + } + + @Override + protected void addTags(HolderLookup.Provider provider) + { + // TAN tags + this.tag(EnchantmentTags.TREASURE).add(TANEnchantments.THERMAL_TUNING).add(TANEnchantments.WATER_CLEANSING); + } +} diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemModelProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemModelProvider.java index 1c228ce0..f9693151 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemModelProvider.java +++ b/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemModelProvider.java @@ -49,6 +49,6 @@ private void registerThermometerModels() private static ResourceLocation loc(String name) { - return new ResourceLocation(ToughAsNails.MOD_ID, name); + return ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name); } } diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java index dfe8e457..99885d52 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java +++ b/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java @@ -97,7 +97,7 @@ protected void buildRecipes(RecipeOutput output) public static void waterPurifier(RecipeOutput output, ItemStack input, ItemStack result, int purifyTime) { - WaterPurifierRecipeBuilder.waterPurifier(input, result, purifyTime).save(output, new ResourceLocation(ToughAsNails.MOD_ID, getItemName(result.getItem()))); + WaterPurifierRecipeBuilder.waterPurifier(input, result, purifyTime).save(output, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, getItemName(result.getItem()))); } public static void netheriteSmithing(RecipeOutput output, Item input, RecipeCategory category, Item result) @@ -106,6 +106,6 @@ public static void netheriteSmithing(RecipeOutput output, Item input, RecipeCate Ingredient.of(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE), Ingredient.of(input), Ingredient.of(Items.NETHERITE_INGOT), category, result ) .unlocks("has_netherite_ingot", has(Items.NETHERITE_INGOT)) - .save(output, new ResourceLocation(ToughAsNails.MOD_ID, getItemName(result)) + "_smithing"); + .save(output, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, getItemName(result)) + "_smithing"); } } diff --git a/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java b/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java index d0aa2253..416f3796 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java +++ b/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java @@ -25,7 +25,7 @@ public static WaterPurifierRecipeBuilder waterPurifier(ItemStack input, ItemStac public void save(RecipeOutput output, String name) { - this.save(output, new ResourceLocation(name)); + this.save(output, ResourceLocation.parse(name)); } public void save(RecipeOutput output, ResourceLocation location) diff --git a/gradle.properties b/gradle.properties index be9a6796..e5887b00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,20 +3,20 @@ group=com.github.glitchfiend release_channel=beta # Common -minecraft_version=1.20.6 +minecraft_version=1.21 # Forge -forge_version=50.0.13 -forge_version_range=[50.0.13,) -forge_loader_version_range=[50,) +forge_version=51.0.5 +forge_version_range=[51.0.5,) +forge_loader_version_range=[51,) # NeoForge -neoforge_version=20.6.57-beta -neoforge_version_range=[20.6,) +neoforge_version=21.0.6-beta +neoforge_version_range=[21.0,) neoforge_loader_version_range=[1,) # Fabric -fabric_version=0.97.8+1.20.6 +fabric_version=0.100.1+1.21 fabric_loader_version=0.15.11 # Mod options @@ -40,5 +40,5 @@ org.gradle.daemon=false # Dependencies nightconfig_version=3.6.7 -glitchcore_version=1.1.0.10 -serene_seasons_version=9.4.0.4 +glitchcore_version=2.0.0.0 +serene_seasons_version=10.0.0.0 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 98080be0..8a1d1d43 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,6 +1,6 @@ plugins { - id "net.neoforged.gradle.userdev" version "7.0.124" - id "net.neoforged.gradle.mixin" version "7.0.124" + id "net.neoforged.gradle.userdev" version "7.0.142" + id "net.neoforged.gradle.mixin" version "7.0.142" id "com.matthewprenger.cursegradle" version "1.4.0" }