diff --git a/src/datagen/java/techguns2/datagen/BlockMetadata.java b/src/datagen/java/techguns2/datagen/BlockMetadata.java
index f90ee104..85055802 100644
--- a/src/datagen/java/techguns2/datagen/BlockMetadata.java
+++ b/src/datagen/java/techguns2/datagen/BlockMetadata.java
@@ -62,25 +62,25 @@ public BlockMetadata(TBlock block, ResourceLocation id)
                         .setRolls(ConstantValue.exactly(1f))
                         .add(LootItem.lootTableItem(this.block))
                         .when(ExplosionCondition.survivesExplosion()));
-        this.recipeMetadatas = new ArrayList<RecipeMetadata<?>>();
-        this.tags = new ArrayList<TagKey<Block>>();
-        this.itemTags = new ArrayList<TagKey<Item>>();
+        this.recipeMetadatas = new ArrayList<>();
+        this.tags = new ArrayList<>();
+        this.itemTags = new ArrayList<>();
     }
     
     @Override
-    public final CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
+    public CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
     {
         return CompletableFuture.completedFuture(ImmutableList.of(new LanguageMetadata(this.langId, this.langName)));
     }
     
     @Override
-    public final CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
+    public CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
     {
         return CompletableFuture.completedFuture(ImmutableList.copyOf(this.recipeMetadatas));
     }
     
     @Override
