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/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java
+11 -11
View File
@@ -68,7 +68,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
@Override
public void loadCraftingRecipes(String outputId, Object... results)
{
if ( (outputId.equals( "crafting" )) && (getClass() == NEIAEShapedRecipeHandler.class) )
if ( (outputId.equals( "crafting" )) && (this.getClass() == NEIAEShapedRecipeHandler.class) )
{
List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe recipe : recipes)
@@ -79,7 +79,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
{
CachedShapedRecipe cachedRecipe = new CachedShapedRecipe( (ShapedRecipe) recipe );
cachedRecipe.computeVisuals();
arecipes.add( cachedRecipe );
this.arecipes.add( cachedRecipe );
}
}
}
@@ -102,7 +102,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
{
CachedShapedRecipe cachedRecipe = new CachedShapedRecipe( (ShapedRecipe) recipe );
cachedRecipe.computeVisuals();
arecipes.add( cachedRecipe );
this.arecipes.add( cachedRecipe );
}
}
}
@@ -124,7 +124,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
if ( cachedRecipe.contains( cachedRecipe.ingredients, ingredient ) )
{
cachedRecipe.setIngredientPermutation( cachedRecipe.ingredients, ingredient );
arecipes.add( cachedRecipe );
this.arecipes.add( cachedRecipe );
}
}
}
@@ -146,7 +146,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
@Override
public boolean hasOverlay(GuiContainer gui, Container container, int recipe)
{
return (super.hasOverlay( gui, container, recipe )) || ((isRecipe2x2( recipe )) && (RecipeInfo.hasDefaultOverlay( gui, "crafting2x2" )));
return (super.hasOverlay( gui, container, recipe )) || ((this.isRecipe2x2( recipe )) && (RecipeInfo.hasDefaultOverlay( gui, "crafting2x2" )));
}
@Override
@@ -160,7 +160,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
if ( positioner == null )
return null;
return new DefaultOverlayRenderer( getIngredientStacks( recipe ), positioner );
return new DefaultOverlayRenderer( this.getIngredientStacks( recipe ), positioner );
}
@Override
@@ -175,7 +175,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
public boolean isRecipe2x2(int recipe)
{
for (PositionedStack stack : getIngredientStacks( recipe ))
for (PositionedStack stack : this.getIngredientStacks( recipe ))
{
if ( (stack.relx > 43) || (stack.rely > 24) )
return false;
@@ -190,9 +190,9 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
public final PositionedStack result;
public CachedShapedRecipe(ShapedRecipe recipe) {
result = new PositionedStack( recipe.getRecipeOutput(), 119, 24 );
ingredients = new ArrayList<PositionedStack>();
setIngredients( recipe.getWidth(), recipe.getHeight(), recipe.getIngredients() );
this.result = new PositionedStack( recipe.getRecipeOutput(), 119, 24 );
this.ingredients = new ArrayList<PositionedStack>();
this.setIngredients( recipe.getWidth(), recipe.getHeight(), recipe.getIngredients() );
}
public void setIngredients(int width, int height, Object[] items)
@@ -230,7 +230,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler
@Override
public List<PositionedStack> getIngredients()
{
return getCycledIngredients( cycleticks / 20, this.ingredients );
return this.getCycledIngredients( NEIAEShapedRecipeHandler.this.cycleticks / 20, this.ingredients );
}
@Override
src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java
+9 -9
View File
@@ -68,7 +68,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
@Override
public void loadCraftingRecipes(String outputId, Object... results)
{
if ( (outputId.equals( "crafting" )) && (getClass() == NEIAEShapelessRecipeHandler.class) )
if ( (outputId.equals( "crafting" )) && (this.getClass() == NEIAEShapelessRecipeHandler.class) )
{
List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
for (IRecipe recipe : recipes)
@@ -102,7 +102,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
{
CachedShapelessRecipe cachedRecipe = new CachedShapelessRecipe( (ShapelessRecipe) recipe );
cachedRecipe.computeVisuals();
arecipes.add( cachedRecipe );
this.arecipes.add( cachedRecipe );
}
}
}
@@ -146,7 +146,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
@Override
public boolean hasOverlay(GuiContainer gui, Container container, int recipe)
{
return (super.hasOverlay( gui, container, recipe )) || ((isRecipe2x2( recipe )) && (RecipeInfo.hasDefaultOverlay( gui, "crafting2x2" )));
return (super.hasOverlay( gui, container, recipe )) || ((this.isRecipe2x2( recipe )) && (RecipeInfo.hasDefaultOverlay( gui, "crafting2x2" )));
}
@Override
@@ -160,7 +160,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
if ( positioner == null )
return null;
return new DefaultOverlayRenderer( getIngredientStacks( recipe ), positioner );
return new DefaultOverlayRenderer( this.getIngredientStacks( recipe ), positioner );
}
@Override
@@ -175,7 +175,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
public boolean isRecipe2x2(int recipe)
{
for (PositionedStack stack : getIngredientStacks( recipe ))
for (PositionedStack stack : this.getIngredientStacks( recipe ))
{
if ( (stack.relx > 43) || (stack.rely > 24) )
return false;
@@ -190,9 +190,9 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
public final PositionedStack result;
public CachedShapelessRecipe(ShapelessRecipe recipe) {
result = new PositionedStack( recipe.getRecipeOutput(), 119, 24 );
ingredients = new ArrayList<PositionedStack>();
setIngredients( recipe.getInput().toArray() );
this.result = new PositionedStack( recipe.getRecipeOutput(), 119, 24 );
this.ingredients = new ArrayList<PositionedStack>();
this.setIngredients( recipe.getInput().toArray() );
}
public void setIngredients(Object[] items)
@@ -231,7 +231,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler
@Override
public List<PositionedStack> getIngredients()
{
return getCycledIngredients( cycleticks / 20, this.ingredients );
return this.getCycledIngredients( NEIAEShapelessRecipeHandler.this.cycleticks / 20, this.ingredients );
}
@Override
src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java
+3 -3
View File
@@ -42,8 +42,8 @@ public class NEICraftingHandler implements IOverlayHandler
public NEICraftingHandler(int x, int y)
{
offsetX = x;
offsetY = y;
this.offsetX = x;
this.offsetY = y;
}
final int offsetX;
@@ -55,7 +55,7 @@ public class NEICraftingHandler implements IOverlayHandler
try
{
List ingredients = recipe.getIngredientStacks( recipeIndex );
overlayRecipe( gui, ingredients, shift );
this.overlayRecipe( gui, ingredients, shift );
}
catch (Exception ignored)
{
src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java
+14 -14
View File
@@ -64,7 +64,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
@Override
public void loadCraftingRecipes(String outputId, Object... results)
{
if ( (outputId.equals( "crafting" )) && (getClass() == NEIFacadeRecipeHandler.class) )
if ( (outputId.equals( "crafting" )) && (this.getClass() == NEIFacadeRecipeHandler.class) )
{
ItemFacade ifa = (ItemFacade) AEApi.instance().items().itemFacade.item();
List<ItemStack> facades = ifa.getFacades();
@@ -72,7 +72,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
{
CachedShapedRecipe recipe = new CachedShapedRecipe( is );
recipe.computeVisuals();
arecipes.add( recipe );
this.arecipes.add( recipe );
}
}
else
@@ -84,18 +84,18 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
@Override
public void loadCraftingRecipes(ItemStack result)
{
if ( result.getItem() == ifa )
if ( result.getItem() == this.ifa )
{
CachedShapedRecipe recipe = new CachedShapedRecipe( result );
recipe.computeVisuals();
arecipes.add( recipe );
this.arecipes.add( recipe );
}
}
@Override
public void loadUsageRecipes(ItemStack ingredient)
{
List<ItemStack> facades = ifa.getFacades();
List<ItemStack> facades = this.ifa.getFacades();
for (ItemStack is : facades)
{
CachedShapedRecipe recipe = new CachedShapedRecipe( is );
@@ -106,7 +106,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
if ( recipe.contains( recipe.ingredients, ingredient ) )
{
recipe.setIngredientPermutation( recipe.ingredients, ingredient );
arecipes.add( recipe );
this.arecipes.add( recipe );
}
}
}
@@ -127,7 +127,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
@Override
public boolean hasOverlay(GuiContainer gui, Container container, int recipe)
{
return (super.hasOverlay( gui, container, recipe )) || ((isRecipe2x2( recipe )) && (RecipeInfo.hasDefaultOverlay( gui, "crafting2x2" )));
return (super.hasOverlay( gui, container, recipe )) || ((this.isRecipe2x2( recipe )) && (RecipeInfo.hasDefaultOverlay( gui, "crafting2x2" )));
}
@Override
@@ -141,7 +141,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
if ( positioner == null )
return null;
return new DefaultOverlayRenderer( getIngredientStacks( recipe ), positioner );
return new DefaultOverlayRenderer( this.getIngredientStacks( recipe ), positioner );
}
@Override
@@ -156,7 +156,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
public boolean isRecipe2x2(int recipe)
{
for (PositionedStack stack : getIngredientStacks( recipe ))
for (PositionedStack stack : this.getIngredientStacks( recipe ))
{
if ( (stack.relx > 43) || (stack.rely > 24) )
return false;
@@ -172,10 +172,10 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
public CachedShapedRecipe(ItemStack output) {
output.stackSize = 4;
result = new PositionedStack( output, 119, 24 );
ingredients = new ArrayList<PositionedStack>();
ItemStack in = ifa.getTextureItem( output );
setIngredients( 3, 3, new Object[] { null, cable_anchor, null, cable_anchor, in, cable_anchor, null, cable_anchor, null } );
this.result = new PositionedStack( output, 119, 24 );
this.ingredients = new ArrayList<PositionedStack>();
ItemStack in = NEIFacadeRecipeHandler.this.ifa.getTextureItem( output );
this.setIngredients( 3, 3, new Object[] { null, NEIFacadeRecipeHandler.this.cable_anchor, null, NEIFacadeRecipeHandler.this.cable_anchor, in, NEIFacadeRecipeHandler.this.cable_anchor, null, NEIFacadeRecipeHandler.this.cable_anchor, null } );
}
public void setIngredients(int width, int height, Object[] items)
@@ -198,7 +198,7 @@ public class NEIFacadeRecipeHandler extends TemplateRecipeHandler
@Override
public List<PositionedStack> getIngredients()
{
return getCycledIngredients( cycleticks / 20, this.ingredients );
return this.getCycledIngredients( NEIFacadeRecipeHandler.this.cycleticks / 20, this.ingredients );
}
@Override
src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java
+9 -9
View File
@@ -51,7 +51,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler
public void drawBackground(int recipe)
{
GL11.glColor4f( 1, 1, 1, 1 );
changeTexture( getGuiTexture() );
changeTexture( this.getGuiTexture() );
drawTexturedModalRect( 40, 10, 75, 16 + 10, 90, 66 );
}
@@ -102,7 +102,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler
@Override
public void loadCraftingRecipes(String outputId, Object... results)
{
if ( (outputId.equals( "grindstone" )) && (getClass() == NEIGrinderRecipeHandler.class) )
if ( (outputId.equals( "grindstone" )) && (this.getClass() == NEIGrinderRecipeHandler.class) )
{
for (IGrinderEntry recipe : AEApi.instance().registries().grinder().getRecipes())
{
@@ -191,24 +191,24 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler
public String Chance;
public CachedGrindStoneRecipe(IGrinderEntry recipe) {
result = new PositionedStack( recipe.getOutput(), -30 + 107, 47 );
ingredients = new ArrayList<PositionedStack>();
this.result = new PositionedStack( recipe.getOutput(), -30 + 107, 47 );
this.ingredients = new ArrayList<PositionedStack>();
if ( recipe.getOptionalOutput() != null )
{
hasOptional = true;
Chance = ((int) (recipe.getOptionalChance() * 100)) + GuiText.OfSecondOutput.getLocal();
ingredients.add( new PositionedStack( recipe.getOptionalOutput(), -30 + 107 + 18, 47 ) );
this.hasOptional = true;
this.Chance = ((int) (recipe.getOptionalChance() * 100)) + GuiText.OfSecondOutput.getLocal();
this.ingredients.add( new PositionedStack( recipe.getOptionalOutput(), -30 + 107 + 18, 47 ) );
}
if ( recipe.getInput() != null )
ingredients.add( new PositionedStack( recipe.getInput(), 45, 24 ) );
this.ingredients.add( new PositionedStack( recipe.getInput(), 45, 24 ) );
}
@Override
public List<PositionedStack> getIngredients()
{
return getCycledIngredients( cycleticks / 20, this.ingredients );
return this.getCycledIngredients( NEIGrinderRecipeHandler.this.cycleticks / 20, this.ingredients );
}
@Override
src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java
+8 -8
View File
@@ -49,7 +49,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler
public void drawBackground(int recipe)
{
GL11.glColor4f( 1, 1, 1, 1 );
changeTexture( getGuiTexture() );
changeTexture( this.getGuiTexture() );
drawTexturedModalRect( 0, 0, 5, 11, 166, 75 );
}
@@ -74,7 +74,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler
@Override
public void loadCraftingRecipes(String outputId, Object... results)
{
if ( (outputId.equals( "inscriber" )) && (getClass() == NEIInscriberRecipeHandler.class) )
if ( (outputId.equals( "inscriber" )) && (this.getClass() == NEIInscriberRecipeHandler.class) )
{
for (InscriberRecipe recipe : Inscribe.recipes)
{
@@ -160,23 +160,23 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler
public final PositionedStack result;
public CachedInscriberRecipe(InscriberRecipe recipe) {
result = new PositionedStack( recipe.output, 108, 29 );
ingredients = new ArrayList<PositionedStack>();
this.result = new PositionedStack( recipe.output, 108, 29 );
this.ingredients = new ArrayList<PositionedStack>();
if ( recipe.plateA != null )
ingredients.add( new PositionedStack( recipe.plateA, 40, 5 ) );
this.ingredients.add( new PositionedStack( recipe.plateA, 40, 5 ) );
if ( recipe.imprintable != null )
ingredients.add( new PositionedStack( recipe.imprintable, 40 + 18, 28 ) );
this.ingredients.add( new PositionedStack( recipe.imprintable, 40 + 18, 28 ) );
if ( recipe.plateB != null )
ingredients.add( new PositionedStack( recipe.plateB, 40, 51 ) );
this.ingredients.add( new PositionedStack( recipe.plateB, 40, 51 ) );
}
@Override
public List<PositionedStack> getIngredients()
{
return getCycledIngredients( cycleticks / 20, this.ingredients );
return this.getCycledIngredients( NEIInscriberRecipeHandler.this.cycleticks / 20, this.ingredients );
}
@Override
src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java
+18 -18
View File
@@ -55,11 +55,11 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler
private void addRecipe(AEItemDefinition def, String msg)
{
if ( NEIServerUtils.areStacksSameTypeCrafting( def.stack( 1 ), target ) )
if ( NEIServerUtils.areStacksSameTypeCrafting( def.stack( 1 ), this.target ) )
{
offsets.add( def );
outputs.add( new PositionedStack( def.stack( 1 ), 75, 4 ) );
details.put( def, msg );
this.offsets.add( def );
this.outputs.add( new PositionedStack( def.stack( 1 ), 75, 4 ) );
this.details.put( def, msg );
}
}
@@ -67,29 +67,29 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler
{
if ( AEConfig.instance.isFeatureEnabled( AEFeature.CertusQuartzWorldGen ) )
addRecipe( AEApi.instance().materials().materialCertusQuartzCrystalCharged,
this.addRecipe( AEApi.instance().materials().materialCertusQuartzCrystalCharged,
GuiText.ChargedQuartz.getLocal() + "\n\n" + GuiText.ChargedQuartzFind.getLocal() );
else
addRecipe( AEApi.instance().materials().materialCertusQuartzCrystalCharged, GuiText.ChargedQuartzFind.getLocal() );
this.addRecipe( AEApi.instance().materials().materialCertusQuartzCrystalCharged, GuiText.ChargedQuartzFind.getLocal() );
if ( AEConfig.instance.isFeatureEnabled( AEFeature.MeteoriteWorldGen ) )
{
addRecipe( AEApi.instance().materials().materialLogicProcessorPress, GuiText.inWorldCraftingPresses.getLocal() );
addRecipe( AEApi.instance().materials().materialCalcProcessorPress, GuiText.inWorldCraftingPresses.getLocal() );
addRecipe( AEApi.instance().materials().materialEngProcessorPress, GuiText.inWorldCraftingPresses.getLocal() );
this.addRecipe( AEApi.instance().materials().materialLogicProcessorPress, GuiText.inWorldCraftingPresses.getLocal() );
this.addRecipe( AEApi.instance().materials().materialCalcProcessorPress, GuiText.inWorldCraftingPresses.getLocal() );
this.addRecipe( AEApi.instance().materials().materialEngProcessorPress, GuiText.inWorldCraftingPresses.getLocal() );
}
if ( AEConfig.instance.isFeatureEnabled( AEFeature.inWorldFluix ) )
addRecipe( AEApi.instance().materials().materialFluixCrystal, GuiText.inWorldFluix.getLocal() );
this.addRecipe( AEApi.instance().materials().materialFluixCrystal, GuiText.inWorldFluix.getLocal() );
if ( AEConfig.instance.isFeatureEnabled( AEFeature.inWorldSingularity ) )
addRecipe( AEApi.instance().materials().materialQESingularity, GuiText.inWorldSingularity.getLocal() );
this.addRecipe( AEApi.instance().materials().materialQESingularity, GuiText.inWorldSingularity.getLocal() );
if ( AEConfig.instance.isFeatureEnabled( AEFeature.inWorldPurification ) )
{
addRecipe( AEApi.instance().materials().materialPurifiedCertusQuartzCrystal, GuiText.inWorldPurificationCertus.getLocal() );
addRecipe( AEApi.instance().materials().materialPurifiedNetherQuartzCrystal, GuiText.inWorldPurificationNether.getLocal() );
addRecipe( AEApi.instance().materials().materialPurifiedFluixCrystal, GuiText.inWorldPurificationFluix.getLocal() );
this.addRecipe( AEApi.instance().materials().materialPurifiedCertusQuartzCrystal, GuiText.inWorldPurificationCertus.getLocal() );
this.addRecipe( AEApi.instance().materials().materialPurifiedNetherQuartzCrystal, GuiText.inWorldPurificationNether.getLocal() );
this.addRecipe( AEApi.instance().materials().materialPurifiedFluixCrystal, GuiText.inWorldPurificationFluix.getLocal() );
}
}
@@ -102,7 +102,7 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler
@Override
public int numRecipes()
{
return offsets.size();
return this.offsets.size();
}
@Override
@@ -139,7 +139,7 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler
@Override
public PositionedStack getResultStack(int recipe)
{
return outputs.get( recipe );
return this.outputs.get( recipe );
}
@Override
@@ -200,7 +200,7 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler
{
try
{
return getClass().newInstance();
return this.getClass().newInstance();
}
catch (Exception e)
{
@@ -217,7 +217,7 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler
@Override
public ICraftingHandler getRecipeHandler(String outputId, Object... results)
{
NEIWorldCraftingHandler g = newInstance();
NEIWorldCraftingHandler g = this.newInstance();
if ( results.length > 0 && results[0] instanceof ItemStack )
{
g.target = (ItemStack) results[0];