From a5fc864b30118215bb9de0c3821897f12b889ee2 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 28 Nov 2020 14:07:36 +0000 Subject: [PATCH] Added Paxels back --- src/generated/resources/.cache/cache | 36 +++++-------- .../blockstates/black_lotus_block.json | 7 --- .../assets/actuallyadditions/lang/en_us.json | 1 - .../models/block/black_lotus_block.json | 6 --- .../models/item/black_lotus_block.json | 3 -- .../models/item/diamatine_paxel.json | 6 +++ ...{emerald_chest.json => diamond_paxel.json} | 2 +- ...merald_helmet.json => emeradic_paxel.json} | 2 +- .../models/item/emerald_leggings.json | 6 --- .../models/item/emerald_pickaxe.json | 6 --- .../models/item/emerald_shovel.json | 6 --- .../models/item/emerald_sword.json | 6 --- .../{emerald_hoe.json => enori_paxel.json} | 2 +- .../{emerald_axe.json => gold_paxel.json} | 2 +- .../{obsidian_axe.json => iron_paxel.json} | 2 +- .../models/item/netherite_paxel.json | 6 +++ .../models/item/obsidian_boots.json | 6 --- .../models/item/obsidian_chest.json | 6 --- .../models/item/obsidian_helmet.json | 6 --- .../models/item/obsidian_leggings.json | 6 --- .../models/item/obsidian_pickaxe.json | 6 --- .../models/item/obsidian_shovel.json | 6 --- .../models/item/obsidian_sword.json | 6 --- .../{obsidian_hoe.json => palis_paxel.json} | 2 +- .../models/item/quartz_paxel.json | 6 +++ ...emerald_boots.json => restonia_paxel.json} | 2 +- .../models/item/stone_paxel.json | 6 +++ .../models/item/void_paxel.json | 6 +++ .../models/item/wooden_paxel.json | 6 +++ .../common/blocks/ActuallyBlock.java | 6 +++ .../common/items/ActuallyItem.java | 13 +++++ .../common/items/ActuallyItems.java | 26 +++++++-- .../common/items/IActuallyItem.java | 5 ++ .../common/items/useables/AllInOneTool.java | 51 ++++++++++++++++++ .../common/materials/ArmorMaterials.java | 12 +++-- .../common/materials/ToolMaterials.java | 11 ++-- .../textures/item/diamatine_paxel.png | Bin 0 -> 291 bytes .../textures/item/diamond_paxel.png | Bin 0 -> 291 bytes .../textures/item/emeradic_paxel.png | Bin 0 -> 291 bytes .../textures/item/enori_paxel.png | Bin 0 -> 291 bytes .../textures/item/gold_paxel.png | Bin 0 -> 291 bytes .../textures/item/iron_paxel.png | Bin 0 -> 291 bytes .../textures/item/netherite_paxel.png | Bin 0 -> 291 bytes .../textures/item/palis_paxel.png | Bin 0 -> 291 bytes .../textures/item/quartz_paxel.png | Bin 0 -> 291 bytes .../textures/item/restonia_paxel.png | Bin 0 -> 291 bytes .../textures/item/stone_paxel.png | Bin 0 -> 291 bytes .../textures/item/void_paxel.png | Bin 0 -> 291 bytes .../textures/item/wooden_paxel.png | Bin 0 -> 291 bytes 49 files changed, 166 insertions(+), 127 deletions(-) delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/black_lotus_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/black_lotus_block.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/diamatine_paxel.json rename src/generated/resources/assets/actuallyadditions/models/item/{emerald_chest.json => diamond_paxel.json} (53%) rename src/generated/resources/assets/actuallyadditions/models/item/{emerald_helmet.json => emeradic_paxel.json} (53%) delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emerald_leggings.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emerald_pickaxe.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emerald_shovel.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/emerald_sword.json rename src/generated/resources/assets/actuallyadditions/models/item/{emerald_hoe.json => enori_paxel.json} (54%) rename src/generated/resources/assets/actuallyadditions/models/item/{emerald_axe.json => gold_paxel.json} (54%) rename src/generated/resources/assets/actuallyadditions/models/item/{obsidian_axe.json => iron_paxel.json} (54%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/netherite_paxel.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/obsidian_boots.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/obsidian_chest.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/obsidian_helmet.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/obsidian_leggings.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/obsidian_pickaxe.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/obsidian_shovel.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/obsidian_sword.json rename src/generated/resources/assets/actuallyadditions/models/item/{obsidian_hoe.json => palis_paxel.json} (54%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/quartz_paxel.json rename src/generated/resources/assets/actuallyadditions/models/item/{emerald_boots.json => restonia_paxel.json} (53%) create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/stone_paxel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/void_paxel.json create mode 100644 src/generated/resources/assets/actuallyadditions/models/item/wooden_paxel.json create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItem.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/items/IActuallyItem.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/items/useables/AllInOneTool.java create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/diamond_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/gold_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/netherite_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/quartz_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/void_paxel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/wooden_paxel.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index fdc220f92..c1cbc3425 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5,7 +5,6 @@ b25315def4a9ff486d8a564449764cfb76b00d78 assets/actuallyadditions/blockstates/bi eefccdcc7bb6e2e26af2195d266691148bb2c25b assets/actuallyadditions/blockstates/black_chiseled_quartz_slab_block.json c36a97288df2eea0cf76a32146fd7582e33e7022 assets/actuallyadditions/blockstates/black_chiseled_quartz_stair_block.json d736c7c359adf5ff961898e55fea00e09aa00e2e assets/actuallyadditions/blockstates/black_chiseled_quartz_wall_block.json -a5d9ac64ea48bee6e29c196abec1596778516b70 assets/actuallyadditions/blockstates/black_lotus_block.json 3f625990d244d8be3e67729086769ca9f7724d63 assets/actuallyadditions/blockstates/black_pillar_quartz_slab_block.json 78807210fb5821006b8875abf1a9cbdcce39d69e assets/actuallyadditions/blockstates/black_pillar_quartz_stair_block.json eec126e116a0cbee9def33009609a95d666dacf7 assets/actuallyadditions/blockstates/black_pillar_quartz_wall_block.json @@ -122,7 +121,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 -eebd14886a3c1958765f54a3b7a19d0e28813c5a assets/actuallyadditions/lang/en_us.json +9f9c34e44b248dba7b5cf4bc8104cf1a6954073e 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 @@ -135,7 +134,6 @@ ebcbbd421acfefa3b558fa3bba1796ef06f1d659 assets/actuallyadditions/models/block/b b9d38b614addaf33c23103c63395b960b4797c27 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_post.json 1cb145ca56e990192a6ccdc04f671c12747cfb53 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side.json 41b38f848e1ee3961822598df0fbac11142972e3 assets/actuallyadditions/models/block/black_chiseled_quartz_wall_block_side_tall.json -0358fc25923f6372371abd6dda1a707527507158 assets/actuallyadditions/models/block/black_lotus_block.json 0c025b6788abd7f33eb7a15cac85933dbe119596 assets/actuallyadditions/models/block/black_pillar_quartz_slab_block.json b87c74333526c7b52df48a4a09591f6116fe4b03 assets/actuallyadditions/models/block/black_pillar_quartz_slab_block_top.json 480c94b0c400ccea983bac8d23662fb8cbe84da2 assets/actuallyadditions/models/block/black_pillar_quartz_stair_block.json @@ -279,7 +277,6 @@ f8092e976c50d90ff29ca2dd4bccfd845ab299b7 assets/actuallyadditions/models/item/ad fa3f47abe215fc8df67a24b20294cc45fa9c9c32 assets/actuallyadditions/models/item/black_chiseled_quartz_slab_block.json 365764b67f52be3bad2f8bd5cc4704b643fb5f78 assets/actuallyadditions/models/item/black_chiseled_quartz_stair_block.json 7128592505005a4585b9c6a21a62cf609e1e3950 assets/actuallyadditions/models/item/black_chiseled_quartz_wall_block.json -d825c4bf0752cb0cbe1b25c425c2253547672a6e assets/actuallyadditions/models/item/black_lotus_block.json 641231a2f0637bd1ac45263e08583220e3f2fa7f assets/actuallyadditions/models/item/black_pillar_quartz_slab_block.json 95d32e4f070679e9425d1b99c158e1fbc4711671 assets/actuallyadditions/models/item/black_pillar_quartz_stair_block.json 672b0bfd546bda3aee14a59acd574dd7a272df6a assets/actuallyadditions/models/item/black_pillar_quartz_wall_block.json @@ -325,9 +322,11 @@ 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 ffb61bb99478e9efba72a21784b1a3fb5287e21b assets/actuallyadditions/models/item/directional_breaker_block.json 58d31d7f80a8dd5fa492b13446d57b11a287ea59 assets/actuallyadditions/models/item/display_stand_block.json 62b147782f326334ae40c69a1b73d0cfe6049b52 assets/actuallyadditions/models/item/dropper_block.json @@ -338,18 +337,10 @@ ffb61bb99478e9efba72a21784b1a3fb5287e21b assets/actuallyadditions/models/item/di 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 -50418c9eef6b14ad74fa3f7ae8ff28d8b0eff632 assets/actuallyadditions/models/item/emerald_axe.json -2b46e6c8b0f70187bb730cd9ecc3099ca154a65b assets/actuallyadditions/models/item/emerald_boots.json -ecc70ea46fe2224b55cad3706429e90a8c5f5c51 assets/actuallyadditions/models/item/emerald_chest.json -28026f0053e453644c6300d862911e63894b256a assets/actuallyadditions/models/item/emerald_helmet.json -ddba38ab6188483e8d487b56f047c3ae936f8972 assets/actuallyadditions/models/item/emerald_hoe.json -832e4c49e1b64d0a16eca0999814389a2996ff8d assets/actuallyadditions/models/item/emerald_leggings.json -aaf2c8c71f5b2d03af72b34eb970eeeabecb7632 assets/actuallyadditions/models/item/emerald_pickaxe.json -99e3443efa2320c630b840163c6252cbf5f26b99 assets/actuallyadditions/models/item/emerald_shovel.json -9c6a6e608556faef96ee804381079aebd5274585 assets/actuallyadditions/models/item/emerald_sword.json ae4d3aee8bfa1fa9b1edb644eb3e970be8a90e43 assets/actuallyadditions/models/item/empowerer_block.json 3d14817e38f054a2ce4fcc6cd700bd0cf787f36d assets/actuallyadditions/models/item/ender_casing_block.json d401c1e85e78657275a1e8334f78c59916ac33bd assets/actuallyadditions/models/item/enderpearl_block.json @@ -365,6 +356,7 @@ 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 @@ -379,6 +371,7 @@ a159872078f26db6fe09c7e09b8caa3e892f4294 assets/actuallyadditions/models/item/en 86dc57da732f6dccb9fbf215baef75a9fc2a35fd assets/actuallyadditions/models/item/fluid_collector_block.json e09bdbddcd177907aaed963f848dfa0f51271ed4 assets/actuallyadditions/models/item/fluid_placer_block.json fa68689be3f4311d003c628b7831ecee9fd80e72 assets/actuallyadditions/models/item/fluids_laser_relay_block.json +ca0c27a6bbf80283389fa7522135af8f605e6fe7 assets/actuallyadditions/models/item/gold_paxel.json b5c343509b6ae48e965a23cd5f3c74e85e4f7d64 assets/actuallyadditions/models/item/green_block.json 4c5a678dc881c854dcb2d6f2123ed5e459fb4856 assets/actuallyadditions/models/item/green_slab_block.json b25412614db4eb1b196fb8c1d29db3929506eaec assets/actuallyadditions/models/item/green_stairs_block.json @@ -388,6 +381,7 @@ b25412614db4eb1b196fb8c1d29db3929506eaec assets/actuallyadditions/models/item/gr 76ed4ff443bb3a205e1548283fb32a7be5cefde9 assets/actuallyadditions/models/item/hopping_item_interface_block.json cc05fca55e55883f67ceac4cb3415f66d5781839 assets/actuallyadditions/models/item/iron_casing_block.json 5d2d679627727fe3d72531c5385cef5349282f7a assets/actuallyadditions/models/item/iron_casing_snow_block.json +754a286167121413fb64334ef9735c108e43dfc8 assets/actuallyadditions/models/item/iron_paxel.json bd1cb3ca86dfb9dfe128e207c067e95417fe7acc assets/actuallyadditions/models/item/item_interface_block.json 681f91c05610fb0a9a0448ce97fd66b2bb4f6abf assets/actuallyadditions/models/item/item_laser_relay_block.json 35a21070654764edd4a7fe580be7e73fe64a4bdd assets/actuallyadditions/models/item/item_repairer_block.json @@ -412,15 +406,7 @@ cce34e8562d22827c0b2a5c1a335bdd22f2f3273 assets/actuallyadditions/models/item/la 35bfe573e7a312ed7c225f0d848053b9c0d3dc2a assets/actuallyadditions/models/item/lava_factory_controller_block.json 925910d216200453c6f33a3023254a5a60507441 assets/actuallyadditions/models/item/leaf_generator_block.json 9b808f2be60fcc9050809764806a35034179dd8b assets/actuallyadditions/models/item/miner_block.json -2ccb64f8091b5be7f13c8a203b9a4e446f48ab2e assets/actuallyadditions/models/item/obsidian_axe.json -af135e2d3773c22408c2b06daeda3afdf0379ece assets/actuallyadditions/models/item/obsidian_boots.json -542fc043d3293dcbbfe67839143a840b60dfe409 assets/actuallyadditions/models/item/obsidian_chest.json -61f5b8f880e9f8ede94f4766bc32ce06042a2399 assets/actuallyadditions/models/item/obsidian_helmet.json -a99e4af2100c6963e06f7bf394238cea0b953213 assets/actuallyadditions/models/item/obsidian_hoe.json -b8068f86a36cf728b084540272d2872843152e18 assets/actuallyadditions/models/item/obsidian_leggings.json -43f583c981f6447b22058fbaf03a390963fcddd9 assets/actuallyadditions/models/item/obsidian_pickaxe.json -2aef742b3063ae14a2968d41404fa8e748385487 assets/actuallyadditions/models/item/obsidian_shovel.json -656ef36c444f1cf376814d463f6ffdbb152cde65 assets/actuallyadditions/models/item/obsidian_sword.json +d1e4e7e705bff89a0bab79236d677b1df7314277 assets/actuallyadditions/models/item/netherite_paxel.json 36bb2691e668e6047d883df9e039ed6c4aee8c5b assets/actuallyadditions/models/item/oil_generator_block.json b4dfa39729410a45832eae5a5ea775ee67498333 assets/actuallyadditions/models/item/ore_black_quartz_block.json 8a77539480881e4fa9ea005fc3aedf2d1cb96591 assets/actuallyadditions/models/item/palis_axe.json @@ -430,6 +416,7 @@ b4dfa39729410a45832eae5a5ea775ee67498333 assets/actuallyadditions/models/item/or 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 @@ -449,6 +436,7 @@ c1160cdeb93906066fe48941bff15df1d2a0eba0 assets/actuallyadditions/models/item/pl 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 @@ -460,6 +448,7 @@ ee6d8f4060c3859a981f804b4a84cb296ad9b15d 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 @@ -467,6 +456,7 @@ bb5a27e6545bd6d9e5935ea59b1fb59c640b4fd6 assets/actuallyadditions/models/item/re a2d1eda557476e8f4a21ba40635949106b828b71 assets/actuallyadditions/models/item/shock_suppressor_block.json ed85d0bf06c97604436d25c0f8167ffaa690342c assets/actuallyadditions/models/item/smiley_cloud_block.json f9b2e4a02149284e112cf645c70404b55b1b75aa assets/actuallyadditions/models/item/solar_panel_block.json +edba2bd7b919b51a66ccd29d8cc99d18999ad508 assets/actuallyadditions/models/item/stone_paxel.json 10bb7fb456cb1ce636b40844d607b617e43ee45a assets/actuallyadditions/models/item/tiny_torch_block.json 0443cb44ad47bce4b409577f727f7e61ed8ff748 assets/actuallyadditions/models/item/treasure_chest_block.json 861ae2abeaca3a3f16ceeffefc15764c6b845b60 assets/actuallyadditions/models/item/void_axe.json @@ -476,6 +466,7 @@ 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 3130b0d1d84eb76ae29a402c6f6720d6c5eb0dfd assets/actuallyadditions/models/item/void_shovel.json 885555ad87ba088765384763091c87f05ed388f1 assets/actuallyadditions/models/item/void_sword.json @@ -484,5 +475,6 @@ bb3367e2a5b29e64ab8e0626603732152aec7d05 assets/actuallyadditions/models/item/wh ff80a66586e72226565ede5db5968bba67a09446 assets/actuallyadditions/models/item/white_stairs_block.json 2c72c538e9ad6eb2324833ae01c8a89f33e68173 assets/actuallyadditions/models/item/white_wall_block.json 018d9aae3519daccd557d07e541686fcb2456b53 assets/actuallyadditions/models/item/wood_casing_block.json +174559d46dbaa07d49ceff6db3708b75e7ad62a4 assets/actuallyadditions/models/item/wooden_paxel.json 5ee8c662c6e0448c4b6a14c03456a9e68c4dd947 assets/actuallyadditions/models/item/xp_solidifier_block.json 5239d485f4e09b7fcf806d00913183dbca09c2dd data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/black_lotus_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/black_lotus_block.json deleted file mode 100644 index 6c572e59f..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/black_lotus_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/black_lotus_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json index be2e5c290..a3db331f9 100644 --- a/src/generated/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -6,7 +6,6 @@ "block.actuallyadditions.black_chiseled_quartz_slab_block": "Chiseled Black Quartz Slab", "block.actuallyadditions.black_chiseled_quartz_stair_block": "Chiseled Black Quartz Stairs", "block.actuallyadditions.black_chiseled_quartz_wall_block": "Chiseled Black Quartz Wall", - "block.actuallyadditions.black_lotus_block": "Black lotus", "block.actuallyadditions.black_pillar_quartz_slab_block": "Black Quartz Pillar Slab", "block.actuallyadditions.black_pillar_quartz_stair_block": "Black Quartz Pillar Stairs", "block.actuallyadditions.black_pillar_quartz_wall_block": "Black Quartz Wall Pillar", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json b/src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json deleted file mode 100644 index 4075c61f8..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/black_lotus_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/black_lotus_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/black_lotus_block.json b/src/generated/resources/assets/actuallyadditions/models/item/black_lotus_block.json deleted file mode 100644 index 5d3892ea3..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/black_lotus_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/black_lotus_block" -} \ 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 new file mode 100644 index 000000000..f2aa52e00 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamatine_paxel.json @@ -0,0 +1,6 @@ +{ + "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/emerald_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/diamond_paxel.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/item/emerald_chest.json rename to src/generated/resources/assets/actuallyadditions/models/item/diamond_paxel.json index 6d8260475..669291170 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_chest.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/diamond_paxel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/emerald_chest" + "layer0": "actuallyadditions:item/diamond_paxel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emerald_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_paxel.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/item/emerald_helmet.json rename to src/generated/resources/assets/actuallyadditions/models/item/emeradic_paxel.json index e54c3705a..de794bbae 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_helmet.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/emeradic_paxel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/emerald_helmet" + "layer0": "actuallyadditions:item/emeradic_paxel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emerald_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/emerald_leggings.json deleted file mode 100644 index 711a10e82..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/emerald_leggings" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emerald_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/emerald_pickaxe.json deleted file mode 100644 index 9bdc47647..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/emerald_pickaxe" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emerald_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/emerald_shovel.json deleted file mode 100644 index 03377f4f0..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/emerald_shovel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emerald_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/emerald_sword.json deleted file mode 100644 index c65bc479f..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/emerald_sword" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emerald_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/enori_paxel.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/models/item/emerald_hoe.json rename to src/generated/resources/assets/actuallyadditions/models/item/enori_paxel.json index b6ba007ec..4d1742481 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_hoe.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/enori_paxel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/emerald_hoe" + "layer0": "actuallyadditions:item/enori_paxel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/emerald_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/gold_paxel.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/models/item/emerald_axe.json rename to src/generated/resources/assets/actuallyadditions/models/item/gold_paxel.json index 424de2dce..6357d0a8c 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_axe.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/gold_paxel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/emerald_axe" + "layer0": "actuallyadditions:item/gold_paxel" } } \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_axe.json b/src/generated/resources/assets/actuallyadditions/models/item/iron_paxel.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/models/item/obsidian_axe.json rename to src/generated/resources/assets/actuallyadditions/models/item/iron_paxel.json index 8ce61d21f..604ab9500 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_axe.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/iron_paxel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/obsidian_axe" + "layer0": "actuallyadditions:item/iron_paxel" } } \ 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 new file mode 100644 index 000000000..fc7d4eaec --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/netherite_paxel.json @@ -0,0 +1,6 @@ +{ + "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/obsidian_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/obsidian_boots.json deleted file mode 100644 index 4d3b7320c..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_boots.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/obsidian_boots" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_chest.json b/src/generated/resources/assets/actuallyadditions/models/item/obsidian_chest.json deleted file mode 100644 index 07d1fa0ec..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_chest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/obsidian_chest" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_helmet.json b/src/generated/resources/assets/actuallyadditions/models/item/obsidian_helmet.json deleted file mode 100644 index ac5190db1..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_helmet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/obsidian_helmet" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_leggings.json b/src/generated/resources/assets/actuallyadditions/models/item/obsidian_leggings.json deleted file mode 100644 index 1d270c24f..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/obsidian_leggings" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_pickaxe.json b/src/generated/resources/assets/actuallyadditions/models/item/obsidian_pickaxe.json deleted file mode 100644 index 812c3dd9f..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/obsidian_pickaxe" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_shovel.json b/src/generated/resources/assets/actuallyadditions/models/item/obsidian_shovel.json deleted file mode 100644 index 9acd8cd36..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/obsidian_shovel" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_sword.json b/src/generated/resources/assets/actuallyadditions/models/item/obsidian_sword.json deleted file mode 100644 index c69a316ad..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_sword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "actuallyadditions:item/obsidian_sword" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_hoe.json b/src/generated/resources/assets/actuallyadditions/models/item/palis_paxel.json similarity index 54% rename from src/generated/resources/assets/actuallyadditions/models/item/obsidian_hoe.json rename to src/generated/resources/assets/actuallyadditions/models/item/palis_paxel.json index 193884f70..ce6d72b22 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/obsidian_hoe.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/palis_paxel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/obsidian_hoe" + "layer0": "actuallyadditions:item/palis_paxel" } } \ 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 new file mode 100644 index 000000000..acb3b8b1e --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/quartz_paxel.json @@ -0,0 +1,6 @@ +{ + "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/emerald_boots.json b/src/generated/resources/assets/actuallyadditions/models/item/restonia_paxel.json similarity index 53% rename from src/generated/resources/assets/actuallyadditions/models/item/emerald_boots.json rename to src/generated/resources/assets/actuallyadditions/models/item/restonia_paxel.json index f20aa1ce7..bea463910 100644 --- a/src/generated/resources/assets/actuallyadditions/models/item/emerald_boots.json +++ b/src/generated/resources/assets/actuallyadditions/models/item/restonia_paxel.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "actuallyadditions:item/emerald_boots" + "layer0": "actuallyadditions:item/restonia_paxel" } } \ 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 new file mode 100644 index 000000000..73d8d8ba9 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/stone_paxel.json @@ -0,0 +1,6 @@ +{ + "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_paxel.json b/src/generated/resources/assets/actuallyadditions/models/item/void_paxel.json new file mode 100644 index 000000000..2880529fe --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/void_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "actuallyadditions:item/void_paxel" + } +} \ 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 new file mode 100644 index 000000000..b44f30417 --- /dev/null +++ b/src/generated/resources/assets/actuallyadditions/models/item/wooden_paxel.json @@ -0,0 +1,6 @@ +{ + "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/blocks/ActuallyBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlock.java index 1a44c50ef..9a0cd86e5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlock.java @@ -5,6 +5,12 @@ import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +/** + * Using a custom class here to declare common rules between all of our blocks. + * This also provides a simple instance of check for our blocks. + * + * @implNote Every block should extend this class in some form or use the {@link IActuallyBlock} + */ public class ActuallyBlock extends Block implements IActuallyBlock { public ActuallyBlock(Properties properties) { super(properties); diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItem.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItem.java new file mode 100644 index 000000000..75a8dcb4d --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItem.java @@ -0,0 +1,13 @@ +package de.ellpeck.actuallyadditions.common.items; + +import net.minecraft.item.Item; + +/** + * I'm using a custom class here as I'm sure we'll need a unified way of declaring rules + * but also so we can always know if something is ours in the simplest form. + */ +public abstract class ActuallyItem extends Item implements IActuallyItem { + public ActuallyItem(Properties properties) { + super(properties); + } +} 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 5a91d73a0..3258f80f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -2,6 +2,7 @@ package de.ellpeck.actuallyadditions.common.items; import com.google.common.collect.ImmutableSet; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.useables.AllInOneTool; import de.ellpeck.actuallyadditions.common.materials.ArmorMaterials; import de.ellpeck.actuallyadditions.common.materials.ToolMaterials; import net.minecraft.item.*; @@ -17,8 +18,6 @@ public class ActuallyItems { // tools // If these ever need registry object referencing then I might be shit out of luck but it shouldn't be that complex to fix. - public static final ToolSet EMERALD_SET = new ToolSet("emerald", ToolMaterials.EMERALD, ArmorMaterials.EMERALD, ActuallyItems::defaultProps); - public static final ToolSet OBSIDIAN_SET = new ToolSet("obsidian", ToolMaterials.OBSIDIAN, ArmorMaterials.OBSIDIAN, ActuallyItems::defaultProps); public static final ToolSet QUARTZ_SET = new ToolSet("quartz", ToolMaterials.QUARTZ, ArmorMaterials.QUARTZ, ActuallyItems::defaultProps); public static final ToolSet ENORI_SET = new ToolSet("enori", ToolMaterials.ENORI, ArmorMaterials.ENORI, ActuallyItems::defaultProps); public static final ToolSet EMERADIC_SET = new ToolSet("emeradic", ToolMaterials.EMERADIC, ArmorMaterials.EMERADIC, ActuallyItems::defaultProps); @@ -27,7 +26,22 @@ public class ActuallyItems { public static final ToolSet PALIS_SET = new ToolSet("palis", ToolMaterials.PALIS, ArmorMaterials.PALIS, ActuallyItems::defaultProps); public static final ToolSet RESTONIA_SET = new ToolSet("restonia", ToolMaterials.RESTONIA, ArmorMaterials.RESTONIA, ActuallyItems::defaultProps); - public static final Set ALL_TOOL_SETS = ImmutableSet.of(EMERALD_SET, OBSIDIAN_SET, QUARTZ_SET, ENORI_SET, EMERADIC_SET, VOID_SET, DIAMATINE_SET, PALIS_SET, RESTONIA_SET); + // 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 Set ALL_TOOL_SETS = ImmutableSet.of(QUARTZ_SET, ENORI_SET, EMERADIC_SET, VOID_SET, DIAMATINE_SET, PALIS_SET, RESTONIA_SET); // Resources public static final RegistryObject BLACK_QUARTS = ITEMS.register("black_quartz", basicItem()); @@ -41,8 +55,12 @@ public class ActuallyItems { public static final RegistryObject BOOKLET = ITEMS.register("booklet", basicItem()); public static final Set> SIMPLE_ITEMS = ImmutableSet.of( + // Crystals BLACK_QUARTS, RESTONIA_CRYSTAL, PALIS_CRYSTAL, DIAMATINE_CRYSTAL, - VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_CRYSTAL + VOID_CRYSTAL, EMERADIC_CRYSTAL, ENORI_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 ); private static Supplier basicItem() { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/IActuallyItem.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/IActuallyItem.java new file mode 100644 index 000000000..36a8124d4 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/IActuallyItem.java @@ -0,0 +1,5 @@ +package de.ellpeck.actuallyadditions.common.items; + +// Currently nothing :cry: +public interface IActuallyItem { +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/useables/AllInOneTool.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/useables/AllInOneTool.java new file mode 100644 index 000000000..11e669985 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/useables/AllInOneTool.java @@ -0,0 +1,51 @@ +package de.ellpeck.actuallyadditions.common.items.useables; + +import com.google.common.collect.ImmutableSet; +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.IActuallyItem; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.*; +import net.minecraft.util.ActionResultType; +import net.minecraftforge.common.ToolType; + +public class AllInOneTool extends ToolItem implements IActuallyItem { + private IItemTier tier; + + public AllInOneTool(IItemTier tier) { + super( + 4.0f, + -2f, + tier, + ImmutableSet.of(), + new Item.Properties() + .addToolType(ToolType.AXE, tier.getHarvestLevel()) + .addToolType(ToolType.HOE, tier.getHarvestLevel()) + .addToolType(ToolType.SHOVEL, tier.getHarvestLevel()) + .addToolType(ToolType.PICKAXE, tier.getHarvestLevel()) + .maxDamage(tier.getMaxUses() * 4) + .group(ActuallyAdditions.ACTUALLY_GROUP) + ); + + this.tier = tier; + } + + @Override + public ActionResultType onItemUse(ItemUseContext context) { + // How, no idea, possible, most likely :cry: + if (context.getPlayer() == null) { + return ActionResultType.FAIL; + } + + // Player not sneaking? Act as a Hoe to the block, else, Act as a shovel + if (!context.getPlayer().isSneaking()) { + return Items.IRON_HOE.onItemUse(context); + } + + return Items.IRON_SHOVEL.onItemUse(context); + } + + @Override + public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) { + return super.canApplyAtEnchantingTable(stack, enchantment) || enchantment.type.canEnchantItem(Items.DIAMOND_SWORD); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/materials/ArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/common/materials/ArmorMaterials.java index 237e42f91..927a3108e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/materials/ArmorMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/materials/ArmorMaterials.java @@ -4,7 +4,6 @@ import de.ellpeck.actuallyadditions.common.ActuallyAdditions; import de.ellpeck.actuallyadditions.common.items.ActuallyItems; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.IArmorMaterial; -import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.LazyValue; import net.minecraft.util.SoundEvent; @@ -14,12 +13,15 @@ import net.minecraftforge.api.distmarker.OnlyIn; import java.util.function.Supplier; -// Mostly a copy of the ItemTier enum because... Lazy +/** + * Complete copy paste from {@link net.minecraft.item.ArmorMaterial} + * + * todo validate all values refect correctly + */ public enum ArmorMaterials implements IArmorMaterial { - EMERALD("emerald_armor_material", 30, new int[] { 5, 8, 9, 4 }, 15, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 2, 0f, () -> Ingredient.fromItems(Items.EMERALD)), - OBSIDIAN("obsidian_armor_material", 28, new int[] { 1, 3, 4, 3 }, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 1, 0f, () -> Ingredient.fromItems(Items.OBSIDIAN)), +// EMERALD("emerald_armor_material", 30, new int[] { 5, 8, 9, 4 }, 15, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 2, 0f, () -> Ingredient.fromItems(Items.EMERALD)), +// OBSIDIAN("obsidian_armor_material", 28, new int[] { 1, 3, 4, 3 }, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 1, 0f, () -> Ingredient.fromItems(Items.OBSIDIAN)), - // Custom resources QUARTZ("quartz_armor_material", 15, new int[] { 3, 5, 6, 3 }, 8, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 1, 0f, () -> Ingredient.fromItems(ActuallyItems.BLACK_QUARTS.get())), RESTONIA("restonia_armor_material", 18, new int[] { 3, 6, 7, 3 }, 9, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0, 0f, () -> Ingredient.fromItems(ActuallyItems.RESTONIA_CRYSTAL.get())), PALIS("palis_armor_material", 10, new int[] { 3, 6, 7, 3 }, 10, SoundEvents.ITEM_ARMOR_EQUIP_GENERIC, 0, 0f, () -> Ingredient.fromItems(ActuallyItems.PALIS_CRYSTAL.get())), diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java index 0834770af..3ded28f5b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java @@ -2,18 +2,17 @@ package de.ellpeck.actuallyadditions.common.materials; import de.ellpeck.actuallyadditions.common.items.ActuallyItems; import net.minecraft.item.IItemTier; -import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.LazyValue; import java.util.function.Supplier; -// Mostly a copy of the ItemTier enum because... Lazy +/** + * Complete copy paste from {@link net.minecraft.item.ItemTier} + * + * todo: review to ensure all values act as intended + */ public enum ToolMaterials implements IItemTier { - EMERALD(3, 2000, 9.0f, 5.0f, 15, () -> Ingredient.fromItems(Items.EMERALD)), - OBSIDIAN(3, 8000, 4.0f, 2.0f, 15, () -> Ingredient.fromItems(Items.OBSIDIAN)), - - // Custom resources QUARTZ(2, 280, 6.5f, 2.0f, 10, () -> Ingredient.fromItems(ActuallyItems.BLACK_QUARTS.get())), RESTONIA(2, 300, 7.0f, 2.25f, 12, () -> Ingredient.fromItems(ActuallyItems.RESTONIA_CRYSTAL.get())), PALIS(2, 300, 7.0f, 2.25f, 12, () -> Ingredient.fromItems(ActuallyItems.PALIS_CRYSTAL.get())), diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/diamatine_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/diamond_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/diamond_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/emeradic_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/enori_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/gold_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/gold_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/iron_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/netherite_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/netherite_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/palis_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/quartz_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/quartz_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/restonia_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/stone_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/void_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/void_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/item/wooden_paxel.png b/src/main/resources/assets/actuallyadditions/textures/item/wooden_paxel.png new file mode 100644 index 0000000000000000000000000000000000000000..56f2ff5fb5bcd1cb0eb25ac062604afdde2ea178 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OLG}_)Usv|~?2^L5Qbq}>^MFDUC9V-A!TD(= z<%vb93~dIoxCe|nPd1JyKox;Tbd_%H3<$lGAR!*V(J^0HRW8;xzI z38Kr)43$2fu2j*9vwHctph#$9`~^cMS!F2EGV z^|a>yE;;?njdLT@K_GQ7`Dy3=HI4_9mmY~<=Xmfk*Y23+rsbk#JK0$Ifku6_o}~Ag Xxp2Y;ah@|k$1r%h`njxgN@xNAGD&2n literal 0 HcmV?d00001