-    public final CompletableFuture<List<LootTableMetadata>> fetchLootTables()
+    public CompletableFuture<List<LootTableMetadata>> fetchLootTables()
     {
         return CompletableFuture.completedFuture(
                 ImmutableList.of(
@@ -91,7 +91,7 @@ public final CompletableFuture<List<LootTableMetadata>> fetchLootTables()
     }
     
     @Override
-    public final CompletableFuture<List<TagKey<?>>> fetchTags()
+    public CompletableFuture<List<TagKey<?>>> fetchTags()
     {
         ImmutableList.Builder<TagKey<?>> tags = ImmutableList.builder();
         for (TagKey<Block> blockTag : this.tags)
@@ -109,7 +109,7 @@ public final CompletableFuture<List<TagKey<?>>> fetchTags()
     
     public static <TBlock extends Block> BlockMetadata<TBlock> of(RegistryObject<TBlock> block)
     {
-        return new BlockMetadata<TBlock>(block);
+        return new BlockMetadata<>(block);
     }
     
     
diff --git a/src/datagen/java/techguns2/datagen/DataGenerators.java b/src/datagen/java/techguns2/datagen/DataGenerators.java
index ae4a31d7..89d0b310 100644
--- a/src/datagen/java/techguns2/datagen/DataGenerators.java
+++ b/src/datagen/java/techguns2/datagen/DataGenerators.java
@@ -12,6 +12,7 @@
 import net.minecraftforge.data.event.GatherDataEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import org.jetbrains.annotations.NotNull;
 import techguns2.Techguns;
 import techguns2.datagen.providers.IItemModelProvider;
 import techguns2.datagen.providers.IRecipeMetadataProvider;
@@ -21,18 +22,14 @@
 public class DataGenerators
 {
     @SubscribeEvent
-    public static void gatherData(GatherDataEvent event) throws IOException
+    public static void gatherData(@NotNull GatherDataEvent event) throws IOException
     {
         DataGenerator generator = event.getGenerator();
         PackOutput packOutput = generator.getPackOutput();
         ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
         CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
-        
-        List<Object> possibleProviders = new ArrayList<>();
-        for (var itemMetadata : ItemMetadatas.getAll())
-        {
-            possibleProviders.add(itemMetadata);
-        }
+
+        List<Object> possibleProviders = new ArrayList<>(ItemMetadatas.getAll());
         
         generator.addProvider(false, new ModRecipeProvider(packOutput, 
                 possibleProviders
diff --git a/src/datagen/java/techguns2/datagen/ItemMetadata.java b/src/datagen/java/techguns2/datagen/ItemMetadata.java
index 90392d20..e6fc17f0 100644
--- a/src/datagen/java/techguns2/datagen/ItemMetadata.java
+++ b/src/datagen/java/techguns2/datagen/ItemMetadata.java
@@ -6,7 +6,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
-import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.ImmutableList;
 
@@ -16,6 +15,8 @@
 import net.minecraft.world.item.Item;
 import net.minecraftforge.client.model.generators.ItemModelBuilder;
 import net.minecraftforge.registries.RegistryObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import techguns2.Techguns;
 import techguns2.datagen.providers.IItemModelProvider;
 import techguns2.datagen.providers.ILangMetadataProvider;
@@ -34,7 +35,7 @@ public final class ItemMetadata<TItem extends Item> implements ILangMetadataProv
     public final List<RecipeMetadata<?>> recipeMetadatas;
     public final List<TagKey<Item>> tags;
     
-    public ItemMetadata(RegistryObject<TItem> registeredItem)
+    public ItemMetadata(@NotNull RegistryObject<TItem> registeredItem)
     {
         this(registeredItem.get(), registeredItem.getId());
     }
@@ -45,49 +46,49 @@ public ItemMetadata(TItem item, ResourceLocation id)
         this.id = id;
         this.langId = Util.makeDescriptionId("item", id);
         this.langName = this.langId;
-        this.recipeMetadatas = new ArrayList<RecipeMetadata<?>>();
-        this.tags = new ArrayList<TagKey<Item>>();
+        this.recipeMetadatas = new ArrayList<>();
+        this.tags = new ArrayList<>();
         this.itemModelGenerator = null;
     }
     
-    public final ItemMetadata<TItem> withLangName(String langName)
+    public ItemMetadata<TItem> withLangName(String langName)
     {
         this.langName = langName;
         return this;
     }
     
-    public final ItemMetadata<TItem> addRecipe(RecipeMetadata<?> recipeMetadata)
+    public ItemMetadata<TItem> addRecipe(RecipeMetadata<?> recipeMetadata)
     {
         this.recipeMetadatas.add(recipeMetadata);
         return this;
     }
     
-    public final ItemMetadata<TItem> addTag(TagKey<Item> tag)
+    public ItemMetadata<TItem> addTag(TagKey<Item> tag)
     {
         this.tags.add(tag);
         return this;
     }
     
     @Override
-    public final CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
+    public CompletableFuture<List<LanguageMetadata>> fetchLanguageEntries()
     {
         return CompletableFuture.completedFuture(ImmutableList.of(new LanguageMetadata(this.langId, this.langName)));
     }
     
     @Override
-    public final CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
+    public CompletableFuture<List<RecipeMetadata<?>>> fetchRecipes()
     {
         return CompletableFuture.completedFuture(ImmutableList.copyOf(this.recipeMetadatas));
     }
     
     @Override
-    public final CompletableFuture<List<TagKey<?>>> fetchTags()
+    public CompletableFuture<List<TagKey<?>>> fetchTags()
     {
         return CompletableFuture.completedFuture(ImmutableList.copyOf(this.tags));
     }
     
     @Override
-    public final ItemModelBuilder fetchItemModel(IModelBuilderFactory<ItemModelBuilder> modelBuilderFactory)
+    public ItemModelBuilder fetchItemModel(IModelBuilderFactory<ItemModelBuilder> modelBuilderFactory)
     {
         String path = this.id.getPath();
         ItemModelBuilder model = modelBuilderFactory.create(path);
@@ -106,11 +107,11 @@ public final ItemModelBuilder fetchItemModel(IModelBuilderFactory<ItemModelBuild
     
     public static <TItem extends Item> ItemMetadata<TItem> of(RegistryObject<TItem> registeredItem)
     {
-        return new ItemMetadata<TItem>(registeredItem);
+        return new ItemMetadata<>(registeredItem);
     }
     
     public static <TItem extends Item> ItemMetadata<TItem> of(TItem item, ResourceLocation id)
     {
-        return new ItemMetadata<TItem>(item, id);
+        return new ItemMetadata<>(item, id);
     }
 }
diff --git a/src/datagen/java/techguns2/datagen/ItemMetadatas.java b/src/datagen/java/techguns2/datagen/ItemMetadatas.java
index 84f2514d..0d5800ef 100644
--- a/src/datagen/java/techguns2/datagen/ItemMetadatas.java
+++ b/src/datagen/java/techguns2/datagen/ItemMetadatas.java
@@ -380,7 +380,7 @@ public final class ItemMetadatas
 
     private static final Map<ResourceLocation, ItemMetadata<?>> METADATA_MAP;
 
-    public static final Collection<ItemMetadata<?>> getAll()
+    public static Collection<ItemMetadata<?>> getAll()
     {
         return METADATA_MAP.values();
     }
diff --git a/src/datagen/java/techguns2/datagen/LanguageMetadata.java b/src/datagen/java/techguns2/datagen/LanguageMetadata.java
index c8402188..03ea80b6 100644
--- a/src/datagen/java/techguns2/datagen/LanguageMetadata.java
+++ b/src/datagen/java/techguns2/datagen/LanguageMetadata.java
@@ -1,13 +1,4 @@
 package techguns2.datagen;
 
-public final class LanguageMetadata
-{
-    public final String id;
-    public final String value;
-    
-    public LanguageMetadata(String id, String value)
-    {
-        this.id = id;
-        this.value = value;
-    }
+public record LanguageMetadata(String id, String value) {
 }
diff --git a/src/datagen/java/techguns2/datagen/LootTableMetadata.java b/src/datagen/java/techguns2/datagen/LootTableMetadata.java
index 406e62c0..d9607878 100644
--- a/src/datagen/java/techguns2/datagen/LootTableMetadata.java
+++ b/src/datagen/java/techguns2/datagen/LootTableMetadata.java
@@ -4,16 +4,5 @@
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet;
 
-public final class LootTableMetadata
-{
-    public final ResourceLocation id;
-    public final LootTable.Builder table;
-    public final LootContextParamSet context;
-    
-    public LootTableMetadata(ResourceLocation id, LootTable.Builder table, LootContextParamSet context)
-    {
-        this.id = id;
-        this.table = table;
-        this.context = context;
-    }
+public record LootTableMetadata(ResourceLocation id, LootTable.Builder table, LootContextParamSet context) {
 }
diff --git a/src/datagen/java/techguns2/datagen/RecipeMetadata.java b/src/datagen/java/techguns2/datagen/RecipeMetadata.java
index e8ce9148..ccd14d8c 100644
--- a/src/datagen/java/techguns2/datagen/RecipeMetadata.java
+++ b/src/datagen/java/techguns2/datagen/RecipeMetadata.java
@@ -6,12 +6,7 @@
 
 import javax.annotation.Nullable;
 
-import net.minecraft.data.recipes.FinishedRecipe;
-import net.minecraft.data.recipes.RecipeBuilder;
-import net.minecraft.data.recipes.RecipeCategory;
-import net.minecraft.data.recipes.ShapedRecipeBuilder;
-import net.minecraft.data.recipes.ShapelessRecipeBuilder;
-import net.minecraft.data.recipes.SimpleCookingRecipeBuilder;
+import net.minecraft.data.recipes.*;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
@@ -22,6 +17,9 @@
 import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.common.crafting.ConditionalRecipe;
 import net.minecraftforge.registries.RegistryObject;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
 import techguns2.machine.alloy_furnace.AlloyFurnaceRecipe;
 import techguns2.machine.ammo_press.AmmoPressRecipe;
 import techguns2.machine.charging_station.SimpleChargingStationRecipe;
@@ -47,12 +45,12 @@ public RecipeMetadata(ResourceLocation id, Supplier<T> recipeBuilderFactory, BiC
         this.recipeSaver = recipeSaver;
     }
     
-    public final void save(Consumer<FinishedRecipe> writer)
+    public void save(Consumer<FinishedRecipe> writer)
     {
         this.recipeSaver.accept(this, writer);
     }
     
-    public final T setupRecipeBuilder()
+    public T setupRecipeBuilder()
     {
         if (this.recipeBuilder == null)
         {
@@ -62,7 +60,8 @@ public final T setupRecipeBuilder()
         return this.recipeBuilder;
     }
     
-    public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapelessRecipeBuilder> shapeless(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             ItemLike result,
@@ -75,7 +74,8 @@ public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
         });
     }
     
-    public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapelessRecipeBuilder> shapeless(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             RegistryObject<? extends ItemLike> resultObject,
@@ -88,7 +88,8 @@ public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
         });
     }
     
-    public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapelessRecipeBuilder> shapeless(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             ItemLike result,
@@ -102,7 +103,8 @@ public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
         });
     }
     
-    public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapelessRecipeBuilder> shapeless(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             RegistryObject<? extends ItemLike> resultObject,
@@ -116,7 +118,8 @@ public static RecipeMetadata<ShapelessRecipeBuilder> shapeless(
         });
     }
     
-    public static RecipeMetadata<ShapedRecipeBuilder> shaped(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapedRecipeBuilder> shaped(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             ItemLike result,
@@ -129,7 +132,8 @@ public static RecipeMetadata<ShapedRecipeBuilder> shaped(
         });
     }
     
-    public static RecipeMetadata<ShapedRecipeBuilder> shaped(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapedRecipeBuilder> shaped(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             RegistryObject<? extends ItemLike> resultObject,
@@ -142,7 +146,8 @@ public static RecipeMetadata<ShapedRecipeBuilder> shaped(
         });
     }
     
-    public static RecipeMetadata<ShapedRecipeBuilder> shaped(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapedRecipeBuilder> shaped(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             ItemLike result,
@@ -156,7 +161,8 @@ public static RecipeMetadata<ShapedRecipeBuilder> shaped(
         });
     }
     
-    public static RecipeMetadata<ShapedRecipeBuilder> shaped(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ShapedRecipeBuilder> shaped(
             ResourceLocation id,
             RecipeCategory recipeCategory,
             RegistryObject<? extends ItemLike> resultObject,
@@ -171,7 +177,8 @@ public static RecipeMetadata<ShapedRecipeBuilder> shaped(
     }
     
 
-    public static RecipeMetadata<SimpleCookingRecipeBuilder> genericCooking(
+    @Contract(value = "_, _, _, _, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleCookingRecipeBuilder> genericCooking(
             ResourceLocation id,
             Ingredient input,
             RecipeCategory category,
@@ -194,7 +201,8 @@ public static RecipeMetadata<SimpleCookingRecipeBuilder> genericCooking(
         });
     }
 
-    public static RecipeMetadata<SimpleCookingRecipeBuilder> campfireCooking(
+    @Contract(value = "_, _, _, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleCookingRecipeBuilder> campfireCooking(
             ResourceLocation id,
             Ingredient input,
             RecipeCategory category,
@@ -215,7 +223,8 @@ public static RecipeMetadata<SimpleCookingRecipeBuilder> campfireCooking(
         });
     }
 
-    public static RecipeMetadata<SimpleCookingRecipeBuilder> blasting(
+    @Contract(value = "_, _, _, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleCookingRecipeBuilder> blasting(
             ResourceLocation id,
             Ingredient input,
             RecipeCategory category,
@@ -236,7 +245,8 @@ public static RecipeMetadata<SimpleCookingRecipeBuilder> blasting(
         });
     }
 
-    public static RecipeMetadata<SimpleCookingRecipeBuilder> smelting(
+    @Contract(value = "_, _, _, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleCookingRecipeBuilder> smelting(
             ResourceLocation id,
             Ingredient input,
             RecipeCategory category,
@@ -257,7 +267,8 @@ public static RecipeMetadata<SimpleCookingRecipeBuilder> smelting(
         });
     }
 
-    public static RecipeMetadata<SimpleCookingRecipeBuilder> smoking(
+    @Contract(value = "_, _, _, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleCookingRecipeBuilder> smoking(
             ResourceLocation id,
             Ingredient input,
             RecipeCategory category,
@@ -278,7 +289,8 @@ public static RecipeMetadata<SimpleCookingRecipeBuilder> smoking(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             Consumer<AmmoPressRecipe.Builder> recipeBuilder)
     {
@@ -289,7 +301,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             ItemLike result,
             Consumer<AmmoPressRecipe.Builder> recipeBuilder)
@@ -302,7 +315,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             Consumer<AmmoPressRecipe.Builder> recipeBuilder)
@@ -315,7 +329,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             ItemLike result,
             @Nullable CompoundTag nbt,
@@ -329,7 +344,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             @Nullable CompoundTag nbt,
@@ -343,7 +359,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -357,7 +374,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -371,7 +389,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -386,7 +405,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -401,7 +421,8 @@ public static RecipeMetadata<AmmoPressRecipe.Builder> ammoPress(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             Consumer<AlloyFurnaceRecipe.Builder> recipeBuilder)
     {
@@ -412,7 +433,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             ItemLike result,
             Consumer<AlloyFurnaceRecipe.Builder> recipeBuilder)
@@ -425,7 +447,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             Consumer<AlloyFurnaceRecipe.Builder> recipeBuilder)
@@ -438,7 +461,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             ItemLike result,
             @Nullable CompoundTag nbt,
@@ -452,7 +476,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             @Nullable CompoundTag nbt,
@@ -466,7 +491,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -480,7 +506,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -494,7 +521,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -509,7 +537,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -524,7 +553,8 @@ public static RecipeMetadata<AlloyFurnaceRecipe.Builder> alloyFurnace(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             Consumer<SimpleChargingStationRecipe.Builder> recipeBuilder)
     {
@@ -535,7 +565,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             ItemLike result,
             Consumer<SimpleChargingStationRecipe.Builder> recipeBuilder)
@@ -548,7 +579,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             Consumer<SimpleChargingStationRecipe.Builder> recipeBuilder)
@@ -561,7 +593,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             ItemLike result,
             @Nullable CompoundTag nbt,
@@ -575,7 +608,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             @Nullable CompoundTag nbt,
@@ -589,7 +623,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -603,7 +638,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -617,7 +653,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -632,7 +669,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -647,7 +685,8 @@ public static RecipeMetadata<SimpleChargingStationRecipe.Builder> charging(
         });
     }
     
-    public static RecipeMetadata<ChemicalLaboratoryRecipe.Builder> chemicalLaboratory(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ChemicalLaboratoryRecipe.Builder> chemicalLaboratory(
             ResourceLocation id,
             Consumer<ChemicalLaboratoryRecipe.Builder> recipeBuilder)
     {
@@ -658,7 +697,8 @@ public static RecipeMetadata<ChemicalLaboratoryRecipe.Builder> chemicalLaborator
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             Consumer<FabricatorRecipe.Builder> recipeBuilder)
     {
@@ -669,7 +709,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             ItemLike result,
             Consumer<FabricatorRecipe.Builder> recipeBuilder)
@@ -682,7 +723,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             Consumer<FabricatorRecipe.Builder> recipeBuilder)
@@ -695,7 +737,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             ItemLike result,
             @Nullable CompoundTag nbt,
@@ -709,7 +752,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             @Nullable CompoundTag nbt,
@@ -723,7 +767,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -737,7 +782,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -751,7 +797,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -766,7 +813,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<FabricatorRecipe.Builder> fabricator(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -781,7 +829,8 @@ public static RecipeMetadata<FabricatorRecipe.Builder> fabricator(
         });
     }
     
-    public static RecipeMetadata<GrinderRecipe.Builder> grinder(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<GrinderRecipe.Builder> grinder(
             ResourceLocation id,
             Consumer<GrinderRecipe.Builder> recipeBuilder)
     {
@@ -792,7 +841,8 @@ public static RecipeMetadata<GrinderRecipe.Builder> grinder(
         });
     }
     
-    public static RecipeMetadata<GrinderRecipe.Builder> grinder(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<GrinderRecipe.Builder> grinder(
             ResourceLocation id,
             ItemLike inputItem,
             Consumer<GrinderRecipe.Builder> recipeBuilder)
@@ -805,7 +855,8 @@ public static RecipeMetadata<GrinderRecipe.Builder> grinder(
         });
     }
     
