From e6d448df3daeba428700f6a825288c739b2870d0 Mon Sep 17 00:00:00 2001 From: Zachary Knoblauch Date: Thu, 10 Oct 2024 01:23:13 -0500 Subject: [PATCH] Tools, Hammer, Custom Armor --- .../33cc91448ef1b59d518192bfc057896d655a1890 | 6 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 11 ++- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 46 +++++----- .../bc1ae8bb89cc6593bda41b4cfe098e8ab94afd6c | 6 +- .../ff84aa9e018ee1ae994e62135584af4e1765dd72 | 5 +- .../blockstates/raw_peacock_block.json | 7 -- .../models/block/raw_peacock_block.json | 6 -- .../models/item/diamond_hammer.json | 6 ++ .../models/item/fire_metal_hammer.json | 6 ++ .../models/item/iron_hammer.json | 6 ++ .../models/item/raw_peacock_block.json | 3 - .../models/item/raw_peacock_chunk.json | 6 -- ...peacock_chunk.json => diamond_hammer.json} | 10 +-- .../recipes/misc/fire_metal_block.json | 4 +- ...s.json => fire_metal_block_to_ingots.json} | 4 +- ...cock_block.json => fire_metal_hammer.json} | 10 +-- .../recipes/misc/fire_metal_ingot.json | 4 +- ...acock_chunk.json => fire_metal_knife.json} | 10 +-- .../recipes/misc/fire_metal_nugget.json | 4 +- .../advancement/recipes/misc/iron_hammer.json | 32 +++++++ ...k_gem_from_blasting_raw_peacock_chunk.json | 32 ------- .../recipes/misc/raw_fire_metal_block.json | 4 +- .../recipes/misc/raw_fire_metal_chunk.json | 4 +- .../blocks/deepslate_fire_metal_ore.json | 2 +- .../blocks/deepslate_peacock_ore.json | 6 +- .../loot_table/blocks/fire_metal_ore.json | 9 ++ .../loot_table/blocks/peacock_ore.json | 11 ++- .../loot_table/blocks/raw_peacock_block.json | 21 ----- .../recipe/diamond_hammer.json | 24 ++++++ ...s.json => fire_metal_block_to_ingots.json} | 0 .../recipe/fire_metal_hammer.json | 24 ++++++ ...rom_blasting_deepslate_fire_metal_ore.json | 2 +- ...al_ingot_from_blasting_fire_metal_ore.json | 2 +- ...ot_from_blasting_raw_fire_metal_chunk.json | 2 +- ...rom_smelting_deepslate_fire_metal_ore.json | 2 +- ...al_ingot_from_smelting_fire_metal_ore.json | 2 +- ...ot_from_smelting_raw_fire_metal_chunk.json | 2 +- .../recipe/fire_metal_knife.json | 21 +++++ .../azraeinworkshop/recipe/iron_hammer.json | 24 ++++++ ...k_gem_from_blasting_raw_peacock_chunk.json | 14 --- ...k_gem_from_smelting_raw_peacock_chunk.json | 14 --- .../recipe/raw_peacock_block.json | 18 ---- .../recipe/raw_peacock_chunk.json | 13 --- .../azraeinworkshop/recipe/xyloth_staff.json | 9 +- .../tags/block/mineable/pickaxe.json | 1 - .../minecraft/tags/block/needs_iron_tool.json | 3 +- .../azraeinworkshop/block/ModBlocks.java | 5 -- .../datagen/ModBlockLootTableProvider.java | 10 +-- .../datagen/ModBlockStateProvider.java | 1 - .../datagen/ModBlockTagProvider.java | 4 +- .../datagen/ModItemModelProvider.java | 80 +++++++++++++++++- .../datagen/ModItemTagProvider.java | 5 +- .../datagen/ModRecipeProvider.java | 42 ++++++--- .../azraeinworkshop/event/ModEvents.java | 46 ++++++++++ .../azraeinworkshop/item/BakoraStaffItem.java | 13 --- .../item/ModCreativeModeTabs.java | 11 ++- .../azraeinworkshop/item/ModItems.java | 66 ++++++++++++--- .../item/{ => custom}/WorkshopManualItem.java | 2 +- .../item/custom/XylothStaffItem.java | 13 +++ .../item/tiers/ModArmorMaterials.java | 45 ++++++++++ .../item/{ => tiers}/ModToolTiers.java | 3 +- .../item/types/HammerItem.java | 63 ++++++++++++++ .../item/{ => types}/KnifeItem.java | 2 +- .../azraeinworkshop/item/types/StaffItem.java | 11 +++ .../assets/azraeinworkshop/lang/en_us.json | 9 ++ .../textures/block/raw_peacock_block.png | Bin 1027 -> 0 bytes .../item/6 Color Palette Savannah.aseprite | Bin 0 -> 268 bytes .../item/7 Color Palette Savannah.aseprite | Bin 0 -> 309 bytes .../textures/item/8 Color Pallette.aseprite | Bin 0 -> 315 bytes .../item/INVERTED 8 Color Pallette.aseprite | Bin 0 -> 315 bytes .../textures/item/diamond_hammer.png | Bin 0 -> 323 bytes .../textures/item/fire_metal_boots.png | Bin 0 -> 198 bytes .../textures/item/fire_metal_chestplate.png | Bin 0 -> 215 bytes .../textures/item/fire_metal_hammer.png | Bin 0 -> 377 bytes .../textures/item/fire_metal_helmet.png | Bin 0 -> 197 bytes .../textures/item/fire_metal_leggings.png | Bin 0 -> 198 bytes .../textures/item/iron_hammer.png | Bin 0 -> 312 bytes .../textures/item/raw_peacock_chunk.png | Bin 917 -> 0 bytes .../textures/item/xyloth_staff.png | Bin 968 -> 597 bytes .../models/armor/fire_metal_layer_1.png | Bin 0 -> 483 bytes .../models/armor/fire_metal_layer_2.png | Bin 0 -> 292 bytes 81 files changed, 613 insertions(+), 276 deletions(-) delete mode 100644 src/generated/resources/assets/azraeinworkshop/blockstates/raw_peacock_block.json delete mode 100644 src/generated/resources/assets/azraeinworkshop/models/block/raw_peacock_block.json create mode 100644 src/generated/resources/assets/azraeinworkshop/models/item/diamond_hammer.json create mode 100644 src/generated/resources/assets/azraeinworkshop/models/item/fire_metal_hammer.json create mode 100644 src/generated/resources/assets/azraeinworkshop/models/item/iron_hammer.json delete mode 100644 src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_block.json delete mode 100644 src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_chunk.json rename src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/{raw_peacock_chunk.json => diamond_hammer.json} (65%) rename src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/{prideland_block_to_ingots.json => fire_metal_block_to_ingots.json} (81%) rename src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/{raw_peacock_block.json => fire_metal_hammer.json} (65%) rename src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/{peacock_gem_from_smelting_raw_peacock_chunk.json => fire_metal_knife.json} (60%) create mode 100644 src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/iron_hammer.json delete mode 100644 src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_blasting_raw_peacock_chunk.json delete mode 100644 src/generated/resources/data/azraeinworkshop/loot_table/blocks/raw_peacock_block.json create mode 100644 src/generated/resources/data/azraeinworkshop/recipe/diamond_hammer.json rename src/generated/resources/data/azraeinworkshop/recipe/{prideland_block_to_ingots.json => fire_metal_block_to_ingots.json} (100%) create mode 100644 src/generated/resources/data/azraeinworkshop/recipe/fire_metal_hammer.json create mode 100644 src/generated/resources/data/azraeinworkshop/recipe/fire_metal_knife.json create mode 100644 src/generated/resources/data/azraeinworkshop/recipe/iron_hammer.json delete mode 100644 src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_blasting_raw_peacock_chunk.json delete mode 100644 src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_smelting_raw_peacock_chunk.json delete mode 100644 src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_block.json delete mode 100644 src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_chunk.json create mode 100644 src/main/java/io/azraein/azraeinworkshop/event/ModEvents.java delete mode 100644 src/main/java/io/azraein/azraeinworkshop/item/BakoraStaffItem.java rename src/main/java/io/azraein/azraeinworkshop/item/{ => custom}/WorkshopManualItem.java (97%) create mode 100644 src/main/java/io/azraein/azraeinworkshop/item/custom/XylothStaffItem.java create mode 100644 src/main/java/io/azraein/azraeinworkshop/item/tiers/ModArmorMaterials.java rename src/main/java/io/azraein/azraeinworkshop/item/{ => tiers}/ModToolTiers.java (80%) create mode 100644 src/main/java/io/azraein/azraeinworkshop/item/types/HammerItem.java rename src/main/java/io/azraein/azraeinworkshop/item/{ => types}/KnifeItem.java (83%) create mode 100644 src/main/java/io/azraein/azraeinworkshop/item/types/StaffItem.java delete mode 100644 src/main/resources/assets/azraeinworkshop/textures/block/raw_peacock_block.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/6 Color Palette Savannah.aseprite create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/7 Color Palette Savannah.aseprite create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/8 Color Pallette.aseprite create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/INVERTED 8 Color Pallette.aseprite create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/diamond_hammer.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_boots.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_chestplate.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_hammer.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_helmet.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_leggings.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/iron_hammer.png delete mode 100644 src/main/resources/assets/azraeinworkshop/textures/item/raw_peacock_chunk.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/models/armor/fire_metal_layer_1.png create mode 100644 src/main/resources/assets/azraeinworkshop/textures/models/armor/fire_metal_layer_2.png diff --git a/src/generated/resources/.cache/33cc91448ef1b59d518192bfc057896d655a1890 b/src/generated/resources/.cache/33cc91448ef1b59d518192bfc057896d655a1890 index dbc323a..321a3b7 100644 --- a/src/generated/resources/.cache/33cc91448ef1b59d518192bfc057896d655a1890 +++ b/src/generated/resources/.cache/33cc91448ef1b59d518192bfc057896d655a1890 @@ -1,10 +1,12 @@ -// 1.21.1 2024-10-04T18:55:33.0043139 Item Models: azraeinworkshop +// 1.21.1 2024-10-05T02:37:06.9166049 Item Models: azraeinworkshop 96522ea59222b57f97bd46f43837ff199eb0b1ea assets/azraeinworkshop/models/item/baked_gourd.json 3618daf6518d5b4ce1b0ce237d75e41367ca90b3 assets/azraeinworkshop/models/item/baobab_fruit.json afc452e4fbd9c28e79762807ce7ca53a7208b78f assets/azraeinworkshop/models/item/blue_feather.json 3400747ce4be64307fbcfd3b817b91de641ab841 assets/azraeinworkshop/models/item/cobble_knife.json +9895010f744327a7d3c76908e5a71db44b4284b7 assets/azraeinworkshop/models/item/diamond_hammer.json 335a2fc8d1affffed0f4a8c96b0185fefc1ba838 assets/azraeinworkshop/models/item/diamond_knife.json 8f35f5c4d414710c61515dbb21ef5f95bf8948ea assets/azraeinworkshop/models/item/fire_metal_axe.json +7226d3ef42f822d779e792606ff2fedb6e2fbb36 assets/azraeinworkshop/models/item/fire_metal_hammer.json ff5104282519d3dbb0045b5263f3925d2a211f93 assets/azraeinworkshop/models/item/fire_metal_hoe.json 599d94c4a734219dbcf6916100fb0f3be6929b75 assets/azraeinworkshop/models/item/fire_metal_ingot.json f8578a659f2419cce5588898afe9795a3dac231e assets/azraeinworkshop/models/item/fire_metal_knife.json @@ -15,13 +17,13 @@ f8578a659f2419cce5588898afe9795a3dac231e assets/azraeinworkshop/models/item/fire edd74cebf8769348f464426d04891a387e7d7ef8 assets/azraeinworkshop/models/item/gold_knife.json 04761377d1202c2686672db7db8299d54e59162b assets/azraeinworkshop/models/item/gourd.json 189f3dc02281fe9c53045de50d39f433e4e1f726 assets/azraeinworkshop/models/item/green_feather.json +4ff7caf80871e15007fbdfc465cd20cacb1480ab assets/azraeinworkshop/models/item/iron_hammer.json 46963d796496179f28e943dfb18f1a86f87f4c82 assets/azraeinworkshop/models/item/iron_knife.json a99408cc96e36459dbd4ab76ef1964865926a319 assets/azraeinworkshop/models/item/netherite_knife.json 9eb68a5f4ca1c8321dbdea4c522a002d7063db42 assets/azraeinworkshop/models/item/peacock_gem.json 08d42c5d8a1375feeb9092a97f5d1e013a7119d8 assets/azraeinworkshop/models/item/peacock_knife.json e11bf5f44158cf5dd226d04fa934afd103e6c5da assets/azraeinworkshop/models/item/purple_feather.json 909180acd5747471ff0bce33d92aff30e480883b assets/azraeinworkshop/models/item/raw_fire_metal_chunk.json -7adb8cf20fbb29c2b630e6d4b68170f259fdda2a assets/azraeinworkshop/models/item/raw_peacock_chunk.json 6c647bd51001ef66d4f5564c0ea3061de8c4c0e1 assets/azraeinworkshop/models/item/red_feather.json becd12146f0f0484b6327ff47f8766ad8b9f8e3e assets/azraeinworkshop/models/item/smashed_gourd.json f5f72df0bd6ddf1eccbadafdf7357b498bb7fd65 assets/azraeinworkshop/models/item/wood_knife.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 7c2e462..ab725ab 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,10 +1,9 @@ -// 1.21.1 2024-10-04T18:55:33.0063166 Loot Tables -6b1b165e608abd9a91562aec8db82940e1c6ec2c data/azraeinworkshop/loot_table/blocks/deepslate_fire_metal_ore.json -8b419f9b66a308c29873d577537d7a39ab6b35cf data/azraeinworkshop/loot_table/blocks/deepslate_peacock_ore.json +// 1.21.1 2024-10-04T22:39:41.1502984 Loot Tables +f6c7ebff351eb1179559d189db7b1665a9b393f8 data/azraeinworkshop/loot_table/blocks/deepslate_fire_metal_ore.json +3e7a482f99118c90f5fdaa0c1acc5fa5b17278ed data/azraeinworkshop/loot_table/blocks/deepslate_peacock_ore.json 91386faa101fead441d94728bb9399dae1fc2689 data/azraeinworkshop/loot_table/blocks/fire_metal_block.json -15b35ae048f2044f4b5be26a244fceb4b623d1ae data/azraeinworkshop/loot_table/blocks/fire_metal_ore.json +62bf4545edf11fb00904172f8c4e621c752f47b4 data/azraeinworkshop/loot_table/blocks/fire_metal_ore.json 7d8e66c975d70bce7007162de0cf3ea04ce43e41 data/azraeinworkshop/loot_table/blocks/peacock_block.json -10b0a642c37dd5fb6fa87f4d5f232e070cf0411c data/azraeinworkshop/loot_table/blocks/peacock_ore.json +91bacc2cfc03ba51e1e63252490c59f0c14fa074 data/azraeinworkshop/loot_table/blocks/peacock_ore.json d08fb8c4769f936f34cfbad85d83e11cd7f77cf5 data/azraeinworkshop/loot_table/blocks/raw_fire_metal_block.json -6e8f50b4dd3b26d9b44d53cd6ee7d2b0a7be1527 data/azraeinworkshop/loot_table/blocks/raw_peacock_block.json 58670ebfa14c8fdbbd59f2fccf78d7537426534f data/azraeinworkshop/loot_table/blocks/smashing_rock.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index c9cf79c..47c0c74 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,77 +1,77 @@ -// 1.21.1 2024-10-04T18:55:33.0088256 Recipes +// 1.21.1 2024-10-05T02:37:06.9195899 Recipes 109368e4cf20de0ab32dd98fc9800e42766ce947 data/azraeinworkshop/advancement/recipes/food/baked_gourd_from_smelting_gourd.json 9c5f896cda908997a7c0c064943199fdaae7dea3 data/azraeinworkshop/advancement/recipes/misc/cobble_knife.json +7e7062e9efa475d722ed1a42f15fe2f11e03a6bf data/azraeinworkshop/advancement/recipes/misc/diamond_hammer.json 7966d389bef9c10ac045f6bce4d55f5c94ccf110 data/azraeinworkshop/advancement/recipes/misc/diamond_knife.json 6d4c711953aa1f37ac42343dcbdce433d847ee86 data/azraeinworkshop/advancement/recipes/misc/fire_metal_axe.json -53fea7b6952ea7e902a5e04a59a2c8f4ac893366 data/azraeinworkshop/advancement/recipes/misc/fire_metal_block.json +94c6fdc844dc702dd1f826e01c1d1487519cfff8 data/azraeinworkshop/advancement/recipes/misc/fire_metal_block.json +af1f7d54382bd305e7220efc4619444bb7bba210 data/azraeinworkshop/advancement/recipes/misc/fire_metal_block_to_ingots.json +d0cf253a77b92cdfe68797aaaa1a1e026864a149 data/azraeinworkshop/advancement/recipes/misc/fire_metal_hammer.json 4184a952eba9608fc9b2408414d6355c6fb74c89 data/azraeinworkshop/advancement/recipes/misc/fire_metal_hoe.json -c6407d73f9a0649f3b428f1e22cae04aaa99cd06 data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot.json +d7b777da9564fc7c4af1d5b0e01103875b67814b data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot.json e580251f64dae237bed040d94ecf0438768884ec data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot_from_blasting_deepslate_fire_metal_ore.json b8142c602957cbd19ca52493f197ddcdd2c7ff33 data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot_from_blasting_fire_metal_ore.json ad5a587bfa2f33ebc07e00cc094b79a2ce2a8bbc data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot_from_blasting_raw_fire_metal_chunk.json c2bee5b00378c6df3e2bc397d967d08ebb950a50 data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot_from_smelting_deepslate_fire_metal_ore.json 38832588dc653979adb77a48dd9460362c367ba8 data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot_from_smelting_fire_metal_ore.json c9502070c381c9ec37c3fd65129ea3f9176cf178 data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot_from_smelting_raw_fire_metal_chunk.json -ed8a9e400b556f437f895d8439b07b3b75f3c4a7 data/azraeinworkshop/advancement/recipes/misc/fire_metal_nugget.json +bee1c33a0b279da53d8ea588e0cdd7d412ce1007 data/azraeinworkshop/advancement/recipes/misc/fire_metal_knife.json +c634955ac6feafa6f7a58480eee1faca9df7ab83 data/azraeinworkshop/advancement/recipes/misc/fire_metal_nugget.json bc2064ba2d18d13ab7b6732a1f84d7682acd3ab8 data/azraeinworkshop/advancement/recipes/misc/fire_metal_pickaxe.json f9ae955e6956337055215f5c563041bad05954c2 data/azraeinworkshop/advancement/recipes/misc/fire_metal_shovel.json e5887a19168d414d871fd82ce6d07731b7d98cbf data/azraeinworkshop/advancement/recipes/misc/fire_metal_sword.json 56e7c0923a17f303656439643cd197b585effc94 data/azraeinworkshop/advancement/recipes/misc/gold_knife.json +4e7bdc06141409ceeee09261eedb866fc6340d10 data/azraeinworkshop/advancement/recipes/misc/iron_hammer.json 090170fb87413f28015a7ef6549433317e2b34ba data/azraeinworkshop/advancement/recipes/misc/iron_knife.json 6fb2ef0d13853e3396baf9cde9d6b00732cdc5ef data/azraeinworkshop/advancement/recipes/misc/netherite_knife.json ac5129438f2186a4d701e5684466360d61b1f70e data/azraeinworkshop/advancement/recipes/misc/peacock_block.json ff16c0b7c93d25ad5f6f56e85f843834297d35f1 data/azraeinworkshop/advancement/recipes/misc/peacock_gem.json 3ca38d20fe4b5e5a0a196b9112825d8225a6d3b4 data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_blasting_deepslate_peacock_ore.json dc9dd4726e210c31392d117eaf4f50cd257b00d2 data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_blasting_peacock_ore.json -a2e3357c652c48d174c75f78c2cc985909058b97 data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_blasting_raw_peacock_chunk.json 92dcdd3a24ed215c9d7a6fb4898b94775de817a0 data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_smelting_deepslate_peacock_ore.json 43419f41102860788ce3e09ce5e8fd85089a74a5 data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_smelting_peacock_ore.json -f166a2a0c2c456a0a9b57ad2e00161a4ecf5b4f6 data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_smelting_raw_peacock_chunk.json 72487cbe85432d8085a97cec410d8917b1896b26 data/azraeinworkshop/advancement/recipes/misc/peacock_knife.json -17a46844fdc8e8302aa283710f47c64ea9e12926 data/azraeinworkshop/advancement/recipes/misc/prideland_block_to_ingots.json -490b509712a60407195673b44471dd007afd198a data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_block.json -3b7d9f2c728231939c4877069970d36ab5e9e28c data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_chunk.json -3941d18ba7cc6d5dd2b58ee80240a8d53f162367 data/azraeinworkshop/advancement/recipes/misc/raw_peacock_block.json -7c317dd253d632cec4f1fe50a60a9e4816f657f3 data/azraeinworkshop/advancement/recipes/misc/raw_peacock_chunk.json +6fb77308691ed74773cd186d70999bc6a91ad611 data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_block.json +5eb4a5cd70aaa8c14f0f132e89bc2ec27348c721 data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_chunk.json 7f56d28d8fa28522e0c90402c9e275283bafcf14 data/azraeinworkshop/advancement/recipes/misc/smashing_rock.json 2ef1c697a80c38d74351478daa8e98254a6e6314 data/azraeinworkshop/advancement/recipes/misc/wood_knife.json 4feb3bac921d398adfe0795ef22610e0334ebd80 data/azraeinworkshop/advancement/recipes/misc/workshop_manual.json 97c2e4a34d7c736ecb7e685562adf4267d1df263 data/azraeinworkshop/advancement/recipes/misc/xyloth_staff.json e99852a769a249e6ec97378571918989362e95cd data/azraeinworkshop/recipe/baked_gourd_from_smelting_gourd.json 1584d3187d1d2ded37733f68321e2d9e76b7a2ff data/azraeinworkshop/recipe/cobble_knife.json +085121b37bc37cd403781cfa4cc8d5eb156a2342 data/azraeinworkshop/recipe/diamond_hammer.json e9cd8e012a8d199623382b557f56a13a236273eb data/azraeinworkshop/recipe/diamond_knife.json d92c290f0fb506be7ed6dbb4ad329f33821553e7 data/azraeinworkshop/recipe/fire_metal_axe.json 7c14c73f553ef535635b811c9026f12bed9d9afd data/azraeinworkshop/recipe/fire_metal_block.json +13c492a3dab84ba78767206f1cb4568252eca688 data/azraeinworkshop/recipe/fire_metal_block_to_ingots.json +0dd79eaa387fbdf6e9c074820650508cd48d964c data/azraeinworkshop/recipe/fire_metal_hammer.json 4f8ba2893a416b7d090d2de20f764212d53ca6a0 data/azraeinworkshop/recipe/fire_metal_hoe.json f14ddb4e019f30575f54c5ad818f5f3252c8a7ca data/azraeinworkshop/recipe/fire_metal_ingot.json -da70d545532ce819a9f4ca90df12e9b388167af8 data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_deepslate_fire_metal_ore.json -f63cf1a5a45d03ab0403d212815d0b501024c809 data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_fire_metal_ore.json -6b4f419e2af6241bd98c4e88e97e4e16cd1bae02 data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_raw_fire_metal_chunk.json -42e80c4e85f3e3fd8e1d97bc7e7d1a32b6a5123b data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_deepslate_fire_metal_ore.json -2f546b99f356b0c2914c0baad203676a852ee49d data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_fire_metal_ore.json -66925dcd4e89d50720ad723e61de002d93c18f63 data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_raw_fire_metal_chunk.json +e8e3a07b69bba258e3a87661b47b5be07abfe9bd data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_deepslate_fire_metal_ore.json +0d11818c1dca9aa0d5fa26afb54976e08c5ddfc7 data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_fire_metal_ore.json +33abb2f6a0e019ecab510b363c7dbf82e61d2941 data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_raw_fire_metal_chunk.json +5b53fa3c32a70dd7e4cf0fd9c4ac15f0b7431176 data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_deepslate_fire_metal_ore.json +fa1f87be02b5a246cb2d97dcf0c3014df6b9bcce data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_fire_metal_ore.json +d06a707c3570a827024cf4916b7812729d49ac86 data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_raw_fire_metal_chunk.json +4191dfd7ce8d771cd9c71e2240f256184015b0ff data/azraeinworkshop/recipe/fire_metal_knife.json 7155d2440e9ffb8399a54837bd4670f41e8da740 data/azraeinworkshop/recipe/fire_metal_nugget.json 9b2613d0a1d40028db1ce12d96ff8eaace57a8d5 data/azraeinworkshop/recipe/fire_metal_pickaxe.json 79ee25bfd48d3ccfe2dda8aceed4b15d95132515 data/azraeinworkshop/recipe/fire_metal_shovel.json 5efe9a41306043ec40d3d92bb60e53635c1a79f7 data/azraeinworkshop/recipe/fire_metal_sword.json c8d26d02702e78e88ba5df77a49f6a2fb2dbd9c1 data/azraeinworkshop/recipe/gold_knife.json +13e91f8ef84a60aad644ea2f0035dcf3b189760d data/azraeinworkshop/recipe/iron_hammer.json ba21d96ce67372f8425c9a957197a9d001fbb09c data/azraeinworkshop/recipe/iron_knife.json d857b00b29d986e6686ee555c7408d695b24c738 data/azraeinworkshop/recipe/netherite_knife.json d38bf0ce9e315d39399f1353e24fd9805bf64033 data/azraeinworkshop/recipe/peacock_block.json e15359ee8ec4909c3a67c53e47fd689420c92551 data/azraeinworkshop/recipe/peacock_gem.json db2f0aecd4010fd56938b7cc58e4d391f1cd9e78 data/azraeinworkshop/recipe/peacock_gem_from_blasting_deepslate_peacock_ore.json 1ab3f88fdad6e4054f9996a1983651775f7f2c11 data/azraeinworkshop/recipe/peacock_gem_from_blasting_peacock_ore.json -9cb9b0886894ac5d83f720267a1ef4af7cb65f72 data/azraeinworkshop/recipe/peacock_gem_from_blasting_raw_peacock_chunk.json 354b98d29c15592d56444a91c973bb62f2126256 data/azraeinworkshop/recipe/peacock_gem_from_smelting_deepslate_peacock_ore.json 39eff893d15aa6f046c863003ae1b28a2ad7b7c8 data/azraeinworkshop/recipe/peacock_gem_from_smelting_peacock_ore.json -0c2d7eb222e44941fec92d2401cdb283ac9f470c data/azraeinworkshop/recipe/peacock_gem_from_smelting_raw_peacock_chunk.json 31de7326354cee340399b9821482b3ed022ffce1 data/azraeinworkshop/recipe/peacock_knife.json -13c492a3dab84ba78767206f1cb4568252eca688 data/azraeinworkshop/recipe/prideland_block_to_ingots.json 5aa9631d0aa9284061d8cb058215c9098fb218bc data/azraeinworkshop/recipe/raw_fire_metal_block.json 092390e1b939bb4d6db0dac5050737b62e872d82 data/azraeinworkshop/recipe/raw_fire_metal_chunk.json -0b518658a73a6c433d13deaddee04439a2285123 data/azraeinworkshop/recipe/raw_peacock_block.json -ca7c7b43ff0489e09c25863d00a5f2f5b44d9280 data/azraeinworkshop/recipe/raw_peacock_chunk.json f9b2803a629981c6f1693fa5f9301fe2fd200bfd data/azraeinworkshop/recipe/smashing_rock.json 6958fc9c89148e6151cbc191c6aa714090871f2a data/azraeinworkshop/recipe/wood_knife.json 0780621e1c662b6382e300667bd4e6b026e494d0 data/azraeinworkshop/recipe/workshop_manual.json -66b29bfcccf46711472db38bc7080ac06d6f3e1e data/azraeinworkshop/recipe/xyloth_staff.json +ff84425c4323d2220dff7d301898794f3c38d92a data/azraeinworkshop/recipe/xyloth_staff.json diff --git a/src/generated/resources/.cache/bc1ae8bb89cc6593bda41b4cfe098e8ab94afd6c b/src/generated/resources/.cache/bc1ae8bb89cc6593bda41b4cfe098e8ab94afd6c index 7e8d183..defbe13 100644 --- a/src/generated/resources/.cache/bc1ae8bb89cc6593bda41b4cfe098e8ab94afd6c +++ b/src/generated/resources/.cache/bc1ae8bb89cc6593bda41b4cfe098e8ab94afd6c @@ -1,6 +1,6 @@ -// 1.21.1 2024-10-04T18:55:32.9967805 Tags for minecraft:block mod id azraeinworkshop +// 1.21.1 2024-10-04T22:33:34.0400463 Tags for minecraft:block mod id azraeinworkshop 926e805eea93938ca76670bc3afa8373a5957fca data/azraeinworkshop/tags/block/incorrect_for_fire_metal_tool.json 32b13946c4cd1f944b029659ccce5fcb2adad4ff data/azraeinworkshop/tags/block/needs_fire_metal_tool.json -4afd1ebb244d96953b42db07c6f1fa4fe1a78b15 data/minecraft/tags/block/mineable/pickaxe.json -4c10e2d38be0a61ea153863d75b7718091b78703 data/minecraft/tags/block/needs_iron_tool.json +2b62bac43304bb2e6f96861dfebc3e662de73df0 data/minecraft/tags/block/mineable/pickaxe.json +3bd88cb56bc1bba88b66ce77588b371a5abcf6bf data/minecraft/tags/block/needs_iron_tool.json f9b7eacd7e04585a770c7dbb20ac3d0434f87e9a data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/generated/resources/.cache/ff84aa9e018ee1ae994e62135584af4e1765dd72 b/src/generated/resources/.cache/ff84aa9e018ee1ae994e62135584af4e1765dd72 index 27b1102..17d93c6 100644 --- a/src/generated/resources/.cache/ff84aa9e018ee1ae994e62135584af4e1765dd72 +++ b/src/generated/resources/.cache/ff84aa9e018ee1ae994e62135584af4e1765dd72 @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-04T18:55:33.0013154 Block States: azraeinworkshop +// 1.21.1 2024-10-04T22:33:34.043043 Block States: azraeinworkshop 462a97c1e1967a74f005a52eaa43503b564ed322 assets/azraeinworkshop/blockstates/deepslate_fire_metal_ore.json d374702ea8366d2fd4abcfcda7bafa1d3e3802cd assets/azraeinworkshop/blockstates/deepslate_peacock_ore.json f750baa30a93602fc8f7861a316fd61ec686ee28 assets/azraeinworkshop/blockstates/fire_metal_block.json @@ -6,7 +6,6 @@ f750baa30a93602fc8f7861a316fd61ec686ee28 assets/azraeinworkshop/blockstates/fire 582cb6b3b13b1947c0a16a14b3928bc30f32e262 assets/azraeinworkshop/blockstates/peacock_block.json 68c6e0c2be7ecba116910e7406d55a4d8cbecaf1 assets/azraeinworkshop/blockstates/peacock_ore.json 29c9d139bb50d9c44c9edd443f76850ce1ea7a5e assets/azraeinworkshop/blockstates/raw_fire_metal_block.json -c62154eb29b1e974825169593128635c3a6c9565 assets/azraeinworkshop/blockstates/raw_peacock_block.json 5788accb4ce979fad83c120a191f32da989a5ff7 assets/azraeinworkshop/blockstates/smashing_rock.json b42711ecdc0af79da24213615e24f520804067fa assets/azraeinworkshop/models/block/deepslate_fire_metal_ore.json 0968347ff76151f377b59a4a1b83c767733ecacb assets/azraeinworkshop/models/block/deepslate_peacock_ore.json @@ -15,7 +14,6 @@ b42711ecdc0af79da24213615e24f520804067fa assets/azraeinworkshop/models/block/dee 2e7e738a7e5a63ad99213754a12d5edd09a259b2 assets/azraeinworkshop/models/block/peacock_block.json 9266b0c8a63ce8ca42acbf2120700afcd662496f assets/azraeinworkshop/models/block/peacock_ore.json cf8d96c6375b7dd7193add22b8c31c1fe639b53e assets/azraeinworkshop/models/block/raw_fire_metal_block.json -8a6e7bcd3ae5fec9c3b02572c75add493213f4a4 assets/azraeinworkshop/models/block/raw_peacock_block.json 019cfc8d23bf03cfd6c2f252b348fe21c192e87d assets/azraeinworkshop/models/block/smashing_rock.json a67d2fe0183c178d0d15c51c11e2a58b79934187 assets/azraeinworkshop/models/block/smashing_rock_top.json 4f5f2a26c52af22621938175996547d2e72a246c assets/azraeinworkshop/models/item/deepslate_fire_metal_ore.json @@ -25,5 +23,4 @@ a67d2fe0183c178d0d15c51c11e2a58b79934187 assets/azraeinworkshop/models/block/sma 97ebb08baee1f7e0850553b49b7d7cf7e30ffa8c assets/azraeinworkshop/models/item/peacock_block.json eb843e1446e7849e131c99d43410b9921e685796 assets/azraeinworkshop/models/item/peacock_ore.json 2d6a9bb6f31bf312becd024e60ee009c2fd0b47f assets/azraeinworkshop/models/item/raw_fire_metal_block.json -6dd70c2e295155e463e89d6e15450382b33542aa assets/azraeinworkshop/models/item/raw_peacock_block.json afe7e9a7e885992f1e0689a51c3c08f5a4fbd99a assets/azraeinworkshop/models/item/smashing_rock.json diff --git a/src/generated/resources/assets/azraeinworkshop/blockstates/raw_peacock_block.json b/src/generated/resources/assets/azraeinworkshop/blockstates/raw_peacock_block.json deleted file mode 100644 index 3a44067..0000000 --- a/src/generated/resources/assets/azraeinworkshop/blockstates/raw_peacock_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "azraeinworkshop:block/raw_peacock_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/azraeinworkshop/models/block/raw_peacock_block.json b/src/generated/resources/assets/azraeinworkshop/models/block/raw_peacock_block.json deleted file mode 100644 index c00c609..0000000 --- a/src/generated/resources/assets/azraeinworkshop/models/block/raw_peacock_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "azraeinworkshop:block/raw_peacock_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/azraeinworkshop/models/item/diamond_hammer.json b/src/generated/resources/assets/azraeinworkshop/models/item/diamond_hammer.json new file mode 100644 index 0000000..6fea6a4 --- /dev/null +++ b/src/generated/resources/assets/azraeinworkshop/models/item/diamond_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "azraeinworkshop:item/diamond_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/azraeinworkshop/models/item/fire_metal_hammer.json b/src/generated/resources/assets/azraeinworkshop/models/item/fire_metal_hammer.json new file mode 100644 index 0000000..cc4395a --- /dev/null +++ b/src/generated/resources/assets/azraeinworkshop/models/item/fire_metal_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "azraeinworkshop:item/fire_metal_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/azraeinworkshop/models/item/iron_hammer.json b/src/generated/resources/assets/azraeinworkshop/models/item/iron_hammer.json new file mode 100644 index 0000000..767bfee --- /dev/null +++ b/src/generated/resources/assets/azraeinworkshop/models/item/iron_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "azraeinworkshop:item/iron_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_block.json b/src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_block.json deleted file mode 100644 index 63d227d..0000000 --- a/src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "azraeinworkshop:block/raw_peacock_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_chunk.json b/src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_chunk.json deleted file mode 100644 index 655515c..0000000 --- a/src/generated/resources/assets/azraeinworkshop/models/item/raw_peacock_chunk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "azraeinworkshop:item/raw_peacock_chunk" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_peacock_chunk.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/diamond_hammer.json similarity index 65% rename from src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_peacock_chunk.json rename to src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/diamond_hammer.json index e4b3d2c..76dc4c3 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_peacock_chunk.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/diamond_hammer.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_raw_peacock_block": { + "has_diamond": { "conditions": { "items": [ { - "items": "azraeinworkshop:raw_peacock_block" + "items": "minecraft:diamond" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "azraeinworkshop:raw_peacock_chunk" + "recipe": "azraeinworkshop:diamond_hammer" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_raw_peacock_block" + "has_diamond" ] ], "rewards": { "recipes": [ - "azraeinworkshop:raw_peacock_chunk" + "azraeinworkshop:diamond_hammer" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_block.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_block.json index 658bcb6..e19a292 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_block.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_block.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_prideland_ingot": { + "has_fire_metal_ingot": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_prideland_ingot" + "has_fire_metal_ingot" ] ], "rewards": { diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/prideland_block_to_ingots.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_block_to_ingots.json similarity index 81% rename from src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/prideland_block_to_ingots.json rename to src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_block_to_ingots.json index 68b449f..212fd2f 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/prideland_block_to_ingots.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_block_to_ingots.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "azraeinworkshop:prideland_block_to_ingots" + "recipe": "azraeinworkshop:fire_metal_block_to_ingots" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "azraeinworkshop:prideland_block_to_ingots" + "azraeinworkshop:fire_metal_block_to_ingots" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_peacock_block.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_hammer.json similarity index 65% rename from src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_peacock_block.json rename to src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_hammer.json index 6af88eb..dbcf64b 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_peacock_block.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_hammer.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_raw_peacock_chunk": { + "has_fire_metal_ingot": { "conditions": { "items": [ { - "items": "azraeinworkshop:raw_peacock_chunk" + "items": "azraeinworkshop:fire_metal_ingot" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "azraeinworkshop:raw_peacock_block" + "recipe": "azraeinworkshop:fire_metal_hammer" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_raw_peacock_chunk" + "has_fire_metal_ingot" ] ], "rewards": { "recipes": [ - "azraeinworkshop:raw_peacock_block" + "azraeinworkshop:fire_metal_hammer" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot.json index 9c1cba6..7d798ad 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_ingot.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_prideland_ingot": { + "has_fire_metal_ingot": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_prideland_ingot" + "has_fire_metal_ingot" ] ], "rewards": { diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_smelting_raw_peacock_chunk.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_knife.json similarity index 60% rename from src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_smelting_raw_peacock_chunk.json rename to src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_knife.json index b43ba5e..53c1cd1 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_smelting_raw_peacock_chunk.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_knife.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_raw_peacock_chunk": { + "has_material_item_stick": { "conditions": { "items": [ { - "items": "azraeinworkshop:raw_peacock_chunk" + "items": "minecraft:stick" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "azraeinworkshop:peacock_gem_from_smelting_raw_peacock_chunk" + "recipe": "azraeinworkshop:fire_metal_knife" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_raw_peacock_chunk" + "has_material_item_stick" ] ], "rewards": { "recipes": [ - "azraeinworkshop:peacock_gem_from_smelting_raw_peacock_chunk" + "azraeinworkshop:fire_metal_knife" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_nugget.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_nugget.json index b1cc566..4071caf 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_nugget.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/fire_metal_nugget.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_prideland_ingot": { + "has_fire_metal_ingot": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_prideland_ingot" + "has_fire_metal_ingot" ] ], "rewards": { diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/iron_hammer.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/iron_hammer.json new file mode 100644 index 0000000..d4e3ce9 --- /dev/null +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/iron_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:iron_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "azraeinworkshop:iron_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_iron_ingot" + ] + ], + "rewards": { + "recipes": [ + "azraeinworkshop:iron_hammer" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_blasting_raw_peacock_chunk.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_blasting_raw_peacock_chunk.json deleted file mode 100644 index 563705e..0000000 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/peacock_gem_from_blasting_raw_peacock_chunk.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_raw_peacock_chunk": { - "conditions": { - "items": [ - { - "items": "azraeinworkshop:raw_peacock_chunk" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "azraeinworkshop:peacock_gem_from_blasting_raw_peacock_chunk" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_raw_peacock_chunk" - ] - ], - "rewards": { - "recipes": [ - "azraeinworkshop:peacock_gem_from_blasting_raw_peacock_chunk" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_block.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_block.json index 2d53673..ac2a48d 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_block.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_block.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_raw_prideland_chunk": { + "has_raw_fire_metal_chunk": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_raw_prideland_chunk" + "has_raw_fire_metal_chunk" ] ], "rewards": { diff --git a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_chunk.json b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_chunk.json index 9747a2f..35bb84d 100644 --- a/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_chunk.json +++ b/src/generated/resources/data/azraeinworkshop/advancement/recipes/misc/raw_fire_metal_chunk.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_raw_prideland_block": { + "has_raw_fire_metal_block": { "conditions": { "items": [ { @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_raw_prideland_block" + "has_raw_fire_metal_block" ] ], "rewards": { diff --git a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_fire_metal_ore.json b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_fire_metal_ore.json index 249a8a8..72bd3f6 100644 --- a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_fire_metal_ore.json +++ b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_fire_metal_ore.json @@ -36,7 +36,7 @@ "count": { "type": "minecraft:uniform", "max": 4.0, - "min": 2.0 + "min": 1.0 }, "function": "minecraft:set_count" }, diff --git a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_peacock_ore.json b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_peacock_ore.json index cc21cbf..95ee375 100644 --- a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_peacock_ore.json +++ b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/deepslate_peacock_ore.json @@ -35,8 +35,8 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 + "max": 2.0, + "min": 1.0 }, "function": "minecraft:set_count" }, @@ -49,7 +49,7 @@ "function": "minecraft:explosion_decay" } ], - "name": "azraeinworkshop:raw_peacock_chunk" + "name": "azraeinworkshop:peacock_gem" } ] } diff --git a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/fire_metal_ore.json b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/fire_metal_ore.json index 75d6c24..b9b1ba2 100644 --- a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/fire_metal_ore.json +++ b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/fire_metal_ore.json @@ -31,6 +31,15 @@ { "type": "minecraft:item", "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, { "enchantment": "minecraft:fortune", "formula": "minecraft:ore_drops", diff --git a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/peacock_ore.json b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/peacock_ore.json index 443b86f..9a6b5bb 100644 --- a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/peacock_ore.json +++ b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/peacock_ore.json @@ -31,6 +31,15 @@ { "type": "minecraft:item", "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, { "enchantment": "minecraft:fortune", "formula": "minecraft:ore_drops", @@ -40,7 +49,7 @@ "function": "minecraft:explosion_decay" } ], - "name": "azraeinworkshop:raw_peacock_chunk" + "name": "azraeinworkshop:peacock_gem" } ] } diff --git a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/raw_peacock_block.json b/src/generated/resources/data/azraeinworkshop/loot_table/blocks/raw_peacock_block.json deleted file mode 100644 index 831c5c1..0000000 --- a/src/generated/resources/data/azraeinworkshop/loot_table/blocks/raw_peacock_block.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "azraeinworkshop:raw_peacock_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "azraeinworkshop:blocks/raw_peacock_block" -} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/diamond_hammer.json b/src/generated/resources/data/azraeinworkshop/recipe/diamond_hammer.json new file mode 100644 index 0000000..b914f7b --- /dev/null +++ b/src/generated/resources/data/azraeinworkshop/recipe/diamond_hammer.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:diamond_block" + }, + "I": { + "item": "minecraft:diamond" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "BIB", + "BSB", + " S " + ], + "result": { + "count": 1, + "id": "azraeinworkshop:diamond_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/prideland_block_to_ingots.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_block_to_ingots.json similarity index 100% rename from src/generated/resources/data/azraeinworkshop/recipe/prideland_block_to_ingots.json rename to src/generated/resources/data/azraeinworkshop/recipe/fire_metal_block_to_ingots.json diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_hammer.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_hammer.json new file mode 100644 index 0000000..81aff65 --- /dev/null +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_hammer.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "azraeinworkshop:fire_metal_block" + }, + "I": { + "item": "azraeinworkshop:fire_metal_ingot" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "BIB", + "BSB", + " S " + ], + "result": { + "count": 1, + "id": "azraeinworkshop:fire_metal_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_deepslate_fire_metal_ore.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_deepslate_fire_metal_ore.json index 602b569..9ef96b9 100644 --- a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_deepslate_fire_metal_ore.json +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_deepslate_fire_metal_ore.json @@ -3,7 +3,7 @@ "category": "misc", "cookingtime": 100, "experience": 0.52, - "group": "prideland_ingot", + "group": "fire_metal_ingot", "ingredient": { "item": "azraeinworkshop:deepslate_fire_metal_ore" }, diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_fire_metal_ore.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_fire_metal_ore.json index 186defc..5beb9f7 100644 --- a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_fire_metal_ore.json +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_fire_metal_ore.json @@ -3,7 +3,7 @@ "category": "misc", "cookingtime": 100, "experience": 0.52, - "group": "prideland_ingot", + "group": "fire_metal_ingot", "ingredient": { "item": "azraeinworkshop:fire_metal_ore" }, diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_raw_fire_metal_chunk.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_raw_fire_metal_chunk.json index 4dfb037..58802f9 100644 --- a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_raw_fire_metal_chunk.json +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_blasting_raw_fire_metal_chunk.json @@ -3,7 +3,7 @@ "category": "misc", "cookingtime": 100, "experience": 0.52, - "group": "prideland_ingot", + "group": "fire_metal_ingot", "ingredient": { "item": "azraeinworkshop:raw_fire_metal_chunk" }, diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_deepslate_fire_metal_ore.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_deepslate_fire_metal_ore.json index bd6550d..9048c39 100644 --- a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_deepslate_fire_metal_ore.json +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_deepslate_fire_metal_ore.json @@ -3,7 +3,7 @@ "category": "misc", "cookingtime": 150, "experience": 0.52, - "group": "prideland_ingot", + "group": "fire_metal_ingot", "ingredient": { "item": "azraeinworkshop:deepslate_fire_metal_ore" }, diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_fire_metal_ore.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_fire_metal_ore.json index 55f3fda..e0fc66f 100644 --- a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_fire_metal_ore.json +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_fire_metal_ore.json @@ -3,7 +3,7 @@ "category": "misc", "cookingtime": 150, "experience": 0.52, - "group": "prideland_ingot", + "group": "fire_metal_ingot", "ingredient": { "item": "azraeinworkshop:fire_metal_ore" }, diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_raw_fire_metal_chunk.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_raw_fire_metal_chunk.json index b575f8a..60ced5d 100644 --- a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_raw_fire_metal_chunk.json +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_ingot_from_smelting_raw_fire_metal_chunk.json @@ -3,7 +3,7 @@ "category": "misc", "cookingtime": 150, "experience": 0.52, - "group": "prideland_ingot", + "group": "fire_metal_ingot", "ingredient": { "item": "azraeinworkshop:raw_fire_metal_chunk" }, diff --git a/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_knife.json b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_knife.json new file mode 100644 index 0000000..4c691d5 --- /dev/null +++ b/src/generated/resources/data/azraeinworkshop/recipe/fire_metal_knife.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "item": "azraeinworkshop:fire_metal_ingot" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "MM ", + "MS ", + " S" + ], + "result": { + "count": 1, + "id": "azraeinworkshop:fire_metal_knife" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/iron_hammer.json b/src/generated/resources/data/azraeinworkshop/recipe/iron_hammer.json new file mode 100644 index 0000000..b8730b3 --- /dev/null +++ b/src/generated/resources/data/azraeinworkshop/recipe/iron_hammer.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "minecraft:iron_block" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "BIB", + "BSB", + " S " + ], + "result": { + "count": 1, + "id": "azraeinworkshop:iron_hammer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_blasting_raw_peacock_chunk.json b/src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_blasting_raw_peacock_chunk.json deleted file mode 100644 index 86d2925..0000000 --- a/src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_blasting_raw_peacock_chunk.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:blasting", - "category": "misc", - "cookingtime": 100, - "experience": 0.25, - "group": "peacock_gem", - "ingredient": { - "item": "azraeinworkshop:raw_peacock_chunk" - }, - "result": { - "count": 1, - "id": "azraeinworkshop:peacock_gem" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_smelting_raw_peacock_chunk.json b/src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_smelting_raw_peacock_chunk.json deleted file mode 100644 index de852e1..0000000 --- a/src/generated/resources/data/azraeinworkshop/recipe/peacock_gem_from_smelting_raw_peacock_chunk.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "misc", - "cookingtime": 200, - "experience": 0.25, - "group": "peacock_gem", - "ingredient": { - "item": "azraeinworkshop:raw_peacock_chunk" - }, - "result": { - "count": 1, - "id": "azraeinworkshop:peacock_gem" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_block.json b/src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_block.json deleted file mode 100644 index 12496a0..0000000 --- a/src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_block.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "P": { - "item": "azraeinworkshop:raw_peacock_chunk" - } - }, - "pattern": [ - "PPP", - "PPP", - "PPP" - ], - "result": { - "count": 1, - "id": "azraeinworkshop:raw_peacock_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_chunk.json b/src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_chunk.json deleted file mode 100644 index d82b83d..0000000 --- a/src/generated/resources/data/azraeinworkshop/recipe/raw_peacock_chunk.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "azraeinworkshop:raw_peacock_block" - } - ], - "result": { - "count": 9, - "id": "azraeinworkshop:raw_peacock_chunk" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/azraeinworkshop/recipe/xyloth_staff.json b/src/generated/resources/data/azraeinworkshop/recipe/xyloth_staff.json index 9f49f48..c4c7dcd 100644 --- a/src/generated/resources/data/azraeinworkshop/recipe/xyloth_staff.json +++ b/src/generated/resources/data/azraeinworkshop/recipe/xyloth_staff.json @@ -5,6 +5,9 @@ "B": { "item": "azraeinworkshop:baked_gourd" }, + "F": { + "item": "minecraft:flint" + }, "S": { "item": "minecraft:string" }, @@ -13,9 +16,9 @@ } }, "pattern": [ - "SB ", - "BT ", - " T" + "FST", + " TS", + "T B" ], "result": { "count": 1, diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index 236b2ae..a175d40 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -4,7 +4,6 @@ "azraeinworkshop:deepslate_peacock_ore", "azraeinworkshop:peacock_block", "azraeinworkshop:peacock_ore", - "azraeinworkshop:raw_peacock_block", "azraeinworkshop:deepslate_fire_metal_ore", "azraeinworkshop:fire_metal_ore", "azraeinworkshop:raw_fire_metal_block", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index a8cd4d9..fae044e 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -2,7 +2,6 @@ "values": [ "azraeinworkshop:deepslate_peacock_ore", "azraeinworkshop:peacock_block", - "azraeinworkshop:peacock_ore", - "azraeinworkshop:raw_peacock_block" + "azraeinworkshop:peacock_ore" ] } \ No newline at end of file diff --git a/src/main/java/io/azraein/azraeinworkshop/block/ModBlocks.java b/src/main/java/io/azraein/azraeinworkshop/block/ModBlocks.java index c1b3017..1d6c178 100644 --- a/src/main/java/io/azraein/azraeinworkshop/block/ModBlocks.java +++ b/src/main/java/io/azraein/azraeinworkshop/block/ModBlocks.java @@ -52,11 +52,6 @@ public class ModBlocks { BlockBehaviour.Properties.of().strength(2f).requiresCorrectToolForDrops() .sound(SoundType.STONE))); - public static final DeferredBlock RAW_PEACOCK_BLOCK = registerBlock("raw_peacock_block", - () -> new Block( - BlockBehaviour.Properties.of().strength(2f).requiresCorrectToolForDrops() - .sound(SoundType.STONE))); - public static final DeferredBlock SMASHING_ROCK = registerBlock("smashing_rock", () -> new SmashingRockBlock( BlockBehaviour.Properties.of().strength(2f).requiresCorrectToolForDrops() diff --git a/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockLootTableProvider.java b/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockLootTableProvider.java index 2d9c137..e1417fc 100644 --- a/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockLootTableProvider.java +++ b/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockLootTableProvider.java @@ -30,18 +30,18 @@ protected ModBlockLootTableProvider(Provider registries) { @Override protected void generate() { dropSelf(ModBlocks.PEACOCK_BLOCK.get()); - dropSelf(ModBlocks.RAW_PEACOCK_BLOCK.get()); dropSelf(ModBlocks.FIRE_METAL_BLOCK.get()); dropSelf(ModBlocks.RAW_FIRE_METAL_BLOCK.get()); dropSelf(ModBlocks.SMASHING_ROCK.get()); add(ModBlocks.SMASHING_ROCK.get(), block -> createSlabItemTable(ModBlocks.SMASHING_ROCK.get())); - addOreDrop(ModBlocks.PEACOCK_ORE.get(), ModItems.RAW_PEACOCK_CHUNK.get()); - addMultiOreDrop(ModBlocks.DEEPSLATE_PEACOCK_ORE.get(), ModItems.RAW_PEACOCK_CHUNK.get(), 2, 4); + addMultiOreDrop(ModBlocks.PEACOCK_ORE.get(), ModItems.PEACOCK_GEM.get(), 1, 2); + addMultiOreDrop(ModBlocks.DEEPSLATE_PEACOCK_ORE.get(), ModItems.PEACOCK_GEM.get(), 1, 2); - addOreDrop(ModBlocks.FIRE_METAL_ORE.get(), ModItems.RAW_FIRE_METAL_CHUNK.get()); - addMultiOreDrop(ModBlocks.DEEPSLATE_FIRE_METAL_ORE.get(), ModItems.RAW_FIRE_METAL_CHUNK.get(), 2, 4); + + addMultiOreDrop(ModBlocks.FIRE_METAL_ORE.get(), ModItems.RAW_FIRE_METAL_CHUNK.get(), 1, 4); + addMultiOreDrop(ModBlocks.DEEPSLATE_FIRE_METAL_ORE.get(), ModItems.RAW_FIRE_METAL_CHUNK.get(), 1, 4); } diff --git a/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockStateProvider.java b/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockStateProvider.java index 1a81f45..f08b850 100644 --- a/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockStateProvider.java +++ b/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockStateProvider.java @@ -23,7 +23,6 @@ protected void registerStatesAndModels() { blockWithItem(ModBlocks.FIRE_METAL_ORE); blockWithItem(ModBlocks.PEACOCK_BLOCK); - blockWithItem(ModBlocks.RAW_PEACOCK_BLOCK); blockWithItem(ModBlocks.FIRE_METAL_BLOCK); blockWithItem(ModBlocks.RAW_FIRE_METAL_BLOCK); diff --git a/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockTagProvider.java b/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockTagProvider.java index 501314a..f092684 100644 --- a/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockTagProvider.java +++ b/src/main/java/io/azraein/azraeinworkshop/datagen/ModBlockTagProvider.java @@ -27,7 +27,6 @@ protected void addTags(Provider provider) { .add(ModBlocks.DEEPSLATE_PEACOCK_ORE.get()) .add(ModBlocks.PEACOCK_BLOCK.get()) .add(ModBlocks.PEACOCK_ORE.get()) - .add(ModBlocks.RAW_PEACOCK_BLOCK.get()) .add(ModBlocks.DEEPSLATE_FIRE_METAL_ORE.get()) .add(ModBlocks.FIRE_METAL_ORE.get()) .add(ModBlocks.RAW_FIRE_METAL_BLOCK.get()) @@ -42,8 +41,7 @@ protected void addTags(Provider provider) { tag(BlockTags.NEEDS_IRON_TOOL) .add(ModBlocks.DEEPSLATE_PEACOCK_ORE.get()) .add(ModBlocks.PEACOCK_BLOCK.get()) - .add(ModBlocks.PEACOCK_ORE.get()) - .add(ModBlocks.RAW_PEACOCK_BLOCK.get()); + .add(ModBlocks.PEACOCK_ORE.get()); tag(ModTags.Blocks.NEEDS_FIRE_METAL_TOOL).addTag(BlockTags.NEEDS_IRON_TOOL); tag(ModTags.Blocks.INCORRECT_FOR_FIRE_METAL_TOOL).addTag(BlockTags.INCORRECT_FOR_IRON_TOOL) diff --git a/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemModelProvider.java b/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemModelProvider.java index aba6bc8..9b583e9 100644 --- a/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemModelProvider.java +++ b/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemModelProvider.java @@ -1,11 +1,19 @@ package io.azraein.azraeinworkshop.datagen; +import java.util.LinkedHashMap; + import io.azraein.azraeinworkshop.AzraeinWorkshop; import io.azraein.azraeinworkshop.item.ModItems; import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.PackType; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.armortrim.TrimMaterial; +import net.minecraft.world.item.armortrim.TrimMaterials; import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; import net.neoforged.neoforge.client.model.generators.ItemModelProvider; +import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.registries.DeferredItem; @@ -15,6 +23,21 @@ public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHe super(output, AzraeinWorkshop.MOD_ID, existingFileHelper); } + private static LinkedHashMap, Float> trimMaterials = new LinkedHashMap<>(); + + static { + trimMaterials.put(TrimMaterials.QUARTZ, 0.1f); + trimMaterials.put(TrimMaterials.IRON, 0.2f); + trimMaterials.put(TrimMaterials.NETHERITE, 0.3f); + trimMaterials.put(TrimMaterials.REDSTONE, 0.4f); + trimMaterials.put(TrimMaterials.COPPER, 0.5f); + trimMaterials.put(TrimMaterials.GOLD, 0.6f); + trimMaterials.put(TrimMaterials.EMERALD, 0.7f); + trimMaterials.put(TrimMaterials.DIAMOND, 0.8f); + trimMaterials.put(TrimMaterials.LAPIS, 0.9f); + trimMaterials.put(TrimMaterials.AMETHYST, 1.0f); + } + @Override protected void registerModels() { basicItem(ModItems.BAKED_GOURD.get()); @@ -35,9 +58,18 @@ protected void registerModels() { handheldItem(ModItems.FIRE_METAL_SHOVEL); handheldItem(ModItems.FIRE_METAL_AXE); handheldItem(ModItems.FIRE_METAL_HOE); + handheldItem(ModItems.FIRE_METAL_HAMMER); + + handheldItem(ModItems.IRON_HAMMER); + handheldItem(ModItems.DIAMOND_HAMMER); handheldItem(ModItems.XYLOTH_STAFF); + trimmedArmorItem(ModItems.FIRE_METAL_HELMET); + trimmedArmorItem(ModItems.FIRE_METAL_CHESTPLATE); + trimmedArmorItem(ModItems.FIRE_METAL_LEGGINGS); + trimmedArmorItem(ModItems.FIRE_METAL_BOOTS); + basicItem(ModItems.BLUE_FEATHER.get()); basicItem(ModItems.GREEN_FEATHER.get()); basicItem(ModItems.RED_FEATHER.get()); @@ -50,7 +82,6 @@ protected void registerModels() { basicItem(ModItems.RAW_FIRE_METAL_CHUNK.get()); basicItem(ModItems.FIRE_METAL_NUGGET.get()); - basicItem(ModItems.RAW_PEACOCK_CHUNK.get()); basicItem(ModItems.PEACOCK_GEM.get()); basicItem(ModItems.ZEBRA_HIDE.get()); @@ -59,6 +90,53 @@ protected void registerModels() { } + private void trimmedArmorItem(DeferredItem itemDeferredItem) { + final String MOD_ID = AzraeinWorkshop.MOD_ID; + + if (itemDeferredItem.get() instanceof ArmorItem armorItem) { + trimMaterials.forEach((trimMaterial, value) -> { + float trimValue = value; + + String armorType = switch (armorItem.getEquipmentSlot()) { + case HEAD -> "helmet"; + case CHEST -> "chestplate"; + case LEGS -> "leggings"; + case FEET -> "boots"; + default -> ""; + }; + + String armorItemPath = armorItem.toString(); + String trimPath = "trims/items/" + armorType + "_trim_" + trimMaterial.location().getPath(); + String currentTrimName = armorItemPath + "_" + trimMaterial.location().getPath() + "_trim"; + ResourceLocation armorItemResLoc = ResourceLocation.parse(armorItemPath); + ResourceLocation trimResLoc = ResourceLocation.parse(trimPath); // minecraft namespace + ResourceLocation trimNameResLoc = ResourceLocation.parse(currentTrimName); + + // This is used for making the ExistingFileHelper acknowledge that this texture + // exist, so this will + // avoid an IllegalArgumentException + existingFileHelper.trackGenerated(trimResLoc, PackType.CLIENT_RESOURCES, ".png", "textures"); + + // Trimmed armorItem files + getBuilder(currentTrimName) + .parent(new ModelFile.UncheckedModelFile("item/generated")) + .texture("layer0", armorItemResLoc.getNamespace() + ":item/" + armorItemResLoc.getPath()) + .texture("layer1", trimResLoc); + + // Non-trimmed armorItem file (normal variant) + this.withExistingParent(itemDeferredItem.getId().getPath(), + mcLoc("item/generated")) + .override() + .model(new ModelFile.UncheckedModelFile( + trimNameResLoc.getNamespace() + ":item/" + trimNameResLoc.getPath())) + .predicate(mcLoc("trim_type"), trimValue).end() + .texture("layer0", + ResourceLocation.fromNamespaceAndPath(MOD_ID, + "item/" + itemDeferredItem.getId().getPath())); + }); + } + } + private ItemModelBuilder handheldItem(DeferredItem item) { return withExistingParent(item.getId().getPath(), ResourceLocation.parse("item/handheld")).texture("layer0", ResourceLocation.fromNamespaceAndPath(AzraeinWorkshop.MOD_ID, "item/" + item.getId().getPath())); diff --git a/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemTagProvider.java b/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemTagProvider.java index 09d05ca..947f757 100644 --- a/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemTagProvider.java +++ b/src/main/java/io/azraein/azraeinworkshop/datagen/ModItemTagProvider.java @@ -32,7 +32,10 @@ protected void addTags(Provider provider) { tag(ItemTags.SHOVELS).add(ModItems.FIRE_METAL_SHOVEL.get()); tag(ItemTags.HOES).add(ModItems.FIRE_METAL_HOE.get()); - // Lion King Tags + tag(ItemTags.TRIMMABLE_ARMOR).add(ModItems.FIRE_METAL_HELMET.get(), ModItems.FIRE_METAL_CHESTPLATE.get(), + ModItems.FIRE_METAL_LEGGINGS.get(), ModItems.FIRE_METAL_BOOTS.get()); + + // Azraein's Workshop Tags tag(ModTags.Items.SMASHABLE_GOURD) .add(ModItems.GOURD.get()); diff --git a/src/main/java/io/azraein/azraeinworkshop/datagen/ModRecipeProvider.java b/src/main/java/io/azraein/azraeinworkshop/datagen/ModRecipeProvider.java index f019b57..3b0d5e7 100644 --- a/src/main/java/io/azraein/azraeinworkshop/datagen/ModRecipeProvider.java +++ b/src/main/java/io/azraein/azraeinworkshop/datagen/ModRecipeProvider.java @@ -6,6 +6,7 @@ import io.azraein.azraeinworkshop.AzraeinWorkshop; import io.azraein.azraeinworkshop.block.ModBlocks; import io.azraein.azraeinworkshop.item.ModItems; +import io.azraein.azraeinworkshop.item.types.HammerItem; import net.minecraft.core.HolderLookup.Provider; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; @@ -22,8 +23,7 @@ public class ModRecipeProvider extends RecipeProvider implements IConditionBuilder { - List PEACOCK_GEM_SMELTABLES = List.of(ModItems.RAW_PEACOCK_CHUNK, - ModBlocks.PEACOCK_ORE, ModBlocks.DEEPSLATE_PEACOCK_ORE); + List PEACOCK_GEM_SMELTABLES = List.of(ModBlocks.PEACOCK_ORE, ModBlocks.DEEPSLATE_PEACOCK_ORE); List FIRE_METAL_INGOT_SMETABLES = List.of(ModItems.RAW_FIRE_METAL_CHUNK, ModBlocks.DEEPSLATE_FIRE_METAL_ORE, ModBlocks.FIRE_METAL_ORE); @@ -47,10 +47,11 @@ protected void buildRecipes(RecipeOutput recipeOutput) { .save(recipeOutput); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.XYLOTH_STAFF.get()) - .pattern("SB ") - .pattern("BT ") - .pattern(" T") + .pattern("FST") + .pattern(" TS") + .pattern("T B") .define('B', ModItems.BAKED_GOURD) + .define('F', Items.FLINT) .define('S', Items.STRING) .define('T', Items.STICK) .unlockedBy("has_baked_gourd", has(ModItems.BAKED_GOURD)) @@ -82,20 +83,12 @@ protected void buildRecipes(RecipeOutput recipeOutput) { .unlockedBy("has_raw_fire_metal_block", has(ModBlocks.RAW_FIRE_METAL_BLOCK)) .save(recipeOutput); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.RAW_PEACOCK_CHUNK.get(), 9) - .requires(ModBlocks.RAW_PEACOCK_BLOCK) - .unlockedBy("has_raw_peacock_block", has(ModBlocks.RAW_PEACOCK_BLOCK)) - .save(recipeOutput); - fullBlockRecipe(recipeOutput, ModBlocks.PEACOCK_BLOCK, Ingredient.of(ModItems.PEACOCK_GEM), "has_peacock_gem", ModItems.PEACOCK_GEM.get()); fullBlockRecipe(recipeOutput, ModBlocks.FIRE_METAL_BLOCK, Ingredient.of(ModItems.FIRE_METAL_INGOT), "has_fire_metal_ingot", ModItems.FIRE_METAL_INGOT.get()); - fullBlockRecipe(recipeOutput, ModBlocks.RAW_PEACOCK_BLOCK, Ingredient.of(ModItems.RAW_PEACOCK_CHUNK), - "has_raw_peacock_chunk", ModItems.RAW_PEACOCK_CHUNK.get()); - fullBlockRecipe(recipeOutput, ModItems.FIRE_METAL_INGOT, Ingredient.of(ModItems.FIRE_METAL_NUGGET), "has_fire_metal_ingot", ModItems.FIRE_METAL_INGOT.get()); @@ -134,6 +127,15 @@ protected void buildRecipes(RecipeOutput recipeOutput) { pickaxeRecipe(ModItems.FIRE_METAL_PICKAXE, ModItems.FIRE_METAL_INGOT, recipeOutput); axeRecipe(ModItems.FIRE_METAL_AXE, ModItems.FIRE_METAL_INGOT, recipeOutput); hoeRecipe(ModItems.FIRE_METAL_HOE, ModItems.FIRE_METAL_INGOT, recipeOutput); + hammerRecipe(ModItems.FIRE_METAL_HAMMER, ModBlocks.FIRE_METAL_BLOCK.get(), + ModItems.FIRE_METAL_INGOT.get(), "has_fire_metal_ingot", + ModItems.FIRE_METAL_INGOT.get(), recipeOutput); + + hammerRecipe(ModItems.DIAMOND_HAMMER, Blocks.DIAMOND_BLOCK, Items.DIAMOND, "has_diamond", Items.DIAMOND, + recipeOutput); + + hammerRecipe(ModItems.IRON_HAMMER, Blocks.IRON_BLOCK, Items.IRON_INGOT, "has_iron_ingot", + Items.IRON_INGOT, recipeOutput); } protected static void fullBlockRecipe(RecipeOutput recipeOutput, DeferredItem itemToCreate, @@ -158,6 +160,20 @@ protected static void fullBlockRecipe(RecipeOutput recipeOutput, DeferredBlock hammerToCreate, Block blockMaterial, + Item itemMaterial, + String unlockString, Item unlockItem, RecipeOutput recipeOutput) { + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, hammerToCreate.get()) + .pattern("BIB") + .pattern("BSB") + .pattern(" S ") + .define('B', blockMaterial) + .define('I', itemMaterial) + .define('S', Items.STICK) + .unlockedBy(unlockString, has(unlockItem)) + .save(recipeOutput); + } + protected static void knifeRecipe(DeferredItem itemToCreate, ItemLike materialItem, RecipeOutput recipeOutput) { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, itemToCreate.get()) diff --git a/src/main/java/io/azraein/azraeinworkshop/event/ModEvents.java b/src/main/java/io/azraein/azraeinworkshop/event/ModEvents.java new file mode 100644 index 0000000..e7e0ec6 --- /dev/null +++ b/src/main/java/io/azraein/azraeinworkshop/event/ModEvents.java @@ -0,0 +1,46 @@ +package io.azraein.azraeinworkshop.event; + +import java.util.HashSet; +import java.util.Set; + +import io.azraein.azraeinworkshop.AzraeinWorkshop; +import io.azraein.azraeinworkshop.item.types.HammerItem; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.level.BlockEvent.BreakEvent; + +@EventBusSubscriber(modid = AzraeinWorkshop.MOD_ID, bus = EventBusSubscriber.Bus.GAME) +public class ModEvents { + + public static final Set HARVESTED_BLOCKS = new HashSet<>(); + + @SubscribeEvent + public static void onHammerBlockBreak(BreakEvent event) { + Player player = event.getPlayer(); + ItemStack mainHandItem = player.getMainHandItem(); + + if (mainHandItem.getItem() instanceof HammerItem hammer && player instanceof ServerPlayer serverPlayer) { + BlockPos initialBlockPos = event.getPos(); + + if (HARVESTED_BLOCKS.contains(initialBlockPos)) + return; + + for (BlockPos pos : HammerItem.getBlocksToBeDestroyed(1, initialBlockPos, serverPlayer)) { + if (pos == initialBlockPos + || !hammer.isCorrectToolForDrops(mainHandItem, event.getLevel().getBlockState(pos))) + continue; + + HARVESTED_BLOCKS.add(pos); + serverPlayer.gameMode.destroyBlock(pos); + HARVESTED_BLOCKS.remove(pos); + } + + } + + } + +} diff --git a/src/main/java/io/azraein/azraeinworkshop/item/BakoraStaffItem.java b/src/main/java/io/azraein/azraeinworkshop/item/BakoraStaffItem.java deleted file mode 100644 index d29a9a6..0000000 --- a/src/main/java/io/azraein/azraeinworkshop/item/BakoraStaffItem.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.azraein.azraeinworkshop.item; - -import net.minecraft.world.item.Item; - -public class BakoraStaffItem extends Item { - - // Allows the user to enact rituals - - public BakoraStaffItem() { - super(new Properties().durability(256)); - } - -} diff --git a/src/main/java/io/azraein/azraeinworkshop/item/ModCreativeModeTabs.java b/src/main/java/io/azraein/azraeinworkshop/item/ModCreativeModeTabs.java index f18b092..c532ba0 100644 --- a/src/main/java/io/azraein/azraeinworkshop/item/ModCreativeModeTabs.java +++ b/src/main/java/io/azraein/azraeinworkshop/item/ModCreativeModeTabs.java @@ -29,7 +29,6 @@ public class ModCreativeModeTabs { output.accept(ModItems.GREEN_FEATHER); output.accept(ModItems.PEACOCK_GEM); - output.accept(ModItems.RAW_PEACOCK_CHUNK); output.accept(ModItems.RAW_FIRE_METAL_CHUNK); output.accept(ModItems.FIRE_METAL_INGOT); output.accept(ModItems.FIRE_METAL_NUGGET); @@ -58,6 +57,15 @@ public class ModCreativeModeTabs { output.accept(ModItems.FIRE_METAL_SHOVEL); output.accept(ModItems.FIRE_METAL_PICKAXE); output.accept(ModItems.FIRE_METAL_HOE); + output.accept(ModItems.FIRE_METAL_HAMMER); + + output.accept(ModItems.FIRE_METAL_HELMET); + output.accept(ModItems.FIRE_METAL_CHESTPLATE); + output.accept(ModItems.FIRE_METAL_LEGGINGS); + output.accept(ModItems.FIRE_METAL_BOOTS); + + output.accept(ModItems.IRON_HAMMER); + output.accept(ModItems.DIAMOND_HAMMER); }) .build()); @@ -73,7 +81,6 @@ public class ModCreativeModeTabs { output.accept(ModBlocks.FIRE_METAL_ORE); output.accept(ModBlocks.DEEPSLATE_FIRE_METAL_ORE); - output.accept(ModBlocks.RAW_PEACOCK_BLOCK); output.accept(ModBlocks.PEACOCK_BLOCK); output.accept(ModBlocks.RAW_FIRE_METAL_BLOCK); output.accept(ModBlocks.FIRE_METAL_BLOCK); diff --git a/src/main/java/io/azraein/azraeinworkshop/item/ModItems.java b/src/main/java/io/azraein/azraeinworkshop/item/ModItems.java index 625365e..06fcf69 100644 --- a/src/main/java/io/azraein/azraeinworkshop/item/ModItems.java +++ b/src/main/java/io/azraein/azraeinworkshop/item/ModItems.java @@ -3,6 +3,14 @@ import java.util.function.Supplier; import io.azraein.azraeinworkshop.AzraeinWorkshop; +import io.azraein.azraeinworkshop.item.custom.WorkshopManualItem; +import io.azraein.azraeinworkshop.item.custom.XylothStaffItem; +import io.azraein.azraeinworkshop.item.tiers.ModArmorMaterials; +import io.azraein.azraeinworkshop.item.tiers.ModToolTiers; +import io.azraein.azraeinworkshop.item.types.HammerItem; +import io.azraein.azraeinworkshop.item.types.KnifeItem; +import io.azraein.azraeinworkshop.item.types.StaffItem; +import net.minecraft.core.Holder; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.*; import net.minecraft.world.item.Item.Properties; @@ -25,8 +33,8 @@ public class ModItems { public static final DeferredItem PURPLE_FEATHER = createGenericItem("purple_feather"); - public static final DeferredItem XYLOTH_STAFF = ITEMS.register("xyloth_staff", - () -> new BakoraStaffItem()); + public static final DeferredItem XYLOTH_STAFF = ITEMS.register("xyloth_staff", + () -> new XylothStaffItem()); public static final DeferredItem WORKSHOP_MANUAL = ITEMS.register("workshop_manual", () -> new WorkshopManualItem()); @@ -67,38 +75,61 @@ public class ModItems { () -> new KnifeItem(420)); // Tools - public static final DeferredItem FIRE_METAL_SWORD = ITEMS.register("fire_metal_sword", + public static final DeferredItem FIRE_METAL_SWORD = createCustomItem("fire_metal_sword", () -> new SwordItem(ModToolTiers.FIRE_METAL, new Item.Properties() .attributes(SwordItem.createAttributes(ModToolTiers.FIRE_METAL, 3, -2.4f)))); - public static final DeferredItem FIRE_METAL_PICKAXE = ITEMS.register("fire_metal_pickaxe", + public static final DeferredItem FIRE_METAL_PICKAXE = createCustomItem("fire_metal_pickaxe", () -> new PickaxeItem(ModToolTiers.FIRE_METAL, new Item.Properties() .attributes(PickaxeItem.createAttributes(ModToolTiers.FIRE_METAL, 1.0f, -2.8f)))); - public static final DeferredItem FIRE_METAL_SHOVEL = ITEMS.register("fire_metal_shovel", + public static final DeferredItem FIRE_METAL_SHOVEL = createCustomItem("fire_metal_shovel", () -> new ShovelItem(ModToolTiers.FIRE_METAL, new Item.Properties() - .attributes(ShovelItem.createAttributes(ModToolTiers.FIRE_METAL, 1.5f, -3.0f)))); + .attributes(ShovelItem.createAttributes(ModToolTiers.FIRE_METAL, 1.5f, + -3.0f)))); - public static final DeferredItem FIRE_METAL_AXE = ITEMS.register("fire_metal_axe", + public static final DeferredItem FIRE_METAL_AXE = createCustomItem("fire_metal_axe", () -> new AxeItem(ModToolTiers.FIRE_METAL, new Item.Properties() .attributes(AxeItem.createAttributes(ModToolTiers.FIRE_METAL, 5, -3.2f)))); - public static final DeferredItem FIRE_METAL_HOE = ITEMS.register("fire_metal_hoe", + public static final DeferredItem FIRE_METAL_HOE = createCustomItem("fire_metal_hoe", () -> new HoeItem(ModToolTiers.FIRE_METAL, new Item.Properties() .attributes(HoeItem.createAttributes(ModToolTiers.FIRE_METAL, 0f, -3.0f)))); + public static final DeferredItem FIRE_METAL_HAMMER = createCustomItem("fire_metal_hammer", + () -> new HammerItem(ModToolTiers.FIRE_METAL, + new Item.Properties().attributes( + HammerItem.createAttributes(ModToolTiers.FIRE_METAL, 7f, + -3.5f)))); + + public static final DeferredItem IRON_HAMMER = createCustomItem("iron_hammer", () -> new HammerItem( + Tiers.IRON, + new Item.Properties().attributes(HammerItem.createAttributes(Tiers.IRON, 6.2f, -3.8f)))); + + public static final DeferredItem DIAMOND_HAMMER = createCustomItem("diamond_hammer", + () -> new HammerItem(Tiers.DIAMOND, new Item.Properties() + .attributes(HammerItem.createAttributes(Tiers.DIAMOND, 8.9f, -3.0f)))); + // Music Discs - + // Armors + public static final DeferredItem FIRE_METAL_HELMET = createArmorItem("fire_metal_helmet", + ModArmorMaterials.FIRE_METAL_ARMOR_MATERIAL, ArmorItem.Type.HELMET, 16); + + public static final DeferredItem FIRE_METAL_CHESTPLATE = createArmorItem("fire_metal_chestplate", + ModArmorMaterials.FIRE_METAL_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE, 16); + + public static final DeferredItem FIRE_METAL_LEGGINGS = createArmorItem("fire_metal_leggings", + ModArmorMaterials.FIRE_METAL_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS, 16); + + public static final DeferredItem FIRE_METAL_BOOTS = createArmorItem("fire_metal_boots", + ModArmorMaterials.FIRE_METAL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, 16); // Mob Hides/Pelts public static final DeferredItem ZEBRA_HIDE = createGenericItem("zebra_hide"); - // Mob Horns - // Chunks, Ingots, Dusts, and Gems - public static final DeferredItem RAW_PEACOCK_CHUNK = createGenericItem("raw_peacock_chunk"); public static final DeferredItem PEACOCK_GEM = createGenericItem("peacock_gem"); public static final DeferredItem RAW_FIRE_METAL_CHUNK = createGenericItem("raw_fire_metal_chunk"); @@ -112,6 +143,15 @@ private static DeferredItem createMusicDiscItem(String itemId, Rarity rari .jukeboxPlayable(song))); } + private static DeferredItem createArmorItem(String itemId, Holder armorMaterial, + ArmorItem.Type armorType, int durabilityFactor) { + return (DeferredItem) createCustomItem(itemId, + () -> new ArmorItem(armorMaterial, armorType, + new Item.Properties() + .durability(armorType + .getDurability(durabilityFactor)))); + } + private static DeferredItem createGenericItem(String itemId) { return createGenericItem(itemId, new Properties()); } @@ -120,7 +160,7 @@ private static DeferredItem createGenericItem(String itemId, Item.Properti return ITEMS.register(itemId, () -> new Item(properties)); } - private static DeferredItem createCustomItem(String itemId, Supplier item) { + private static DeferredItem createCustomItem(String itemId, Supplier item) { return ITEMS.register(itemId, item); } diff --git a/src/main/java/io/azraein/azraeinworkshop/item/WorkshopManualItem.java b/src/main/java/io/azraein/azraeinworkshop/item/custom/WorkshopManualItem.java similarity index 97% rename from src/main/java/io/azraein/azraeinworkshop/item/WorkshopManualItem.java rename to src/main/java/io/azraein/azraeinworkshop/item/custom/WorkshopManualItem.java index 4a8faf7..deae15c 100644 --- a/src/main/java/io/azraein/azraeinworkshop/item/WorkshopManualItem.java +++ b/src/main/java/io/azraein/azraeinworkshop/item/custom/WorkshopManualItem.java @@ -1,4 +1,4 @@ -package io.azraein.azraeinworkshop.item; +package io.azraein.azraeinworkshop.item.custom; import java.util.List; diff --git a/src/main/java/io/azraein/azraeinworkshop/item/custom/XylothStaffItem.java b/src/main/java/io/azraein/azraeinworkshop/item/custom/XylothStaffItem.java new file mode 100644 index 0000000..bf080e0 --- /dev/null +++ b/src/main/java/io/azraein/azraeinworkshop/item/custom/XylothStaffItem.java @@ -0,0 +1,13 @@ +package io.azraein.azraeinworkshop.item.custom; + +import io.azraein.azraeinworkshop.item.types.StaffItem; + +public class XylothStaffItem extends StaffItem { + + // Allows the user to enact rituals + + public XylothStaffItem() { + super(new Properties().durability(256)); + } + +} diff --git a/src/main/java/io/azraein/azraeinworkshop/item/tiers/ModArmorMaterials.java b/src/main/java/io/azraein/azraeinworkshop/item/tiers/ModArmorMaterials.java new file mode 100644 index 0000000..96cc1e1 --- /dev/null +++ b/src/main/java/io/azraein/azraeinworkshop/item/tiers/ModArmorMaterials.java @@ -0,0 +1,45 @@ +package io.azraein.azraeinworkshop.item.tiers; + +import java.util.EnumMap; +import java.util.List; +import java.util.function.Supplier; + +import io.azraein.azraeinworkshop.AzraeinWorkshop; +import io.azraein.azraeinworkshop.item.ModItems; +import net.minecraft.Util; +import net.minecraft.core.Holder; +import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorItem.Type; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; + +public class ModArmorMaterials { + + public static final Holder FIRE_METAL_ARMOR_MATERIAL = register("fire_metal", + Util.make(new EnumMap<>(ArmorItem.Type.class), attribute -> { + attribute.put(Type.BOOTS, 5); + attribute.put(Type.LEGGINGS, 7); + attribute.put(Type.CHESTPLATE, 9); + attribute.put(Type.HELMET, 5); + attribute.put(Type.BODY, 11); + }), SoundEvents.ARMOR_EQUIP_IRON, 16, 2f, 0.3f, () -> ModItems.FIRE_METAL_INGOT.get()); + + private static Holder register(String name, EnumMap typeProtection, + Holder equipSound, int enchantability, float toughness, float knockbackResistance, + Supplier ingredientItem) { + ResourceLocation location = ResourceLocation.fromNamespaceAndPath(AzraeinWorkshop.MOD_ID, name); + Supplier ingredient = () -> Ingredient.of(ingredientItem.get()); + List layers = List.of(new ArmorMaterial.Layer(location)); + + return Registry.registerForHolder(BuiltInRegistries.ARMOR_MATERIAL, location, + new ArmorMaterial(typeProtection, enchantability, equipSound, ingredient, layers, toughness, + knockbackResistance)); + } + +} diff --git a/src/main/java/io/azraein/azraeinworkshop/item/ModToolTiers.java b/src/main/java/io/azraein/azraeinworkshop/item/tiers/ModToolTiers.java similarity index 80% rename from src/main/java/io/azraein/azraeinworkshop/item/ModToolTiers.java rename to src/main/java/io/azraein/azraeinworkshop/item/tiers/ModToolTiers.java index 3026979..4861728 100644 --- a/src/main/java/io/azraein/azraeinworkshop/item/ModToolTiers.java +++ b/src/main/java/io/azraein/azraeinworkshop/item/tiers/ModToolTiers.java @@ -1,5 +1,6 @@ -package io.azraein.azraeinworkshop.item; +package io.azraein.azraeinworkshop.item.tiers; +import io.azraein.azraeinworkshop.item.ModItems; import io.azraein.azraeinworkshop.tags.ModTags; import net.minecraft.world.item.Tier; import net.minecraft.world.item.crafting.Ingredient; diff --git a/src/main/java/io/azraein/azraeinworkshop/item/types/HammerItem.java b/src/main/java/io/azraein/azraeinworkshop/item/types/HammerItem.java new file mode 100644 index 0000000..ed15903 --- /dev/null +++ b/src/main/java/io/azraein/azraeinworkshop/item/types/HammerItem.java @@ -0,0 +1,63 @@ +package io.azraein.azraeinworkshop.item.types; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.item.DiggerItem; +import net.minecraft.world.item.Tier; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; + +public class HammerItem extends DiggerItem { + + public HammerItem(Tier tier, Properties properties) { + super(tier, BlockTags.MINEABLE_WITH_PICKAXE, properties); + } + + public static List getBlocksToBeDestroyed(int range, BlockPos initialBlockPos, ServerPlayer player) { + List positions = new ArrayList<>(); + BlockHitResult traceResult = player.level() + .clip(new ClipContext(player.getEyePosition(1f), + (player.getEyePosition(1f).add(player.getViewVector(1f).scale(6f))), ClipContext.Block.COLLIDER, + ClipContext.Fluid.NONE, player)); + + if (traceResult.getType() == HitResult.Type.MISS) { + return positions; + } + + if (traceResult.getDirection() == Direction.DOWN || traceResult.getDirection() == Direction.UP) { + for (int x = -range; x <= range; x++) { + for (int y = -range; y <= range; y++) { + positions.add(new BlockPos(initialBlockPos.getX() + x, initialBlockPos.getY(), + initialBlockPos.getZ() + y)); + } + } + } + + if (traceResult.getDirection() == Direction.NORTH || traceResult.getDirection() == Direction.SOUTH) { + for (int x = -range; x <= range; x++) { + for (int y = -range; y <= range; y++) { + positions.add(new BlockPos(initialBlockPos.getX() + x, initialBlockPos.getY() + y, + initialBlockPos.getZ())); + } + } + } + + if (traceResult.getDirection() == Direction.EAST || traceResult.getDirection() == Direction.WEST) { + for (int x = -range; x <= range; x++) { + for (int y = -range; y <= range; y++) { + positions.add(new BlockPos(initialBlockPos.getX(), initialBlockPos.getY() + y, + initialBlockPos.getZ() + x)); + } + } + } + + return positions; + } + +} diff --git a/src/main/java/io/azraein/azraeinworkshop/item/KnifeItem.java b/src/main/java/io/azraein/azraeinworkshop/item/types/KnifeItem.java similarity index 83% rename from src/main/java/io/azraein/azraeinworkshop/item/KnifeItem.java rename to src/main/java/io/azraein/azraeinworkshop/item/types/KnifeItem.java index 13e1469..c9803a6 100644 --- a/src/main/java/io/azraein/azraeinworkshop/item/KnifeItem.java +++ b/src/main/java/io/azraein/azraeinworkshop/item/types/KnifeItem.java @@ -1,4 +1,4 @@ -package io.azraein.azraeinworkshop.item; +package io.azraein.azraeinworkshop.item.types; import net.minecraft.world.item.Item; diff --git a/src/main/java/io/azraein/azraeinworkshop/item/types/StaffItem.java b/src/main/java/io/azraein/azraeinworkshop/item/types/StaffItem.java new file mode 100644 index 0000000..4e9b54b --- /dev/null +++ b/src/main/java/io/azraein/azraeinworkshop/item/types/StaffItem.java @@ -0,0 +1,11 @@ +package io.azraein.azraeinworkshop.item.types; + +import net.minecraft.world.item.Item; + +public class StaffItem extends Item { + + public StaffItem(Properties properties) { + super(properties); + } + +} diff --git a/src/main/resources/assets/azraeinworkshop/lang/en_us.json b/src/main/resources/assets/azraeinworkshop/lang/en_us.json index 0eb50f5..2dd6476 100644 --- a/src/main/resources/assets/azraeinworkshop/lang/en_us.json +++ b/src/main/resources/assets/azraeinworkshop/lang/en_us.json @@ -28,6 +28,15 @@ "item.azraeinworkshop.fire_metal_pickaxe": "Fire Metal Pickaxe", "item.azraeinworkshop.fire_metal_axe": "Fire Metal Axe", "item.azraeinworkshop.fire_metal_hoe": "Fire Metal Hoe", + "item.azraeinworkshop.fire_metal_hammer": "Fire Metal Hammer", + + "item.azraeinworkshop.fire_metal_helmet": "Fire Metal Helmet", + "item.azraeinworkshop.fire_metal_chestplate": "Fire Metal Chestplate", + "item.azraeinworkshop.fire_metal_leggings": "Fire Metal Leggings", + "item.azraeinworkshop.fire_metal_boots": "Fire Metal Boots", + + "item.azraeinworkshop.iron_hammer": "Iron Hammer", + "item.azraeinworkshop.diamond_hammer": "Diamond Hammer", "item.azraeinworkshop.raw_peacock_chunk": "Raw Peacock Chunk", "item.azraeinworkshop.peacock_gem": "Peacock Gem", diff --git a/src/main/resources/assets/azraeinworkshop/textures/block/raw_peacock_block.png b/src/main/resources/assets/azraeinworkshop/textures/block/raw_peacock_block.png deleted file mode 100644 index 259d48d2d808a23fe8366831fd61d003ca0fd1b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7Zr~o@t(*S_~XO4l9EcBP#f9m>wY z0+cr}GB#jb05KD!o^=7loJl}72rvOnVFIfRva|rQpt=kV3_!AHG$J1Q@;=o8s=MLo z;uvD#&pY9Co^&XK!~5i8#mCG4oIBE+ZJx|&UKZtQvb0yApCdFR)S-iwTP){>!VSfi z2l_t*%5rWn2nlI)buq9mjPmtdUN-5LvE2C^^Sd|Nb4L8OV$DuSIi4BY5Icom>r+5b zNipAw8kNVhA7)Kscp{Klu;Jof{hOYA8XM!aXR&g8it#_#&-~|k9#hrab?>iF$|&1j z!y~Y6)t4e;%a4}2lQww2d-qg+kK_Bxeb-aedoDXknRTt5`{mKJ6*4*h8kPS%tX_0> z=KIClvk$pjxBfN%J#$l0NPMnG-%iu2hZlnWJXqUxD~IR!=O|8&vNf~xUd4wpOrK-S zRF`G>sQY1<=l|syn|Jho2xPySar)=mmkfsz4UhkA-Id9`Q2r>_%f{FB?8VwQF2t|n z?^vv|Lp^u(XPZrVy#5WP_b#}n{_*|$Akk5nG1BFpkrSU1oB7-;+{Vw+E7#xM%;lRc z^wOp#F7?x<2K#$I7lk)1osb>%T|c@`%Gj~bc&4xE&V8}5cUPQI`v37o&bh-2oF}|| zY+JEBfYmqfXKUBI(Aty#A72-6xwZJq=}jB&&Xb$Pc3*%0ysgtupWQOU$!5a#c@ll^ zt};8%`B2OmkS}O+WPW&nuxM+9-0mA&ZKkb@3g7kcC(C`6SE8HG|M{pgkE_E?CgW6` z`)ixc?bEi)v`@eMV~@_2`MaO5bGH?Hus$lDedpt6t0h#rj<7Vwefaf#YfU-xk$b8s z3OZI#E;wFKe_!6etvU8b3iQ@^eJm_5z^kwu@-t6!XJR<`Ixds$0XPk1|_x?kzX z4nL`jDh;il6a&~9{>?eXs5MdQt?}3U2ck9wv#o3}RPDW8^H<5}pwjVmOy+WT5@e^V zfBd(+JgvZR?(EXWcmEuYH1xPs7tL0W(u-XXZhZD+(`EJZ|JYgCO4XgJZRmv);Ru&*z42ankz*Ztz zCj(@&fLzD+|Ay(8t-+TX!_Gvz@3pqxt7WVNl2hPEQvDyu=3;P4OwLX($}i1J(E##U e6(9=!GeKyeQ9$!5<|HSiB&8*?GB9W|2mk#c7!b27fUQKb z&IQPpRA7gSup!C7nE!8>{%2tLvNae;UTO>jl4qjbf#hCmYY?er{9g&EltqCbrU6I; yB^bCEoD!3>(~I&;^HMZ{d{zY@0R;b#c7!b27fUQKb z&I`zvRN#P$up`O9nE#(;|7T$Mf5Q|=e%TrfBri3F0m(Db?m%*{wKa&;GXAdw)WD*^ z57P#uff5W{3{Hv3+37|3rFkiuKt8JikN|@JOb{CACScf9%t=m2NlHshWoBToXAlDb D2CXB{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/INVERTED 8 Color Pallette.aseprite b/src/main/resources/assets/azraeinworkshop/textures/item/INVERTED 8 Color Pallette.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..4d0eca87379ac74739ea0618fec68b005063dac7 GIT binary patch literal 315 zcmcC!WMFu(l#zj*fsug&h#44CfEWRQVjw{V0U)FW*bOxF*GCqxtt>#c7!b27fUQKb z&I`zvRN#P$up`O9n0vL1|1&V`wYCP5XQJJK4F literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/diamond_hammer.png b/src/main/resources/assets/azraeinworkshop/textures/item/diamond_hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..e4a9610b4a1d977dd155410197e188f6233bc571 GIT binary patch literal 323 zcmV-J0lfZ+P)Px#{YgYYR5*=eV4yi@YWmO6)bt;hG!r3>R<*U{+idm!KOEz71tTuaI?~b%3=9km z?2(ah;j=wG3=DO3D0*;u;mXse3|C}j8GbHb4i_^nDPcf&33eACxrD*OfhbtFEaoD002ovPDHLkV1lKig{c4l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_boots.png b/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..a60bc6940a19d04957335d9739ec4c82c291a21a GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0KGt z%XqJ~^_gh*OO0V)wg&&dVfz1B_KHO52A~{ANswPK!+!|4dMd;SDCXhm;us<^b?#|L zp#usW%nm|~|NlQ$TI9EU`6W2|*t!g4nKo7sY? m0gK%kOzc}6?j|j-|IEH7I;us<^wYC2s z?*Ri2X673y|9iO`yH>3VseiQFM(5hE{gTe~DWM4f DC)Q34 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_hammer.png b/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_hammer.png new file mode 100644 index 0000000000000000000000000000000000000000..a7fc4828ece79d37d279f1e92c86ec8ae52d53bd GIT binary patch literal 377 zcmV-<0fzpGP)Px$Gf6~2R5*>bQn5+{K@fdsBm_LzN)Qyii{KXo0=X^+E?U}NnNP5@4WzQQ%m?@b z5ro)n5!g;h5%And41rV&E6ByLHr{e)ZchuHW?^REoA+i0`0p47fgT2dw$-=GfB?|$ zCwS;otqr!yy0`m@d2K2jTld}5eE>kcu{QZpZ-J1p9LB0(dH;%JA`$b7$u+O`Hk1@9 z$SNV8i|PqMy|Kp5@eAIb4l(L2001FlPN4!GQOzT&Z$9RbLgkdiyaM96KUit&)wvVNr{~|sC XO(u|PRci|<00000NkvXXu0mjfv<{uE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_helmet.png b/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..3341b2a1b69cebb8d876cc5cd6dc287a7898bc70 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~=>VS)S0KGt z%XqJ~^_gh*OO0V)wg&&dVfz1BcBhu{<`q}tfzq5ML4Lsu|DnK~Y4#PMptGloV~E7m zx&4NG2NZaiFDJ17|9@1KhvinUw9;MPX-Q?B{$}j#Z#DbnRKg0~tO6R79do(YJrU1h iwrbw_$!mLlO(o-=bjCziL+2!*aSWcWelF{r5}E)Y$wFuV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_leggings.png b/src/main/resources/assets/azraeinworkshop/textures/item/fire_metal_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..34e65a0fd06c17256a9d6fa70de223f00b65ace4 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0KGt z%XqJ~^_gh*OO0V)wg&&dVfz1B_KHO52A~{ANswPK!+!|4dMd;SDCXhm;us<^wfCGM z-vI?4=fIx11^=bZ1590bMC%>S&CYnc>R;QQTAp%aCB=0f(mt0M8MtR0b!oNyEuZ1H lfPx#@<~KNR5*>blCf$6K@dQniGeFj*iz8q?CuW~LSVij-{6PLhos3bq_I5+_F^Gd z=@lnfE=jYXa2DYfFWxR#IL*S&yq!10!o5RPYgMg7`F;!p5E1e`4>ov+br%tThAeua z?rE9=FiH}Czbpz=wZ#Mt%Ch8SEqmwu-D{RznRFUlnv9L1Zw#X(;b}PJcsQ^uiYDKS z?qI$6q_VbUvUiTLF}~(81iw!w^<;2lm4ES)%@_bb&T+Dq%38mR&Jh}Tv#nU{{%V?W zE@9|cVi(-RfB4EE28Y7y0sMY{+yu8q5D}i=<~PBu2V(#Iu5kvkhjzN-@9_8l0000< KMNUMnLSTYg4v1m^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/raw_peacock_chunk.png b/src/main/resources/assets/azraeinworkshop/textures/item/raw_peacock_chunk.png deleted file mode 100644 index ef6c2e856b82a5260fa3316e645fbd80e44f6077..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!7Zr~o@t(*S_~XO4l9EcBP#ATEkmEn%X7GTTuJ2Tz|167H{#usl8z|B&Y|>%M=@ zk35|6zBPTbGs(D zMVBk{9fNiy4*F~M5gdgrz4T74(KgkH2Umo?zZ{Io>#n&pkvn{`fDE)=a? z=$4Yxd~MTov;F-a=at>MwJf1vZiKc&rA4(~jK8sB2Z2qOgXsYvy?XunM zgE5^8cWAh}&4~WRx~?T}t!KZ?Bi^o@cY7-W)y}c6nzO`b(^fG^>nuB4%643Y zd-a5KyDIjCF^Z+$`Ls&6ZN?d6t!cg-fv&zhAERvcDa_rzS3^Beu|=-nD6vuS^Yg}pB(b8?RX-*!L@d+^CH1}S&FO9tFCyxChV7Wx}S6x&*`(L zwWqi~(3UNnyCr$zw$fw$RjpS=bU)@^bN)YD>YZ=rOnKgIDUaT=Ukt8yc{u$r|IXq} z`RMI;qP`bi>D4yST4nq&%FIY?X{(WAq2B(WAI=+s-`GA3|9YK&L8jEsi*u}dcP0gS yh^cNq-BI!`aMz2U9|R^G-#_QizU()AjP{H&8{Tq%k_nm$N`aoPelF{r5}E*fp;@N@ diff --git a/src/main/resources/assets/azraeinworkshop/textures/item/xyloth_staff.png b/src/main/resources/assets/azraeinworkshop/textures/item/xyloth_staff.png index cfd30a1dbe8c702c3cba9633279bb1cec30d724b..255f9c8f5a20d2a07fd6c2af6ec48043c4fef602 100644 GIT binary patch delta 366 zcmV-!0g?X52h{|SNeaOL01m+cxRGn^kyBC$*>(W{=mP)%*^#bYf4()lqzyZd3Yli=Z>XJYmj0^#DpTYIv^#aINkY;}d|Nj?``ZF+a za4@`n`UNTr0eB5~fAHV|1IT75mtpzg=M3wv{bWeC6oHH3^}_y0hW`g1LD+`cvJ4D= z|1tdk^^@V(&p!+-EQ}1n%ic5MbOA7`{(}O{L5_i;@hAi1zpq~z7&+J({{H#Pz{bwP z@Z%>aGH`eSq#4R&a9j>?<>${pjcV=;zkdB=VAJ+t;1=NrOv_^!fUFr7RUp7G2(JNR5(v%QcGwPQ4~G%%VegLCLzUTY1O45xY1Igng$ z3W7M=+5#j1bWPhC!*QI9Od^q7GYWFJB(i>ZMm+7hCVF~Mb6rg8N~ugT!K{Ts0Z|ko zybP5*Jg(GqS>0TSd^v00YiODmyZ}U;x5g`vl8%VDB5n^&y3oW(o7lExoUz$522}Ylc*s zDWKCWv6Wyz25C%0O6@seVXh z^?JvHE?h}DTnV&txiBWvIY)0K*yM}vtr_04TrN&2e--n+&Kbx{L~cg7_0$oGA2 z|3e!cfGuk7+O~N~vgWr(`(O~X78ib*igI~IG7ToEjwKMrU;$U8gHxVo=h#Yt`)WB_ z{pok?LLo7mOu3^c{3jTMdtFB0Yo+3TluYNO3;OGoI7`DinWZ})1l!Aiykmec4Dk=9 WXG$LW+pG5g0000Px#7*I@9MF0Q*|K@A|*fsREQ__J}%v(pjJ3GB9Gx+6dGynhq2y{|TQvm<}|NsC0 z|JBM=G5`PpWl2OqR7i=fRa=h4APfWYy8n&W4luL(Q9xypT2hHP!Ew@3#QtxBl3pM@Hv716dU_UNx|% z&EqwAf6E@B%olBsUchm; zp+7ddl8qWRIarVxj3&9*Py|W)+2I$n`QmVqoU8M# ZSwE_*3>`Zi5bXc}002ovPDHLkV1g0%(1rj2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/azraeinworkshop/textures/models/armor/fire_metal_layer_2.png b/src/main/resources/assets/azraeinworkshop/textures/models/armor/fire_metal_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..615dda966a37efcfe44c7377cbfc991aa3f5cacb GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4azq1sLR^9L z{~M-Xwgz8n3_BC;zSr7%ua@y^Q6n~>1ba!4UogXeFj!i@>^D$om8Xkih)3t!$=-ZN z6nLDyg@6BZm$MEr-n{Ziy0^-d4JQs;6vV3g&9V3>&aja^^K6DZ1_kB};i_5e zjh-pG3gQe)q?8X#5S;k=@`sZ(A{?6-E}WdC_mk0i8RHiAo=t}qRI*-O&$(nu$0mjo zvl3=z>dz~z+O#I-rEJeXj(xdR*P`C`6--+dHv8l1i{?93k1qT3s*s^-an+`EOV_?G k%>Scb^;vjtUFZi!g{`cS!cKy*Kvy$(y85}Sb4q9e0LSTbQvd(} literal 0 HcmV?d00001