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/handlers/Crusher.java
+5 -5
View File
@@ -47,8 +47,8 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -61,11 +61,11 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.RC ) )
{
IRC rc = (IRC) AppEng.instance.getIntegration( IntegrationType.RC );
for (ItemStack is : pro_input.getItemStackSet())
for (ItemStack is : this.pro_input.getItemStackSet())
{
try
{
rc.rockCrusher( is, pro_output[0].getItemStack() );
rc.rockCrusher( is, this.pro_output[0].getItemStack() );
}
catch (java.lang.RuntimeException err)
{
@@ -78,7 +78,7 @@ public class Crusher implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( pro_output[0].getItemStack(), output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(), output );
}
@Override
src/main/java/appeng/recipes/handlers/Grind.java
+7 -7
View File
@@ -46,8 +46,8 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -57,20 +57,20 @@ public class Grind implements ICraftHandler, IWebsiteSerializer
@Override
public void register() throws RegistrationError, MissingIngredientError
{
for (ItemStack is : pro_input.getItemStackSet())
AEApi.instance().registries().grinder().addRecipe( is, pro_output[0].getItemStack(), 8 );
for (ItemStack is : this.pro_input.getItemStackSet())
AEApi.instance().registries().grinder().addRecipe( is, this.pro_output[0].getItemStack(), 8 );
}
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError {
return Platform.isSameItemPrecise( pro_output[0].getItemStack(),output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(),output );
}
@Override
public String getPattern( RecipeHandler h ) {
return "grind\n"+
h.getName(pro_input)+ '\n' +
h.getName(pro_output[0]);
h.getName(this.pro_input)+ '\n' +
h.getName(this.pro_output[0]);
}
}
src/main/java/appeng/recipes/handlers/GrindFZ.java
+5 -5
View File
@@ -47,8 +47,8 @@ public class GrindFZ implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -61,11 +61,11 @@ public class GrindFZ implements ICraftHandler, IWebsiteSerializer
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.FZ ) )
{
IFZ fz = (IFZ) AppEng.instance.getIntegration( IntegrationType.FZ );
for (ItemStack is : pro_input.getItemStackSet())
for (ItemStack is : this.pro_input.getItemStackSet())
{
try
{
fz.grinderRecipe( is, pro_output[0].getItemStack() );
fz.grinderRecipe( is, this.pro_output[0].getItemStack() );
}
catch (java.lang.RuntimeException err)
{
@@ -78,7 +78,7 @@ public class GrindFZ implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( pro_output[0].getItemStack(), output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(), output );
}
@Override
src/main/java/appeng/recipes/handlers/HCCrusher.java
+5 -5
View File
@@ -46,8 +46,8 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -57,13 +57,13 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
@Override
public void register() throws RegistrationError, MissingIngredientError
{
for (ItemStack beginStack : pro_input.getItemStackSet())
for (ItemStack beginStack : this.pro_input.getItemStackSet())
{
try
{
NBTTagCompound toRegister = new NBTTagCompound();
ItemStack endStack = pro_output[0].getItemStack();
ItemStack endStack = this.pro_output[0].getItemStack();
NBTTagCompound itemFrom = new NBTTagCompound();
NBTTagCompound itemTo = new NBTTagCompound();
@@ -87,7 +87,7 @@ public class HCCrusher implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( pro_output[0].getItemStack(), output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(), output );
}
@Override
src/main/java/appeng/recipes/handlers/Inscribe.java
+20 -20
View File
@@ -45,7 +45,7 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer
this.usePlates = usePlates;
this.plateA = plateA;
this.plateB = plateB;
output = out;
this.output = out;
}
final public boolean usePlates;
@@ -77,12 +77,12 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer
{
if ( input.size() == 1 && input.get( 0 ).size() > 1 )
{
imprintable = input.get( 0 ).get( 0 );
this.imprintable = input.get( 0 ).get( 0 );
plateA = input.get( 0 ).get( 1 );
this.plateA = input.get( 0 ).get( 1 );
if ( input.get( 0 ).size() > 2 )
plateB = input.get( 0 ).get( 2 );
this.plateB = input.get( 0 ).get( 2 );
this.output = output.get( 0 ).get( 0 );
}
@@ -96,40 +96,40 @@ public class Inscribe implements ICraftHandler, IWebsiteSerializer
@Override
public void register() throws RegistrationError, MissingIngredientError
{
if ( imprintable != null )
Collections.addAll( inputs, imprintable.getItemStackSet() );
if ( this.imprintable != null )
Collections.addAll( inputs, this.imprintable.getItemStackSet() );
if ( plateA != null )
Collections.addAll( plates, plateA.getItemStackSet() );
if ( this.plateA != null )
Collections.addAll( plates, this.plateA.getItemStackSet() );
if ( plateB != null )
Collections.addAll( plates, plateB.getItemStackSet() );
if ( this.plateB != null )
Collections.addAll( plates, this.plateB.getItemStackSet() );
InscriberRecipe ir = new InscriberRecipe( imprintable.getItemStackSet(), plateA == null ? null : plateA.getItemStack(), plateB == null ? null
: plateB.getItemStack(), output.getItemStack(), usePlates );
InscriberRecipe ir = new InscriberRecipe( this.imprintable.getItemStackSet(), this.plateA == null ? null : this.plateA.getItemStack(), this.plateB == null ? null
: this.plateB.getItemStack(), this.output.getItemStack(), this.usePlates );
recipes.add( ir );
}
@Override
public boolean canCraft(ItemStack reqOutput) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( output.getItemStack(), reqOutput );
return Platform.isSameItemPrecise( this.output.getItemStack(), reqOutput );
}
@Override
public String getPattern(RecipeHandler h)
{
String o = "inscriber " + output.getQty() + '\n';
String o = "inscriber " + this.output.getQty() + '\n';
o += h.getName( output ) + '\n';
o += h.getName( this.output ) + '\n';
if ( plateA != null )
o += h.getName( plateA )+ '\n';
if ( this.plateA != null )
o += h.getName( this.plateA )+ '\n';
o += h.getName(imprintable);
o += h.getName(this.imprintable);
if ( plateB != null )
o += '\n' +h.getName( plateB );
if ( this.plateB != null )
o += '\n' +h.getName( this.plateB );
return o;
}
src/main/java/appeng/recipes/handlers/Macerator.java
+5 -5
View File
@@ -47,8 +47,8 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -61,11 +61,11 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.IC2 ) )
{
IIC2 ic2 = (IIC2) AppEng.instance.getIntegration( IntegrationType.IC2 );
for (ItemStack is : pro_input.getItemStackSet())
for (ItemStack is : this.pro_input.getItemStackSet())
{
try
{
ic2.maceratorRecipe( is, pro_output[0].getItemStack() );
ic2.maceratorRecipe( is, this.pro_output[0].getItemStack() );
}
catch (java.lang.RuntimeException err)
{
@@ -78,7 +78,7 @@ public class Macerator implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( pro_output[0].getItemStack(), output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(), output );
}
@Override
src/main/java/appeng/recipes/handlers/MekCrusher.java
+5 -5
View File
@@ -47,8 +47,8 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -61,11 +61,11 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.Mekanism ) )
{
IMekanism rc = (IMekanism) AppEng.instance.getIntegration( IntegrationType.Mekanism );
for (ItemStack is : pro_input.getItemStackSet())
for (ItemStack is : this.pro_input.getItemStackSet())
{
try
{
rc.addCrusherRecipe( is, pro_output[0].getItemStack() );
rc.addCrusherRecipe( is, this.pro_output[0].getItemStack() );
}
catch (java.lang.RuntimeException err)
{
@@ -78,7 +78,7 @@ public class MekCrusher implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( pro_output[0].getItemStack(), output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(), output );
}
@Override
src/main/java/appeng/recipes/handlers/MekEnrichment.java
+5 -5
View File
@@ -47,8 +47,8 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -61,11 +61,11 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.Mekanism ) )
{
IMekanism rc = (IMekanism) AppEng.instance.getIntegration( IntegrationType.Mekanism );
for (ItemStack is : pro_input.getItemStackSet())
for (ItemStack is : this.pro_input.getItemStackSet())
{
try
{
rc.addEnrichmentChamberRecipe( is, pro_output[0].getItemStack() );
rc.addEnrichmentChamberRecipe( is, this.pro_output[0].getItemStack() );
}
catch (java.lang.RuntimeException err)
{
@@ -78,7 +78,7 @@ public class MekEnrichment implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( pro_output[0].getItemStack(), output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(), output );
}
@Override
src/main/java/appeng/recipes/handlers/OreRegistration.java
+4 -4
View File
@@ -35,18 +35,18 @@ public class OreRegistration implements ICraftHandler
final String name;
public OreRegistration(List<IIngredient> in, String out) {
inputs = in;
name = out;
this.inputs = in;
this.name = out;
}
@Override
public void register() throws RegistrationError, MissingIngredientError
{
for (IIngredient i : inputs)
for (IIngredient i : this.inputs)
{
for (ItemStack is : i.getItemStackSet())
{
OreDictionary.registerOre( name, is );
OreDictionary.registerOre( this.name, is );
}
}
}
src/main/java/appeng/recipes/handlers/Press.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class Press extends Inscribe
{
public Press() {
usePlates = true;
this.usePlates = true;
}
}
src/main/java/appeng/recipes/handlers/Pulverizer.java
+5 -5
View File
@@ -45,8 +45,8 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
int outs = output.get( 0 ).size();
if ( input.get( 0 ).size() == 1 && outs == 1 )
{
pro_input = input.get( 0 ).get( 0 );
pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
this.pro_input = input.get( 0 ).get( 0 );
this.pro_output = output.get( 0 ).toArray( new IIngredient[outs] );
return;
}
}
@@ -60,9 +60,9 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
toSend.setInteger( "energy", 800 );
toSend.setTag( "primaryOutput", new NBTTagCompound() );
pro_output[0].getItemStack().writeToNBT( toSend.getCompoundTag( "primaryOutput" ) );
this.pro_output[0].getItemStack().writeToNBT( toSend.getCompoundTag( "primaryOutput" ) );
for (ItemStack is : pro_input.getItemStackSet())
for (ItemStack is : this.pro_input.getItemStackSet())
{
toSend.setTag( "input", new NBTTagCompound() );
is.writeToNBT( toSend.getCompoundTag( "input" ) );
@@ -73,7 +73,7 @@ public class Pulverizer implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack output) throws RegistrationError, MissingIngredientError
{
return Platform.isSameItemPrecise( pro_output[0].getItemStack(), output );
return Platform.isSameItemPrecise( this.pro_output[0].getItemStack(), output );
}
@Override
src/main/java/appeng/recipes/handlers/Shaped.java
+22 -22
View File
@@ -50,21 +50,21 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
{
if ( output.size() == 1 && output.get( 0 ).size() == 1 )
{
rows = input.size();
if ( rows > 0 && input.size() <= 3 )
this.rows = input.size();
if ( this.rows > 0 && input.size() <= 3 )
{
cols = input.get( 0 ).size();
if ( cols <= 3 && cols >= 1 )
this.cols = input.get( 0 ).size();
if ( this.cols <= 3 && this.cols >= 1 )
{
for (List<IIngredient> anInput : input)
{
if ( anInput.size() != cols )
if ( anInput.size() != this.cols )
{
throw new RecipeError( "all rows in a shaped crafting recipe must contain the same number of ingredients." );
}
}
inputs = input;
this.inputs = input;
this.output = output.get( 0 ).get( 0 );
}
else
@@ -83,18 +83,18 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
char first = 'A';
List<Object> args = new ArrayList<Object>();
for (int y = 0; y < rows; y++)
for (int y = 0; y < this.rows; y++)
{
StringBuilder row = new StringBuilder();
for (int x = 0; x < cols; x++)
for (int x = 0; x < this.cols; x++)
{
if ( inputs.get( y ).get( x ).isAir() )
if ( this.inputs.get( y ).get( x ).isAir() )
row.append( ' ' );
else
{
row.append( first );
args.add( first );
args.add( inputs.get( y ).get( x ) );
args.add( this.inputs.get( y ).get( x ) );
first++;
}
@@ -102,7 +102,7 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
args.add( y, row.toString() );
}
ItemStack outIS = output.getItemStack();
ItemStack outIS = this.output.getItemStack();
try
{
@@ -118,10 +118,10 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
@Override
public boolean canCraft(ItemStack reqOutput) throws RegistrationError, MissingIngredientError
{
for (int y = 0; y < rows; y++)
for (int x = 0; x < cols; x++)
for (int y = 0; y < this.rows; y++)
for (int x = 0; x < this.cols; x++)
{
IIngredient i = inputs.get( y ).get( x );
IIngredient i = this.inputs.get( y ).get( x );
if ( !i.isAir() )
{
@@ -133,25 +133,25 @@ public class Shaped implements ICraftHandler, IWebsiteSerializer
}
}
return Platform.isSameItemPrecise( output.getItemStack(), reqOutput );
return Platform.isSameItemPrecise( this.output.getItemStack(), reqOutput );
}
@Override
public String getPattern(RecipeHandler h)
{
String o = "shaped " + output.getQty() + ' ' + cols + 'x' + rows + '\n';
String o = "shaped " + this.output.getQty() + ' ' + this.cols + 'x' + this.rows + '\n';
o += h.getName( output ) + '\n';
o += h.getName( this.output ) + '\n';
for (int y = 0; y < rows; y++)
for (int x = 0; x < cols; x++)
for (int y = 0; y < this.rows; y++)
for (int x = 0; x < this.cols; x++)
{
IIngredient i = inputs.get( y ).get( x );
IIngredient i = this.inputs.get( y ).get( x );
if ( i.isAir() )
o += "air" + (x + 1 == cols ? "\n" : " ");
o += "air" + (x + 1 == this.cols ? "\n" : " ");
else
o += h.getName( i ) + (x + 1 == cols ? "\n" : " ");
o += h.getName( i ) + (x + 1 == this.cols ? "\n" : " ");
}
return o.trim();
src/main/java/appeng/recipes/handlers/Shapeless.java
+9 -9
View File
@@ -49,7 +49,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
{
if ( input.size() == 1 )
{
inputs = input.get( 0 );
this.inputs = input.get( 0 );
this.output = output.get( 0 ).get( 0 );
}
else
@@ -63,10 +63,10 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
public void register() throws RegistrationError, MissingIngredientError
{
List<Object> args = new ArrayList<Object>();
for (IIngredient i : inputs)
for (IIngredient i : this.inputs)
args.add( i );
ItemStack outIS = output.getItemStack();
ItemStack outIS = this.output.getItemStack();
try
{
@@ -83,7 +83,7 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
public boolean canCraft(ItemStack reqOutput) throws RegistrationError, MissingIngredientError
{
for (IIngredient i : inputs)
for (IIngredient i : this.inputs)
{
if ( !i.isAir() )
{
@@ -97,19 +97,19 @@ public class Shapeless implements ICraftHandler, IWebsiteSerializer
}
}
return Platform.isSameItemPrecise( output.getItemStack(), reqOutput );
return Platform.isSameItemPrecise( this.output.getItemStack(), reqOutput );
}
@Override
public String getPattern(RecipeHandler h)
{
StringBuilder o = new StringBuilder( "shapeless " + output.getQty() + '\n' );
StringBuilder o = new StringBuilder( "shapeless " + this.output.getQty() + '\n' );
o.append( h.getName( output ) ).append( '\n' );
o.append( h.getName( this.output ) ).append( '\n' );
for (int y = 0; y < inputs.size(); y++)
for (int y = 0; y < this.inputs.size(); y++)
{
IIngredient i = inputs.get( y );
IIngredient i = this.inputs.get( y );
if ( i.isAir() )
{
src/main/java/appeng/recipes/handlers/Smelt.java
+11 -11
View File
@@ -48,8 +48,8 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
List<IIngredient> outputList = output.get( 0 );
if ( inputList.size() == 1 && outputList.size() == 1 )
{
in = inputList.get( 0 );
out = outputList.get( 0 );
this.in = inputList.get( 0 );
this.out = outputList.get( 0 );
return;
}
}
@@ -59,24 +59,24 @@ public class Smelt implements ICraftHandler, IWebsiteSerializer
@Override
public void register() throws RegistrationError, MissingIngredientError
{
if ( in.getItemStack().getItem() == null )
throw new RegistrationError( in.toString() + ": Smelting Input is not a valid item." );
if ( this.in.getItemStack().getItem() == null )
throw new RegistrationError( this.in.toString() + ": Smelting Input is not a valid item." );
if ( out.getItemStack().getItem() == null )
throw new RegistrationError( out.toString() + ": Smelting Output is not a valid item." );
if ( this.out.getItemStack().getItem() == null )
throw new RegistrationError( this.out.toString() + ": Smelting Output is not a valid item." );
GameRegistry.addSmelting( in.getItemStack(), out.getItemStack(), 0 );
GameRegistry.addSmelting( this.in.getItemStack(), this.out.getItemStack(), 0 );
}
@Override
public boolean canCraft(ItemStack reqOutput) throws RegistrationError, MissingIngredientError {
return Platform.isSameItemPrecise( out.getItemStack(),reqOutput );
return Platform.isSameItemPrecise( this.out.getItemStack(),reqOutput );
}
@Override
public String getPattern( RecipeHandler h ) {
return "smelt "+out.getQty()+ '\n' +
h.getName(out)+ '\n' +
h.getName(in);
return "smelt "+this.out.getQty()+ '\n' +
h.getName(this.out)+ '\n' +
h.getName(this.in);
}
}