Basic reformat, hit once, hope never again

This commit is contained in:
thatsIch
2015-04-03 08:54:31 +02:00
parent 4ff1631f89
commit d34c988c88
886 changed files with 31400 additions and 30990 deletions
@@ -18,6 +18,7 @@
package appeng.parts.misc;
import java.io.IOException;
import java.util.List;
import java.util.Random;
@@ -48,6 +49,7 @@ import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.ISimplifiedBundle;
import appeng.api.parts.PartItemStack;
public class PartCableAnchor implements IPart
{
@@ -56,35 +58,29 @@ public class PartCableAnchor implements IPart
IPartHost host = null;
ForgeDirection mySide = ForgeDirection.UP;
public PartCableAnchor(ItemStack is) {
public PartCableAnchor( ItemStack is )
{
this.is = is;
}
@Override
@SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer)
public void getBoxes( IPartCollisionHelper bch )
{
this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache );
IIcon myIcon = this.is.getIconIndex();
rh.setTexture( myIcon );
if ( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null )
rh.setBounds( 7, 7, 10, 9, 9, 14 );
if( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null )
bch.addBox( 7, 7, 10, 9, 9, 14 );
else
rh.setBounds( 7, 7, 10, 9, 9, 16 );
rh.renderBlock( x, y, z, renderer );
rh.setTexture( null );
bch.addBox( 7, 7, 10, 9, 9, 16 );
}
@Override
@SideOnly(Side.CLIENT)
public void randomDisplayTick(World world, int x, int y, int z, Random r)
public ItemStack getItemStack( PartItemStack wrenched )
{
return this.is;
}
@Override
@SideOnly(Side.CLIENT)
public void renderInventory(IPartRenderHelper instance, RenderBlocks renderer)
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper instance, RenderBlocks renderer )
{
instance.setTexture( this.is.getIconIndex() );
instance.setBounds( 7, 7, 4, 9, 9, 14 );
@@ -93,18 +89,31 @@ public class PartCableAnchor implements IPart
}
@Override
public void getBoxes(IPartCollisionHelper bch)
@SideOnly( Side.CLIENT )
public void renderStatic( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer )
{
if ( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null )
bch.addBox( 7, 7, 10, 9, 9, 14 );
this.renderCache = rh.useSimplifiedRendering( x, y, z, this, this.renderCache );
IIcon myIcon = this.is.getIconIndex();
rh.setTexture( myIcon );
if( this.host != null && this.host.getFacadeContainer().getFacade( this.mySide ) != null )
rh.setBounds( 7, 7, 10, 9, 9, 14 );
else
bch.addBox( 7, 7, 10, 9, 9, 16 );
rh.setBounds( 7, 7, 10, 9, 9, 16 );
rh.renderBlock( x, y, z, renderer );
rh.setTexture( null );
}
@Override
public ItemStack getItemStack(PartItemStack wrenched)
@SideOnly( Side.CLIENT )
public void renderDynamic( double x, double y, double z, IPartRenderHelper rh, RenderBlocks renderer )
{
return this.is;
}
@Override
public IIcon getBreakingTexture()
{
return null;
}
@Override
@@ -113,13 +122,6 @@ public class PartCableAnchor implements IPart
return false;
}
@Override
@SideOnly(Side.CLIENT)
public void renderDynamic(double x, double y, double z, IPartRenderHelper rh, RenderBlocks renderer)
{
}
@Override
public boolean isSolid()
{
@@ -133,13 +135,13 @@ public class PartCableAnchor implements IPart
}
@Override
public void writeToNBT(NBTTagCompound data)
public void writeToNBT( NBTTagCompound data )
{
}
@Override
public void readFromNBT(NBTTagCompound data)
public void readFromNBT( NBTTagCompound data )
{
}
@@ -150,6 +152,12 @@ public class PartCableAnchor implements IPart
return 0;
}
@Override
public boolean isLadder( EntityLivingBase entity )
{
return this.mySide.offsetY == 0 && ( entity.isCollidedHorizontally || !entity.onGround );
}
@Override
public void onNeighborChanged()
{
@@ -169,13 +177,13 @@ public class PartCableAnchor implements IPart
}
@Override
public void writeToStream(ByteBuf data) throws IOException
public void writeToStream( ByteBuf data ) throws IOException
{
}
@Override
public boolean readFromStream(ByteBuf data) throws IOException
public boolean readFromStream( ByteBuf data ) throws IOException
{
return false;
}
@@ -187,7 +195,7 @@ public class PartCableAnchor implements IPart
}
@Override
public void onEntityCollision(Entity entity)
public void onEntityCollision( Entity entity )
{
}
@@ -211,20 +219,26 @@ public class PartCableAnchor implements IPart
}
@Override
public void setPartHostInfo(ForgeDirection side, IPartHost host, TileEntity tile)
public void setPartHostInfo( ForgeDirection side, IPartHost host, TileEntity tile )
{
this.host = host;
this.mySide = side;
}
@Override
public boolean onActivate(EntityPlayer player, Vec3 pos)
public boolean onActivate( EntityPlayer player, Vec3 pos )
{
return false;
}
@Override
public void getDrops(List<ItemStack> drops, boolean wrenched)
public boolean onShiftActivate( EntityPlayer player, Vec3 pos )
{
return false;
}
@Override
public void getDrops( List<ItemStack> drops, boolean wrenched )
{
}
@@ -236,32 +250,21 @@ public class PartCableAnchor implements IPart
}
@Override
public boolean isLadder(EntityLivingBase entity)
{
return this.mySide.offsetY == 0 && ( entity.isCollidedHorizontally || ! entity.onGround );
}
@Override
public boolean onShiftActivate(EntityPlayer player, Vec3 pos)
{
return false;
}
@Override
public void onPlacement(EntityPlayer player, ItemStack held, ForgeDirection side)
@SideOnly( Side.CLIENT )
public void randomDisplayTick( World world, int x, int y, int z, Random r )
{
}
@Override
public boolean canBePlacedOn(BusSupport what)
public void onPlacement( EntityPlayer player, ItemStack held, ForgeDirection side )
{
}
@Override
public boolean canBePlacedOn( BusSupport what )
{
return what == BusSupport.CABLE || what == BusSupport.DENSE_CABLE;
}
@Override
public IIcon getBreakingTexture()
{
return null;
}
}
@@ -73,8 +73,7 @@ import appeng.util.Platform;
import appeng.util.inv.IInventoryDestination;
public class PartInterface extends PartBasicState
implements IGridTickable, IStorageMonitorable, IInventoryDestination, IInterfaceHost, ISidedInventory, IAEAppEngInventory, ITileStorageMonitorable, IPriorityHost
public class PartInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IInventoryDestination, IInterfaceHost, ISidedInventory, IAEAppEngInventory, ITileStorageMonitorable, IPriorityHost
{
final DualityInterface duality = new DualityInterface( this.proxy, this );
@@ -97,6 +96,19 @@ public class PartInterface extends PartBasicState
this.duality.notifyNeighbors();
}
@Override
public void getBoxes( IPartCollisionHelper bch )
{
bch.addBox( 2, 2, 14, 14, 14, 16 );
bch.addBox( 5, 5, 12, 11, 11, 14 );
}
@Override
public int getInstalledUpgrades( Upgrades u )
{
return this.duality.getInstalledUpgrades( u );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, RenderBlocks renderer )
@@ -113,6 +125,12 @@ public class PartInterface extends PartBasicState
rh.renderInventoryBox( renderer );
}
@Override
public void gridChanged()
{
this.duality.gridChanged();
}
@Override
@SideOnly( Side.CLIENT )
public void renderStatic( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer )
@@ -157,13 +175,6 @@ public class PartInterface extends PartBasicState
this.duality.initialize();
}
@Override
public void getBoxes( IPartCollisionHelper bch )
{
bch.addBox( 2, 2, 14, 14, 14, 16 );
bch.addBox( 5, 5, 12, 11, 11, 14 );
}
@Override
public void getDrops( List<ItemStack> drops, boolean wrenched )
{
@@ -176,12 +187,6 @@ public class PartInterface extends PartBasicState
return 4;
}
@Override
public void gridChanged()
{
this.duality.gridChanged();
}
@Override
public IConfigManager getConfigManager()
{
@@ -194,19 +199,13 @@ public class PartInterface extends PartBasicState
return this.duality.getInventoryByName( name );
}
@Override
public int getInstalledUpgrades( Upgrades u )
{
return this.duality.getInstalledUpgrades( u );
}
@Override
public boolean onPartActivate( EntityPlayer p, Vec3 pos )
{
if ( p.isSneaking() )
if( p.isSneaking() )
return false;
if ( Platform.isServer() )
if( Platform.isServer() )
Platform.openGUI( p, this.getTileEntity(), this.side, GuiBridge.GUI_INTERFACE );
return true;
@@ -91,8 +91,7 @@ import appeng.util.prioitylist.PrecisePriorityList;
@Interface( iname = "BC", iface = "buildcraft.api.transport.IPipeConnection" )
public class PartStorageBus extends PartUpgradeable
implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPipeConnection, IPriorityHost
public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPipeConnection, IPriorityHost
{
final BaseActionSource mySrc;
final AppEngInternalAEInventory Config = new AppEngInternalAEInventory( this, 63 );
@@ -124,7 +123,7 @@ public class PartStorageBus extends PartUpgradeable
private void updateStatus()
{
boolean currentActive = this.proxy.isActive();
if ( this.wasActive != currentActive )
if( this.wasActive != currentActive )
{
this.wasActive = currentActive;
try
@@ -132,7 +131,7 @@ public class PartStorageBus extends PartUpgradeable
this.proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() );
this.host.markForUpdate();
}
catch ( GridAccessException e )
catch( GridAccessException e )
{
// :P
}
@@ -152,11 +151,26 @@ public class PartStorageBus extends PartUpgradeable
}
@Override
public void writeToNBT( NBTTagCompound data )
public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
{
super.writeToNBT( data );
this.Config.writeToNBT( data, "config" );
data.setInteger( "priority", this.priority );
this.resetCache( true );
this.host.markForSave();
}
@Override
public void onChangeInventory( IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack )
{
super.onChangeInventory( inv, slot, mc, removedStack, newStack );
if( inv == this.Config )
this.resetCache( true );
}
@Override
public void upgradesChanged()
{
super.upgradesChanged();
this.resetCache( true );
}
@Override
@@ -167,36 +181,41 @@ public class PartStorageBus extends PartUpgradeable
this.priority = data.getInteger( "priority" );
}
@Override
public void writeToNBT( NBTTagCompound data )
{
super.writeToNBT( data );
this.Config.writeToNBT( data, "config" );
data.setInteger( "priority", this.priority );
}
@Override
public IInventory getInventoryByName( String name )
{
if ( name.equals( "config" ) )
if( name.equals( "config" ) )
return this.Config;
return super.getInventoryByName( name );
}
@Override
public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
private void resetCache( boolean fullReset )
{
this.resetCache( true );
this.host.markForSave();
}
if( this.host == null || this.host.getTile() == null || this.host.getTile().getWorldObj() == null || this.host.getTile().getWorldObj().isRemote )
return;
@Override
public void upgradesChanged()
{
super.upgradesChanged();
this.resetCache( true );
}
if( fullReset )
this.resetCacheLogic = 2;
else
this.resetCacheLogic = 1;
@Override
public void onChangeInventory( IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack )
{
super.onChangeInventory( inv, slot, mc, removedStack, newStack );
if ( inv == this.Config )
this.resetCache( true );
try
{
this.proxy.getTick().alertDevice( this.proxy.getNode() );
}
catch( GridAccessException e )
{
// :P
}
}
@Override
@@ -210,10 +229,10 @@ public class PartStorageBus extends PartUpgradeable
{
try
{
if ( this.proxy.isActive() )
if( this.proxy.isActive() )
this.proxy.getStorage().postAlterationOfStoredItems( StorageChannel.ITEMS, change, this.mySrc );
}
catch ( GridAccessException e )
catch( GridAccessException e )
{
// :(
}
@@ -225,6 +244,14 @@ public class PartStorageBus extends PartUpgradeable
// not used here.
}
@Override
public void getBoxes( IPartCollisionHelper bch )
{
bch.addBox( 3, 3, 15, 13, 13, 16 );
bch.addBox( 2, 2, 14, 14, 14, 15 );
bch.addBox( 5, 5, 12, 11, 11, 14 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, RenderBlocks renderer )
@@ -273,34 +300,6 @@ public class PartStorageBus extends PartUpgradeable
this.resetCache( false );
}
private void resetCache( boolean fullReset )
{
if ( this.host == null || this.host.getTile() == null || this.host.getTile().getWorldObj() == null || this.host.getTile().getWorldObj().isRemote )
return;
if ( fullReset )
this.resetCacheLogic = 2;
else
this.resetCacheLogic = 1;
try
{
this.proxy.getTick().alertDevice( this.proxy.getNode() );
}
catch ( GridAccessException e )
{
// :P
}
}
@Override
public void getBoxes( IPartCollisionHelper bch )
{
bch.addBox( 3, 3, 15, 13, 13, 16 );
bch.addBox( 2, 2, 14, 14, 14, 15 );
bch.addBox( 5, 5, 12, 11, 11, 14 );
}
@Override
public int cableConnectionRenderTo()
{
@@ -310,9 +309,9 @@ public class PartStorageBus extends PartUpgradeable
@Override
public boolean onPartActivate( EntityPlayer player, Vec3 pos )
{
if ( !player.isSneaking() )
if( !player.isSneaking() )
{
if ( Platform.isClient() )
if( Platform.isClient() )
return true;
Platform.openGUI( player, this.getHost().getTile(), this.side, GuiBridge.GUI_STORAGEBUS );
@@ -331,10 +330,10 @@ public class PartStorageBus extends PartUpgradeable
@Override
public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
{
if ( this.resetCacheLogic != 0 )
if( this.resetCacheLogic != 0 )
this.resetCache();
if ( this.monitor != null )
if( this.monitor != null )
return this.monitor.onTick();
return TickRateModulation.SLEEP;
@@ -347,20 +346,20 @@ public class PartStorageBus extends PartUpgradeable
IMEInventory<IAEItemStack> in = this.getInternalHandler();
IItemList<IAEItemStack> before = AEApi.instance().storage().createItemList();
if ( in != null )
if( in != null )
before = in.getAvailableItems( before );
this.cached = false;
if ( fullReset )
if( fullReset )
this.handlerHash = 0;
IMEInventory<IAEItemStack> out = this.getInternalHandler();
if ( this.monitor != null )
if( this.monitor != null )
this.monitor.onTick();
IItemList<IAEItemStack> after = AEApi.instance().storage().createItemList();
if ( out != null )
if( out != null )
after = out.getAvailableItems( after );
Platform.postListChanges( before, after, this, this.mySrc );
@@ -368,7 +367,7 @@ public class PartStorageBus extends PartUpgradeable
public MEInventoryHandler getInternalHandler()
{
if ( this.cached )
if( this.cached )
return this.handler;
boolean wasSleeping = this.monitor == null;
@@ -379,7 +378,7 @@ public class PartStorageBus extends PartUpgradeable
int newHandlerHash = Platform.generateTileHash( target );
if ( this.handlerHash == newHandlerHash && this.handlerHash != 0 )
if( this.handlerHash == newHandlerHash && this.handlerHash != 0 )
return this.handler;
try
@@ -387,7 +386,7 @@ public class PartStorageBus extends PartUpgradeable
// force grid to update handlers...
this.proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() );
}
catch ( GridAccessException e )
catch( GridAccessException e )
{
// :3
}
@@ -395,66 +394,66 @@ public class PartStorageBus extends PartUpgradeable
this.handlerHash = newHandlerHash;
this.handler = null;
this.monitor = null;
if ( target != null )
if( target != null )
{
IExternalStorageHandler esh = AEApi.instance().registries().externalStorage().getHandler( target, this.side.getOpposite(), StorageChannel.ITEMS, this.mySrc );
if ( esh != null )
if( esh != null )
{
IMEInventory inv = esh.getInventory( target, this.side.getOpposite(), StorageChannel.ITEMS, this.mySrc );
if ( inv instanceof MEMonitorIInventory )
if( inv instanceof MEMonitorIInventory )
{
MEMonitorIInventory h = (MEMonitorIInventory) inv;
h.mode = (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER );
h.mySource = new MachineSource( this );
}
if ( inv instanceof MEMonitorIInventory )
if( inv instanceof MEMonitorIInventory )
this.monitor = (MEMonitorIInventory) inv;
if ( inv != null )
if( inv != null )
{
this.checkInterfaceVsStorageBus( target, this.side.getOpposite() );
this.handler = new MEInventoryHandler( inv, StorageChannel.ITEMS );
this.handler.setBaseAccess( ( AccessRestriction ) this.getConfigManager().getSetting( Settings.ACCESS ) );
this.handler.setBaseAccess( (AccessRestriction) this.getConfigManager().getSetting( Settings.ACCESS ) );
this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST );
this.handler.setPriority( this.priority );
IItemList<IAEItemStack> priorityList = AEApi.instance().storage().createItemList();
int slotsToUse = 18 + this.getInstalledUpgrades( Upgrades.CAPACITY ) * 9;
for ( int x = 0; x < this.Config.getSizeInventory() && x < slotsToUse; x++ )
for( int x = 0; x < this.Config.getSizeInventory() && x < slotsToUse; x++ )
{
IAEItemStack is = this.Config.getAEStackInSlot( x );
if ( is != null )
if( is != null )
priorityList.add( is );
}
if ( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
this.handler.setPartitionList( new FuzzyPriorityList( priorityList, (FuzzyMode) this.getConfigManager().getSetting( Settings.FUZZY_MODE ) ) );
else
this.handler.setPartitionList( new PrecisePriorityList( priorityList ) );
if ( inv instanceof IMEMonitor )
if( inv instanceof IMEMonitor )
( (IMEMonitor) inv ).addListener( this, this.handler );
}
}
}
// update sleep state...
if ( wasSleeping != ( this.monitor == null ) )
if( wasSleeping != ( this.monitor == null ) )
{
try
{
ITickManager tm = this.proxy.getTick();
if ( this.monitor == null )
if( this.monitor == null )
tm.sleepDevice( this.proxy.getNode() );
else
tm.wakeDevice( this.proxy.getNode() );
}
catch ( GridAccessException e )
catch( GridAccessException e )
{
// :(
}
@@ -467,17 +466,17 @@ public class PartStorageBus extends PartUpgradeable
{
IInterfaceHost achievement = null;
if ( target instanceof IInterfaceHost )
if( target instanceof IInterfaceHost )
achievement = (IInterfaceHost) target;
if ( target instanceof IPartHost )
if( target instanceof IPartHost )
{
Object part = ( (IPartHost) target ).getPart( side );
if ( part instanceof IInterfaceHost )
if( part instanceof IInterfaceHost )
achievement = (IInterfaceHost) part;
}
if ( achievement != null && achievement.getActionableNode() != null )
if( achievement != null && achievement.getActionableNode() != null )
{
Platform.addStat( achievement.getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() );
// Platform.addStat( getActionableNode().getPlayerID(), Achievements.Recursive.getAchievement() );
@@ -487,13 +486,13 @@ public class PartStorageBus extends PartUpgradeable
@Override
public List<IMEInventoryHandler> getCellArray( StorageChannel channel )
{
if ( channel == StorageChannel.ITEMS )
if( channel == StorageChannel.ITEMS )
{
IMEInventoryHandler out = this.proxy.isActive() ? this.getInternalHandler() : null;
if ( out != null )
if( out != null )
return Collections.singletonList( out );
}
return Arrays.asList( new IMEInventoryHandler[] { } );
return Arrays.asList( new IMEInventoryHandler[] {} );
}
@Override
@@ -93,6 +93,31 @@ public class PartToggleBus extends PartBasicState
return this.is.getIconIndex();
}
@Override
public AECableType getCableConnectionType( ForgeDirection dir )
{
return AECableType.GLASS;
}
@Override
public void securityBreak()
{
if( this.is.stackSize > 0 )
{
List<ItemStack> items = new ArrayList<ItemStack>();
items.add( this.is.copy() );
this.host.removePart( this.side, false );
Platform.spawnDrops( this.tile.getWorldObj(), this.tile.xCoord, this.tile.yCoord, this.tile.zCoord, items );
this.is.stackSize = 0;
}
}
@Override
public void getBoxes( IPartCollisionHelper bch )
{
bch.addBox( 6, 6, 11, 10, 10, 16 );
}
@Override
@SideOnly( Side.CLIENT )
public void renderInventory( IPartRenderHelper rh, RenderBlocks renderer )
@@ -145,7 +170,7 @@ public class PartToggleBus extends PartBasicState
boolean oldHasRedstone = this.hasRedstone;
this.hasRedstone = this.getHost().hasRedstone( this.side );
if ( this.hasRedstone != oldHasRedstone )
if( this.hasRedstone != oldHasRedstone )
{
this.updateInternalState();
this.getHost().markForUpdate();
@@ -195,18 +220,6 @@ public class PartToggleBus extends PartBasicState
return this.outerProxy.getNode();
}
@Override
public void getBoxes( IPartCollisionHelper bch )
{
bch.addBox( 6, 6, 11, 10, 10, 16 );
}
@Override
public AECableType getCableConnectionType( ForgeDirection dir )
{
return AECableType.GLASS;
}
@Override
public int cableConnectionRenderTo()
{
@@ -220,33 +233,20 @@ public class PartToggleBus extends PartBasicState
this.outerProxy.setOwner( player );
}
@Override
public void securityBreak()
{
if ( this.is.stackSize > 0 )
{
List<ItemStack> items = new ArrayList<ItemStack>();
items.add( this.is.copy() );
this.host.removePart( this.side, false );
Platform.spawnDrops( this.tile.getWorldObj(), this.tile.xCoord, this.tile.yCoord, this.tile.zCoord, items );
this.is.stackSize = 0;
}
}
private void updateInternalState()
{
boolean intention = this.getIntention();
if ( intention == ( this.connection == null ) )
if( intention == ( this.connection == null ) )
{
if ( this.proxy.getNode() != null && this.outerProxy.getNode() != null )
if( this.proxy.getNode() != null && this.outerProxy.getNode() != null )
{
if ( intention )
if( intention )
{
try
{
this.connection = AEApi.instance().createGridConnection( this.proxy.getNode(), this.outerProxy.getNode() );
}
catch ( FailedConnection e )
catch( FailedConnection e )
{
// :(
}