diff --git a/gradle.properties b/gradle.properties
index d0e55aa..55b3919 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,8 +4,8 @@ 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
@@ -15,4 +15,4 @@ archives_base_name=stal-alloys
 modid=stal-alloys
 
 # Dependencies
-fabric_version=0.100.2+1.20.6
\ No newline at end of file
+fabric_version=0.100.3+1.21
\ No newline at end of file
diff --git a/src/main/java/net/stal/alloys/block/StalAlloysBlocks.java b/src/main/java/net/stal/alloys/block/StalAlloysBlocks.java
index f75a50b..e4bbd73 100644
--- a/src/main/java/net/stal/alloys/block/StalAlloysBlocks.java
+++ b/src/main/java/net/stal/alloys/block/StalAlloysBlocks.java
@@ -257,11 +257,11 @@ public class StalAlloysBlocks {
   private static Block registerBlock(String name, Block block) {
     registerBlockItem(name, block);
 
-    return Registry.register(Registries.BLOCK, new Identifier(StalAlloys.MOD_ID, name), block);
+    return Registry.register(Registries.BLOCK, Identifier.of(StalAlloys.MOD_ID, name), block);
   }
 
   private static Item registerBlockItem(String name, Block block) {
-    Item item = Registry.register(Registries.ITEM, new Identifier(StalAlloys.MOD_ID, name), new BlockItem(block, new Item.Settings()));
+    Item item = Registry.register(Registries.ITEM, Identifier.of(StalAlloys.MOD_ID, name), new BlockItem(block, new Item.Settings()));
 
     return item;
   }
diff --git a/src/main/java/net/stal/alloys/block/entity/AlloySmelterEntity.java b/src/main/java/net/stal/alloys/block/entity/AlloySmelterEntity.java
index c0118ab..dc97a34 100644
--- a/src/main/java/net/stal/alloys/block/entity/AlloySmelterEntity.java
+++ b/src/main/java/net/stal/alloys/block/entity/AlloySmelterEntity.java
@@ -148,7 +148,7 @@ public void readNbt(NbtCompound nbt, WrapperLookup registryLookup) {
 
     NbtCompound nbtCompound = nbt.getCompound(mRecipesUsedNBTKey);
     for (String string : nbtCompound.getKeys()) {
-      this.recipesUsed.put(new Identifier(string), nbtCompound.getInt(string));
+      this.recipesUsed.put(Identifier.of(string), nbtCompound.getInt(string));
     }
   }
 
@@ -213,8 +213,15 @@ private static boolean hasRecipe(AlloySmelterEntity entity) {
     }
     
     Optional<RecipeEntry<AlloySmelterRecipe>> recipeFromInventoryOpt = entity.getWorld()
-                                                .getRecipeManager()
-                                                .getFirstMatch(AlloySmelterRecipe.AlloySmelterRecipeType.INSTANCE, inventory, entity.getWorld());
+      .getRecipeManager()
+      .getFirstMatch(
+        AlloySmelterRecipe.AlloySmelterRecipeType.INSTANCE, 
+        new AlloySmelterRecipeInput(
+          inventory.getStack(AlloySmelterInventorySlots.FIRST.value), 
+          inventory.getStack(AlloySmelterInventorySlots.SECOND.value)
+        ), 
+        entity.getWorld()
+      );
     
     if (recipeFromInventoryOpt.isPresent()) {
       AlloySmelterRecipe recipe = recipeFromInventoryOpt.get().value();
@@ -236,8 +243,15 @@ private static void craftItem(AlloySmelterEntity entity) {
     }
 
     Optional<RecipeEntry<AlloySmelterRecipe>> recipeFromInventoryOpt = entity.getWorld()
-                                                .getRecipeManager()
-                                                .getFirstMatch(AlloySmelterRecipe.AlloySmelterRecipeType.INSTANCE, inventory, entity.getWorld());
+      .getRecipeManager()
+      .getFirstMatch(
+        AlloySmelterRecipe.AlloySmelterRecipeType.INSTANCE, 
+        new AlloySmelterRecipeInput(
+          inventory.getStack(AlloySmelterInventorySlots.FIRST.value), 
+          inventory.getStack(AlloySmelterInventorySlots.SECOND.value)
+        ), 
+        entity.getWorld()
+      );
 
     if (recipeFromInventoryOpt.isPresent() && hasRecipe(entity)) {
       AlloySmelterRecipe recipe = recipeFromInventoryOpt.get().value();
diff --git a/src/main/java/net/stal/alloys/block/entity/StalAlloysBlockEntities.java b/src/main/java/net/stal/alloys/block/entity/StalAlloysBlockEntities.java
index b5a8cee..901e2e7 100644
--- a/src/main/java/net/stal/alloys/block/entity/StalAlloysBlockEntities.java
+++ b/src/main/java/net/stal/alloys/block/entity/StalAlloysBlockEntities.java
@@ -15,7 +15,7 @@ public static void registerModBlockEntities() {
     
     ALLOY_SMELTER_ENTITY = Registry.register(
       Registries.BLOCK_ENTITY_TYPE, 
-      new Identifier(
+      Identifier.of(
         StalAlloys.MOD_ID, 
         "alloy_smelter"
       ), 
diff --git a/src/main/java/net/stal/alloys/datagen/StalAlloysRecipeProvider.java b/src/main/java/net/stal/alloys/datagen/StalAlloysRecipeProvider.java
index cff2883..1048afb 100644
--- a/src/main/java/net/stal/alloys/datagen/StalAlloysRecipeProvider.java
+++ b/src/main/java/net/stal/alloys/datagen/StalAlloysRecipeProvider.java
@@ -63,7 +63,7 @@ public void generate(RecipeExporter exporter) {
       .input('C', Items.COBBLED_DEEPSLATE)
       .criterion(hasItem(Items.DEEPSLATE), conditionsFromItem(Items.DEEPSLATE))
       .criterion(hasItem(Items.FURNACE), conditionsFromItem(Items.FURNACE))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "alloy_smelter"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "alloy_smelter"));
 
     ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.BRASS_BOOTS, 1)
       .pattern("# #")
@@ -71,7 +71,7 @@ public void generate(RecipeExporter exporter) {
       .pattern("   ")
       .input('#', StalAlloysItems.BRASS_INGOT)
       .criterion(hasItem(StalAlloysItems.BRASS_INGOT), conditionsFromItem(StalAlloysItems.BRASS_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "brass_boots"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "brass_boots"));
 
     ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.BRASS_CHESTPLATE, 1)
       .pattern("# #")
@@ -79,7 +79,7 @@ public void generate(RecipeExporter exporter) {
       .pattern("###")
       .input('#', StalAlloysItems.BRASS_INGOT)
       .criterion(hasItem(StalAlloysItems.BRASS_INGOT), conditionsFromItem(StalAlloysItems.BRASS_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "brass_chestplate"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "brass_chestplate"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.BRASS_HELMET, 1)
       .pattern("###")
@@ -87,7 +87,7 @@ public void generate(RecipeExporter exporter) {
       .pattern("   ")
       .input('#', StalAlloysItems.BRASS_INGOT)
       .criterion(hasItem(StalAlloysItems.BRASS_INGOT), conditionsFromItem(StalAlloysItems.BRASS_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "brass_helmet"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "brass_helmet"));
   
     ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.BRASS_LEGGINGS, 1)
       .pattern("###")
@@ -95,7 +95,7 @@ public void generate(RecipeExporter exporter) {
       .pattern("# #")
       .input('#', StalAlloysItems.BRASS_INGOT)
       .criterion(hasItem(StalAlloysItems.BRASS_INGOT), conditionsFromItem(StalAlloysItems.BRASS_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "brass_leggings"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "brass_leggings"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.BRONZE_AXE, 1)
       .pattern("## ")
@@ -104,13 +104,13 @@ public void generate(RecipeExporter exporter) {
       .input('#', StalAlloysItems.BRONZE_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(StalAlloysItems.BRONZE_INGOT), conditionsFromItem(StalAlloysItems.BRONZE_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "bronze_axe"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "bronze_axe"));
     
     ShapelessRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.BRONZE_DAGGER, 1)
       .input(StalAlloysItems.BRONZE_INGOT, 1)
       .input(Items.STICK, 1)
       .criterion(hasItem(StalAlloysItems.BRONZE_INGOT), conditionsFromItem(StalAlloysItems.BRONZE_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "bronze_dagger"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "bronze_dagger"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.BRONZE_DIRK, 1)
       .pattern("  #")
@@ -119,7 +119,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', StalAlloysItems.BRONZE_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(StalAlloysItems.BRONZE_INGOT), conditionsFromItem(StalAlloysItems.BRONZE_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "bronze_dirk"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "bronze_dirk"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.BRONZE_SWORD, 1)
       .pattern(" # ")
@@ -128,7 +128,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', StalAlloysItems.BRONZE_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(StalAlloysItems.BRONZE_INGOT), conditionsFromItem(StalAlloysItems.BRONZE_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "bronze_sword"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "bronze_sword"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, StalAlloysItems.CARBON_PLATE, 1)
       .pattern("   ")
@@ -136,7 +136,7 @@ public void generate(RecipeExporter exporter) {
       .pattern("CCC")
       .input('C', StalAlloysItems.RAW_CARBON)
       .criterion(hasItem(StalAlloysItems.RAW_CARBON), conditionsFromItem(StalAlloysItems.RAW_CARBON))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "carbon_plate"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "carbon_plate"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.COPPER_AXE, 1)
       .pattern("## ")
@@ -145,7 +145,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', Items.COPPER_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(Items.COPPER_INGOT), conditionsFromItem(Items.COPPER_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "copper_axe"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "copper_axe"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.COPPER_HOE, 1)
       .pattern("## ")
@@ -154,7 +154,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', Items.COPPER_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(Items.COPPER_INGOT), conditionsFromItem(Items.COPPER_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "copper_hoe"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "copper_hoe"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.COPPER_PICKAXE, 1)
       .pattern("###")
@@ -163,7 +163,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', Items.COPPER_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(Items.COPPER_INGOT), conditionsFromItem(Items.COPPER_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "copper_pickaxe"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "copper_pickaxe"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.COPPER_SHOVEL, 1)
       .pattern(" # ")
@@ -172,7 +172,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', Items.COPPER_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(Items.COPPER_INGOT), conditionsFromItem(Items.COPPER_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "copper_shovel"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "copper_shovel"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, StalAlloysItems.COPPER_SWORD, 1)
       .pattern(" # ")
@@ -181,7 +181,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', Items.COPPER_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(Items.COPPER_INGOT), conditionsFromItem(Items.COPPER_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "copper_sword"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "copper_sword"));
 
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.STEEL_AXE, 1)
       .pattern("## ")
@@ -190,7 +190,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', StalAlloysItems.STEEL_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(StalAlloysItems.STEEL_INGOT), conditionsFromItem(StalAlloysItems.STEEL_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "steel_axe"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "steel_axe"));
 
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.STEEL_HOE, 1)
       .pattern("## ")
@@ -199,7 +199,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', StalAlloysItems.STEEL_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(StalAlloysItems.STEEL_INGOT), conditionsFromItem(StalAlloysItems.STEEL_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "steel_hoe"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "steel_hoe"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.STEEL_PICKAXE, 1)
       .pattern("###")
@@ -208,7 +208,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', StalAlloysItems.STEEL_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(StalAlloysItems.STEEL_INGOT), conditionsFromItem(StalAlloysItems.STEEL_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "steel_pickaxe"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "steel_pickaxe"));
     
     ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, StalAlloysItems.STEEL_SHOVEL, 1)
       .pattern(" # ")
@@ -217,7 +217,7 @@ public void generate(RecipeExporter exporter) {
       .input('#', StalAlloysItems.STEEL_INGOT)
       .input('S', Items.STICK)
       .criterion(hasItem(StalAlloysItems.STEEL_INGOT), conditionsFromItem(StalAlloysItems.STEEL_INGOT))
-      .offerTo(exporter, new Identifier(StalAlloys.MOD_ID, "steel_shovel"));
+      .offerTo(exporter, Identifier.of(StalAlloys.MOD_ID, "steel_shovel"));
   }
   
 }
diff --git a/src/main/java/net/stal/alloys/item/StalAlloysArmorMaterials.java b/src/main/java/net/stal/alloys/item/StalAlloysArmorMaterials.java
index 512cdad..56733a6 100644
--- a/src/main/java/net/stal/alloys/item/StalAlloysArmorMaterials.java
+++ b/src/main/java/net/stal/alloys/item/StalAlloysArmorMaterials.java
@@ -42,13 +42,13 @@ public class StalAlloysArmorMaterials extends ArmorMaterials{
   private static RegistryEntry<ArmorMaterial> registerArmorMaterial(String id, EnumMap<ArmorItem.Type, Integer> defense, int enchantability, RegistryEntry<SoundEvent> equipSound, float toughness, float knockbackResistance, Supplier<Ingredient> repairIngredient) {
       return Registry.registerReference(
         Registries.ARMOR_MATERIAL, 
-        new Identifier(StalAlloys.MOD_ID, id), 
+        Identifier.of(StalAlloys.MOD_ID, id), 
         new ArmorMaterial(
           defense, 
           enchantability, 
           equipSound, 
           repairIngredient, 
-          List.of(new ArmorMaterial.Layer(new Identifier(StalAlloys.MOD_ID, id))), 
+          List.of(new ArmorMaterial.Layer(Identifier.of(StalAlloys.MOD_ID, id))), 
           toughness, 
           knockbackResistance
         )
diff --git a/src/main/java/net/stal/alloys/item/StalAlloysItemGroup.java b/src/main/java/net/stal/alloys/item/StalAlloysItemGroup.java
index 3df2857..6bb490f 100644
--- a/src/main/java/net/stal/alloys/item/StalAlloysItemGroup.java
+++ b/src/main/java/net/stal/alloys/item/StalAlloysItemGroup.java
@@ -16,7 +16,7 @@
 
 public class StalAlloysItemGroup {
 
-  public static final RegistryKey<ItemGroup> STAL_ALLOYS = RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier(StalAlloys.MOD_ID, "stal_alloys"));
+  public static final RegistryKey<ItemGroup> STAL_ALLOYS = RegistryKey.of(RegistryKeys.ITEM_GROUP, Identifier.of(StalAlloys.MOD_ID, "stal_alloys"));
 
   public static final ItemGroup STAL_ALLOYS_ITEM_GROUP = Registry.register(
     Registries.ITEM_GROUP, 
diff --git a/src/main/java/net/stal/alloys/item/StalAlloysItems.java b/src/main/java/net/stal/alloys/item/StalAlloysItems.java
index 2526e6c..63b6edb 100644
--- a/src/main/java/net/stal/alloys/item/StalAlloysItems.java
+++ b/src/main/java/net/stal/alloys/item/StalAlloysItems.java
@@ -57,7 +57,7 @@ public class StalAlloysItems {
   public static final Item STAINLESS_STEEL_BOOTS = registerItem("stainless_steel_boots", new ArmorItem(StalAlloysArmorMaterials.STAINLESS_STEEL, ArmorItem.Type.BOOTS, new Item.Settings()));
 
   private static Item registerItem(String name, Item item) {
-    return Registry.register(Registries.ITEM, new Identifier(StalAlloys.MOD_ID, name), item);
+    return Registry.register(Registries.ITEM, Identifier.of(StalAlloys.MOD_ID, name), item);
   }
 
   public static void registerModItems() {
diff --git a/src/main/java/net/stal/alloys/recipe/AlloySmelterRecipe.java b/src/main/java/net/stal/alloys/recipe/AlloySmelterRecipe.java
index 14cc1dc..e26f288 100644
--- a/src/main/java/net/stal/alloys/recipe/AlloySmelterRecipe.java
+++ b/src/main/java/net/stal/alloys/recipe/AlloySmelterRecipe.java
@@ -5,8 +5,6 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.recipe.RecipeSerializer;
-
-import net.minecraft.inventory.SimpleInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
@@ -17,7 +15,7 @@
 
 import java.util.List;
 
-public class AlloySmelterRecipe implements Recipe<SimpleInventory> {
+public class AlloySmelterRecipe implements Recipe<AlloySmelterRecipeInput> {
 
   private final ItemStack mOutput;
   private final int mCookingTime;
@@ -47,21 +45,21 @@ public AlloySmelterRecipe( int cookingtime, int experience, List<Ingredient> rec
   }
 
   @Override
-  public boolean matches(SimpleInventory inventory, World world) {
+  public boolean matches(AlloySmelterRecipeInput recipeInput, World world) {
     if (world.isClient()) return false;
 
-    boolean matchA = mRecipeItems.get(0).test(inventory.getStack(0 /* 0 is the first slot */)) && 
-                     mRecipeItems.get(1).test(inventory.getStack(1 /* 1 is the second slot */));
+    boolean matchA = mRecipeItems.get(0).test(recipeInput.getStackInSlot(0 /* 0 is the first slot */)) && 
+                     mRecipeItems.get(1).test(recipeInput.getStackInSlot(1 /* 1 is the second slot */));
 
     // This is here because the inputs are slot agnostic
-    boolean matchB = mRecipeItems.get(1).test(inventory.getStack(0 /* 0 is the first slot */)) && 
-                     mRecipeItems.get(0).test(inventory.getStack(1 /* 1 is the second slot */));
+    boolean matchB = mRecipeItems.get(1).test(recipeInput.getStackInSlot(0 /* 0 is the first slot */)) && 
+                     mRecipeItems.get(0).test(recipeInput.getStackInSlot(1 /* 1 is the second slot */));
 
     return matchA || matchB;
   }
 
   @Override
-  public ItemStack craft(SimpleInventory inventory, WrapperLookup lookup) {
+  public ItemStack craft(AlloySmelterRecipeInput recipeInput, WrapperLookup lookup) {
     return mOutput;
   }
 
diff --git a/src/main/java/net/stal/alloys/recipe/AlloySmelterRecipeInput.java b/src/main/java/net/stal/alloys/recipe/AlloySmelterRecipeInput.java
new file mode 100644
index 0000000..304d49d
--- /dev/null
+++ b/src/main/java/net/stal/alloys/recipe/AlloySmelterRecipeInput.java
@@ -0,0 +1,49 @@
+package net.stal.alloys.recipe;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.input.RecipeInput;
+
+
+public record AlloySmelterRecipeInput(ItemStack slotA, ItemStack slotB) implements RecipeInput {
+
+
+  public AlloySmelterRecipeInput(ItemStack slotA, ItemStack slotB) {
+    this.slotA = slotA;
+    this.slotB = slotB;
+  }
+
+  @Override
+  public int getSize() {
+    return 2;
+  }
+
+  @Override
+  public ItemStack getStackInSlot(int slot) {
+    ItemStack result;
+    switch (slot) {
+      case 0:
+        result = this.slotA;
+        break;
+      case 1:
+        result = this.slotB;
+        break;
+      default:
+        throw new IllegalArgumentException("Recipe does not contain slot " + slot);
+    }
+
+    return result;
+  }
+
+  public boolean isEmpty() {
+    return this.slotA.isEmpty() && this.slotB.isEmpty();
+  }
+
+  public ItemStack slotA() {
+    return this.slotA.copy();
+  }
+
+  public ItemStack slotB() {
+    return this.slotB.copy();
+  }
+  
+}
diff --git a/src/main/java/net/stal/alloys/recipe/StalAlloysRecipes.java b/src/main/java/net/stal/alloys/recipe/StalAlloysRecipes.java
index 09c491e..87f80d8 100644
--- a/src/main/java/net/stal/alloys/recipe/StalAlloysRecipes.java
+++ b/src/main/java/net/stal/alloys/recipe/StalAlloysRecipes.java
@@ -12,14 +12,14 @@ public static void registerRecipes() {
     // Alloy Smelter Serializer
     Registry.register(
       Registries.RECIPE_SERIALIZER, 
-      new Identifier(StalAlloys.MOD_ID, AlloySmelterRecipe.AlloySmelterRecipeSerializer.ID), 
+      Identifier.of(StalAlloys.MOD_ID, AlloySmelterRecipe.AlloySmelterRecipeSerializer.ID), 
       AlloySmelterRecipe.AlloySmelterRecipeSerializer.INSTANCE
     );
 
     // Alloy Smelter Type
     Registry.register(
       Registries.RECIPE_TYPE, 
-      new Identifier(StalAlloys.MOD_ID, AlloySmelterRecipe.AlloySmelterRecipeType.ID), 
+      Identifier.of(StalAlloys.MOD_ID, AlloySmelterRecipe.AlloySmelterRecipeType.ID), 
       AlloySmelterRecipe.AlloySmelterRecipeType.INSTANCE
     );
   }
diff --git a/src/main/java/net/stal/alloys/screen/AlloySmelterScreen.java b/src/main/java/net/stal/alloys/screen/AlloySmelterScreen.java
index e3ce3c0..903b725 100644
--- a/src/main/java/net/stal/alloys/screen/AlloySmelterScreen.java
+++ b/src/main/java/net/stal/alloys/screen/AlloySmelterScreen.java
@@ -12,7 +12,7 @@
 
 public class AlloySmelterScreen extends HandledScreen<AlloySmelterScreenHandler> {
 
-  private static final Identifier ALLOY_SMELTER_SCREEN_TEXTURE = new Identifier(StalAlloys.MOD_ID, "textures/gui/container/alloy_smelter.png");
+  private static final Identifier ALLOY_SMELTER_SCREEN_TEXTURE = Identifier.of(StalAlloys.MOD_ID, "textures/gui/container/alloy_smelter.png");
 
   public AlloySmelterScreen(AlloySmelterScreenHandler handler, PlayerInventory inventory, Text title) {
     super(handler, inventory, title);
diff --git a/src/main/java/net/stal/alloys/screen/StalAlloysScreenHandlers.java b/src/main/java/net/stal/alloys/screen/StalAlloysScreenHandlers.java
index 1c50acd..1189bf4 100644
--- a/src/main/java/net/stal/alloys/screen/StalAlloysScreenHandlers.java
+++ b/src/main/java/net/stal/alloys/screen/StalAlloysScreenHandlers.java
@@ -17,6 +17,6 @@ public class StalAlloysScreenHandlers {
   public static void registerModScreenHandlers() {
     StalAlloys.LOGGER.debug("Registering screen handlers for " + StalAlloys.MOD_ID);
 
-    Registry.register(Registries.SCREEN_HANDLER, new Identifier(StalAlloys.MOD_ID, "alloy_smelter"), ALLOY_SMELTER_SCREEN_HANDLER);
+    Registry.register(Registries.SCREEN_HANDLER, Identifier.of(StalAlloys.MOD_ID, "alloy_smelter"), ALLOY_SMELTER_SCREEN_HANDLER);
   }
 }
diff --git a/src/main/java/net/stal/alloys/world/StalAlloysConfiguredFeatures.java b/src/main/java/net/stal/alloys/world/StalAlloysConfiguredFeatures.java
index 3d6ad84..035044d 100644
--- a/src/main/java/net/stal/alloys/world/StalAlloysConfiguredFeatures.java
+++ b/src/main/java/net/stal/alloys/world/StalAlloysConfiguredFeatures.java
@@ -84,7 +84,7 @@ public static void bootstrap(Registerable<ConfiguredFeature<?, ?>> context) {
   }
 
   public static RegistryKey<ConfiguredFeature<?,?>> registerKey(String name) {
-    return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(StalAlloys.MOD_ID, name));
+    return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, Identifier.of(StalAlloys.MOD_ID, name));
   }
 
   private static <FC extends FeatureConfig, F extends Feature<FC>> void register(Registerable<ConfiguredFeature<?, ?>> context, RegistryKey<ConfiguredFeature<?, ?>> key, F feature, FC configuration) {
diff --git a/src/main/java/net/stal/alloys/world/StalAlloysPlacedFeatures.java b/src/main/java/net/stal/alloys/world/StalAlloysPlacedFeatures.java
index 2e3a6e9..7e82bd7 100644
--- a/src/main/java/net/stal/alloys/world/StalAlloysPlacedFeatures.java
+++ b/src/main/java/net/stal/alloys/world/StalAlloysPlacedFeatures.java
@@ -50,7 +50,7 @@ public static void bootstrap(Registerable<PlacedFeature> context) {
   }
 
     public static RegistryKey<PlacedFeature> registerKey(String name) {
-      return RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier(StalAlloys.MOD_ID, name));
+      return RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(StalAlloys.MOD_ID, name));
     }
 
     private static void register(Registerable<PlacedFeature> context, RegistryKey<PlacedFeature> key, RegistryEntry<ConfiguredFeature<?, ?>> configuration,
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/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
rename to src/main/resources/data/minecraft/tags/block/needs_iron_tool.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json
rename to src/main/resources/data/minecraft/tags/block/needs_stone_tool.json
diff --git a/src/main/resources/data/minecraft/tags/items/trimmable_armor.json b/src/main/resources/data/minecraft/tags/item/trimmable_armor.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/items/trimmable_armor.json
rename to src/main/resources/data/minecraft/tags/item/trimmable_armor.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/chromium_ingot.json b/src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/chromium_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/chromium_ingot.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/chromium_ingot.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/nickel_ingot.json b/src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/nickel_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/nickel_ingot.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/nickel_ingot.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/steel_ingot.json b/src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/steel_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/steel_ingot.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/steel_ingot.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/zinc_ingot.json b/src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/zinc_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/zinc_ingot.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/building_blocks/zinc_ingot.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_boots.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_boots.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_boots.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_boots.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_chestplate.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_chestplate.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_chestplate.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_chestplate.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_helmet.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_helmet.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_helmet.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_helmet.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_leggings.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_leggings.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/brass_leggings.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/brass_leggings.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/bronze_dagger.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/bronze_dagger.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/bronze_dagger.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/bronze_dagger.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/bronze_dirk.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/bronze_dirk.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/bronze_dirk.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/bronze_dirk.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/bronze_sword.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/bronze_sword.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/bronze_sword.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/bronze_sword.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/combat/copper_sword.json b/src/main/resources/data/stal-alloys/advancement/recipes/combat/copper_sword.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/combat/copper_sword.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/combat/copper_sword.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/chromium_block.json b/src/main/resources/data/stal-alloys/advancement/recipes/decorations/chromium_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/decorations/chromium_block.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/decorations/chromium_block.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/cut_nickel_from_nickel_block_stonecutting.json b/src/main/resources/data/stal-alloys/advancement/recipes/decorations/cut_nickel_from_nickel_block_stonecutting.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/decorations/cut_nickel_from_nickel_block_stonecutting.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/decorations/cut_nickel_from_nickel_block_stonecutting.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/cut_nickel_slab_from_nickel_block_stonecutting.json b/src/main/resources/data/stal-alloys/advancement/recipes/decorations/cut_nickel_slab_from_nickel_block_stonecutting.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/decorations/cut_nickel_slab_from_nickel_block_stonecutting.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/decorations/cut_nickel_slab_from_nickel_block_stonecutting.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/cut_nickel_stairs_from_nickel_block_stonecutting.json b/src/main/resources/data/stal-alloys/advancement/recipes/decorations/cut_nickel_stairs_from_nickel_block_stonecutting.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/decorations/cut_nickel_stairs_from_nickel_block_stonecutting.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/decorations/cut_nickel_stairs_from_nickel_block_stonecutting.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/nickel_block.json b/src/main/resources/data/stal-alloys/advancement/recipes/decorations/nickel_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/decorations/nickel_block.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/decorations/nickel_block.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/steel_block.json b/src/main/resources/data/stal-alloys/advancement/recipes/decorations/steel_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/decorations/steel_block.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/decorations/steel_block.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/zinc_block.json b/src/main/resources/data/stal-alloys/advancement/recipes/decorations/zinc_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/decorations/zinc_block.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/decorations/zinc_block.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/alloy_smelter.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/alloy_smelter.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/alloy_smelter.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/alloy_smelter.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/carbon_plate.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/carbon_plate.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/carbon_plate.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/carbon_plate.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_deepslate_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_netherrack_chromium_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_netherrack_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_netherrack_chromium_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_netherrack_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_blasting_raw_chromium.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_deepslate_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_netherrack_chromium_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_netherrack_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_netherrack_chromium_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_netherrack_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/chromium_ingot_from_smelting_raw_chromium.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_deepslate_nickel_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_deepslate_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_deepslate_nickel_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_deepslate_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_netherrack_nickel_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_netherrack_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_netherrack_nickel_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_netherrack_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_nickel_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_nickel_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_raw_nickel.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_raw_nickel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_blasting_raw_nickel.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_blasting_raw_nickel.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_deepslate_nickel_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_deepslate_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_deepslate_nickel_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_deepslate_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_netherrack_nickel_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_netherrack_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_netherrack_nickel_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_netherrack_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_nickel_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_nickel_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_raw_nickel.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_raw_nickel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/nickel_ingot_from_smelting_raw_nickel.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/nickel_ingot_from_smelting_raw_nickel.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_blasting_deepslate_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_blasting_raw_tin.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_blasting_raw_tin.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_blasting_raw_tin.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_blasting_tin_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_blasting_tin_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_blasting_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_smelting_deepslate_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_smelting_raw_tin.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_smelting_raw_tin.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_smelting_raw_tin.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_smelting_tin_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/tin_ingot_from_smelting_tin_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/tin_ingot_from_smelting_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_blasting_deepslate_zinc_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_blasting_raw_zinc.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_blasting_zinc_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_smelting_deepslate_zinc_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_smelting_raw_zinc.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json b/src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/misc/zinc_ingot_from_smelting_zinc_ore.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/bronze_axe.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/bronze_axe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/bronze_axe.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/bronze_axe.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_axe.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_axe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_axe.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_axe.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_hoe.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_hoe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_hoe.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_hoe.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_pickaxe.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_pickaxe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_pickaxe.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_pickaxe.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_shovel.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_shovel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/copper_shovel.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/copper_shovel.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_axe.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_axe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_axe.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_axe.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_hoe.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_hoe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_hoe.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_hoe.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_pickaxe.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_pickaxe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_pickaxe.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_pickaxe.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_shovel.json b/src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_shovel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/advancements/recipes/tools/steel_shovel.json
rename to src/main/resources/data/stal-alloys/advancement/recipes/tools/steel_shovel.json
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/chromium_block.json b/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/chromium_block.json
deleted file mode 100644
index a43239b..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/chromium_block.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_chromium_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:chromium_ingot"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:chromium_block"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_chromium_ingot",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:chromium_block"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/nickel_block.json b/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/nickel_block.json
deleted file mode 100644
index aa8f661..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/nickel_block.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_nickel_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:nickel_ingot"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:nickel_block"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_nickel_ingot",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:nickel_block"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/steel_block.json b/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/steel_block.json
deleted file mode 100644
index ae75304..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/steel_block.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_steel_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:steel_ingot"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:steel_block"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_steel_ingot",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:steel_block"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/zinc_block.json b/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/zinc_block.json
deleted file mode 100644
index 13acad4..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/building_blocks/zinc_block.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:zinc_block"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    },
-    "has_zinc_ingot": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:zinc_ingot"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    }
-  },
-  "requirements": [
-    [
-      "has_zinc_ingot",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:zinc_block"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/chromium_ingot.json b/src/main/resources/data/stal-alloys/advancements/recipes/decorations/chromium_ingot.json
deleted file mode 100644
index 2dd60b9..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/chromium_ingot.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_chromium_block": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:chromium_block"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:chromium_ingot"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_chromium_block",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:chromium_ingot"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/nickel_ingot.json b/src/main/resources/data/stal-alloys/advancements/recipes/decorations/nickel_ingot.json
deleted file mode 100644
index 0585bcb..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/nickel_ingot.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_nickel_block": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:nickel_block"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:nickel_ingot"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_nickel_block",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:nickel_ingot"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/steel_ingot.json b/src/main/resources/data/stal-alloys/advancements/recipes/decorations/steel_ingot.json
deleted file mode 100644
index 170655e..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/steel_ingot.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_steel_block": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:steel_block"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:steel_ingot"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    }
-  },
-  "requirements": [
-    [
-      "has_steel_block",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:steel_ingot"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/zinc_ingot.json b/src/main/resources/data/stal-alloys/advancements/recipes/decorations/zinc_ingot.json
deleted file mode 100644
index 80b0430..0000000
--- a/src/main/resources/data/stal-alloys/advancements/recipes/decorations/zinc_ingot.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "criteria": {
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minecraft:zinc_ingot"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    },
-    "has_zinc_block": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "stal-alloys:zinc_block"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    }
-  },
-  "requirements": [
-    [
-      "has_zinc_block",
-      "has_the_recipe"
-    ]
-  ],
-  "rewards": {
-    "recipes": [
-      "minecraft:zinc_ingot"
-    ]
-  },
-  "sends_telemetry_event": false
-}
\ No newline at end of file
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/alloy_smelter.json b/src/main/resources/data/stal-alloys/loot_table/blocks/alloy_smelter.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/alloy_smelter.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/alloy_smelter.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/carbon_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/carbon_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/carbon_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/carbon_ore.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/chromium_block.json b/src/main/resources/data/stal-alloys/loot_table/blocks/chromium_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/chromium_block.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/chromium_block.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/chromium_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/chromium_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/chromium_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/chromium_ore.json
index 5e779e9..0db179b 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/chromium_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/chromium_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/cut_nickel.json b/src/main/resources/data/stal-alloys/loot_table/blocks/cut_nickel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/cut_nickel.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/cut_nickel.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/cut_nickel_slab.json b/src/main/resources/data/stal-alloys/loot_table/blocks/cut_nickel_slab.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/cut_nickel_slab.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/cut_nickel_slab.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/cut_nickel_stairs.json b/src/main/resources/data/stal-alloys/loot_table/blocks/cut_nickel_stairs.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/cut_nickel_stairs.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/cut_nickel_stairs.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_carbon_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_carbon_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_carbon_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_carbon_ore.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_chromium_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_chromium_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_chromium_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_chromium_ore.json
index 5bb7c85..1a6c175 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_chromium_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_chromium_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_nickel_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_nickel_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_nickel_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_nickel_ore.json
index 7ecdb24..b31a5db 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_nickel_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_nickel_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_tin_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_tin_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_tin_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_tin_ore.json
index 4e972d6..30d00a5 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_tin_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_tin_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_zinc_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_zinc_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_zinc_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_zinc_ore.json
index ce6909c..ccf4adf 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/deepslate_zinc_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/deepslate_zinc_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/netherrack_chromium_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/netherrack_chromium_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/netherrack_chromium_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/netherrack_chromium_ore.json
index 3268f62..7a38bd2 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/netherrack_chromium_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/netherrack_chromium_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/netherrack_nickel_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/netherrack_nickel_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/netherrack_nickel_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/netherrack_nickel_ore.json
index c3da63b..bfdd237 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/netherrack_nickel_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/netherrack_nickel_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/nickel_block.json b/src/main/resources/data/stal-alloys/loot_table/blocks/nickel_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/nickel_block.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/nickel_block.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/nickel_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/nickel_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/nickel_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/nickel_ore.json
index 9e89aa2..21ce3de 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/nickel_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/nickel_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/steel_block.json b/src/main/resources/data/stal-alloys/loot_table/blocks/steel_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/steel_block.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/steel_block.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/tin_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/tin_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/tin_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/tin_ore.json
index bff84ad..b752466 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/tin_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/tin_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/zinc_block.json b/src/main/resources/data/stal-alloys/loot_table/blocks/zinc_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/zinc_block.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/zinc_block.json
diff --git a/src/main/resources/data/stal-alloys/loot_tables/blocks/zinc_ore.json b/src/main/resources/data/stal-alloys/loot_table/blocks/zinc_ore.json
similarity index 95%
rename from src/main/resources/data/stal-alloys/loot_tables/blocks/zinc_ore.json
rename to src/main/resources/data/stal-alloys/loot_table/blocks/zinc_ore.json
index 80c5ff5..ff37526 100644
--- a/src/main/resources/data/stal-alloys/loot_tables/blocks/zinc_ore.json
+++ b/src/main/resources/data/stal-alloys/loot_table/blocks/zinc_ore.json
@@ -16,7 +16,7 @@
                     "predicates": {
                       "minecraft:enchantments": [
                         {
-                          "enchantment": "minecraft:silk_touch",
+                          "enchantments": "minecraft:silk_touch",
                           "levels": {
                             "min": 1
                           }
diff --git a/src/main/resources/data/stal-alloys/recipes/alloy_smelter.json b/src/main/resources/data/stal-alloys/recipe/alloy_smelter.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/alloy_smelter.json
rename to src/main/resources/data/stal-alloys/recipe/alloy_smelter.json
diff --git a/src/main/resources/data/stal-alloys/recipes/brass_boots.json b/src/main/resources/data/stal-alloys/recipe/brass_boots.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/brass_boots.json
rename to src/main/resources/data/stal-alloys/recipe/brass_boots.json
diff --git a/src/main/resources/data/stal-alloys/recipes/brass_chestplate.json b/src/main/resources/data/stal-alloys/recipe/brass_chestplate.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/brass_chestplate.json
rename to src/main/resources/data/stal-alloys/recipe/brass_chestplate.json
diff --git a/src/main/resources/data/stal-alloys/recipes/brass_helmet.json b/src/main/resources/data/stal-alloys/recipe/brass_helmet.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/brass_helmet.json
rename to src/main/resources/data/stal-alloys/recipe/brass_helmet.json
diff --git a/src/main/resources/data/stal-alloys/recipes/brass_ingot_from_alloy_smelter.json b/src/main/resources/data/stal-alloys/recipe/brass_ingot_from_alloy_smelter.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/brass_ingot_from_alloy_smelter.json
rename to src/main/resources/data/stal-alloys/recipe/brass_ingot_from_alloy_smelter.json
diff --git a/src/main/resources/data/stal-alloys/recipes/brass_leggings.json b/src/main/resources/data/stal-alloys/recipe/brass_leggings.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/brass_leggings.json
rename to src/main/resources/data/stal-alloys/recipe/brass_leggings.json
diff --git a/src/main/resources/data/stal-alloys/recipes/bronze_axe.json b/src/main/resources/data/stal-alloys/recipe/bronze_axe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/bronze_axe.json
rename to src/main/resources/data/stal-alloys/recipe/bronze_axe.json
diff --git a/src/main/resources/data/stal-alloys/recipes/bronze_dagger.json b/src/main/resources/data/stal-alloys/recipe/bronze_dagger.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/bronze_dagger.json
rename to src/main/resources/data/stal-alloys/recipe/bronze_dagger.json
diff --git a/src/main/resources/data/stal-alloys/recipes/bronze_dirk.json b/src/main/resources/data/stal-alloys/recipe/bronze_dirk.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/bronze_dirk.json
rename to src/main/resources/data/stal-alloys/recipe/bronze_dirk.json
diff --git a/src/main/resources/data/stal-alloys/recipes/bronze_ingot_from_alloy_smelter.json b/src/main/resources/data/stal-alloys/recipe/bronze_ingot_from_alloy_smelter.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/bronze_ingot_from_alloy_smelter.json
rename to src/main/resources/data/stal-alloys/recipe/bronze_ingot_from_alloy_smelter.json
diff --git a/src/main/resources/data/stal-alloys/recipes/bronze_sword.json b/src/main/resources/data/stal-alloys/recipe/bronze_sword.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/bronze_sword.json
rename to src/main/resources/data/stal-alloys/recipe/bronze_sword.json
diff --git a/src/main/resources/data/stal-alloys/recipes/carbon_plate.json b/src/main/resources/data/stal-alloys/recipe/carbon_plate.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/carbon_plate.json
rename to src/main/resources/data/stal-alloys/recipe/carbon_plate.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_block.json b/src/main/resources/data/stal-alloys/recipe/chromium_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_block.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_block.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_chromium_ore.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_chromium_ore.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_deepslate_chromium_ore.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_deepslate_chromium_ore.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_deepslate_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_netherrack_chromium_ore.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_netherrack_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_netherrack_chromium_ore.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_netherrack_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_raw_chromium.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_raw_chromium.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_blasting_raw_chromium.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_blasting_raw_chromium.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_chromium_ore.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_chromium_ore.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_deepslate_chromium_ore.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_deepslate_chromium_ore.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_deepslate_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_netherrack_chromium_ore.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_netherrack_chromium_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_netherrack_chromium_ore.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_netherrack_chromium_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_raw_chromium.json b/src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_raw_chromium.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/chromium_ingot_from_smelting_raw_chromium.json
rename to src/main/resources/data/stal-alloys/recipe/chromium_ingot_from_smelting_raw_chromium.json
diff --git a/src/main/resources/data/stal-alloys/recipes/copper_axe.json b/src/main/resources/data/stal-alloys/recipe/copper_axe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/copper_axe.json
rename to src/main/resources/data/stal-alloys/recipe/copper_axe.json
diff --git a/src/main/resources/data/stal-alloys/recipes/copper_hoe.json b/src/main/resources/data/stal-alloys/recipe/copper_hoe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/copper_hoe.json
rename to src/main/resources/data/stal-alloys/recipe/copper_hoe.json
diff --git a/src/main/resources/data/stal-alloys/recipes/copper_pickaxe.json b/src/main/resources/data/stal-alloys/recipe/copper_pickaxe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/copper_pickaxe.json
rename to src/main/resources/data/stal-alloys/recipe/copper_pickaxe.json
diff --git a/src/main/resources/data/stal-alloys/recipes/copper_shovel.json b/src/main/resources/data/stal-alloys/recipe/copper_shovel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/copper_shovel.json
rename to src/main/resources/data/stal-alloys/recipe/copper_shovel.json
diff --git a/src/main/resources/data/stal-alloys/recipes/copper_sword.json b/src/main/resources/data/stal-alloys/recipe/copper_sword.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/copper_sword.json
rename to src/main/resources/data/stal-alloys/recipe/copper_sword.json
diff --git a/src/main/resources/data/stal-alloys/recipes/cut_nickel_from_nickel_block_stonecutting.json b/src/main/resources/data/stal-alloys/recipe/cut_nickel_from_nickel_block_stonecutting.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/cut_nickel_from_nickel_block_stonecutting.json
rename to src/main/resources/data/stal-alloys/recipe/cut_nickel_from_nickel_block_stonecutting.json
diff --git a/src/main/resources/data/stal-alloys/recipes/cut_nickel_slab_from_nickel_block_stonecutting.json b/src/main/resources/data/stal-alloys/recipe/cut_nickel_slab_from_nickel_block_stonecutting.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/cut_nickel_slab_from_nickel_block_stonecutting.json
rename to src/main/resources/data/stal-alloys/recipe/cut_nickel_slab_from_nickel_block_stonecutting.json
diff --git a/src/main/resources/data/stal-alloys/recipes/cut_nickel_stairs_from_nickel_block_stonecutting.json b/src/main/resources/data/stal-alloys/recipe/cut_nickel_stairs_from_nickel_block_stonecutting.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/cut_nickel_stairs_from_nickel_block_stonecutting.json
rename to src/main/resources/data/stal-alloys/recipe/cut_nickel_stairs_from_nickel_block_stonecutting.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_block.json b/src/main/resources/data/stal-alloys/recipe/nickel_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_block.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_block.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_deepslate_nickel_ore.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_deepslate_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_deepslate_nickel_ore.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_deepslate_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_netherrack_nickel_ore.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_netherrack_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_netherrack_nickel_ore.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_netherrack_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_nickel_ore.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_nickel_ore.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_raw_nickel.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_raw_nickel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_blasting_raw_nickel.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_blasting_raw_nickel.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_deepslate_nickel_ore.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_deepslate_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_deepslate_nickel_ore.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_deepslate_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_netherrack_nickel_ore.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_netherrack_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_netherrack_nickel_ore.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_netherrack_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_nickel_ore.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_nickel_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_nickel_ore.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_nickel_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_raw_nickel.json b/src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_raw_nickel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/nickel_ingot_from_smelting_raw_nickel.json
rename to src/main/resources/data/stal-alloys/recipe/nickel_ingot_from_smelting_raw_nickel.json
diff --git a/src/main/resources/data/stal-alloys/recipes/stainless_steel_boots_smithing.json b/src/main/resources/data/stal-alloys/recipe/stainless_steel_boots_smithing.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/stainless_steel_boots_smithing.json
rename to src/main/resources/data/stal-alloys/recipe/stainless_steel_boots_smithing.json
diff --git a/src/main/resources/data/stal-alloys/recipes/stainless_steel_chestplate_smithing.json b/src/main/resources/data/stal-alloys/recipe/stainless_steel_chestplate_smithing.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/stainless_steel_chestplate_smithing.json
rename to src/main/resources/data/stal-alloys/recipe/stainless_steel_chestplate_smithing.json
diff --git a/src/main/resources/data/stal-alloys/recipes/stainless_steel_helmet_smithing.json b/src/main/resources/data/stal-alloys/recipe/stainless_steel_helmet_smithing.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/stainless_steel_helmet_smithing.json
rename to src/main/resources/data/stal-alloys/recipe/stainless_steel_helmet_smithing.json
diff --git a/src/main/resources/data/stal-alloys/recipes/stainless_steel_ingot_from_alloy_smelter.json b/src/main/resources/data/stal-alloys/recipe/stainless_steel_ingot_from_alloy_smelter.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/stainless_steel_ingot_from_alloy_smelter.json
rename to src/main/resources/data/stal-alloys/recipe/stainless_steel_ingot_from_alloy_smelter.json
diff --git a/src/main/resources/data/stal-alloys/recipes/stainless_steel_leggings_smithing.json b/src/main/resources/data/stal-alloys/recipe/stainless_steel_leggings_smithing.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/stainless_steel_leggings_smithing.json
rename to src/main/resources/data/stal-alloys/recipe/stainless_steel_leggings_smithing.json
diff --git a/src/main/resources/data/stal-alloys/recipes/steel_axe.json b/src/main/resources/data/stal-alloys/recipe/steel_axe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/steel_axe.json
rename to src/main/resources/data/stal-alloys/recipe/steel_axe.json
diff --git a/src/main/resources/data/stal-alloys/recipes/steel_block.json b/src/main/resources/data/stal-alloys/recipe/steel_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/steel_block.json
rename to src/main/resources/data/stal-alloys/recipe/steel_block.json
diff --git a/src/main/resources/data/stal-alloys/recipes/steel_hoe.json b/src/main/resources/data/stal-alloys/recipe/steel_hoe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/steel_hoe.json
rename to src/main/resources/data/stal-alloys/recipe/steel_hoe.json
diff --git a/src/main/resources/data/stal-alloys/recipes/steel_ingot.json b/src/main/resources/data/stal-alloys/recipe/steel_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/steel_ingot.json
rename to src/main/resources/data/stal-alloys/recipe/steel_ingot.json
diff --git a/src/main/resources/data/stal-alloys/recipes/steel_ingot_from_alloy_smelter.json b/src/main/resources/data/stal-alloys/recipe/steel_ingot_from_alloy_smelter.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/steel_ingot_from_alloy_smelter.json
rename to src/main/resources/data/stal-alloys/recipe/steel_ingot_from_alloy_smelter.json
diff --git a/src/main/resources/data/stal-alloys/recipes/steel_pickaxe.json b/src/main/resources/data/stal-alloys/recipe/steel_pickaxe.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/steel_pickaxe.json
rename to src/main/resources/data/stal-alloys/recipe/steel_pickaxe.json
diff --git a/src/main/resources/data/stal-alloys/recipes/steel_shovel.json b/src/main/resources/data/stal-alloys/recipe/steel_shovel.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/steel_shovel.json
rename to src/main/resources/data/stal-alloys/recipe/steel_shovel.json
diff --git a/src/main/resources/data/stal-alloys/recipes/tin_ingot_from_blasting_deepslate_tin_ore.json b/src/main/resources/data/stal-alloys/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/tin_ingot_from_blasting_deepslate_tin_ore.json
rename to src/main/resources/data/stal-alloys/recipe/tin_ingot_from_blasting_deepslate_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/tin_ingot_from_blasting_raw_tin.json b/src/main/resources/data/stal-alloys/recipe/tin_ingot_from_blasting_raw_tin.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/tin_ingot_from_blasting_raw_tin.json
rename to src/main/resources/data/stal-alloys/recipe/tin_ingot_from_blasting_raw_tin.json
diff --git a/src/main/resources/data/stal-alloys/recipes/tin_ingot_from_blasting_tin_ore.json b/src/main/resources/data/stal-alloys/recipe/tin_ingot_from_blasting_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/tin_ingot_from_blasting_tin_ore.json
rename to src/main/resources/data/stal-alloys/recipe/tin_ingot_from_blasting_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/tin_ingot_from_smelting_deepslate_tin_ore.json b/src/main/resources/data/stal-alloys/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/tin_ingot_from_smelting_deepslate_tin_ore.json
rename to src/main/resources/data/stal-alloys/recipe/tin_ingot_from_smelting_deepslate_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/tin_ingot_from_smelting_raw_tin.json b/src/main/resources/data/stal-alloys/recipe/tin_ingot_from_smelting_raw_tin.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/tin_ingot_from_smelting_raw_tin.json
rename to src/main/resources/data/stal-alloys/recipe/tin_ingot_from_smelting_raw_tin.json
diff --git a/src/main/resources/data/stal-alloys/recipes/tin_ingot_from_smelting_tin_ore.json b/src/main/resources/data/stal-alloys/recipe/tin_ingot_from_smelting_tin_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/tin_ingot_from_smelting_tin_ore.json
rename to src/main/resources/data/stal-alloys/recipe/tin_ingot_from_smelting_tin_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_block.json b/src/main/resources/data/stal-alloys/recipe/zinc_block.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_block.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_block.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_ingot.json b/src/main/resources/data/stal-alloys/recipe/zinc_ingot.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_ingot.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_ingot.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_blasting_deepslate_zinc_ore.json b/src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_blasting_deepslate_zinc_ore.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_blasting_deepslate_zinc_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_blasting_raw_zinc.json b/src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_blasting_raw_zinc.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_blasting_raw_zinc.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_blasting_raw_zinc.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_blasting_zinc_ore.json b/src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_blasting_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_blasting_zinc_ore.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_blasting_zinc_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_smelting_deepslate_zinc_ore.json b/src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_smelting_deepslate_zinc_ore.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_smelting_deepslate_zinc_ore.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_smelting_raw_zinc.json b/src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_smelting_raw_zinc.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_smelting_raw_zinc.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_smelting_raw_zinc.json
diff --git a/src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_smelting_zinc_ore.json b/src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_smelting_zinc_ore.json
similarity index 100%
rename from src/main/resources/data/stal-alloys/recipes/zinc_ingot_from_smelting_zinc_ore.json
rename to src/main/resources/data/stal-alloys/recipe/zinc_ingot_from_smelting_zinc_ore.json
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index ec98f22..0d4de32 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -30,8 +30,8 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.15.11",
-		"minecraft": "~1.20",
-		"java": ">=17",
+		"minecraft": "~1.21",
+		"java": ">=21",
 		"fabric-api": "*"
 	},
 	"suggests": {
diff --git a/src/main/resources/stal-alloys.mixins.json b/src/main/resources/stal-alloys.mixins.json
index afda23e..3a4127c 100644
--- a/src/main/resources/stal-alloys.mixins.json
+++ b/src/main/resources/stal-alloys.mixins.json
@@ -1,7 +1,7 @@
 {
 	"required": true,
 	"package": "net.stal.alloys.mixin",
-	"compatibilityLevel": "JAVA_17",
+	"compatibilityLevel": "JAVA_21",
 	"mixins": [
 		"ExampleMixin",
 		"StalAlloysEntityDataSaverMixin"