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

Changed access to use this qualifier

Browse Source
This commit is contained in:
yueh
2014-12-29 15:13:47 +01:00
parent 2a5e57a59b
commit f471513bd0
604 changed files with 11573 additions and 11573 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/recipes/game/DisassembleRecipe.java
+20 -20
View File
@@ -50,17 +50,17 @@ public class DisassembleRecipe implements IRecipe
if ( hasCell != null )
return null;
if ( items.itemCell1k.sameAsStack( is ) )
hasCell = mats.materialCell1kPart.stack( 1 );
if ( this.items.itemCell1k.sameAsStack( is ) )
hasCell = this.mats.materialCell1kPart.stack( 1 );
if ( items.itemCell4k.sameAsStack( is ) )
hasCell = mats.materialCell4kPart.stack( 1 );
if ( this.items.itemCell4k.sameAsStack( is ) )
hasCell = this.mats.materialCell4kPart.stack( 1 );
if ( items.itemCell16k.sameAsStack( is ) )
hasCell = mats.materialCell16kPart.stack( 1 );
if ( this.items.itemCell16k.sameAsStack( is ) )
hasCell = this.mats.materialCell16kPart.stack( 1 );
if ( items.itemCell64k.sameAsStack( is ) )
hasCell = mats.materialCell64kPart.stack( 1 );
if ( this.items.itemCell64k.sameAsStack( is ) )
hasCell = this.mats.materialCell64kPart.stack( 1 );
// make sure the storage cell is empty...
if ( hasCell != null )
@@ -74,20 +74,20 @@ public class DisassembleRecipe implements IRecipe
}
}
if ( items.itemEncodedPattern.sameAsStack( is ) )
hasCell = mats.materialBlankPattern.stack( 1 );
if ( this.items.itemEncodedPattern.sameAsStack( is ) )
hasCell = this.mats.materialBlankPattern.stack( 1 );
if ( blocks.blockCraftingStorage1k.sameAsStack( is ) )
hasCell = mats.materialCell1kPart.stack( 1 );
if ( this.blocks.blockCraftingStorage1k.sameAsStack( is ) )
hasCell = this.mats.materialCell1kPart.stack( 1 );
if ( blocks.blockCraftingStorage4k.sameAsStack( is ) )
hasCell = mats.materialCell4kPart.stack( 1 );
if ( this.blocks.blockCraftingStorage4k.sameAsStack( is ) )
hasCell = this.mats.materialCell4kPart.stack( 1 );
if ( blocks.blockCraftingStorage16k.sameAsStack( is ) )
hasCell = mats.materialCell16kPart.stack( 1 );
if ( this.blocks.blockCraftingStorage16k.sameAsStack( is ) )
hasCell = this.mats.materialCell16kPart.stack( 1 );
if ( blocks.blockCraftingStorage64k.sameAsStack( is ) )
hasCell = mats.materialCell64kPart.stack( 1 );
if ( this.blocks.blockCraftingStorage64k.sameAsStack( is ) )
hasCell = this.mats.materialCell64kPart.stack( 1 );
if ( hasCell == null )
return null;
@@ -100,13 +100,13 @@ public class DisassembleRecipe implements IRecipe
@Override
public boolean matches(InventoryCrafting inv, World w)
{
return getOutput( inv, false ) != null;
return this.getOutput( inv, false ) != null;
}
@Override
public ItemStack getCraftingResult(InventoryCrafting inv)
{
return getOutput( inv, true );
return this.getOutput( inv, true );
}
@Override
src/main/java/appeng/recipes/game/FacadeRecipe.java
+5 -5
View File
@@ -36,10 +36,10 @@ public class FacadeRecipe implements IRecipe
{
if ( inv.getStackInSlot( 0 ) == null && inv.getStackInSlot( 2 ) == null && inv.getStackInSlot( 6 ) == null && inv.getStackInSlot( 8 ) == null )
{
if ( anchor.sameAsStack( inv.getStackInSlot( 1 ) ) && anchor.sameAsStack( inv.getStackInSlot( 3 ) ) && anchor.sameAsStack( inv.getStackInSlot( 5 ) )
&& anchor.sameAsStack( inv.getStackInSlot( 7 ) ) )
if ( this.anchor.sameAsStack( inv.getStackInSlot( 1 ) ) && this.anchor.sameAsStack( inv.getStackInSlot( 3 ) ) && this.anchor.sameAsStack( inv.getStackInSlot( 5 ) )
&& this.anchor.sameAsStack( inv.getStackInSlot( 7 ) ) )
{
ItemStack facades = facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade );
ItemStack facades = this.facade.createFacadeForItem( inv.getStackInSlot( 4 ), !createFacade );
if ( facades != null && createFacade )
facades.stackSize = 4;
return facades;
@@ -51,13 +51,13 @@ public class FacadeRecipe implements IRecipe
@Override
public boolean matches(InventoryCrafting inv, World w)
{
return getOutput( inv, false ) != null;
return this.getOutput( inv, false ) != null;
}
@Override
public ItemStack getCraftingResult(InventoryCrafting inv)
{
return getOutput( inv, true );
return this.getOutput( inv, true );
}
@Override
src/main/java/appeng/recipes/game/ShapedRecipe.java
+33 -33
View File
@@ -46,19 +46,19 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
public boolean isEnabled()
{
return !disable;
return !this.disable;
}
public ShapedRecipe(ItemStack result, Object... recipe)
{
output = result.copy();
this.output = result.copy();
StringBuilder shape = new StringBuilder();
int idx = 0;
if ( recipe[idx] instanceof Boolean )
{
mirrored = (Boolean) recipe[idx];
this.mirrored = (Boolean) recipe[idx];
if ( recipe[idx + 1] instanceof Object[] )
{
recipe = (Object[]) recipe[idx + 1];
@@ -75,11 +75,11 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
for (String s : parts)
{
width = s.length();
this.width = s.length();
shape.append( s );
}
height = parts.length;
this.height = parts.length;
}
else
{
@@ -87,19 +87,19 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
{
String s = (String) recipe[idx++];
shape.append( s );
width = s.length();
height++;
this.width = s.length();
this.height++;
}
}
if ( width * height != shape.length() )
if ( this.width * this.height != shape.length() )
{
StringBuilder ret = new StringBuilder( "Invalid shaped ore recipe: " );
for (Object tmp : recipe)
{
ret.append( tmp ).append( ", " );
}
ret.append( output );
ret.append( this.output );
throw new RuntimeException( ret.toString() );
}
@@ -121,53 +121,53 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
{
ret.append( tmp ).append( ", " );
}
ret.append( output );
ret.append( this.output );
throw new RuntimeException( ret.toString() );
}
}
input = new Object[width * height];
this.input = new Object[this.width * this.height];
int x = 0;
for (char chr : shape.toString().toCharArray())
{
input[x++] = itemMap.get( chr );
this.input[x++] = itemMap.get( chr );
}
}
@Override
public ItemStack getCraftingResult(InventoryCrafting var1)
{
return output.copy();
return this.output.copy();
}
@Override
public int getRecipeSize()
{
return input.length;
return this.input.length;
}
@Override
public ItemStack getRecipeOutput()
{
return output;
return this.output;
}
@Override
public boolean matches(InventoryCrafting inv, World world)
{
if ( disable )
if ( this.disable )
return false;
for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++)
for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - this.width; x++)
{
for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y)
for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - this.height; ++y)
{
if ( checkMatch( inv, x, y, false ) )
if ( this.checkMatch( inv, x, y, false ) )
{
return true;
}
if ( mirrored && checkMatch( inv, x, y, true ) )
if ( this.mirrored && this.checkMatch( inv, x, y, true ) )
{
return true;
}
@@ -180,7 +180,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
@SuppressWarnings("unchecked")
private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror)
{
if ( disable )
if ( this.disable )
return false;
for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++)
@@ -191,15 +191,15 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
int subY = y - startY;
Object target = null;
if ( subX >= 0 && subY >= 0 && subX < width && subY < height )
if ( subX >= 0 && subY >= 0 && subX < this.width && subY < this.height )
{
if ( mirror )
{
target = input[width - subX - 1 + subY * width];
target = this.input[this.width - subX - 1 + subY * this.width];
}
else
{
target = input[subX + subY * width];
target = this.input[subX + subY * this.width];
}
}
@@ -213,7 +213,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
{
for (ItemStack item : ((IIngredient) target).getItemStackSet())
{
matched = matched || checkItemEquals( item, slot );
matched = matched || this.checkItemEquals( item, slot );
}
}
catch (RegistrationError e)
@@ -236,7 +236,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
for (ItemStack item : (ArrayList<ItemStack>) target)
{
matched = matched || checkItemEquals( item, slot );
matched = matched || this.checkItemEquals( item, slot );
}
if ( !matched )
@@ -266,7 +266,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
public ShapedRecipe setMirrored(boolean mirror)
{
mirrored = mirror;
this.mirrored = mirror;
return this;
}
@@ -283,17 +283,17 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
public int getWidth()
{
return width;
return this.width;
}
public int getHeight()
{
return height;
return this.height;
}
public Object[] getIngredients()
{
return input;
return this.input;
}
@Override
@@ -301,8 +301,8 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
{
try
{
disable = false;
for (Object o : getInput())
this.disable = false;
for (Object o : this.getInput())
{
if ( o instanceof IIngredient )
((IIngredient) o).bake();
@@ -310,7 +310,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable
}
catch (MissingIngredientError err)
{
disable = true;
this.disable = true;
}
}
src/main/java/appeng/recipes/game/ShapelessRecipe.java
+13 -13
View File
@@ -38,17 +38,17 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
public boolean isEnabled()
{
return !disable;
return !this.disable;
}
public ShapelessRecipe(ItemStack result, Object... recipe)
{
output = result.copy();
this.output = result.copy();
for (Object in : recipe)
{
if ( in instanceof IIngredient )
{
input.add( in );
this.input.add( in );
}
else
{
@@ -57,7 +57,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
{
ret.append( tmp ).append( ", " );
}
ret.append( output );
ret.append( this.output );
throw new RuntimeException( ret.toString() );
}
}
@@ -66,29 +66,29 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
@Override
public int getRecipeSize()
{
return input.size();
return this.input.size();
}
@Override
public ItemStack getRecipeOutput()
{
return output;
return this.output;
}
@Override
public ItemStack getCraftingResult(InventoryCrafting var1)
{
return output.copy();
return this.output.copy();
}
@SuppressWarnings("unchecked")
@Override
public boolean matches(InventoryCrafting var1, World world)
{
if ( disable )
if ( this.disable )
return false;
ArrayList<Object> required = new ArrayList<Object>( input );
ArrayList<Object> required = new ArrayList<Object>( this.input );
for (int x = 0; x < var1.getSizeInventory(); x++)
{
@@ -108,7 +108,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
{
for (ItemStack item : ((IIngredient) next).getItemStackSet())
{
match = match || checkItemEquals( item, slot );
match = match || this.checkItemEquals( item, slot );
}
}
catch (RegistrationError e)
@@ -161,8 +161,8 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
{
try
{
disable = false;
for (Object o : getInput())
this.disable = false;
for (Object o : this.getInput())
{
if ( o instanceof IIngredient )
((IIngredient) o).bake();
@@ -170,7 +170,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable
}
catch (MissingIngredientError e)
{
disable = true;
this.disable = true;
}
}
}