fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some additional fixes from other branch.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-05-30 22:18:26 +02:00
parent 16d6d55d7f
commit ec3b464655
139 changed files with 1489 additions and 1485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/game/DisassembleRecipe.java
+4 -4
View File
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
@@ -76,7 +76,7 @@ public final class DisassembleRecipe extends net.minecraftforge.registries.IForg
}
@Override
public boolean matches( final InventoryCrafting inv, final World w )
public boolean matches(final CraftingInventory inv, final World w )
{
return !this.getOutput( inv ).isEmpty();
}
@@ -161,7 +161,7 @@ public final class DisassembleRecipe extends net.minecraftforge.registries.IForg
@Nullable
@Override
public ItemStack getCraftingResult( final InventoryCrafting inv )
public ItemStack getCraftingResult( final CraftingInventory inv )
{
return this.getOutput( inv );
}
@@ -180,7 +180,7 @@ public final class DisassembleRecipe extends net.minecraftforge.registries.IForg
}
@Override
public NonNullList<ItemStack> getRemainingItems( final InventoryCrafting inv )
public NonNullList<ItemStack> getRemainingItems( final CraftingInventory inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems( inv );
}
src/main/java/appeng/recipes/game/FacadeRecipe.java
+4 -4
View File
@@ -22,7 +22,7 @@ package appeng.recipes.game;
import javax.annotation.Nullable;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
@@ -49,7 +49,7 @@ public final class FacadeRecipe extends net.minecraftforge.registries.IForgeRegi
}
@Override
public boolean matches( final InventoryCrafting inv, final World w )
public boolean matches(final CraftingInventory inv, final World w )
{
return !this.getOutput( inv, false ).isEmpty();
}
@@ -75,7 +75,7 @@ public final class FacadeRecipe extends net.minecraftforge.registries.IForgeRegi
}
@Override
public ItemStack getCraftingResult( final InventoryCrafting inv )
public ItemStack getCraftingResult( final CraftingInventory inv )
{
return this.getOutput( inv, true );
}
@@ -93,7 +93,7 @@ public final class FacadeRecipe extends net.minecraftforge.registries.IForgeRegi
}
@Override
public NonNullList<ItemStack> getRemainingItems( final InventoryCrafting inv )
public NonNullList<ItemStack> getRemainingItems( final CraftingInventory inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems( inv );
}