review changes

Team-EnderIO · Sep 26, 2024 · 3a1c0d8 · 3a1c0d8
1 parent 83c4725
commit 3a1c0d8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/enderio-base/src/main/resources/META-INF/neoforge.mods.toml b/enderio-base/src/main/resources/META-INF/neoforge.mods.toml
@@ -15,9 +15,6 @@ logoFile="logo.png"
 [[mixins]]
 config="enderiobase.mixins.json"
 
-[[mixins]]
-config="enderio-machines.mixins.json"
-
 [[dependencies.enderio_base]]
 modId="minecraft"
 type="required"

diff --git a/...chines/src/main/java/com/enderio/machines/common/blockentity/AlloySmelterBlockEntity.java b/...chines/src/main/java/com/enderio/machines/common/blockentity/AlloySmelterBlockEntity.java
@@ -26,7 +26,6 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponentMap;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -297,17 +296,6 @@ protected void consumeInputs(AlloySmeltingRecipe recipe) {
             }
         }
 
-        @Nullable
-        @Override
-        protected RecipeHolder<AlloySmeltingRecipe> loadRecipe(ResourceLocation id) {
-            //noinspection unchecked
-            return (RecipeHolder<AlloySmeltingRecipe>) level
-                .getRecipeManager()
-                .byKey(id)
-                .filter(recipe -> recipe.value().getType() == MachineRecipes.ALLOY_SMELTING.type().get())
-                .orElse(null);
-        }
-
         @Override
         public void deserializeNBT(HolderLookup.Provider lookupProvider, CompoundTag nbt) {
             super.deserializeNBT(lookupProvider, nbt);

diff --git a/enderio-machines/src/main/java/com/enderio/machines/common/recipe/AlloySmeltingRecipe.java b/enderio-machines/src/main/java/com/enderio/machines/common/recipe/AlloySmeltingRecipe.java
@@ -25,14 +25,14 @@ public class AlloySmeltingRecipe implements MachineRecipe<AlloySmeltingRecipe.In
     private final ItemStack output;
     private final int energy;
     private final float experience;
-    private final boolean smelting;
+    private final boolean isSmelting;
 
-    public AlloySmeltingRecipe(List<SizedIngredient> inputs, ItemStack output, int energy, float experience, boolean smelting) {
+    public AlloySmeltingRecipe(List<SizedIngredient> inputs, ItemStack output, int energy, float experience, boolean isSmelting) {
         this.inputs = inputs;
         this.output = output;
         this.energy = energy;
         this.experience = experience;
-        this.smelting = smelting;
+        this.isSmelting = isSmelting;
     }
 
     public AlloySmeltingRecipe(List<SizedIngredient> inputs, ItemStack output, int energy, float experience) {
@@ -56,7 +56,7 @@ public float experience() {
     }
 
     public boolean isSmelting() {
-        return smelting;
+        return isSmelting;
     }
 
     @Override
@@ -109,7 +109,7 @@ public boolean matches(Input recipeInput, Level level) {
     @Override
     public List<OutputStack> craft(Input container, RegistryAccess registryAccess) {
         ItemStack outputStack = output.copy();
-        if (smelting) {
+        if (isSmelting) {
             outputStack.setCount(container.inputsConsumed);
         }
         return List.of(OutputStack.of(outputStack));

diff --git a/enderio-machines/src/main/resources/META-INF/neoforge.mods.toml b/enderio-machines/src/main/resources/META-INF/neoforge.mods.toml
@@ -12,6 +12,9 @@ description="The machines module for Ender IO"
 displayURL="https://enderio.com/"
 logoFile="logo.png"
 
+[[mixins]]
+config="enderio-machines.mixins.json"
+
 [[dependencies.enderio_machines]]
 modId="minecraft"
 type="required"