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

Replace call to simple getter from within class with inlined version

Browse Source
This commit is contained in:
thatsIch
2015-03-26 10:23:59 +01:00
parent e41d6a0289
commit 4b4693498d
22 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/AEBasePart.java
+2 -2
View File
@@ -231,9 +231,9 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
protected AEColor getColor()
{
if ( this.getHost() == null )
if ( this.host == null )
return AEColor.Transparent;
return this.getHost().getColor();
return this.host.getColor();
}
@Override
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+4 -4
View File
@@ -21,8 +21,6 @@ package appeng.parts.automation;
import java.util.concurrent.Callable;
import com.google.common.collect.Lists;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.RenderBlocks;
@@ -38,6 +36,8 @@ import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import com.google.common.collect.Lists;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.networking.IGridNode;
@@ -246,7 +246,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
public TickRateModulation breakblock( boolean modulate )
{
if ( this.isAccepting() && this.proxy.isActive() )
if ( this.isAccepting && this.proxy.isActive() )
{
try
{
@@ -349,7 +349,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
@Override
public void onEntityCollision( Entity entity )
{
if ( this.isAccepting() && entity instanceof EntityItem && !entity.isDead && Platform.isServer() && this.proxy.isActive() )
if ( this.isAccepting && entity instanceof EntityItem && !entity.isDead && Platform.isServer() && this.proxy.isActive() )
{
boolean capture = false;
src/main/java/appeng/parts/reporting/PartPatternTerminal.java
+2 -2
View File
@@ -46,7 +46,7 @@ public class PartPatternTerminal extends PartTerminal
public void writeToNBT(NBTTagCompound data)
{
super.writeToNBT( data );
data.setBoolean( "craftingMode", this.isCraftingRecipe() );
data.setBoolean( "craftingMode", this.craftingMode );
this.pattern.writeToNBT( data, "pattern" );
this.output.writeToNBT( data, "outputList" );
this.crafting.writeToNBT( data, "craftingGrid" );
@@ -157,7 +157,7 @@ public class PartPatternTerminal extends PartTerminal
private void fixCraftingRecipes()
{
if ( this.isCraftingRecipe() )
if ( this.craftingMode )
{
for (int x = 0; x < this.crafting.getSizeInventory(); x++)
{