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

Reduces visibility of internal fields/methods

Browse Source 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
This commit is contained in:
yueh
2015-10-08 15:42:42 +02:00
parent f054bd699b
commit e94a0cfccf
497 changed files with 7865 additions and 6908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/reporting/AbstractPartDisplay.java
+5 -5
View File
@@ -59,7 +59,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.is ), sideTexture, sideTexture );
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.renderInventoryBox( renderer );
rh.setInvColor( this.getColor().whiteVariant );
@@ -82,7 +82,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.is ), sideTexture, sideTexture );
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer );
@@ -93,7 +93,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting
renderer.setBrightness( l << 20 | l << 4 );
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = this.getSpin();
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( this.getSpin() ) ) ) ) ) );
renderer.setColorOpaque_I( this.getColor().whiteVariant );
rh.renderFace( pos, this.getFrontBright().getIcon(), EnumFacing.SOUTH, renderer );
@@ -104,11 +104,11 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting
renderer.setColorOpaque_I( this.getColor().blackVariant );
rh.renderFace( pos, this.getFrontColored().getIcon(), EnumFacing.SOUTH, renderer );
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
final IAESprite sideStatusTexture = CableBusTextures.PartMonitorSidesStatus.getIcon();
rh.setTexture( sideStatusTexture, sideStatusTexture, backTexture, renderer.getIcon( this.is ), sideStatusTexture, sideStatusTexture );
rh.setTexture( sideStatusTexture, sideStatusTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideStatusTexture, sideStatusTexture );
rh.setBounds( 4, 4, 13, 12, 12, 14 );
rh.renderBlock( pos, renderer );
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+12 -12
View File
@@ -166,7 +166,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
return true;
}
if( !this.proxy.isActive() )
if( !this.getProxy().isActive() )
{
return false;
}
@@ -176,7 +176,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
return false;
}
final TileEntity te = this.tile;
final TileEntity te = this.getTile();
final ItemStack eq = player.getCurrentEquippedItem();
if( Platform.isWrench( player, eq, te.getPos() ) )
@@ -200,7 +200,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
}
// update the system...
public void configureWatchers()
private void configureWatchers()
{
if( this.myWatcher != null )
{
@@ -216,7 +216,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
this.myWatcher.add( this.configuredItem );
}
this.updateReportingValue( this.proxy.getStorage().getItemInventory() );
this.updateReportingValue( this.getProxy().getStorage().getItemInventory() );
}
}
catch( final GridAccessException e )
@@ -314,7 +314,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
{
// GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
final AEPartLocation d = this.side;
final AEPartLocation d = this.getSide();
GL11.glTranslated( d.xOffset * 0.77, d.yOffset * 0.77, d.zOffset * 0.77 );
switch( d ) {
@@ -323,27 +323,27 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
GL11.glRotatef( 90.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( this.getSpin() * 90.0F, 0, 0, 1 );
break;
case DOWN:
GL11.glScalef( 1.0f, -1.0f, 1.0f );
GL11.glRotatef( -90.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( this.getSpin() * -90.0F, 0, 0, 1 );
break;
case EAST:
GL11.glScalef( -1.0f, -1.0f, -1.0f );
GL11.glRotatef( -90.0f, 0.0f, 1.0f, 0.0f );
break;
case WEST:
GL11.glScalef( -1.0f, -1.0f, -1.0f );
GL11.glRotatef( 90.0f, 0.0f, 1.0f, 0.0f );
break;
case NORTH:
GL11.glScalef( -1.0f, -1.0f, -1.0f );
break;
case SOUTH:
GL11.glScalef( -1.0f, -1.0f, -1.0f );
GL11.glRotatef( 180.0f, 0.0f, 1.0f, 0.0f );
@@ -352,7 +352,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
default:
break;
}
try
{
final ItemStack sis = ais.getItemStack();
@@ -370,7 +370,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
// RenderHelper.enableGUIStandardItemLighting();
wr.setColorOpaque_F( 1.0f, 1.0f, 1.0f );
ClientHelper.proxy.doRenderItem( sis, this.tile.getWorld() );
ClientHelper.proxy.doRenderItem( sis, this.getTile().getWorld() );
}
catch( final Exception e )
{
src/main/java/appeng/parts/reporting/AbstractPartPanel.java
+2 -2
View File
@@ -86,7 +86,7 @@ public abstract class AbstractPartPanel extends AbstractPartReporting
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.is ), sideTexture, sideTexture );
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.renderInventoryBox( renderer );
rh.setInvColor( this.getBrightnessColor() );
@@ -103,7 +103,7 @@ public abstract class AbstractPartPanel extends AbstractPartReporting
final IAESprite sideTexture = CableBusTextures.PartMonitorSides.getIcon();
final IAESprite backTexture = CableBusTextures.PartMonitorBack.getIcon();
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.is ), sideTexture, sideTexture );
rh.setTexture( sideTexture, sideTexture, backTexture, renderer.getIcon( this.getItemStack() ), sideTexture, sideTexture );
rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( pos, renderer );
src/main/java/appeng/parts/reporting/AbstractPartReporting.java
+9 -9
View File
@@ -80,12 +80,12 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
if( requireChannel )
{
this.proxy.setFlags( GridFlags.REQUIRE_CHANNEL );
this.proxy.setIdlePowerUsage( 1.0 / 2.0 );
this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL );
this.getProxy().setIdlePowerUsage( 1.0 / 2.0 );
}
else
{
this.proxy.setIdlePowerUsage( 1.0 / 16.0 ); // lights drain a little bit.
this.getProxy().setIdlePowerUsage( 1.0 / 16.0 ); // lights drain a little bit.
}
}
@@ -145,17 +145,17 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
try
{
if( this.proxy.getEnergy().isNetworkPowered() )
if( this.getProxy().getEnergy().isNetworkPowered() )
{
this.clientFlags = this.getClientFlags() | AbstractPartReporting.POWERED_FLAG;
}
if( this.proxy.getPath().isNetworkBooting() )
if( this.getProxy().getPath().isNetworkBooting() )
{
this.clientFlags = this.getClientFlags() | AbstractPartReporting.BOOTING_FLAG;
}
if( this.proxy.getNode().meetsChannelRequirements() )
if( this.getProxy().getNode().meetsChannelRequirements() )
{
this.clientFlags = this.getClientFlags() | AbstractPartReporting.CHANNEL_FLAG;
}
@@ -218,7 +218,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
break;
}
this.host.markForUpdate();
this.getHost().markForUpdate();
this.saveChanges();
}
return true;
@@ -250,7 +250,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
if( this.opacity < 0 )
{
final TileEntity te = this.getTile();
this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( this.side.getFacing() ) );
this.opacity = 255 - te.getWorld().getBlockLightOpacity( te.getPos().offset( this.getSide().getFacing() ) );
}
return (int) ( emit * ( this.opacity / 255.0f ) );
@@ -263,7 +263,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
{
if( Platform.isServer() )
{
return this.proxy.getEnergy().isNetworkPowered();
return this.getProxy().getEnergy().isNetworkPowered();
}
else
{
src/main/java/appeng/parts/reporting/AbstractPartTerminal.java
+4 -4
View File
@@ -121,7 +121,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
return true;
}
Platform.openGUI( player, this.getHost().getTile(), this.side, this.getGui( player ) );
Platform.openGUI( player, this.getHost().getTile(), this.getSide(), this.getGui( player ) );
return true;
}
@@ -139,7 +139,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
{
try
{
return this.proxy.getStorage().getItemInventory();
return this.getProxy().getStorage().getItemInventory();
}
catch( final GridAccessException e )
{
@@ -153,7 +153,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
{
try
{
return this.proxy.getStorage().getFluidInventory();
return this.getProxy().getStorage().getFluidInventory();
}
catch( final GridAccessException e )
{
@@ -177,6 +177,6 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay implement
@Override
public void onChangeInventory( final IInventory inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack )
{
this.host.markForSave();
this.getHost().markForSave();
}
}
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
+9 -9
View File
@@ -60,7 +60,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
return true;
}
if( !this.proxy.isActive() )
if( !this.getProxy().isActive() )
{
return false;
}
@@ -83,13 +83,13 @@ public class PartConversionMonitor extends AbstractPartMonitor
{
try
{
if( !this.proxy.isActive() )
if( !this.getProxy().isActive() )
{
return false;
}
final IEnergySource energy = this.proxy.getEnergy();
final IMEMonitor<IAEItemStack> cell = this.proxy.getStorage().getItemInventory();
final IEnergySource energy = this.getProxy().getEnergy();
final IMEMonitor<IAEItemStack> cell = this.getProxy().getStorage().getItemInventory();
final IAEItemStack input = AEItemStack.create( item );
if( ModeB )
@@ -128,13 +128,13 @@ public class PartConversionMonitor extends AbstractPartMonitor
{
try
{
if( !this.proxy.isActive() )
if( !this.getProxy().isActive() )
{
return;
}
final IEnergySource energy = this.proxy.getEnergy();
final IMEMonitor<IAEItemStack> cell = this.proxy.getStorage().getItemInventory();
final IEnergySource energy = this.getProxy().getEnergy();
final IMEMonitor<IAEItemStack> cell = this.getProxy().getStorage().getItemInventory();
final ItemStack is = input.getItemStack();
input.setStackSize( is.getMaxStackSize() );
@@ -147,9 +147,9 @@ public class PartConversionMonitor extends AbstractPartMonitor
newItems = adaptor.addItems( newItems );
if( newItems != null )
{
final TileEntity te = this.tile;
final TileEntity te = this.getTile();
final List<ItemStack> list = Collections.singletonList( newItems );
Platform.spawnDrops( player.worldObj, te.getPos().offset( this.side.getFacing() ), list );
Platform.spawnDrops( player.worldObj, te.getPos().offset( this.getSide().getFacing() ), list );
}
if( player.openContainer != null )
src/main/java/appeng/parts/reporting/PartCraftingTerminal.java
+4 -4
View File
@@ -81,12 +81,12 @@ public class PartCraftingTerminal extends AbstractPartTerminal
int z = (int) p.posZ;
if( this.getHost().getTile() != null )
{
x = this.tile.getPos().getX();
y = this.tile.getPos().getY();
z = this.tile.getPos().getZ();
x = this.getTile().getPos().getX();
y = this.getTile().getPos().getY();
z = this.getTile().getPos().getZ();
}
if( GuiBridge.GUI_CRAFTING_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.side, p ) )
if( GuiBridge.GUI_CRAFTING_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.getSide(), p ) )
{
return GuiBridge.GUI_CRAFTING_TERMINAL;
}
src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
return true;
}
Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_INTERFACE_TERMINAL );
Platform.openGUI( player, this.getHost().getTile(), this.getSide(), GuiBridge.GUI_INTERFACE_TERMINAL );
return true;
}
src/main/java/appeng/parts/reporting/PartPatternTerminal.java
+5 -5
View File
@@ -96,12 +96,12 @@ public class PartPatternTerminal extends AbstractPartTerminal
int z = (int) p.posZ;
if( this.getHost().getTile() != null )
{
x = this.tile.getPos().getX();
y = this.tile.getPos().getY();
z = this.tile.getPos().getZ();
x = this.getTile().getPos().getX();
y = this.getTile().getPos().getY();
z = this.getTile().getPos().getZ();
}
if( GuiBridge.GUI_PATTERN_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.side, p ) )
if( GuiBridge.GUI_PATTERN_TERMINAL.hasPermissions( this.getHost().getTile(), x, y, z, this.getSide(), p ) )
{
return GuiBridge.GUI_PATTERN_TERMINAL;
}
@@ -142,7 +142,7 @@ public class PartPatternTerminal extends AbstractPartTerminal
this.fixCraftingRecipes();
}
this.host.markForSave();
this.getHost().markForSave();
}
private void fixCraftingRecipes()