keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #1952 from ganymedes01/master 

Change permission levels on ore recipes parameters
This commit is contained in:
LexManos 2015-06-18 11:55:46 -07:00
parent 40bc035d74 ab548afbfb
commit 94dc49e522
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java
View File

@ -17,14 +17,14 @@ import net.minecraftforge.common.ForgeHooks;
public class ShapedOreRecipe implements IRecipe
{
//Added in for future ease of change, but hard coded for now.
private static final int MAX_CRAFT_GRID_WIDTH = 3;
private static final int MAX_CRAFT_GRID_HEIGHT = 3;
public static final int MAX_CRAFT_GRID_WIDTH = 3;
public static final int MAX_CRAFT_GRID_HEIGHT = 3;
private ItemStack output = null;
private Object[] input = null;
private int width = 0;
private int height = 0;
private boolean mirrored = true;
protected ItemStack output = null;
protected Object[] input = null;
protected int width = 0;
protected int height = 0;
protected boolean mirrored = true;
public ShapedOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); }
public ShapedOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); }
@ -184,7 +184,7 @@ public class ShapedOreRecipe implements IRecipe
}
@SuppressWarnings("unchecked")
private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror)
protected boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror)
{
for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++)
{

4
src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java
View File

@ -16,8 +16,8 @@ import net.minecraftforge.common.ForgeHooks;
public class ShapelessOreRecipe implements IRecipe
{
private ItemStack output = null;
private ArrayList<Object> input = new ArrayList<Object>();
protected ItemStack output = null;
protected ArrayList<Object> input = new ArrayList<Object>();
public ShapelessOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); }
public ShapelessOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); }