-    public static RecipeMetadata<GrinderRecipe.Builder> grinder(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<GrinderRecipe.Builder> grinder(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> inputItemObject,
             Consumer<GrinderRecipe.Builder> recipeBuilder)
@@ -818,7 +869,8 @@ public static RecipeMetadata<GrinderRecipe.Builder> grinder(
         });
     }
     
-    public static RecipeMetadata<GrinderRecipe.Builder> grinder(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<GrinderRecipe.Builder> grinder(
             ResourceLocation id,
             TagKey<Item> inputItemTag,
             Consumer<GrinderRecipe.Builder> recipeBuilder)
@@ -831,7 +883,8 @@ public static RecipeMetadata<GrinderRecipe.Builder> grinder(
         });
     }
     
-    public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
             ResourceLocation id,
             Consumer<ChancedGrinderRecipe.Builder> recipeBuilder)
     {
@@ -842,7 +895,8 @@ public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
         });
     }
     
-    public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
             ResourceLocation id,
             ItemLike inputItem,
             Consumer<ChancedGrinderRecipe.Builder> recipeBuilder)
@@ -855,7 +909,8 @@ public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
         });
     }
     
-    public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> inputItemObject,
             Consumer<ChancedGrinderRecipe.Builder> recipeBuilder)
@@ -868,7 +923,8 @@ public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
         });
     }
     
