diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 16b9e0f7..2ab21dfd 100644 --- a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.21.3 2024-12-05T17:14:27.3472282 Registries +// 1.21.4 2024-12-14T11:48:11.7423765 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 a96ea7d3..cf3337e6 100644 --- a/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c +++ b/common/src/generated/resources/.cache/1edd1aa8a5f5209e40be6ce639ab3fdd92079a0c @@ -1,4 +1,4 @@ -// 1.21.3 2024-12-05T17:14:27.35023 Tags for minecraft:enchantment mod id vanilla +// 1.21.4 2024-12-14T11:48:11.7438772 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 9fdb1c22..fc644bfd 100644 --- a/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 +++ b/common/src/generated/resources/.cache/20dae170dba4c8eb919766d5be31700d182da0d9 @@ -1,4 +1,4 @@ -// 1.21.3 2024-12-05T17:14:27.3467282 Tags for minecraft:worldgen/biome mod id toughasnails +// 1.21.4 2024-12-14T11:48:11.7413773 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 849d9e98..af43f89b 100644 --- a/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb +++ b/common/src/generated/resources/.cache/237ed1d533e00e9b8d8148d6061ae61b82e960bb @@ -1,3 +1,3 @@ -// 1.21.3 2024-12-05T17:14:27.3457287 Tags for minecraft:trim_material mod id toughasnails +// 1.21.4 2024-12-14T11:48:11.7408766 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/25053ef1e0b8c487102ccc9453cf716a2dc74845 b/common/src/generated/resources/.cache/25053ef1e0b8c487102ccc9453cf716a2dc74845 deleted file mode 100644 index 92bc8855..00000000 --- a/common/src/generated/resources/.cache/25053ef1e0b8c487102ccc9453cf716a2dc74845 +++ /dev/null @@ -1,3 +0,0 @@ -// 1.21.3 2024-12-06T21:52:56.7067031 Equipment Model Definitions -4b2945d310c6084cdfa1731f33901d34d6ce4731 assets/toughasnails/models/equipment/leaf.json -192c8a743376167dc4e419443577552eb962ef7f assets/toughasnails/models/equipment/wool.json diff --git a/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 b/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 index 8b4f16f1..ab238900 100644 --- a/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 +++ b/common/src/generated/resources/.cache/4ff5308374b2e7729a466dfe56bd6182ead9b2c3 @@ -1,2 +1,2 @@ -// 1.21.3 2024-12-05T17:14:27.3497276 Tags for minecraft:point_of_interest_type mod id toughasnails +// 1.21.4 2024-12-14T11:48:11.7408766 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 795ff0e9..1babbd98 100644 --- a/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/common/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21.3 2024-12-05T17:14:27.3467282 Loot Tables +// 1.21.4 2024-12-14T11:48:11.7393769 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/77038cb024c5999ce280bcb6800e72cf1c655fe7 b/common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7 index 86220c8a..56e5f745 100644 --- a/common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7 +++ b/common/src/generated/resources/.cache/77038cb024c5999ce280bcb6800e72cf1c655fe7 @@ -1,5 +1,79 @@ -// 1.21.3 2024-12-06T21:52:56.7052034 Model Definitions -32bdea9f9460b4ff4236b3a565e962e3793f937f assets/toughasnails/models/item/leaf_boots.json +// 1.21.4 2024-12-15T12:32:43.8386119 Model Definitions +a46a7ed55fa00f2a5e8e739fed5ceb555c7c8502 assets/toughasnails/items/apple_juice.json +c591889fd14596775b2f5d363c1417e6dbbddf2a assets/toughasnails/items/cactus_juice.json +8d13e160ccdd855380e2758d9a511f4727663ed1 assets/toughasnails/items/charc_os.json +84955afd1ea6b6f48c025abba670b53e52223060 assets/toughasnails/items/chorus_fruit_juice.json +2713827de5b432976b69b3cd358233687f3e14aa assets/toughasnails/items/copper_dirty_water_canteen.json +874d400e8449c5fba00d6e16796a830c867bda9b assets/toughasnails/items/copper_purified_water_canteen.json +4a2aef09261145a699342a6094bbd7dbaf08fb93 assets/toughasnails/items/copper_water_canteen.json +54a470976016ff0539c943d2096f2382be41936c assets/toughasnails/items/diamond_dirty_water_canteen.json +8b83f236433628746586751edd0ae607eb32d791 assets/toughasnails/items/diamond_purified_water_canteen.json +c333133047921cac899a9fcd0834945659749614 assets/toughasnails/items/diamond_water_canteen.json +73d47530a0d37f0789b4a865364e21245f1c94cb assets/toughasnails/items/dirty_water_bottle.json +a9f1890a5115d346e99f62e861c7ede940e54fb0 assets/toughasnails/items/empty_copper_canteen.json +e169a03f53a1496b79b06da7df487720ed8759ea assets/toughasnails/items/empty_diamond_canteen.json +3ad34e22529cf475a2f87e5753d136bc92b8ca70 assets/toughasnails/items/empty_gold_canteen.json +c394973b72ff60388de38c34182362c534d36bd6 assets/toughasnails/items/empty_iron_canteen.json +85edb0a4bb82b3bd6ad730ba1fbcbbbcf6db56a9 assets/toughasnails/items/empty_leather_canteen.json +416d63c13bf7bcd673120ca1a1ac71314b268d1d assets/toughasnails/items/empty_netherite_canteen.json +789027711fe954b1d6ebaa6477ba484c73d1dc97 assets/toughasnails/items/glow_berry_juice.json +4e53af0490601d02e19b636a3c694c2b98dbe317 assets/toughasnails/items/gold_dirty_water_canteen.json +bfabd47c2329716e02db1936ab81a61f809218e2 assets/toughasnails/items/gold_purified_water_canteen.json +365fce211285945360ee966d257ce210af3b2bf6 assets/toughasnails/items/gold_water_canteen.json +df126ef457d525c87a5a6d8c365deff420a07463 assets/toughasnails/items/ice_cream.json +ca2449c2b116ebecf70f32faeb2f9f866831a97e assets/toughasnails/items/iron_dirty_water_canteen.json +80c210194ebf33db20c3df4858ed883d59cd028b assets/toughasnails/items/iron_purified_water_canteen.json +09407f691faa92ff02285e563ca1b643c1382b4e assets/toughasnails/items/iron_water_canteen.json +304856f0fef764aa6e00ef0be3cee7b60467bf55 assets/toughasnails/items/leaf_boots.json +a20a8c97813fd4c11ba7ce0163f12c65115aba88 assets/toughasnails/items/leaf_chestplate.json +c6c397ce69818106e2ffd53cfab511d732f3f3f8 assets/toughasnails/items/leaf_helmet.json +e3c02088c70737e0581a68cb08700c2ca9f1ccfa assets/toughasnails/items/leaf_leggings.json +4777163e047e6d9bedd3d432302e0ddac13ef1a7 assets/toughasnails/items/leather_dirty_water_canteen.json +97fdbc2ade0feac8b34de3f1a4c11298e3b482c5 assets/toughasnails/items/leather_purified_water_canteen.json +c3a1ceb48d2519bbe384999c4d8ae110a2745c6d assets/toughasnails/items/leather_water_canteen.json +af39586b7b8cde34445b4228e60ac1f93cd614f5 assets/toughasnails/items/melon_juice.json +fb1454eaf50592a87f7d80aa308252d13045149e assets/toughasnails/items/netherite_dirty_water_canteen.json +1e571d8d117827974a82cf33433e85e92f9e2dbf assets/toughasnails/items/netherite_purified_water_canteen.json +0098213afce11f42384f7f6be6166ec8785aec70 assets/toughasnails/items/netherite_water_canteen.json +743d52b9771291c5cab2360c793c504ad0d685f2 assets/toughasnails/items/pumpkin_juice.json +ca4bbef609fcac533228c6fb7cbec3ebb16f2832 assets/toughasnails/items/purified_water_bottle.json +57d254270b20dbbcba6fed8e6dd042182cc4121f assets/toughasnails/items/rain_collector.json +24a62f4383a28cd81b355ede24124f96f0a495fb assets/toughasnails/items/sweet_berry_juice.json +83604432a420cf2b813bfb1e41dd90257d1c2cf1 assets/toughasnails/items/tan_icon.json +748ab730c9622fef6624caa632939b6787e87321 assets/toughasnails/items/temperature_gauge.json +0bec0e66c111212fb2674c9ec7be38d0099f615b assets/toughasnails/items/thermometer.json +173f3c94c0ce5e45d6390bfe3b5e272d5161df81 assets/toughasnails/items/thermoregulator.json +dc76830866633f9afa704ec99fb65ba3c804d3e4 assets/toughasnails/items/water_purifier.json +99a5b5f52946e054be85477e9aa6a28c1d598991 assets/toughasnails/items/wool_boots.json +9bac72f2d86a0766bd571c20a27dba85f86f9870 assets/toughasnails/items/wool_chestplate.json +52f118bacf86016d30fab23fd88c48c3de1c3032 assets/toughasnails/items/wool_helmet.json +d3edd21cbe8d3bc6186269ffaa4132ad1b8d5cc9 assets/toughasnails/items/wool_leggings.json +fbb3928956c38cd4f6dfaaf5092047123f8c76ff assets/toughasnails/models/item/apple_juice.json +aac7597ce5ef5a4367bbcf0830bdf1d7d7573299 assets/toughasnails/models/item/cactus_juice.json +a6231c29ef436d8c7bd574d5a51b3d306d1f0d68 assets/toughasnails/models/item/charc_os.json +772a9bd1b7c39e6957fea6c02c8cf8aff24ed87e assets/toughasnails/models/item/chorus_fruit_juice.json +da651f690598888fa5c4dec9861844ba87731a0c assets/toughasnails/models/item/copper_dirty_water_canteen.json +ba24df3f5de607e9417343e9bbe4ce5b3a9d5bd8 assets/toughasnails/models/item/copper_purified_water_canteen.json +d1d7215bd676f8267e10559ef1a62153fdfc77c8 assets/toughasnails/models/item/copper_water_canteen.json +4c397fc95b7424b35c08c8a88d495b92fbe40bbb assets/toughasnails/models/item/diamond_dirty_water_canteen.json +0f803ad10c5c413c5f68e0be556011064b36cd22 assets/toughasnails/models/item/diamond_purified_water_canteen.json +de912d9d0ac5127a236a2905b5670397a50beb1b assets/toughasnails/models/item/diamond_water_canteen.json +cfd0134395f237e4ddcfeb4011778f2cc3974b5d assets/toughasnails/models/item/dirty_water_bottle.json +d02f8c4cf872aa0a3f6324569d24029eb121f5e9 assets/toughasnails/models/item/empty_copper_canteen.json +2b9d74b0141910fd8a5fe559589f5dfbbff1b50e assets/toughasnails/models/item/empty_diamond_canteen.json +a368bb2246c60e7ee24050262f1037ff48c15955 assets/toughasnails/models/item/empty_gold_canteen.json +622d385b35248843b51514cf802b47b11612cd56 assets/toughasnails/models/item/empty_iron_canteen.json +ed2d3569d7c3f6e75e6d65512a1758407b87e0e1 assets/toughasnails/models/item/empty_leather_canteen.json +19321f614a82577909e3493d661643c605ea7a64 assets/toughasnails/models/item/empty_netherite_canteen.json +fff3625b65a04e925e5a9865a75ead3a4e2e2fa0 assets/toughasnails/models/item/glow_berry_juice.json +1d916fa543d103bf60d801abdccfd7160e1de580 assets/toughasnails/models/item/gold_dirty_water_canteen.json +c377c2c570d0495860676846356313e936b07756 assets/toughasnails/models/item/gold_purified_water_canteen.json +b0d8c49c046ebeca6d152ff24447492768350dba assets/toughasnails/models/item/gold_water_canteen.json +25bf02c23652396ecf977e2591c0f1a2c2817ff9 assets/toughasnails/models/item/ice_cream.json +017e043f1ebf570f435f69a422bc4290e0e5c775 assets/toughasnails/models/item/iron_dirty_water_canteen.json +721f73aebf8120e01e48460bb2ccf1be5075ac74 assets/toughasnails/models/item/iron_purified_water_canteen.json +b00f98e717644b19aaf4539bca340a4d8022dedb assets/toughasnails/models/item/iron_water_canteen.json +a6ec6a0e5205ffd5e5de4010b353822eaac2370e assets/toughasnails/models/item/leaf_boots.json ad8f22de0b62eeda1deabc1069cd80944ef8455b assets/toughasnails/models/item/leaf_boots_amethyst_trim.json 348a4ee8a5bde6da1cd071773cfa4c6ffa45dceb assets/toughasnails/models/item/leaf_boots_copper_trim.json 39fca9edaf3c47fad93dd2772eb2c195324d399c assets/toughasnails/models/item/leaf_boots_diamond_trim.json @@ -10,7 +84,8 @@ c1268e927f0089bcecf65ec3d9f94ab4449fe158 assets/toughasnails/models/item/leaf_bo 3f01a4d0bfd054727e628cf6fc974444fd9c4b14 assets/toughasnails/models/item/leaf_boots_netherite_trim.json 4318dd4eff0ae258d5f3797ee3b10f853755eba5 assets/toughasnails/models/item/leaf_boots_quartz_trim.json 316417000cd96df6db6cd780e0a98de660ed8068 assets/toughasnails/models/item/leaf_boots_redstone_trim.json -371df1adccd73b9154625b921fbf060fe2ae7d0f assets/toughasnails/models/item/leaf_chestplate.json +1151488035fdfbca30334c84af476f791a66cc16 assets/toughasnails/models/item/leaf_boots_resin_trim.json +f31d13df0441fa68f035b5e44f5acb52ec12cc43 assets/toughasnails/models/item/leaf_chestplate.json 8d850c71367a8fa6c46276d445c526ae2675545e assets/toughasnails/models/item/leaf_chestplate_amethyst_trim.json 5172ce521cc7c732c66e1c21fbf2a3cd9c1039cc assets/toughasnails/models/item/leaf_chestplate_copper_trim.json e23474ac60b809a0f6b78f4d93e337dea51b4d8c assets/toughasnails/models/item/leaf_chestplate_diamond_trim.json @@ -21,7 +96,8 @@ b4b2db65b491dfaa7740a5c702db58141d1f2cbc assets/toughasnails/models/item/leaf_ch fe99a23c3754618afd2e7671940887b68f0d7ba3 assets/toughasnails/models/item/leaf_chestplate_netherite_trim.json 8a217d89061fc2a46ec1e34584f6fc530f018495 assets/toughasnails/models/item/leaf_chestplate_quartz_trim.json b68cc189af5de8df65632a3b8498afdb9033a317 assets/toughasnails/models/item/leaf_chestplate_redstone_trim.json -3e16eca56dd3a9fd20f27466f85312df0e5c9584 assets/toughasnails/models/item/leaf_helmet.json +3abfecdda82b6d6e02c5aa71f1fac93f6e88f1d5 assets/toughasnails/models/item/leaf_chestplate_resin_trim.json +260a753ef2397cbfcfe2be687e9d3d9531b67b83 assets/toughasnails/models/item/leaf_helmet.json 29a2194b01e73fe20c7d3f40a74ceb10cb02b896 assets/toughasnails/models/item/leaf_helmet_amethyst_trim.json 2d821aed3149962ce3212a29f47e6989f9db49d7 assets/toughasnails/models/item/leaf_helmet_copper_trim.json 682817ea56cb9be67b28b8a9fccd701fe8a6e19d assets/toughasnails/models/item/leaf_helmet_diamond_trim.json @@ -32,7 +108,8 @@ ad0d1f8eb1da3718a34b66765e876285e4643b70 assets/toughasnails/models/item/leaf_he 917e9f9267a7843678f62244d7bebc391464932f assets/toughasnails/models/item/leaf_helmet_netherite_trim.json 793b1fba3c6a0f386660ad7647d348cb32f6eb84 assets/toughasnails/models/item/leaf_helmet_quartz_trim.json 5fb18c32856c2344802e2d35f56ec059fb466ba1 assets/toughasnails/models/item/leaf_helmet_redstone_trim.json -bdc9c38f066f4f61f1930eb09392f83107f35283 assets/toughasnails/models/item/leaf_leggings.json +5cbc37182f2ad76d7bc5ddbb614273b96d97dd84 assets/toughasnails/models/item/leaf_helmet_resin_trim.json +db5518ccec85c37db8b2c97d1713d1b9a28e0b4c assets/toughasnails/models/item/leaf_leggings.json 0f56b3f25ce691129af0cc428ae302568edd97ad assets/toughasnails/models/item/leaf_leggings_amethyst_trim.json 186d7599f1fc27e89fe14241cf29bc9ea33fccaa assets/toughasnails/models/item/leaf_leggings_copper_trim.json 29129d5b2781d88855f89389e73f1ce97d3aa0be assets/toughasnails/models/item/leaf_leggings_diamond_trim.json @@ -43,7 +120,40 @@ bdc9c38f066f4f61f1930eb09392f83107f35283 assets/toughasnails/models/item/leaf_le 7624eca624835ea89ce37a30277cb0457a0e6944 assets/toughasnails/models/item/leaf_leggings_netherite_trim.json ff42c39f4d2602a397610f2ec87d64d3b7739741 assets/toughasnails/models/item/leaf_leggings_quartz_trim.json a86d317549a09cd4a906a896da1d1f8da0ba6db3 assets/toughasnails/models/item/leaf_leggings_redstone_trim.json -c688c9fb448ca26a6adb7b8d521d2d5cd0befe7b assets/toughasnails/models/item/wool_boots.json +bcce3e10337d82938288a099788a0b6770540674 assets/toughasnails/models/item/leaf_leggings_resin_trim.json +0dfe5962b380ecf81c76a32c003fc40d2d558394 assets/toughasnails/models/item/leather_dirty_water_canteen.json +3cc2430a4925db4b0b8be8aafb39a9d28112f253 assets/toughasnails/models/item/leather_purified_water_canteen.json +41659224602b677c75f404edab10bfb67115b9f9 assets/toughasnails/models/item/leather_water_canteen.json +4a326df9cef778cbbe5da99431ae3c3e0973cb88 assets/toughasnails/models/item/melon_juice.json +f687e95afe50c05d5e469a19c8134ade3b3e5574 assets/toughasnails/models/item/netherite_dirty_water_canteen.json +e0379f9024f6a77d4183b249082f8eaef4ff5e60 assets/toughasnails/models/item/netherite_purified_water_canteen.json +6e0abd17fee6bfdd17ff588621e5acd5dfc95bf7 assets/toughasnails/models/item/netherite_water_canteen.json +f38f99fd48ebf8c98d12c47d4974678a20b3739c assets/toughasnails/models/item/pumpkin_juice.json +b2af0a87766e5af5e6eefbf43e7f4248a79ef579 assets/toughasnails/models/item/purified_water_bottle.json +fec75c479c98f911a97f4bddc74ffaddd4f7e7ed assets/toughasnails/models/item/sweet_berry_juice.json +29222617ef6336b350d04425ec94c4ab59ee761e assets/toughasnails/models/item/tan_icon.json +0fbb3edc334b05d5f3657d01ad0444da28d830ec assets/toughasnails/models/item/thermometer_00.json +f90715b0138223634226f703377c9210440ebba4 assets/toughasnails/models/item/thermometer_01.json +440c2d22c0b439446b29607c91a0f59c109a2ac9 assets/toughasnails/models/item/thermometer_02.json +2907ac0ae691401c03c0ca68d12a9957a001acdb assets/toughasnails/models/item/thermometer_03.json +c52014a435b97758257ab34348feb7ff1e84ae40 assets/toughasnails/models/item/thermometer_04.json +95e6ab7ba41753eb89e2b6734b3f65f67a516fea assets/toughasnails/models/item/thermometer_05.json +6f9f7308638335f6d22deed54f58af41d80d57ac assets/toughasnails/models/item/thermometer_06.json +650c231de872dafeefafe2178f68bbf11db28577 assets/toughasnails/models/item/thermometer_07.json +17be302c23083a79a0737442f263d8a90ba9a082 assets/toughasnails/models/item/thermometer_08.json +2f20e8f45b4bbffe275eb3cf833adc221afc27b7 assets/toughasnails/models/item/thermometer_09.json +78599b8e101dce74c1a8b35fa0f329493e0b2500 assets/toughasnails/models/item/thermometer_10.json +dd8bfe31c24513ada71c632b77b9ece6d1c59c1a assets/toughasnails/models/item/thermometer_11.json +aa47031765274df8d84141ce6ee6723a4d0d0152 assets/toughasnails/models/item/thermometer_12.json +717bda823c19584c4d1f0d4e6ad8776d3ca0dada assets/toughasnails/models/item/thermometer_13.json +3e152a20f652e3ae96905168bc5fdb9cc38e4c58 assets/toughasnails/models/item/thermometer_14.json +678f08f1c7738e468f663117f0c3e7ee736c7fe3 assets/toughasnails/models/item/thermometer_15.json +f330be7df4b6985d0c83fd154ad528cc1eeee767 assets/toughasnails/models/item/thermometer_16.json +62e6066b57cdaafc3c70c415cf98e3f9387d2a43 assets/toughasnails/models/item/thermometer_17.json +a90d31153bbc8e7d36dcb024c10e4c0a2b27e7bf assets/toughasnails/models/item/thermometer_18.json +0f27a70b4dddfcf0598b74f6f02b86be202ca464 assets/toughasnails/models/item/thermometer_19.json +e0508d7e82ef472eff6f73f7a8a92a54094cbd41 assets/toughasnails/models/item/thermometer_20.json +40cdbc19e3166a9ce090dd41416f087b71148597 assets/toughasnails/models/item/wool_boots.json 0ae799bf1bec71d090b0a9bbd320e713ade840ff assets/toughasnails/models/item/wool_boots_amethyst_trim.json f0741eeba8213a03810bf5a87bd6b68c1d3a7dc2 assets/toughasnails/models/item/wool_boots_copper_trim.json 7011ac4d0480e11bfb543ce9db67252093e2d82b assets/toughasnails/models/item/wool_boots_diamond_trim.json @@ -54,7 +164,8 @@ face03b7f6b9a53fbcdc802ec75d6f115278ca90 assets/toughasnails/models/item/wool_bo 23f8908cd78cfba1a0aa5874a8751815f9f7dd64 assets/toughasnails/models/item/wool_boots_netherite_trim.json 288229c5f22ad8a10f6b50812aeb43696b08dad3 assets/toughasnails/models/item/wool_boots_quartz_trim.json 4993a8628fdc2c68ae8ed7e7b76365b44dd7f0a2 assets/toughasnails/models/item/wool_boots_redstone_trim.json -0484c4eff52b6f9362b660cb44e9ee3b4a5d5235 assets/toughasnails/models/item/wool_chestplate.json +dc900450cae37f2765b57389a14202a8b67d2b2e assets/toughasnails/models/item/wool_boots_resin_trim.json +a724b0810b1132118c88468abff22eb0f817285a assets/toughasnails/models/item/wool_chestplate.json 554e54b0437e75ef5d8a44d3c668ccb959806739 assets/toughasnails/models/item/wool_chestplate_amethyst_trim.json 1b28bdcabf970b3bcc78d128cc32657ad90e567d assets/toughasnails/models/item/wool_chestplate_copper_trim.json 0bfd385ff2cd5b8d9420573fad03715e1846434a assets/toughasnails/models/item/wool_chestplate_diamond_trim.json @@ -65,7 +176,8 @@ db827b6f0297b731ba22a088b26ae7ed2eb4e5e4 assets/toughasnails/models/item/wool_ch 85345ecf3302637502b1b2d7b60469adb64b05e7 assets/toughasnails/models/item/wool_chestplate_netherite_trim.json 3615b6087f37f9c515ebe65fc0f51ba616be5705 assets/toughasnails/models/item/wool_chestplate_quartz_trim.json 802466fba61809ab725e7885a3594a37c5166e17 assets/toughasnails/models/item/wool_chestplate_redstone_trim.json -b19778d802fed27f71a192427232a2b0603eef04 assets/toughasnails/models/item/wool_helmet.json +eb807ec653cedad522b37a720d8716d85d9bd097 assets/toughasnails/models/item/wool_chestplate_resin_trim.json +07e5d211adecce95e10350d44bcc097485bb5faa assets/toughasnails/models/item/wool_helmet.json 13e3dd842af67fff170942a7d0817d371d6e7327 assets/toughasnails/models/item/wool_helmet_amethyst_trim.json 63d169526543fffd1ef77e1d2fe45358e38e266d assets/toughasnails/models/item/wool_helmet_copper_trim.json 5d4ab99f37bf8c41c5ed120243902f7e3d894d14 assets/toughasnails/models/item/wool_helmet_diamond_trim.json @@ -76,7 +188,8 @@ f93903d5536ba686c276035a281dcfd3709569a4 assets/toughasnails/models/item/wool_he 806d81ba18de15120438b4bbeccf8e102b0b0708 assets/toughasnails/models/item/wool_helmet_netherite_trim.json b710a8c6d3738520e40e119abaea30f0712b8559 assets/toughasnails/models/item/wool_helmet_quartz_trim.json fc12ec2f31552b7d6fbad169bb0092b8f6e075c6 assets/toughasnails/models/item/wool_helmet_redstone_trim.json -fd2729eff1017099f240cffc2606c4133772a7af assets/toughasnails/models/item/wool_leggings.json +2bf4d3744d9c37fab301c531b2069e9b0610d567 assets/toughasnails/models/item/wool_helmet_resin_trim.json +32090a0205fe2301c369b7ce97bac6e4e50eae81 assets/toughasnails/models/item/wool_leggings.json 8382d868b6c6ec556c3e5f31d48a0c1a5be2fbe5 assets/toughasnails/models/item/wool_leggings_amethyst_trim.json 8d999351fc0b9558795f26c5203037f274e53a56 assets/toughasnails/models/item/wool_leggings_copper_trim.json cbfc0b586c9fea54d4b6dc65aa90ecf914ee3236 assets/toughasnails/models/item/wool_leggings_diamond_trim.json @@ -87,3 +200,4 @@ d6f44cabad027e1cee881d44f6aa1c3db88ae74f assets/toughasnails/models/item/wool_le 060a61be7409a2170bcfd8f17c7827da0f9d3efa assets/toughasnails/models/item/wool_leggings_netherite_trim.json 2f93d4eeac9582b4ad80d58efd82651537c79b66 assets/toughasnails/models/item/wool_leggings_quartz_trim.json 277de1982c3349ef9a7324baac887a971615b413 assets/toughasnails/models/item/wool_leggings_redstone_trim.json +63d815886a81ffbbdfb731c6fafaf04d1eddb140 assets/toughasnails/models/item/wool_leggings_resin_trim.json diff --git a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 index 46b39b75..62466800 100644 --- a/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 +++ b/common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3 @@ -1,4 +1,4 @@ -// 1.21.3 2024-12-05T17:14:27.3487275 Tags for minecraft:item mod id toughasnails +// 1.21.4 2024-12-14T11:48:11.7428765 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 deleted file mode 100644 index d6006584..00000000 --- a/common/src/generated/resources/.cache/cee4a031f97c8b7c81810a1ed20819f05a390a91 +++ /dev/null @@ -1,23 +0,0 @@ -// 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 -440c2d22c0b439446b29607c91a0f59c109a2ac9 assets/toughasnails/models/item/thermometer_02.json -2907ac0ae691401c03c0ca68d12a9957a001acdb assets/toughasnails/models/item/thermometer_03.json -c52014a435b97758257ab34348feb7ff1e84ae40 assets/toughasnails/models/item/thermometer_04.json -95e6ab7ba41753eb89e2b6734b3f65f67a516fea assets/toughasnails/models/item/thermometer_05.json -6f9f7308638335f6d22deed54f58af41d80d57ac assets/toughasnails/models/item/thermometer_06.json -650c231de872dafeefafe2178f68bbf11db28577 assets/toughasnails/models/item/thermometer_07.json -17be302c23083a79a0737442f263d8a90ba9a082 assets/toughasnails/models/item/thermometer_08.json -2f20e8f45b4bbffe275eb3cf833adc221afc27b7 assets/toughasnails/models/item/thermometer_09.json -78599b8e101dce74c1a8b35fa0f329493e0b2500 assets/toughasnails/models/item/thermometer_10.json -dd8bfe31c24513ada71c632b77b9ece6d1c59c1a assets/toughasnails/models/item/thermometer_11.json -aa47031765274df8d84141ce6ee6723a4d0d0152 assets/toughasnails/models/item/thermometer_12.json -717bda823c19584c4d1f0d4e6ad8776d3ca0dada assets/toughasnails/models/item/thermometer_13.json -3e152a20f652e3ae96905168bc5fdb9cc38e4c58 assets/toughasnails/models/item/thermometer_14.json -678f08f1c7738e468f663117f0c3e7ee736c7fe3 assets/toughasnails/models/item/thermometer_15.json -f330be7df4b6985d0c83fd154ad528cc1eeee767 assets/toughasnails/models/item/thermometer_16.json -62e6066b57cdaafc3c70c415cf98e3f9387d2a43 assets/toughasnails/models/item/thermometer_17.json -a90d31153bbc8e7d36dcb024c10e4c0a2b27e7bf assets/toughasnails/models/item/thermometer_18.json -0f27a70b4dddfcf0598b74f6f02b86be202ca464 assets/toughasnails/models/item/thermometer_19.json -e0508d7e82ef472eff6f73f7a8a92a54094cbd41 assets/toughasnails/models/item/thermometer_20.json diff --git a/common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579 b/common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579 index 8145b5c9..761bd80e 100644 --- a/common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579 +++ b/common/src/generated/resources/.cache/d288570b70137f55051bdf585fe1fd764998d579 @@ -1,4 +1,4 @@ -// 1.21.3 2024-12-05T17:14:27.3477277 TAN Recipes +// 1.21.4 2024-12-14T11:48:11.7398768 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 diff --git a/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b b/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b index b76c8194..38971549 100644 --- a/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b +++ b/common/src/generated/resources/.cache/d5932a16d3f0544ba1e8cda3b77d0d46f353493b @@ -1,3 +1,3 @@ -// 1.21.3 2024-12-05T17:14:27.3477277 Tags for minecraft:damage_type mod id toughasnails +// 1.21.4 2024-12-14T11:48:11.7428765 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 0c46ca54..6f62fb63 100644 --- a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 +++ b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 @@ -1,4 +1,4 @@ -// 1.21.3 2024-12-05T17:14:27.3462285 Tags for minecraft:block mod id toughasnails +// 1.21.4 2024-12-14T11:48:11.7363444 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/.cache/ece1a0d38a152b7be1e86680691afdfd6d9fba1f b/common/src/generated/resources/.cache/ece1a0d38a152b7be1e86680691afdfd6d9fba1f new file mode 100644 index 00000000..8b31d9ef --- /dev/null +++ b/common/src/generated/resources/.cache/ece1a0d38a152b7be1e86680691afdfd6d9fba1f @@ -0,0 +1,3 @@ +// 1.21.4 2024-12-14T11:48:11.7418774 Equipment Asset Definitions +4b2945d310c6084cdfa1731f33901d34d6ce4731 assets/toughasnails/equipment/leaf.json +192c8a743376167dc4e419443577552eb962ef7f assets/toughasnails/equipment/wool.json diff --git a/common/src/generated/resources/assets/toughasnails/models/equipment/leaf.json b/common/src/generated/resources/assets/toughasnails/equipment/leaf.json similarity index 100% rename from common/src/generated/resources/assets/toughasnails/models/equipment/leaf.json rename to common/src/generated/resources/assets/toughasnails/equipment/leaf.json diff --git a/common/src/generated/resources/assets/toughasnails/models/equipment/wool.json b/common/src/generated/resources/assets/toughasnails/equipment/wool.json similarity index 100% rename from common/src/generated/resources/assets/toughasnails/models/equipment/wool.json rename to common/src/generated/resources/assets/toughasnails/equipment/wool.json diff --git a/common/src/generated/resources/assets/toughasnails/items/apple_juice.json b/common/src/generated/resources/assets/toughasnails/items/apple_juice.json new file mode 100644 index 00000000..25fd174c --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/apple_juice.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/apple_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/cactus_juice.json b/common/src/generated/resources/assets/toughasnails/items/cactus_juice.json new file mode 100644 index 00000000..ae6cba44 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/cactus_juice.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/cactus_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/charc_os.json b/common/src/generated/resources/assets/toughasnails/items/charc_os.json new file mode 100644 index 00000000..e6f647cf --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/charc_os.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/charc_os" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/chorus_fruit_juice.json b/common/src/generated/resources/assets/toughasnails/items/chorus_fruit_juice.json new file mode 100644 index 00000000..daafb13b --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/chorus_fruit_juice.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/chorus_fruit_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/copper_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/copper_dirty_water_canteen.json new file mode 100644 index 00000000..9031aa77 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/copper_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/copper_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/copper_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/copper_purified_water_canteen.json new file mode 100644 index 00000000..cd77327e --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/copper_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/copper_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/copper_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/copper_water_canteen.json new file mode 100644 index 00000000..f9d53aa8 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/copper_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/copper_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/diamond_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/diamond_dirty_water_canteen.json new file mode 100644 index 00000000..3012bf15 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/diamond_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/diamond_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/diamond_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/diamond_purified_water_canteen.json new file mode 100644 index 00000000..92e103a4 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/diamond_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/diamond_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/diamond_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/diamond_water_canteen.json new file mode 100644 index 00000000..2dbef0b0 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/diamond_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/diamond_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/dirty_water_bottle.json b/common/src/generated/resources/assets/toughasnails/items/dirty_water_bottle.json new file mode 100644 index 00000000..c894f6d3 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/dirty_water_bottle.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/dirty_water_bottle" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/empty_copper_canteen.json b/common/src/generated/resources/assets/toughasnails/items/empty_copper_canteen.json new file mode 100644 index 00000000..15fd0055 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/empty_copper_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/empty_copper_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/empty_diamond_canteen.json b/common/src/generated/resources/assets/toughasnails/items/empty_diamond_canteen.json new file mode 100644 index 00000000..5fc0c0dd --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/empty_diamond_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/empty_diamond_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/empty_gold_canteen.json b/common/src/generated/resources/assets/toughasnails/items/empty_gold_canteen.json new file mode 100644 index 00000000..65505bb5 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/empty_gold_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/empty_gold_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/empty_iron_canteen.json b/common/src/generated/resources/assets/toughasnails/items/empty_iron_canteen.json new file mode 100644 index 00000000..3f26288d --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/empty_iron_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/empty_iron_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/empty_leather_canteen.json b/common/src/generated/resources/assets/toughasnails/items/empty_leather_canteen.json new file mode 100644 index 00000000..585c4ed8 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/empty_leather_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/empty_leather_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/empty_netherite_canteen.json b/common/src/generated/resources/assets/toughasnails/items/empty_netherite_canteen.json new file mode 100644 index 00000000..72658b8d --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/empty_netherite_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/empty_netherite_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/glow_berry_juice.json b/common/src/generated/resources/assets/toughasnails/items/glow_berry_juice.json new file mode 100644 index 00000000..feca7a4b --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/glow_berry_juice.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/glow_berry_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/gold_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/gold_dirty_water_canteen.json new file mode 100644 index 00000000..7874045b --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/gold_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/gold_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/gold_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/gold_purified_water_canteen.json new file mode 100644 index 00000000..69e1ba47 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/gold_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/gold_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/gold_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/gold_water_canteen.json new file mode 100644 index 00000000..c0bf943f --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/gold_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/gold_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/ice_cream.json b/common/src/generated/resources/assets/toughasnails/items/ice_cream.json new file mode 100644 index 00000000..c10723a6 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/ice_cream.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/ice_cream" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/iron_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/iron_dirty_water_canteen.json new file mode 100644 index 00000000..943876a5 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/iron_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/iron_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/iron_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/iron_purified_water_canteen.json new file mode 100644 index 00000000..1329c4dc --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/iron_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/iron_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/iron_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/iron_water_canteen.json new file mode 100644 index 00000000..4a1ba962 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/iron_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/iron_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/leaf_boots.json b/common/src/generated/resources/assets/toughasnails/items/leaf_boots.json new file mode 100644 index 00000000..8b09fe98 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/leaf_boots.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_boots", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/leaf_chestplate.json b/common/src/generated/resources/assets/toughasnails/items/leaf_chestplate.json new file mode 100644 index 00000000..80159d3a --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/leaf_chestplate.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_chestplate", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/leaf_helmet.json b/common/src/generated/resources/assets/toughasnails/items/leaf_helmet.json new file mode 100644 index 00000000..45d86104 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/leaf_helmet.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_helmet", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/leaf_leggings.json b/common/src/generated/resources/assets/toughasnails/items/leaf_leggings.json new file mode 100644 index 00000000..f533156f --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/leaf_leggings.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/leaf_leggings", + "tints": [ + { + "type": "minecraft:dye", + "default": -12012264 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/leather_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/leather_dirty_water_canteen.json new file mode 100644 index 00000000..9d5838b8 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/leather_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leather_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/leather_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/leather_purified_water_canteen.json new file mode 100644 index 00000000..caf2a423 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/leather_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leather_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/leather_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/leather_water_canteen.json new file mode 100644 index 00000000..3854ac18 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/leather_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/leather_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/melon_juice.json b/common/src/generated/resources/assets/toughasnails/items/melon_juice.json new file mode 100644 index 00000000..d6a7a238 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/melon_juice.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/melon_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/netherite_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/netherite_dirty_water_canteen.json new file mode 100644 index 00000000..37f2b0f7 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/netherite_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/netherite_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/netherite_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/netherite_purified_water_canteen.json new file mode 100644 index 00000000..bdf0b512 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/netherite_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/netherite_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/netherite_water_canteen.json b/common/src/generated/resources/assets/toughasnails/items/netherite_water_canteen.json new file mode 100644 index 00000000..af375356 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/netherite_water_canteen.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/netherite_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/pumpkin_juice.json b/common/src/generated/resources/assets/toughasnails/items/pumpkin_juice.json new file mode 100644 index 00000000..5ff96db9 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/pumpkin_juice.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/pumpkin_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/purified_water_bottle.json b/common/src/generated/resources/assets/toughasnails/items/purified_water_bottle.json new file mode 100644 index 00000000..6dc14562 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/purified_water_bottle.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/purified_water_bottle" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/rain_collector.json b/common/src/generated/resources/assets/toughasnails/items/rain_collector.json new file mode 100644 index 00000000..9891f2f0 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/rain_collector.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:block/rain_collector" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/sweet_berry_juice.json b/common/src/generated/resources/assets/toughasnails/items/sweet_berry_juice.json new file mode 100644 index 00000000..7d9a0569 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/sweet_berry_juice.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/sweet_berry_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/tan_icon.json b/common/src/generated/resources/assets/toughasnails/items/tan_icon.json new file mode 100644 index 00000000..4d23f5b9 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/tan_icon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/tan_icon" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/temperature_gauge.json b/common/src/generated/resources/assets/toughasnails/items/temperature_gauge.json new file mode 100644 index 00000000..68cf28e4 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/temperature_gauge.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:block/temperature_gauge" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/thermometer.json b/common/src/generated/resources/assets/toughasnails/items/thermometer.json new file mode 100644 index 00000000..ea05e6bb --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/thermometer.json @@ -0,0 +1,156 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "deltas": {}, + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_00" + }, + "threshold": 0.0 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_01" + }, + "threshold": 0.05 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_02" + }, + "threshold": 0.1 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_03" + }, + "threshold": 0.15 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_04" + }, + "threshold": 0.2 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_05" + }, + "threshold": 0.25 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_06" + }, + "threshold": 0.3 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_07" + }, + "threshold": 0.35 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_08" + }, + "threshold": 0.4 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_09" + }, + "threshold": 0.45 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_10" + }, + "threshold": 0.5 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_11" + }, + "threshold": 0.55 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_12" + }, + "threshold": 0.6 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_13" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_14" + }, + "threshold": 0.7 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_15" + }, + "threshold": 0.75 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_16" + }, + "threshold": 0.8 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_17" + }, + "threshold": 0.85 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_18" + }, + "threshold": 0.9 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_19" + }, + "threshold": 0.95 + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/thermometer_20" + }, + "threshold": 1.0 + } + ], + "property": "minecraft:temperature" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/thermoregulator.json b/common/src/generated/resources/assets/toughasnails/items/thermoregulator.json new file mode 100644 index 00000000..4c310f93 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/thermoregulator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:block/thermoregulator" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/water_purifier.json b/common/src/generated/resources/assets/toughasnails/items/water_purifier.json new file mode 100644 index 00000000..21f55f67 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/water_purifier.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "toughasnails:block/water_purifier" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/wool_boots.json b/common/src/generated/resources/assets/toughasnails/items/wool_boots.json new file mode 100644 index 00000000..4e5e59a1 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/wool_boots.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_boots", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/wool_chestplate.json b/common/src/generated/resources/assets/toughasnails/items/wool_chestplate.json new file mode 100644 index 00000000..7b916e7c --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/wool_chestplate.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_chestplate", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/wool_helmet.json b/common/src/generated/resources/assets/toughasnails/items/wool_helmet.json new file mode 100644 index 00000000..21180ea7 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/wool_helmet.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_helmet", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/items/wool_leggings.json b/common/src/generated/resources/assets/toughasnails/items/wool_leggings.json new file mode 100644 index 00000000..2b85efd5 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/items/wool_leggings.json @@ -0,0 +1,161 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_quartz_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_iron_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_netherite_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_redstone_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_copper_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_gold_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_emerald_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_diamond_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_lapis_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_amethyst_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings_resin_trim", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "toughasnails:item/wool_leggings", + "tints": [ + { + "type": "minecraft:dye", + "default": -6265536 + } + ] + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/apple_juice.json b/common/src/generated/resources/assets/toughasnails/models/item/apple_juice.json new file mode 100644 index 00000000..d0ce9410 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/apple_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/apple_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/cactus_juice.json b/common/src/generated/resources/assets/toughasnails/models/item/cactus_juice.json new file mode 100644 index 00000000..b2191938 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/cactus_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/cactus_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/charc_os.json b/common/src/generated/resources/assets/toughasnails/models/item/charc_os.json new file mode 100644 index 00000000..c917a282 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/charc_os.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/charc_os" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/chorus_fruit_juice.json b/common/src/generated/resources/assets/toughasnails/models/item/chorus_fruit_juice.json new file mode 100644 index 00000000..4c0877e3 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/chorus_fruit_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/chorus_fruit_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json new file mode 100644 index 00000000..a95b6ef5 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/copper_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json new file mode 100644 index 00000000..26290227 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/copper_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/copper_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/copper_water_canteen.json new file mode 100644 index 00000000..a9842875 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/copper_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/copper_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json new file mode 100644 index 00000000..994ec93b --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/diamond_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json new file mode 100644 index 00000000..b555519d --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/diamond_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/diamond_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/diamond_water_canteen.json new file mode 100644 index 00000000..db1a686b --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/diamond_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/diamond_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/dirty_water_bottle.json b/common/src/generated/resources/assets/toughasnails/models/item/dirty_water_bottle.json new file mode 100644 index 00000000..8053d989 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/dirty_water_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/dirty_water_bottle" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/empty_copper_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/empty_copper_canteen.json new file mode 100644 index 00000000..44bc2dea --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/empty_copper_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/empty_copper_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/empty_diamond_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/empty_diamond_canteen.json new file mode 100644 index 00000000..75c6e719 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/empty_diamond_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/empty_diamond_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/empty_gold_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/empty_gold_canteen.json new file mode 100644 index 00000000..c232502a --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/empty_gold_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/empty_gold_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/empty_iron_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/empty_iron_canteen.json new file mode 100644 index 00000000..73c6004f --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/empty_iron_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/empty_iron_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/empty_leather_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/empty_leather_canteen.json new file mode 100644 index 00000000..e6d2d438 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/empty_leather_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/empty_leather_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/empty_netherite_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/empty_netherite_canteen.json new file mode 100644 index 00000000..3029d81e --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/empty_netherite_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/empty_netherite_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/glow_berry_juice.json b/common/src/generated/resources/assets/toughasnails/models/item/glow_berry_juice.json new file mode 100644 index 00000000..608ad078 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/glow_berry_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/glow_berry_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json new file mode 100644 index 00000000..faff7210 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/gold_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json new file mode 100644 index 00000000..b480a913 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/gold_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/gold_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/gold_water_canteen.json new file mode 100644 index 00000000..d26bebee --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/gold_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/gold_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/ice_cream.json b/common/src/generated/resources/assets/toughasnails/models/item/ice_cream.json new file mode 100644 index 00000000..52ed8ca9 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/ice_cream.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/ice_cream" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json new file mode 100644 index 00000000..38150cbe --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/iron_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json new file mode 100644 index 00000000..cc75743d --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/iron_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/iron_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/iron_water_canteen.json new file mode 100644 index 00000000..cca86eea --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/iron_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/iron_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_boots.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_boots.json index 95e38375..0277a207 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/leaf_boots.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_boots.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/leaf_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/leaf_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/leaf_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/leaf_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/leaf_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/leaf_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/leaf_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/leaf_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/leaf_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/leaf_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/leaf_boots", "layer1": "toughasnails:item/leaf_boots_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_boots_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_boots_resin_trim.json new file mode 100644 index 00000000..f4ad4cdc --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_boots_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/leaf_boots", + "layer1": "toughasnails:item/leaf_boots_overlay", + "layer2": "minecraft:trims/items/boots_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_chestplate.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_chestplate.json index 9d5cc78e..256b50c9 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/leaf_chestplate.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_chestplate.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/leaf_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/leaf_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/leaf_chestplate", "layer1": "toughasnails:item/leaf_chestplate_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_chestplate_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_chestplate_resin_trim.json new file mode 100644 index 00000000..c24b25de --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_chestplate_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/leaf_chestplate", + "layer1": "toughasnails:item/leaf_chestplate_overlay", + "layer2": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_helmet.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_helmet.json index daa30bed..398d16ad 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/leaf_helmet.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_helmet.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/leaf_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/leaf_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/leaf_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/leaf_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/leaf_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/leaf_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/leaf_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/leaf_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/leaf_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/leaf_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/leaf_helmet", "layer1": "toughasnails:item/leaf_helmet_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_helmet_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_helmet_resin_trim.json new file mode 100644 index 00000000..4a078251 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_helmet_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/leaf_helmet", + "layer1": "toughasnails:item/leaf_helmet_overlay", + "layer2": "minecraft:trims/items/helmet_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_leggings.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_leggings.json index e541676f..f1af1477 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/leaf_leggings.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_leggings.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/leaf_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/leaf_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/leaf_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/leaf_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/leaf_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/leaf_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/leaf_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/leaf_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/leaf_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/leaf_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/leaf_leggings", "layer1": "toughasnails:item/leaf_leggings_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leaf_leggings_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/leaf_leggings_resin_trim.json new file mode 100644 index 00000000..5418f6cc --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/leaf_leggings_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/leaf_leggings", + "layer1": "toughasnails:item/leaf_leggings_overlay", + "layer2": "minecraft:trims/items/leggings_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json new file mode 100644 index 00000000..2334f643 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/leather_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json new file mode 100644 index 00000000..8c24936c --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/leather_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/leather_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/leather_water_canteen.json new file mode 100644 index 00000000..8278a6d1 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/leather_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/leather_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/melon_juice.json b/common/src/generated/resources/assets/toughasnails/models/item/melon_juice.json new file mode 100644 index 00000000..baeceebf --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/melon_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/melon_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json new file mode 100644 index 00000000..14307c20 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/netherite_dirty_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json new file mode 100644 index 00000000..87c96bdb --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/netherite_purified_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/netherite_water_canteen.json b/common/src/generated/resources/assets/toughasnails/models/item/netherite_water_canteen.json new file mode 100644 index 00000000..71c3b7df --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/netherite_water_canteen.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/netherite_water_canteen" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/pumpkin_juice.json b/common/src/generated/resources/assets/toughasnails/models/item/pumpkin_juice.json new file mode 100644 index 00000000..05dcd9b8 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/pumpkin_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/pumpkin_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/purified_water_bottle.json b/common/src/generated/resources/assets/toughasnails/models/item/purified_water_bottle.json new file mode 100644 index 00000000..0fa91c6c --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/purified_water_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/purified_water_bottle" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/sweet_berry_juice.json b/common/src/generated/resources/assets/toughasnails/models/item/sweet_berry_juice.json new file mode 100644 index 00000000..fc54dbb5 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/sweet_berry_juice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/sweet_berry_juice" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/tan_icon.json b/common/src/generated/resources/assets/toughasnails/models/item/tan_icon.json new file mode 100644 index 00000000..dec6612a --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/tan_icon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/tan_icon" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/thermometer.json b/common/src/generated/resources/assets/toughasnails/models/item/thermometer.json deleted file mode 100644 index 20db79cc..00000000 --- a/common/src/generated/resources/assets/toughasnails/models/item/thermometer.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/thermometer_00", - "predicate": { - "toughasnails:temperature": 0.0 - } - }, - { - "model": "toughasnails:item/thermometer_01", - "predicate": { - "toughasnails:temperature": 0.05 - } - }, - { - "model": "toughasnails:item/thermometer_02", - "predicate": { - "toughasnails:temperature": 0.1 - } - }, - { - "model": "toughasnails:item/thermometer_03", - "predicate": { - "toughasnails:temperature": 0.15 - } - }, - { - "model": "toughasnails:item/thermometer_04", - "predicate": { - "toughasnails:temperature": 0.2 - } - }, - { - "model": "toughasnails:item/thermometer_05", - "predicate": { - "toughasnails:temperature": 0.25 - } - }, - { - "model": "toughasnails:item/thermometer_06", - "predicate": { - "toughasnails:temperature": 0.3 - } - }, - { - "model": "toughasnails:item/thermometer_07", - "predicate": { - "toughasnails:temperature": 0.35 - } - }, - { - "model": "toughasnails:item/thermometer_08", - "predicate": { - "toughasnails:temperature": 0.4 - } - }, - { - "model": "toughasnails:item/thermometer_09", - "predicate": { - "toughasnails:temperature": 0.45 - } - }, - { - "model": "toughasnails:item/thermometer_10", - "predicate": { - "toughasnails:temperature": 0.5 - } - }, - { - "model": "toughasnails:item/thermometer_11", - "predicate": { - "toughasnails:temperature": 0.55 - } - }, - { - "model": "toughasnails:item/thermometer_12", - "predicate": { - "toughasnails:temperature": 0.6 - } - }, - { - "model": "toughasnails:item/thermometer_13", - "predicate": { - "toughasnails:temperature": 0.65 - } - }, - { - "model": "toughasnails:item/thermometer_14", - "predicate": { - "toughasnails:temperature": 0.7 - } - }, - { - "model": "toughasnails:item/thermometer_15", - "predicate": { - "toughasnails:temperature": 0.75 - } - }, - { - "model": "toughasnails:item/thermometer_16", - "predicate": { - "toughasnails:temperature": 0.8 - } - }, - { - "model": "toughasnails:item/thermometer_17", - "predicate": { - "toughasnails:temperature": 0.85 - } - }, - { - "model": "toughasnails:item/thermometer_18", - "predicate": { - "toughasnails:temperature": 0.9 - } - }, - { - "model": "toughasnails:item/thermometer_19", - "predicate": { - "toughasnails:temperature": 0.95 - } - }, - { - "model": "toughasnails:item/thermometer_20", - "predicate": { - "toughasnails:temperature": 1.0 - } - } - ] -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_boots.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_boots.json index 71ef0f6b..1f843d09 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/wool_boots.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_boots.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/wool_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/wool_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/wool_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/wool_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/wool_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/wool_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/wool_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/wool_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/wool_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/wool_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/wool_boots", "layer1": "toughasnails:item/wool_boots_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_boots_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_boots_resin_trim.json new file mode 100644 index 00000000..0de9962d --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_boots_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/wool_boots", + "layer1": "toughasnails:item/wool_boots_overlay", + "layer2": "minecraft:trims/items/boots_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_chestplate.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_chestplate.json index 521089ca..de95533b 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/wool_chestplate.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_chestplate.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/wool_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/wool_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/wool_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/wool_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/wool_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/wool_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/wool_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/wool_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/wool_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/wool_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/wool_chestplate", "layer1": "toughasnails:item/wool_chestplate_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_chestplate_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_chestplate_resin_trim.json new file mode 100644 index 00000000..b161b043 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_chestplate_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/wool_chestplate", + "layer1": "toughasnails:item/wool_chestplate_overlay", + "layer2": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_helmet.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_helmet.json index 8f625e93..40ed342f 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/wool_helmet.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_helmet.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/wool_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/wool_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/wool_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/wool_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/wool_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/wool_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/wool_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/wool_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/wool_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/wool_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/wool_helmet", "layer1": "toughasnails:item/wool_helmet_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_helmet_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_helmet_resin_trim.json new file mode 100644 index 00000000..9e98afcf --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_helmet_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/wool_helmet", + "layer1": "toughasnails:item/wool_helmet_overlay", + "layer2": "minecraft:trims/items/helmet_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_leggings.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_leggings.json index cb1d5317..b2c6b7cc 100644 --- a/common/src/generated/resources/assets/toughasnails/models/item/wool_leggings.json +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_leggings.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "toughasnails:item/wool_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "toughasnails:item/wool_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "toughasnails:item/wool_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "toughasnails:item/wool_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "toughasnails:item/wool_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "toughasnails:item/wool_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "toughasnails:item/wool_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "toughasnails:item/wool_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "toughasnails:item/wool_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "toughasnails:item/wool_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "toughasnails:item/wool_leggings", "layer1": "toughasnails:item/wool_leggings_overlay" diff --git a/common/src/generated/resources/assets/toughasnails/models/item/wool_leggings_resin_trim.json b/common/src/generated/resources/assets/toughasnails/models/item/wool_leggings_resin_trim.json new file mode 100644 index 00000000..4d7d5805 --- /dev/null +++ b/common/src/generated/resources/assets/toughasnails/models/item/wool_leggings_resin_trim.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "toughasnails:item/wool_leggings", + "layer1": "toughasnails:item/wool_leggings_overlay", + "layer2": "minecraft:trims/items/leggings_trim_resin" + } +} \ No newline at end of file diff --git a/common/src/main/java/toughasnails/client/item/TemperatureProperty.java b/common/src/main/java/toughasnails/client/item/TemperatureProperty.java new file mode 100644 index 00000000..d97eeb57 --- /dev/null +++ b/common/src/main/java/toughasnails/client/item/TemperatureProperty.java @@ -0,0 +1,150 @@ +/******************************************************************************* + * Copyright 2024, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.client.item; + +import com.google.common.collect.Maps; +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperty; +import net.minecraft.core.BlockPos; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; +import toughasnails.api.temperature.TemperatureHelper; +import toughasnails.api.temperature.TemperatureLevel; +import toughasnails.temperature.TemperatureHelperImpl; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +public class TemperatureProperty implements RangeSelectItemModelProperty +{ + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec((builder) -> + builder.group( + Codec.unboundedMap(Codec.INT, Delta.CODEC) + .fieldOf("deltas") + .forGetter(TemperatureProperty::deltas) + ).apply(builder, TemperatureProperty::new) + ); + + private final Map deltas; + + public TemperatureProperty(Map deltas) + { + this.deltas = Maps.newHashMap(deltas); + } + + public TemperatureProperty() { this.deltas = new HashMap<>(); } + + @Override + public float get(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int i) + { + Entity holder = entity != null ? entity : stack.getEntityRepresentation(); + + if (holder == null) + return 0.5F; + + if (level == null && holder.level() instanceof ClientLevel) + level = (ClientLevel)holder.level(); + + if (level == null) + return 0.5F; + + Delta delta = deltas.computeIfAbsent(holder.getId(), k -> new Delta()); + delta.update(level, getTemperatureForThermometer(level, holder)); + return delta.getValue(); + } + + @Override + public MapCodec type() + { + return CODEC; + } + + private Map deltas() + { + return this.deltas; + } + + private static TemperatureLevel getTemperatureForThermometer(Level level, Entity holder) + { + TemperatureLevel temperatureLevel = TemperatureHelper.getTemperatureAtPos(level, holder.blockPosition()); + + // Use the player to acquire nearby thermoregulators, even if they aren't holding the thermometer + Player player = Minecraft.getInstance().player; + Set nearbyThermoregulators = TemperatureHelper.getTemperatureData(player).getNearbyThermoregulators(); + return TemperatureHelperImpl.modifyTemperatureByThermoregulators(level, nearbyThermoregulators, holder.blockPosition(), temperatureLevel); + } + + private static class Delta + { + public static final Codec CODEC = RecordCodecBuilder.create((builder) -> + builder.group( + Codec.LONG.fieldOf("last_update_tick").forGetter(Delta::lastUpdateTick), + Codec.DOUBLE.fieldOf("value").forGetter(Delta::currentValue), + Codec.DOUBLE.fieldOf("rota").forGetter(Delta::rota) + ).apply(builder, Delta::new) + ); + + private long lastUpdateTick; + private double currentValue; + private double rota; + + public Delta(long lastUpdateTick, double currentValue, double rota) + { + this.lastUpdateTick = lastUpdateTick; + this.currentValue = currentValue; + this.rota = rota; + } + + public Delta() {} + + private void update(ClientLevel level, TemperatureLevel temperatureLevel) + { + if (level.getGameTime() == this.lastUpdateTick) + return; + + this.lastUpdateTick = level.getGameTime(); + double targetValue = temperatureLevel.ordinal() * 0.25; + double delta = targetValue - this.currentValue; + + // Add a small increment to the rota to move towards the target value + this.rota += delta * 0.1; + + // Diminish the rota over time. The clock uses 0.9, but we want slightly less wobbling + this.rota *= 0.87; + this.currentValue = Mth.clamp(this.currentValue + this.rota, 0.0, 1.0); + } + + public float getValue() + { + // Round to the nearest 0.05 + return (float)((double)Math.round(this.currentValue * 20.0) / 20.0); + } + + private long lastUpdateTick() + { + return this.lastUpdateTick; + } + + private double currentValue() + { + return this.currentValue; + } + + private double rota() + { + return this.rota; + } + } +} diff --git a/common/src/main/java/toughasnails/core/ToughAsNails.java b/common/src/main/java/toughasnails/core/ToughAsNails.java index 47176d6f..e91922f7 100644 --- a/common/src/main/java/toughasnails/core/ToughAsNails.java +++ b/common/src/main/java/toughasnails/core/ToughAsNails.java @@ -104,7 +104,6 @@ private static void addClientHandlers() // Coloring EventManager.addListener(ModClient::registerBlockColors); - EventManager.addListener(ModClient::registerItemColors); // Particles EventManager.addListener(ModClient::registerParticleSprites); diff --git a/common/src/main/java/toughasnails/init/ModArmorMaterials.java b/common/src/main/java/toughasnails/init/ModArmorMaterials.java index b7aa2443..3b4540e8 100644 --- a/common/src/main/java/toughasnails/init/ModArmorMaterials.java +++ b/common/src/main/java/toughasnails/init/ModArmorMaterials.java @@ -3,8 +3,6 @@ import net.minecraft.Util; import net.minecraft.sounds.SoundEvents; import net.minecraft.tags.ItemTags; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.equipment.ArmorMaterial; import net.minecraft.world.item.equipment.ArmorType; @@ -17,12 +15,12 @@ public class ModArmorMaterials map.put(ArmorType.LEGGINGS, 1); map.put(ArmorType.CHESTPLATE, 1); map.put(ArmorType.HELMET, 1); - }), 1, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, ItemTags.WOOL, ModEquipmentModels.WOOL); + }), 1, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, ItemTags.WOOL, ModEquipmentAssets.WOOL); public static ArmorMaterial LEAF = new ArmorMaterial(5, Util.make(new EnumMap<>(ArmorType.class), (map) -> { map.put(ArmorType.BOOTS, 1); map.put(ArmorType.LEGGINGS, 1); map.put(ArmorType.CHESTPLATE, 1); map.put(ArmorType.HELMET, 1); - }), 1, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, ItemTags.LEAVES, ModEquipmentModels.LEAF); + }), 1, SoundEvents.ARMOR_EQUIP_GENERIC, 0.0F, 0.0F, ItemTags.LEAVES, ModEquipmentAssets.LEAF); } diff --git a/common/src/main/java/toughasnails/init/ModClient.java b/common/src/main/java/toughasnails/init/ModClient.java index f6333c85..4939870d 100644 --- a/common/src/main/java/toughasnails/init/ModClient.java +++ b/common/src/main/java/toughasnails/init/ModClient.java @@ -7,116 +7,15 @@ import glitchcore.event.client.RegisterColorsEvent; import glitchcore.event.client.RegisterParticleSpritesEvent; import glitchcore.util.RenderHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.item.ClampedItemPropertyFunction; -import net.minecraft.client.renderer.item.ItemProperties; -import net.minecraft.core.BlockPos; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.Mth; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.component.DyedItemColor; -import net.minecraft.world.level.FoliageColor; -import net.minecraft.world.level.Level; -import org.jetbrains.annotations.Nullable; -import toughasnails.api.item.TANItems; import toughasnails.api.particle.TANParticles; -import toughasnails.api.temperature.TemperatureHelper; -import toughasnails.api.temperature.TemperatureLevel; import toughasnails.client.particle.ThermoregulatorParticle; -import toughasnails.core.ToughAsNails; -import toughasnails.temperature.TemperatureHelperImpl; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; import static toughasnails.api.block.TANBlocks.RAIN_COLLECTOR; import static toughasnails.api.block.TANBlocks.WATER_PURIFIER; public class ModClient { - static void registerItemProperties() - { - ItemProperties.register(TANItems.THERMOMETER, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "temperature"), new ClampedItemPropertyFunction() { - final Map deltas = new HashMap<>(); - - @Override - public float unclampedCall(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int seed) - { - Entity holder = entity != null ? entity : stack.getEntityRepresentation(); - - if (holder == null) - return 0.5F; - - if (level == null && holder.level() instanceof ClientLevel) - level = (ClientLevel)holder.level(); - - if (level == null) - return 0.5F; - - Delta delta = deltas.computeIfAbsent(holder.getId(), k -> new Delta()); - delta.update(level, getTemperatureForThermometer(level, holder)); - return delta.getValue(); - } - - private static TemperatureLevel getTemperatureForThermometer(Level level, Entity holder) - { - TemperatureLevel temperatureLevel = TemperatureHelper.getTemperatureAtPos(level, holder.blockPosition()); - - // Use the player to acquire nearby thermoregulators, even if they aren't holding the thermometer - Player player = Minecraft.getInstance().player; - Set nearbyThermoregulators = TemperatureHelper.getTemperatureData(player).getNearbyThermoregulators(); - return TemperatureHelperImpl.modifyTemperatureByThermoregulators(level, nearbyThermoregulators, holder.blockPosition(), temperatureLevel); - } - - private static class Delta - { - private long lastUpdateTick; - private double currentValue; - private double rota; - - private void update(ClientLevel level, TemperatureLevel temperatureLevel) - { - if (level.getGameTime() == this.lastUpdateTick) - return; - - this.lastUpdateTick = level.getGameTime(); - double targetValue = temperatureLevel.ordinal() * 0.25; - double delta = targetValue - this.currentValue; - - // Add a small increment to the rota to move towards the target value - this.rota += delta * 0.1; - - // Diminish the rota over time. The clock uses 0.9, but we want slightly less wobbling - this.rota *= 0.87; - this.currentValue = Mth.clamp(this.currentValue + this.rota, 0.0, 1.0); - } - - public float getValue() - { - // Round to the nearest 0.05 - return (float)((double)Math.round(this.currentValue * 20.0) / 20.0); - } - } - }); - } - - public static void registerItemColors(RegisterColorsEvent.Item event) - { - event.register((stack, tintIndex) -> { - return tintIndex > 0 ? -1 : DyedItemColor.getOrDefault(stack, 0xFFFFFF); - }, TANItems.WOOL_HELMET, TANItems.WOOL_CHESTPLATE, TANItems.WOOL_LEGGINGS, TANItems.WOOL_BOOTS); - - event.register((stack, tintIndex) -> { - return tintIndex > 0 ? -1 : DyedItemColor.getOrDefault(stack, FoliageColor.getDefaultColor()); - }, TANItems.LEAF_HELMET, TANItems.LEAF_CHESTPLATE, TANItems.LEAF_LEGGINGS, TANItems.LEAF_BOOTS); - } - public static void registerBlockColors(RegisterColorsEvent.Block event) { event.register((state, world, pos, tintIndex) -> 0x47DAFF, RAIN_COLLECTOR); diff --git a/common/src/main/java/toughasnails/init/ModEquipmentAssets.java b/common/src/main/java/toughasnails/init/ModEquipmentAssets.java new file mode 100644 index 00000000..aeab21ab --- /dev/null +++ b/common/src/main/java/toughasnails/init/ModEquipmentAssets.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright 2024, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.init; + +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.equipment.EquipmentAsset; +import net.minecraft.world.item.equipment.EquipmentAssets; +import toughasnails.core.ToughAsNails; + +import java.util.function.BiConsumer; + +public class ModEquipmentAssets +{ + public static final ResourceKey LEAF = createId("leaf"); + public static final ResourceKey WOOL = createId("wool"); + + static ResourceKey createId(String name) + { + return ResourceKey.create(EquipmentAssets.ROOT_ID, ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name)); + } +} diff --git a/common/src/main/java/toughasnails/init/ModEquipmentModels.java b/common/src/main/java/toughasnails/init/ModEquipmentModels.java deleted file mode 100644 index c5409fab..00000000 --- a/common/src/main/java/toughasnails/init/ModEquipmentModels.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright 2024, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.init; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.equipment.EquipmentModel; -import toughasnails.core.ToughAsNails; - -import java.util.function.BiConsumer; - -public class ModEquipmentModels -{ - public static final ResourceLocation LEAF = ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "leaf"); - public static final ResourceLocation WOOL = ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "wool"); - - public static void bootstrap(BiConsumer output) - { - output.accept( - LEAF, - EquipmentModel.builder() - .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "leaf"), true) - .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "leaf_overlay"), true) - .build() - ); - output.accept( - WOOL, - EquipmentModel.builder() - .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "wool"), true) - .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "wool_overlay"), false) - .build() - ); - } -} diff --git a/common/src/main/java/toughasnails/init/ModItems.java b/common/src/main/java/toughasnails/init/ModItems.java index 557eea0d..6aedb86b 100644 --- a/common/src/main/java/toughasnails/init/ModItems.java +++ b/common/src/main/java/toughasnails/init/ModItems.java @@ -95,11 +95,6 @@ public static void registerItems(BiConsumer func) TANItems.SWEET_BERRY_JUICE = registerItem(func, "sweet_berry_juice", JuiceItem::new, new Item.Properties().stacksTo(16)); TANItems.TAN_ICON = registerItem(func, "tan_icon", Item::new, new Item.Properties()); - - if (Environment.isClient()) - { - ModClient.registerItemProperties(); - } } public static Item registerBlock(BiConsumer func, Block block) diff --git a/common/src/main/java/toughasnails/mixin/client/MixinRangeSelectItemModelProperties.java b/common/src/main/java/toughasnails/mixin/client/MixinRangeSelectItemModelProperties.java new file mode 100644 index 00000000..c575e1df --- /dev/null +++ b/common/src/main/java/toughasnails/mixin/client/MixinRangeSelectItemModelProperties.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright 2024, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.mixin.client; + +import com.mojang.serialization.MapCodec; +import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperties; +import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperty; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.ExtraCodecs; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import toughasnails.client.item.TemperatureProperty; + +@Mixin(RangeSelectItemModelProperties.class) +public class MixinRangeSelectItemModelProperties +{ + @Shadow + @Final + private static ExtraCodecs.LateBoundIdMapper> ID_MAPPER; + + @Inject(method = "bootstrap", at=@At("TAIL")) + private static void onBootstrap(CallbackInfo ci) + { + ID_MAPPER.put(ResourceLocation.withDefaultNamespace("temperature"), TemperatureProperty.CODEC); + } +} diff --git a/common/src/main/resources/assets/toughasnails/blockstates/rain_collector.json b/common/src/main/resources/assets/toughasnails/blockstates/rain_collector.json index 7df2bb4b..6d9b85e9 100644 --- a/common/src/main/resources/assets/toughasnails/blockstates/rain_collector.json +++ b/common/src/main/resources/assets/toughasnails/blockstates/rain_collector.json @@ -1,6 +1,6 @@ { "variants": { - "level=0": { "model": "toughasnails:block/rain_collector_empty" }, + "level=0": { "model": "toughasnails:block/rain_collector" }, "level=1": { "model": "toughasnails:block/rain_collector_level1" }, "level=2": { "model": "toughasnails:block/rain_collector_level2" }, "level=3": { "model": "toughasnails:block/rain_collector_level3" } diff --git a/common/src/main/resources/assets/toughasnails/blockstates/thermoregulator.json b/common/src/main/resources/assets/toughasnails/blockstates/thermoregulator.json index e22b49ee..045642e6 100644 --- a/common/src/main/resources/assets/toughasnails/blockstates/thermoregulator.json +++ b/common/src/main/resources/assets/toughasnails/blockstates/thermoregulator.json @@ -1,7 +1,7 @@ { "variants": { "facing=east,cooling=false,heating=false": { - "model": "toughasnails:block/thermoregulator_inactive", + "model": "toughasnails:block/thermoregulator", "y": 90 }, "facing=east,cooling=true,heating=false": { @@ -17,7 +17,7 @@ "y": 90 }, "facing=north,cooling=false,heating=false": { - "model": "toughasnails:block/thermoregulator_inactive" + "model": "toughasnails:block/thermoregulator" }, "facing=north,cooling=true,heating=false": { "model": "toughasnails:block/thermoregulator_cooling_active" @@ -29,7 +29,7 @@ "model": "toughasnails:block/thermoregulator_active" }, "facing=south,cooling=false,heating=false": { - "model": "toughasnails:block/thermoregulator_inactive", + "model": "toughasnails:block/thermoregulator", "y": 180 }, "facing=south,cooling=true,heating=false": { @@ -45,7 +45,7 @@ "y": 180 }, "facing=west,cooling=false,heating=false": { - "model": "toughasnails:block/thermoregulator_inactive", + "model": "toughasnails:block/thermoregulator", "y": 270 }, "facing=west,cooling=true,heating=false": { diff --git a/common/src/main/resources/assets/toughasnails/models/block/rain_collector_empty.json b/common/src/main/resources/assets/toughasnails/models/block/rain_collector.json similarity index 100% rename from common/src/main/resources/assets/toughasnails/models/block/rain_collector_empty.json rename to common/src/main/resources/assets/toughasnails/models/block/rain_collector.json diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator.json similarity index 100% rename from common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json rename to common/src/main/resources/assets/toughasnails/models/block/thermoregulator.json diff --git a/common/src/main/resources/assets/toughasnails/models/item/apple_juice.json b/common/src/main/resources/assets/toughasnails/models/item/apple_juice.json deleted file mode 100644 index 680035d9..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/apple_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/apple_juice" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/cactus_juice.json b/common/src/main/resources/assets/toughasnails/models/item/cactus_juice.json deleted file mode 100644 index 0b477a85..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/cactus_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/cactus_juice" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/charc_os.json b/common/src/main/resources/assets/toughasnails/models/item/charc_os.json deleted file mode 100644 index b536d5a5..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/charc_os.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/charc_os" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/chorus_fruit_juice.json b/common/src/main/resources/assets/toughasnails/models/item/chorus_fruit_juice.json deleted file mode 100644 index e5a0bfe2..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/chorus_fruit_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/chorus_fruit_juice" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json deleted file mode 100644 index 9c7dd43a..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/copper_dirty_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/copper_dirty_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json deleted file mode 100644 index 892cece4..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/copper_purified_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/copper_purified_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/copper_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/copper_water_canteen.json deleted file mode 100644 index 0f46a2c5..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/copper_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/copper_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json deleted file mode 100644 index 8e7e09d4..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/diamond_dirty_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/diamond_dirty_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json deleted file mode 100644 index 28dcf268..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/diamond_purified_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/diamond_purified_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/diamond_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/diamond_water_canteen.json deleted file mode 100644 index b5de79a6..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/diamond_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/diamond_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/dirty_water_bottle.json b/common/src/main/resources/assets/toughasnails/models/item/dirty_water_bottle.json deleted file mode 100644 index bfa70e59..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/dirty_water_bottle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/dirty_water_bottle" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_copper_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_copper_canteen.json deleted file mode 100644 index 60e53d9a..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/empty_copper_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/empty_copper_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_diamond_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_diamond_canteen.json deleted file mode 100644 index 4b46aec1..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/empty_diamond_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/empty_diamond_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_gold_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_gold_canteen.json deleted file mode 100644 index 3e22f982..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/empty_gold_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/empty_gold_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_iron_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_iron_canteen.json deleted file mode 100644 index a7ec0b2e..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/empty_iron_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/empty_iron_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_leather_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_leather_canteen.json deleted file mode 100644 index bf3dc11b..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/empty_leather_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/empty_leather_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/empty_netherite_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/empty_netherite_canteen.json deleted file mode 100644 index dc640366..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/empty_netherite_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/empty_netherite_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/glow_berry_juice.json b/common/src/main/resources/assets/toughasnails/models/item/glow_berry_juice.json deleted file mode 100644 index 9662cad4..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/glow_berry_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/glow_berry_juice" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json deleted file mode 100644 index 3a4faf16..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/gold_dirty_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/gold_dirty_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json deleted file mode 100644 index e2f3e700..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/gold_purified_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/gold_purified_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/gold_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/gold_water_canteen.json deleted file mode 100644 index 1fc35061..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/gold_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/gold_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/ice_cream.json b/common/src/main/resources/assets/toughasnails/models/item/ice_cream.json deleted file mode 100644 index a4b4620d..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/ice_cream.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/ice_cream" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json deleted file mode 100644 index 45aae4f2..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/iron_dirty_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/iron_dirty_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json deleted file mode 100644 index f208f844..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/iron_purified_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/iron_purified_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/iron_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/iron_water_canteen.json deleted file mode 100644 index b7f8312c..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/iron_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/iron_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json deleted file mode 100644 index de876127..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/leather_dirty_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/leather_dirty_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json deleted file mode 100644 index b6875529..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/leather_purified_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/leather_purified_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/leather_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/leather_water_canteen.json deleted file mode 100644 index 66fd603d..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/leather_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/leather_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/melon_juice.json b/common/src/main/resources/assets/toughasnails/models/item/melon_juice.json deleted file mode 100644 index 83c50ccc..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/melon_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/melon_juice" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json deleted file mode 100644 index 2e07b5a9..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/netherite_dirty_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/netherite_dirty_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json deleted file mode 100644 index 8d023cc3..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/netherite_purified_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/netherite_purified_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/netherite_water_canteen.json b/common/src/main/resources/assets/toughasnails/models/item/netherite_water_canteen.json deleted file mode 100644 index f1d76fe5..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/netherite_water_canteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/netherite_water_canteen" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/pumpkin_juice.json b/common/src/main/resources/assets/toughasnails/models/item/pumpkin_juice.json deleted file mode 100644 index 5bc30317..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/pumpkin_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/pumpkin_juice" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/purified_water_bottle.json b/common/src/main/resources/assets/toughasnails/models/item/purified_water_bottle.json deleted file mode 100644 index dd5f8c9c..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/purified_water_bottle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/purified_water_bottle" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/rain_collector.json b/common/src/main/resources/assets/toughasnails/models/item/rain_collector.json index adcdc17d..97fbb8eb 100644 --- a/common/src/main/resources/assets/toughasnails/models/item/rain_collector.json +++ b/common/src/main/resources/assets/toughasnails/models/item/rain_collector.json @@ -1,4 +1,4 @@ { - "parent": "toughasnails:block/rain_collector_empty" + "parent": "toughasnails:block/rain_collector" } diff --git a/common/src/main/resources/assets/toughasnails/models/item/sweet_berry_juice.json b/common/src/main/resources/assets/toughasnails/models/item/sweet_berry_juice.json deleted file mode 100644 index 12428106..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/sweet_berry_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/sweet_berry_juice" - } -} diff --git a/common/src/main/resources/assets/toughasnails/models/item/tan_icon.json b/common/src/main/resources/assets/toughasnails/models/item/tan_icon.json deleted file mode 100644 index 17fd0dfd..00000000 --- a/common/src/main/resources/assets/toughasnails/models/item/tan_icon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "toughasnails:item/tan_icon" - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/toughasnails/models/item/thermoregulator.json b/common/src/main/resources/assets/toughasnails/models/item/thermoregulator.json index de68c9bd..d05f57d9 100644 --- a/common/src/main/resources/assets/toughasnails/models/item/thermoregulator.json +++ b/common/src/main/resources/assets/toughasnails/models/item/thermoregulator.json @@ -1,3 +1,3 @@ { - "parent": "toughasnails:block/thermoregulator_inactive" + "parent": "toughasnails:block/thermoregulator" } \ No newline at end of file diff --git a/common/src/main/resources/toughasnails.mixins.json b/common/src/main/resources/toughasnails.mixins.json index 73851e25..333d4aa3 100644 --- a/common/src/main/resources/toughasnails.mixins.json +++ b/common/src/main/resources/toughasnails.mixins.json @@ -13,7 +13,8 @@ ], "client": [ "client.MixinGui", - "client.MixinLocalPlayer" + "client.MixinLocalPlayer", + "client.MixinRangeSelectItemModelProperties" ], "injectors": { "defaultRequire": 1 diff --git a/forge/build.gradle b/forge/build.gradle index 8f416d67..ba2d8c86 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -54,15 +54,6 @@ minecraft { } } } - - data { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - args '--mod', mod_id, '--all', '--output', project(':Common').file('src/generated/resources/'), '--existing', project(':Common').file('src/main/resources/') - taskName 'Data' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - } } } diff --git a/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java b/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java deleted file mode 100644 index 08a6c0ff..00000000 --- a/forge/src/main/java/toughasnails/forge/datagen/DataGenerationHandler.java +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************even******* - * Copyright 2022, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.forge.datagen; - -import net.minecraft.core.Cloner; -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistryAccess; -import net.minecraft.core.RegistrySetBuilder; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.PackOutput; -import net.minecraft.data.registries.RegistriesDatapackGenerator; -import net.minecraft.resources.RegistryDataLoader; -import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import toughasnails.api.TANAPI; -import toughasnails.core.ToughAsNails; -import toughasnails.forge.datagen.loot.TANLootTableProvider; -import toughasnails.forge.datagen.model.TANEquipmentModelProvider; -import toughasnails.forge.datagen.model.TANModelProvider; -import toughasnails.forge.datagen.provider.*; -import toughasnails.init.ModEnchantments; -import toughasnails.init.ModEquipmentModels; - -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.CompletableFuture; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = ToughAsNails.MOD_ID) -public class DataGenerationHandler -{ - private static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() - .add(Registries.DAMAGE_TYPE, ModDamageTypes::bootstrap) - .add(Registries.ENCHANTMENT, ModEnchantments::bootstrap); - - @SubscribeEvent - public static void onGatherData(GatherDataEvent event) - { - DataGenerator generator = event.getGenerator(); - ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); - PackOutput output = generator.getPackOutput(); - CompletableFuture lookupProvider = event.getLookupProvider(); - - var datapackProvider = generator.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(output, lookupProvider, BUILDER, Set.of(ToughAsNails.MOD_ID))); - - // Recipes - generator.addProvider(event.includeServer(), new TANRecipeProvider.Runner(output, event.getLookupProvider())); - - // Loot - generator.addProvider(event.includeServer(), TANLootTableProvider.create(output, event.getLookupProvider())); - - // Tags - var blocksTagProvider = generator.addProvider(event.includeServer(), new TANBlockTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); - generator.addProvider(event.includeServer(), new TANItemTagsProvider(output, datapackProvider.getRegistryProvider(), blocksTagProvider.contentsGetter(), existingFileHelper)); - generator.addProvider(event.includeServer(), new TANBiomeTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); - 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)); - generator.addProvider(event.includeClient(), new TANEquipmentModelProvider(output)); - generator.addProvider(event.includeClient(), new TANModelProvider(output)); - } -} diff --git a/forge/src/main/java/toughasnails/forge/datagen/model/TANEquipmentModelProvider.java b/forge/src/main/java/toughasnails/forge/datagen/model/TANEquipmentModelProvider.java deleted file mode 100644 index 75f300de..00000000 --- a/forge/src/main/java/toughasnails/forge/datagen/model/TANEquipmentModelProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright 2024, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.forge.datagen.model; - -import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataProvider; -import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.equipment.EquipmentModel; -import toughasnails.init.ModEquipmentModels; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CompletableFuture; - -public class TANEquipmentModelProvider implements DataProvider -{ - private final PackOutput.PathProvider pathProvider; - - public TANEquipmentModelProvider(PackOutput output) - { - this.pathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "models/equipment"); - } - - @Override - public CompletableFuture run(CachedOutput output) - { - Map map = new HashMap<>(); - ModEquipmentModels.bootstrap((location, model) -> { - if (map.putIfAbsent(location, model) != null) { - throw new IllegalStateException("Tried to register equipment model twice for id: " + location); - } - }); - return DataProvider.saveAll(output, EquipmentModel.CODEC, this.pathProvider, map); - } - - @Override - public String getName() { - return "Equipment Model Definitions"; - } -} \ No newline at end of file diff --git a/forge/src/main/java/toughasnails/forge/datagen/model/TANItemModelGenerators.java b/forge/src/main/java/toughasnails/forge/datagen/model/TANItemModelGenerators.java deleted file mode 100644 index 018469b7..00000000 --- a/forge/src/main/java/toughasnails/forge/datagen/model/TANItemModelGenerators.java +++ /dev/null @@ -1,170 +0,0 @@ -/******************************************************************************* - * Copyright 2024, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.forge.datagen.model; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.function.BiConsumer; -import java.util.function.Supplier; -import net.minecraft.core.component.DataComponents; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.models.ItemModelGenerators; -import net.minecraft.data.models.model.ModelLocationUtils; -import net.minecraft.data.models.model.ModelTemplate; -import net.minecraft.data.models.model.ModelTemplates; -import net.minecraft.data.models.model.TextureMapping; -import net.minecraft.data.models.model.TextureSlot; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.EquipmentSlot.Type; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.equipment.EquipmentModel; -import net.minecraft.world.item.equipment.EquipmentModels; -import net.minecraft.world.item.equipment.Equippable; -import net.minecraft.world.item.equipment.EquipmentModel.LayerType; -import toughasnails.core.ToughAsNails; -import toughasnails.init.ModEquipmentModels; - -public class TANItemModelGenerators -{ - public static final ResourceLocation TRIM_TYPE_PREDICATE_ID = ResourceLocation.withDefaultNamespace("trim_type"); - public static final List GENERATED_TRIM_MODELS = List.of( - new TrimModelData("quartz", 0.1F, Map.of()), - new TrimModelData("iron", 0.2F, Map.of(EquipmentModels.IRON, "iron_darker")), - new TrimModelData("netherite", 0.3F, Map.of(EquipmentModels.NETHERITE, "netherite_darker")), - new TrimModelData("redstone", 0.4F, Map.of()), - new TrimModelData("copper", 0.5F, Map.of()), - new TrimModelData("gold", 0.6F, Map.of(EquipmentModels.GOLD, "gold_darker")), - new TrimModelData("emerald", 0.7F, Map.of()), - new TrimModelData("diamond", 0.8F, Map.of(EquipmentModels.DIAMOND, "diamond_darker")), - new TrimModelData("lapis", 0.9F, Map.of()), - new TrimModelData("amethyst", 1.0F, Map.of()) - ); - private final BiConsumer> output; - - public TANItemModelGenerators(BiConsumer> p_125082_) { - this.output = p_125082_; - } - - private void generateLayeredItem(ResourceLocation p_267272_, ResourceLocation p_266738_, ResourceLocation p_267328_) { - ModelTemplates.TWO_LAYERED_ITEM.create(p_267272_, TextureMapping.layered(p_266738_, p_267328_), this.output); - } - - private void generateLayeredItem(ResourceLocation p_268353_, ResourceLocation p_268162_, ResourceLocation p_268173_, ResourceLocation p_268312_) { - ModelTemplates.THREE_LAYERED_ITEM.create(p_268353_, TextureMapping.layered(p_268162_, p_268173_, p_268312_), this.output); - } - - private ResourceLocation getItemModelForTrimMaterial(ResourceLocation p_266817_, String p_267030_) { - return p_266817_.withSuffix("_" + p_267030_ + "_trim"); - } - - private JsonObject generateBaseArmorTrimTemplate(ResourceLocation p_266939_, Map p_267324_, ResourceLocation p_371397_) { - JsonObject jsonobject = ModelTemplates.TWO_LAYERED_ITEM.createBaseTemplate(p_266939_, p_267324_); - JsonArray jsonarray = new JsonArray(); - - for (TrimModelData itemmodelgenerators$trimmodeldata : GENERATED_TRIM_MODELS) { - JsonObject jsonobject1 = new JsonObject(); - JsonObject jsonobject2 = new JsonObject(); - jsonobject2.addProperty(TRIM_TYPE_PREDICATE_ID.getPath(), itemmodelgenerators$trimmodeldata.itemModelIndex()); - jsonobject1.add("predicate", jsonobject2); - jsonobject1.addProperty("model", this.getItemModelForTrimMaterial(p_266939_, itemmodelgenerators$trimmodeldata.name(p_371397_)).toString()); - jsonarray.add(jsonobject1); - } - - jsonobject.add("overrides", jsonarray); - return jsonobject; - } - - private void generateArmorTrims(Item p_371707_, ResourceLocation p_371849_, EquipmentModel equipmentModel, EquipmentSlot p_371847_) { - List list = equipmentModel.getLayers(EquipmentModel.LayerType.HUMANOID); - if (!list.isEmpty()) { - boolean flag = list.size() == 2 && list.getFirst().dyeable().isPresent(); - ResourceLocation resourcelocation = ModelLocationUtils.getModelLocation(p_371707_); - ResourceLocation resourcelocation1 = TextureMapping.getItemTexture(p_371707_); - ResourceLocation resourcelocation2 = TextureMapping.getItemTexture(p_371707_, "_overlay"); - if (flag) { - ModelTemplates.TWO_LAYERED_ITEM - .create( - resourcelocation, - TextureMapping.layered(resourcelocation1, resourcelocation2), - this.output, - (p_370385_, p_370386_) -> this.generateBaseArmorTrimTemplate(p_370385_, p_370386_, p_371849_) - ); - } else { - ModelTemplates.FLAT_ITEM - .create( - resourcelocation, - TextureMapping.layer0(resourcelocation1), - this.output, - (p_370382_, p_370383_) -> this.generateBaseArmorTrimTemplate(p_370382_, p_370383_, p_371849_) - ); - } - String s = switch (p_371847_) { - case HEAD -> "helmet"; - case CHEST -> "chestplate"; - case LEGS -> "leggings"; - case FEET -> "boots"; - default -> throw new UnsupportedOperationException(); - }; - - for (TrimModelData itemmodelgenerators$trimmodeldata : GENERATED_TRIM_MODELS) { - String s1 = itemmodelgenerators$trimmodeldata.name(p_371849_); - ResourceLocation resourcelocation3 = this.getItemModelForTrimMaterial(resourcelocation, s1); - String s2 = s + "_trim_" + s1; - ResourceLocation resourcelocation4 = ResourceLocation.withDefaultNamespace(s2).withPrefix("trims/items/"); - if (flag) { - this.generateLayeredItem(resourcelocation3, resourcelocation1, resourcelocation2, resourcelocation4); - } else { - this.generateLayeredItem(resourcelocation3, resourcelocation1, resourcelocation4); - } - } - } - } - - public void run() - { - Map map = new HashMap<>(); - ModEquipmentModels.bootstrap(map::put); - - for (Map.Entry, Item> entry : BuiltInRegistries.ITEM.entrySet()) { - // We only want to generate models for our armour - if (!entry.getKey().location().getNamespace().equals(ToughAsNails.MOD_ID)) - continue; - - Item item = entry.getValue(); - - Equippable equippable = item.components().get(DataComponents.EQUIPPABLE); - if (equippable != null && equippable.slot().getType() == EquipmentSlot.Type.HUMANOID_ARMOR && equippable.model().isPresent()) { - ResourceLocation resourcelocation = equippable.model().get(); - EquipmentModel equipmentModel = map.get(resourcelocation); - if (equipmentModel == null) { - throw new IllegalStateException("Referenced equipment model does not exist: " + resourcelocation); - } - - this.generateArmorTrims(item, resourcelocation, equipmentModel, equippable.slot()); - } - } - } - - record TrimModelData(String name, float itemModelIndex, Map overrideArmorMaterials) { - - public String name(ResourceLocation p_363786_) { - return (String)this.overrideArmorMaterials.getOrDefault(p_363786_, this.name); - } - - public float itemModelIndex() { - return this.itemModelIndex; - } - } -} diff --git a/forge/src/main/java/toughasnails/forge/datagen/model/TANModelProvider.java b/forge/src/main/java/toughasnails/forge/datagen/model/TANModelProvider.java deleted file mode 100644 index 1eafa93c..00000000 --- a/forge/src/main/java/toughasnails/forge/datagen/model/TANModelProvider.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright 2024, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.forge.datagen.model; - -import com.google.common.collect.Maps; -import com.google.gson.JsonElement; -import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataProvider; -import net.minecraft.data.PackOutput; -import net.minecraft.data.models.ItemModelGenerators; -import net.minecraft.resources.ResourceLocation; - -import java.nio.file.Path; -import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.function.Supplier; - -public class TANModelProvider implements DataProvider -{ - private final PackOutput.PathProvider modelPathProvider; - - public TANModelProvider(PackOutput output) - { - this.modelPathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "models"); - } - - @Override - public CompletableFuture run(CachedOutput output) - { - Map> modelMap = Maps.newHashMap(); - BiConsumer> modelOutput = (p_325908_, p_325909_) -> { - Supplier $$3x = (Supplier)modelMap.put(p_325908_, p_325909_); - if ($$3x != null) { - throw new IllegalStateException("Duplicate model definition for " + String.valueOf(p_325908_)); - } - }; - (new TANItemModelGenerators(modelOutput)).run(); - return CompletableFuture.allOf(this.saveCollection(output, modelMap, this.modelPathProvider::json)); - } - - private CompletableFuture saveCollection(CachedOutput p_254549_, Map> p_253779_, Function p_254013_) { - return CompletableFuture.allOf(p_253779_.entrySet().stream().map(p_253408_ -> { - Path path = p_254013_.apply(p_253408_.getKey()); - JsonElement jsonelement = p_253408_.getValue().get(); - return DataProvider.saveStable(p_254549_, jsonelement, path); - }).toArray(CompletableFuture[]::new)); - } - - public final String getName() { - return "Model Definitions"; - } -} diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemModelProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemModelProvider.java deleted file mode 100644 index 98a8ea9f..00000000 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemModelProvider.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright 2023, the Glitchfiend Team. - * All rights reserved. - ******************************************************************************/ -package toughasnails.forge.datagen.provider; - -import net.minecraft.core.component.DataComponents; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.equipment.EquipmentModel; -import net.minecraft.world.item.equipment.EquipmentModels; -import net.minecraft.world.item.equipment.Equippable; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; -import toughasnails.core.ToughAsNails; - -import java.util.HashMap; -import java.util.Map; - -public class TANItemModelProvider extends ItemModelProvider -{ - private static final int NUM_THERMOMETER_MODELS = 21; - - public TANItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) - { - super(output, ToughAsNails.MOD_ID, existingFileHelper); - } - - @Override - protected void registerModels() - { - this.registerThermometerModels(); - } - - private void registerThermometerModels() - { - var thermometer = getBuilder(loc("thermometer").toString()).parent(new ModelFile.UncheckedModelFile("item/generated")); - ModelFile[] thermometerModels = new ModelFile[NUM_THERMOMETER_MODELS]; - - // Populate standard and tropical arrays - for (int i = 0; i < NUM_THERMOMETER_MODELS; i++) - { - String pathIndex = String.format("%02d", i); - thermometerModels[i] = this.basicItem(loc("thermometer_" + pathIndex)); - } - - // Thermometer overrides - for (int i = 0; i < NUM_THERMOMETER_MODELS; i++) - { - thermometer.override() - .predicate(loc("temperature"), (float)i / (float)(NUM_THERMOMETER_MODELS - 1)) - .model(thermometerModels[i]); - } - } - - private static ResourceLocation loc(String name) - { - return ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, name); - } -} diff --git a/gradle.properties b/gradle.properties index 728cb207..73af179e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,20 +3,20 @@ group=com.github.glitchfiend release_channel=beta # Common -minecraft_version=1.21.3 +minecraft_version=1.21.4 # Forge -forge_version=53.0.25 -forge_version_range=[53.0.25,) -forge_loader_version_range=[53,) +forge_version=54.0.6 +forge_version_range=[54.0.6,) +forge_loader_version_range=[54,) # NeoForge -neoforge_version=21.3.57 -neoforge_version_range=[21.3,) +neoforge_version=21.4.9-beta +neoforge_version_range=[21.4,) neoforge_loader_version_range=[1,) # Fabric -fabric_version=0.110.0+1.21.3 +fabric_version=0.111.0+1.21.4 fabric_loader_version=0.16.9 # Mod options @@ -40,5 +40,5 @@ org.gradle.daemon=false # Dependencies nightconfig_version=3.6.7 -glitchcore_version=2.2.0.5 -serene_seasons_version=10.2.0.1 +glitchcore_version=2.3.0.1 +serene_seasons_version=10.4.0.0 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index ba5a0ffc..46f607a4 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -29,6 +29,10 @@ runs { systemProperty 'neoforge.enabledGameTestNamespaces', mod_id programArgument '--nogui' } + + clientData { + programArguments.addAll '--mod', project.mod_id, '--all', '--output', project(':Common').file('src/generated/resources/').getAbsolutePath(), '--existing', project(':Common').file('src/main/resources/').getAbsolutePath() + } } dependencies { diff --git a/neoforge/src/main/java/toughasnails/neoforge/datagen/DataGenerationHandler.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/DataGenerationHandler.java new file mode 100644 index 00000000..d4687ef5 --- /dev/null +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/DataGenerationHandler.java @@ -0,0 +1,63 @@ +/************************************************************************even******* + * Copyright 2022, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.neoforge.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.RegistrySetBuilder; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.data.event.GatherDataEvent; +import toughasnails.core.ToughAsNails; +import toughasnails.init.ModEnchantments; +import toughasnails.neoforge.datagen.loot.TANLootTableProvider; +import toughasnails.neoforge.datagen.model.TANEquipmentAssetProvider; +import toughasnails.neoforge.datagen.model.TANModelProvider; +import toughasnails.neoforge.datagen.provider.*; + +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = ToughAsNails.MOD_ID) +public class DataGenerationHandler +{ + private static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() + .add(Registries.DAMAGE_TYPE, ModDamageTypes::bootstrap) + .add(Registries.ENCHANTMENT, ModEnchantments::bootstrap); + + @SubscribeEvent + public static void onGatherData(GatherDataEvent.Client event) + { + DataGenerator generator = event.getGenerator(); + ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + PackOutput output = generator.getPackOutput(); + CompletableFuture lookupProvider = event.getLookupProvider(); + + var datapackProvider = generator.addProvider(true, new DatapackBuiltinEntriesProvider(output, lookupProvider, BUILDER, Set.of(ToughAsNails.MOD_ID))); + + // Recipes + generator.addProvider(true, new TANRecipeProvider.Runner(output, event.getLookupProvider())); + + // Loot + generator.addProvider(true, TANLootTableProvider.create(output, event.getLookupProvider())); + + // Tags + var blocksTagProvider = generator.addProvider(true, new TANBlockTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(true, new TANItemTagsProvider(output, datapackProvider.getRegistryProvider(), blocksTagProvider.contentsGetter(), existingFileHelper)); + generator.addProvider(true, new TANBiomeTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(true, new TANDamageTypeTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(true, new TANTrimMaterialTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(true, new TANPoiTypesTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(true, new TANEnchantmentTagsProvider(output, datapackProvider.getRegistryProvider(), existingFileHelper)); + + // Client + generator.addProvider(true, new TANEquipmentAssetProvider(output)); + generator.addProvider(true, new TANModelProvider(output)); + } +} diff --git a/forge/src/main/java/toughasnails/forge/datagen/ModDamageTypes.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/ModDamageTypes.java similarity index 94% rename from forge/src/main/java/toughasnails/forge/datagen/ModDamageTypes.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/ModDamageTypes.java index 43a0f639..a2a2518c 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/ModDamageTypes.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/ModDamageTypes.java @@ -2,7 +2,7 @@ * Copyright 2022, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen; +package toughasnails.neoforge.datagen; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.world.damagesource.DamageType; diff --git a/forge/src/main/java/toughasnails/forge/datagen/loot/TANBlockLoot.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/loot/TANBlockLoot.java similarity index 96% rename from forge/src/main/java/toughasnails/forge/datagen/loot/TANBlockLoot.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/loot/TANBlockLoot.java index 52301bbf..751a5b23 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/loot/TANBlockLoot.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/loot/TANBlockLoot.java @@ -2,7 +2,7 @@ * Copyright 2023, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.loot; +package toughasnails.neoforge.datagen.loot; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/forge/src/main/java/toughasnails/forge/datagen/loot/TANLootTableProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/loot/TANLootTableProvider.java similarity index 95% rename from forge/src/main/java/toughasnails/forge/datagen/loot/TANLootTableProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/loot/TANLootTableProvider.java index fd2ad0a9..222f21cd 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/loot/TANLootTableProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/loot/TANLootTableProvider.java @@ -2,7 +2,7 @@ * Copyright 2023, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.loot; +package toughasnails.neoforge.datagen.loot; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; diff --git a/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANEquipmentAssetProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANEquipmentAssetProvider.java new file mode 100644 index 00000000..a445b828 --- /dev/null +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANEquipmentAssetProvider.java @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright 2024, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.neoforge.datagen.model; + +import net.minecraft.client.resources.model.EquipmentClientInfo; +import net.minecraft.data.CachedOutput; +import net.minecraft.data.DataProvider; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.equipment.EquipmentAsset; +import toughasnails.core.ToughAsNails; +import toughasnails.init.ModEquipmentAssets; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; + +public class TANEquipmentAssetProvider implements DataProvider +{ + private final PackOutput.PathProvider pathProvider; + + public TANEquipmentAssetProvider(PackOutput output) + { + this.pathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "equipment"); + } + + private static void bootstrap(BiConsumer, EquipmentClientInfo> output) + { + output.accept( + ModEquipmentAssets.LEAF, + EquipmentClientInfo.builder() + .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "leaf"), true) + .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "leaf_overlay"), true) + .build() + ); + output.accept( + ModEquipmentAssets.WOOL, + EquipmentClientInfo.builder() + .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "wool"), true) + .addHumanoidLayers(ResourceLocation.fromNamespaceAndPath(ToughAsNails.MOD_ID, "wool_overlay"), false) + .build() + ); + } + + @Override + public CompletableFuture run(CachedOutput output) + { + Map, EquipmentClientInfo> map = new HashMap<>(); + bootstrap((key, info) -> { + if (map.putIfAbsent(key, info) != null) { + throw new IllegalStateException("Tried to register equipment asset twice for id: " + key); + } + }); + return DataProvider.saveAll(output, EquipmentClientInfo.CODEC, this.pathProvider::json, map); + } + + @Override + public String getName() { + return "Equipment Asset Definitions"; + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANItemModelGenerators.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANItemModelGenerators.java new file mode 100644 index 00000000..d320b637 --- /dev/null +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANItemModelGenerators.java @@ -0,0 +1,137 @@ +/******************************************************************************* + * Copyright 2024, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.neoforge.datagen.model; + +import net.minecraft.client.color.item.Dye; +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.ItemModelOutput; +import net.minecraft.client.data.models.model.*; +import net.minecraft.client.renderer.item.ItemModel; +import net.minecraft.client.renderer.item.RangeSelectItemModel; +import net.minecraft.client.renderer.item.SelectItemModel; +import net.minecraft.client.renderer.item.properties.select.TrimMaterialProperty; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.equipment.EquipmentAsset; +import net.minecraft.world.item.equipment.trim.TrimMaterial; +import net.minecraft.world.level.FoliageColor; +import net.neoforged.neoforge.client.model.generators.ModelFile; +import toughasnails.api.item.TANItems; +import toughasnails.client.item.TemperatureProperty; +import toughasnails.init.ModEquipmentAssets; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.BiConsumer; + +public class TANItemModelGenerators extends ItemModelGenerators +{ + private final ItemModelOutput itemModelOutput; + private final BiConsumer modelOutput; + + public TANItemModelGenerators(ItemModelOutput itemModelOutput, BiConsumer modelOutput) + { + super(itemModelOutput, modelOutput); + this.itemModelOutput = itemModelOutput; + this.modelOutput = modelOutput; + } + + @Override + public void run() + { + this.generateFlatItem(TANItems.ICE_CREAM, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.CHARC_0S, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.EMPTY_LEATHER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.LEATHER_DIRTY_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.LEATHER_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.LEATHER_PURIFIED_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.EMPTY_COPPER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.COPPER_DIRTY_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.COPPER_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.COPPER_PURIFIED_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.EMPTY_IRON_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.IRON_DIRTY_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.IRON_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.IRON_PURIFIED_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.EMPTY_GOLD_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.GOLD_DIRTY_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.GOLD_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.GOLD_PURIFIED_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.EMPTY_DIAMOND_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.DIAMOND_DIRTY_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.DIAMOND_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.DIAMOND_PURIFIED_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.EMPTY_NETHERITE_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.NETHERITE_DIRTY_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.NETHERITE_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.NETHERITE_PURIFIED_WATER_CANTEEN, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.DIRTY_WATER_BOTTLE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.PURIFIED_WATER_BOTTLE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.APPLE_JUICE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.CACTUS_JUICE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.CHORUS_FRUIT_JUICE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.GLOW_BERRY_JUICE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.MELON_JUICE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.PUMPKIN_JUICE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.SWEET_BERRY_JUICE, ModelTemplates.FLAT_ITEM); + this.generateFlatItem(TANItems.TAN_ICON, ModelTemplates.FLAT_ITEM); + + this.generateTrimmableItemWithDefaultColor(TANItems.LEAF_HELMET, ModEquipmentAssets.LEAF, "helmet", FoliageColor.FOLIAGE_DEFAULT); + this.generateTrimmableItemWithDefaultColor(TANItems.LEAF_CHESTPLATE, ModEquipmentAssets.LEAF, "chestplate", FoliageColor.FOLIAGE_DEFAULT); + this.generateTrimmableItemWithDefaultColor(TANItems.LEAF_LEGGINGS, ModEquipmentAssets.LEAF, "leggings", FoliageColor.FOLIAGE_DEFAULT); + this.generateTrimmableItemWithDefaultColor(TANItems.LEAF_BOOTS, ModEquipmentAssets.LEAF, "boots", FoliageColor.FOLIAGE_DEFAULT); + this.generateTrimmableItem(TANItems.WOOL_HELMET, ModEquipmentAssets.WOOL, "helmet", true); + this.generateTrimmableItem(TANItems.WOOL_CHESTPLATE, ModEquipmentAssets.WOOL, "chestplate", true); + this.generateTrimmableItem(TANItems.WOOL_LEGGINGS, ModEquipmentAssets.WOOL, "leggings", true); + this.generateTrimmableItem(TANItems.WOOL_BOOTS, ModEquipmentAssets.WOOL, "boots", true); + + this.generateThermometerItem(TANItems.THERMOMETER); + } + + public void generateTrimmableItemWithDefaultColor(Item item, ResourceKey key, String name, int defaultColor) + { + ResourceLocation modelLocation = ModelLocationUtils.getModelLocation(item); + ResourceLocation textureLocation = TextureMapping.getItemTexture(item); + ResourceLocation overlayTextureLocation = TextureMapping.getItemTexture(item, "_overlay"); + List>> list = new ArrayList<>(TRIM_MATERIAL_MODELS.size()); + + for (ItemModelGenerators.TrimMaterialData itemmodelgenerators$trimmaterialdata : TRIM_MATERIAL_MODELS) { + ResourceLocation resourcelocation3 = modelLocation.withSuffix("_" + itemmodelgenerators$trimmaterialdata.name() + "_trim"); + ResourceLocation resourcelocation4 = ResourceLocation.withDefaultNamespace( + "trims/items/" + name + "_trim_" + itemmodelgenerators$trimmaterialdata.textureName(key) + ); + ItemModel.Unbaked itemmodel$unbaked; + this.generateLayeredItem(resourcelocation3, textureLocation, overlayTextureLocation, resourcelocation4); + itemmodel$unbaked = ItemModelUtils.tintedModel(resourcelocation3, new Dye(defaultColor)); + + list.add(ItemModelUtils.when(itemmodelgenerators$trimmaterialdata.materialKey(), itemmodel$unbaked)); + } + + ItemModel.Unbaked itemmodel$unbaked1; + ModelTemplates.TWO_LAYERED_ITEM.create(modelLocation, TextureMapping.layered(textureLocation, overlayTextureLocation), this.modelOutput); + itemmodel$unbaked1 = ItemModelUtils.tintedModel(modelLocation, new Dye(defaultColor)); + + this.itemModelOutput.accept(item, ItemModelUtils.select(new TrimMaterialProperty(), itemmodel$unbaked1, list)); + } + + private static final int NUM_THERMOMETER_MODELS = 21; + + public void generateThermometerItem(Item item) + { + List entries = new ArrayList<>(); + + for (int i = 0; i < NUM_THERMOMETER_MODELS; i++) + { + entries.add(ItemModelUtils.override(ItemModelUtils.plainModel(this.createFlatItemModel(item, String.format("_%02d", i), ModelTemplates.FLAT_ITEM)), (float)i / (float)(NUM_THERMOMETER_MODELS - 1))); + } + + this.itemModelOutput + .accept( + item, + ItemModelUtils.rangeSelect(new TemperatureProperty(), 1.0F, entries) + ); + } +} diff --git a/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANModelProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANModelProvider.java new file mode 100644 index 00000000..68798883 --- /dev/null +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/model/TANModelProvider.java @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright 2024, the Glitchfiend Team. + * All rights reserved. + ******************************************************************************/ +package toughasnails.neoforge.datagen.model; + +import glitchcore.data.ModelProviderBase; +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.ItemModelOutput; +import net.minecraft.client.data.models.blockstates.BlockStateGenerator; +import net.minecraft.client.data.models.model.ModelInstance; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import toughasnails.core.ToughAsNails; + +import java.util.function.BiConsumer; +import java.util.function.Consumer; + +public class TANModelProvider extends ModelProviderBase +{ + public TANModelProvider(PackOutput output) + { + super(output, ToughAsNails.MOD_ID); + } + + @Override + protected BlockModelGenerators createBlockModelGenerators(Consumer consumer, ItemModelOutput itemModelOutput, BiConsumer biConsumer) { + return null; + } + + @Override + protected ItemModelGenerators createItemModelGenerators(ItemModelOutput itemModelOutput, BiConsumer modelOutput) { + return new TANItemModelGenerators(itemModelOutput, modelOutput); + } +} diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANBiomeTagsProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANBiomeTagsProvider.java similarity index 96% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANBiomeTagsProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANBiomeTagsProvider.java index ef6a3417..e50153f6 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANBiomeTagsProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANBiomeTagsProvider.java @@ -2,13 +2,13 @@ * Copyright 2023, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.datagen.provider; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.BiomeTagsProvider; import net.minecraft.world.level.biome.Biomes; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import toughasnails.core.ToughAsNails; import toughasnails.init.ModTags; diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANBlockTagsProvider.java similarity index 90% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANBlockTagsProvider.java index 1e5b21d9..e934cd77 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANBlockTagsProvider.java @@ -2,14 +2,14 @@ * Copyright 2022, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.datagen.provider; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.tags.BlockTags; import net.minecraft.world.level.block.Blocks; -import net.minecraftforge.common.data.BlockTagsProvider; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.BlockTagsProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import toughasnails.api.block.TANBlocks; import toughasnails.core.ToughAsNails; diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANDamageTypeTagsProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANDamageTypeTagsProvider.java similarity index 91% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANDamageTypeTagsProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANDamageTypeTagsProvider.java index 15f27170..df44cf7f 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANDamageTypeTagsProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANDamageTypeTagsProvider.java @@ -2,7 +2,7 @@ * Copyright 2022, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.datagen.provider; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; @@ -10,7 +10,7 @@ import net.minecraft.data.tags.TagsProvider; import net.minecraft.tags.DamageTypeTags; import net.minecraft.world.damagesource.DamageType; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import toughasnails.api.damagesource.TANDamageTypes; import toughasnails.core.ToughAsNails; diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANEnchantmentTagsProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANEnchantmentTagsProvider.java similarity index 78% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANEnchantmentTagsProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANEnchantmentTagsProvider.java index 8b551414..1567c732 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANEnchantmentTagsProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANEnchantmentTagsProvider.java @@ -2,21 +2,15 @@ * Copyright 2022, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.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 net.neoforged.neoforge.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; diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemTagsProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANItemTagsProvider.java similarity index 98% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANItemTagsProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANItemTagsProvider.java index f2f800e0..2c1c6d4d 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANItemTagsProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANItemTagsProvider.java @@ -2,7 +2,7 @@ * Copyright 2023, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.datagen.provider; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -11,7 +11,7 @@ import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import toughasnails.api.item.TANItems; import toughasnails.core.ToughAsNails; diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANPoiTypesTagsProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANPoiTypesTagsProvider.java similarity index 91% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANPoiTypesTagsProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANPoiTypesTagsProvider.java index 0dfad8e2..a74a1307 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANPoiTypesTagsProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANPoiTypesTagsProvider.java @@ -2,14 +2,14 @@ * Copyright 2024, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.datagen.provider; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.PoiTypeTagsProvider; import net.minecraft.tags.PoiTypeTags; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import toughasnails.api.village.TANPoiTypes; import toughasnails.core.ToughAsNails; diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANRecipeProvider.java similarity index 98% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANRecipeProvider.java index 456b3d2b..716a85db 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANRecipeProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANRecipeProvider.java @@ -1,4 +1,4 @@ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.datagen.provider; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; @@ -14,7 +14,7 @@ import toughasnails.api.block.TANBlocks; import toughasnails.api.item.TANItems; import toughasnails.core.ToughAsNails; -import toughasnails.forge.datagen.recipes.WaterPurifierRecipeBuilder; +import toughasnails.neoforge.datagen.recipes.WaterPurifierRecipeBuilder; import java.util.concurrent.CompletableFuture; diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANTrimMaterialTagsProvider.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANTrimMaterialTagsProvider.java similarity index 91% rename from forge/src/main/java/toughasnails/forge/datagen/provider/TANTrimMaterialTagsProvider.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANTrimMaterialTagsProvider.java index 963e4af3..ada3ed86 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANTrimMaterialTagsProvider.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/provider/TANTrimMaterialTagsProvider.java @@ -2,14 +2,14 @@ * Copyright 2023, the Glitchfiend Team. * All rights reserved. ******************************************************************************/ -package toughasnails.forge.datagen.provider; +package toughasnails.neoforge.datagen.provider; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.TagsProvider; import net.minecraft.world.item.equipment.trim.TrimMaterial; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import toughasnails.core.ToughAsNails; import toughasnails.init.ModTags; diff --git a/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java b/neoforge/src/main/java/toughasnails/neoforge/datagen/recipes/WaterPurifierRecipeBuilder.java similarity index 96% rename from forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java rename to neoforge/src/main/java/toughasnails/neoforge/datagen/recipes/WaterPurifierRecipeBuilder.java index 54dc608e..e369ee04 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/recipes/WaterPurifierRecipeBuilder.java +++ b/neoforge/src/main/java/toughasnails/neoforge/datagen/recipes/WaterPurifierRecipeBuilder.java @@ -1,4 +1,4 @@ -package toughasnails.forge.datagen.recipes; +package toughasnails.neoforge.datagen.recipes; import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeOutput; diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg index 54ef8026..2ef91012 100644 --- a/neoforge/src/main/resources/META-INF/accesstransformer.cfg +++ b/neoforge/src/main/resources/META-INF/accesstransformer.cfg @@ -24,3 +24,8 @@ public net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool public net.minecraft.world.entity.ai.village.poi.PoiTypes registerBlockStates(Lnet/minecraft/core/Holder;Ljava/util/Set;)V public net.minecraft.world.level.block.entity.BlockEntityType (Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;Ljava/util/Set;)V + +# Data gen +public net.minecraft.client.data.models.ItemModelGenerators *() +public net.minecraft.client.data.models.ItemModelGenerators$TrimMaterialData +public net.minecraft.client.data.models.ItemModelGenerators TRIM_MATERIAL_MODELS