From f77a0312a62f0a99357c44474d6477ea75995d0a Mon Sep 17 00:00:00 2001 From: Aton-Kish <38515249+Aton-Kish@users.noreply.github.com> Date: Sun, 16 Jun 2024 17:41:51 +0900 Subject: [PATCH] [v3.0.1+1.21] support Minecraft 1.21 (#76) * bump deps * disable integration with shulker box tooltip * replaced `new Identifier` with `Identifier.of` * replaced `Instrument` with `NoteBlockInstrument` * fixed recipe tests * fixed tab spaces * fixed ReinforcedShulkerBoxBlockEntityRenderer * fixed custom recipes * renamed data pack directories * fixed fabric.mod.json * fixed loot table tests * bump mod version to v3.0.1+1.21 * removed VoidScreenHandler * fixed release metadata --- build.gradle | 21 ++-- gradle.properties | 14 +-- .../render/ModTexturedRenderLayers.java | 4 +- ...inforcedShulkerBoxBlockEntityRenderer.java | 2 +- .../reinfshulker/block/ModBlocks.java | 2 +- .../block/entity/ModBlockEntityType.java | 2 +- .../gametest/testcase/AdvancementTests.java | 30 ++--- .../gametest/testcase/LootTableTests.java | 3 +- .../gametest/testcase/RecipeTests.java | 106 +++++++----------- .../gametest/util/VoidScreenHander.java | 21 ---- .../ReinforcedShulkerBoxPreviewProvider.java | 69 ------------ .../shulkerboxtooltip/ShulkerBoxTooltip.java | 32 ------ .../mixin/ShulkerBoxColoringRecipeMixin.java | 8 +- .../recipe/ModRecipeSerializer.java | 2 +- .../ReinforcedShulkerBoxColoringRecipe.java | 14 +-- .../ReinforcedShulkerBoxCraftingRecipe.java | 6 +- .../atonkish/reinfshulker/stat/ModStats.java | 2 +- .../util/ReinforcingMaterialSettings.java | 6 +- .../{items => item}/portable_container.json | 0 .../{blocks => block}/mineable/pickaxe.json | 0 .../tags/{blocks => block}/shulker_boxes.json | 0 .../decorations/copper_shulker_box.json | 0 .../copper_shulker_box_from_copper_chest.json | 0 .../decorations/diamond_shulker_box.json | 0 ...iamond_shulker_box_from_diamond_chest.json | 0 .../recipes/decorations/gold_shulker_box.json | 0 .../gold_shulker_box_from_gold_chest.json | 0 .../recipes/decorations/iron_shulker_box.json | 0 .../iron_shulker_box_from_iron_chest.json | 0 ...rite_shulker_box_from_netherite_chest.json | 0 .../netherite_shulker_box_smithing.json | 0 .../blocks/black_copper_shulker_box.json | 0 .../blocks/black_diamond_shulker_box.json | 0 .../blocks/black_gold_shulker_box.json | 0 .../blocks/black_iron_shulker_box.json | 0 .../blocks/black_netherite_shulker_box.json | 0 .../blocks/blue_copper_shulker_box.json | 0 .../blocks/blue_diamond_shulker_box.json | 0 .../blocks/blue_gold_shulker_box.json | 0 .../blocks/blue_iron_shulker_box.json | 0 .../blocks/blue_netherite_shulker_box.json | 0 .../blocks/brown_copper_shulker_box.json | 0 .../blocks/brown_diamond_shulker_box.json | 0 .../blocks/brown_gold_shulker_box.json | 0 .../blocks/brown_iron_shulker_box.json | 0 .../blocks/brown_netherite_shulker_box.json | 0 .../blocks/copper_shulker_box.json | 0 .../blocks/cyan_copper_shulker_box.json | 0 .../blocks/cyan_diamond_shulker_box.json | 0 .../blocks/cyan_gold_shulker_box.json | 0 .../blocks/cyan_iron_shulker_box.json | 0 .../blocks/cyan_netherite_shulker_box.json | 0 .../blocks/diamond_shulker_box.json | 0 .../blocks/gold_shulker_box.json | 0 .../blocks/gray_copper_shulker_box.json | 0 .../blocks/gray_diamond_shulker_box.json | 0 .../blocks/gray_gold_shulker_box.json | 0 .../blocks/gray_iron_shulker_box.json | 0 .../blocks/gray_netherite_shulker_box.json | 0 .../blocks/green_copper_shulker_box.json | 0 .../blocks/green_diamond_shulker_box.json | 0 .../blocks/green_gold_shulker_box.json | 0 .../blocks/green_iron_shulker_box.json | 0 .../blocks/green_netherite_shulker_box.json | 0 .../blocks/iron_shulker_box.json | 0 .../blocks/light_blue_copper_shulker_box.json | 0 .../light_blue_diamond_shulker_box.json | 0 .../blocks/light_blue_gold_shulker_box.json | 0 .../blocks/light_blue_iron_shulker_box.json | 0 .../light_blue_netherite_shulker_box.json | 0 .../blocks/light_gray_copper_shulker_box.json | 0 .../light_gray_diamond_shulker_box.json | 0 .../blocks/light_gray_gold_shulker_box.json | 0 .../blocks/light_gray_iron_shulker_box.json | 0 .../light_gray_netherite_shulker_box.json | 0 .../blocks/lime_copper_shulker_box.json | 0 .../blocks/lime_diamond_shulker_box.json | 0 .../blocks/lime_gold_shulker_box.json | 0 .../blocks/lime_iron_shulker_box.json | 0 .../blocks/lime_netherite_shulker_box.json | 0 .../blocks/magenta_copper_shulker_box.json | 0 .../blocks/magenta_diamond_shulker_box.json | 0 .../blocks/magenta_gold_shulker_box.json | 0 .../blocks/magenta_iron_shulker_box.json | 0 .../blocks/magenta_netherite_shulker_box.json | 0 .../blocks/netherite_shulker_box.json | 0 .../blocks/orange_copper_shulker_box.json | 0 .../blocks/orange_diamond_shulker_box.json | 0 .../blocks/orange_gold_shulker_box.json | 0 .../blocks/orange_iron_shulker_box.json | 0 .../blocks/orange_netherite_shulker_box.json | 0 .../blocks/pink_copper_shulker_box.json | 0 .../blocks/pink_diamond_shulker_box.json | 0 .../blocks/pink_gold_shulker_box.json | 0 .../blocks/pink_iron_shulker_box.json | 0 .../blocks/pink_netherite_shulker_box.json | 0 .../blocks/purple_copper_shulker_box.json | 0 .../blocks/purple_diamond_shulker_box.json | 0 .../blocks/purple_gold_shulker_box.json | 0 .../blocks/purple_iron_shulker_box.json | 0 .../blocks/purple_netherite_shulker_box.json | 0 .../blocks/red_copper_shulker_box.json | 0 .../blocks/red_diamond_shulker_box.json | 0 .../blocks/red_gold_shulker_box.json | 0 .../blocks/red_iron_shulker_box.json | 0 .../blocks/red_netherite_shulker_box.json | 0 .../blocks/white_copper_shulker_box.json | 0 .../blocks/white_diamond_shulker_box.json | 0 .../blocks/white_gold_shulker_box.json | 0 .../blocks/white_iron_shulker_box.json | 0 .../blocks/white_netherite_shulker_box.json | 0 .../blocks/yellow_copper_shulker_box.json | 0 .../blocks/yellow_diamond_shulker_box.json | 0 .../blocks/yellow_gold_shulker_box.json | 0 .../blocks/yellow_iron_shulker_box.json | 0 .../blocks/yellow_netherite_shulker_box.json | 0 .../black_copper_shulker_box.json | 0 .../black_diamond_shulker_box.json | 0 .../black_gold_shulker_box.json | 0 .../black_iron_shulker_box.json | 0 .../black_netherite_shulker_box_smithing.json | 0 .../blue_copper_shulker_box.json | 0 .../blue_diamond_shulker_box.json | 0 .../blue_gold_shulker_box.json | 0 .../blue_iron_shulker_box.json | 0 .../blue_netherite_shulker_box_smithing.json | 0 .../brown_copper_shulker_box.json | 0 .../brown_diamond_shulker_box.json | 0 .../brown_gold_shulker_box.json | 0 .../brown_iron_shulker_box.json | 0 .../brown_netherite_shulker_box_smithing.json | 0 .../copper_shulker_box.json | 0 .../copper_shulker_box_from_copper_chest.json | 0 .../cyan_copper_shulker_box.json | 0 .../cyan_diamond_shulker_box.json | 0 .../cyan_gold_shulker_box.json | 0 .../cyan_iron_shulker_box.json | 0 .../cyan_netherite_shulker_box_smithing.json | 0 .../diamond_shulker_box.json | 0 ...iamond_shulker_box_from_diamond_chest.json | 0 .../{recipes => recipe}/gold_shulker_box.json | 0 .../gold_shulker_box_from_gold_chest.json | 0 .../gray_copper_shulker_box.json | 0 .../gray_diamond_shulker_box.json | 0 .../gray_gold_shulker_box.json | 0 .../gray_iron_shulker_box.json | 0 .../gray_netherite_shulker_box_smithing.json | 0 .../green_copper_shulker_box.json | 0 .../green_diamond_shulker_box.json | 0 .../green_gold_shulker_box.json | 0 .../green_iron_shulker_box.json | 0 .../green_netherite_shulker_box_smithing.json | 0 .../{recipes => recipe}/iron_shulker_box.json | 0 .../iron_shulker_box_from_iron_chest.json | 0 .../light_blue_copper_shulker_box.json | 0 .../light_blue_diamond_shulker_box.json | 0 .../light_blue_gold_shulker_box.json | 0 .../light_blue_iron_shulker_box.json | 0 ...t_blue_netherite_shulker_box_smithing.json | 0 .../light_gray_copper_shulker_box.json | 0 .../light_gray_diamond_shulker_box.json | 0 .../light_gray_gold_shulker_box.json | 0 .../light_gray_iron_shulker_box.json | 0 ...t_gray_netherite_shulker_box_smithing.json | 0 .../lime_copper_shulker_box.json | 0 .../lime_diamond_shulker_box.json | 0 .../lime_gold_shulker_box.json | 0 .../lime_iron_shulker_box.json | 0 .../lime_netherite_shulker_box_smithing.json | 0 .../magenta_copper_shulker_box.json | 0 .../magenta_diamond_shulker_box.json | 0 .../magenta_gold_shulker_box.json | 0 .../magenta_iron_shulker_box.json | 0 ...agenta_netherite_shulker_box_smithing.json | 0 ...rite_shulker_box_from_netherite_chest.json | 0 .../netherite_shulker_box_smithing.json | 0 .../orange_copper_shulker_box.json | 0 .../orange_diamond_shulker_box.json | 0 .../orange_gold_shulker_box.json | 0 .../orange_iron_shulker_box.json | 0 ...orange_netherite_shulker_box_smithing.json | 0 .../pink_copper_shulker_box.json | 0 .../pink_diamond_shulker_box.json | 0 .../pink_gold_shulker_box.json | 0 .../pink_iron_shulker_box.json | 0 .../pink_netherite_shulker_box_smithing.json | 0 .../purple_copper_shulker_box.json | 0 .../purple_diamond_shulker_box.json | 0 .../purple_gold_shulker_box.json | 0 .../purple_iron_shulker_box.json | 0 ...purple_netherite_shulker_box_smithing.json | 0 .../red_copper_shulker_box.json | 0 .../red_diamond_shulker_box.json | 0 .../red_gold_shulker_box.json | 0 .../red_iron_shulker_box.json | 0 .../red_netherite_shulker_box_smithing.json | 0 .../reinforced_shulker_box_coloring.json | 0 .../white_copper_shulker_box.json | 0 .../white_diamond_shulker_box.json | 0 .../white_gold_shulker_box.json | 0 .../white_iron_shulker_box.json | 0 .../white_netherite_shulker_box_smithing.json | 0 .../yellow_copper_shulker_box.json | 0 .../yellow_diamond_shulker_box.json | 0 .../yellow_gold_shulker_box.json | 0 .../yellow_iron_shulker_box.json | 0 ...yellow_netherite_shulker_box_smithing.json | 0 .../copper_shulker_boxes.json | 0 .../diamond_shulker_boxes.json | 0 .../{blocks => block}/gold_shulker_boxes.json | 0 .../{blocks => block}/iron_shulker_boxes.json | 0 .../netherite_shulker_boxes.json | 0 .../{items => item}/copper_shulker_boxes.json | 0 .../diamond_shulker_boxes.json | 0 .../{items => item}/gold_shulker_boxes.json | 0 .../{items => item}/iron_shulker_boxes.json | 0 .../netherite_shulker_boxes.json | 0 src/main/resources/fabric.mod.json | 5 +- 218 files changed, 100 insertions(+), 249 deletions(-) delete mode 100644 src/main/java/atonkish/reinfshulker/gametest/util/VoidScreenHander.java delete mode 100644 src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java delete mode 100644 src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ShulkerBoxTooltip.java rename src/main/resources/data/enchantedshulkers/tags/{items => item}/portable_container.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/copper_shulker_box_from_copper_chest.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/diamond_shulker_box_from_diamond_chest.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/gold_shulker_box_from_gold_chest.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/iron_shulker_box_from_iron_chest.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/netherite_shulker_box_from_netherite_chest.json (100%) rename src/main/resources/data/reinfshulker/{advancements => advancement}/recipes/decorations/netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/black_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/black_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/black_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/black_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/black_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/blue_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/blue_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/blue_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/blue_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/blue_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/brown_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/brown_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/brown_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/brown_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/brown_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/cyan_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/cyan_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/cyan_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/cyan_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/cyan_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/gray_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/gray_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/gray_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/gray_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/gray_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/green_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/green_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/green_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/green_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/green_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_blue_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_blue_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_blue_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_blue_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_blue_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_gray_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_gray_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_gray_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_gray_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/light_gray_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/lime_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/lime_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/lime_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/lime_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/lime_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/magenta_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/magenta_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/magenta_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/magenta_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/magenta_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/orange_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/orange_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/orange_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/orange_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/orange_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/pink_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/pink_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/pink_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/pink_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/pink_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/purple_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/purple_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/purple_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/purple_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/purple_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/red_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/red_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/red_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/red_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/red_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/white_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/white_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/white_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/white_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/white_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/yellow_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/yellow_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/yellow_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/yellow_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{loot_tables => loot_table}/blocks/yellow_netherite_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/black_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/black_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/black_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/black_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/black_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/blue_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/blue_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/blue_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/blue_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/blue_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/brown_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/brown_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/brown_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/brown_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/brown_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/copper_shulker_box_from_copper_chest.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/cyan_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/cyan_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/cyan_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/cyan_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/cyan_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/diamond_shulker_box_from_diamond_chest.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/gold_shulker_box_from_gold_chest.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/gray_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/gray_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/gray_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/gray_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/gray_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/green_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/green_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/green_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/green_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/green_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/iron_shulker_box_from_iron_chest.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_blue_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_blue_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_blue_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_blue_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_blue_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_gray_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_gray_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_gray_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_gray_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/light_gray_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/lime_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/lime_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/lime_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/lime_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/lime_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/magenta_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/magenta_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/magenta_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/magenta_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/magenta_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/netherite_shulker_box_from_netherite_chest.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/orange_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/orange_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/orange_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/orange_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/orange_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/pink_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/pink_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/pink_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/pink_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/pink_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/purple_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/purple_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/purple_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/purple_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/purple_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/red_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/red_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/red_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/red_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/red_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/reinforced_shulker_box_coloring.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/white_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/white_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/white_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/white_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/white_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/yellow_copper_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/yellow_diamond_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/yellow_gold_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/yellow_iron_shulker_box.json (100%) rename src/main/resources/data/reinfshulker/{recipes => recipe}/yellow_netherite_shulker_box_smithing.json (100%) rename src/main/resources/data/reinfshulker/tags/{blocks => block}/copper_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{blocks => block}/diamond_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{blocks => block}/gold_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{blocks => block}/iron_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{blocks => block}/netherite_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{items => item}/copper_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{items => item}/diamond_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{items => item}/gold_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{items => item}/iron_shulker_boxes.json (100%) rename src/main/resources/data/reinfshulker/tags/{items => item}/netherite_shulker_boxes.json (100%) diff --git a/build.gradle b/build.gradle index 3a9da0e..6a8f7a5 100644 --- a/build.gradle +++ b/build.gradle @@ -39,10 +39,10 @@ repositories { // url "https://maven.kyrptonaught.dev" // } - // Shulker Box Tooltip - maven { - url "https://maven.misterpemodder.com/libs-release" - } + // // Shulker Box Tooltip + // maven { + // url "https://maven.misterpemodder.com/libs-release" + // } } loom { @@ -97,8 +97,8 @@ dependencies { // // Quick Shulker deps // modImplementation "net.kyrptonaught:shulkerutils:${project.shulkerutils_version}" - // Shulker Box Tooltip - modImplementation "com.misterpemodder:shulkerboxtooltip-fabric:${project.shulker_box_tooltip_version}" + // // Shulker Box Tooltip + // modImplementation "com.misterpemodder:shulkerboxtooltip-fabric:${project.shulker_box_tooltip_version}" } processResources { @@ -166,14 +166,13 @@ curseforge { addGameVersion "Fabric" addGameVersion "Java 21" - addGameVersion "1.20.5" - addGameVersion "1.20.6" + addGameVersion "1.21" relations { requiredDependency "fabric-api" embeddedLibrary "cloth-config" optionalDependency "modmenu" - optionalDependency "shulkerboxtooltip" + // optionalDependency "shulkerboxtooltip" // optionalDependency "quick-shulker" optionalDependency "reinforced-chests" } @@ -191,14 +190,14 @@ modrinth { versionType = "release" changelog = "[v${project.version}](https://github.com/Aton-Kish/reinforced-shulker-boxes/releases/tag/v" + java.net.URLEncoder.encode(project.version, "UTF-8") + ")" - gameVersions = ["1.20.5", "1.20.6"] + gameVersions = ["1.21"] loaders = ["fabric"] dependencies { required.project "fabric-api" embedded.project "cloth-config" optional.project "modmenu" - optional.project "shulkerboxtooltip" + // optional.project "shulkerboxtooltip" // optional.project "quickshulker" optional.project "reinforced-chests" } diff --git a/gradle.properties b/gradle.properties index 51946b3..e97780f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,22 +4,22 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.6 - yarn_mappings=1.20.6+build.3 + minecraft_version=1.21 + yarn_mappings=1.21+build.2 loader_version=0.15.11 # Mod Properties - mod_version=3.0.0+1.20 + mod_version=3.0.1+1.21 mod_id=reinfshulker maven_group=atonkish.reinfshulker archives_base_name=reinforced-shulker-boxes # Dependencies - fabric_version=0.100.0+1.20.6 - reinforced_core_version=4.0.0+1.20 - reinforced_chests_version=3.0.0+1.20 + fabric_version=0.100.1+1.21 + reinforced_core_version=4.0.1+1.21 + reinforced_chests_version=3.0.1+1.21 # quick_shulker_version=1.4.0-1.20 - shulker_box_tooltip_version=4.1.0-alpha.4+1.20.6 + # shulker_box_tooltip_version=4.1.0-alpha.4+1.20.6 # # Quick Shulker deps # shulkerutils_version=1.0.4-1.19 diff --git a/src/client/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java b/src/client/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java index daca82d..3f9aa6b 100644 --- a/src/client/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java +++ b/src/client/java/atonkish/reinfshulker/client/render/ModTexturedRenderLayers.java @@ -25,7 +25,7 @@ public class ModTexturedRenderLayers { public static SpriteIdentifier registerMaterialDefaultSprite(String namespace, ReinforcingMaterial material) { if (!REINFORCED_SHULKER_TEXTURE_ID_MAP.containsKey(material)) { SpriteIdentifier identifier = new SpriteIdentifier(TexturedRenderLayers.SHULKER_BOXES_ATLAS_TEXTURE, - new Identifier(namespace, "entity/reinforced_shulker/" + material.getName() + "/shulker")); + Identifier.of(namespace, "entity/reinforced_shulker/" + material.getName() + "/shulker")); REINFORCED_SHULKER_TEXTURE_ID_MAP.put(material, identifier); } @@ -37,7 +37,7 @@ public static List registerMaterialColoringSprites(String name if (!COLORED_REINFORCED_SHULKER_BOXES_TEXTURES_MAP.containsKey(material)) { List identifiers = Stream.of(DyeColor.values()).map((color) -> { return new SpriteIdentifier(TexturedRenderLayers.SHULKER_BOXES_ATLAS_TEXTURE, - new Identifier(namespace, + Identifier.of(namespace, "entity/reinforced_shulker/" + material.getName() + "/shulker_" + color.getName())); }).collect(ImmutableList.toImmutableList()); COLORED_REINFORCED_SHULKER_BOXES_TEXTURES_MAP.put(material, identifiers); diff --git a/src/client/java/atonkish/reinfshulker/client/render/block/entity/ReinforcedShulkerBoxBlockEntityRenderer.java b/src/client/java/atonkish/reinfshulker/client/render/block/entity/ReinforcedShulkerBoxBlockEntityRenderer.java index a81dace..9b525bb 100644 --- a/src/client/java/atonkish/reinfshulker/client/render/block/entity/ReinforcedShulkerBoxBlockEntityRenderer.java +++ b/src/client/java/atonkish/reinfshulker/client/render/block/entity/ReinforcedShulkerBoxBlockEntityRenderer.java @@ -65,7 +65,7 @@ public void render(ReinforcedShulkerBoxBlockEntity reinforcedShulkerBoxBlockEnti modelPart.yaw = 270.0F * reinforcedShulkerBoxBlockEntity.getAnimationProgress(tickDelta) * 0.017453292F; VertexConsumer vertexConsumer = spriteIdentifier2.getVertexConsumer(vertexConsumers, RenderLayer::getEntityCutoutNoCull); - this.model.render(matrices, vertexConsumer, light, overlay, 1.0F, 1.0F, 1.0F, 1.0F); + this.model.render(matrices, vertexConsumer, light, overlay); matrices.pop(); } } diff --git a/src/main/java/atonkish/reinfshulker/block/ModBlocks.java b/src/main/java/atonkish/reinfshulker/block/ModBlocks.java index 863be8a..207b542 100644 --- a/src/main/java/atonkish/reinfshulker/block/ModBlocks.java +++ b/src/main/java/atonkish/reinfshulker/block/ModBlocks.java @@ -41,6 +41,6 @@ public static Block registerMaterialDyeColor(String namespace, ReinforcingMateri } private static Block register(String namespace, String id, Block block) { - return Registry.register(Registries.BLOCK, new Identifier(namespace, id), block); + return Registry.register(Registries.BLOCK, Identifier.of(namespace, id), block); } } diff --git a/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java b/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java index d7ddf46..5b06027 100644 --- a/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java +++ b/src/main/java/atonkish/reinfshulker/block/entity/ModBlockEntityType.java @@ -34,7 +34,7 @@ public static BlockEntityType registerMaterial( private static BlockEntityType create(String namespace, String id, BlockEntityType.Builder builder) { - return Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(namespace, id), + return Registry.register(Registries.BLOCK_ENTITY_TYPE, Identifier.of(namespace, id), builder.build(null)); } diff --git a/src/main/java/atonkish/reinfshulker/gametest/testcase/AdvancementTests.java b/src/main/java/atonkish/reinfshulker/gametest/testcase/AdvancementTests.java index 5e2efe0..f9e60d1 100644 --- a/src/main/java/atonkish/reinfshulker/gametest/testcase/AdvancementTests.java +++ b/src/main/java/atonkish/reinfshulker/gametest/testcase/AdvancementTests.java @@ -62,16 +62,16 @@ public class AdvancementTests { String.format("Obtain Copper Shulker Box recipe advancement by having %s", item.getName().getString()), item, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box"))); } add(AdvancementTests.createTest( "Obtain Copper Shulker Box recipe advancement by having Copper Ingot", Items.COPPER_INGOT, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box"))); add(AdvancementTests.createTest( "Obtain Copper Shulker Box recipe advancement by having Copper Chest", atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("copper")), - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/copper_shulker_box_from_copper_chest"))); // Iron Shulker Box @@ -81,16 +81,16 @@ public class AdvancementTests { String.format("Obtain Iron Shulker Box recipe advancement by having %s", item.getName().getString()), item, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box"))); } add(AdvancementTests.createTest( "Obtain Iron Shulker Box recipe advancement by having Iron Ingot", Items.IRON_INGOT, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box"))); add(AdvancementTests.createTest( "Obtain Iron Shulker Box recipe advancement by having Iron Chest", atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("iron")), - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/iron_shulker_box_from_iron_chest"))); // Gold Shulker Box @@ -100,16 +100,16 @@ public class AdvancementTests { String.format("Obtain Gold Shulker Box recipe advancement by having %s", item.getName().getString()), item, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box"))); } add(AdvancementTests.createTest( "Obtain Gold Shulker Box recipe advancement by having Gold Ingot", Items.GOLD_INGOT, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box"))); add(AdvancementTests.createTest( "Obtain Gold Shulker Box recipe advancement by having Gold Chest", atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("gold")), - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/gold_shulker_box_from_gold_chest"))); // Diamond Shulker Box @@ -119,16 +119,16 @@ public class AdvancementTests { String.format("Obtain Diamond Shulker Box recipe advancement by having %s", item.getName().getString()), item, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box"))); } add(AdvancementTests.createTest( "Obtain Diamond Shulker Box recipe advancement by having Diamond Ingot", Items.DIAMOND, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box"))); + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box"))); add(AdvancementTests.createTest( "Obtain Diamond Shulker Box recipe advancement by having Diamond Chest", atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP.get(ReinforcingMaterials.MAP.get("diamond")), - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/diamond_shulker_box_from_diamond_chest"))); // Netherite Shulker Box @@ -138,19 +138,19 @@ public class AdvancementTests { String.format("Obtain Netherite Shulker Box recipe advancement by having %s", item.getName().getString()), item, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/netherite_shulker_box_smithing"))); } add(AdvancementTests.createTest( "Obtain Netherite Shulker Box recipe advancement by having Netherite Ingot", Items.NETHERITE_INGOT, - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/netherite_shulker_box_smithing"))); add(AdvancementTests.createTest( "Obtain Netherite Shulker Box recipe advancement by having Netherite Chest", atonkish.reinfchest.item.ModItems.REINFORCED_CHEST_MAP .get(ReinforcingMaterials.MAP.get("netherite")), - new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, + Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, "recipes/decorations/netherite_shulker_box_from_netherite_chest"))); } }; diff --git a/src/main/java/atonkish/reinfshulker/gametest/testcase/LootTableTests.java b/src/main/java/atonkish/reinfshulker/gametest/testcase/LootTableTests.java index 3a6714a..4585c17 100644 --- a/src/main/java/atonkish/reinfshulker/gametest/testcase/LootTableTests.java +++ b/src/main/java/atonkish/reinfshulker/gametest/testcase/LootTableTests.java @@ -8,7 +8,6 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; -import net.minecraft.entity.EntityType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -198,7 +197,7 @@ private static TestFunction createTest(String name, Block shulkerBoxBlock, Item CompletableFuture.allOf(futurePartialAct1, futurePartialAct2).thenRun(() -> { try { context.expectBlock(Blocks.AIR, blockPos); - context.expectEntitiesAround(EntityType.ITEM, blockPos, shouldDrop ? 1 : 0, 1); + context.expectItemsAt(shulkerBoxBlock.asItem(), blockPos, 1, shouldDrop ? 1 : 0); } catch (Exception e) { ReinforcedShulkerBoxesMod.LOGGER.error("[{}] {}", testName, e.getMessage()); throw e; diff --git a/src/main/java/atonkish/reinfshulker/gametest/testcase/RecipeTests.java b/src/main/java/atonkish/reinfshulker/gametest/testcase/RecipeTests.java index afd9d36..30d0a7e 100644 --- a/src/main/java/atonkish/reinfshulker/gametest/testcase/RecipeTests.java +++ b/src/main/java/atonkish/reinfshulker/gametest/testcase/RecipeTests.java @@ -10,10 +10,6 @@ import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.ContainerComponent; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.Inventory; -import net.minecraft.inventory.RecipeInputInventory; -import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.DyeItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,6 +17,9 @@ import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeManager; import net.minecraft.recipe.RecipeType; +import net.minecraft.recipe.input.CraftingRecipeInput; +import net.minecraft.recipe.input.RecipeInput; +import net.minecraft.recipe.input.SmithingRecipeInput; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.test.StructureTestUtil; @@ -29,7 +28,6 @@ import atonkish.reinfcore.util.ReinforcingMaterials; import atonkish.reinfshulker.ReinforcedShulkerBoxesMod; -import atonkish.reinfshulker.gametest.util.VoidScreenHander; import atonkish.reinfshulker.item.ModItems; public class RecipeTests { @@ -74,10 +72,10 @@ public class RecipeTests { add(RecipeTests.createTest( String.format("Craft %s", baseShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( material, material, material, material, baseShulkerBox, material, - material, material, material), + material, material, material)), shulkerBox)); } @@ -100,10 +98,9 @@ public class RecipeTests { baseShulkerBox.getItem().getName().getString(), dyedShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( - baseShulkerBox, dye, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY), + CraftingRecipeInput.create(2, 2, List.of( + baseShulkerBox, dye, + ItemStack.EMPTY, ItemStack.EMPTY)), dyedShulkerBox)); } } @@ -122,10 +119,10 @@ public class RecipeTests { shulkerBox.getItem().getName().getString(), chest.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( shell, ItemStack.EMPTY, ItemStack.EMPTY, chest, ItemStack.EMPTY, ItemStack.EMPTY, - shell, ItemStack.EMPTY, ItemStack.EMPTY), + shell, ItemStack.EMPTY, ItemStack.EMPTY)), shulkerBox)); } @@ -144,10 +141,10 @@ public class RecipeTests { add(RecipeTests.createTest( String.format("Craft %s", baseShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( material, material, material, material, baseShulkerBox, material, - material, material, material), + material, material, material)), shulkerBox)); } @@ -170,10 +167,9 @@ public class RecipeTests { baseShulkerBox.getItem().getName().getString(), dyedShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( - baseShulkerBox, dye, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY), + CraftingRecipeInput.create(2, 2, List.of( + baseShulkerBox, dye, + ItemStack.EMPTY, ItemStack.EMPTY)), dyedShulkerBox)); } } @@ -192,10 +188,10 @@ public class RecipeTests { shulkerBox.getItem().getName().getString(), chest.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( shell, ItemStack.EMPTY, ItemStack.EMPTY, chest, ItemStack.EMPTY, ItemStack.EMPTY, - shell, ItemStack.EMPTY, ItemStack.EMPTY), + shell, ItemStack.EMPTY, ItemStack.EMPTY)), shulkerBox)); } @@ -214,10 +210,10 @@ public class RecipeTests { add(RecipeTests.createTest( String.format("Craft %s", baseShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( material, material, material, material, baseShulkerBox, material, - material, material, material), + material, material, material)), shulkerBox)); } @@ -240,10 +236,9 @@ public class RecipeTests { baseShulkerBox.getItem().getName().getString(), dyedShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( - baseShulkerBox, dye, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY), + CraftingRecipeInput.create(2, 2, List.of( + baseShulkerBox, dye, + ItemStack.EMPTY, ItemStack.EMPTY)), dyedShulkerBox)); } } @@ -262,10 +257,10 @@ public class RecipeTests { shulkerBox.getItem().getName().getString(), chest.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( shell, ItemStack.EMPTY, ItemStack.EMPTY, chest, ItemStack.EMPTY, ItemStack.EMPTY, - shell, ItemStack.EMPTY, ItemStack.EMPTY), + shell, ItemStack.EMPTY, ItemStack.EMPTY)), shulkerBox)); } @@ -284,10 +279,10 @@ public class RecipeTests { add(RecipeTests.createTest( String.format("Craft %s", baseShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( material, material, material, material, baseShulkerBox, material, - material, material, material), + material, material, material)), shulkerBox)); } @@ -310,10 +305,9 @@ public class RecipeTests { baseShulkerBox.getItem().getName().getString(), dyedShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( - baseShulkerBox, dye, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY), + CraftingRecipeInput.create(2, 2, List.of( + baseShulkerBox, dye, + ItemStack.EMPTY, ItemStack.EMPTY)), dyedShulkerBox)); } } @@ -332,10 +326,10 @@ public class RecipeTests { shulkerBox.getItem().getName().getString(), chest.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( shell, ItemStack.EMPTY, ItemStack.EMPTY, chest, ItemStack.EMPTY, ItemStack.EMPTY, - shell, ItemStack.EMPTY, ItemStack.EMPTY), + shell, ItemStack.EMPTY, ItemStack.EMPTY)), shulkerBox)); } @@ -355,7 +349,7 @@ public class RecipeTests { add(RecipeTests.createTest( String.format("Smithing %s", baseShulkerBox.getItem().getName().getString()), RecipeType.SMITHING, - new SimpleInventory(template, baseShulkerBox, material), + new SmithingRecipeInput(template, baseShulkerBox, material), shulkerBox)); } @@ -378,10 +372,9 @@ public class RecipeTests { baseShulkerBox.getItem().getName().getString(), dyedShulkerBox.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( - baseShulkerBox, dye, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY, - ItemStack.EMPTY, ItemStack.EMPTY, ItemStack.EMPTY), + CraftingRecipeInput.create(2, 2, List.of( + baseShulkerBox, dye, + ItemStack.EMPTY, ItemStack.EMPTY)), dyedShulkerBox)); } } @@ -400,17 +393,17 @@ public class RecipeTests { shulkerBox.getItem().getName().getString(), chest.getItem().getName().getString()), RecipeType.CRAFTING, - RecipeTests.create3x3CraftingInventory( + CraftingRecipeInput.create(3, 3, List.of( shell, ItemStack.EMPTY, ItemStack.EMPTY, chest, ItemStack.EMPTY, ItemStack.EMPTY, - shell, ItemStack.EMPTY, ItemStack.EMPTY), + shell, ItemStack.EMPTY, ItemStack.EMPTY)), shulkerBox)); } } }; - private static > TestFunction createTest( - String name, RecipeType type, C inventory, ItemStack expected) { + private static > TestFunction createTest(String name, + RecipeType type, I input, ItemStack expected) { String testName = String.format("%s %s %s", ReinforcedShulkerBoxesMod.MOD_ID, RecipeTests.class.getSimpleName(), @@ -434,10 +427,10 @@ private static > TestFunction createTes ServerWorld world = context.getWorld(); RecipeManager recipeManager = world.getRecipeManager(); DynamicRegistryManager registryManager = world.getRegistryManager(); - T recipe = recipeManager.getFirstMatch(type, inventory, world).orElseThrow().value(); + T recipe = recipeManager.getFirstMatch(type, input, world).orElseThrow().value(); // Act - ItemStack actual = recipe.craft(inventory, registryManager); + ItemStack actual = recipe.craft(input, registryManager); // Assert try { @@ -451,21 +444,4 @@ private static > TestFunction createTes context.complete(); }); } - - private static RecipeInputInventory create3x3CraftingInventory( - ItemStack stack1, ItemStack stack2, ItemStack stack3, - ItemStack stack4, ItemStack stack5, ItemStack stack6, - ItemStack stack7, ItemStack stack8, ItemStack stack9) { - RecipeInputInventory inventory = new CraftingInventory(new VoidScreenHander(), 3, 3); - inventory.setStack(0, stack1); - inventory.setStack(1, stack2); - inventory.setStack(2, stack3); - inventory.setStack(3, stack4); - inventory.setStack(4, stack5); - inventory.setStack(5, stack6); - inventory.setStack(6, stack7); - inventory.setStack(7, stack8); - inventory.setStack(8, stack9); - return inventory; - } } diff --git a/src/main/java/atonkish/reinfshulker/gametest/util/VoidScreenHander.java b/src/main/java/atonkish/reinfshulker/gametest/util/VoidScreenHander.java deleted file mode 100644 index c709742..0000000 --- a/src/main/java/atonkish/reinfshulker/gametest/util/VoidScreenHander.java +++ /dev/null @@ -1,21 +0,0 @@ -package atonkish.reinfshulker.gametest.util; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.screen.ScreenHandler; - -public class VoidScreenHander extends ScreenHandler { - public VoidScreenHander() { - super(null, 0); - } - - @Override - public ItemStack quickMove(PlayerEntity player, int index) { - throw new UnsupportedOperationException("not implemented"); - }; - - @Override - public boolean canUse(PlayerEntity player) { - throw new UnsupportedOperationException("not implemented"); - }; -} diff --git a/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java b/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java deleted file mode 100644 index 4803b4b..0000000 --- a/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ReinforcedShulkerBoxPreviewProvider.java +++ /dev/null @@ -1,69 +0,0 @@ -package atonkish.reinfshulker.integration.shulkerboxtooltip; - -import com.misterpemodder.shulkerboxtooltip.api.PreviewContext; -import com.misterpemodder.shulkerboxtooltip.api.color.ColorKey; -import com.misterpemodder.shulkerboxtooltip.api.provider.BlockEntityPreviewProvider; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -import net.minecraft.block.Block; -import net.minecraft.util.DyeColor; - -import atonkish.reinfcore.util.ReinforcingMaterial; -import atonkish.reinfshulker.block.ReinforcedShulkerBoxBlock; - -public class ReinforcedShulkerBoxPreviewProvider extends BlockEntityPreviewProvider { - protected final int maxRowSize; - private final ReinforcingMaterial material; - - public ReinforcedShulkerBoxPreviewProvider(ReinforcingMaterial material) { - super(material.getSize(), true); - - int size = material.getSize(); - this.maxRowSize = size <= 81 ? 9 : size / 9; - - this.material = material; - } - - @Override - public boolean showTooltipHints(PreviewContext context) { - return true; - } - - @Override - @Environment(EnvType.CLIENT) - public ColorKey getWindowColorKey(PreviewContext context) { - DyeColor dye = ((ReinforcedShulkerBoxBlock) Block.getBlockFromItem(context.stack().getItem())).getColor(); - - if (dye == null) - return ColorKey.SHULKER_BOX; - return switch (dye) { - case ORANGE -> ColorKey.ORANGE_SHULKER_BOX; - case MAGENTA -> ColorKey.MAGENTA_SHULKER_BOX; - case LIGHT_BLUE -> ColorKey.LIGHT_BLUE_SHULKER_BOX; - case YELLOW -> ColorKey.YELLOW_SHULKER_BOX; - case LIME -> ColorKey.LIME_SHULKER_BOX; - case PINK -> ColorKey.PINK_SHULKER_BOX; - case GRAY -> ColorKey.GRAY_SHULKER_BOX; - case LIGHT_GRAY -> ColorKey.LIGHT_GRAY_SHULKER_BOX; - case CYAN -> ColorKey.CYAN_SHULKER_BOX; - case PURPLE -> ColorKey.PURPLE_SHULKER_BOX; - case BLUE -> ColorKey.BLUE_SHULKER_BOX; - case BROWN -> ColorKey.BROWN_SHULKER_BOX; - case GREEN -> ColorKey.GREEN_SHULKER_BOX; - case RED -> ColorKey.RED_SHULKER_BOX; - case BLACK -> ColorKey.BLACK_SHULKER_BOX; - default -> ColorKey.WHITE_SHULKER_BOX; - }; - } - - @Override - public int getMaxRowSize(PreviewContext context) { - return this.maxRowSize; - } - - public ReinforcingMaterial getMaterial() { - return this.material; - } -} diff --git a/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ShulkerBoxTooltip.java b/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ShulkerBoxTooltip.java deleted file mode 100644 index 0349c0b..0000000 --- a/src/main/java/atonkish/reinfshulker/integration/shulkerboxtooltip/ShulkerBoxTooltip.java +++ /dev/null @@ -1,32 +0,0 @@ -package atonkish.reinfshulker.integration.shulkerboxtooltip; - -import com.misterpemodder.shulkerboxtooltip.api.ShulkerBoxTooltipApi; -import com.misterpemodder.shulkerboxtooltip.api.provider.PreviewProvider; -import com.misterpemodder.shulkerboxtooltip.api.provider.PreviewProviderRegistry; - -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.Item; -import net.minecraft.util.Identifier; - -import atonkish.reinfcore.util.ReinforcingMaterial; -import atonkish.reinfcore.util.ReinforcingMaterials; -import atonkish.reinfshulker.block.entity.ModBlockEntityType; -import atonkish.reinfshulker.item.ModItems; - -public class ShulkerBoxTooltip implements ShulkerBoxTooltipApi { - private static void register(PreviewProviderRegistry registry, String namespace, String id, - PreviewProvider provider, Item... items) { - registry.register(new Identifier(namespace, id), provider, items); - } - - @Override - public void registerProviders(PreviewProviderRegistry registry) { - for (ReinforcingMaterial material : ReinforcingMaterials.MAP.values()) { - String namespace = BlockEntityType.getId(ModBlockEntityType.REINFORCED_SHULKER_BOX_MAP.get(material)) - .getNamespace(); - String id = material.getName() + "_shulker_box"; - Item[] items = ModItems.REINFORCED_SHULKER_BOX_MAP.get(material).values().toArray(new Item[0]); - register(registry, namespace, id, new ReinforcedShulkerBoxPreviewProvider(material), items); - } - } -} diff --git a/src/main/java/atonkish/reinfshulker/mixin/ShulkerBoxColoringRecipeMixin.java b/src/main/java/atonkish/reinfshulker/mixin/ShulkerBoxColoringRecipeMixin.java index 4a6ed56..c3a3d99 100644 --- a/src/main/java/atonkish/reinfshulker/mixin/ShulkerBoxColoringRecipeMixin.java +++ b/src/main/java/atonkish/reinfshulker/mixin/ShulkerBoxColoringRecipeMixin.java @@ -1,9 +1,9 @@ package atonkish.reinfshulker.mixin; import net.minecraft.block.Block; -import net.minecraft.inventory.RecipeInputInventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.ShulkerBoxColoringRecipe; +import net.minecraft.recipe.input.CraftingRecipeInput; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; @@ -16,10 +16,10 @@ @Mixin(ShulkerBoxColoringRecipe.class) public class ShulkerBoxColoringRecipeMixin { @Inject(at = @At("HEAD"), method = "matches", cancellable = true) - public void matches(RecipeInputInventory recipeInputInventory, World world, + public void matches(CraftingRecipeInput craftingRecipeInput, World world, CallbackInfoReturnable infoReturnable) { - for (int k = 0; k < recipeInputInventory.size(); ++k) { - ItemStack itemStack = recipeInputInventory.getStack(k); + for (int k = 0; k < craftingRecipeInput.getSize(); ++k) { + ItemStack itemStack = craftingRecipeInput.getStackInSlot(k); if (Block.getBlockFromItem(itemStack.getItem()) instanceof ReinforcedShulkerBoxBlock) { infoReturnable.setReturnValue(false); } diff --git a/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java b/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java index 42da345..6652bac 100644 --- a/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java +++ b/src/main/java/atonkish/reinfshulker/recipe/ModRecipeSerializer.java @@ -17,7 +17,7 @@ public static void init() { } private static , T extends Recipe> S register(String id, S serializer) { - Identifier identifier = new Identifier(ReinforcedShulkerBoxesMod.MOD_ID, id); + Identifier identifier = Identifier.of(ReinforcedShulkerBoxesMod.MOD_ID, id); return Registry.register(Registries.RECIPE_SERIALIZER, identifier, serializer); } diff --git a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java index f7cb77a..e707314 100644 --- a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java +++ b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxColoringRecipe.java @@ -1,7 +1,6 @@ package atonkish.reinfshulker.recipe; import net.minecraft.block.Block; -import net.minecraft.inventory.RecipeInputInventory; import net.minecraft.item.DyeItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -9,6 +8,7 @@ import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.recipe.input.CraftingRecipeInput; import net.minecraft.registry.RegistryWrapper; import net.minecraft.world.World; @@ -23,12 +23,12 @@ public ReinforcedShulkerBoxColoringRecipe(CraftingRecipeCategory craftingRecipeC } @Override - public boolean matches(RecipeInputInventory recipeInputInventory, World world) { + public boolean matches(CraftingRecipeInput craftingRecipeInput, World world) { int i = 0; int j = 0; - for (int k = 0; k < recipeInputInventory.size(); ++k) { - ItemStack itemStack = recipeInputInventory.getStack(k); + for (int k = 0; k < craftingRecipeInput.getSize(); ++k) { + ItemStack itemStack = craftingRecipeInput.getStackInSlot(k); if (itemStack.isEmpty()) { continue; } @@ -52,15 +52,15 @@ public boolean matches(RecipeInputInventory recipeInputInventory, World world) { } @Override - public ItemStack craft(RecipeInputInventory recipeInputInventory, RegistryWrapper.WrapperLookup wrapperLookup) { + public ItemStack craft(CraftingRecipeInput craftingRecipeInput, RegistryWrapper.WrapperLookup wrapperLookup) { ItemStack itemStack = ItemStack.EMPTY; DyeItem dyeItem = (DyeItem) Items.WHITE_DYE; @Nullable ReinforcingMaterial material = null; - for (int i = 0; i < recipeInputInventory.size(); ++i) { - ItemStack itemStack2 = recipeInputInventory.getStack(i); + for (int i = 0; i < craftingRecipeInput.getSize(); ++i) { + ItemStack itemStack2 = craftingRecipeInput.getStackInSlot(i); if (itemStack2.isEmpty()) { continue; } diff --git a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java index d3cdf50..e234ed2 100644 --- a/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java +++ b/src/main/java/atonkish/reinfshulker/recipe/ReinforcedShulkerBoxCraftingRecipe.java @@ -4,7 +4,6 @@ import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.minecraft.inventory.RecipeInputInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.network.RegistryByteBuf; @@ -13,6 +12,7 @@ import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.ShapedRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.recipe.input.CraftingRecipeInput; import net.minecraft.registry.RegistryWrapper; public class ReinforcedShulkerBoxCraftingRecipe extends ShapedRecipe { @@ -39,9 +39,9 @@ private RawShapedRecipe getRaw() { } @Override - public ItemStack craft(RecipeInputInventory recipeInputInventory, RegistryWrapper.WrapperLookup wrapperLookup) { + public ItemStack craft(CraftingRecipeInput craftingRecipeInput, RegistryWrapper.WrapperLookup wrapperLookup) { Item item = this.getResult(wrapperLookup).copy().getItem(); - ItemStack itemStack = recipeInputInventory.getStack(4); + ItemStack itemStack = craftingRecipeInput.getStackInSlot(4); return itemStack.copyComponentsToNewStack(item, 1); } diff --git a/src/main/java/atonkish/reinfshulker/stat/ModStats.java b/src/main/java/atonkish/reinfshulker/stat/ModStats.java index 5487793..f421e6d 100644 --- a/src/main/java/atonkish/reinfshulker/stat/ModStats.java +++ b/src/main/java/atonkish/reinfshulker/stat/ModStats.java @@ -36,7 +36,7 @@ public static Identifier registerMaterialOpen(String namespace, ReinforcingMater } private static Identifier register(String namespace, String id, StatFormatter formatter) { - Identifier identifier = new Identifier(namespace, id); + Identifier identifier = Identifier.of(namespace, id); Registry.register(Registries.CUSTOM_STAT, id, identifier); Stats.CUSTOM.getOrCreateStat(identifier, formatter); return identifier; diff --git a/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java b/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java index abb759e..bc14692 100644 --- a/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java +++ b/src/main/java/atonkish/reinfshulker/util/ReinforcingMaterialSettings.java @@ -6,7 +6,7 @@ import net.minecraft.block.MapColor; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.ShulkerBoxBlockEntity; -import net.minecraft.block.enums.Instrument; +import net.minecraft.block.enums.NoteBlockInstrument; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.item.Item; import net.minecraft.item.Items; @@ -26,14 +26,14 @@ public enum ReinforcingMaterialSettings { IRON(ReinforcedCoreRegistry.registerReinforcingMaterial("iron", 54, Items.IRON_INGOT), AbstractBlock.Settings .create() - .instrument(Instrument.IRON_XYLOPHONE) + .instrument(NoteBlockInstrument.IRON_XYLOPHONE) .strength(2.0F, 6.0F) .sounds(BlockSoundGroup.METAL), new Item.Settings()), GOLD(ReinforcedCoreRegistry.registerReinforcingMaterial("gold", 81, Items.GOLD_INGOT), AbstractBlock.Settings .create() - .instrument(Instrument.BELL) + .instrument(NoteBlockInstrument.BELL) .strength(2.0F, 6.0F) .sounds(BlockSoundGroup.METAL), new Item.Settings()), diff --git a/src/main/resources/data/enchantedshulkers/tags/items/portable_container.json b/src/main/resources/data/enchantedshulkers/tags/item/portable_container.json similarity index 100% rename from src/main/resources/data/enchantedshulkers/tags/items/portable_container.json rename to src/main/resources/data/enchantedshulkers/tags/item/portable_container.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/shulker_boxes.json b/src/main/resources/data/minecraft/tags/block/shulker_boxes.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/shulker_boxes.json rename to src/main/resources/data/minecraft/tags/block/shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/copper_shulker_box.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/copper_shulker_box.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/copper_shulker_box_from_copper_chest.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/copper_shulker_box_from_copper_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/copper_shulker_box_from_copper_chest.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/copper_shulker_box_from_copper_chest.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/diamond_shulker_box.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/diamond_shulker_box_from_diamond_chest.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/diamond_shulker_box_from_diamond_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/diamond_shulker_box_from_diamond_chest.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/diamond_shulker_box_from_diamond_chest.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/gold_shulker_box.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/gold_shulker_box.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/gold_shulker_box_from_gold_chest.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/gold_shulker_box_from_gold_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/gold_shulker_box_from_gold_chest.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/gold_shulker_box_from_gold_chest.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/iron_shulker_box.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/iron_shulker_box.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/iron_shulker_box_from_iron_chest.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/iron_shulker_box_from_iron_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/iron_shulker_box_from_iron_chest.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/iron_shulker_box_from_iron_chest.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/netherite_shulker_box_from_netherite_chest.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/netherite_shulker_box_from_netherite_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/netherite_shulker_box_from_netherite_chest.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/netherite_shulker_box_from_netherite_chest.json diff --git a/src/main/resources/data/reinfshulker/advancements/recipes/decorations/netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/advancement/recipes/decorations/netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/advancements/recipes/decorations/netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/advancement/recipes/decorations/netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/black_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/black_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/black_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/black_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/black_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/black_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/black_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/black_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/black_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/black_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/black_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/black_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/black_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/black_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/black_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/black_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/black_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/black_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/black_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/black_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/blue_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/blue_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/blue_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/blue_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/blue_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/blue_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/blue_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/blue_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/blue_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/blue_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/blue_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/blue_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/blue_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/blue_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/blue_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/blue_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/blue_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/blue_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/blue_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/blue_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/brown_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/brown_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/brown_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/brown_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/brown_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/brown_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/brown_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/brown_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/brown_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/brown_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/brown_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/brown_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/brown_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/brown_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/brown_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/brown_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/brown_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/brown_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/brown_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/brown_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/cyan_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/cyan_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/cyan_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/cyan_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/cyan_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/cyan_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/cyan_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/cyan_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/cyan_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/cyan_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/cyan_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/gray_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/gray_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/gray_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/gray_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/gray_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/gray_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/gray_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/gray_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/gray_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/gray_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/gray_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/gray_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/gray_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/gray_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/gray_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/gray_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/gray_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/gray_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/gray_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/gray_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/green_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/green_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/green_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/green_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/green_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/green_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/green_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/green_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/green_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/green_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/green_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/green_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/green_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/green_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/green_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/green_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/green_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/green_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/green_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/green_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_blue_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_blue_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/light_gray_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/light_gray_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/lime_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/lime_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/lime_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/lime_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/lime_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/lime_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/lime_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/lime_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/lime_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/lime_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/lime_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/lime_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/lime_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/lime_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/lime_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/lime_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/lime_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/lime_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/lime_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/lime_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/magenta_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/magenta_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/magenta_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/magenta_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/magenta_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/magenta_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/magenta_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/magenta_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/magenta_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/magenta_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/magenta_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/orange_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/orange_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/orange_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/orange_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/orange_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/orange_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/orange_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/orange_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/orange_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/orange_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/orange_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/orange_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/orange_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/orange_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/orange_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/orange_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/orange_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/orange_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/orange_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/orange_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/pink_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/pink_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/pink_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/pink_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/pink_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/pink_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/pink_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/pink_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/pink_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/pink_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/pink_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/pink_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/pink_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/pink_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/pink_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/pink_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/pink_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/pink_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/pink_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/pink_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/purple_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/purple_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/purple_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/purple_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/purple_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/purple_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/purple_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/purple_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/purple_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/purple_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/purple_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/purple_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/purple_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/purple_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/purple_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/purple_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/purple_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/purple_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/purple_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/purple_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/red_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/red_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/red_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/red_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/red_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/red_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/red_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/red_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/red_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/red_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/red_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/red_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/red_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/red_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/red_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/red_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/red_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/red_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/red_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/red_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/white_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/white_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/white_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/white_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/white_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/white_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/white_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/white_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/white_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/white_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/white_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/white_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/white_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/white_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/white_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/white_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/white_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/white_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/white_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/white_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_copper_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/yellow_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/yellow_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/yellow_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/yellow_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_gold_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/yellow_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/yellow_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_iron_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/yellow_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/yellow_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_netherite_shulker_box.json b/src/main/resources/data/reinfshulker/loot_table/blocks/yellow_netherite_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/loot_tables/blocks/yellow_netherite_shulker_box.json rename to src/main/resources/data/reinfshulker/loot_table/blocks/yellow_netherite_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/black_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/black_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/black_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/black_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/black_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/black_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/black_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/black_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/black_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/black_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/black_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/black_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/black_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/black_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/black_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/black_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/black_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/black_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/black_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/black_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/blue_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/blue_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/blue_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/blue_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/blue_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/blue_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/blue_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/blue_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/blue_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/blue_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/blue_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/blue_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/blue_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/blue_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/blue_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/blue_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/blue_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/blue_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/blue_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/blue_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/brown_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/brown_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/brown_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/brown_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/brown_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/brown_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/brown_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/brown_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/brown_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/brown_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/brown_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/brown_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/brown_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/brown_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/brown_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/brown_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/brown_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/brown_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/brown_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/brown_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/copper_shulker_box_from_copper_chest.json b/src/main/resources/data/reinfshulker/recipe/copper_shulker_box_from_copper_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/copper_shulker_box_from_copper_chest.json rename to src/main/resources/data/reinfshulker/recipe/copper_shulker_box_from_copper_chest.json diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/cyan_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/cyan_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/cyan_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/cyan_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/cyan_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/cyan_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/cyan_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/cyan_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/cyan_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/cyan_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/cyan_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/cyan_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/cyan_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/cyan_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/cyan_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/cyan_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/diamond_shulker_box_from_diamond_chest.json b/src/main/resources/data/reinfshulker/recipe/diamond_shulker_box_from_diamond_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/diamond_shulker_box_from_diamond_chest.json rename to src/main/resources/data/reinfshulker/recipe/diamond_shulker_box_from_diamond_chest.json diff --git a/src/main/resources/data/reinfshulker/recipes/gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/gold_shulker_box_from_gold_chest.json b/src/main/resources/data/reinfshulker/recipe/gold_shulker_box_from_gold_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/gold_shulker_box_from_gold_chest.json rename to src/main/resources/data/reinfshulker/recipe/gold_shulker_box_from_gold_chest.json diff --git a/src/main/resources/data/reinfshulker/recipes/gray_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/gray_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/gray_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/gray_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/gray_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/gray_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/gray_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/gray_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/gray_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/gray_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/gray_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/gray_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/gray_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/gray_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/gray_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/gray_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/gray_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/gray_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/gray_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/gray_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/green_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/green_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/green_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/green_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/green_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/green_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/green_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/green_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/green_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/green_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/green_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/green_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/green_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/green_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/green_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/green_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/green_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/green_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/green_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/green_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/iron_shulker_box_from_iron_chest.json b/src/main/resources/data/reinfshulker/recipe/iron_shulker_box_from_iron_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/iron_shulker_box_from_iron_chest.json rename to src/main/resources/data/reinfshulker/recipe/iron_shulker_box_from_iron_chest.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_blue_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_blue_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_blue_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_blue_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_blue_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_blue_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_blue_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_blue_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_blue_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_blue_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_blue_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_blue_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_blue_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/light_blue_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_blue_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/light_blue_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_gray_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_gray_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_gray_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_gray_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_gray_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_gray_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_gray_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_gray_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_gray_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/light_gray_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_gray_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/light_gray_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/light_gray_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/light_gray_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/light_gray_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/light_gray_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/lime_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/lime_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/lime_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/lime_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/lime_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/lime_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/lime_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/lime_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/lime_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/lime_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/lime_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/lime_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/lime_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/lime_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/lime_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/lime_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/lime_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/lime_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/lime_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/lime_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/magenta_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/magenta_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/magenta_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/magenta_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/magenta_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/magenta_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/magenta_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/magenta_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/magenta_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/magenta_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/magenta_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/magenta_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/magenta_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/magenta_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/magenta_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/magenta_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_from_netherite_chest.json b/src/main/resources/data/reinfshulker/recipe/netherite_shulker_box_from_netherite_chest.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_from_netherite_chest.json rename to src/main/resources/data/reinfshulker/recipe/netherite_shulker_box_from_netherite_chest.json diff --git a/src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/orange_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/orange_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/orange_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/orange_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/orange_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/orange_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/orange_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/orange_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/orange_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/orange_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/orange_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/orange_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/orange_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/orange_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/orange_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/orange_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/orange_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/orange_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/orange_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/orange_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/pink_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/pink_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/pink_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/pink_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/pink_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/pink_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/pink_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/pink_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/pink_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/pink_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/pink_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/pink_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/pink_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/pink_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/pink_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/pink_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/pink_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/pink_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/pink_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/pink_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/purple_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/purple_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/purple_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/purple_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/purple_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/purple_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/purple_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/purple_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/purple_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/purple_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/purple_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/purple_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/purple_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/purple_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/purple_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/purple_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/purple_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/purple_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/purple_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/purple_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/red_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/red_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/red_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/red_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/red_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/red_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/red_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/red_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/red_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/red_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/red_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/red_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/red_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/red_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/red_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/red_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/red_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/red_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/red_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/red_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/reinforced_shulker_box_coloring.json b/src/main/resources/data/reinfshulker/recipe/reinforced_shulker_box_coloring.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/reinforced_shulker_box_coloring.json rename to src/main/resources/data/reinfshulker/recipe/reinforced_shulker_box_coloring.json diff --git a/src/main/resources/data/reinfshulker/recipes/white_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/white_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/white_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/white_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/white_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/white_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/white_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/white_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/white_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/white_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/white_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/white_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/white_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/white_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/white_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/white_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/white_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/white_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/white_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/white_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_copper_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/yellow_copper_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/yellow_copper_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/yellow_copper_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_diamond_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/yellow_diamond_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/yellow_diamond_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/yellow_diamond_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_gold_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/yellow_gold_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/yellow_gold_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/yellow_gold_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_iron_shulker_box.json b/src/main/resources/data/reinfshulker/recipe/yellow_iron_shulker_box.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/yellow_iron_shulker_box.json rename to src/main/resources/data/reinfshulker/recipe/yellow_iron_shulker_box.json diff --git a/src/main/resources/data/reinfshulker/recipes/yellow_netherite_shulker_box_smithing.json b/src/main/resources/data/reinfshulker/recipe/yellow_netherite_shulker_box_smithing.json similarity index 100% rename from src/main/resources/data/reinfshulker/recipes/yellow_netherite_shulker_box_smithing.json rename to src/main/resources/data/reinfshulker/recipe/yellow_netherite_shulker_box_smithing.json diff --git a/src/main/resources/data/reinfshulker/tags/blocks/copper_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/block/copper_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/blocks/copper_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/block/copper_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/blocks/diamond_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/block/diamond_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/blocks/diamond_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/block/diamond_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/blocks/gold_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/block/gold_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/blocks/gold_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/block/gold_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/blocks/iron_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/block/iron_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/blocks/iron_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/block/iron_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/blocks/netherite_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/block/netherite_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/blocks/netherite_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/block/netherite_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/items/copper_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/item/copper_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/items/copper_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/item/copper_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/items/diamond_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/item/diamond_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/items/diamond_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/item/diamond_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/items/gold_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/item/gold_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/items/gold_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/item/gold_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/items/iron_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/item/iron_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/items/iron_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/item/iron_shulker_boxes.json diff --git a/src/main/resources/data/reinfshulker/tags/items/netherite_shulker_boxes.json b/src/main/resources/data/reinfshulker/tags/item/netherite_shulker_boxes.json similarity index 100% rename from src/main/resources/data/reinfshulker/tags/items/netherite_shulker_boxes.json rename to src/main/resources/data/reinfshulker/tags/item/netherite_shulker_boxes.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cd24a45..0001789 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -21,7 +21,6 @@ "reinfcore": ["atonkish.reinfshulker.ReinforcedShulkerBoxesMod"], "reinfcore-client": ["atonkish.reinfshulker.ReinforcedShulkerBoxesClientMod"], "reinfcore-gametest": ["atonkish.reinfshulker.gametest.ReinforcedShulkerBoxesModGameTest"], - "shulkerboxtooltip": ["atonkish.reinfshulker.integration.shulkerboxtooltip.ShulkerBoxTooltip"], "modmenu": ["atonkish.reinfcore.integration.modmenu.ModMenu"] }, "mixins": [ @@ -29,8 +28,8 @@ ], "depends": { - "fabricloader": ">=0.15.10", - "minecraft": ">=1.20.5", + "fabricloader": ">=0.15.11", + "minecraft": "~1.21", "java": ">=21", "fabric-api": "*" },