From b894d7fd21f7216909edc4a670ef650d589e3cea Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Wed, 2 Dec 2020 18:29:11 +0000 Subject: [PATCH] Refactored all paxels to AIOTS --- src/generated/resources/.cache/cache | 28 ++++++++-------- .../assets/actuallyadditions/lang/en_us.json | 26 +++++++-------- ...meradic_paxel.json => diamatine_aiot.json} | 2 +- .../models/item/diamatine_paxel.json | 6 ---- .../models/item/diamond_aiot.json | 6 ++++ ...{diamond_paxel.json => emeradic_aiot.json} | 2 +- .../item/{gold_paxel.json => enori_aiot.json} | 2 +- .../item/{void_paxel.json => gold_aiot.json} | 2 +- .../item/{iron_paxel.json => iron_aiot.json} | 2 +- .../models/item/netherite_aiot.json | 6 ++++ .../models/item/netherite_paxel.json | 6 ---- .../{enori_paxel.json => palis_aiot.json} | 2 +- .../{palis_paxel.json => quartz_aiot.json} | 2 +- .../models/item/quartz_paxel.json | 6 ---- .../models/item/restonia_aiot.json | 6 ++++ .../models/item/restonia_paxel.json | 6 ---- .../models/item/stone_aiot.json | 6 ++++ .../models/item/stone_paxel.json | 6 ---- .../models/item/void_aiot.json | 6 ++++ .../models/item/wooden_aiot.json | 6 ++++ .../models/item/wooden_paxel.json | 6 ---- .../common/items/ActuallyItems.java | 30 +++++++++--------- .../data/GeneratorLanguage.java | 28 ++++++++-------- ...diamatine_paxel.png => diamatine_aiot.png} | Bin .../{diamond_paxel.png => diamond_aiot.png} | Bin .../{emeradic_paxel.png => emeradic_aiot.png} | Bin .../item/{enori_paxel.png => enori_aiot.png} | Bin .../item/{gold_paxel.png => gold_aiot.png} | Bin .../item/{iron_paxel.png => iron_aiot.png} | Bin ...netherite_paxel.png => netherite_aiot.png} | Bin .../item/{palis_paxel.png => palis_aiot.png} | Bin .../{quartz_paxel.png => quartz_aiot.png} | Bin .../{restonia_paxel.png => restonia_aiot.png} | Bin .../item/{stone_paxel.png => stone_aiot.png} | Bin .../item/{void_paxel.png => void_aiot.png} | Bin .../{wooden_paxel.png => wooden_aiot.png} | Bin 36 files changed, 99 insertions(+), 99 deletions(-) rename src/generated/resources/assets/actuallyadditions/models/item/{emeradic_paxel.json => diamatine_aiot.json} (53%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_paxel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json rename src/generated/resources/assets/actuallyadditions/models/item/{diamond_paxel.json => emeradic_aiot.json} (53%) rename src/generated/resources/assets/actuallyadditions/models/item/{gold_paxel.json => enori_aiot.json} (55%) rename src/generated/resources/assets/actuallyadditions/models/item/{void_paxel.json => gold_aiot.json} (55%) rename src/generated/resources/assets/actuallyadditions/models/item/{iron_paxel.json => iron_aiot.json} (55%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/netherite_paxel.json rename src/generated/resources/assets/actuallyadditions/models/item/{enori_paxel.json => palis_aiot.json} (54%) rename src/generated/resources/assets/actuallyadditions/models/item/{palis_paxel.json => quartz_aiot.json} (54%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_paxel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/restonia_paxel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/stone_paxel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/wooden_paxel.json rename src/main/resources/assets/actuallyadditions/textures/item/{diamatine_paxel.png => diamatine_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{diamond_paxel.png => diamond_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{emeradic_paxel.png => emeradic_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{enori_paxel.png => enori_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{gold_paxel.png => gold_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{iron_paxel.png => iron_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{netherite_paxel.png => netherite_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{palis_paxel.png => palis_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{quartz_paxel.png => quartz_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{restonia_paxel.png => restonia_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{stone_paxel.png => stone_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{void_paxel.png => void_aiot.png} (100%) rename src/main/resources/assets/actuallyadditions/textures/item/{wooden_paxel.png => wooden_aiot.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 7abd0d413..22bcb04d9 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -115,7 +115,7 @@ e2c81adfe240117fa0ce2e3dfcfd04f4e1034153 assets/actuallyadditions/blockstates/wh 3670535838b4c26d01afe7ee4807c53a6cbaba12 assets/actuallyadditions/blockstates/white_wall_block.json 78e89628e3c6e891f2994b2a1794672f69826516 assets/actuallyadditions/blockstates/wood_casing_block.json 207adf3d139369e983100a6002f6f77d36d40916 assets/actuallyadditions/blockstates/xp_solidifier_block.json -3cb05cbdad628cca379116db0b49361364870d46 assets/actuallyadditions/lang/en_us.json +d8850d66bfac1fdc09b7872f5602a4325cd82ba9 assets/actuallyadditions/lang/en_us.json 8ce3f2af3288773fb581a3668c2cb90b64c9ee2f assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json de74eda6290d47ef2b26961693e537d7b8795a06 assets/actuallyadditions/models/block/atomic_reconstructor_block.json 16a76926a07fc8fa10e4a3949d15ad2ca6920bb8 assets/actuallyadditions/models/block/battery_box_block.json @@ -335,6 +335,7 @@ af1f5da310b381b33448253efb60dbe483a45aa3 assets/actuallyadditions/models/item/cr 49746606ac712682e5214b7ab7a17dc0623c7b9b assets/actuallyadditions/models/item/crystal_void_empowered_block.json 3a9cfcb0a3bec43f6556b3bdab09731758a36cc2 assets/actuallyadditions/models/item/crystallized_canola_seed.json a943582385821b446d6aee26d801d6e679b240f0 assets/actuallyadditions/models/item/cup_with_coffee.json +ec0cdeb022c4e0bc43c0fd5d3e3e758361f7ebe2 assets/actuallyadditions/models/item/diamatine_aiot.json 9e7e70f1efd1fdc83d78d0526657c229acf7293d assets/actuallyadditions/models/item/diamatine_axe.json 04cc1e040d286dbf4e8b828b52a76829ed51e14a assets/actuallyadditions/models/item/diamatine_boots.json da70aeb59016906e7f33962b8c5495e9c152b2f9 assets/actuallyadditions/models/item/diamatine_chest.json @@ -343,11 +344,10 @@ da70aeb59016906e7f33962b8c5495e9c152b2f9 assets/actuallyadditions/models/item/di ffecaedc7f93c583286ea861c0c98791305a0a59 assets/actuallyadditions/models/item/diamatine_helmet.json ca4a1f8f4693b25fa330046e0d98166837306736 assets/actuallyadditions/models/item/diamatine_hoe.json 8cb448698814ed775d58d129e20c381961941228 assets/actuallyadditions/models/item/diamatine_leggings.json -25c0434b01fcb5c50cfc190a78a31684971bb5bf assets/actuallyadditions/models/item/diamatine_paxel.json c4ac3c9aa45c9de7a4bde35c39b7319a6985a81a assets/actuallyadditions/models/item/diamatine_pickaxe.json 7fac46c297edcfe8a9016ea9774edec7ca6e9b28 assets/actuallyadditions/models/item/diamatine_shovel.json 306227b32b761fa7d197510fdd6a5bee47999230 assets/actuallyadditions/models/item/diamatine_sword.json -d00da166616c8b18aefe791cbb75647d88911f36 assets/actuallyadditions/models/item/diamond_paxel.json +6f5307c394a079b45f70e8f08cc3e370aeca5f52 assets/actuallyadditions/models/item/diamond_aiot.json ffb61bb99478e9efba72a21784b1a3fb5287e21b assets/actuallyadditions/models/item/directional_breaker_block.json 58d31d7f80a8dd5fa492b13446d57b11a287ea59 assets/actuallyadditions/models/item/display_stand_block.json 830e1315602d6dd7ccc4b38860895ce4790c145c assets/actuallyadditions/models/item/double_battery.json @@ -379,6 +379,7 @@ b6f39db1ed21e51247f4e3ea4f609f5dd6baff11 assets/actuallyadditions/models/item/dr 92b01e19a49bb23c379c29955a0438e1eb8dd8c1 assets/actuallyadditions/models/item/drill_white.json 7824efe710d936cef44998e197b49a8433c1c1f9 assets/actuallyadditions/models/item/drill_yellow.json 62b147782f326334ae40c69a1b73d0cfe6049b52 assets/actuallyadditions/models/item/dropper_block.json +4b8852132e20b7dd8e00a9c34e20c3a2c11d9a23 assets/actuallyadditions/models/item/emeradic_aiot.json 3bd2946a4b692c94378729e98fa7d8c6a75cd0d4 assets/actuallyadditions/models/item/emeradic_axe.json 1b28a2ffb84777e3d60a63fc61cad5ba5f30a577 assets/actuallyadditions/models/item/emeradic_boots.json 0cddaa86241703d2ac166172cb5d8049d24e2098 assets/actuallyadditions/models/item/emeradic_chest.json @@ -387,7 +388,6 @@ b6f39db1ed21e51247f4e3ea4f609f5dd6baff11 assets/actuallyadditions/models/item/dr 0a31211bac47e8d59023790adc3797602f31d1c9 assets/actuallyadditions/models/item/emeradic_helmet.json ac21d5995a062f1dda81b773345ae57f8561cb10 assets/actuallyadditions/models/item/emeradic_hoe.json 154b131984e141fc688228103a195768180cec38 assets/actuallyadditions/models/item/emeradic_leggings.json -d18763063950fcd1bb179e093680bfd080e2183e assets/actuallyadditions/models/item/emeradic_paxel.json bb7a2ccf98db52964ddeab40faf8131ccc26b54c assets/actuallyadditions/models/item/emeradic_pickaxe.json 1c10c3878a34ec5c8b2cece3edb9dbb5fa33d530 assets/actuallyadditions/models/item/emeradic_shovel.json 53ab26f5ffd8ad380fea2a54cb17e42262735021 assets/actuallyadditions/models/item/emeradic_sword.json @@ -404,6 +404,7 @@ e825d00bc65e1c3a7cc106d619c1de96ddfb9574 assets/actuallyadditions/models/item/en 7e3e0cf6399c050df5555c0242f5dcb1be1e364c assets/actuallyadditions/models/item/enervator_block.json accc66e54be6fcc7b86a7ce166ed15a5dd24e2fe assets/actuallyadditions/models/item/engineers_goggles.json e82ce9a388975576c2251b7e8bf685a8423bc288 assets/actuallyadditions/models/item/engineers_goggles_infrared.json +4ce9cdeb273ad2dae586c9d5c97cd1d78aa64e95 assets/actuallyadditions/models/item/enori_aiot.json 9da6d04e1afdb1605234f885bdb00581ab4e21da assets/actuallyadditions/models/item/enori_axe.json 792b648a3ec5c6aaa304db5d249fd818f092e132 assets/actuallyadditions/models/item/enori_boots.json c1c34b6ddfc22f9be215b9b4cd99485f37522423 assets/actuallyadditions/models/item/enori_chest.json @@ -412,7 +413,6 @@ ce947ce66c2f81aa41e5659b6341d44c07705525 assets/actuallyadditions/models/item/en 2ca56d563000f0ac4a880e1c70ee16e96591ee71 assets/actuallyadditions/models/item/enori_helmet.json fb640c28e67d6f8371452f516caf213b782357c1 assets/actuallyadditions/models/item/enori_hoe.json 8e9938fd557deb4cc956a8b46d3e9e863d0fbfc1 assets/actuallyadditions/models/item/enori_leggings.json -97b8ed52ba1116dc67dcc1dfbe7b560aedd1508d assets/actuallyadditions/models/item/enori_paxel.json a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/enori_pickaxe.json 3b242598d0f2f6a4ad68ba825be8ad40c3b3a938 assets/actuallyadditions/models/item/enori_shovel.json 26c0ad839f51a9f49d254d966c98738ebf2b6906 assets/actuallyadditions/models/item/enori_sword.json @@ -450,7 +450,7 @@ de34f91f91b336fd4dda56e4a5c8a6c39b9060cd assets/actuallyadditions/models/item/fo cee9ab0a1ce3d3bbedd6d3c36a35d6c3968909c0 assets/actuallyadditions/models/item/food_toast.json e7b0055342ea6b416ac6cf8d372766926c6a0d70 assets/actuallyadditions/models/item/food_toast_o_chocolate.json c130e4cc1b77811230481e0a0276b94802094506 assets/actuallyadditions/models/item/fur_ball.json -ca0c27a6bbf80283389fa7522135af8f605e6fe7 assets/actuallyadditions/models/item/gold_paxel.json +668a71327161393ba5b3bbe236e8158ebec5585d assets/actuallyadditions/models/item/gold_aiot.json b5c343509b6ae48e965a23cd5f3c74e85e4f7d64 assets/actuallyadditions/models/item/green_block.json 1b2f19134b68efea27bc6f6ec1b195860609a5d7 assets/actuallyadditions/models/item/green_crystal_shard.json 4c5a678dc881c854dcb2d6f2123ed5e459fb4856 assets/actuallyadditions/models/item/green_slab_block.json @@ -460,8 +460,8 @@ c6073044af8a741e3a90c90622d6e1272dab9482 assets/actuallyadditions/models/item/gr 0d5a4fcc37d925f2adc52d7d3ddda708871dc4b8 assets/actuallyadditions/models/item/handheld_filler.json 66471a00731b2df91c36c59827f9e07444c9c301 assets/actuallyadditions/models/item/heat_collector_block.json 76ed4ff443bb3a205e1548283fb32a7be5cefde9 assets/actuallyadditions/models/item/hopping_item_interface_block.json +5513baa5bd2d53702880a1ab6bb23d7159ebbd89 assets/actuallyadditions/models/item/iron_aiot.json cc05fca55e55883f67ceac4cb3415f66d5781839 assets/actuallyadditions/models/item/iron_casing_block.json -754a286167121413fb64334ef9735c108e43dfc8 assets/actuallyadditions/models/item/iron_paxel.json 1c851c6b2d694d8e78336b90389cd2a0719657b0 assets/actuallyadditions/models/item/item_filter.json bd1cb3ca86dfb9dfe128e207c067e95417fe7acc assets/actuallyadditions/models/item/item_interface_block.json 681f91c05610fb0a9a0448ce97fd66b2bb4f6abf assets/actuallyadditions/models/item/item_laser_relay_block.json @@ -506,9 +506,10 @@ a1da5a212c8f8454a1e632e083986fc86cbe8de7 assets/actuallyadditions/models/item/le 3247178d5c1350c2a93e544687c12a88cf28a363 assets/actuallyadditions/models/item/lens_of_the_miner.json 7cf35789a4219d1cdd98efc48377411397c3bc56 assets/actuallyadditions/models/item/light_blue_crystal_shard.json 9b808f2be60fcc9050809764806a35034179dd8b assets/actuallyadditions/models/item/miner_block.json -d1e4e7e705bff89a0bab79236d677b1df7314277 assets/actuallyadditions/models/item/netherite_paxel.json +abf136ca89e5d896fd9ae6f89d0113d5793b3b1c assets/actuallyadditions/models/item/netherite_aiot.json 36bb2691e668e6047d883df9e039ed6c4aee8c5b assets/actuallyadditions/models/item/oil_generator_block.json b4dfa39729410a45832eae5a5ea775ee67498333 assets/actuallyadditions/models/item/ore_black_quartz_block.json +0dc90f8c2d8cc17f4859d196c4ab22caf52e7bd1 assets/actuallyadditions/models/item/palis_aiot.json 8a77539480881e4fa9ea005fc3aedf2d1cb96591 assets/actuallyadditions/models/item/palis_axe.json 29f970ca565c5c644753d5620e7067d4be4dbfaf assets/actuallyadditions/models/item/palis_boots.json 0f3a678af7ca6a190f1c67912ee70cbb015d3b5a assets/actuallyadditions/models/item/palis_chest.json @@ -517,7 +518,6 @@ f1bb3641fe606b35763c0c9195912e7a0568e5ce assets/actuallyadditions/models/item/pa 7b1188381f2f6027ccf90a60a31608e328140215 assets/actuallyadditions/models/item/palis_helmet.json 3084f4f936248f5ba8ee824589b6c44d5a0bd5c6 assets/actuallyadditions/models/item/palis_hoe.json ffaaa1313bcf109c56f6559188a76c423974337e assets/actuallyadditions/models/item/palis_leggings.json -77d00a0dacef96ab24137089e78957cf35d02144 assets/actuallyadditions/models/item/palis_paxel.json c3d4f372ba0830107b923c775ec4cb56fdaf689c assets/actuallyadditions/models/item/palis_pickaxe.json 71a10bd7ab54b34dd69c72786fdfbb8481fd55c6 assets/actuallyadditions/models/item/palis_shovel.json 7f56c1c9431ae3e145363418db9f7c1ce84cf280 assets/actuallyadditions/models/item/palis_sword.json @@ -535,13 +535,13 @@ c1160cdeb93906066fe48941bff15df1d2a0eba0 assets/actuallyadditions/models/item/pl 9321683e08cd6615f2f0950625607eb81e9d0c26 assets/actuallyadditions/models/item/player_probe.json 883ee3452093e194ba6ce9d0080503f8632c4769 assets/actuallyadditions/models/item/powered_furnace_block.json 5bd39a6929e7aae1ea79ae43886375a87c99ede8 assets/actuallyadditions/models/item/quadruple_battery.json +0f44823c6679515075a2dab5136e0b252eb8f9d9 assets/actuallyadditions/models/item/quartz_aiot.json 7bba09610775eb952d606503b2a3d1cf53c879ff assets/actuallyadditions/models/item/quartz_axe.json 54fb808aed07fcfb05f00a106ec5702741bc4039 assets/actuallyadditions/models/item/quartz_boots.json 2925dd7f88077a3b4785896bc1629e578ce6431c assets/actuallyadditions/models/item/quartz_chest.json eb82609dc88ed0191e68c525c85709eaf7e56a3e assets/actuallyadditions/models/item/quartz_helmet.json 4faca792b10bc25242c6a4b2a169bef4c43e0b5b assets/actuallyadditions/models/item/quartz_hoe.json e7defe0b4ca9c8de825236c45430005dd52e7006 assets/actuallyadditions/models/item/quartz_leggings.json -a5708820c1b9dfc00f4e4f5f702d423ad59f21db assets/actuallyadditions/models/item/quartz_paxel.json af0512cfb813e6fb43bb920db3eb1f1c2976ace6 assets/actuallyadditions/models/item/quartz_pickaxe.json 10afec0e4b4f4adfab5e4286455ffc2c5b1f845f assets/actuallyadditions/models/item/quartz_shovel.json bb0fbcacce026c672b8d98db22694fd2b6eefb20 assets/actuallyadditions/models/item/quartz_sword.json @@ -549,6 +549,7 @@ bb0fbcacce026c672b8d98db22694fd2b6eefb20 assets/actuallyadditions/models/item/qu dc81fa6e9280a8403f7f747e9edcb259575ae5d5 assets/actuallyadditions/models/item/ranged_collector_block.json 6446c65e960d8eb91c12f6dcfeba208c760d590d assets/actuallyadditions/models/item/red_crystal_shard.json a607d6e415c04d4aa4128446c3dbb40b9aafc5d5 assets/actuallyadditions/models/item/resonant_rice.json +68d8873d46bfbe65112f29bc4b1159e586d6705f assets/actuallyadditions/models/item/restonia_aiot.json 5300d3a0ece8b26a0bc0631df9151bebaef8a1b9 assets/actuallyadditions/models/item/restonia_axe.json 5ceb9b78fdc192c7b916df639da93dc5114e850f assets/actuallyadditions/models/item/restonia_boots.json ee6d8f4060c3859a981f804b4a84cb296ad9b15d assets/actuallyadditions/models/item/restonia_chest.json @@ -557,7 +558,6 @@ f79db1ee29a87c5348ceaed1adc063dded9bd21b assets/actuallyadditions/models/item/re be08ee91e3e969850ef7d9e8c6dc15f877c330db assets/actuallyadditions/models/item/restonia_helmet.json da001039f100f0ba02bdcf057fc64a937ef9ee90 assets/actuallyadditions/models/item/restonia_hoe.json f10850d62ce98922b620a23ff83739c2507bc788 assets/actuallyadditions/models/item/restonia_leggings.json -810204a3eade0e7dc72dd022b046cfc49701f810 assets/actuallyadditions/models/item/restonia_paxel.json 9d03f0ca60290dcecc7469c14f81f7ef28f4424a assets/actuallyadditions/models/item/restonia_pickaxe.json 788f21d60d8c266a7abc12bddffa7a63b3fc4ed3 assets/actuallyadditions/models/item/restonia_shovel.json bb5a27e6545bd6d9e5935ea59b1fb59c640b4fd6 assets/actuallyadditions/models/item/restonia_sword.json @@ -581,13 +581,14 @@ ab0b21a1a76f80574d19a31ef7be2f9bf332b247 assets/actuallyadditions/models/item/ri a2d1eda557476e8f4a21ba40635949106b828b71 assets/actuallyadditions/models/item/shock_suppressor_block.json ef7f9a92f8b47c3de7f732172f7bb0d996b38718 assets/actuallyadditions/models/item/single_battery.json 90f07fa285908351a3a486bcab320352b4697500 assets/actuallyadditions/models/item/solidified_experience.json -edba2bd7b919b51a66ccd29d8cc99d18999ad508 assets/actuallyadditions/models/item/stone_paxel.json +1ba6c5a40ec762bae26cbca11afea7a76a24f85c assets/actuallyadditions/models/item/stone_aiot.json 1905e7a72f7b8dfebbe177105540c57d9b365385 assets/actuallyadditions/models/item/teleport_staff.json 35d62238b8fadb4bff4c99162b85710a6809e924 assets/actuallyadditions/models/item/tiny_charcoal.json dabc22d7872bd1ee124e387b8d5c7fc36d1856fc assets/actuallyadditions/models/item/tiny_coal.json 10bb7fb456cb1ce636b40844d607b617e43ee45a assets/actuallyadditions/models/item/tiny_torch_block.json f6c37b58efbc2db0451fc7f373979635be37358a assets/actuallyadditions/models/item/travelers_sack.json 181f54a35065333fef383f61d837b83d57dfbf5f assets/actuallyadditions/models/item/triple_battery.json +9c0b2c0b89a809f2e0f30ac70a51e70d46bbef07 assets/actuallyadditions/models/item/void_aiot.json 861ae2abeaca3a3f16ceeffefc15764c6b845b60 assets/actuallyadditions/models/item/void_axe.json 2e765dce52513b9411e01d0ee5cb8e9003429b10 assets/actuallyadditions/models/item/void_boots.json 638ea6ecc2739a77198d1afe03f8eac9e70b751e assets/actuallyadditions/models/item/void_chest.json @@ -596,7 +597,6 @@ a42cb031c408a93ddbf94a5b7f1b496b3cc18086 assets/actuallyadditions/models/item/vo f3f1c5ac565bf8694ac5d3ec96d254346460df5f assets/actuallyadditions/models/item/void_helmet.json ca235c3014cc9cbf2ed399db17f3740df21edb68 assets/actuallyadditions/models/item/void_hoe.json e62936f8ce3af90b6d6b1d9e379e3164d338e9c6 assets/actuallyadditions/models/item/void_leggings.json -c2ea30cd4452d458861aea97fa639790f3471d1e assets/actuallyadditions/models/item/void_paxel.json ee36da9a021297b34b30e4979c30eb63835b2a6b assets/actuallyadditions/models/item/void_pickaxe.json 1c0eb44eca6ed5e0b36dcd783f81b4e3557ff5b4 assets/actuallyadditions/models/item/void_sack.json 3130b0d1d84eb76ae29a402c6f6720d6c5eb0dfd assets/actuallyadditions/models/item/void_shovel.json @@ -608,7 +608,7 @@ ff80a66586e72226565ede5db5968bba67a09446 assets/actuallyadditions/models/item/wh 7a7d0c69a1799c526d2765dc580b6524fc1c0f4c assets/actuallyadditions/models/item/white_wall_block.json 4309a1169749dc7b9e79ba5a37c4f4f7a8206dea assets/actuallyadditions/models/item/wings_of_the_bats.json 018d9aae3519daccd557d07e541686fcb2456b53 assets/actuallyadditions/models/item/wood_casing_block.json -174559d46dbaa07d49ceff6db3708b75e7ad62a4 assets/actuallyadditions/models/item/wooden_paxel.json +f657eabc7321de0b05cf92d9ebdd6f5215a685b5 assets/actuallyadditions/models/item/wooden_aiot.json 7f8e5e703d9244222706c52d7b24b299e07cb2db assets/actuallyadditions/models/item/worm.json 5ee8c662c6e0448c4b6a14c03456a9e68c4dd947 assets/actuallyadditions/models/item/xp_solidifier_block.json ef56ec29c7349f7c646cf3c9df0608213f6a47d7 data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_coil.json diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json index e66cd2d0a..3a282fdb4 100644 --- a/src/generated/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -154,6 +154,7 @@ "item.actuallyadditions.crushed_quartz": "Crushed Quartz", "item.actuallyadditions.crystallized_canola_seed": "Crystallized Canola Seed", "item.actuallyadditions.cup_with_coffee": "Cup with Coffee", + "item.actuallyadditions.diamatine_aiot": "Diamatine AIOT", "item.actuallyadditions.diamatine_axe": "Diamatine Axe", "item.actuallyadditions.diamatine_boots": "Diamatine Boots", "item.actuallyadditions.diamatine_chest": "Diamatine Chestplate", @@ -162,11 +163,10 @@ "item.actuallyadditions.diamatine_helmet": "Diamatine Helmet", "item.actuallyadditions.diamatine_hoe": "Diamatine Hoe", "item.actuallyadditions.diamatine_leggings": "Diamatine Leggings", - "item.actuallyadditions.diamatine_paxel": "Diamatine Paxel", "item.actuallyadditions.diamatine_pickaxe": "Diamatine Pickaxe", "item.actuallyadditions.diamatine_shovel": "Diamatine Shovel", "item.actuallyadditions.diamatine_sword": "Diamatine Sword", - "item.actuallyadditions.diamond_paxel": "Diamond Paxel", + "item.actuallyadditions.diamond_aiot": "Diamond AIOT", "item.actuallyadditions.double_battery": "Double Battery", "item.actuallyadditions.dough": "Dough", "item.actuallyadditions.drill_black": "Black Drill", @@ -195,6 +195,7 @@ "item.actuallyadditions.drill_speed_augment_iii": "Drill Speed Augment III", "item.actuallyadditions.drill_white": "White Drill", "item.actuallyadditions.drill_yellow": "Yellow Drill", + "item.actuallyadditions.emeradic_aiot": "Emeradic AIOT", "item.actuallyadditions.emeradic_axe": "Emeradic Axe", "item.actuallyadditions.emeradic_boots": "Emeradic Boots", "item.actuallyadditions.emeradic_chest": "Emeradic Chestplate", @@ -203,7 +204,6 @@ "item.actuallyadditions.emeradic_helmet": "Emeradic Helmet", "item.actuallyadditions.emeradic_hoe": "Emeradic Hoe", "item.actuallyadditions.emeradic_leggings": "Emeradic Leggings", - "item.actuallyadditions.emeradic_paxel": "Emeradic Paxel", "item.actuallyadditions.emeradic_pickaxe": "Emeradic Pickaxe", "item.actuallyadditions.emeradic_shovel": "Emeradic Shovel", "item.actuallyadditions.emeradic_sword": "Emeradic Sword", @@ -212,6 +212,7 @@ "item.actuallyadditions.ender_star": "Ender Star", "item.actuallyadditions.engineers_goggles": "Engineer's Goggles", "item.actuallyadditions.engineers_goggles_infrared": "Engineer's Infrared Goggles", + "item.actuallyadditions.enori_aiot": "Enori AIOT", "item.actuallyadditions.enori_axe": "Enori Axe", "item.actuallyadditions.enori_boots": "Enori Boots", "item.actuallyadditions.enori_chest": "Enori Chestplate", @@ -220,7 +221,6 @@ "item.actuallyadditions.enori_helmet": "Enori Helmet", "item.actuallyadditions.enori_hoe": "Enori Hoe", "item.actuallyadditions.enori_leggings": "Enori Leggings", - "item.actuallyadditions.enori_paxel": "Enori Paxel", "item.actuallyadditions.enori_pickaxe": "Enori Pickaxe", "item.actuallyadditions.enori_shovel": "Enori Shovel", "item.actuallyadditions.enori_sword": "Enori Sword", @@ -248,10 +248,10 @@ "item.actuallyadditions.food_toast": "Toast", "item.actuallyadditions.food_toast_o_chocolate": "Toast o' Chocolate", "item.actuallyadditions.fur_ball": "Fur Ball", - "item.actuallyadditions.gold_paxel": "Gold Paxel", + "item.actuallyadditions.gold_aiot": "Gold AIOT", "item.actuallyadditions.green_crystal_shard": "Green Crystal Shard", "item.actuallyadditions.handheld_filler": "Handheld Filler", - "item.actuallyadditions.iron_paxel": "Iron Paxel", + "item.actuallyadditions.iron_aiot": "Iron AIOT", "item.actuallyadditions.item_filter": "Item Filter", "item.actuallyadditions.jam_ch_ap_ci": "ChApCi-Jam", "item.actuallyadditions.jam_cu_ba_ra": "CuBaRa-Jam", @@ -273,7 +273,8 @@ "item.actuallyadditions.lens_of_the_killer": "Lens of the Killer", "item.actuallyadditions.lens_of_the_miner": "Lens of the Miner", "item.actuallyadditions.light_blue_crystal_shard": "Light Blue Crystal", - "item.actuallyadditions.netherite_paxel": "Netherite Paxel", + "item.actuallyadditions.netherite_aiot": "Netherite AIOT", + "item.actuallyadditions.palis_aiot": "Palis AIOT", "item.actuallyadditions.palis_axe": "Palis Axe", "item.actuallyadditions.palis_boots": "Palis Boots", "item.actuallyadditions.palis_chest": "Palis Chestplate", @@ -282,7 +283,6 @@ "item.actuallyadditions.palis_helmet": "Palis Helmet", "item.actuallyadditions.palis_hoe": "Palis Hoe", "item.actuallyadditions.palis_leggings": "Palis Leggings", - "item.actuallyadditions.palis_paxel": "Palis Paxel", "item.actuallyadditions.palis_pickaxe": "Palis Pickaxe", "item.actuallyadditions.palis_shovel": "Palis Shovel", "item.actuallyadditions.palis_sword": "Palis Sword", @@ -290,19 +290,20 @@ "item.actuallyadditions.phantom_connector": "Phantom Connector", "item.actuallyadditions.player_probe": "Player Probe", "item.actuallyadditions.quadruple_battery": "Quadruple Battery", + "item.actuallyadditions.quartz_aiot": "Quartz AIOT", "item.actuallyadditions.quartz_axe": "Quartz Axe", "item.actuallyadditions.quartz_boots": "Quartz Boots", "item.actuallyadditions.quartz_chest": "Quartz Chestplate", "item.actuallyadditions.quartz_helmet": "Quartz Helmet", "item.actuallyadditions.quartz_hoe": "Quartz Hoe", "item.actuallyadditions.quartz_leggings": "Quartz Leggings", - "item.actuallyadditions.quartz_paxel": "Quartz Paxel", "item.actuallyadditions.quartz_pickaxe": "Quartz Pickaxe", "item.actuallyadditions.quartz_shovel": "Quartz Shovel", "item.actuallyadditions.quartz_sword": "Quartz Sword", "item.actuallyadditions.quintuple_battery": "Quintuple Battery", "item.actuallyadditions.red_crystal_shard": "Red Crystal Shard", "item.actuallyadditions.resonant_rice": "Resonant Rice", + "item.actuallyadditions.restonia_aiot": "Restonia AIOT", "item.actuallyadditions.restonia_axe": "Restonia Axe", "item.actuallyadditions.restonia_boots": "Restonia Boots", "item.actuallyadditions.restonia_chest": "Restonia Chestplate", @@ -311,7 +312,6 @@ "item.actuallyadditions.restonia_helmet": "Restonia Helmet", "item.actuallyadditions.restonia_hoe": "Restonia Hoe", "item.actuallyadditions.restonia_leggings": "Restonia Leggings", - "item.actuallyadditions.restonia_paxel": "Restonia Paxel", "item.actuallyadditions.restonia_pickaxe": "Restonia Pickaxe", "item.actuallyadditions.restonia_shovel": "Restonia Shovel", "item.actuallyadditions.restonia_sword": "Restonia Sword", @@ -333,12 +333,13 @@ "item.actuallyadditions.ring_of_water_breathing": "Ring of Water Breathing", "item.actuallyadditions.single_battery": "Single Battery", "item.actuallyadditions.solidified_experience": "Solidified Experience", - "item.actuallyadditions.stone_paxel": "Stone Paxel", + "item.actuallyadditions.stone_aiot": "Stone AIOT", "item.actuallyadditions.teleport_staff": "Teleport Staff", "item.actuallyadditions.tiny_charcoal": "Tiny Charcoal", "item.actuallyadditions.tiny_coal": "Tiny Coal", "item.actuallyadditions.travelers_sack": "Traveler's Sack", "item.actuallyadditions.triple_battery": "Triple Battery", + "item.actuallyadditions.void_aiot": "Void AIOT", "item.actuallyadditions.void_axe": "Void Axe", "item.actuallyadditions.void_boots": "Void Boots", "item.actuallyadditions.void_chest": "Void Chestplate", @@ -347,14 +348,13 @@ "item.actuallyadditions.void_helmet": "Void Helmet", "item.actuallyadditions.void_hoe": "Void Hoe", "item.actuallyadditions.void_leggings": "Void Leggings", - "item.actuallyadditions.void_paxel": "Void Paxel", "item.actuallyadditions.void_pickaxe": "Void Pickaxe", "item.actuallyadditions.void_sack": "Void Sack", "item.actuallyadditions.void_shovel": "Void Shovel", "item.actuallyadditions.void_sword": "Void Sword", "item.actuallyadditions.white_crystal_shard": "White Crystal Shard", "item.actuallyadditions.wings_of_the_bats": "Wings Of The Bats", - "item.actuallyadditions.wooden_paxel": "Wooden Paxel", + "item.actuallyadditions.wooden_aiot": "Wooden AIOT", "item.actuallyadditions.worm": "Worm", "itemGroup.actuallyadditions": "Actually Additions", "misc.message.so_cute": "So cute!" diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_aiot.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/item/emeradic_paxel.json rename to src/generated/resources/assets/actuallyadditions/models/item/diamatine_aiot.json index de794bbae..cc6bd3ac1 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/emeradic_paxel.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_aiot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/emeradic_paxel" + "layer0": "actuallyadditions:item/diamatine_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_paxel.json deleted file mode 100644 index f2aa52e00..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/diamatine_paxel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/diamatine_paxel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json new file mode 100644 index 000000000..e39682168 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamond_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/diamond_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/diamond_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_aiot.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/item/diamond_paxel.json rename to src/generated/resources/assets/actuallyadditions/models/item/emeradic_aiot.json index 669291170..9830e8ac8 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/diamond_paxel.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_aiot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/diamond_paxel" + "layer0": "actuallyadditions:item/emeradic_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/gold_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_aiot.json similarity index 55% rename from src/generated/resources/assets/actuallyadditions/models/item/gold_paxel.json rename to src/generated/resources/assets/actuallyadditions/models/item/enori_aiot.json index 6357d0a8c..fbbfb5d87 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/gold_paxel.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_aiot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/gold_paxel" + "layer0": "actuallyadditions:item/enori_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/gold_aiot.json similarity index 55% rename from src/generated/resources/assets/actuallyadditions/models/item/void_paxel.json rename to src/generated/resources/assets/actuallyadditions/models/item/gold_aiot.json index 2880529fe..ef5cbb64b 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/void_paxel.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/gold_aiot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/void_paxel" + "layer0": "actuallyadditions:item/gold_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/iron_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/iron_aiot.json similarity index 55% rename from src/generated/resources/assets/actuallyadditions/models/item/iron_paxel.json rename to src/generated/resources/assets/actuallyadditions/models/item/iron_aiot.json index 604ab9500..e76346eec 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/iron_paxel.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/iron_aiot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/iron_paxel" + "layer0": "actuallyadditions:item/iron_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json new file mode 100644 index 000000000..9b8027a06 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/netherite_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/netherite_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/netherite_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/netherite_paxel.json deleted file mode 100644 index fc7d4eaec..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/netherite_paxel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/netherite_paxel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/enori_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_aiot.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/models/item/enori_paxel.json rename to src/generated/resources/assets/actuallyadditions/models/item/palis_aiot.json index 4d1742481..7398af334 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/enori_paxel.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_aiot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/enori_paxel" + "layer0": "actuallyadditions:item/palis_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/palis_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_aiot.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/models/item/palis_paxel.json rename to src/generated/resources/assets/actuallyadditions/models/item/quartz_aiot.json index ce6d72b22..b9808e5ff 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/palis_paxel.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_aiot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/palis_paxel" + "layer0": "actuallyadditions:item/quartz_aiot" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/quartz_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/quartz_paxel.json deleted file mode 100644 index acb3b8b1e..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/quartz_paxel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/quartz_paxel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json new file mode 100644 index 000000000..5f228de89 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/restonia_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/restonia_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_paxel.json deleted file mode 100644 index bea463910..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/restonia_paxel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/restonia_paxel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json new file mode 100644 index 000000000..2d243dbf5 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/stone_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/stone_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/stone_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/stone_paxel.json deleted file mode 100644 index 73d8d8ba9..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/stone_paxel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/stone_paxel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json new file mode 100644 index 000000000..efd10a435 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json b/src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json new file mode 100644 index 000000000..441f77605 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/wooden_aiot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/wooden_aiot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/wooden_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/wooden_paxel.json deleted file mode 100644 index b44f30417..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/wooden_paxel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/wooden_paxel" - } -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java index c4bc87b75..3890443e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -31,19 +31,19 @@ public final class ActuallyItems { public static final ToolSet RESTONIA_SET = new ToolSet("restonia", ToolMaterials.RESTONIA, ArmorMaterials.RESTONIA, ActuallyItems::defaultProps); // Paxels :D - public static final RegistryObject WOODEN_PAXEL = ITEMS.register("wooden_paxel", () -> new AllInOneTool(ItemTier.WOOD)); - public static final RegistryObject STONE_PAXEL = ITEMS.register("stone_paxel", () -> new AllInOneTool(ItemTier.STONE)); - public static final RegistryObject IRON_PAXEL = ITEMS.register("iron_paxel", () -> new AllInOneTool(ItemTier.IRON)); - public static final RegistryObject GOLD_PAXEL = ITEMS.register("gold_paxel", () -> new AllInOneTool(ItemTier.GOLD)); - public static final RegistryObject DIAMOND_PAXEL = ITEMS.register("diamond_paxel", () -> new AllInOneTool(ItemTier.DIAMOND)); - public static final RegistryObject NETHERITE_PAXEL = ITEMS.register("netherite_paxel", () -> new AllInOneTool(ItemTier.NETHERITE)); - public static final RegistryObject QUARTZ_PAXEL = ITEMS.register("quartz_paxel", () -> new AllInOneTool(ToolMaterials.QUARTZ)); - public static final RegistryObject ENORI_PAXEL = ITEMS.register("enori_paxel", () -> new AllInOneTool(ToolMaterials.ENORI)); - public static final RegistryObject EMERADIC_PAXEL = ITEMS.register("emeradic_paxel", () -> new AllInOneTool(ToolMaterials.EMERADIC)); - public static final RegistryObject VOID_PAXEL = ITEMS.register("void_paxel", () -> new AllInOneTool(ToolMaterials.VOID)); - public static final RegistryObject DIAMATINE_PAXEL = ITEMS.register("diamatine_paxel", () -> new AllInOneTool(ToolMaterials.DIAMATINE)); - public static final RegistryObject PALIS_PAXEL = ITEMS.register("palis_paxel", () -> new AllInOneTool(ToolMaterials.PALIS)); - public static final RegistryObject RESTONIA_PAXEL = ITEMS.register("restonia_paxel", () -> new AllInOneTool(ToolMaterials.RESTONIA)); + public static final RegistryObject WOODEN_AIOT = ITEMS.register("wooden_aiot", () -> new AllInOneTool(ItemTier.WOOD)); + public static final RegistryObject STONE_AIOT = ITEMS.register("stone_aiot", () -> new AllInOneTool(ItemTier.STONE)); + public static final RegistryObject IRON_AIOT = ITEMS.register("iron_aiot", () -> new AllInOneTool(ItemTier.IRON)); + public static final RegistryObject GOLD_AIOT = ITEMS.register("gold_aiot", () -> new AllInOneTool(ItemTier.GOLD)); + public static final RegistryObject DIAMOND_AIOT = ITEMS.register("diamond_aiot", () -> new AllInOneTool(ItemTier.DIAMOND)); + public static final RegistryObject NETHERITE_AIOT = ITEMS.register("netherite_aiot", () -> new AllInOneTool(ItemTier.NETHERITE)); + public static final RegistryObject QUARTZ_AIOT = ITEMS.register("quartz_aiot", () -> new AllInOneTool(ToolMaterials.QUARTZ)); + public static final RegistryObject ENORI_AIOT = ITEMS.register("enori_aiot", () -> new AllInOneTool(ToolMaterials.ENORI)); + public static final RegistryObject EMERADIC_AIOT = ITEMS.register("emeradic_aiot", () -> new AllInOneTool(ToolMaterials.EMERADIC)); + public static final RegistryObject VOID_AIOT = ITEMS.register("void_aiot", () -> new AllInOneTool(ToolMaterials.VOID)); + public static final RegistryObject DIAMATINE_AIOT = ITEMS.register("diamatine_aiot", () -> new AllInOneTool(ToolMaterials.DIAMATINE)); + public static final RegistryObject PALIS_AIOT = ITEMS.register("palis_aiot", () -> new AllInOneTool(ToolMaterials.PALIS)); + public static final RegistryObject RESTONIA_AIOT = ITEMS.register("restonia_aiot", () -> new AllInOneTool(ToolMaterials.RESTONIA)); public static final Set ALL_TOOL_SETS = ImmutableSet.of(QUARTZ_SET, ENORI_SET, EMERADIC_SET, VOID_SET, DIAMATINE_SET, PALIS_SET, RESTONIA_SET); @@ -220,8 +220,8 @@ public final class ActuallyItems { PALIS_EMPOWERED_CRYSTAL, DIAMATINE_EMPOWERED_CRYSTAL, VOID_EMPOWERED_CRYSTAL, EMERADIC_EMPOWERED_CRYSTAL, ENORI_EMPOWERED_CRYSTAL, // All in one tools - WOODEN_PAXEL, STONE_PAXEL, IRON_PAXEL, GOLD_PAXEL, DIAMOND_PAXEL, NETHERITE_PAXEL, QUARTZ_PAXEL, ENORI_PAXEL, - EMERADIC_PAXEL, VOID_PAXEL, DIAMATINE_PAXEL, PALIS_PAXEL, RESTONIA_PAXEL, + WOODEN_AIOT, STONE_AIOT, IRON_AIOT, GOLD_AIOT, DIAMOND_AIOT, NETHERITE_AIOT, QUARTZ_AIOT, ENORI_AIOT, + EMERADIC_AIOT, VOID_AIOT, DIAMATINE_AIOT, PALIS_AIOT, RESTONIA_AIOT, // The rest? RED_CRYSTAL_SHARD, BLUE_CRYSTAL_SHARD, LIGHT_BLUE_CRYSTAL_SHARD, BLACK_CRYSTAL_SHARD, GREEN_CRYSTAL_SHARD, WHITE_CRYSTAL_SHARD, ENGINEERS_GOGGLES, ENGINEERS_GOGGLES_INFRARED, LASER_RELAY_MODIFIER_RANGE, LASER_RELAY_MODIFIER_INVISIBILITY, diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index 40eeeecab..7d7f5b694 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -137,20 +137,20 @@ public class GeneratorLanguage extends LanguageProvider { // Tools ActuallyItems.ALL_TOOL_SETS.forEach(this::addToolSet); - // Paxels - addItem(ActuallyItems.WOODEN_PAXEL, "Wooden Paxel"); - addItem(ActuallyItems.STONE_PAXEL, "Stone Paxel"); - addItem(ActuallyItems.IRON_PAXEL, "Iron Paxel"); - addItem(ActuallyItems.GOLD_PAXEL, "Gold Paxel"); - addItem(ActuallyItems.DIAMOND_PAXEL, "Diamond Paxel"); - addItem(ActuallyItems.NETHERITE_PAXEL, "Netherite Paxel"); - addItem(ActuallyItems.QUARTZ_PAXEL, "Quartz Paxel"); - addItem(ActuallyItems.ENORI_PAXEL, "Enori Paxel"); - addItem(ActuallyItems.EMERADIC_PAXEL, "Emeradic Paxel"); - addItem(ActuallyItems.VOID_PAXEL, "Void Paxel"); - addItem(ActuallyItems.DIAMATINE_PAXEL, "Diamatine Paxel"); - addItem(ActuallyItems.PALIS_PAXEL, "Palis Paxel"); - addItem(ActuallyItems.RESTONIA_PAXEL, "Restonia Paxel"); + // AIOT's + addItem(ActuallyItems.WOODEN_AIOT, "Wooden AIOT"); + addItem(ActuallyItems.STONE_AIOT, "Stone AIOT"); + addItem(ActuallyItems.IRON_AIOT, "Iron AIOT"); + addItem(ActuallyItems.GOLD_AIOT, "Gold AIOT"); + addItem(ActuallyItems.DIAMOND_AIOT, "Diamond AIOT"); + addItem(ActuallyItems.NETHERITE_AIOT, "Netherite AIOT"); + addItem(ActuallyItems.QUARTZ_AIOT, "Quartz AIOT"); + addItem(ActuallyItems.ENORI_AIOT, "Enori AIOT"); + addItem(ActuallyItems.EMERADIC_AIOT, "Emeradic AIOT"); + addItem(ActuallyItems.VOID_AIOT, "Void AIOT"); + addItem(ActuallyItems.DIAMATINE_AIOT, "Diamatine AIOT"); + addItem(ActuallyItems.PALIS_AIOT, "Palis AIOT"); + addItem(ActuallyItems.RESTONIA_AIOT, "Restonia AIOT"); addItem(ActuallyItems.BLACK_QUARTS, "Black Quarts"); // Crystals diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/diamatine_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/diamatine_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamond_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/diamond_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/diamond_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/diamond_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/emeradic_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/emeradic_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/enori_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/enori_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/gold_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/gold_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/gold_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/gold_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/iron_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/iron_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/netherite_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/netherite_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/netherite_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/netherite_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/palis_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/palis_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/quartz_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/quartz_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/quartz_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/quartz_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/restonia_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/restonia_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/stone_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/stone_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/void_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/void_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/void_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/void_aiot.png diff --git a/src/main/resources/assets/actuallyadditions/textures/item/wooden_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/wooden_aiot.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/item/wooden_paxel.png rename to src/main/resources/assets/actuallyadditions/textures/item/wooden_aiot.png