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

Port to 1.11

Browse Source
This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/game/DisassembleRecipe.java
+2 -1
View File
@@ -30,6 +30,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
@@ -174,7 +175,7 @@ public final class DisassembleRecipe implements IRecipe
}
@Override
public ItemStack[] getRemainingItems( final InventoryCrafting inv )
public NonNullList<ItemStack> getRemainingItems( final InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems( inv );
}
src/main/java/appeng/recipes/game/FacadeRecipe.java
+3 -2
View File
@@ -25,6 +25,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
@@ -63,7 +64,7 @@ public final class FacadeRecipe implements IRecipe
final ItemStack facades = facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade );
if( facades != null && createFacade )
{
facades.stackSize = 4;
facades.setCount( 4 );
}
return facades;
}
@@ -91,7 +92,7 @@ public final class FacadeRecipe implements IRecipe
}
@Override
public ItemStack[] getRemainingItems( final InventoryCrafting inv )
public NonNullList<ItemStack> getRemainingItems( final InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems( inv );
}
src/main/java/appeng/recipes/game/ShapedRecipe.java
+2 -1
View File
@@ -26,6 +26,7 @@ import java.util.Map;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
@@ -327,7 +328,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
}
@Override
public ItemStack[] getRemainingItems( final InventoryCrafting inv )
public NonNullList<ItemStack> getRemainingItems( final InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems( inv );
}
src/main/java/appeng/recipes/game/ShapelessRecipe.java
+2 -1
View File
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.oredict.OreDictionary;
@@ -182,7 +183,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
}
@Override
public ItemStack[] getRemainingItems( final InventoryCrafting inv )
public NonNullList<ItemStack> getRemainingItems( final InventoryCrafting inv )
{
return ForgeHooks.defaultRecipeGetRemainingItems( inv );
}