-    public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
             ResourceLocation id,
             TagKey<Item> inputItemTag,
             Consumer<ChancedGrinderRecipe.Builder> recipeBuilder)
@@ -881,7 +937,8 @@ public static RecipeMetadata<ChancedGrinderRecipe.Builder> grinderChanced(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             Consumer<MetalPressRecipe.Builder> recipeBuilder)
     {
@@ -892,7 +949,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             ItemLike result,
             Consumer<MetalPressRecipe.Builder> recipeBuilder)
@@ -905,7 +963,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             ItemLike result,
             @Nullable
@@ -920,7 +979,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             ItemLike result,
             int count,
@@ -934,7 +994,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             ItemLike result,
             int count,
@@ -950,7 +1011,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             Consumer<MetalPressRecipe.Builder> recipeBuilder)
@@ -963,7 +1025,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             @Nullable
@@ -978,7 +1041,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int count,
@@ -992,7 +1056,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<MetalPressRecipe.Builder> metalPress(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int count,
@@ -1008,7 +1073,8 @@ public static RecipeMetadata<MetalPressRecipe.Builder> metalPress(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             Consumer<ReactionChamberRecipe.Builder> recipeBuilder)
     {
@@ -1019,7 +1085,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             ItemLike result,
             Consumer<ReactionChamberRecipe.Builder> recipeBuilder)
@@ -1032,7 +1099,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             Consumer<ReactionChamberRecipe.Builder> recipeBuilder)
@@ -1045,7 +1113,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             ItemLike result,
             @Nullable CompoundTag nbt,
@@ -1059,7 +1128,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             @Nullable CompoundTag nbt,
@@ -1073,7 +1143,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -1087,7 +1158,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -1101,7 +1173,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             ItemLike result,
             int amount,
@@ -1116,7 +1189,8 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
+    @Contract(value = "_, _, _, _, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
             ResourceLocation id,
             RegistryObject<? extends ItemLike> resultObject,
             int amount,
@@ -1131,26 +1205,28 @@ public static RecipeMetadata<ReactionChamberRecipe.Builder> reactionChamber(
         });
     }
     
-    public static <T extends RecipeBuilder> RecipeMetadata<T> fromBuilder(ResourceLocation id, Supplier<T> builderFactory)
+    @Contract(value = "_, _ -> new", pure = true)
+    public static <T extends RecipeBuilder> @NotNull RecipeMetadata<T> fromBuilder(ResourceLocation id, Supplier<T> builderFactory)
     {
-        return new RecipeMetadata<T>(id, builderFactory, RecipeMetadata::recipeBuilderSaver);
+        return new RecipeMetadata<>(id, builderFactory, RecipeMetadata::recipeBuilderSaver);
     }
     
