diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 8a746110..16b9e0f7 100644 --- a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.21.1 2024-09-15T13:24:42.7248409 Registries +// 1.21.3 2024-12-05T17:14:27.3472282 Registries 55b6780cec82f4d4f609e750902d114649d4a8ad data/toughasnails/damage_type/hyperthermia.json eae6d7bc6de6b808206268351a4eb97746f013bf data/toughasnails/damage_type/thirst.json 0b83414be2d208b5f29e5575e1b11fe45ee59319 data/toughasnails/enchantment/thermal_tuning.json diff --git a/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c b/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c index 4a500a42..a96ea7d3 100644 --- a/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c +++ b/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c @@ -1,4 +1,4 @@ -// 1.21.1 2024-09-08T16:27:07.7039549 Tags for minecraft:enchantment mod id vanilla +// 1.21.3 2024-12-05T17:14:27.35023 Tags for minecraft:enchantment mod id vanilla 0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/on_random_loot.json 0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/tradeable.json 0ef1512d105fb2b8c0f389b6cc5fffd07ba5c820 data/minecraft/tags/enchantment/treasure.json diff --git a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 index 838e9c80..9fdb1c22 100644 --- a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 +++ b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-25T05:09:20.7510417 Tags for minecraft:worldgen/biome mod id toughasnails +// 1.21.3 2024-12-05T17:14:27.3467282 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 1c8c16c6..849d9e98 100644 --- a/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb +++ b/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb @@ -1,3 +1,3 @@ -// 1.21.1 2024-08-25T05:09:20.7500434 Tags for minecraft:trim_material mod id toughasnails +// 1.21.3 2024-12-05T17:14:27.3457287 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 db986675..8b4f16f1 100644 --- a/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 +++ b/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 @@ -1,2 +1,2 @@ -// 1.21.1 2024-08-25T05:09:20.7535554 Tags for minecraft:point_of_interest_type mod id toughasnails +// 1.21.3 2024-12-05T17:14:27.3497276 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 62dfe091..795ff0e9 100644 --- a/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-25T05:09:20.7510417 Loot Tables +// 1.21.3 2024-12-05T17:14:27.3467282 Loot Tables 8fca2e50f9df3893ec7ecb84fb15e5f83b33508a data/toughasnails/loot_table/blocks/rain_collector.json 5b982875ef4148c8acb507e82e690b7ffd814749 data/toughasnails/loot_table/blocks/temperature_gauge.json 3014cc41e7b43922f50ec3eb6c2eb83fbf3201d2 data/toughasnails/loot_table/blocks/thermoregulator.json diff --git a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 index 2b42a132..46b39b75 100644 --- a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 +++ b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-25T05:09:20.7525498 Tags for minecraft:item mod id toughasnails +// 1.21.3 2024-12-05T17:14:27.3487275 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 diff --git a/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 b/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 index 17c586cb..d6006584 100644 --- a/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 +++ b/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-25T05:09:20.7535554 Item Models: toughasnails +// 1.21.3 2024-12-05T17:14:27.3497276 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/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579 similarity index 72% rename from common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e rename to common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579 index 92fa2c84..8145b5c9 100644 --- a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579 @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-25T05:09:20.7520438 Recipes +// 1.21.3 2024-12-05T17:14:27.3477277 TAN 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 @@ -30,48 +30,48 @@ f1cc178cdd820a87e997cc32feab7c35dcef76b8 data/toughasnails/advancement/recipes/t 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 +7ae9cd24767c9e22920fc6742750639e7c25d563 data/toughasnails/recipe/apple_juice.json +0fa25520aa35419fcb34fe1086bda3f445302c77 data/toughasnails/recipe/cactus_juice.json +47fd12f6eb3a0024c6de07d278e3b681718cd023 data/toughasnails/recipe/charc_os.json +0504fefb53205c273ca75f2682178277eef01d4d 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 +d0691c802fd374aeb7ad983887c325fdac834b2e data/toughasnails/recipe/empty_copper_canteen.json +b6ff10adedcd98934cca27cc29ebb6c67e432081 data/toughasnails/recipe/empty_diamond_canteen.json +f112bb27cf9a5626319c8145da5813e0d7ff0b70 data/toughasnails/recipe/empty_gold_canteen.json +64e691d70fc9c358f36f1e6a5b0fd638e40e1f13 data/toughasnails/recipe/empty_iron_canteen.json +38e534d8e98abc149852dba77b5cae519c568f09 data/toughasnails/recipe/empty_leather_canteen.json +ae0f4935d08c1008cd8c409371404dec06781898 data/toughasnails/recipe/empty_netherite_canteen_smithing.json +8c11dc93bc9a23c5a9e18ee64e3f620d8136ac48 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 +87310eadcb834b2a6c6ff27b758d28ca58eea4c1 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 +51b498d973655d79b9a4197a82833742453bfcf7 data/toughasnails/recipe/leaf_boots.json +e872838768cacd34384bec36ddf0c761c2e8a9a4 data/toughasnails/recipe/leaf_chestplate.json +b134446bb20b1dddbf701e2b9cca48416ce4e45d data/toughasnails/recipe/leaf_helmet.json +eb0481ca4e00397c5e72125a7b59555042934ce4 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 +fe315b7c2ac5b588859583fcffd92fe5a16e907e data/toughasnails/recipe/melon_juice.json +1a36ab0cd38cec1fd3c1ee913cdf5f6bc0cb2b7e 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 +357003ba8d56d7c187f2125f54a662ee6d10fd11 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 +83e4c0746f49c7452fcbc47c7f09e0942f78105f data/toughasnails/recipe/netherite_water_canteen_smithing.json ceedf2e2958333f02b577fb673e60e3a605113a5 data/toughasnails/recipe/potion.json -05cad50ed7457dd7b71cff72212a92f73d50ae02 data/toughasnails/recipe/pumpkin_juice.json +c25f8ea63deddea28304843d9fa4bf9d2a656234 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 +dc11330068388d2a26806f4c46e7704a1e1e44b5 data/toughasnails/recipe/rain_collector.json +c578b91c32ec0e4763cfeed650f99caf7eac88df data/toughasnails/recipe/sweet_berry_juice.json +c329bb907035607d58dc77f74aa6d057b66bf502 data/toughasnails/recipe/temperature_gauge.json +c398e5e91633b705be2b5354c3e605ccabab1db9 data/toughasnails/recipe/thermometer.json +596bfedee294eb93394a02bb0c2977d49ff7d165 data/toughasnails/recipe/thermoregulator.json +bbcd1dfd1c65f9f8fba02280f16d924ea6176da3 data/toughasnails/recipe/water_purifier.json +98c5c0d4ad6c6b626ab0e2d91914756f404f24ba data/toughasnails/recipe/wool_boots.json +a0a10bc48337837c388cbd33b1ad5a31499ce6d2 data/toughasnails/recipe/wool_chestplate.json +36e7dff29394992f3bedbf7433f32f3f5abc1be1 data/toughasnails/recipe/wool_helmet.json +418b38867d425cf0f0b35556db6332524478087b data/toughasnails/recipe/wool_leggings.json diff --git a/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b b/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b index 25754927..b76c8194 100644 --- a/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b +++ b/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b @@ -1,3 +1,3 @@ -// 1.21.1 2024-08-25T05:09:20.7525498 Tags for minecraft:damage_type mod id toughasnails +// 1.21.3 2024-12-05T17:14:27.3477277 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 ae19800e..0c46ca54 100644 --- a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 +++ b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 @@ -1,4 +1,4 @@ -// 1.21.1 2024-08-25T05:09:20.7510417 Tags for minecraft:block mod id toughasnails +// 1.21.3 2024-12-05T17:14:27.3462285 Tags for minecraft:block mod id toughasnails bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/block/mineable/axe.json 0342cd45a4d6f790afda91090de45871d9b0ef63 data/minecraft/tags/block/mineable/pickaxe.json eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/block/cooling_blocks.json diff --git a/common/src/generated/resources/data/toughasnails/recipe/apple_juice.json b/common/src/generated/resources/data/toughasnails/recipe/apple_juice.json index 1d80960f..401943e7 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/apple_juice.json +++ b/common/src/generated/resources/data/toughasnails/recipe/apple_juice.json @@ -3,15 +3,9 @@ "category": "misc", "group": "juice", "ingredients": [ - { - "item": "toughasnails:purified_water_bottle" - }, - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:apple" - } + "toughasnails:purified_water_bottle", + "minecraft:sugar", + "minecraft:apple" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/toughasnails/recipe/cactus_juice.json b/common/src/generated/resources/data/toughasnails/recipe/cactus_juice.json index fd821737..69ccbd8b 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/cactus_juice.json +++ b/common/src/generated/resources/data/toughasnails/recipe/cactus_juice.json @@ -3,15 +3,9 @@ "category": "misc", "group": "juice", "ingredients": [ - { - "item": "toughasnails:purified_water_bottle" - }, - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:cactus" - } + "toughasnails:purified_water_bottle", + "minecraft:sugar", + "minecraft:cactus" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/toughasnails/recipe/charc_os.json b/common/src/generated/resources/data/toughasnails/recipe/charc_os.json index 94163d41..22dba69b 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/charc_os.json +++ b/common/src/generated/resources/data/toughasnails/recipe/charc_os.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "item": "minecraft:charcoal" - }, - "B": { - "item": "minecraft:bowl" - }, - "S": { - "item": "minecraft:sugar" - } + "#": "minecraft:charcoal", + "B": "minecraft:bowl", + "S": "minecraft:sugar" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/chorus_fruit_juice.json b/common/src/generated/resources/data/toughasnails/recipe/chorus_fruit_juice.json index 67537be6..fe709502 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/chorus_fruit_juice.json +++ b/common/src/generated/resources/data/toughasnails/recipe/chorus_fruit_juice.json @@ -3,15 +3,9 @@ "category": "misc", "group": "juice", "ingredients": [ - { - "item": "toughasnails:purified_water_bottle" - }, - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:chorus_fruit" - } + "toughasnails:purified_water_bottle", + "minecraft:sugar", + "minecraft:chorus_fruit" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/toughasnails/recipe/empty_copper_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_copper_canteen.json index 30053e37..d4f8eb58 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/empty_copper_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipe/empty_copper_canteen.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "#": { - "item": "minecraft:copper_ingot" - } + "#": "minecraft:copper_ingot" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/empty_diamond_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_diamond_canteen.json index d975c1aa..649601ab 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/empty_diamond_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipe/empty_diamond_canteen.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "#": { - "item": "minecraft:diamond" - } + "#": "minecraft:diamond" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/empty_gold_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_gold_canteen.json index 5b0ed12a..83cca6ea 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/empty_gold_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipe/empty_gold_canteen.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "#": { - "item": "minecraft:gold_ingot" - } + "#": "minecraft:gold_ingot" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/empty_iron_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_iron_canteen.json index 8a8ca88b..1e0f8ae8 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/empty_iron_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipe/empty_iron_canteen.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "#": { - "item": "minecraft:iron_ingot" - } + "#": "minecraft:iron_ingot" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/empty_leather_canteen.json b/common/src/generated/resources/data/toughasnails/recipe/empty_leather_canteen.json index ee5a8e1d..331f2711 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/empty_leather_canteen.json +++ b/common/src/generated/resources/data/toughasnails/recipe/empty_leather_canteen.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "#": { - "item": "minecraft:leather" - } + "#": "minecraft:leather" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/empty_netherite_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/empty_netherite_canteen_smithing.json index ab97cb7f..5446006b 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/empty_netherite_canteen_smithing.json +++ b/common/src/generated/resources/data/toughasnails/recipe/empty_netherite_canteen_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "item": "minecraft:netherite_ingot" - }, - "base": { - "item": "toughasnails:empty_diamond_canteen" - }, + "addition": "minecraft:netherite_ingot", + "base": "toughasnails:empty_diamond_canteen", "result": { "count": 1, "id": "toughasnails:empty_netherite_canteen" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipe/glow_berry_juice.json b/common/src/generated/resources/data/toughasnails/recipe/glow_berry_juice.json index 5478a467..906db3ff 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/glow_berry_juice.json +++ b/common/src/generated/resources/data/toughasnails/recipe/glow_berry_juice.json @@ -3,15 +3,9 @@ "category": "misc", "group": "juice", "ingredients": [ - { - "item": "toughasnails:purified_water_bottle" - }, - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:glow_berries" - } + "toughasnails:purified_water_bottle", + "minecraft:sugar", + "minecraft:glow_berries" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/toughasnails/recipe/ice_cream.json b/common/src/generated/resources/data/toughasnails/recipe/ice_cream.json index e65d5581..dac63652 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/ice_cream.json +++ b/common/src/generated/resources/data/toughasnails/recipe/ice_cream.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "#": { - "item": "minecraft:snowball" - }, - "B": { - "item": "minecraft:bowl" - }, - "S": { - "item": "minecraft:sugar" - } + "#": "minecraft:snowball", + "B": "minecraft:bowl", + "S": "minecraft:sugar" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/leaf_boots.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_boots.json index 83b0868c..ae49f102 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/leaf_boots.json +++ b/common/src/generated/resources/data/toughasnails/recipe/leaf_boots.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:leaves" - } + "X": "#minecraft:leaves" }, "pattern": [ "X X", diff --git a/common/src/generated/resources/data/toughasnails/recipe/leaf_chestplate.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_chestplate.json index c5e32761..1895f427 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/leaf_chestplate.json +++ b/common/src/generated/resources/data/toughasnails/recipe/leaf_chestplate.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:leaves" - } + "X": "#minecraft:leaves" }, "pattern": [ "X X", diff --git a/common/src/generated/resources/data/toughasnails/recipe/leaf_helmet.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_helmet.json index e4b2e287..b1600729 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/leaf_helmet.json +++ b/common/src/generated/resources/data/toughasnails/recipe/leaf_helmet.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:leaves" - } + "X": "#minecraft:leaves" }, "pattern": [ "XXX", diff --git a/common/src/generated/resources/data/toughasnails/recipe/leaf_leggings.json b/common/src/generated/resources/data/toughasnails/recipe/leaf_leggings.json index 9c97c7e3..5fccb999 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/leaf_leggings.json +++ b/common/src/generated/resources/data/toughasnails/recipe/leaf_leggings.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:leaves" - } + "X": "#minecraft:leaves" }, "pattern": [ "XXX", diff --git a/common/src/generated/resources/data/toughasnails/recipe/melon_juice.json b/common/src/generated/resources/data/toughasnails/recipe/melon_juice.json index 4b56c279..99d61aeb 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/melon_juice.json +++ b/common/src/generated/resources/data/toughasnails/recipe/melon_juice.json @@ -3,15 +3,9 @@ "category": "misc", "group": "juice", "ingredients": [ - { - "item": "toughasnails:purified_water_bottle" - }, - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:melon_slice" - } + "toughasnails:purified_water_bottle", + "minecraft:sugar", + "minecraft:melon_slice" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/toughasnails/recipe/netherite_dirty_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_dirty_water_canteen_smithing.json index 622fa062..c34dfb68 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/netherite_dirty_water_canteen_smithing.json +++ b/common/src/generated/resources/data/toughasnails/recipe/netherite_dirty_water_canteen_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "item": "minecraft:netherite_ingot" - }, - "base": { - "item": "toughasnails:diamond_dirty_water_canteen" - }, + "addition": "minecraft:netherite_ingot", + "base": "toughasnails:diamond_dirty_water_canteen", "result": { "count": 1, "id": "toughasnails:netherite_dirty_water_canteen" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen_smithing.json index 857b3ff1..1ff30b03 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen_smithing.json +++ b/common/src/generated/resources/data/toughasnails/recipe/netherite_purified_water_canteen_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "item": "minecraft:netherite_ingot" - }, - "base": { - "item": "toughasnails:diamond_purified_water_canteen" - }, + "addition": "minecraft:netherite_ingot", + "base": "toughasnails:diamond_purified_water_canteen", "result": { "count": 1, "id": "toughasnails:netherite_purified_water_canteen" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen_smithing.json b/common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen_smithing.json index d2d6cfb2..a62fba77 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen_smithing.json +++ b/common/src/generated/resources/data/toughasnails/recipe/netherite_water_canteen_smithing.json @@ -1,16 +1,10 @@ { "type": "minecraft:smithing_transform", - "addition": { - "item": "minecraft:netherite_ingot" - }, - "base": { - "item": "toughasnails:diamond_water_canteen" - }, + "addition": "minecraft:netherite_ingot", + "base": "toughasnails:diamond_water_canteen", "result": { "count": 1, "id": "toughasnails:netherite_water_canteen" }, - "template": { - "item": "minecraft:netherite_upgrade_smithing_template" - } + "template": "minecraft:netherite_upgrade_smithing_template" } \ No newline at end of file diff --git a/common/src/generated/resources/data/toughasnails/recipe/pumpkin_juice.json b/common/src/generated/resources/data/toughasnails/recipe/pumpkin_juice.json index f1c0464b..32a35c0e 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/pumpkin_juice.json +++ b/common/src/generated/resources/data/toughasnails/recipe/pumpkin_juice.json @@ -3,15 +3,9 @@ "category": "misc", "group": "juice", "ingredients": [ - { - "item": "toughasnails:purified_water_bottle" - }, - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:pumpkin" - } + "toughasnails:purified_water_bottle", + "minecraft:sugar", + "minecraft:pumpkin" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/toughasnails/recipe/rain_collector.json b/common/src/generated/resources/data/toughasnails/recipe/rain_collector.json index 985f7cd0..9482ae71 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/rain_collector.json +++ b/common/src/generated/resources/data/toughasnails/recipe/rain_collector.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "S": { - "item": "minecraft:string" - }, - "W": { - "tag": "minecraft:planks" - } + "S": "minecraft:string", + "W": "#minecraft:planks" }, "pattern": [ "WSW", diff --git a/common/src/generated/resources/data/toughasnails/recipe/sweet_berry_juice.json b/common/src/generated/resources/data/toughasnails/recipe/sweet_berry_juice.json index 5d14ac77..df9b3974 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/sweet_berry_juice.json +++ b/common/src/generated/resources/data/toughasnails/recipe/sweet_berry_juice.json @@ -3,15 +3,9 @@ "category": "misc", "group": "juice", "ingredients": [ - { - "item": "toughasnails:purified_water_bottle" - }, - { - "item": "minecraft:sugar" - }, - { - "item": "minecraft:sweet_berries" - } + "toughasnails:purified_water_bottle", + "minecraft:sugar", + "minecraft:sweet_berries" ], "result": { "count": 1, diff --git a/common/src/generated/resources/data/toughasnails/recipe/temperature_gauge.json b/common/src/generated/resources/data/toughasnails/recipe/temperature_gauge.json index 8323c548..ca7f8b3e 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/temperature_gauge.json +++ b/common/src/generated/resources/data/toughasnails/recipe/temperature_gauge.json @@ -2,18 +2,10 @@ "type": "minecraft:crafting_shaped", "category": "redstone", "key": { - "B": { - "item": "minecraft:brick_slab" - }, - "G": { - "item": "minecraft:glass" - }, - "Q": { - "item": "minecraft:quartz" - }, - "T": { - "item": "toughasnails:thermometer" - } + "B": "minecraft:brick_slab", + "G": "minecraft:glass", + "Q": "minecraft:quartz", + "T": "toughasnails:thermometer" }, "pattern": [ "GGG", diff --git a/common/src/generated/resources/data/toughasnails/recipe/thermometer.json b/common/src/generated/resources/data/toughasnails/recipe/thermometer.json index 0f1ef4d8..714245d1 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/thermometer.json +++ b/common/src/generated/resources/data/toughasnails/recipe/thermometer.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "#": { - "item": "minecraft:copper_ingot" - }, - "X": { - "item": "minecraft:redstone" - } + "#": "minecraft:copper_ingot", + "X": "minecraft:redstone" }, "pattern": [ " # ", diff --git a/common/src/generated/resources/data/toughasnails/recipe/thermoregulator.json b/common/src/generated/resources/data/toughasnails/recipe/thermoregulator.json index ce2ebc8a..ed2ab248 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/thermoregulator.json +++ b/common/src/generated/resources/data/toughasnails/recipe/thermoregulator.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "I": { - "item": "minecraft:iron_ingot" - }, - "S": { - "item": "minecraft:smooth_stone" - }, - "T": { - "item": "toughasnails:thermometer" - } + "I": "minecraft:iron_ingot", + "S": "minecraft:smooth_stone", + "T": "toughasnails:thermometer" }, "pattern": [ "SIS", diff --git a/common/src/generated/resources/data/toughasnails/recipe/water_purifier.json b/common/src/generated/resources/data/toughasnails/recipe/water_purifier.json index e84be711..15e6e00c 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/water_purifier.json +++ b/common/src/generated/resources/data/toughasnails/recipe/water_purifier.json @@ -2,15 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "C": { - "item": "minecraft:copper_ingot" - }, - "G": { - "item": "minecraft:glass" - }, - "W": { - "tag": "minecraft:planks" - } + "C": "minecraft:copper_ingot", + "G": "minecraft:glass", + "W": "#minecraft:planks" }, "pattern": [ "GCG", diff --git a/common/src/generated/resources/data/toughasnails/recipe/wool_boots.json b/common/src/generated/resources/data/toughasnails/recipe/wool_boots.json index 48ccff56..3c115f23 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/wool_boots.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_boots.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:wool" - } + "X": "#minecraft:wool" }, "pattern": [ "X X", diff --git a/common/src/generated/resources/data/toughasnails/recipe/wool_chestplate.json b/common/src/generated/resources/data/toughasnails/recipe/wool_chestplate.json index f7be0956..66109255 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/wool_chestplate.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_chestplate.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:wool" - } + "X": "#minecraft:wool" }, "pattern": [ "X X", diff --git a/common/src/generated/resources/data/toughasnails/recipe/wool_helmet.json b/common/src/generated/resources/data/toughasnails/recipe/wool_helmet.json index 3356c443..45b123e1 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/wool_helmet.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_helmet.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:wool" - } + "X": "#minecraft:wool" }, "pattern": [ "XXX", diff --git a/common/src/generated/resources/data/toughasnails/recipe/wool_leggings.json b/common/src/generated/resources/data/toughasnails/recipe/wool_leggings.json index 758c7bea..13ac4421 100644 --- a/common/src/generated/resources/data/toughasnails/recipe/wool_leggings.json +++ b/common/src/generated/resources/data/toughasnails/recipe/wool_leggings.json @@ -2,9 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "X": { - "tag": "minecraft:wool" - } + "X": "#minecraft:wool" }, "pattern": [ "XXX", diff --git a/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java b/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java index 68e6710a..bae9ee73 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java +++ b/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java @@ -33,8 +33,7 @@ public class DataGenerationHandler { private static final RegistrySetBuilder REG_BUILDER = new RegistrySetBuilder() .add(Registries.DAMAGE_TYPE, ModDamageTypes::bootstrap) - .add(Registries.ENCHANTMENT, ModEnchantments::bootstrap) - .add(Registries.MODEL, ModEquipmentModels::bootstrap); + .add(Registries.ENCHANTMENT, ModEnchantments::bootstrap); @SubscribeEvent public static void onGatherData(GatherDataEvent event) @@ -46,7 +45,7 @@ public static void onGatherData(GatherDataEvent event) var datapackProvider = generator.addProvider(event.includeServer(), new RegistriesDatapackGenerator(output, event.getLookupProvider().thenApply(r -> constructRegistries(r, REG_BUILDER)), Set.of(TANAPI.MOD_ID))); // Recipes - generator.addProvider(event.includeServer(), new TANRecipeProvider(output, event.getLookupProvider())); + generator.addProvider(event.includeServer(), new TANRecipeProvider.Runner(output, event.getLookupProvider())); // Loot generator.addProvider(event.includeServer(), TANLootTableProvider.create(output, event.getLookupProvider())); 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 99885d52..456b3d2b 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java +++ b/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java @@ -20,56 +20,56 @@ public class TANRecipeProvider extends RecipeProvider { - public TANRecipeProvider(PackOutput output, CompletableFuture lookup) + public TANRecipeProvider(HolderLookup.Provider provider, RecipeOutput output) { - super(output, lookup); + super(provider, output); } @Override - protected void buildRecipes(RecipeOutput output) + protected void buildRecipes() { // Canteen - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_LEATHER_CANTEEN).define('#', Items.LEATHER).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_leather", has(Items.LEATHER)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_COPPER_CANTEEN).define('#', Items.COPPER_INGOT).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_copper_ingot", has(Items.COPPER_INGOT)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_IRON_CANTEEN).define('#', Items.IRON_INGOT).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_GOLD_CANTEEN).define('#', Items.GOLD_INGOT).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_DIAMOND_CANTEEN).define('#', Items.DIAMOND).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_diamond", has(Items.DIAMOND)).save(output); + this.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_LEATHER_CANTEEN).define('#', Items.LEATHER).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_leather", has(Items.LEATHER)).save(output); + this.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_COPPER_CANTEEN).define('#', Items.COPPER_INGOT).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_copper_ingot", has(Items.COPPER_INGOT)).save(output); + this.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_IRON_CANTEEN).define('#', Items.IRON_INGOT).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)).save(output); + this.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_GOLD_CANTEEN).define('#', Items.GOLD_INGOT).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_gold_ingot", has(Items.GOLD_INGOT)).save(output); + this.shaped(RecipeCategory.TOOLS, TANItems.EMPTY_DIAMOND_CANTEEN).define('#', Items.DIAMOND).pattern(" # ").pattern("# #").pattern(" # ").unlockedBy("has_diamond", has(Items.DIAMOND)).save(output); netheriteSmithing(output, TANItems.EMPTY_DIAMOND_CANTEEN, RecipeCategory.TOOLS, TANItems.EMPTY_NETHERITE_CANTEEN); netheriteSmithing(output, TANItems.DIAMOND_DIRTY_WATER_CANTEEN, RecipeCategory.TOOLS, TANItems.NETHERITE_DIRTY_WATER_CANTEEN); netheriteSmithing(output, TANItems.DIAMOND_WATER_CANTEEN, RecipeCategory.TOOLS, TANItems.NETHERITE_WATER_CANTEEN); netheriteSmithing(output, TANItems.DIAMOND_PURIFIED_WATER_CANTEEN, RecipeCategory.TOOLS, TANItems.NETHERITE_PURIFIED_WATER_CANTEEN); // Juice - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.APPLE_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.APPLE).group("juice").unlockedBy("has_apple", has(Items.APPLE)).save(output); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.CACTUS_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.CACTUS).group("juice").unlockedBy("has_cactus", has(Items.CACTUS)).save(output); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.CHORUS_FRUIT_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.CHORUS_FRUIT).group("juice").unlockedBy("has_chorus_fruit", has(Items.CHORUS_FRUIT)).save(output); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.GLOW_BERRY_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.GLOW_BERRIES).group("juice").unlockedBy("has_glow_berries", has(Items.GLOW_BERRIES)).save(output); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.MELON_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.MELON_SLICE).group("juice").unlockedBy("has_melon_slice", has(Items.MELON_SLICE)).save(output); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.PUMPKIN_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.PUMPKIN).group("juice").unlockedBy("has_pumpkin", has(Items.PUMPKIN)).save(output); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, TANItems.SWEET_BERRY_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.SWEET_BERRIES).group("juice").unlockedBy("has_sweet_berries", has(Items.SWEET_BERRIES)).save(output); + this.shapeless(RecipeCategory.FOOD, TANItems.APPLE_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.APPLE).group("juice").unlockedBy("has_apple", has(Items.APPLE)).save(output); + this.shapeless(RecipeCategory.FOOD, TANItems.CACTUS_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.CACTUS).group("juice").unlockedBy("has_cactus", has(Items.CACTUS)).save(output); + this.shapeless(RecipeCategory.FOOD, TANItems.CHORUS_FRUIT_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.CHORUS_FRUIT).group("juice").unlockedBy("has_chorus_fruit", has(Items.CHORUS_FRUIT)).save(output); + this.shapeless(RecipeCategory.FOOD, TANItems.GLOW_BERRY_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.GLOW_BERRIES).group("juice").unlockedBy("has_glow_berries", has(Items.GLOW_BERRIES)).save(output); + this.shapeless(RecipeCategory.FOOD, TANItems.MELON_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.MELON_SLICE).group("juice").unlockedBy("has_melon_slice", has(Items.MELON_SLICE)).save(output); + this.shapeless(RecipeCategory.FOOD, TANItems.PUMPKIN_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.PUMPKIN).group("juice").unlockedBy("has_pumpkin", has(Items.PUMPKIN)).save(output); + this.shapeless(RecipeCategory.FOOD, TANItems.SWEET_BERRY_JUICE).requires(TANItems.PURIFIED_WATER_BOTTLE).requires(Items.SUGAR).requires(Items.SWEET_BERRIES).group("juice").unlockedBy("has_sweet_berries", has(Items.SWEET_BERRIES)).save(output); // Foods - ShapedRecipeBuilder.shaped(RecipeCategory.FOOD, TANItems.ICE_CREAM).define('#', Items.SNOWBALL).define('S', Items.SUGAR).define('B', Items.BOWL).pattern(" # ").pattern("#S#").pattern(" B ").unlockedBy("has_snowball", has(Items.SNOWBALL)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.FOOD, TANItems.CHARC_0S).define('#', Items.CHARCOAL).define('S', Items.SUGAR).define('B', Items.BOWL).pattern(" # ").pattern("#S#").pattern(" B ").unlockedBy("has_charcoal", has(Items.CHARCOAL)).save(output); + this.shaped(RecipeCategory.FOOD, TANItems.ICE_CREAM).define('#', Items.SNOWBALL).define('S', Items.SUGAR).define('B', Items.BOWL).pattern(" # ").pattern("#S#").pattern(" B ").unlockedBy("has_snowball", has(Items.SNOWBALL)).save(output); + this.shaped(RecipeCategory.FOOD, TANItems.CHARC_0S).define('#', Items.CHARCOAL).define('S', Items.SUGAR).define('B', Items.BOWL).pattern(" # ").pattern("#S#").pattern(" B ").unlockedBy("has_charcoal", has(Items.CHARCOAL)).save(output); // Blocks - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.THERMOREGULATOR).define('S', Items.SMOOTH_STONE).define('I', Items.IRON_INGOT).define('T', TANItems.THERMOMETER).pattern("SIS").pattern("ITI").pattern("SIS").unlockedBy("has_thermometer", has(TANItems.THERMOMETER)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.REDSTONE, TANBlocks.TEMPERATURE_GAUGE).define('G', Items.GLASS).define('Q', Items.QUARTZ).define('T', TANItems.THERMOMETER).define('B', Items.BRICK_SLAB).pattern("GGG").pattern("QTQ").pattern("BBB").unlockedBy("has_thermometer", has(TANItems.THERMOMETER)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.RAIN_COLLECTOR).define('W', ItemTags.PLANKS).define('S', Items.STRING).pattern("WSW").pattern("W W").pattern("WWW").unlockedBy("has_string", has(Items.STRING)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, TANBlocks.WATER_PURIFIER).define('W', ItemTags.PLANKS).define('C', Items.COPPER_INGOT).define('G', Items.GLASS).pattern("GCG").pattern("C C").pattern("WWW").unlockedBy("has_copper_ingot", has(Items.COPPER_INGOT)).save(output); + this.shaped(RecipeCategory.DECORATIONS, TANBlocks.THERMOREGULATOR).define('S', Items.SMOOTH_STONE).define('I', Items.IRON_INGOT).define('T', TANItems.THERMOMETER).pattern("SIS").pattern("ITI").pattern("SIS").unlockedBy("has_thermometer", has(TANItems.THERMOMETER)).save(output); + this.shaped(RecipeCategory.REDSTONE, TANBlocks.TEMPERATURE_GAUGE).define('G', Items.GLASS).define('Q', Items.QUARTZ).define('T', TANItems.THERMOMETER).define('B', Items.BRICK_SLAB).pattern("GGG").pattern("QTQ").pattern("BBB").unlockedBy("has_thermometer", has(TANItems.THERMOMETER)).save(output); + this.shaped(RecipeCategory.DECORATIONS, TANBlocks.RAIN_COLLECTOR).define('W', ItemTags.PLANKS).define('S', Items.STRING).pattern("WSW").pattern("W W").pattern("WWW").unlockedBy("has_string", has(Items.STRING)).save(output); + this.shaped(RecipeCategory.DECORATIONS, TANBlocks.WATER_PURIFIER).define('W', ItemTags.PLANKS).define('C', Items.COPPER_INGOT).define('G', Items.GLASS).pattern("GCG").pattern("C C").pattern("WWW").unlockedBy("has_copper_ingot", has(Items.COPPER_INGOT)).save(output); // Armor - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_BOOTS).define('X', ItemTags.LEAVES).pattern("X X").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_CHESTPLATE).define('X', ItemTags.LEAVES).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_HELMET).define('X', ItemTags.LEAVES).pattern("XXX").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.LEAF_LEGGINGS).define('X', ItemTags.LEAVES).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.LEAF_BOOTS).define('X', ItemTags.LEAVES).pattern("X X").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.LEAF_CHESTPLATE).define('X', ItemTags.LEAVES).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.LEAF_HELMET).define('X', ItemTags.LEAVES).pattern("XXX").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.LEAF_LEGGINGS).define('X', ItemTags.LEAVES).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_leaves", has(ItemTags.LEAVES)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_BOOTS).define('X', ItemTags.WOOL).pattern("X X").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_CHESTPLATE).define('X', ItemTags.WOOL).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_HELMET).define('X', ItemTags.WOOL).pattern("XXX").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, TANItems.WOOL_LEGGINGS).define('X', ItemTags.WOOL).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.WOOL_BOOTS).define('X', ItemTags.WOOL).pattern("X X").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.WOOL_CHESTPLATE).define('X', ItemTags.WOOL).pattern("X X").pattern("XXX").pattern("XXX").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.WOOL_HELMET).define('X', ItemTags.WOOL).pattern("XXX").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); + this.shaped(RecipeCategory.COMBAT, TANItems.WOOL_LEGGINGS).define('X', ItemTags.WOOL).pattern("XXX").pattern("X X").pattern("X X").unlockedBy("has_wool", has(ItemTags.WOOL)).save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, TANItems.THERMOMETER).define('#', Items.COPPER_INGOT).define('X', Items.REDSTONE).pattern(" # ").pattern("#X#").pattern(" # ").unlockedBy("has_redstone", has(Items.REDSTONE)).save(output); + this.shaped(RecipeCategory.TOOLS, TANItems.THERMOMETER).define('#', Items.COPPER_INGOT).define('X', Items.REDSTONE).pattern(" # ").pattern("#X#").pattern(" # ").unlockedBy("has_redstone", has(Items.REDSTONE)).save(output); // // Water purification recipes @@ -100,7 +100,7 @@ public static void waterPurifier(RecipeOutput output, ItemStack input, ItemStack 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) + public void netheriteSmithing(RecipeOutput output, Item input, RecipeCategory category, Item result) { SmithingTransformRecipeBuilder.smithing( Ingredient.of(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE), Ingredient.of(input), Ingredient.of(Items.NETHERITE_INGOT), category, result @@ -108,4 +108,23 @@ public static void netheriteSmithing(RecipeOutput output, Item input, RecipeCate .unlocks("has_netherite_ingot", has(Items.NETHERITE_INGOT)) .save(output, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, getItemName(result)) + "_smithing"); } + + + public static class Runner extends RecipeProvider.Runner + { + public Runner(PackOutput p_365442_, CompletableFuture p_362168_) { + super(p_365442_, p_362168_); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider provider, RecipeOutput output) + { + return new TANRecipeProvider(provider, output); + } + + @Override + public String getName() { + return "TAN Recipes"; + } + } } diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANTrimMaterialTagsProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANTrimMaterialTagsProvider.java index 1f1337f2..963e4af3 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANTrimMaterialTagsProvider.java +++ b/forge/src/main/java/toughasnails/forge/datagen/provider/TANTrimMaterialTagsProvider.java @@ -8,8 +8,7 @@ import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.TagsProvider; -import net.minecraft.world.item.armortrim.TrimMaterial; -import net.minecraft.world.item.armortrim.TrimMaterials; +import net.minecraft.world.item.equipment.trim.TrimMaterial; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import toughasnails.core.ToughAsNails; 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 416f3796..54dc608e 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java +++ b/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java @@ -1,6 +1,8 @@ package toughasnails.forge.datagen.recipes; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import toughasnails.crafting.WaterPurifierRecipe; @@ -30,6 +32,6 @@ public void save(RecipeOutput output, String name) public void save(RecipeOutput output, ResourceLocation location) { - output.accept(location, new WaterPurifierRecipe(this.input, this.result, this.purifyTime), null); + output.accept(ResourceKey.create(Registries.RECIPE, location), new WaterPurifierRecipe(this.input, this.result, this.purifyTime), null); } } diff --git a/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java b/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java index 5ddf82ff..93880a54 100644 --- a/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java +++ b/forge/src/main/java/toughasnails/forge/mixin/MixinTemperatureHelperImpl.java @@ -26,7 +26,7 @@ private static boolean coldEnoughToSnow(Level level, Holder biome, BlockP } else { - return biome.value().coldEnoughToSnow(pos); + return biome.value().coldEnoughToSnow(pos, level.getSeaLevel()); } } }