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 1ea48fb389
commit 500fc47490
463 changed files with 5670 additions and 3757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
+50 -23
View File
@@ -22,6 +22,8 @@ package appeng.container.implementations;
import java.io.IOException;
import java.nio.BufferOverflowException;
import javax.annotation.Nonnull;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
@@ -72,17 +74,17 @@ import appeng.util.Platform;
public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<IAEItemStack>
{
public final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5];
final IMEMonitor<IAEItemStack> monitor;
final IItemList<IAEItemStack> items = AEApi.instance().storage().createItemList();
final IConfigManager clientCM;
private final SlotRestrictedInput[] cellView = new SlotRestrictedInput[5];
private final IMEMonitor<IAEItemStack> monitor;
private final IItemList<IAEItemStack> items = AEApi.instance().storage().createItemList();
private final IConfigManager clientCM;
private final ITerminalHost host;
@GuiSync( 99 )
public boolean canAccessViewCells = false;
@GuiSync( 98 )
public boolean hasPower = false;
public IConfigManagerHost gui;
IConfigManager serverCM;
private IConfigManagerHost gui;
private IConfigManager serverCM;
private IGridNode networkNode;
public ContainerMEMonitorable( final InventoryPlayer ip, final ITerminalHost monitorable )
@@ -110,15 +112,15 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
this.monitor.addListener( this, null );
this.cellInv = this.monitor;
this.setCellInventory( this.monitor );
if( monitorable instanceof IPortableCell )
{
this.powerSrc = (IEnergySource) monitorable;
this.setPowerSource( (IEnergySource) monitorable );
}
else if( monitorable instanceof IMEChest )
{
this.powerSrc = (IEnergySource) monitorable;
this.setPowerSource( (IEnergySource) monitorable );
}
else if( monitorable instanceof IGridHost )
{
@@ -129,14 +131,14 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
final IGrid g = node.getGrid();
if( g != null )
{
this.powerSrc = new ChannelPowerSrc( this.networkNode, (IEnergySource) g.getCache( IEnergyGrid.class ) );
this.setPowerSource( new ChannelPowerSrc( this.networkNode, (IEnergySource) g.getCache( IEnergyGrid.class ) ) );
}
}
}
}
else
{
this.isContainerValid = false;
this.setValidContainer( false );
}
}
else
@@ -149,8 +151,8 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
for( int y = 0; y < 5; y++ )
{
this.cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEW_CELL, ( (IViewCellStorage) monitorable ).getViewCellStorage(), y, 206, y * 18 + 8, this.invPlayer );
this.cellView[y].allowEdit = this.canAccessViewCells;
this.cellView[y] = new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.VIEW_CELL, ( (IViewCellStorage) monitorable ).getViewCellStorage(), y, 206, y * 18 + 8, this.getInventoryPlayer() );
this.cellView[y].setAllowEdit( this.canAccessViewCells );
this.addSlotToContainer( this.cellView[y] );
}
}
@@ -173,7 +175,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
if( this.monitor != this.host.getItemInventory() )
{
this.isContainerValid = false;
this.setValidContainer( false );
}
for( final Settings set : this.serverCM.getSettings() )
@@ -249,7 +251,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
if( this.cellView[y] != null )
{
this.cellView[y].allowEdit = this.canAccessViewCells;
this.cellView[y].setAllowEdit( this.canAccessViewCells );
}
}
}
@@ -264,15 +266,15 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
if( this.networkNode != null )
{
this.hasPower = this.networkNode.isActive();
this.setPowered( this.networkNode.isActive() );
}
else if( this.powerSrc instanceof IEnergyGrid )
else if( this.getPowerSource() instanceof IEnergyGrid )
{
this.hasPower = ( (IEnergyGrid) this.powerSrc ).isNetworkPowered();
this.setPowered( ( (IEnergyGrid) this.getPowerSource() ).isNetworkPowered() );
}
else
{
this.hasPower = this.powerSrc.extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.8;
this.setPowered( this.getPowerSource().extractAEPower( 1, Actionable.SIMULATE, PowerMultiplier.CONFIG ) > 0.8 );
}
}
catch( final Throwable t )
@@ -290,7 +292,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
{
if( this.cellView[y] != null )
{
this.cellView[y].allowEdit = this.canAccessViewCells;
this.cellView[y].setAllowEdit( this.canAccessViewCells );
}
}
}
@@ -305,7 +307,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
this.queueInventory( c );
}
public void queueInventory( final ICrafting c )
private void queueInventory( final ICrafting c )
{
if( Platform.isServer() && c instanceof EntityPlayer && this.monitor != null )
{
@@ -390,9 +392,9 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
@Override
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
{
if( this.gui != null )
if( this.getGui() != null )
{
this.gui.updateSetting( manager, settingName, newValue );
this.getGui().updateSetting( manager, settingName, newValue );
}
}
@@ -417,4 +419,29 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
return list;
}
public SlotRestrictedInput getCellViewSlot( final int index )
{
return this.cellView[index];
}
public boolean isPowered()
{
return this.hasPower;
}
private void setPowered( final boolean isPowered )
{
this.hasPower = isPowered;
}
private IConfigManagerHost getGui()
{
return this.gui;
}
public void setGui( @Nonnull final IConfigManagerHost gui )
{
this.gui = gui;
}
}