-    public static RecipeMetadata<ConditionalRecipe.Builder> fromConditional(ResourceLocation id, Consumer<ConditionalRecipe.Builder> recipeBuilder)
+    @Contract(value = "_, _ -> new", pure = true)
+    public static @NotNull RecipeMetadata<ConditionalRecipe.Builder> fromConditional(ResourceLocation id, Consumer<ConditionalRecipe.Builder> recipeBuilder)
     {
-        return new RecipeMetadata<ConditionalRecipe.Builder>(id, () -> {
+        return new RecipeMetadata<>(id, () -> {
             var builder = new ConditionalRecipe.Builder();
             recipeBuilder.accept(builder);
             return builder;
         }, RecipeMetadata::conditionalRecipeSaver);
     }
     
-    private static void conditionalRecipeSaver(RecipeMetadata<ConditionalRecipe.Builder> metadata, Consumer<FinishedRecipe> writer)
+    private static void conditionalRecipeSaver(@NotNull RecipeMetadata<ConditionalRecipe.Builder> metadata, Consumer<FinishedRecipe> writer)
     {
         metadata.setupRecipeBuilder().build(writer, metadata.id);
     }
     
-    private static <T extends RecipeBuilder> void recipeBuilderSaver(RecipeMetadata<T> metadata, Consumer<FinishedRecipe> writer)
+    private static <T extends RecipeBuilder> void recipeBuilderSaver(@NotNull RecipeMetadata<T> metadata, Consumer<FinishedRecipe> writer)
     {
         metadata.setupRecipeBuilder().save(writer, metadata.id);
     }
diff --git a/src/datagen/java/techguns2/datagen/recipes/ModRecipeProvider.java b/src/datagen/java/techguns2/datagen/recipes/ModRecipeProvider.java
index c72fe14f..94d35c98 100644
--- a/src/datagen/java/techguns2/datagen/recipes/ModRecipeProvider.java
+++ b/src/datagen/java/techguns2/datagen/recipes/ModRecipeProvider.java
@@ -25,6 +25,7 @@
 import net.minecraftforge.common.crafting.ConditionalRecipe;
 import net.minecraftforge.common.crafting.conditions.NotCondition;
 import net.minecraftforge.common.crafting.conditions.TagEmptyCondition;
+import org.jetbrains.annotations.NotNull;
 import techguns2.TGItems;
 import techguns2.Techguns;
 import techguns2.datagen.RecipeMetadata;
@@ -44,18 +45,18 @@ public ModRecipeProvider(PackOutput output, Stream<IRecipeMetadataProvider> meta
     {
         super(output);
         
-        this._metadatas = new ArrayList<RecipeMetadata<?>>();
+        this._metadatas = new ArrayList<>();
         this._metadataProviders = metadataProviders.toList();
     }
     
     @Override
-    public final CompletableFuture<?> run(CachedOutput output)
+    public final @NotNull CompletableFuture<?> run(@NotNull CachedOutput output)
     {
         return this.collectMetadata()
                 .thenCompose((x) -> super.run(output));
     }
     
-    private final CompletableFuture<?> collectMetadata()
+    private CompletableFuture<?> collectMetadata()
     {
         CompletableFuture<?> completableFuture = CompletableFuture.runAsync(() -> {
             this._metadatas.clear();
@@ -66,18 +67,13 @@ private final CompletableFuture<?> collectMetadata()
         {
             completableFuture = completableFuture
                     .thenComposeAsync(x -> metadataProvider.fetchRecipes())
-                    .thenAccept(recipeMetadatas -> {
-                        for (RecipeMetadata<?> recipeMetadata : recipeMetadatas)
-                        {
-                            this._metadatas.add(recipeMetadata);
-                        }
-                    });
+                    .thenAccept(this._metadatas::addAll);
         }
         
         return completableFuture;
     }
     
-    private final void collectBuiltInMetadatas()
+    private void collectBuiltInMetadatas()
     {
         {
             ResourceLocation id = new ResourceLocation(Techguns.MODID, "gunpowder_in_chemical_laboratory");
@@ -208,7 +204,7 @@ private final void collectBuiltInMetadatas()
     }
 
     @Override
-    protected final void buildRecipes(Consumer<FinishedRecipe> builder)
+    protected final void buildRecipes(@NotNull Consumer<FinishedRecipe> builder)
     {
         for (RecipeMetadata<?> recipeMetadata : this._metadatas)
         {
diff --git a/src/main/java/techguns2/TGAmmoGroups.java b/src/main/java/techguns2/TGAmmoGroups.java
index 2e13cce6..0af94aaf 100644
--- a/src/main/java/techguns2/TGAmmoGroups.java
+++ b/src/main/java/techguns2/TGAmmoGroups.java
@@ -10,7 +10,7 @@ public final class TGAmmoGroups implements TGInitializer
 {
     protected TGAmmoGroups()
     { }
-    
+
     @SuppressWarnings("deprecation")
     @Override
     public final void setup(IEventBus eventBus)
@@ -24,7 +24,7 @@ public final void setup(IEventBus eventBus)
     }
 
     private static final DeferredRegister<AmmoGroup> REGISTER = DeferredRegister.create(TGCustomRegistries.AMMO_GROUPS, Techguns.MODID);
-    
+
     public static final RegistryObject<AmmoGroup> STONE_BULLETS = REGISTER.register("stone_bullets", () -> {
         AmmoGroup group = new AmmoGroup();
         group.addAmmo(TGAmmo.STONE_BULLETS);
@@ -120,7 +120,7 @@ public final void setup(IEventBus eventBus)
         group.addAmmo(TGAmmo.EXPLOSIVE_AS50_ROUND_MAGAZINE);
         return group;
     });
-    public static final RegistryObject<AmmoGroup> ADVANCED_ROUND_MAGAZINE = REGISTER.register("as50_round_magazine", () -> {
+    public static final RegistryObject<AmmoGroup> ADVANCED_ROUND_MAGAZINE = REGISTER.register("advanced_round_magazine", () -> {
         AmmoGroup group = new AmmoGroup();
         group.addAmmo(TGAmmo.ADVANCED_ROUND_MAGAZINE);
         return group;
diff --git a/src/main/java/techguns2/TGBlockEntityTypes.java b/src/main/java/techguns2/TGBlockEntityTypes.java
index f315af04..7c6d00ea 100644
--- a/src/main/java/techguns2/TGBlockEntityTypes.java
+++ b/src/main/java/techguns2/TGBlockEntityTypes.java
@@ -39,18 +39,18 @@ protected TGBlockEntityTypes()
     public final void setup(IEventBus eventBus)
     {
         REGISTER.register(eventBus);
-        
+
         eventBus.addListener(TGBlockEntityTypes::registerEntityRendererLayers);
         eventBus.addListener(TGBlockEntityTypes::registerEntityRenderers);
     }
-    
+
     private static final DeferredRegister<BlockEntityType<?>> REGISTER = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, Techguns.MODID);
-    
+
     public static final RegistryObject<BlockEntityType<BioBlobBlockEntity>> BIO_BLOB = register("bio_blob", BioBlobBlockEntity::new, null, TGBlocks.BIO_BLOB);
-    
+
     public static final RegistryObject<BlockEntityType<NPCTurretBlockEntity>> NPC_TURRET = register("turret", NPCTurretBlockEntity::new, null, TGBlocks.TURRET);
     public static final RegistryObject<BlockEntityType<AmmoPressBlockEntity>> AMMO_PRESS = register("ammo_press", AmmoPressBlockEntity::new, null, TGBlocks.AMMO_PRESS);
-    public static final RegistryObject<BlockEntityType<GrinderBlockEntity>> GRINDER = register("ammo_press", GrinderBlockEntity::new, null, TGBlocks.GRINDER);
+    public static final RegistryObject<BlockEntityType<GrinderBlockEntity>> GRINDER = register("grinder", GrinderBlockEntity::new, null, TGBlocks.GRINDER);
     public static final RegistryObject<BlockEntityType<MetalPressBlockEntity>> METAL_PRESS = register("metal_press", MetalPressBlockEntity::new, null, TGBlocks.METAL_PRESS);
     public static final RegistryObject<BlockEntityType<AlloyFurnaceBlockEntity>> ALLOY_FURNACE = register("alloy_furnace", AlloyFurnaceBlockEntity::new, null, TGBlocks.ALLOY_FURNACE);
     public static final RegistryObject<BlockEntityType<ChemicalLaboratoryBlockEntity>> CHEMICAL_LABORATORY = register("chemical_laboratory", ChemicalLaboratoryBlockEntity::new, null, TGBlocks.CHEMICAL_LABORATORY);
@@ -59,7 +59,7 @@ public final void setup(IEventBus eventBus)
     public static final RegistryObject<BlockEntityType<ReactionChamberControllerBlockEntity>> REACTION_CHAMBER_CONTROLLER = register("reaction_chamber_controller", ReactionChamberControllerBlockEntity::new, null, TGBlocks.REACTION_CHAMBER_CONTROLLER);
     public static final RegistryObject<BlockEntityType<ReactionChamberPartBlockEntity>> REACTION_CHAMBER_PART = register("reaction_chamber_part", ReactionChamberPartBlockEntity::new, null, TGBlocks.REACTION_CHAMBER_PART);
     public static final RegistryObject<BlockEntityType<ChargingStationBlockEntity>> CHARGING_STATION = register("charging_station", ChargingStationBlockEntity::new, null, TGBlocks.CHARGING_STATION);
-    
+
     private static <T extends BlockEntity> RegistryObject<BlockEntityType<T>> register(
             String name,
             BlockEntitySupplier<T> blockEntitySupplier,
@@ -69,12 +69,12 @@ private static <T extends BlockEntity> RegistryObject<BlockEntityType<T>> regist
     {
         return REGISTER.register(name, () -> BlockEntityType.Builder.of(blockEntitySupplier, blockSupplier.get()).build(dataFixerType));
     }
-    
+
     private static void registerEntityRendererLayers(EntityRenderersEvent.RegisterLayerDefinitions registerLayerDefinitionsEvent)
     {
         registerLayerDefinitionsEvent.registerLayerDefinition(AmmoPressRenderer.LAYER_LOCATION, AmmoPressRenderer::createLayer);
     }
-    
+
     private static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderers registerEntityRenderersEvent)
     {
         registerEntityRenderersEvent.registerBlockEntityRenderer(TGBlockEntityTypes.AMMO_PRESS.get(), AmmoPressRenderer::new);
diff --git a/src/main/java/techguns2/TGBlocks.java b/src/main/java/techguns2/TGBlocks.java
index 4a735e94..a85e67b2 100644
--- a/src/main/java/techguns2/TGBlocks.java
+++ b/src/main/java/techguns2/TGBlocks.java
@@ -43,21 +43,21 @@
 public final class TGBlocks implements TGInitializer
 {
 
-    protected TGBlocks()
+    TGBlocks()
     { }
-    
+
     private static final DeferredRegister<Block> BLOCK_REGISTER = DeferredRegister.create(ForgeRegistries.BLOCKS, Techguns.MODID);
     private static final DeferredRegister<Item> ITEM_REGISTER = DeferredRegister.create(ForgeRegistries.ITEMS, Techguns.MODID);
 
     @Override
-    public final void setup(IEventBus eventBus)
+    public void setup(IEventBus eventBus)
     {
         BLOCK_REGISTER.register(eventBus);
         ITEM_REGISTER.register(eventBus);
     }
-    
-    protected static final List<RegistryObject<? extends Block>> MACHINE_BLOCKS = new ArrayList<RegistryObject<? extends Block>>();
-    
+
+    static final List<RegistryObject<? extends Block>> MACHINE_BLOCKS = new ArrayList<>();
+
     public static final RegistryObject<Block> TIN_ORE = registerCommon(
             "tin_ore",
             () -> new DropExperienceBlock(BlockBehaviour.Properties.of()
@@ -168,7 +168,7 @@ public final void setup(IEventBus eventBus)
                     .sound(SoundType.STONE)
                     .strength(5.0F, 6.0F)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<BioBlobBlock> BIO_BLOB = registerCommon(
             "bio_blob",
             () -> new BioBlobBlock(BlockBehaviour.Properties.of()
@@ -176,7 +176,7 @@ public final void setup(IEventBus eventBus)
                     .lightLevel(x -> 7)
                     .sound(SoundType.SLIME_BLOCK)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<SandBagsBlock> SANDBAGS = registerCommon(
             "sandbags",
             () -> new SandBagsBlock(BlockBehaviour.Properties.of()
@@ -185,7 +185,7 @@ public final void setup(IEventBus eventBus)
                     .forceSolidOn()
                     .strength(3.0F, 15.0F)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLampBlock> YELLOW_LAMP = registerCommon(
             "yellow_lamp",
             () -> new TGLampBlock(BlockBehaviour.Properties.of()
@@ -196,7 +196,7 @@ public final void setup(IEventBus eventBus)
                     .noOcclusion()
                     .sound(SoundType.GLASS)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLampBlock> WHITE_LAMP = registerCommon(
             "white_lamp",
             () -> new TGLampBlock(BlockBehaviour.Properties.of()
@@ -207,7 +207,7 @@ public final void setup(IEventBus eventBus)
                     .noOcclusion()
                     .sound(SoundType.GLASS)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLanternBlock> LANTERN = registerCommon(
             "yellow_lantern",
             () -> new TGLanternBlock(BlockBehaviour.Properties.of()
@@ -218,7 +218,7 @@ public final void setup(IEventBus eventBus)
                     .noOcclusion()
                     .sound(SoundType.GLASS)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLanternBlock> WHITE_LANTERN = registerCommon(
             "white_lantern",
             () -> new TGLanternBlock(BlockBehaviour.Properties.of()
@@ -229,7 +229,7 @@ public final void setup(IEventBus eventBus)
                     .noOcclusion()
                     .sound(SoundType.GLASS)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLadderBlock> METAL_LADDER = registerCommon(
             "metal_ladder",
             () -> new TGLadderBlock(BlockBehaviour.Properties.of()
@@ -238,7 +238,7 @@ public final void setup(IEventBus eventBus)
                     .strength(6.0F)
                     .sound(SoundType.METAL)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLadderBlock> SHINY_LADDER = registerCommon(
             "shiny_ladder",
             () -> new TGLadderBlock(BlockBehaviour.Properties.of()
@@ -247,7 +247,7 @@ public final void setup(IEventBus eventBus)
                     .strength(6.0F)
                     .sound(SoundType.METAL)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLadderBlock> RUSTY_LADDER = registerCommon(
             "rusty_ladder",
             () -> new TGLadderBlock(BlockBehaviour.Properties.of()
@@ -256,7 +256,7 @@ public final void setup(IEventBus eventBus)
                     .strength(6.0F)
                     .sound(SoundType.METAL)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<TGLadderBlock> CARBON_LADDER = registerCommon(
             "carbon_ladder",
             () -> new TGLadderBlock(BlockBehaviour.Properties.of()
@@ -265,7 +265,7 @@ public final void setup(IEventBus eventBus)
                     .strength(6.0F)
                     .sound(SoundType.METAL)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<NeonLightRotatableBlock> NEON_LIGHT = registerCommon(
             "neon_light",
             () -> new NeonLightRotatableBlock(BlockBehaviour.Properties.of()
@@ -275,7 +275,7 @@ public final void setup(IEventBus eventBus)
                     .strength(4.0F)
                     .sound(SoundType.GLASS)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<NeonLightRotatableBlock> QUAD_NEON_LIGHT = registerCommon(
             "quad_neon_light",
             () -> new NeonLightRotatableBlock(BlockBehaviour.Properties.of()
@@ -285,7 +285,7 @@ public final void setup(IEventBus eventBus)
                     .strength(4.0F)
                     .sound(SoundType.GLASS)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<NeonLightBlock> SQUARE_NEON_LIGHT = registerCommon(
             "square_neon_light",
             () -> new NeonLightBlock(BlockBehaviour.Properties.of()
@@ -295,167 +295,166 @@ public final void setup(IEventBus eventBus)
                     .strength(4.0F)
                     .sound(SoundType.GLASS)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> CRATE = registerCommon(
             "ammo_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> WEAPON_CRATE = registerCommon(
             "weapon_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> ARMOR_CRATE = registerCommon(
             "armor_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> MEDICAL_CRATE = registerCommon(
             "medical_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> EXPLOSIVES_CRATE = registerCommon(
             "explosives_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> OAK_SUPPLY_CRATE = registerCommon(
             "oak_supply_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> SPRUCE_SUPPLY_CRATE = registerCommon(
             "spruce_supply_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> BIRCH_SUPPLY_CRATE = registerCommon(
             "birch_supply_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<CrateBlock> JUNGLE_SUPPLY_CRATE = registerCommon(
             "jungle_supply_crate",
             () -> new CrateBlock(BlockBehaviour.Properties.of()
                     // TODO: Properties
                     .sound(SoundType.STONE)),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<AmmoPressBlock> AMMO_PRESS = registerMachine("ammo_press", 
+
+    public static final RegistryObject<AmmoPressBlock> AMMO_PRESS = registerMachine("ammo_press",
             () -> new AmmoPressBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<MetalPressBlock> METAL_PRESS = registerMachine("metal_press", 
+
+    public static final RegistryObject<MetalPressBlock> METAL_PRESS = registerMachine("metal_press",
             () -> new MetalPressBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<ChemicalLaboratoryBlock> CHEMICAL_LABORATORY = registerMachine("chemical_laboratory", 
+
+    public static final RegistryObject<ChemicalLaboratoryBlock> CHEMICAL_LABORATORY = registerMachine("chemical_laboratory",
             () -> new ChemicalLaboratoryBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<NPCTurretBlock> TURRET = registerMachine("turret", 
+
+    public static final RegistryObject<NPCTurretBlock> TURRET = registerMachine("turret",
             () -> new NPCTurretBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<Block> CAMO_BENCH = registerCommon(
             "camo_bench",
             () -> new Block(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<Block> REPAIR_BENCH = registerCommon(
             "repair_bench",
             () -> new Block(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<ChargingStationBlock> CHARGING_STATION = registerMachine("charging_station", 
+
+    public static final RegistryObject<ChargingStationBlock> CHARGING_STATION = registerMachine("charging_station",
             () -> new ChargingStationBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<AlloyFurnaceBlock> ALLOY_FURNACE = registerMachine("alloy_furnace", 
+
+    public static final RegistryObject<AlloyFurnaceBlock> ALLOY_FURNACE = registerMachine("alloy_furnace",
             () -> new AlloyFurnaceBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
 
-    public static final RegistryObject<GrinderBlock> GRINDER = registerMachine("grinder", 
+    public static final RegistryObject<GrinderBlock> GRINDER = registerMachine("grinder",
             () -> new GrinderBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<Block> UPGRADE_BENCH = registerCommon(
-            "repair_bench",
+            "upgrade_bench",
             () -> new Block(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<Block> FABRICATOR_HOUSING = registerCommon(
             "fabricator_housing",
             () -> new Block(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<Block> FABRICATOR_GLASS = registerCommon(
             "fabricator_glass",
             () -> new Block(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<FabricatorPartBlock> FABRICATOR_PART = registerMBMachinePart("fabricator_part", 
+
+    public static final RegistryObject<FabricatorPartBlock> FABRICATOR_PART = registerMBMachinePart("fabricator_part",
             () -> new FabricatorPartBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<FabricatorControllerBlock> FABRICATOR_CONTROLLER = registerMachine("fabricator_controller", 
+
+    public static final RegistryObject<FabricatorControllerBlock> FABRICATOR_CONTROLLER = registerMachine("fabricator_controller",
             () -> new FabricatorControllerBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<Block> REACTION_CHAMBER_HOUSING = registerCommon(
             "reaction_chamber_housing",
             () -> new Block(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
+
     public static final RegistryObject<Block> REACTION_CHAMBER_GLASS = registerCommon(
             "reaction_chamber_glass",
             () -> new Block(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<ReactionChamberPartBlock> REACTION_CHAMBER_PART = registerMBMachinePart("reaction_chamber_part", 
+
+    public static final RegistryObject<ReactionChamberPartBlock> REACTION_CHAMBER_PART = registerMBMachinePart("reaction_chamber_part",
             () -> new ReactionChamberPartBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
-    
-    public static final RegistryObject<ReactionChamberControllerBlock> REACTION_CHAMBER_CONTROLLER = registerMachine("reaction_chamber_controller", 
+
+    public static final RegistryObject<ReactionChamberControllerBlock> REACTION_CHAMBER_CONTROLLER = registerMachine("reaction_chamber_controller",
             () -> new ReactionChamberControllerBlock(BlockBehaviour.Properties.of()),
             (block) -> new BlockItem(block, new Item.Properties()));
 
-    private static final <
+    private static <
             T extends AbstractMultiBlockMachinePartBlock<TPartBlockEntity, TControllerBlockEntity>,
             TPartBlockEntity extends AbstractMultiBlockMachinePartBlockEntity<TPartBlockEntity, TControllerBlockEntity>,
             TControllerBlockEntity extends AbstractMultiBlockMachineControllerBlockEntity<TPartBlockEntity, TControllerBlockEntity>
-        > RegistryObject<T> registerMBMachinePart(String name, Supplier<T> blockSupplier, Function<T, Item> itemSupplier)
+            > RegistryObject<T> registerMBMachinePart(String name, Supplier<T> blockSupplier, Function<T, Item> itemSupplier)
     {
-        var result = registerCommon(name, blockSupplier, itemSupplier);
-        return result;
+        return registerCommon(name, blockSupplier, itemSupplier);
     }
-    
-    private static final <T extends Block> RegistryObject<T> registerMachine(String name, Supplier<T> blockSupplier, Function<T, Item> itemSupplier)
+
+    private static <T extends Block> RegistryObject<T> registerMachine(String name, Supplier<T> blockSupplier, Function<T, Item> itemSupplier)
     {
         var result = registerCommon(name, blockSupplier, itemSupplier);
         MACHINE_BLOCKS.add(result);
         return result;
     }
-    
-    private static final <T extends Block> RegistryObject<T> registerCommon(String name, Supplier<T> blockSupplier, Function<T, Item> itemSupplier)
+
+    private static <T extends Block> RegistryObject<T> registerCommon(String name, Supplier<T> blockSupplier, Function<T, Item> itemSupplier)
     {
         var result = BLOCK_REGISTER.register(name, blockSupplier);
         ITEM_REGISTER.register(name, () -> itemSupplier.apply(result.get()));
diff --git a/src/main/java/techguns2/block/BioBlobBlock.java b/src/main/java/techguns2/block/BioBlobBlock.java
index 215934e8..cf62a2d6 100644
--- a/src/main/java/techguns2/block/BioBlobBlock.java
+++ b/src/main/java/techguns2/block/BioBlobBlock.java
@@ -17,54 +17,68 @@
 import net.minecraft.world.level.pathfinder.PathComputationType;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.NotNull;
 import techguns2.block.entity.BioBlobBlockEntity;
 
 public final class BioBlobBlock extends BaseEntityBlock
 {
     public static final IntegerProperty SIZE = IntegerProperty.create("size", 0, 2);
-    public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
-    
+    public static final DirectionProperty FACING = BlockStateProperties.FACING;
+
     private final Map<BlockState, VoxelShape> _shapes;
-    
+
     public BioBlobBlock(Properties properties)
     {
         super(properties);
-        
+
         this.registerDefaultState(this.stateDefinition.any()
                 .setValue(SIZE, 0)
                 .setValue(FACING, Direction.UP));
-        
+
         this._shapes = makeShapes(this.defaultBlockState());
     }
-    
+
     @Override
-    public final VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext)
+    public @NotNull VoxelShape getShape(
+            @NotNull BlockState blockState,
+            @NotNull BlockGetter blockGetter,
+            @NotNull BlockPos blockPos,
+            @NotNull CollisionContext collisionContext
+    )
     {
         return this._shapes.get(blockState);
     }
-    
+
     @Override
-    public final VoxelShape getCollisionShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos,
-            CollisionContext collisionContext)
+    public VoxelShape getCollisionShape(
+            @NotNull BlockState blockState,
+            @NotNull BlockGetter blockGetter,
+            @NotNull BlockPos blockPos,
+            @NotNull CollisionContext collisionContext
+    )
     {
         return this._shapes.get(blockState);
     }
-    
+
     @Override
-    public final boolean isPathfindable(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos,
-            PathComputationType type)
+    public boolean isPathfindable(
+            @NotNull BlockState blockState,
+            @NotNull BlockGetter blockGetter,
+            @NotNull BlockPos blockPos,
+            @NotNull PathComputationType type
+    )
     {
         return false;
     }
-    
+
     @Override
-    protected final void createBlockStateDefinition(Builder<Block, BlockState> builder)
+    protected void createBlockStateDefinition(Builder<Block, BlockState> builder)
     {
         builder.add(SIZE, FACING);
     }
 
     @Override
-    public final BioBlobBlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState)
+    public BioBlobBlockEntity newBlockEntity(@NotNull BlockPos blockPos, @NotNull BlockState blockState)
     {
         return new BioBlobBlockEntity(blockPos, blockState);
     }
@@ -72,15 +86,15 @@ public final BioBlobBlockEntity newBlockEntity(BlockPos blockPos, BlockState blo
     private static Map<BlockState, VoxelShape> makeShapes(BlockState defaultState)
     {
         ImmutableMap.Builder<BlockState, VoxelShape> result = ImmutableMap.builder();
-        
+
         int size = 0;
         while (size < 3)
         {
             int w = 5 - (2 * size);
             int h = 3 + size;
-            
+
             BlockState sizedState = defaultState.setValue(SIZE, size);
-            
+
             result.put(sizedState.setValue(FACING, Direction.DOWN),
                     Block.box(w, 0, w, 16 - w, h, 16 - w));
             result.put(sizedState.setValue(FACING, Direction.WEST),
@@ -88,15 +102,16 @@ private static Map<BlockState, VoxelShape> makeShapes(BlockState defaultState)
             result.put(sizedState.setValue(FACING, Direction.NORTH),
                     Block.box(w, w, 0, 16 - w, 16 - w, h));
             result.put(sizedState.setValue(FACING, Direction.SOUTH),
-                    Block.box(w, w, 16 - h, 16 - w, h, 1));
+                    //Block.box(w, w, 16 - h, 16 - w, h, 1)); fixed error
+                    Block.box(w, w, 16 - h, 16 - w, 16-w, 16));
             result.put(sizedState.setValue(FACING, Direction.UP),
-                    Block.box(w, 16-h, w, 16 - w, 1, 16 - w));
+                    Block.box(w, 16-h, w, 16 - w, 16, 16 - w));
             result.put(sizedState.setValue(FACING, Direction.EAST),
-                    Block.box(16 - h, w, w, 1, 16 - w, 16 - w));
-            
+                    Block.box(16 - h, w, w, 16, 16 - w, 16 - w));
+
             size++;
         }
-        
+
         return result.build();
     }
 
diff --git a/src/main/resources/assets/techguns2/textures/item/ingotbronze.png b/src/main/resources/assets/techguns2/textures/item/ingotbronze.png
index eca45e35..d8718f05 100644
Binary files a/src/main/resources/assets/techguns2/textures/item/ingotbronze.png and b/src/main/resources/assets/techguns2/textures/item/ingotbronze.png differ
diff --git a/src/main/resources/assets/techguns2/textures/item/ingotcopper.png b/src/main/resources/assets/techguns2/textures/item/ingotcopper.png
deleted file mode 100644
index e99ca8e1..00000000
Binary files a/src/main/resources/assets/techguns2/textures/item/ingotcopper.png and /dev/null differ
diff --git a/src/main/resources/assets/techguns2/textures/item/ingotlead.png b/src/main/resources/assets/techguns2/textures/item/ingotlead.png
index c173213e..c70b34b6 100644
Binary files a/src/main/resources/assets/techguns2/textures/item/ingotlead.png and b/src/main/resources/assets/techguns2/textures/item/ingotlead.png differ
diff --git a/src/main/resources/assets/techguns2/textures/item/ingotobsidiansteel.png b/src/main/resources/assets/techguns2/textures/item/ingotobsidiansteel.png
index b1d0d6d0..e12bfc09 100644
Binary files a/src/main/resources/assets/techguns2/textures/item/ingotobsidiansteel.png and b/src/main/resources/assets/techguns2/textures/item/ingotobsidiansteel.png differ
diff --git a/src/main/resources/assets/techguns2/textures/item/ingotsteel.png b/src/main/resources/assets/techguns2/textures/item/ingotsteel.png
index 20e33541..6f3bd32b 100644
Binary files a/src/main/resources/assets/techguns2/textures/item/ingotsteel.png and b/src/main/resources/assets/techguns2/textures/item/ingotsteel.png differ
diff --git a/src/main/resources/assets/techguns2/textures/item/ingottin.png b/src/main/resources/assets/techguns2/textures/item/ingottin.png
index 12b773ca..748ea0cc 100644
Binary files a/src/main/resources/assets/techguns2/textures/item/ingottin.png and b/src/main/resources/assets/techguns2/textures/item/ingottin.png differ
diff --git a/src/main/resources/assets/techguns2/textures/item/ingottitanium.png b/src/main/resources/assets/techguns2/textures/item/ingottitanium.png
index e30577cc..1d889386 100644
Binary files a/src/main/resources/assets/techguns2/textures/item/ingottitanium.png and b/src/main/resources/assets/techguns2/textures/item/ingottitanium.png differ
diff --git a/src/main/resources/assets/techguns2/textures/item/treatedleather.png b/src/main/resources/assets/techguns2/textures/item/treatedleather.png
index 7626659c..e215cf9e 100644
Binary files a/src/main/resources/assets/techguns2/textures/item/treatedleather.png and b/src/main/resources/assets/techguns2/textures/item/treatedleather.png differ