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.facade;
import java.io.IOException;
import io.netty.buffer.ByteBuf;
@@ -38,72 +39,113 @@ import appeng.integration.abstraction.IBC;
import appeng.items.parts.ItemFacade;
import appeng.parts.CableBusStorage;
public class FacadeContainer implements IFacadeContainer
{
final int facades = 6;
final CableBusStorage storage;
public FacadeContainer(CableBusStorage cbs) {
public FacadeContainer( CableBusStorage cbs )
{
this.storage = cbs;
}
@Override
public void writeToStream(ByteBuf out) throws IOException
public boolean addFacade( IFacadePart a )
{
int facadeSides = 0;
for (int x = 0; x < this.facades; x++)
if( this.getFacade( a.getSide() ) == null )
{
if ( this.getFacade( ForgeDirection.getOrientation( x ) ) != null )
facadeSides |= ( 1 << x );
this.storage.setFacade( a.getSide().ordinal(), a );
return true;
}
out.writeByte( (byte) facadeSides );
return false;
}
for (int x = 0; x < this.facades; x++)
@Override
public void removeFacade( IPartHost host, ForgeDirection side )
{
if( side != null && side != ForgeDirection.UNKNOWN )
{
IFacadePart part = this.getFacade( ForgeDirection.getOrientation( x ) );
if ( part != null )
if( this.storage.getFacade( side.ordinal() ) != null )
{
int itemID = Item.getIdFromItem( part.getItem() );
int dmgValue = part.getItemDamage();
out.writeInt( itemID * (part.isBC() ? -1 : 1) );
out.writeInt( dmgValue );
this.storage.setFacade( side.ordinal(), null );
if( host != null )
host.markForUpdate();
}
}
}
@Override
public boolean readFromStream(ByteBuf out) throws IOException
public IFacadePart getFacade( ForgeDirection s )
{
return this.storage.getFacade( s.ordinal() );
}
@Override
public void rotateLeft()
{
IFacadePart[] newFacades = new FacadePart[6];
newFacades[ForgeDirection.UP.ordinal()] = this.storage.getFacade( ForgeDirection.UP.ordinal() );
newFacades[ForgeDirection.DOWN.ordinal()] = this.storage.getFacade( ForgeDirection.DOWN.ordinal() );
newFacades[ForgeDirection.EAST.ordinal()] = this.storage.getFacade( ForgeDirection.NORTH.ordinal() );
newFacades[ForgeDirection.SOUTH.ordinal()] = this.storage.getFacade( ForgeDirection.EAST.ordinal() );
newFacades[ForgeDirection.WEST.ordinal()] = this.storage.getFacade( ForgeDirection.SOUTH.ordinal() );
newFacades[ForgeDirection.NORTH.ordinal()] = this.storage.getFacade( ForgeDirection.WEST.ordinal() );
for( int x = 0; x < this.facades; x++ )
this.storage.setFacade( x, newFacades[x] );
}
@Override
public void writeToNBT( NBTTagCompound c )
{
for( int x = 0; x < this.facades; x++ )
{
if( this.storage.getFacade( x ) != null )
{
NBTTagCompound data = new NBTTagCompound();
this.storage.getFacade( x ).getItemStack().writeToNBT( data );
c.setTag( "facade:" + x, data );
}
}
}
@Override
public boolean readFromStream( ByteBuf out ) throws IOException
{
int facadeSides = out.readByte();
boolean changed = false;
int[] ids = new int[2];
for (int x = 0; x < this.facades; x++)
for( int x = 0; x < this.facades; x++ )
{
ForgeDirection side = ForgeDirection.getOrientation( x );
int ix = (1 << x);
if ( (facadeSides & ix) == ix )
int ix = ( 1 << x );
if( ( facadeSides & ix ) == ix )
{
ids[0] = out.readInt();
ids[1] = out.readInt();
boolean isBC = ids[0] < 0;
ids[0] = Math.abs( ids[0] );
if ( isBC && AppEng.instance.isIntegrationEnabled( IntegrationType.BC ) )
if( isBC && AppEng.instance.isIntegrationEnabled( IntegrationType.BC ) )
{
IBC bc = (IBC) AppEng.instance.getIntegration( IntegrationType.BC );
changed = changed || this.storage.getFacade( x ) == null;
this.storage.setFacade( x, bc.createFacadePart( (Block) Block.blockRegistry.getObjectById( ids[0] ), ids[1], side ) );
}
else if ( !isBC )
else if( !isBC )
{
for ( Item facadeItem : AEApi.instance().definitions().items().facade().maybeItem().asSet() )
for( Item facadeItem : AEApi.instance().definitions().items().facade().maybeItem().asSet() )
{
ItemFacade ifa = (ItemFacade) facadeItem;
ItemStack facade = ifa.createFromIDs( ids );
if ( facade != null )
if( facade != null )
{
changed = changed || this.storage.getFacade( x ) == null;
this.storage.setFacade( x, ifa.createPartFromItemStack( facade, side ) );
@@ -122,27 +164,27 @@ public class FacadeContainer implements IFacadeContainer
}
@Override
public void readFromNBT(NBTTagCompound c)
public void readFromNBT( NBTTagCompound c )
{
for (int x = 0; x < this.facades; x++)
for( int x = 0; x < this.facades; x++ )
{
this.storage.setFacade( x, null );
NBTTagCompound t = c.getCompoundTag( "facade:" + x );
if ( t != null )
if( t != null )
{
ItemStack is = ItemStack.loadItemStackFromNBT( t );
if ( is != null )
if( is != null )
{
Item i = is.getItem();
if ( i instanceof IFacadeItem )
this.storage.setFacade( x, ((IFacadeItem) i).createPartFromItemStack( is, ForgeDirection.getOrientation( x ) ) );
if( i instanceof IFacadeItem )
this.storage.setFacade( x, ( (IFacadeItem) i ).createPartFromItemStack( is, ForgeDirection.getOrientation( x ) ) );
else
{
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.BC ) )
if( AppEng.instance.isIntegrationEnabled( IntegrationType.BC ) )
{
IBC bc = (IBC) AppEng.instance.getIntegration( IntegrationType.BC );
if ( bc.isFacade( is ) )
if( bc.isFacade( is ) )
this.storage.setFacade( x, bc.createFacadePart( is, ForgeDirection.getOrientation( x ) ) );
}
}
@@ -152,74 +194,35 @@ public class FacadeContainer implements IFacadeContainer
}
@Override
public void writeToNBT(NBTTagCompound c)
public void writeToStream( ByteBuf out ) throws IOException
{
for (int x = 0; x < this.facades; x++)
int facadeSides = 0;
for( int x = 0; x < this.facades; x++ )
{
if ( this.storage.getFacade( x ) != null )
if( this.getFacade( ForgeDirection.getOrientation( x ) ) != null )
facadeSides |= ( 1 << x );
}
out.writeByte( (byte) facadeSides );
for( int x = 0; x < this.facades; x++ )
{
IFacadePart part = this.getFacade( ForgeDirection.getOrientation( x ) );
if( part != null )
{
NBTTagCompound data = new NBTTagCompound();
this.storage.getFacade( x ).getItemStack().writeToNBT( data );
c.setTag( "facade:" + x, data );
int itemID = Item.getIdFromItem( part.getItem() );
int dmgValue = part.getItemDamage();
out.writeInt( itemID * ( part.isBC() ? -1 : 1 ) );
out.writeInt( dmgValue );
}
}
}
@Override
public boolean addFacade(IFacadePart a)
{
if ( this.getFacade( a.getSide() ) == null )
{
this.storage.setFacade( a.getSide().ordinal(), a );
return true;
}
return false;
}
@Override
public void removeFacade(IPartHost host, ForgeDirection side)
{
if ( side != null && side != ForgeDirection.UNKNOWN )
{
if ( this.storage.getFacade( side.ordinal() ) != null )
{
this.storage.setFacade( side.ordinal(), null );
if ( host != null )
host.markForUpdate();
}
}
}
@Override
public IFacadePart getFacade(ForgeDirection s)
{
return this.storage.getFacade( s.ordinal() );
}
@Override
public boolean isEmpty()
{
for (int x = 0; x < this.facades; x++)
if ( this.storage.getFacade( x ) != null )
for( int x = 0; x < this.facades; x++ )
if( this.storage.getFacade( x ) != null )
return false;
return true;
}
@Override
public void rotateLeft()
{
IFacadePart[] newFacades = new FacadePart[6];
newFacades[ForgeDirection.UP.ordinal()] = this.storage.getFacade( ForgeDirection.UP.ordinal() );
newFacades[ForgeDirection.DOWN.ordinal()] = this.storage.getFacade( ForgeDirection.DOWN.ordinal() );
newFacades[ForgeDirection.EAST.ordinal()] = this.storage.getFacade( ForgeDirection.NORTH.ordinal() );
newFacades[ForgeDirection.SOUTH.ordinal()] = this.storage.getFacade( ForgeDirection.EAST.ordinal() );
newFacades[ForgeDirection.WEST.ordinal()] = this.storage.getFacade( ForgeDirection.SOUTH.ordinal() );
newFacades[ForgeDirection.NORTH.ordinal()] = this.storage.getFacade( ForgeDirection.WEST.ordinal() );
for (int x = 0; x < this.facades; x++)
this.storage.setFacade( x, newFacades[x] );
}
}