Merge pull request #1356 from thatsIch/e-brackets-everywhere

Puts everywhere brackets
This commit is contained in:
thatsIch
2015-04-30 18:52:34 +02:00
465 changed files with 6726 additions and 14 deletions
@@ -80,7 +80,9 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
public StackType injectItems( StackType input, Actionable mode, BaseActionSource src ) public StackType injectItems( StackType input, Actionable mode, BaseActionSource src )
{ {
if( mode == Actionable.SIMULATE ) if( mode == Actionable.SIMULATE )
{
return this.getHandler().injectItems( input, mode, src ); return this.getHandler().injectItems( input, mode, src );
}
return this.monitorDifference( input.copy(), this.getHandler().injectItems( input, mode, src ), false, src ); return this.monitorDifference( input.copy(), this.getHandler().injectItems( input, mode, src ), false, src );
} }
@@ -94,12 +96,18 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
StackType diff = (StackType) original.copy(); StackType diff = (StackType) original.copy();
if( extraction ) if( extraction )
{
diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() ); diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() );
}
else if( leftOvers != null ) else if( leftOvers != null )
{
diff.decStackSize( leftOvers.getStackSize() ); diff.decStackSize( leftOvers.getStackSize() );
}
if( diff.getStackSize() != 0 ) if( diff.getStackSize() != 0 )
{
this.postChangesToListeners( ImmutableList.of( diff ), src ); this.postChangesToListeners( ImmutableList.of( diff ), src );
}
return leftOvers; return leftOvers;
} }
@@ -118,9 +126,13 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
Entry<IMEMonitorHandlerReceiver<StackType>, Object> o = i.next(); Entry<IMEMonitorHandlerReceiver<StackType>, Object> o = i.next();
IMEMonitorHandlerReceiver<StackType> receiver = o.getKey(); IMEMonitorHandlerReceiver<StackType> receiver = o.getKey();
if( receiver.isValid( o.getValue() ) ) if( receiver.isValid( o.getValue() ) )
{
receiver.postChange( this, diff, src ); receiver.postChange( this, diff, src );
}
else else
{
i.remove(); i.remove();
}
} }
} }
@@ -133,7 +145,9 @@ public class MEMonitorHandler<StackType extends IAEStack> implements IMEMonitor<
public StackType extractItems( StackType request, Actionable mode, BaseActionSource src ) public StackType extractItems( StackType request, Actionable mode, BaseActionSource src )
{ {
if( mode == Actionable.SIMULATE ) if( mode == Actionable.SIMULATE )
{
return this.getHandler().extractItems( request, mode, src ); return this.getHandler().extractItems( request, mode, src );
}
return this.monitorDifference( request.copy(), this.getHandler().extractItems( request, mode, src ), true, src ); return this.monitorDifference( request.copy(), this.getHandler().extractItems( request, mode, src ), true, src );
} }
@@ -53,8 +53,12 @@ public enum StorageChannel
public IItemList createList() public IItemList createList()
{ {
if( this == ITEMS ) if( this == ITEMS )
{
return AEApi.instance().storage().createItemList(); return AEApi.instance().storage().createItemList();
}
else else
{
return AEApi.instance().storage().createFluidList(); return AEApi.instance().storage().createFluidList();
}
} }
} }
@@ -105,22 +105,34 @@ public class WorldCoord
int zlen = Math.abs( oz ); int zlen = Math.abs( oz );
if( loc.isEqual( this.copy().add( ForgeDirection.EAST, xlen ) ) ) if( loc.isEqual( this.copy().add( ForgeDirection.EAST, xlen ) ) )
{
return ForgeDirection.EAST; return ForgeDirection.EAST;
}
if( loc.isEqual( this.copy().add( ForgeDirection.WEST, xlen ) ) ) if( loc.isEqual( this.copy().add( ForgeDirection.WEST, xlen ) ) )
{
return ForgeDirection.WEST; return ForgeDirection.WEST;
}
if( loc.isEqual( this.copy().add( ForgeDirection.NORTH, zlen ) ) ) if( loc.isEqual( this.copy().add( ForgeDirection.NORTH, zlen ) ) )
{
return ForgeDirection.NORTH; return ForgeDirection.NORTH;
}
if( loc.isEqual( this.copy().add( ForgeDirection.SOUTH, zlen ) ) ) if( loc.isEqual( this.copy().add( ForgeDirection.SOUTH, zlen ) ) )
{
return ForgeDirection.SOUTH; return ForgeDirection.SOUTH;
}
if( loc.isEqual( this.copy().add( ForgeDirection.UP, ylen ) ) ) if( loc.isEqual( this.copy().add( ForgeDirection.UP, ylen ) ) )
{
return ForgeDirection.UP; return ForgeDirection.UP;
}
if( loc.isEqual( this.copy().add( ForgeDirection.DOWN, ylen ) ) ) if( loc.isEqual( this.copy().add( ForgeDirection.DOWN, ylen ) ) )
{
return ForgeDirection.DOWN; return ForgeDirection.DOWN;
}
return null; return null;
} }
@@ -117,13 +117,21 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
super( mat ); super( mat );
if( mat == AEGlassMaterial.INSTANCE || mat == Material.glass ) if( mat == AEGlassMaterial.INSTANCE || mat == Material.glass )
{
this.setStepSound( Block.soundTypeGlass ); this.setStepSound( Block.soundTypeGlass );
}
else if( mat == Material.rock ) else if( mat == Material.rock )
{
this.setStepSound( Block.soundTypeStone ); this.setStepSound( Block.soundTypeStone );
}
else if( mat == Material.wood ) else if( mat == Material.wood )
{
this.setStepSound( Block.soundTypeWood ); this.setStepSound( Block.soundTypeWood );
}
else else
{
this.setStepSound( Block.soundTypeMetal ); this.setStepSound( Block.soundTypeMetal );
}
this.featureFullName = new FeatureNameExtractor( c, subName ).get(); this.featureFullName = new FeatureNameExtractor( c, subName ).get();
this.featureSubName = subName; this.featureSubName = subName;
@@ -152,7 +160,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public BlockRenderInfo getRendererInstance() public BlockRenderInfo getRendererInstance()
{ {
if( this.renderInfo != null ) if( this.renderInfo != null )
{
return this.renderInfo; return this.renderInfo;
}
try try
{ {
@@ -243,7 +253,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public IIcon getIcon( int direction, int metadata ) public IIcon getIcon( int direction, int metadata )
{ {
if( this.renderIcon != null ) if( this.renderIcon != null )
{
return this.renderIcon; return this.renderIcon;
}
return this.getRendererInstance().getTexture( ForgeDirection.getOrientation( direction ) ); return this.getRendererInstance().getTexture( ForgeDirection.getOrientation( direction ) );
} }
@@ -256,12 +268,16 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
ICustomCollision collisionHandler = null; ICustomCollision collisionHandler = null;
if( this instanceof ICustomCollision ) if( this instanceof ICustomCollision )
{
collisionHandler = (ICustomCollision) this; collisionHandler = (ICustomCollision) this;
}
else else
{ {
AEBaseTile te = this.getTileEntity( w, x, y, z ); AEBaseTile te = this.getTileEntity( w, x, y, z );
if( te instanceof ICustomCollision ) if( te instanceof ICustomCollision )
{
collisionHandler = (ICustomCollision) te; collisionHandler = (ICustomCollision) te;
}
} }
if( collisionHandler != null && bb != null ) if( collisionHandler != null && bb != null )
@@ -277,11 +293,15 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
b.maxY += y; b.maxY += y;
b.maxZ += z; b.maxZ += z;
if( bb.intersectsWith( b ) ) if( bb.intersectsWith( b ) )
{
out.add( b ); out.add( b );
}
} }
} }
else else
{
super.addCollisionBoxesToList( w, x, y, z, bb, out, e ); super.addCollisionBoxesToList( w, x, y, z, bb, out, e );
}
} }
@Override @Override
@@ -292,12 +312,16 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
AxisAlignedBB b = null; AxisAlignedBB b = null;
if( this instanceof ICustomCollision ) if( this instanceof ICustomCollision )
{
collisionHandler = (ICustomCollision) this; collisionHandler = (ICustomCollision) this;
}
else else
{ {
AEBaseTile te = this.getTileEntity( w, x, y, z ); AEBaseTile te = this.getTileEntity( w, x, y, z );
if( te instanceof ICustomCollision ) if( te instanceof ICustomCollision )
{
collisionHandler = (ICustomCollision) te; collisionHandler = (ICustomCollision) te;
}
} }
if( collisionHandler != null ) if( collisionHandler != null )
@@ -345,7 +369,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
for( AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, false ) ) for( AxisAlignedBB bx : collisionHandler.getSelectedBoundingBoxesFromPool( w, x, y, z, null, false ) )
{ {
if( b == null ) if( b == null )
{
b = bx; b = bx;
}
else else
{ {
double minX = Math.min( b.minX, bx.minX ); double minX = Math.min( b.minX, bx.minX );
@@ -361,7 +387,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
b.setBounds( b.minX + x, b.minY + y, b.minZ + z, b.maxX + x, b.maxY + y, b.maxZ + z ); b.setBounds( b.minX + x, b.minY + y, b.minZ + z, b.maxX + x, b.maxY + y, b.maxZ + z );
} }
else else
{
b = super.getSelectedBoundingBoxFromPool( w, x, y, z ); b = super.getSelectedBoundingBoxFromPool( w, x, y, z );
}
return b; return b;
} }
@@ -378,12 +406,16 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
ICustomCollision collisionHandler = null; ICustomCollision collisionHandler = null;
if( this instanceof ICustomCollision ) if( this instanceof ICustomCollision )
{
collisionHandler = (ICustomCollision) this; collisionHandler = (ICustomCollision) this;
}
else else
{ {
AEBaseTile te = this.getTileEntity( w, x, y, z ); AEBaseTile te = this.getTileEntity( w, x, y, z );
if( te instanceof ICustomCollision ) if( te instanceof ICustomCollision )
{
collisionHandler = (ICustomCollision) te; collisionHandler = (ICustomCollision) te;
}
} }
if( collisionHandler != null ) if( collisionHandler != null )
@@ -444,10 +476,14 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
ItemStack[] drops = Platform.getBlockDrops( w, x, y, z ); ItemStack[] drops = Platform.getBlockDrops( w, x, y, z );
if( tile == null ) if( tile == null )
{
return false; return false;
}
if( tile instanceof TileCableBus || tile instanceof TileSkyChest ) if( tile instanceof TileCableBus || tile instanceof TileSkyChest )
{
return false; return false;
}
ItemStack op = new ItemStack( this ); ItemStack op = new ItemStack( this );
for( ItemStack ol : drops ) for( ItemStack ol : drops )
@@ -456,7 +492,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{ {
NBTTagCompound tag = tile.downloadSettings( SettingsFrom.DISMANTLE_ITEM ); NBTTagCompound tag = tile.downloadSettings( SettingsFrom.DISMANTLE_ITEM );
if( tag != null ) if( tag != null )
{
ol.setTagCompound( tag ); ol.setTagCompound( tag );
}
} }
} }
@@ -499,7 +537,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED ); memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
} }
else else
{
memoryCard.notifyUser( player, MemoryCardMessages.INVALID_MACHINE ); memoryCard.notifyUser( player, MemoryCardMessages.INVALID_MACHINE );
}
return false; return false;
} }
} }
@@ -521,7 +561,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{ {
TileEntity te = this.getTileEntity( w, x, y, z ); TileEntity te = this.getTileEntity( w, x, y, z );
if( te instanceof AEBaseTile ) if( te instanceof AEBaseTile )
{
( (AEBaseTile) w.getTileEntity( x, y, z ) ).setName( is.getDisplayName() ); ( (AEBaseTile) w.getTileEntity( x, y, z ) ).setName( is.getDisplayName() );
}
} }
} }
@@ -544,7 +586,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{ {
TileEntity te = this.getTileEntity( w, x, y, z ); TileEntity te = this.getTileEntity( w, x, y, z );
if( te instanceof IInventory ) if( te instanceof IInventory )
{
return Container.calcRedstoneFromInventory( (IInventory) te ); return Container.calcRedstoneFromInventory( (IInventory) te );
}
return 0; return 0;
} }
@@ -678,7 +722,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{ {
// if the input is an flippable IIcon find the original. // if the input is an flippable IIcon find the original.
while( substitute instanceof FlippableIcon ) while( substitute instanceof FlippableIcon )
{
substitute = ( (FlippableIcon) substitute ).getOriginal(); substitute = ( (FlippableIcon) substitute ).getOriginal();
}
if( substitute != null ) if( substitute != null )
{ {
@@ -689,7 +735,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc ); IResource res = Minecraft.getMinecraft().getResourceManager().getResource( resLoc );
if( res != null ) if( res != null )
{
return new FlippableIcon( ir.registerIcon( Name ) ); return new FlippableIcon( ir.registerIcon( Name ) );
}
} }
catch( Throwable e ) catch( Throwable e )
{ {
@@ -731,11 +779,15 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
public <T extends TileEntity> T getTileEntity( IBlockAccess w, int x, int y, int z ) public <T extends TileEntity> T getTileEntity( IBlockAccess w, int x, int y, int z )
{ {
if( !this.hasBlockTileEntity() ) if( !this.hasBlockTileEntity() )
{
return null; return null;
}
TileEntity te = w.getTileEntity( x, y, z ); TileEntity te = w.getTileEntity( x, y, z );
if( this.tileEntityType.isInstance( te ) ) if( this.tileEntityType.isInstance( te ) )
{
return (T) te; return (T) te;
}
return null; return null;
} }
@@ -754,30 +806,48 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
ForgeDirection west = ForgeDirection.UNKNOWN; ForgeDirection west = ForgeDirection.UNKNOWN;
if( forward == null || up == null ) if( forward == null || up == null )
{
return dir; return dir;
}
int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY; int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY;
int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ; int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ;
int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX; int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX;
for( ForgeDirection dx : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection dx : ForgeDirection.VALID_DIRECTIONS )
{
if( dx.offsetX == west_x && dx.offsetY == west_y && dx.offsetZ == west_z ) if( dx.offsetX == west_x && dx.offsetY == west_y && dx.offsetZ == west_z )
{
west = dx; west = dx;
}
}
if( dir == forward ) if( dir == forward )
{
return ForgeDirection.SOUTH; return ForgeDirection.SOUTH;
}
if( dir == forward.getOpposite() ) if( dir == forward.getOpposite() )
{
return ForgeDirection.NORTH; return ForgeDirection.NORTH;
}
if( dir == up ) if( dir == up )
{
return ForgeDirection.UP; return ForgeDirection.UP;
}
if( dir == up.getOpposite() ) if( dir == up.getOpposite() )
{
return ForgeDirection.DOWN; return ForgeDirection.DOWN;
}
if( dir == west ) if( dir == west )
{
return ForgeDirection.WEST; return ForgeDirection.WEST;
}
if( dir == west.getOpposite() ) if( dir == west.getOpposite() )
{
return ForgeDirection.EAST; return ForgeDirection.EAST;
}
return ForgeDirection.UNKNOWN; return ForgeDirection.UNKNOWN;
} }
@@ -823,9 +893,13 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
{ {
ArrayList<ItemStack> drops = new ArrayList<ItemStack>(); ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
if( te.dropItems() ) if( te.dropItems() )
{
te.getDrops( w, x, y, z, drops ); te.getDrops( w, x, y, z, drops );
}
else else
{
te.getNoDrops( w, x, y, z, drops ); te.getNoDrops( w, x, y, z, drops );
}
// Cry ;_; ... // Cry ;_; ...
Platform.spawnDrops( w, x, y, z, drops ); Platform.spawnDrops( w, x, y, z, drops );
@@ -833,7 +907,9 @@ public class AEBaseBlock extends BlockContainer implements IAEFeature
super.breakBlock( w, x, y, z, a, b ); super.breakBlock( w, x, y, z, a, b );
if( te != null ) if( te != null )
{
w.setTileEntity( x, y, z, null ); w.setTileEntity( x, y, z, null );
}
} }
public String getUnlocalizedName( ItemStack is ) public String getUnlocalizedName( ItemStack is )
@@ -56,14 +56,18 @@ public class AEBaseItemBlock extends ItemBlock
this.hasSubtypes = this.blockType.hasSubtypes; this.hasSubtypes = this.blockType.hasSubtypes;
if( Platform.isClient() ) if( Platform.isClient() )
{
MinecraftForgeClient.registerItemRenderer( this, ItemRenderer.INSTANCE ); MinecraftForgeClient.registerItemRenderer( this, ItemRenderer.INSTANCE );
}
} }
@Override @Override
public int getMetadata( int dmg ) public int getMetadata( int dmg )
{ {
if( this.hasSubtypes ) if( this.hasSubtypes )
{
return dmg; return dmg;
}
return 0; return 0;
} }
@@ -107,17 +111,25 @@ public class AEBaseItemBlock extends ItemBlock
{ {
up = ForgeDirection.getOrientation( side ); up = ForgeDirection.getOrientation( side );
if( up == ForgeDirection.UP || up == ForgeDirection.DOWN ) if( up == ForgeDirection.UP || up == ForgeDirection.DOWN )
{
forward = ForgeDirection.SOUTH; forward = ForgeDirection.SOUTH;
}
else else
{
forward = ForgeDirection.UP; forward = ForgeDirection.UP;
}
} }
else if( this.blockType instanceof BlockWireless || this.blockType instanceof BlockSkyCompass ) else if( this.blockType instanceof BlockWireless || this.blockType instanceof BlockSkyCompass )
{ {
forward = ForgeDirection.getOrientation( side ); forward = ForgeDirection.getOrientation( side );
if( forward == ForgeDirection.UP || forward == ForgeDirection.DOWN ) if( forward == ForgeDirection.UP || forward == ForgeDirection.DOWN )
{
up = ForgeDirection.SOUTH; up = ForgeDirection.SOUTH;
}
else else
{
up = ForgeDirection.UP; up = ForgeDirection.UP;
}
} }
else else
{ {
@@ -161,11 +173,15 @@ public class AEBaseItemBlock extends ItemBlock
up = ForgeDirection.getOrientation( side ); up = ForgeDirection.getOrientation( side );
forward = ForgeDirection.SOUTH; forward = ForgeDirection.SOUTH;
if( up.offsetY == 0 ) if( up.offsetY == 0 )
{
forward = ForgeDirection.UP; forward = ForgeDirection.UP;
}
} }
if( !this.blockType.isValidOrientation( w, x, y, z, forward, up ) ) if( !this.blockType.isValidOrientation( w, x, y, z, forward, up ) )
{
return false; return false;
}
if( super.placeBlockAt( stack, player, w, x, y, z, side, hitX, hitY, hitZ, metadata ) ) if( super.placeBlockAt( stack, player, w, x, y, z, side, hitX, hitY, hitZ, metadata ) )
{ {
@@ -175,13 +191,17 @@ public class AEBaseItemBlock extends ItemBlock
ori = tile; ori = tile;
if( tile == null ) if( tile == null )
{
return true; return true;
}
if( ori.canBeRotated() && !this.blockType.hasCustomRotation() ) if( ori.canBeRotated() && !this.blockType.hasCustomRotation() )
{ {
if( ori.getForward() == null || ori.getUp() == null || // null if( ori.getForward() == null || ori.getUp() == null || // null
tile.getForward() == ForgeDirection.UNKNOWN || ori.getUp() == ForgeDirection.UNKNOWN ) tile.getForward() == ForgeDirection.UNKNOWN || ori.getUp() == ForgeDirection.UNKNOWN )
{
ori.setOrientation( forward, up ); ori.setOrientation( forward, up );
}
} }
if( tile instanceof IGridProxyable ) if( tile instanceof IGridProxyable )
@@ -89,13 +89,19 @@ public class BlockCraftingStorage extends BlockCraftingUnit
public String getUnlocalizedName( ItemStack is ) public String getUnlocalizedName( ItemStack is )
{ {
if( is.getItemDamage() == 1 ) if( is.getItemDamage() == 1 )
{
return "tile.appliedenergistics2.BlockCraftingStorage4k"; return "tile.appliedenergistics2.BlockCraftingStorage4k";
}
if( is.getItemDamage() == 2 ) if( is.getItemDamage() == 2 )
{
return "tile.appliedenergistics2.BlockCraftingStorage16k"; return "tile.appliedenergistics2.BlockCraftingStorage16k";
}
if( is.getItemDamage() == 3 ) if( is.getItemDamage() == 3 )
{
return "tile.appliedenergistics2.BlockCraftingStorage64k"; return "tile.appliedenergistics2.BlockCraftingStorage64k";
}
return this.getItemUnlocalizedName( is ); return this.getItemUnlocalizedName( is );
} }
@@ -94,7 +94,9 @@ public class BlockCraftingUnit extends AEBaseBlock
if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() ) if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() )
{ {
if( Platform.isClient() ) if( Platform.isClient() )
{
return true; return true;
}
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CRAFTING_CPU ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CRAFTING_CPU );
return true; return true;
@@ -124,7 +126,9 @@ public class BlockCraftingUnit extends AEBaseBlock
{ {
TileCraftingTile cp = this.getTileEntity( w, x, y, z ); TileCraftingTile cp = this.getTileEntity( w, x, y, z );
if( cp != null ) if( cp != null )
{
cp.breakCluster(); cp.breakCluster();
}
super.breakBlock( w, x, y, z, a, b ); super.breakBlock( w, x, y, z, a, b );
} }
@@ -133,7 +137,9 @@ public class BlockCraftingUnit extends AEBaseBlock
public String getUnlocalizedName( ItemStack is ) public String getUnlocalizedName( ItemStack is )
{ {
if( is.getItemDamage() == 1 ) if( is.getItemDamage() == 1 )
{
return "tile.appliedenergistics2.BlockCraftingAccelerator"; return "tile.appliedenergistics2.BlockCraftingAccelerator";
}
return this.getItemUnlocalizedName( is ); return this.getItemUnlocalizedName( is );
} }
@@ -148,7 +154,9 @@ public class BlockCraftingUnit extends AEBaseBlock
{ {
TileCraftingTile cp = this.getTileEntity( w, x, y, z ); TileCraftingTile cp = this.getTileEntity( w, x, y, z );
if( cp != null ) if( cp != null )
{
cp.updateMultiBlock(); cp.updateMultiBlock();
}
} }
@Override @Override
@@ -117,10 +117,12 @@ public class BlockCrank extends AEBaseBlock
private ForgeDirection findCrankable( World world, int x, int y, int z ) private ForgeDirection findCrankable( World world, int x, int y, int z )
{ {
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
{
if( this.isCrankable( world, x, y, z, dir ) ) if( this.isCrankable( world, x, y, z, dir ) )
{ {
return dir; return dir;
} }
}
return ForgeDirection.UNKNOWN; return ForgeDirection.UNKNOWN;
} }
@@ -47,13 +47,17 @@ public class BlockCellWorkbench extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileCellWorkbench tg = this.getTileEntity( w, x, y, z ); TileCellWorkbench tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CELL_WORKBENCH ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_CELL_WORKBENCH );
}
return true; return true;
} }
return false; return false;
@@ -71,7 +71,9 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{ {
if( player.isSneaking() ) if( player.isSneaking() )
{
return false; return false;
}
if( Platform.isServer() ) if( Platform.isServer() )
{ {
@@ -90,10 +92,14 @@ public class BlockCharger extends AEBaseBlock implements ICustomCollision
public void randomDisplayTick( World w, int x, int y, int z, Random r ) public void randomDisplayTick( World w, int x, int y, int z, Random r )
{ {
if( !AEConfig.instance.enableEffects ) if( !AEConfig.instance.enableEffects )
{
return; return;
}
if( r.nextFloat() < 0.98 ) if( r.nextFloat() < 0.98 )
{
return; return;
}
AEBaseTile tile = this.getTileEntity( w, x, y, z ); AEBaseTile tile = this.getTileEntity( w, x, y, z );
if( tile instanceof TileCharger ) if( tile instanceof TileCharger )
@@ -47,7 +47,9 @@ public class BlockCondenser extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{ {
if( player.isSneaking() ) if( player.isSneaking() )
{
return false; return false;
}
if( Platform.isServer() ) if( Platform.isServer() )
{ {
@@ -57,13 +57,17 @@ public class BlockInscriber extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileInscriber tg = this.getTileEntity( w, x, y, z ); TileInscriber tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_INSCRIBER ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_INSCRIBER );
}
return true; return true;
} }
return false; return false;
@@ -56,13 +56,17 @@ public class BlockInterface extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileInterface tg = this.getTileEntity( w, x, y, z ); TileInterface tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_INTERFACE ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_INTERFACE );
}
return true; return true;
} }
return false; return false;
@@ -46,7 +46,9 @@ public class BlockLightDetector extends BlockQuartzTorch
public int isProvidingWeakPower( IBlockAccess w, int x, int y, int z, int side ) public int isProvidingWeakPower( IBlockAccess w, int x, int y, int z, int side )
{ {
if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, x, y, z ) ).isReady() ) if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, x, y, z ) ).isReady() )
{
return ( (World) w ).getBlockLightValue( x, y, z ) - 6; return ( (World) w ).getBlockLightValue( x, y, z ) - 6;
}
return 0; return 0;
} }
@@ -58,7 +60,9 @@ public class BlockLightDetector extends BlockQuartzTorch
TileLightDetector tld = this.getTileEntity( world, x, y, z ); TileLightDetector tld = this.getTileEntity( world, x, y, z );
if( tld != null ) if( tld != null )
{
tld.updateLight(); tld.updateLight();
}
} }
@Override @Override
@@ -88,7 +88,9 @@ public class BlockPaint extends AEBaseBlock
TilePaint tp = this.getTileEntity( w, x, y, z ); TilePaint tp = this.getTileEntity( w, x, y, z );
if( tp != null ) if( tp != null )
{
tp.onNeighborBlockChange(); tp.onNeighborBlockChange();
}
} }
@Override @Override
@@ -107,7 +109,9 @@ public class BlockPaint extends AEBaseBlock
public void fillWithRain( World w, int x, int y, int z ) public void fillWithRain( World w, int x, int y, int z )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
w.setBlock( x, y, z, Platform.AIR, 0, 3 ); w.setBlock( x, y, z, Platform.AIR, 0, 3 );
}
} }
@Override @Override
@@ -68,7 +68,9 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient
public void randomDisplayTick( World w, int x, int y, int z, Random r ) public void randomDisplayTick( World w, int x, int y, int z, Random r )
{ {
if( !AEConfig.instance.enableEffects ) if( !AEConfig.instance.enableEffects )
{
return; return;
}
TileQuartzGrowthAccelerator tileQuartzGrowthAccelerator = this.getTileEntity( w, x, y, z ); TileQuartzGrowthAccelerator tileQuartzGrowthAccelerator = this.getTileEntity( w, x, y, z );
@@ -98,25 +100,33 @@ public class BlockQuartzGrowthAccelerator extends AEBaseBlock implements IOrient
dx = 0.6; dx = 0.6;
dz = d1; dz = d1;
if( !w.getBlock( x + west.offsetX, y + west.offsetY, z + west.offsetZ ).isAir( w, x + west.offsetX, y + west.offsetY, z + west.offsetZ ) ) if( !w.getBlock( x + west.offsetX, y + west.offsetY, z + west.offsetZ ).isAir( w, x + west.offsetX, y + west.offsetY, z + west.offsetZ ) )
{
return; return;
}
break; break;
case 1: case 1:
dx = d1; dx = d1;
dz += 0.6; dz += 0.6;
if( !w.getBlock( x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ ).isAir( w, x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ ) ) if( !w.getBlock( x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ ).isAir( w, x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ ) )
{
return; return;
}
break; break;
case 2: case 2:
dx = d1; dx = d1;
dz = -0.6; dz = -0.6;
if( !w.getBlock( x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ ).isAir( w, x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ ) ) if( !w.getBlock( x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ ).isAir( w, x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ ) )
{
return; return;
}
break; break;
case 3: case 3:
dx = -0.6; dx = -0.6;
dz = d1; dz = d1;
if( !w.getBlock( x - west.offsetX, y - west.offsetY, z - west.offsetZ ).isAir( w, x - west.offsetX, y - west.offsetY, z - west.offsetZ ) ) if( !w.getBlock( x - west.offsetX, y - west.offsetY, z - west.offsetZ ).isAir( w, x - west.offsetX, y - west.offsetY, z - west.offsetZ ) )
{
return; return;
}
break; break;
} }
@@ -107,10 +107,14 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
public void randomDisplayTick( World w, int x, int y, int z, Random r ) public void randomDisplayTick( World w, int x, int y, int z, Random r )
{ {
if( !AEConfig.instance.enableEffects ) if( !AEConfig.instance.enableEffects )
{
return; return;
}
if( r.nextFloat() < 0.98 ) if( r.nextFloat() < 0.98 )
{
return; return;
}
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp(); ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
double xOff = -0.3 * up.offsetX; double xOff = -0.3 * up.offsetX;
@@ -132,7 +136,9 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
{ {
ForgeDirection up = this.getOrientable( w, x, y, z ).getUp(); ForgeDirection up = this.getOrientable( w, x, y, z ).getUp();
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) ) if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
{
this.dropTorch( w, x, y, z ); this.dropTorch( w, x, y, z );
}
} }
private void dropTorch( World w, int x, int y, int z ) private void dropTorch( World w, int x, int y, int z )
@@ -146,8 +152,12 @@ public class BlockQuartzTorch extends AEBaseBlock implements IOrientableBlock, I
public boolean canPlaceBlockAt( World w, int x, int y, int z ) public boolean canPlaceBlockAt( World w, int x, int y, int z )
{ {
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
{
if( this.canPlaceAt( w, x, y, z, dir ) ) if( this.canPlaceAt( w, x, y, z, dir ) )
{
return true; return true;
}
}
return false; return false;
} }
@@ -55,13 +55,17 @@ public class BlockSecurity extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileSecurity tg = this.getTileEntity( w, x, y, z ); TileSecurity tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isClient() ) if( Platform.isClient() )
{
return true; return true;
}
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SECURITY );
return true; return true;
@@ -80,7 +80,9 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
{ {
TileSkyCompass sc = this.getTileEntity( w, x, y, z ); TileSkyCompass sc = this.getTileEntity( w, x, y, z );
if( sc != null ) if( sc != null )
{
return false; return false;
}
return this.canPlaceAt( w, x, y, z, forward.getOpposite() ); return this.canPlaceAt( w, x, y, z, forward.getOpposite() );
} }
@@ -95,7 +97,9 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
TileSkyCompass sc = this.getTileEntity( w, x, y, z ); TileSkyCompass sc = this.getTileEntity( w, x, y, z );
ForgeDirection up = sc.getForward(); ForgeDirection up = sc.getForward();
if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) ) if( !this.canPlaceAt( w, x, y, z, up.getOpposite() ) )
{
this.dropTorch( w, x, y, z ); this.dropTorch( w, x, y, z );
}
} }
private void dropTorch( World w, int x, int y, int z ) private void dropTorch( World w, int x, int y, int z )
@@ -109,8 +113,12 @@ public class BlockSkyCompass extends AEBaseBlock implements ICustomCollision
public boolean canPlaceBlockAt( World w, int x, int y, int z ) public boolean canPlaceBlockAt( World w, int x, int y, int z )
{ {
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
{
if( this.canPlaceAt( w, x, y, z, dir ) ) if( this.canPlaceAt( w, x, y, z, dir ) )
{
return true; return true;
}
}
return false; return false;
} }
@@ -68,7 +68,9 @@ public class BlockVibrationChamber extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{ {
if( player.isSneaking() ) if( player.isSneaking() )
{
return false; return false;
}
if( Platform.isServer() ) if( Platform.isServer() )
{ {
@@ -87,7 +89,9 @@ public class BlockVibrationChamber extends AEBaseBlock
public void randomDisplayTick( World w, int x, int y, int z, Random r ) public void randomDisplayTick( World w, int x, int y, int z, Random r )
{ {
if( !AEConfig.instance.enableEffects ) if( !AEConfig.instance.enableEffects )
{
return; return;
}
AEBaseTile tile = this.getTileEntity( w, x, y, z ); AEBaseTile tile = this.getTileEntity( w, x, y, z );
if( tile instanceof TileVibrationChamber ) if( tile instanceof TileVibrationChamber )
@@ -119,7 +119,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
public int getRenderBlockPass() public int getRenderBlockPass()
{ {
if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
{
return 1; return 1;
}
return 0; return 0;
} }
@@ -162,7 +164,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
return block.getLightValue( world, x, y, z ); return block.getLightValue( world, x, y, z );
} }
if( block == null ) if( block == null )
{
return 0; return 0;
}
return this.cb( world, x, y, z ).getLightValue(); return this.cb( world, x, y, z ).getLightValue();
} }
@@ -192,7 +196,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
{ {
AEBaseTile tile = this.getTileEntity( world, x, y, z ); AEBaseTile tile = this.getTileEntity( world, x, y, z );
if( tile != null ) if( tile != null )
{
tile.disableDrops(); tile.disableDrops();
}
// maybe ray trace? // maybe ray trace?
} }
return super.removedByPlayer( world, player, x, y, z ); return super.removedByPlayer( world, player, x, y, z );
@@ -224,7 +230,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
BusRenderHelper.INSTANCE.setPass( pass ); BusRenderHelper.INSTANCE.setPass( pass );
if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) ) if( AEConfig.instance.isFeatureEnabled( AEFeature.AlphaPass ) )
{
return true; return true;
}
return pass == 0; return pass == 0;
} }
@@ -236,9 +244,13 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
SelectedPart sp = this.cb( world, x, y, z ).selectPart( v3 ); SelectedPart sp = this.cb( world, x, y, z ).selectPart( v3 );
if( sp.part != null ) if( sp.part != null )
{
return sp.part.getItemStack( PartItemStack.Pick ); return sp.part.getItemStack( PartItemStack.Pick );
}
else if( sp.facade != null ) else if( sp.facade != null )
{
return sp.facade.getItemStack(); return sp.facade.getItemStack();
}
return null; return null;
} }
@@ -258,7 +270,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
IIcon ico = this.getIcon( p ); IIcon ico = this.getIcon( p );
if( ico == null ) if( ico == null )
{
continue; continue;
}
byte b0 = (byte) ( Platform.getRandomInt() % 2 == 0 ? 1 : 0 ); byte b0 = (byte) ( Platform.getRandomInt() % 2 == 0 ? 1 : 0 );
@@ -304,7 +318,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
IIcon ico = this.getIcon( p ); IIcon ico = this.getIcon( p );
if( ico == null ) if( ico == null )
{
continue; continue;
}
byte b0 = 3; byte b0 = 3;
@@ -335,19 +351,25 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
public void onNeighborChange( IBlockAccess w, int x, int y, int z, int tileX, int tileY, int tileZ ) public void onNeighborChange( IBlockAccess w, int x, int y, int z, int tileX, int tileY, int tileZ )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
this.cb( w, x, y, z ).onNeighborChanged(); this.cb( w, x, y, z ).onNeighborChanged();
}
} }
private IIcon getIcon( IPart p ) private IIcon getIcon( IPart p )
{ {
if( p == null ) if( p == null )
{
return null; return null;
}
try try
{ {
IIcon ico = p.getBreakingTexture(); IIcon ico = p.getBreakingTexture();
if( ico != null ) if( ico != null )
{
return ico; return ico;
}
} }
catch( Throwable t ) catch( Throwable t )
{ {
@@ -356,7 +378,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
ItemStack is = p.getItemStack( PartItemStack.Network ); ItemStack is = p.getItemStack( PartItemStack.Network );
if( is == null || is.getItem() == null ) if( is == null || is.getItem() == null )
{
return null; return null;
}
return is.getItem().getIcon( is, 0 ); return is.getItem().getIcon( is, 0 );
} }
@@ -367,10 +391,13 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
ICableBusContainer out = null; ICableBusContainer out = null;
if( te instanceof TileCableBus ) if( te instanceof TileCableBus )
{
out = ( (TileCableBus) te ).cb; out = ( (TileCableBus) te ).cb;
}
else if( AppEng.instance.isIntegrationEnabled( IntegrationType.FMP ) ) else if( AppEng.instance.isIntegrationEnabled( IntegrationType.FMP ) )
{
out = ( (IFMP) AppEng.instance.getIntegration( IntegrationType.FMP ) ).getCableContainer( te ); out = ( (IFMP) AppEng.instance.getIntegration( IntegrationType.FMP ) ).getCableContainer( te );
}
return out == null ? NULL_CABLE_BUS : out; return out == null ? NULL_CABLE_BUS : out;
} }
@@ -392,7 +419,9 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
{ {
IIcon i = super.getIcon( direction, metadata ); IIcon i = super.getIcon( direction, metadata );
if( i != null ) if( i != null )
{
return i; return i;
}
return ExtraBlockTextures.BlockQuartzGlassB.getIcon(); return ExtraBlockTextures.BlockQuartzGlassB.getIcon();
} }
@@ -440,10 +469,14 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
TileEntity te = w.getTileEntity( x, y, z ); TileEntity te = w.getTileEntity( x, y, z );
if( noTesrTile.isInstance( te ) ) if( noTesrTile.isInstance( te ) )
{
return (T) te; return (T) te;
}
if( tesrTile != null && tesrTile.isInstance( te ) ) if( tesrTile != null && tesrTile.isInstance( te ) )
{
return (T) te; return (T) te;
}
return null; return null;
} }
@@ -48,7 +48,9 @@ public class BlockController extends AEBaseBlock
{ {
TileController tc = this.getTileEntity( w, x, y, z ); TileController tc = this.getTileEntity( w, x, y, z );
if( tc != null ) if( tc != null )
{
tc.onNeighborChange( false ); tc.onNeighborChange( false );
}
} }
@Override @Override
@@ -63,13 +63,17 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileWireless tg = this.getTileEntity( w, x, y, z ); TileWireless tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_WIRELESS ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_WIRELESS );
}
return true; return true;
} }
return false; return false;
@@ -197,6 +201,8 @@ public class BlockWireless extends AEBaseBlock implements ICustomCollision
out.add( AxisAlignedBB.getBoundingBox( minX, minY, minZ, maxX, maxY, maxZ ) ); out.add( AxisAlignedBB.getBoundingBox( minX, minY, minZ, maxX, maxY, maxZ ) );
} }
else else
{
out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) ); out.add( AxisAlignedBB.getBoundingBox( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
}
} }
} }
@@ -71,7 +71,9 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
if( bridge.hasQES() ) if( bridge.hasQES() )
{ {
if( CommonHelper.proxy.shouldAddParticles( r ) ) if( CommonHelper.proxy.shouldAddParticles( r ) )
{
CommonHelper.proxy.spawnEffect( EffectType.Energy, w, bx + 0.5, by + 0.5, bz + 0.5, null ); CommonHelper.proxy.spawnEffect( EffectType.Energy, w, bx + 0.5, by + 0.5, bz + 0.5, null );
}
} }
} }
} }
@@ -81,7 +83,9 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
{ {
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z ); TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if( bridge != null ) if( bridge != null )
{
bridge.neighborUpdate(); bridge.neighborUpdate();
}
} }
@Override @Override
@@ -94,13 +98,17 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileQuantumBridge tg = this.getTileEntity( w, x, y, z ); TileQuantumBridge tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_QNB ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_QNB );
}
return true; return true;
} }
return false; return false;
@@ -111,7 +119,9 @@ public class BlockQuantumLinkChamber extends AEBaseBlock implements ICustomColli
{ {
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z ); TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if( bridge != null ) if( bridge != null )
{
bridge.breakCluster(); bridge.breakCluster();
}
super.breakBlock( w, x, y, z, a, b ); super.breakBlock( w, x, y, z, a, b );
} }
@@ -56,7 +56,9 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
{ {
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z ); TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if( bridge != null ) if( bridge != null )
{
bridge.neighborUpdate(); bridge.neighborUpdate();
}
} }
@Override @Override
@@ -70,7 +72,9 @@ public class BlockQuantumRing extends AEBaseBlock implements ICustomCollision
{ {
TileQuantumBridge bridge = this.getTileEntity( w, x, y, z ); TileQuantumBridge bridge = this.getTileEntity( w, x, y, z );
if( bridge != null ) if( bridge != null )
{
bridge.breakCluster(); bridge.breakCluster();
}
super.breakBlock( w, x, y, z, a, b ); super.breakBlock( w, x, y, z, a, b );
} }
@@ -64,7 +64,9 @@ public class BlockQuartzGlass extends AEBaseBlock
if( mat == Material.glass || mat == AEGlassMaterial.INSTANCE ) if( mat == Material.glass || mat == AEGlassMaterial.INSTANCE )
{ {
if( w.getBlock( x, y, z ).getRenderType() == this.getRenderType() ) if( w.getBlock( x, y, z ).getRenderType() == this.getRenderType() )
{
return false; return false;
}
} }
return super.shouldSideBeRendered( w, x, y, z, side ); return super.shouldSideBeRendered( w, x, y, z, side );
} }
@@ -50,7 +50,9 @@ public class BlockQuartzLamp extends BlockQuartzGlass
public void randomDisplayTick( World w, int x, int y, int z, Random r ) public void randomDisplayTick( World w, int x, int y, int z, Random r )
{ {
if( !AEConfig.instance.enableEffects ) if( !AEConfig.instance.enableEffects )
{
return; return;
}
if( CommonHelper.proxy.shouldAddParticles( r ) ) if( CommonHelper.proxy.shouldAddParticles( r ) )
{ {
@@ -90,10 +90,14 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
int level = -1; int level = -1;
if( is != null ) if( is != null )
{
level = is.getItem().getHarvestLevel( is, "pickaxe" ); level = is.getItem().getHarvestLevel( is, "pickaxe" );
}
if( Ev.metadata > 0 || level >= 3 || Ev.originalSpeed > 7.0 ) if( Ev.metadata > 0 || level >= 3 || Ev.originalSpeed > 7.0 )
{
Ev.newSpeed /= 0.1; Ev.newSpeed /= 0.1;
}
} }
} }
@@ -117,7 +121,9 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
{ {
super.onBlockAdded( w, x, y, z ); super.onBlockAdded( w, x, y, z );
if( Platform.isServer() ) if( Platform.isServer() )
{
WorldSettings.getInstance().getCompass().updateArea( w, x, y, z ); WorldSettings.getInstance().getCompass().updateArea( w, x, y, z );
}
} }
// use AE2's renderer, no rotatable blocks. // use AE2's renderer, no rotatable blocks.
@@ -142,12 +148,16 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
{ {
IOrientable out = ( (IRB) AppEng.instance.getIntegration( IntegrationType.RB ) ).getOrientable( te ); IOrientable out = ( (IRB) AppEng.instance.getIntegration( IntegrationType.RB ) ).getOrientable( te );
if( out != null ) if( out != null )
{
return out; return out;
}
} }
} }
if( w.getBlockMetadata( x, y, z ) == 0 ) if( w.getBlockMetadata( x, y, z ) == 0 )
{
return new LocationRotation( w, x, y, z ); return new LocationRotation( w, x, y, z );
}
return new NullRotation(); return new NullRotation();
} }
@@ -156,13 +166,19 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
public String getUnlocalizedName( ItemStack is ) public String getUnlocalizedName( ItemStack is )
{ {
if( is.getItemDamage() == 1 ) if( is.getItemDamage() == 1 )
{
return this.getUnlocalizedName() + ".Block"; return this.getUnlocalizedName() + ".Block";
}
if( is.getItemDamage() == 2 ) if( is.getItemDamage() == 2 )
{
return this.getUnlocalizedName() + ".Brick"; return this.getUnlocalizedName() + ".Brick";
}
if( is.getItemDamage() == 3 ) if( is.getItemDamage() == 3 )
{
return this.getUnlocalizedName() + ".SmallBrick"; return this.getUnlocalizedName() + ".SmallBrick";
}
return this.getUnlocalizedName(); return this.getUnlocalizedName();
} }
@@ -182,11 +198,17 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
public IIcon getIcon( int direction, int metadata ) public IIcon getIcon( int direction, int metadata )
{ {
if( metadata == 1 ) if( metadata == 1 )
{
return this.Block; return this.Block;
}
if( metadata == 2 ) if( metadata == 2 )
{
return this.Brick; return this.Brick;
}
if( metadata == 3 ) if( metadata == 3 )
{
return this.SmallBrick; return this.SmallBrick;
}
return super.getIcon( direction, metadata ); return super.getIcon( direction, metadata );
} }
@@ -212,6 +234,8 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
{ {
super.breakBlock( w, x, y, z, b, WTF ); super.breakBlock( w, x, y, z, b, WTF );
if( Platform.isServer() ) if( Platform.isServer() )
{
WorldSettings.getInstance().getCompass().updateArea( w, x, y, z ); WorldSettings.getInstance().getCompass().updateArea( w, x, y, z );
}
} }
} }
@@ -91,7 +91,9 @@ public class OreQuartz extends AEBaseBlock
} }
if( j1 > 15 ) if( j1 > 15 )
{
j1 = 15; j1 = 15;
}
return j1 << 20 | j1 << 4; return j1 << 20 | j1 << 4;
} }
return j1; return j1;
@@ -20,7 +20,6 @@ package appeng.block.solids;
import java.util.Random; import java.util.Random;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@@ -76,7 +75,9 @@ public class OreQuartzCharged extends OreQuartz
public void randomDisplayTick( World w, int x, int y, int z, Random r ) public void randomDisplayTick( World w, int x, int y, int z, Random r )
{ {
if ( !AEConfig.instance.enableEffects ) if ( !AEConfig.instance.enableEffects )
{
return; return;
}
double xOff = ( r.nextFloat() ); double xOff = ( r.nextFloat() );
double yOff = ( r.nextFloat() ); double yOff = ( r.nextFloat() );
@@ -49,20 +49,26 @@ public class BlockSpatialIOPort extends AEBaseBlock
{ {
TileSpatialIOPort te = this.getTileEntity( w, x, y, z ); TileSpatialIOPort te = this.getTileEntity( w, x, y, z );
if( te != null ) if( te != null )
{
te.updateRedstoneState(); te.updateRedstoneState();
}
} }
@Override @Override
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileSpatialIOPort tg = this.getTileEntity( w, x, y, z ); TileSpatialIOPort tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SPATIAL_IO_PORT ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_SPATIAL_IO_PORT );
}
return true; return true;
} }
return false; return false;
@@ -48,7 +48,9 @@ public class BlockSpatialPylon extends AEBaseBlock
{ {
TileSpatialPylon tsp = this.getTileEntity( w, x, y, z ); TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
if( tsp != null ) if( tsp != null )
{
tsp.onNeighborBlockChange(); tsp.onNeighborBlockChange();
}
} }
@Override @Override
@@ -56,7 +58,9 @@ public class BlockSpatialPylon extends AEBaseBlock
{ {
TileSpatialPylon tsp = this.getTileEntity( w, x, y, z ); TileSpatialPylon tsp = this.getTileEntity( w, x, y, z );
if( tsp != null ) if( tsp != null )
{
return tsp.getLightValue(); return tsp.getLightValue();
}
return super.getLightValue( w, x, y, z ); return super.getLightValue( w, x, y, z );
} }
@@ -62,7 +62,9 @@ public class BlockChest extends AEBaseBlock
if( tg != null && !p.isSneaking() ) if( tg != null && !p.isSneaking() )
{ {
if( Platform.isClient() ) if( Platform.isClient() )
{
return true; return true;
}
if( side != tg.getUp().ordinal() ) if( side != tg.getUp().ordinal() )
{ {
@@ -78,7 +80,9 @@ public class BlockChest extends AEBaseBlock
tg.openGui( p, ch, cell, side ); tg.openGui( p, ch, cell, side );
} }
else else
{
p.addChatMessage( PlayerMessages.ChestCannotReadStorageCell.get() ); p.addChatMessage( PlayerMessages.ChestCannotReadStorageCell.get() );
}
} }
return true; return true;
@@ -55,13 +55,17 @@ public class BlockDrive extends AEBaseBlock
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileDrive tg = this.getTileEntity( w, x, y, z ); TileDrive tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_DRIVE ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_DRIVE );
}
return true; return true;
} }
return false; return false;
@@ -49,20 +49,26 @@ public class BlockIOPort extends AEBaseBlock
{ {
TileIOPort te = this.getTileEntity( w, x, y, z ); TileIOPort te = this.getTileEntity( w, x, y, z );
if( te != null ) if( te != null )
{
te.updateRedstoneState(); te.updateRedstoneState();
}
} }
@Override @Override
public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer p, int side, float hitX, float hitY, float hitZ )
{ {
if( p.isSneaking() ) if( p.isSneaking() )
{
return false; return false;
}
TileIOPort tg = this.getTileEntity( w, x, y, z ); TileIOPort tg = this.getTileEntity( w, x, y, z );
if( tg != null ) if( tg != null )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_IOPORT ); Platform.openGUI( p, tg, ForgeDirection.getOrientation( side ), GuiBridge.GUI_IOPORT );
}
return true; return true;
} }
return false; return false;
@@ -104,7 +104,9 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ ) public boolean onActivated( World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ )
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
Platform.openGUI( player, this.getTileEntity( w, x, y, z ), ForgeDirection.getOrientation( side ), GuiBridge.GUI_SKYCHEST ); Platform.openGUI( player, this.getTileEntity( w, x, y, z ), ForgeDirection.getOrientation( side ), GuiBridge.GUI_SKYCHEST );
}
return true; return true;
} }
@@ -127,7 +129,9 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
public String getUnlocalizedName( ItemStack is ) public String getUnlocalizedName( ItemStack is )
{ {
if( is.getItemDamage() == 1 ) if( is.getItemDamage() == 1 )
{
return this.getUnlocalizedName() + ".Block"; return this.getUnlocalizedName() + ".Block";
}
return this.getUnlocalizedName(); return this.getUnlocalizedName();
} }
@@ -140,7 +144,9 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
ForgeDirection o = ForgeDirection.UNKNOWN; ForgeDirection o = ForgeDirection.UNKNOWN;
if( sk != null ) if( sk != null )
{
o = sk.getUp(); o = sk.getUp();
}
double X = o.offsetX == 0 ? 0.06 : 0.0; double X = o.offsetX == 0 ? 0.06 : 0.0;
double Y = o.offsetY == 0 ? 0.06 : 0.0; double Y = o.offsetY == 0 ? 0.06 : 0.0;
@@ -119,9 +119,13 @@ public class ClientHelper extends ServerHelper
public World getWorld() public World getWorld()
{ {
if( Platform.isClient() ) if( Platform.isClient() )
{
return Minecraft.getMinecraft().theWorld; return Minecraft.getMinecraft().theWorld;
}
else else
{
return super.getWorld(); return super.getWorld();
}
} }
@Override @Override
@@ -129,7 +133,9 @@ public class ClientHelper extends ServerHelper
{ {
BaseBlockRender bbr = blk.getRendererInstance().rendererInstance; BaseBlockRender bbr = blk.getRendererInstance().rendererInstance;
if( bbr.hasTESR() && tile != null ) if( bbr.hasTESR() && tile != null )
{
ClientRegistry.bindTileEntitySpecialRenderer( tile, new TESRWrapper( bbr ) ); ClientRegistry.bindTileEntitySpecialRenderer( tile, new TESRWrapper( bbr ) );
}
} }
@Override @Override
@@ -142,7 +148,9 @@ public class ClientHelper extends ServerHelper
return o; return o;
} }
else else
{
return super.getPlayers(); return super.getPlayers();
}
} }
@Override @Override
@@ -243,9 +251,13 @@ public class ClientHelper extends ServerHelper
{ {
int setting = Minecraft.getMinecraft().gameSettings.particleSetting; int setting = Minecraft.getMinecraft().gameSettings.particleSetting;
if( setting == 2 ) if( setting == 2 )
{
return false; return false;
}
if( setting == 0 ) if( setting == 0 )
{
return true; return true;
}
return r.nextInt( 2 * ( setting + 1 ) ) == 0; return r.nextInt( 2 * ( setting + 1 ) ) == 0;
} }
@@ -347,7 +359,9 @@ public class ClientHelper extends ServerHelper
public CableRenderMode getRenderMode() public CableRenderMode getRenderMode()
{ {
if( Platform.isServer() ) if( Platform.isServer() )
{
return super.getRenderMode(); return super.getRenderMode();
}
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
EntityPlayer player = mc.thePlayer; EntityPlayer player = mc.thePlayer;
@@ -360,7 +374,9 @@ public class ClientHelper extends ServerHelper
{ {
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
if( mc == null || mc.thePlayer == null || mc.theWorld == null ) if( mc == null || mc.thePlayer == null || mc.theWorld == null )
{
return; return;
}
EntityPlayer player = mc.thePlayer; EntityPlayer player = mc.thePlayer;
@@ -383,7 +399,9 @@ public class ClientHelper extends ServerHelper
public void wheelEvent( MouseEvent me ) public void wheelEvent( MouseEvent me )
{ {
if( me.isCanceled() || me.dwheel == 0 ) if( me.isCanceled() || me.dwheel == 0 )
{
return; return;
}
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
EntityPlayer player = mc.thePlayer; EntityPlayer player = mc.thePlayer;
@@ -409,16 +427,22 @@ public class ClientHelper extends ServerHelper
if( ev.map.getTextureType() == 1 ) if( ev.map.getTextureType() == 1 )
{ {
for( ExtraItemTextures et : ExtraItemTextures.values() ) for( ExtraItemTextures et : ExtraItemTextures.values() )
{
et.registerIcon( ev.map ); et.registerIcon( ev.map );
}
} }
if( ev.map.getTextureType() == 0 ) if( ev.map.getTextureType() == 0 )
{ {
for( ExtraBlockTextures et : ExtraBlockTextures.values() ) for( ExtraBlockTextures et : ExtraBlockTextures.values() )
{
et.registerIcon( ev.map ); et.registerIcon( ev.map );
}
for( CableBusTextures cb : CableBusTextures.values() ) for( CableBusTextures cb : CableBusTextures.values() )
{
cb.registerIcon( ev.map ); cb.registerIcon( ev.map );
}
} }
} }
} }
+46 -1
View File
@@ -136,11 +136,17 @@ public abstract class AEBaseGui extends GuiContainer
final List<Slot> slots = this.getInventorySlots(); final List<Slot> slots = this.getInventorySlots();
Iterator<Slot> i = slots.iterator(); Iterator<Slot> i = slots.iterator();
while( i.hasNext() ) while( i.hasNext() )
{
if( i.next() instanceof SlotME ) if( i.next() instanceof SlotME )
{
i.remove(); i.remove();
}
}
for( InternalSlotME me : this.meSlots ) for( InternalSlotME me : this.meSlots )
{
slots.add( new SlotME( me ) ); slots.add( new SlotME( me ) );
}
} }
@SuppressWarnings( "unchecked" ) @SuppressWarnings( "unchecked" )
@@ -156,7 +162,9 @@ public abstract class AEBaseGui extends GuiContainer
boolean hasClicked = Mouse.isButtonDown( 0 ); boolean hasClicked = Mouse.isButtonDown( 0 );
if( hasClicked && this.myScrollBar != null ) if( hasClicked && this.myScrollBar != null )
{
this.myScrollBar.click( this, mouse_x - this.guiLeft, mouse_y - this.guiTop ); this.myScrollBar.click( this, mouse_x - this.guiLeft, mouse_y - this.guiTop );
}
for( Object c : this.buttonList ) for( Object c : this.buttonList )
{ {
@@ -171,11 +179,15 @@ public abstract class AEBaseGui extends GuiContainer
if( y < mouse_y && y + tooltip.getHeight() > mouse_y ) if( y < mouse_y && y + tooltip.getHeight() > mouse_y )
{ {
if( y < 15 ) if( y < 15 )
{
y = 15; y = 15;
}
String msg = tooltip.getMessage(); String msg = tooltip.getMessage();
if( msg != null ) if( msg != null )
{
this.drawTooltip( x + 11, y + 4, 0, msg ); this.drawTooltip( x + 11, y + 4, 0, msg );
}
} }
} }
} }
@@ -222,7 +234,9 @@ public abstract class AEBaseGui extends GuiContainer
} }
if( forceWidth > 0 ) if( forceWidth > 0 )
{
var5 = forceWidth; var5 = forceWidth;
}
this.zLevel = 300.0F; this.zLevel = 300.0F;
itemRender.zLevel = 300.0F; itemRender.zLevel = 300.0F;
@@ -276,7 +290,9 @@ public abstract class AEBaseGui extends GuiContainer
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
if( this.myScrollBar != null ) if( this.myScrollBar != null )
{
this.myScrollBar.draw( this ); this.myScrollBar.draw( this );
}
this.drawFG( ox, oy, x, y ); this.drawFG( ox, oy, x, y );
} }
@@ -357,7 +373,9 @@ public abstract class AEBaseGui extends GuiContainer
} }
} }
else else
{
super.mouseClickMove( x, y, c, d ); super.mouseClickMove( x, y, c, d );
}
} }
@Override @Override
@@ -370,7 +388,9 @@ public abstract class AEBaseGui extends GuiContainer
final InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; final InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
if( this.drag_click.size() > 1 ) if( this.drag_click.size() > 1 )
{
return; return;
}
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
NetworkHandler.instance.sendToServer( p ); NetworkHandler.instance.sendToServer( p );
@@ -381,7 +401,9 @@ public abstract class AEBaseGui extends GuiContainer
if( slot instanceof SlotPatternTerm ) if( slot instanceof SlotPatternTerm )
{ {
if( key == 6 ) if( key == 6 )
{
return; // prevent weird double clicks.. return; // prevent weird double clicks..
}
try try
{ {
@@ -395,13 +417,19 @@ public abstract class AEBaseGui extends GuiContainer
else if( slot instanceof SlotCraftingTerm ) else if( slot instanceof SlotCraftingTerm )
{ {
if( key == 6 ) if( key == 6 )
{
return; // prevent weird double clicks.. return; // prevent weird double clicks..
}
InventoryAction action = null; InventoryAction action = null;
if( key == 1 ) if( key == 1 )
{
action = InventoryAction.CRAFT_SHIFT; action = InventoryAction.CRAFT_SHIFT;
}
else else
{
action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM; action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
}
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
NetworkHandler.instance.sendToServer( p ); NetworkHandler.instance.sendToServer( p );
@@ -415,12 +443,16 @@ public abstract class AEBaseGui extends GuiContainer
{ {
IAEItemStack stack = null; IAEItemStack stack = null;
if( slot instanceof SlotME ) if( slot instanceof SlotME )
{
stack = ( (SlotME) slot ).getAEStack(); stack = ( (SlotME) slot ).getAEStack();
}
int slotNum = this.getInventorySlots().size(); int slotNum = this.getInventorySlots().size();
if( !( slot instanceof SlotME ) && slot != null ) if( !( slot instanceof SlotME ) && slot != null )
{
slotNum = slot.slotNumber; slotNum = slot.slotNumber;
}
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack ); ( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 ); PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
@@ -477,7 +509,9 @@ public abstract class AEBaseGui extends GuiContainer
stack = ( (SlotME) slot ).getAEStack(); stack = ( (SlotME) slot ).getAEStack();
if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null ) if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null )
{
action = InventoryAction.AUTO_CRAFT; action = InventoryAction.AUTO_CRAFT;
}
break; break;
case 1: case 1:
@@ -489,8 +523,9 @@ public abstract class AEBaseGui extends GuiContainer
stack = ( (SlotME) slot ).getAEStack(); stack = ( (SlotME) slot ).getAEStack();
if( stack != null && stack.isCraftable() ) if( stack != null && stack.isCraftable() )
{
action = InventoryAction.AUTO_CRAFT; action = InventoryAction.AUTO_CRAFT;
}
else if( player.capabilities.isCreativeMode ) else if( player.capabilities.isCreativeMode )
{ {
IAEItemStack slotItem = ( (SlotME) slot ).getAEStack(); IAEItemStack slotItem = ( (SlotME) slot ).getAEStack();
@@ -526,9 +561,13 @@ public abstract class AEBaseGui extends GuiContainer
this.bl_clicked = slot; this.bl_clicked = slot;
this.dbl_clickTimer = Stopwatch.createStarted(); this.dbl_clickTimer = Stopwatch.createStarted();
if( slot != null ) if( slot != null )
{
this.dbl_whichItem = slot.getHasStack() ? slot.getStack().copy() : null; this.dbl_whichItem = slot.getHasStack() ? slot.getStack().copy() : null;
}
else else
{
this.dbl_whichItem = null; this.dbl_whichItem = null;
}
} }
else if( this.dbl_whichItem != null ) else if( this.dbl_whichItem != null )
{ {
@@ -642,7 +681,9 @@ public abstract class AEBaseGui extends GuiContainer
this.mouseWheelEvent( x, y, i / Math.abs( i ) ); this.mouseWheelEvent( x, y, i / Math.abs( i ) );
} }
else if( i != 0 && this.myScrollBar != null ) else if( i != 0 && this.myScrollBar != null )
{
this.myScrollBar.wheel( i ); this.myScrollBar.wheel( i );
}
} }
protected void mouseWheelEvent( int x, int y, int wheel ) protected void mouseWheelEvent( int x, int y, int wheel )
@@ -702,7 +743,9 @@ public abstract class AEBaseGui extends GuiContainer
private boolean hasCustomInventoryName() private boolean hasCustomInventoryName()
{ {
if( this.inventorySlots instanceof AEBaseContainer ) if( this.inventorySlots instanceof AEBaseContainer )
{
return ( (AEBaseContainer) this.inventorySlots ).customName != null; return ( (AEBaseContainer) this.inventorySlots ).customName != null;
}
return false; return false;
} }
@@ -835,7 +878,9 @@ public abstract class AEBaseGui extends GuiContainer
this.safeDrawSlot( s ); this.safeDrawSlot( s );
} }
else else
{
this.safeDrawSlot( s ); this.safeDrawSlot( s );
}
return; return;
} }
@@ -121,10 +121,14 @@ public abstract class AEBaseMEGui extends AEBaseGui
List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips ); List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) ) if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
{
currentToolTip.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getStackSize() ) ); currentToolTip.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getStackSize() ) );
}
if( myStack.getCountRequestable() > 0 ) if( myStack.getCountRequestable() > 0 )
{
currentToolTip.add( "Items Requestable: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getCountRequestable() ) ); currentToolTip.add( "Items Requestable: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getCountRequestable() ) );
}
this.drawTooltip( x, y, 0, join( currentToolTip, "\n" ) ); this.drawTooltip( x, y, 0, join( currentToolTip, "\n" ) );
} }
@@ -48,15 +48,21 @@ public class AEConfigGui extends GuiConfig
for( String cat : AEConfig.instance.getCategoryNames() ) for( String cat : AEConfig.instance.getCategoryNames() )
{ {
if( cat.equals( "versionchecker" ) ) if( cat.equals( "versionchecker" ) )
{
continue; continue;
}
if( cat.equals( "settings" ) ) if( cat.equals( "settings" ) )
{
continue; continue;
}
ConfigCategory cc = AEConfig.instance.getCategory( cat ); ConfigCategory cc = AEConfig.instance.getCategory( cat );
if( cc.isChild() ) if( cc.isChild() )
{
continue; continue;
}
ConfigElement ce = new ConfigElement( cc ); ConfigElement ce = new ConfigElement( cc );
list.add( ce ); list.add( ce );
@@ -98,9 +98,13 @@ public class GuiCellWorkbench extends GuiUpgradeable
int dx = this.workbench.availableUpgrades() - 8; int dx = this.workbench.availableUpgrades() - 8;
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + dx * 18 ); this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
if( dx == 8 ) if( dx == 8 )
{
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY + ( 7 + ( dx ) * 18 ), 186, 151, 35 - 8, 7 ); this.drawTexturedModalRect( offsetX + 177 + 27, offsetY + ( 7 + ( dx ) * 18 ), 186, 151, 35 - 8, 7 );
}
else else
{
this.drawTexturedModalRect( offsetX + 177 + 27 + 4, offsetY + ( 7 + ( dx ) * 18 ), 186 + 4, 151, 35 - 8, 7 ); this.drawTexturedModalRect( offsetX + 177 + 27 + 4, offsetY + ( 7 + ( dx ) * 18 ), 186 + 4, 151, 35 - 8, 7 );
}
} }
else else
{ {
@@ -113,13 +117,19 @@ public class GuiCellWorkbench extends GuiUpgradeable
int dx = this.workbench.availableUpgrades() - 16; int dx = this.workbench.availableUpgrades() - 16;
this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY, 186, 0, 35 - 8, 7 + dx * 18 ); this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
if( dx == 8 ) if( dx == 8 )
{
this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY + ( 7 + ( dx ) * 18 ), 186, 151, 35 - 8, 7 ); this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY + ( 7 + ( dx ) * 18 ), 186, 151, 35 - 8, 7 );
}
else else
{
this.drawTexturedModalRect( offsetX + 177 + 27 + 18 + 4, offsetY + ( 7 + ( dx ) * 18 ), 186 + 4, 151, 35 - 8, 7 ); this.drawTexturedModalRect( offsetX + 177 + 27 + 18 + 4, offsetY + ( 7 + ( dx ) * 18 ), 186 + 4, 151, 35 - 8, 7 );
}
} }
} }
if( this.hasToolbox() ) if( this.hasToolbox() )
{
this.drawTexturedModalRect( offsetX + 178, offsetY + this.ySize - 90, 178, 161, 68, 68 ); this.drawTexturedModalRect( offsetX + 178, offsetY + this.ySize - 90, 178, 161, 68, 68 );
}
} }
@Override @Override
@@ -135,7 +145,9 @@ public class GuiCellWorkbench extends GuiUpgradeable
if( is != null && is.getItem() instanceof IUpgradeModule ) if( is != null && is.getItem() instanceof IUpgradeModule )
{ {
if( ( (IUpgradeModule) is.getItem() ).getType( is ) == Upgrades.FUZZY ) if( ( (IUpgradeModule) is.getItem() ).getType( is ) == Upgrades.FUZZY )
{
hasFuzzy = true; hasFuzzy = true;
}
} }
} }
this.fuzzyMode.setVisibility( hasFuzzy ); this.fuzzyMode.setVisibility( hasFuzzy );
@@ -186,7 +198,9 @@ public class GuiCellWorkbench extends GuiUpgradeable
NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Fuzzy", fz.name() ) ); NetworkHandler.instance.sendToServer( new PacketValueConfig( "CellWorkbench.Fuzzy", fz.name() ) );
} }
else else
{
super.actionPerformed( btn ); super.actionPerformed( btn );
}
} }
catch( IOException ignored ) catch( IOException ignored )
{ {
@@ -197,10 +197,14 @@ public class GuiCraftAmount extends AEBaseGui
} }
if( fixed ) if( fixed )
{
this.amountToCraft.setText( out ); this.amountToCraft.setText( out );
}
if( out.length() == 0 ) if( out.length() == 0 )
{
out = "0"; out = "0";
}
long result = Long.parseLong( out ); long result = Long.parseLong( out );
if( result < 0 ) if( result < 0 )
@@ -248,7 +252,9 @@ public class GuiCraftAmount extends AEBaseGui
boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000; boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
if( isPlus || isMinus ) if( isPlus || isMinus )
{
this.addQty( this.getQty( btn ) ); this.addQty( this.getQty( btn ) );
}
} }
private void addQty( int i ) private void addQty( int i )
@@ -265,19 +271,27 @@ public class GuiCraftAmount extends AEBaseGui
} }
if( fixed ) if( fixed )
{
this.amountToCraft.setText( out ); this.amountToCraft.setText( out );
}
if( out.length() == 0 ) if( out.length() == 0 )
{
out = "0"; out = "0";
}
long result = Integer.parseInt( out ); long result = Integer.parseInt( out );
if( result == 1 && i > 1 ) if( result == 1 && i > 1 )
{
result = 0; result = 0;
}
result += i; result += i;
if( result < 1 ) if( result < 1 )
{
result = 1; result = 1;
}
out = Long.toString( result ); out = Long.toString( result );
Integer.parseInt( out ); Integer.parseInt( out );
@@ -84,16 +84,24 @@ public class GuiCraftConfirm extends AEBaseGui
this.ccc = (ContainerCraftConfirm) this.inventorySlots; this.ccc = (ContainerCraftConfirm) this.inventorySlots;
if( te instanceof WirelessTerminalGuiObject ) if( te instanceof WirelessTerminalGuiObject )
{
this.OriginalGui = GuiBridge.GUI_WIRELESS_TERM; this.OriginalGui = GuiBridge.GUI_WIRELESS_TERM;
}
if( te instanceof PartTerminal ) if( te instanceof PartTerminal )
{
this.OriginalGui = GuiBridge.GUI_ME; this.OriginalGui = GuiBridge.GUI_ME;
}
if( te instanceof PartCraftingTerminal ) if( te instanceof PartCraftingTerminal )
{
this.OriginalGui = GuiBridge.GUI_CRAFTING_TERMINAL; this.OriginalGui = GuiBridge.GUI_CRAFTING_TERMINAL;
}
if( te instanceof PartPatternTerminal ) if( te instanceof PartPatternTerminal )
{
this.OriginalGui = GuiBridge.GUI_PATTERN_TERMINAL; this.OriginalGui = GuiBridge.GUI_PATTERN_TERMINAL;
}
} }
boolean isAutoStart() boolean isAutoStart()
@@ -115,7 +123,9 @@ public class GuiCraftConfirm extends AEBaseGui
this.buttonList.add( this.selectCPU ); this.buttonList.add( this.selectCPU );
if( this.OriginalGui != null ) if( this.OriginalGui != null )
{
this.cancel = new GuiButton( 0, this.guiLeft + 6, this.guiTop + this.ySize - 25, 50, 20, GuiText.Cancel.getLocal() ); this.cancel = new GuiButton( 0, this.guiLeft + 6, this.guiTop + this.ySize - 25, 50, 20, GuiText.Cancel.getLocal() );
}
this.buttonList.add( this.cancel ); this.buttonList.add( this.cancel );
} }
@@ -174,11 +184,15 @@ public class GuiCraftConfirm extends AEBaseGui
btnTextText = GuiText.CraftingCPU.getLocal() + ": " + name; btnTextText = GuiText.CraftingCPU.getLocal() + ": " + name;
} }
else else
{
btnTextText = GuiText.CraftingCPU.getLocal() + ": #" + this.ccc.selectedCpu; btnTextText = GuiText.CraftingCPU.getLocal() + ": #" + this.ccc.selectedCpu;
}
} }
if( this.ccc.noCPU ) if( this.ccc.noCPU )
{
btnTextText = GuiText.NoCraftingCPUs.getLocal(); btnTextText = GuiText.NoCraftingCPUs.getLocal();
}
this.selectCPU.displayString = btnTextText; this.selectCPU.displayString = btnTextText;
} }
@@ -199,9 +213,13 @@ public class GuiCraftConfirm extends AEBaseGui
String dsp = null; String dsp = null;
if( this.isSimulation() ) if( this.isSimulation() )
{
dsp = GuiText.Simulation.getLocal(); dsp = GuiText.Simulation.getLocal();
}
else else
{
dsp = this.ccc.cpuBytesAvail > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.cpuBytesAvail + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.cpuCoProcessors ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A"; dsp = this.ccc.cpuBytesAvail > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.cpuBytesAvail + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.cpuCoProcessors ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A";
}
int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2; int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2;
this.fontRendererObj.drawString( dsp, offset, 165, 4210752 ); this.fontRendererObj.drawString( dsp, offset, 165, 4210752 );
@@ -237,11 +255,17 @@ public class GuiCraftConfirm extends AEBaseGui
int lines = 0; int lines = 0;
if( stored != null && stored.getStackSize() > 0 ) if( stored != null && stored.getStackSize() > 0 )
{
lines++; lines++;
}
if( pendingStack != null && pendingStack.getStackSize() > 0 ) if( pendingStack != null && pendingStack.getStackSize() > 0 )
{
lines++; lines++;
}
if( pendingStack != null && pendingStack.getStackSize() > 0 ) if( pendingStack != null && pendingStack.getStackSize() > 0 )
{
lines++; lines++;
}
int negY = ( ( lines - 1 ) * 5 ) / 2; int negY = ( ( lines - 1 ) * 5 ) / 2;
int downY = 0; int downY = 0;
@@ -251,16 +275,22 @@ public class GuiCraftConfirm extends AEBaseGui
{ {
String str = Long.toString( stored.getStackSize() ); String str = Long.toString( stored.getStackSize() );
if( stored.getStackSize() >= 10000 ) if( stored.getStackSize() >= 10000 )
{
str = Long.toString( stored.getStackSize() / 1000 ) + 'k'; str = Long.toString( stored.getStackSize() / 1000 ) + 'k';
}
if( stored.getStackSize() >= 10000000 ) if( stored.getStackSize() >= 10000000 )
{
str = Long.toString( stored.getStackSize() / 1000000 ) + 'm'; str = Long.toString( stored.getStackSize() / 1000000 ) + 'm';
}
str = GuiText.FromStorage.getLocal() + ": " + str; str = GuiText.FromStorage.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str ); int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart ) if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.FromStorage.getLocal() + ": " + Long.toString( stored.getStackSize() ) ); lineList.add( GuiText.FromStorage.getLocal() + ": " + Long.toString( stored.getStackSize() ) );
}
downY += 5; downY += 5;
} }
@@ -269,16 +299,22 @@ public class GuiCraftConfirm extends AEBaseGui
{ {
String str = Long.toString( missingStack.getStackSize() ); String str = Long.toString( missingStack.getStackSize() );
if( missingStack.getStackSize() >= 10000 ) if( missingStack.getStackSize() >= 10000 )
{
str = Long.toString( missingStack.getStackSize() / 1000 ) + 'k'; str = Long.toString( missingStack.getStackSize() / 1000 ) + 'k';
}
if( missingStack.getStackSize() >= 10000000 ) if( missingStack.getStackSize() >= 10000000 )
{
str = Long.toString( missingStack.getStackSize() / 1000000 ) + 'm'; str = Long.toString( missingStack.getStackSize() / 1000000 ) + 'm';
}
str = GuiText.Missing.getLocal() + ": " + str; str = GuiText.Missing.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str ); int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart ) if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.Missing.getLocal() + ": " + Long.toString( missingStack.getStackSize() ) ); lineList.add( GuiText.Missing.getLocal() + ": " + Long.toString( missingStack.getStackSize() ) );
}
red = true; red = true;
downY += 5; downY += 5;
@@ -288,16 +324,22 @@ public class GuiCraftConfirm extends AEBaseGui
{ {
String str = Long.toString( pendingStack.getStackSize() ); String str = Long.toString( pendingStack.getStackSize() );
if( pendingStack.getStackSize() >= 10000 ) if( pendingStack.getStackSize() >= 10000 )
{
str = Long.toString( pendingStack.getStackSize() / 1000 ) + 'k'; str = Long.toString( pendingStack.getStackSize() / 1000 ) + 'k';
}
if( pendingStack.getStackSize() >= 10000000 ) if( pendingStack.getStackSize() >= 10000000 )
{
str = Long.toString( pendingStack.getStackSize() / 1000000 ) + 'm'; str = Long.toString( pendingStack.getStackSize() / 1000000 ) + 'm';
}
str = GuiText.ToCraft.getLocal() + ": " + str; str = GuiText.ToCraft.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str ); int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart ) if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.ToCraft.getLocal() + ": " + Long.toString( pendingStack.getStackSize() ) ); lineList.add( GuiText.ToCraft.getLocal() + ": " + Long.toString( pendingStack.getStackSize() ) );
}
} }
GL11.glPopMatrix(); GL11.glPopMatrix();
@@ -311,7 +353,9 @@ public class GuiCraftConfirm extends AEBaseGui
dspToolTip = Platform.getItemDisplayName( is ); dspToolTip = Platform.getItemDisplayName( is );
if( lineList.size() > 0 ) if( lineList.size() > 0 )
{
dspToolTip = dspToolTip + '\n' + Joiner.on( "\n" ).join( lineList ); dspToolTip = dspToolTip + '\n' + Joiner.on( "\n" ).join( lineList );
}
toolPosX = x * ( 1 + sectionLength ) + xo + sectionLength - 8; toolPosX = x * ( 1 + sectionLength ) + xo + sectionLength - 8;
toolPosY = y * offY + yo; toolPosY = y * offY + yo;
@@ -366,17 +410,23 @@ public class GuiCraftConfirm extends AEBaseGui
{ {
case 0: case 0:
for( IAEItemStack l : list ) for( IAEItemStack l : list )
{
this.handleInput( this.storage, l ); this.handleInput( this.storage, l );
}
break; break;
case 1: case 1:
for( IAEItemStack l : list ) for( IAEItemStack l : list )
{
this.handleInput( this.pending, l ); this.handleInput( this.pending, l );
}
break; break;
case 2: case 2:
for( IAEItemStack l : list ) for( IAEItemStack l : list )
{
this.handleInput( this.missing, l ); this.handleInput( this.missing, l );
}
break; break;
} }
@@ -385,7 +435,9 @@ public class GuiCraftConfirm extends AEBaseGui
long amt = this.getTotal( l ); long amt = this.getTotal( l );
if( amt <= 0 ) if( amt <= 0 )
{
this.deleteVisualStack( l ); this.deleteVisualStack( l );
}
else else
{ {
IAEItemStack is = this.findVisualStack( l ); IAEItemStack is = this.findVisualStack( l );
@@ -403,7 +455,9 @@ public class GuiCraftConfirm extends AEBaseGui
if( l.getStackSize() <= 0 ) if( l.getStackSize() <= 0 )
{ {
if( a != null ) if( a != null )
{
a.reset(); a.reset();
}
} }
else else
{ {
@@ -414,7 +468,9 @@ public class GuiCraftConfirm extends AEBaseGui
} }
if( a != null ) if( a != null )
{
a.setStackSize( l.getStackSize() ); a.setStackSize( l.getStackSize() );
}
} }
} }
@@ -427,13 +483,19 @@ public class GuiCraftConfirm extends AEBaseGui
long total = 0; long total = 0;
if( a != null ) if( a != null )
{
total += a.getStackSize(); total += a.getStackSize();
}
if( c != null ) if( c != null )
{
total += c.getStackSize(); total += c.getStackSize();
}
if( m != null ) if( m != null )
{
total += m.getStackSize(); total += m.getStackSize();
}
return total; return total;
} }
@@ -228,16 +228,22 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{ {
String str = Long.toString( stored.getStackSize() ); String str = Long.toString( stored.getStackSize() );
if( stored.getStackSize() >= 10000 ) if( stored.getStackSize() >= 10000 )
{
str = Long.toString( stored.getStackSize() / 1000 ) + 'k'; str = Long.toString( stored.getStackSize() / 1000 ) + 'k';
}
if( stored.getStackSize() >= 10000000 ) if( stored.getStackSize() >= 10000000 )
{
str = Long.toString( stored.getStackSize() / 1000000 ) + 'm'; str = Long.toString( stored.getStackSize() / 1000000 ) + 'm';
}
str = GuiText.Stored.getLocal() + ": " + str; str = GuiText.Stored.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str ); int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart ) if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.Stored.getLocal() + ": " + Long.toString( stored.getStackSize() ) ); lineList.add( GuiText.Stored.getLocal() + ": " + Long.toString( stored.getStackSize() ) );
}
downY += 5; downY += 5;
} }
@@ -246,16 +252,22 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{ {
String str = Long.toString( activeStack.getStackSize() ); String str = Long.toString( activeStack.getStackSize() );
if( activeStack.getStackSize() >= 10000 ) if( activeStack.getStackSize() >= 10000 )
{
str = Long.toString( activeStack.getStackSize() / 1000 ) + 'k'; str = Long.toString( activeStack.getStackSize() / 1000 ) + 'k';
}
if( activeStack.getStackSize() >= 10000000 ) if( activeStack.getStackSize() >= 10000000 )
{
str = Long.toString( activeStack.getStackSize() / 1000000 ) + 'm'; str = Long.toString( activeStack.getStackSize() / 1000000 ) + 'm';
}
str = GuiText.Crafting.getLocal() + ": " + str; str = GuiText.Crafting.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str ); int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart ) if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.Crafting.getLocal() + ": " + Long.toString( activeStack.getStackSize() ) ); lineList.add( GuiText.Crafting.getLocal() + ": " + Long.toString( activeStack.getStackSize() ) );
}
downY += 5; downY += 5;
} }
@@ -264,16 +276,22 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{ {
String str = Long.toString( pendingStack.getStackSize() ); String str = Long.toString( pendingStack.getStackSize() );
if( pendingStack.getStackSize() >= 10000 ) if( pendingStack.getStackSize() >= 10000 )
{
str = Long.toString( pendingStack.getStackSize() / 1000 ) + 'k'; str = Long.toString( pendingStack.getStackSize() / 1000 ) + 'k';
}
if( pendingStack.getStackSize() >= 10000000 ) if( pendingStack.getStackSize() >= 10000000 )
{
str = Long.toString( pendingStack.getStackSize() / 1000000 ) + 'm'; str = Long.toString( pendingStack.getStackSize() / 1000000 ) + 'm';
}
str = GuiText.Scheduled.getLocal() + ": " + str; str = GuiText.Scheduled.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str ); int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 ); this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart ) if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.Scheduled.getLocal() + ": " + Long.toString( pendingStack.getStackSize() ) ); lineList.add( GuiText.Scheduled.getLocal() + ": " + Long.toString( pendingStack.getStackSize() ) );
}
} }
GL11.glPopMatrix(); GL11.glPopMatrix();
@@ -287,7 +305,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
dspToolTip = Platform.getItemDisplayName( is ); dspToolTip = Platform.getItemDisplayName( is );
if( lineList.size() > 0 ) if( lineList.size() > 0 )
{
dspToolTip = dspToolTip + '\n' + Joiner.on( "\n" ).join( lineList ); dspToolTip = dspToolTip + '\n' + Joiner.on( "\n" ).join( lineList );
}
toolPosX = x * ( 1 + sectionLength ) + xo + sectionLength - 8; toolPosX = x * ( 1 + sectionLength ) + xo + sectionLength - 8;
toolPosY = y * offY + yo; toolPosY = y * offY + yo;
@@ -326,17 +346,23 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{ {
case 0: case 0:
for( IAEItemStack l : list ) for( IAEItemStack l : list )
{
this.handleInput( this.storage, l ); this.handleInput( this.storage, l );
}
break; break;
case 1: case 1:
for( IAEItemStack l : list ) for( IAEItemStack l : list )
{
this.handleInput( this.active, l ); this.handleInput( this.active, l );
}
break; break;
case 2: case 2:
for( IAEItemStack l : list ) for( IAEItemStack l : list )
{
this.handleInput( this.pending, l ); this.handleInput( this.pending, l );
}
break; break;
} }
@@ -345,7 +371,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
long amt = this.getTotal( l ); long amt = this.getTotal( l );
if( amt <= 0 ) if( amt <= 0 )
{
this.deleteVisualStack( l ); this.deleteVisualStack( l );
}
else else
{ {
IAEItemStack is = this.findVisualStack( l ); IAEItemStack is = this.findVisualStack( l );
@@ -363,7 +391,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
if( l.getStackSize() <= 0 ) if( l.getStackSize() <= 0 )
{ {
if( a != null ) if( a != null )
{
a.reset(); a.reset();
}
} }
else else
{ {
@@ -374,7 +404,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
} }
if( a != null ) if( a != null )
{
a.setStackSize( l.getStackSize() ); a.setStackSize( l.getStackSize() );
}
} }
} }
@@ -387,13 +419,19 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
long total = 0; long total = 0;
if( a != null ) if( a != null )
{
total += a.getStackSize(); total += a.getStackSize();
}
if( b != null ) if( b != null )
{
total += b.getStackSize(); total += b.getStackSize();
}
if( c != null ) if( c != null )
{
total += c.getStackSize(); total += c.getStackSize();
}
return total; return total;
} }
@@ -166,11 +166,15 @@ public class GuiCraftingStatus extends GuiCraftingCPU
btnTextText = GuiText.CPUs.getLocal() + ": " + name; btnTextText = GuiText.CPUs.getLocal() + ": " + name;
} }
else else
{
btnTextText = GuiText.CPUs.getLocal() + ": #" + this.status.selectedCpu; btnTextText = GuiText.CPUs.getLocal() + ": #" + this.status.selectedCpu;
}
} }
if( this.status.noCPU ) if( this.status.noCPU )
{
btnTextText = GuiText.NoCraftingJobs.getLocal(); btnTextText = GuiText.NoCraftingJobs.getLocal();
}
this.selectCPU.displayString = btnTextText; this.selectCPU.displayString = btnTextText;
} }
@@ -59,7 +59,9 @@ public class GuiCraftingTerm extends GuiMEMonitorable
for( Object j : c.inventorySlots ) for( Object j : c.inventorySlots )
{ {
if( j instanceof SlotCraftingMatrix ) if( j instanceof SlotCraftingMatrix )
{
s = (Slot) j; s = (Slot) j;
}
} }
if( s != null ) if( s != null )
@@ -69,10 +69,14 @@ public class GuiFormationPlane extends GuiUpgradeable
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.fuzzyMode != null ) if( this.fuzzyMode != null )
{
this.fuzzyMode.set( this.cvb.fzMode ); this.fuzzyMode.set( this.cvb.fzMode );
}
if( this.placeMode != null ) if( this.placeMode != null )
{
this.placeMode.set( ( (ContainerFormationPlane) this.cvb ).placeMode ); this.placeMode.set( ( (ContainerFormationPlane) this.cvb ).placeMode );
}
} }
@Override @Override
@@ -70,13 +70,19 @@ public class GuiIOPort extends GuiUpgradeable
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.redstoneMode != null ) if( this.redstoneMode != null )
{
this.redstoneMode.set( this.cvb.rsMode ); this.redstoneMode.set( this.cvb.rsMode );
}
if( this.operationMode != null ) if( this.operationMode != null )
{
this.operationMode.set( ( (ContainerIOPort) this.cvb ).opMode ); this.operationMode.set( ( (ContainerIOPort) this.cvb ).opMode );
}
if( this.fullMode != null ) if( this.fullMode != null )
{
this.fullMode.set( ( (ContainerIOPort) this.cvb ).fMode ); this.fullMode.set( ( (ContainerIOPort) this.cvb ).fMode );
}
} }
@Override @Override
@@ -111,9 +117,13 @@ public class GuiIOPort extends GuiUpgradeable
boolean backwards = Mouse.isButtonDown( 1 ); boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.fullMode ) if( btn == this.fullMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.fullMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.fullMode.getSetting(), backwards ) );
}
if( btn == this.operationMode ) if( btn == this.operationMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.operationMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.operationMode.getSetting(), backwards ) );
}
} }
} }
@@ -77,9 +77,13 @@ public class GuiInscriber extends AEBaseGui
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, this.ySize ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, this.ySize );
if( this.drawUpgrades() ) if( this.drawUpgrades() )
{
this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 14 + this.cvc.availableUpgrades() * 18 ); this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 14 + this.cvc.availableUpgrades() * 18 );
}
if( this.hasToolbox() ) if( this.hasToolbox() )
{
this.drawTexturedModalRect( offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68 ); this.drawTexturedModalRect( offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68 );
}
} }
protected boolean drawUpgrades() protected boolean drawUpgrades()
@@ -68,10 +68,14 @@ public class GuiInterface extends GuiUpgradeable
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY ) public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
{ {
if( this.BlockMode != null ) if( this.BlockMode != null )
{
this.BlockMode.set( ( (ContainerInterface) this.cvb ).bMode ); this.BlockMode.set( ( (ContainerInterface) this.cvb ).bMode );
}
if( this.interfaceMode != null ) if( this.interfaceMode != null )
{
this.interfaceMode.setState( ( (ContainerInterface) this.cvb ).iTermMode == YesNo.YES ); this.interfaceMode.setState( ( (ContainerInterface) this.cvb ).iTermMode == YesNo.YES );
}
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Interface.getLocal() ), 8, 6, 4210752 ); this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Interface.getLocal() ), 8, 6, 4210752 );
@@ -101,9 +105,13 @@ public class GuiInterface extends GuiUpgradeable
} }
if( btn == this.interfaceMode ) if( btn == this.interfaceMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( Settings.INTERFACE_TERMINAL, backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( Settings.INTERFACE_TERMINAL, backwards ) );
}
if( btn == this.BlockMode ) if( btn == this.BlockMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.BlockMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.BlockMode.getSetting(), backwards ) );
}
} }
} }
@@ -105,7 +105,9 @@ public class GuiInterfaceTerminal extends AEBaseGui
while( o.hasNext() ) while( o.hasNext() )
{ {
if( o.next() instanceof SlotDisconnected ) if( o.next() instanceof SlotDisconnected )
{
o.remove(); o.remove();
}
} }
for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ ) for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
@@ -124,10 +126,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
String name = (String) lineObj; String name = (String) lineObj;
int rows = this.byName.get( name ).size(); int rows = this.byName.get( name ).size();
if( rows > 1 ) if( rows > 1 )
{
name = name + " (" + rows + ')'; name = name + " (" + rows + ')';
}
while( name.length() > 2 && this.fontRendererObj.getStringWidth( name ) > 155 ) while( name.length() > 2 && this.fontRendererObj.getStringWidth( name ) > 155 )
{
name = name.substring( 0, name.length() - 1 ); name = name.substring( 0, name.length() - 1 );
}
this.fontRendererObj.drawString( name, 10, 6 + offset, 4210752 ); this.fontRendererObj.drawString( name, 10, 6 + offset, 4210752 );
} }
@@ -173,7 +179,9 @@ public class GuiInterfaceTerminal extends AEBaseGui
} }
if( this.searchField != null ) if( this.searchField != null )
{
this.searchField.drawTextBox(); this.searchField.drawTextBox();
}
} }
@Override @Override
@@ -182,7 +190,9 @@ public class GuiInterfaceTerminal extends AEBaseGui
if( !this.checkHotbarKeys( key ) ) if( !this.checkHotbarKeys( key ) )
{ {
if( character == ' ' && this.searchField.getText().length() == 0 ) if( character == ' ' && this.searchField.getText().length() == 0 )
{
return; return;
}
if( this.searchField.textboxKeyTyped( character, key ) ) if( this.searchField.textboxKeyTyped( character, key ) )
{ {
@@ -218,7 +228,9 @@ public class GuiInterfaceTerminal extends AEBaseGui
{ {
String which = Integer.toString( x ); String which = Integer.toString( x );
if( invData.hasKey( which ) ) if( invData.hasKey( which ) )
{
current.inv.setInventorySlotContents( x, ItemStack.loadItemStackFromNBT( invData.getCompoundTag( which ) ) ); current.inv.setInventorySlotContents( x, ItemStack.loadItemStackFromNBT( invData.getCompoundTag( which ) ) );
}
} }
} }
catch( NumberFormatException ignored ) catch( NumberFormatException ignored )
@@ -130,10 +130,14 @@ public class GuiLevelEmitter extends GuiUpgradeable
super.drawFG( offsetX, offsetY, mouseX, mouseY ); super.drawFG( offsetX, offsetY, mouseX, mouseY );
if( this.craftingMode != null ) if( this.craftingMode != null )
{
this.craftingMode.set( ( (ContainerLevelEmitter) this.cvb ).cmType ); this.craftingMode.set( ( (ContainerLevelEmitter) this.cvb ).cmType );
}
if( this.levelMode != null ) if( this.levelMode != null )
{
this.levelMode.set( ( (ContainerLevelEmitter) this.cvb ).lvType ); this.levelMode.set( ( (ContainerLevelEmitter) this.cvb ).lvType );
}
} }
@Override @Override
@@ -170,16 +174,22 @@ public class GuiLevelEmitter extends GuiUpgradeable
boolean backwards = Mouse.isButtonDown( 1 ); boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.craftingMode ) if( btn == this.craftingMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.craftingMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.craftingMode.getSetting(), backwards ) );
}
if( btn == this.levelMode ) if( btn == this.levelMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.levelMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.levelMode.getSetting(), backwards ) );
}
boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000; boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000; boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
if( isPlus || isMinus ) if( isPlus || isMinus )
{
this.addQty( this.getQty( btn ) ); this.addQty( this.getQty( btn ) );
}
} }
private void addQty( long i ) private void addQty( long i )
@@ -196,15 +206,21 @@ public class GuiLevelEmitter extends GuiUpgradeable
} }
if( Fixed ) if( Fixed )
{
this.level.setText( Out ); this.level.setText( Out );
}
if( Out.length() == 0 ) if( Out.length() == 0 )
{
Out = "0"; Out = "0";
}
long result = Long.parseLong( Out ); long result = Long.parseLong( Out );
result += i; result += i;
if( result < 0 ) if( result < 0 )
{
result = 0; result = 0;
}
this.level.setText( Out = Long.toString( result ) ); this.level.setText( Out = Long.toString( result ) );
@@ -240,10 +256,14 @@ public class GuiLevelEmitter extends GuiUpgradeable
} }
if( Fixed ) if( Fixed )
{
this.level.setText( Out ); this.level.setText( Out );
}
if( Out.length() == 0 ) if( Out.length() == 0 )
{
Out = "0"; Out = "0";
}
NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) ); NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) );
} }
@@ -111,7 +111,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.ySize = 204; this.ySize = 204;
if( te instanceof IViewCellStorage ) if( te instanceof IViewCellStorage )
{
this.xSize += 33; this.xSize += 33;
}
this.standardSize = this.xSize; this.standardSize = this.xSize;
@@ -121,21 +123,33 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.viewCell = te instanceof IViewCellStorage; this.viewCell = te instanceof IViewCellStorage;
if( te instanceof TileSecurity ) if( te instanceof TileSecurity )
{
this.myName = GuiText.Security; this.myName = GuiText.Security;
}
else if( te instanceof WirelessTerminalGuiObject ) else if( te instanceof WirelessTerminalGuiObject )
{
this.myName = GuiText.WirelessTerminal; this.myName = GuiText.WirelessTerminal;
}
else if( te instanceof IPortableCell ) else if( te instanceof IPortableCell )
{
this.myName = GuiText.PortableCell; this.myName = GuiText.PortableCell;
}
else if( te instanceof IMEChest ) else if( te instanceof IMEChest )
{
this.myName = GuiText.Chest; this.myName = GuiText.Chest;
}
else if( te instanceof PartTerminal ) else if( te instanceof PartTerminal )
{
this.myName = GuiText.Terminal; this.myName = GuiText.Terminal;
}
} }
public void postUpdate( List<IAEItemStack> list ) public void postUpdate( List<IAEItemStack> list )
{ {
for( IAEItemStack is : list ) for( IAEItemStack is : list )
{
this.repo.postUpdate( is ); this.repo.postUpdate( is );
}
this.repo.updateView(); this.repo.updateView();
this.setScrollBar(); this.setScrollBar();
@@ -166,9 +180,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
Enum next = Platform.rotateEnum( cv, backwards, iBtn.getSetting().getPossibleValues() ); Enum next = Platform.rotateEnum( cv, backwards, iBtn.getSetting().getPossibleValues() );
if( btn == this.terminalStyleBox ) if( btn == this.terminalStyleBox )
{
AEConfig.instance.settings.putSetting( iBtn.getSetting(), next ); AEConfig.instance.settings.putSetting( iBtn.getSetting(), next );
}
else if( btn == this.searchBoxSettings ) else if( btn == this.searchBoxSettings )
{
AEConfig.instance.settings.putSetting( iBtn.getSetting(), next ); AEConfig.instance.settings.putSetting( iBtn.getSetting(), next );
}
else else
{ {
try try
@@ -184,7 +202,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
iBtn.set( next ); iBtn.set( next );
if( next.getClass() == SearchBoxMode.class || next.getClass() == TerminalStyle.class ) if( next.getClass() == SearchBoxMode.class || next.getClass() == TerminalStyle.class )
{
this.re_init(); this.re_init();
}
} }
} }
} }
@@ -217,10 +237,14 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
} }
if( hasNEI ) if( hasNEI )
{
this.rows--; this.rows--;
}
if( this.rows < 3 ) if( this.rows < 3 )
{
this.rows = 3; this.rows = 3;
}
this.meSlots.clear(); this.meSlots.clear();
for( int y = 0; y < this.rows; y++ ) for( int y = 0; y < this.rows; y++ )
@@ -232,9 +256,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
} }
if( AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ) if( AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL )
{
this.xSize = this.standardSize + ( ( this.perRow - 9 ) * 18 ); this.xSize = this.standardSize + ( ( this.perRow - 9 ) * 18 );
}
else else
{
this.xSize = this.standardSize; this.xSize = this.standardSize;
}
super.initGui(); super.initGui();
// full size : 204 // full size : 204
@@ -303,7 +331,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
if( s instanceof AppEngSlot ) if( s instanceof AppEngSlot )
{ {
if( ( (AppEngSlot) s ).xDisplayPosition < 197 ) if( ( (AppEngSlot) s ).xDisplayPosition < 197 )
{
this.repositionSlot( (AppEngSlot) s ); this.repositionSlot( (AppEngSlot) s );
}
} }
if( s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix ) if( s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix )
@@ -365,10 +395,14 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 );
if( this.viewCell || ( this instanceof GuiSecurity ) ) if( this.viewCell || ( this instanceof GuiSecurity ) )
{
this.drawTexturedModalRect( offsetX + x_width, offsetY, x_width, 0, 46, 128 ); this.drawTexturedModalRect( offsetX + x_width, offsetY, x_width, 0, 46, 128 );
}
for( int x = 0; x < this.rows; x++ ) for( int x = 0; x < this.rows; x++ )
{
this.drawTexturedModalRect( offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18 ); this.drawTexturedModalRect( offsetX, offsetY + 18 + x * 18, 0, 18, x_width, 18 );
}
this.drawTexturedModalRect( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, 99 + this.reservedSpace - this.lowerTextureOffset ); this.drawTexturedModalRect( offsetX, offsetY + 16 + this.rows * 18 + this.lowerTextureOffset, 0, 106 - 18 - 18, x_width, 99 + this.reservedSpace - this.lowerTextureOffset );
@@ -386,11 +420,15 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
} }
if( update ) if( update )
{
this.repo.setViewCell( this.myCurrentViewCells ); this.repo.setViewCell( this.myCurrentViewCells );
}
} }
if( this.searchField != null ) if( this.searchField != null )
{
this.searchField.drawTextBox(); this.searchField.drawTextBox();
}
} }
protected String getBackground() protected String getBackground()
@@ -420,7 +458,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
if( !this.checkHotbarKeys( key ) ) if( !this.checkHotbarKeys( key ) )
{ {
if( character == ' ' && this.searchField.getText().length() == 0 ) if( character == ' ' && this.searchField.getText().length() == 0 )
{
return; return;
}
if( this.searchField.textboxKeyTyped( character, key ) ) if( this.searchField.textboxKeyTyped( character, key ) )
{ {
@@ -464,13 +504,19 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue ) public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
{ {
if( this.SortByBox != null ) if( this.SortByBox != null )
{
this.SortByBox.set( this.configSrc.getSetting( Settings.SORT_BY ) ); this.SortByBox.set( this.configSrc.getSetting( Settings.SORT_BY ) );
}
if( this.SortDirBox != null ) if( this.SortDirBox != null )
{
this.SortDirBox.set( this.configSrc.getSetting( Settings.SORT_DIRECTION ) ); this.SortDirBox.set( this.configSrc.getSetting( Settings.SORT_DIRECTION ) );
}
if( this.ViewBox != null ) if( this.ViewBox != null )
{
this.ViewBox.set( this.configSrc.getSetting( Settings.VIEW_MODE ) ); this.ViewBox.set( this.configSrc.getSetting( Settings.VIEW_MODE ) );
}
this.repo.updateView(); this.repo.updateView();
} }
@@ -161,7 +161,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
String str = Long.toString( refStack.getStackSize() ); String str = Long.toString( refStack.getStackSize() );
if( refStack.getStackSize() >= 10000 ) if( refStack.getStackSize() >= 10000 )
{
str = Long.toString( refStack.getStackSize() / 1000 ) + 'k'; str = Long.toString( refStack.getStackSize() / 1000 ) + 'k';
}
int w = this.fontRendererObj.getStringWidth( str ); int w = this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * sectionLength + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * 18 + yo + 6 ) * 2, 4210752 ); this.fontRendererObj.drawString( str, (int) ( ( x * sectionLength + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * 18 + yo + 6 ) * 2, 4210752 );
@@ -176,7 +178,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
toolTip += ( '\n' + GuiText.Installed.getLocal() + ": " + ( refStack.getStackSize() ) ); toolTip += ( '\n' + GuiText.Installed.getLocal() + ": " + ( refStack.getStackSize() ) );
if( refStack.getCountRequestable() > 0 ) if( refStack.getCountRequestable() > 0 )
{
toolTip += ( '\n' + GuiText.EnergyDrain.getLocal() + ": " + Platform.formatPowerLong( refStack.getCountRequestable(), true ) ); toolTip += ( '\n' + GuiText.EnergyDrain.getLocal() + ": " + Platform.formatPowerLong( refStack.getCountRequestable(), true ) );
}
toolPosX = x * sectionLength + xo + sectionLength - 8; toolPosX = x * sectionLength + xo + sectionLength - 8;
toolPosY = y * 18 + yo; toolPosY = y * 18 + yo;
@@ -214,7 +218,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
this.repo.clear(); this.repo.clear();
for( IAEItemStack is : list ) for( IAEItemStack is : list )
{
this.repo.postUpdate( is ); this.repo.postUpdate( is );
}
this.repo.updateView(); this.repo.updateView();
this.setScrollBar(); this.setScrollBar();
@@ -249,7 +255,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
if( myStack != null ) if( myStack != null )
{ {
while( currentToolTip.size() > 1 ) while( currentToolTip.size() > 1 )
{
currentToolTip.remove( 1 ); currentToolTip.remove( 1 );
}
} }
} }
} }
@@ -278,7 +286,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
List currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips ); List currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
while( currentToolTip.size() > 1 ) while( currentToolTip.size() > 1 )
{
currentToolTip.remove( 1 ); currentToolTip.remove( 1 );
}
currentToolTip.add( GuiText.Installed.getLocal() + ": " + ( myStack.getStackSize() ) ); currentToolTip.add( GuiText.Installed.getLocal() + ": " + ( myStack.getStackSize() ) );
currentToolTip.add( GuiText.EnergyDrain.getLocal() + ": " + Platform.formatPowerLong( myStack.getCountRequestable(), true ) ); currentToolTip.add( GuiText.EnergyDrain.getLocal() + ": " + Platform.formatPowerLong( myStack.getCountRequestable(), true ) );
@@ -53,7 +53,9 @@ public class GuiNetworkTool extends AEBaseGui
try try
{ {
if( btn == this.tFacades ) if( btn == this.tFacades )
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "NetworkTool", "Toggle" ) ); NetworkHandler.instance.sendToServer( new PacketValueConfig( "NetworkTool", "Toggle" ) );
}
} }
catch( IOException e ) catch( IOException e )
{ {
@@ -75,7 +77,9 @@ public class GuiNetworkTool extends AEBaseGui
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY ) public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
{ {
if( this.tFacades != null ) if( this.tFacades != null )
{
this.tFacades.setState( ( (ContainerNetworkTool) this.inventorySlots ).facadeMode ); this.tFacades.setState( ( (ContainerNetworkTool) this.inventorySlots ).facadeMode );
}
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.NetworkTool.getLocal() ), 8, 6, 4210752 ); this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.NetworkTool.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -130,7 +130,9 @@ public class GuiPatternTerm extends GuiMEMonitorable
protected String getBackground() protected String getBackground()
{ {
if( this.container.craftingMode ) if( this.container.craftingMode )
{
return "guis/pattern.png"; return "guis/pattern.png";
}
return "guis/pattern2.png"; return "guis/pattern2.png";
} }
@@ -138,8 +140,12 @@ public class GuiPatternTerm extends GuiMEMonitorable
protected void repositionSlot( AppEngSlot s ) protected void repositionSlot( AppEngSlot s )
{ {
if( s.isPlayerSide() ) if( s.isPlayerSide() )
{
s.yDisplayPosition = s.defY + this.ySize - 78 - 5; s.yDisplayPosition = s.defY + this.ySize - 78 - 5;
}
else else
{
s.yDisplayPosition = s.defY + this.ySize - 78 - 3; s.yDisplayPosition = s.defY + this.ySize - 78 - 3;
}
} }
} }
@@ -156,7 +156,9 @@ public class GuiPriority extends AEBaseGui
} }
if( this.OriginalGui != null && myIcon != null ) if( this.OriginalGui != null && myIcon != null )
{
this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) ); this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), itemRender ) );
}
this.priority = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Long.class ); this.priority = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Long.class );
this.priority.setEnableBackgroundDrawing( false ); this.priority.setEnableBackgroundDrawing( false );
@@ -196,7 +198,9 @@ public class GuiPriority extends AEBaseGui
boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000; boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
if( isPlus || isMinus ) if( isPlus || isMinus )
{
this.addQty( this.getQty( btn ) ); this.addQty( this.getQty( btn ) );
}
} }
private void addQty( int i ) private void addQty( int i )
@@ -213,10 +217,14 @@ public class GuiPriority extends AEBaseGui
} }
if( fixed ) if( fixed )
{
this.priority.setText( out ); this.priority.setText( out );
}
if( out.length() == 0 ) if( out.length() == 0 )
{
out = "0"; out = "0";
}
long result = Long.parseLong( out ); long result = Long.parseLong( out );
result += i; result += i;
@@ -255,10 +263,14 @@ public class GuiPriority extends AEBaseGui
} }
if( fixed ) if( fixed )
{
this.priority.setText( out ); this.priority.setText( out );
}
if( out.length() == 0 ) if( out.length() == 0 )
{
out = "0"; out = "0";
}
NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) ); NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) );
} }
@@ -62,15 +62,25 @@ public class GuiSecurity extends GuiMEMonitorable
SecurityPermissions toggleSetting = null; SecurityPermissions toggleSetting = null;
if( btn == this.inject ) if( btn == this.inject )
{
toggleSetting = SecurityPermissions.INJECT; toggleSetting = SecurityPermissions.INJECT;
}
if( btn == this.extract ) if( btn == this.extract )
{
toggleSetting = SecurityPermissions.EXTRACT; toggleSetting = SecurityPermissions.EXTRACT;
}
if( btn == this.craft ) if( btn == this.craft )
{
toggleSetting = SecurityPermissions.CRAFT; toggleSetting = SecurityPermissions.CRAFT;
}
if( btn == this.build ) if( btn == this.build )
{
toggleSetting = SecurityPermissions.BUILD; toggleSetting = SecurityPermissions.BUILD;
}
if( btn == this.security ) if( btn == this.security )
{
toggleSetting = SecurityPermissions.SECURITY; toggleSetting = SecurityPermissions.SECURITY;
}
if( toggleSetting != null ) if( toggleSetting != null )
{ {
@@ -84,13 +84,19 @@ public class GuiStorageBus extends GuiUpgradeable
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.fuzzyMode != null ) if( this.fuzzyMode != null )
{
this.fuzzyMode.set( this.cvb.fzMode ); this.fuzzyMode.set( this.cvb.fzMode );
}
if( this.storageFilter != null ) if( this.storageFilter != null )
{
this.storageFilter.set( ( (ContainerStorageBus) this.cvb ).storageFilter ); this.storageFilter.set( ( (ContainerStorageBus) this.cvb ).storageFilter );
}
if( this.rwMode != null ) if( this.rwMode != null )
{
this.rwMode.set( ( (ContainerStorageBus) this.cvb ).rwMode ); this.rwMode.set( ( (ContainerStorageBus) this.cvb ).rwMode );
}
} }
@Override @Override
@@ -109,19 +115,25 @@ public class GuiStorageBus extends GuiUpgradeable
try try
{ {
if( btn == this.partition ) if( btn == this.partition )
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "StorageBus.Action", "Partition" ) ); NetworkHandler.instance.sendToServer( new PacketValueConfig( "StorageBus.Action", "Partition" ) );
}
else if( btn == this.clear ) else if( btn == this.clear )
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "StorageBus.Action", "Clear" ) ); NetworkHandler.instance.sendToServer( new PacketValueConfig( "StorageBus.Action", "Clear" ) );
}
else if( btn == this.priority ) else if( btn == this.priority )
{
NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); NetworkHandler.instance.sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) );
}
else if( btn == this.rwMode ) else if( btn == this.rwMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.rwMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.rwMode.getSetting(), backwards ) );
}
else if( btn == this.storageFilter ) else if( btn == this.storageFilter )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.storageFilter.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.storageFilter.getSetting(), backwards ) );
}
} }
catch( IOException e ) catch( IOException e )
{ {
@@ -94,13 +94,19 @@ public class GuiUpgradeable extends AEBaseGui
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 ); this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.redstoneMode != null ) if( this.redstoneMode != null )
{
this.redstoneMode.set( this.cvb.rsMode ); this.redstoneMode.set( this.cvb.rsMode );
}
if( this.fuzzyMode != null ) if( this.fuzzyMode != null )
{
this.fuzzyMode.set( this.cvb.fzMode ); this.fuzzyMode.set( this.cvb.fzMode );
}
if( this.craftMode != null ) if( this.craftMode != null )
{
this.craftMode.set( this.cvb.cMode ); this.craftMode.set( this.cvb.cMode );
}
} }
@Override @Override
@@ -111,19 +117,29 @@ public class GuiUpgradeable extends AEBaseGui
this.bindTexture( this.getBackground() ); this.bindTexture( this.getBackground() );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, this.ySize ); this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, this.ySize );
if( this.drawUpgrades() ) if( this.drawUpgrades() )
{
this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 14 + this.cvb.availableUpgrades() * 18 ); this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 14 + this.cvb.availableUpgrades() * 18 );
}
if( this.hasToolbox() ) if( this.hasToolbox() )
{
this.drawTexturedModalRect( offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68 ); this.drawTexturedModalRect( offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68 );
}
} }
protected void handleButtonVisibility() protected void handleButtonVisibility()
{ {
if( this.redstoneMode != null ) if( this.redstoneMode != null )
{
this.redstoneMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.REDSTONE ) > 0 ); this.redstoneMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.REDSTONE ) > 0 );
}
if( this.fuzzyMode != null ) if( this.fuzzyMode != null )
{
this.fuzzyMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.FUZZY ) > 0 ); this.fuzzyMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.FUZZY ) > 0 );
}
if( this.craftMode != null ) if( this.craftMode != null )
{
this.craftMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 ); this.craftMode.setVisibility( this.bc.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 );
}
} }
protected String getBackground() protected String getBackground()
@@ -149,12 +165,18 @@ public class GuiUpgradeable extends AEBaseGui
boolean backwards = Mouse.isButtonDown( 1 ); boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.redstoneMode ) if( btn == this.redstoneMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.redstoneMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.redstoneMode.getSetting(), backwards ) );
}
if( btn == this.craftMode ) if( btn == this.craftMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.craftMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.craftMode.getSetting(), backwards ) );
}
if( btn == this.fuzzyMode ) if( btn == this.fuzzyMode )
{
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.fuzzyMode.getSetting(), backwards ) ); NetworkHandler.instance.sendToServer( new PacketConfigButton( this.fuzzyMode.getSetting(), backwards ) );
}
} }
} }
@@ -193,9 +193,13 @@ public class GuiImgButton extends GuiButton implements ITooltip
GL11.glScalef( 0.5f, 0.5f, 0.5f ); GL11.glScalef( 0.5f, 0.5f, 0.5f );
if( this.enabled ) if( this.enabled )
{
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
}
else else
{
GL11.glColor4f( 0.5f, 0.5f, 0.5f, 1.0f ); GL11.glColor4f( 0.5f, 0.5f, 0.5f, 1.0f );
}
par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) ); par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
@@ -212,9 +216,13 @@ public class GuiImgButton extends GuiButton implements ITooltip
else else
{ {
if( this.enabled ) if( this.enabled )
{
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
}
else else
{
GL11.glColor4f( 0.5f, 0.5f, 0.5f, 1.0f ); GL11.glColor4f( 0.5f, 0.5f, 0.5f, 1.0f );
}
par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) ); par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
@@ -236,7 +244,9 @@ public class GuiImgButton extends GuiButton implements ITooltip
{ {
ButtonAppearance app = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) ); ButtonAppearance app = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) );
if( app == null ) if( app == null )
{
return 256 - 1; return 256 - 1;
}
return app.index; return app.index;
} }
return 256 - 1; return 256 - 1;
@@ -262,7 +272,9 @@ public class GuiImgButton extends GuiButton implements ITooltip
{ {
ButtonAppearance buttonAppearance = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) ); ButtonAppearance buttonAppearance = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) );
if( buttonAppearance == null ) if( buttonAppearance == null )
{
return "No Such Message"; return "No Such Message";
}
displayName = buttonAppearance.displayName; displayName = buttonAppearance.displayName;
displayValue = buttonAppearance.displayValue; displayValue = buttonAppearance.displayValue;
@@ -274,19 +286,27 @@ public class GuiImgButton extends GuiButton implements ITooltip
String value = StatCollector.translateToLocal( displayValue ); String value = StatCollector.translateToLocal( displayValue );
if( name == null || name.isEmpty() ) if( name == null || name.isEmpty() )
{
name = displayName; name = displayName;
}
if( value == null || value.isEmpty() ) if( value == null || value.isEmpty() )
{
value = displayValue; value = displayValue;
}
if( this.fillVar != null ) if( this.fillVar != null )
{
value = COMPILE.matcher( value ).replaceFirst( this.fillVar ); value = COMPILE.matcher( value ).replaceFirst( this.fillVar );
}
value = PATTERN_NEW_LINE.matcher( value ).replaceAll( "\n" ); value = PATTERN_NEW_LINE.matcher( value ).replaceAll( "\n" );
StringBuilder sb = new StringBuilder( value ); StringBuilder sb = new StringBuilder( value );
int i = sb.lastIndexOf( "\n" ); int i = sb.lastIndexOf( "\n" );
if( i <= 0 ) if( i <= 0 )
{
i = 0; i = 0;
}
while( i + 30 < sb.length() && ( i = sb.lastIndexOf( " ", i + 30 ) ) != -1 ) while( i + 30 < sb.length() && ( i = sb.lastIndexOf( " ", i + 30 ) ) != -1 )
{ {
sb.replace( i, i + 1, "\n" ); sb.replace( i, i + 1, "\n" );
@@ -357,9 +377,13 @@ public class GuiImgButton extends GuiButton implements ITooltip
public boolean equals( Object obj ) public boolean equals( Object obj )
{ {
if( obj == null ) if( obj == null )
{
return false; return false;
}
if( this.getClass() != obj.getClass() ) if( this.getClass() != obj.getClass() )
{
return false; return false;
}
EnumPair other = (EnumPair) obj; EnumPair other = (EnumPair) obj;
return other.setting == this.setting && other.value == this.value; return other.setting == this.setting && other.value == this.value;
} }
@@ -43,11 +43,17 @@ public class GuiNumberBox extends GuiTextField
try try
{ {
if( this.type == int.class || this.type == Integer.class ) if( this.type == int.class || this.type == Integer.class )
{
Integer.parseInt( this.getText() ); Integer.parseInt( this.getText() );
}
else if( this.type == long.class || this.type == Long.class ) else if( this.type == long.class || this.type == Long.class )
{
Long.parseLong( this.getText() ); Long.parseLong( this.getText() );
}
else if( this.type == double.class || this.type == Double.class ) else if( this.type == double.class || this.type == Double.class )
{
Double.parseDouble( this.getText() ); Double.parseDouble( this.getText() );
}
} }
catch( NumberFormatException e ) catch( NumberFormatException e )
{ {
@@ -91,7 +91,9 @@ public class GuiProgressBar extends GuiButton implements ITooltip
public String getMessage() public String getMessage()
{ {
if( this.fullMsg != null ) if( this.fullMsg != null )
{
return this.fullMsg; return this.fullMsg;
}
return ( this.titleName != null ? this.titleName : "" ) + '\n' + this.source.getCurrentProgress() + ' ' + GuiText.Of.getLocal() + ' ' + this.source.getMaxProgress(); return ( this.titleName != null ? this.titleName : "" ) + '\n' + this.source.getCurrentProgress() + ' ' + GuiText.Of.getLocal() + ' ' + this.source.getMaxProgress();
} }
@@ -109,7 +109,9 @@ public class GuiScrollbar implements IScrollSource
this.pageSize = pageSize; this.pageSize = pageSize;
if( this.minScroll > this.maxScroll ) if( this.minScroll > this.maxScroll )
{
this.maxScroll = this.minScroll; this.maxScroll = this.minScroll;
}
this.applyRange(); this.applyRange();
} }
@@ -128,7 +130,9 @@ public class GuiScrollbar implements IScrollSource
public void click( AEBaseGui aeBaseGui, int x, int y ) public void click( AEBaseGui aeBaseGui, int x, int y )
{ {
if( this.getRange() == 0 ) if( this.getRange() == 0 )
{
return; return;
}
if( x > this.displayX && x <= this.displayX + this.width ) if( x > this.displayX && x <= this.displayX + this.width )
{ {
@@ -93,16 +93,22 @@ public class GuiToggleButton extends GuiButton implements ITooltip
String value = StatCollector.translateToLocal( this.displayHint ); String value = StatCollector.translateToLocal( this.displayHint );
if( name == null || name.isEmpty() ) if( name == null || name.isEmpty() )
{
name = this.displayName; name = this.displayName;
}
if( value == null || value.isEmpty() ) if( value == null || value.isEmpty() )
{
value = this.displayHint; value = this.displayHint;
}
value = PATTERN_NEW_LINE.matcher( value ).replaceAll( "\n" ); value = PATTERN_NEW_LINE.matcher( value ).replaceAll( "\n" );
StringBuilder sb = new StringBuilder( value ); StringBuilder sb = new StringBuilder( value );
int i = sb.lastIndexOf( "\n" ); int i = sb.lastIndexOf( "\n" );
if( i <= 0 ) if( i <= 0 )
{
i = 0; i = 0;
}
while( i + 30 < sb.length() && ( i = sb.lastIndexOf( " ", i + 30 ) ) != -1 ) while( i + 30 < sb.length() && ( i = sb.lastIndexOf( " ", i + 30 ) ) != -1 )
{ {
sb.replace( i, i + 1, "\n" ); sb.replace( i, i + 1, "\n" );
@@ -45,7 +45,9 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
{ {
String s = StatCollector.translateToLocal( this.unlocalizedName + ".name" ); String s = StatCollector.translateToLocal( this.unlocalizedName + ".name" );
if( s.equals( this.unlocalizedName + ".name" ) ) if( s.equals( this.unlocalizedName + ".name" ) )
{
return StatCollector.translateToLocal( this.unlocalizedName ); return StatCollector.translateToLocal( this.unlocalizedName );
}
return s; return s;
} }
@@ -74,7 +74,9 @@ public class ItemRepo
idx += this.src.getCurrentScroll() * this.rowSize; idx += this.src.getCurrentScroll() * this.rowSize;
if( idx >= this.view.size() ) if( idx >= this.view.size() )
{
return null; return null;
}
return this.view.get( idx ); return this.view.get( idx );
} }
@@ -83,7 +85,9 @@ public class ItemRepo
idx += this.src.getCurrentScroll() * this.rowSize; idx += this.src.getCurrentScroll() * this.rowSize;
if( idx >= this.dsp.size() ) if( idx >= this.dsp.size() )
{
return null; return null;
}
return this.dsp.get( idx ); return this.dsp.get( idx );
} }
@@ -102,7 +106,9 @@ public class ItemRepo
st.add( is ); st.add( is );
} }
else else
{
this.list.add( is ); this.list.add( is );
}
} }
public void setViewCell( ItemStack[] list ) public void setViewCell( ItemStack[] list )
@@ -122,7 +128,9 @@ public class ItemRepo
Enum viewMode = this.sortSrc.getSortDisplay(); Enum viewMode = this.sortSrc.getSortDisplay();
Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE ); Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
if( searchMode == SearchBoxMode.NEI_AUTOSEARCH || searchMode == SearchBoxMode.NEI_MANUAL_SEARCH ) if( searchMode == SearchBoxMode.NEI_AUTOSEARCH || searchMode == SearchBoxMode.NEI_MANUAL_SEARCH )
{
this.updateNEI( this.searchString ); this.updateNEI( this.searchString );
}
this.innerSearch = this.searchString; this.innerSearch = this.searchString;
boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO; boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO;
@@ -158,11 +166,15 @@ public class ItemRepo
if( this.myPartitionList != null ) if( this.myPartitionList != null )
{ {
if( !this.myPartitionList.isListed( is ) ) if( !this.myPartitionList.isListed( is ) )
{
continue; continue;
}
} }
if( viewMode == ViewItems.CRAFTABLE && !is.isCraftable() ) if( viewMode == ViewItems.CRAFTABLE && !is.isCraftable() )
{
continue; continue;
}
if( viewMode == ViewItems.CRAFTABLE ) if( viewMode == ViewItems.CRAFTABLE )
{ {
@@ -171,7 +183,9 @@ public class ItemRepo
} }
if( viewMode == ViewItems.STORED && is.getStackSize() == 0 ) if( viewMode == ViewItems.STORED && is.getStackSize() == 0 )
{
continue; continue;
}
String dspName = searchMod ? Platform.getModId( is ) : Platform.getItemDisplayName( is ); String dspName = searchMod ? Platform.getModId( is ) : Platform.getItemDisplayName( is );
notDone = true; notDone = true;
@@ -185,12 +199,14 @@ public class ItemRepo
if( terminalSearchToolTips && notDone ) if( terminalSearchToolTips && notDone )
{ {
for( Object lp : Platform.getTooltip( is ) ) for( Object lp : Platform.getTooltip( is ) )
{
if( lp instanceof String && m.matcher( (String) lp ).find() ) if( lp instanceof String && m.matcher( (String) lp ).find() )
{ {
this.view.add( is ); this.view.add( is );
notDone = false; notDone = false;
break; break;
} }
}
} }
/* /*
@@ -206,16 +222,26 @@ public class ItemRepo
ItemSorters.init(); ItemSorters.init();
if( SortBy == SortOrder.MOD ) if( SortBy == SortOrder.MOD )
{
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_MOD ); Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_MOD );
}
else if( SortBy == SortOrder.AMOUNT ) else if( SortBy == SortOrder.AMOUNT )
{
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_SIZE ); Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_SIZE );
}
else if( SortBy == SortOrder.INVTWEAKS ) else if( SortBy == SortOrder.INVTWEAKS )
{
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS ); Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS );
}
else else
{
Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_NAME ); Collections.sort( this.view, ItemSorters.CONFIG_BASED_SORT_BY_NAME );
}
for( IAEItemStack is : this.view ) for( IAEItemStack is : this.view )
{
this.dsp.add( is.getItemStack() ); this.dsp.add( is.getItemStack() );
}
} }
private void updateNEI( String filter ) private void updateNEI( String filter )
@@ -68,7 +68,9 @@ public class SlotDisconnected extends AppEngSlot
ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
ItemStack out = iep.getOutput( is ); ItemStack out = iep.getOutput( is );
if( out != null ) if( out != null )
{
return out; return out;
}
} }
} }
return super.getStack(); return super.getStack();
@@ -41,7 +41,9 @@ public class SlotME extends Slot
public IAEItemStack getAEStack() public IAEItemStack getAEStack()
{ {
if( this.mySlot.hasPower() ) if( this.mySlot.hasPower() )
{
return this.mySlot.getAEStack(); return this.mySlot.getAEStack();
}
return null; return null;
} }
@@ -60,7 +62,9 @@ public class SlotME extends Slot
public ItemStack getStack() public ItemStack getStack()
{ {
if( this.mySlot.hasPower() ) if( this.mySlot.hasPower() )
{
return this.mySlot.getStack(); return this.mySlot.getStack();
}
return null; return null;
} }
@@ -68,7 +72,9 @@ public class SlotME extends Slot
public boolean getHasStack() public boolean getHasStack()
{ {
if( this.mySlot.hasPower() ) if( this.mySlot.hasPower() )
{
return this.getStack() != null; return this.getStack() != null;
}
return false; return false;
} }
@@ -289,7 +289,9 @@ public class BaseBlockRender
if( info.isValid() ) if( info.isValid() )
{ {
if( block.hasSubtypes() ) if( block.hasSubtypes() )
{
block.setRenderStateByMeta( item.getItemDamage() ); block.setRenderStateByMeta( item.getItemDamage() );
}
renderer.uvRotateBottom = info.getTexture( ForgeDirection.DOWN ).setFlip( getOrientation( ForgeDirection.DOWN, ForgeDirection.SOUTH, ForgeDirection.UP ) ); renderer.uvRotateBottom = info.getTexture( ForgeDirection.DOWN ).setFlip( getOrientation( ForgeDirection.DOWN, ForgeDirection.SOUTH, ForgeDirection.UP ) );
renderer.uvRotateTop = info.getTexture( ForgeDirection.UP ).setFlip( getOrientation( ForgeDirection.UP, ForgeDirection.SOUTH, ForgeDirection.UP ) ); renderer.uvRotateTop = info.getTexture( ForgeDirection.UP ).setFlip( getOrientation( ForgeDirection.UP, ForgeDirection.SOUTH, ForgeDirection.UP ) );
@@ -304,7 +306,9 @@ public class BaseBlockRender
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), block, item, tess, 0xffffff, renderer ); this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), block, item, tess, 0xffffff, renderer );
if( block.hasSubtypes() ) if( block.hasSubtypes() )
{
info.setTemporaryRenderIcon( null ); info.setTemporaryRenderIcon( null );
}
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
} }
@@ -314,7 +318,9 @@ public class BaseBlockRender
if( in == null || in == ForgeDirection.UNKNOWN // 1 if( in == null || in == ForgeDirection.UNKNOWN // 1
|| forward == null || forward == ForgeDirection.UNKNOWN // 2 || forward == null || forward == ForgeDirection.UNKNOWN // 2
|| up == null || up == ForgeDirection.UNKNOWN ) || up == null || up == ForgeDirection.UNKNOWN )
{
return 0; return 0;
}
int a = in.ordinal(); int a = in.ordinal();
int b = forward.ordinal(); int b = forward.ordinal();
@@ -327,7 +333,9 @@ public class BaseBlockRender
{ {
int meta = 0; int meta = 0;
if( block != null && block.hasSubtypes() && item != null ) if( block != null && block.hasSubtypes() && item != null )
{
meta = item.getItemDamage(); meta = item.getItemDamage();
}
if( sides.contains( ForgeDirection.DOWN ) ) if( sides.contains( ForgeDirection.DOWN ) )
{ {
@@ -387,8 +395,12 @@ public class BaseBlockRender
public IIcon firstNotNull( IIcon... s ) public IIcon firstNotNull( IIcon... s )
{ {
for( IIcon o : s ) for( IIcon o : s )
{
if( o != null ) if( o != null )
{
return o; return o;
}
}
return ExtraBlockTextures.getMissing(); return ExtraBlockTextures.getMissing();
} }
@@ -434,9 +446,13 @@ public class BaseBlockRender
public IOrientable getOrientable( AEBaseBlock block, IBlockAccess w, int x, int y, int z ) public IOrientable getOrientable( AEBaseBlock block, IBlockAccess w, int x, int y, int z )
{ {
if( block.hasBlockTileEntity() ) if( block.hasBlockTileEntity() )
{
return (AEBaseTile) block.getTileEntity( w, x, y, z ); return (AEBaseTile) block.getTileEntity( w, x, y, z );
}
else if( block instanceof IOrientableBlock ) else if( block instanceof IOrientableBlock )
{
return ( (IOrientableBlock) block ).getOrientable( w, x, y, z ); return ( (IOrientableBlock) block ).getOrientable( w, x, y, z );
}
return null; return null;
} }
@@ -660,10 +676,14 @@ public class BaseBlockRender
private double mapFaceUV( int offset, int uv ) private double mapFaceUV( int offset, int uv )
{ {
if( offset == 0 ) if( offset == 0 )
{
return 0; return 0;
}
if( offset > 0 ) if( offset > 0 )
{
return uv / 16.0; return uv / 16.0;
}
return ( 16.0 - uv ) / 16.0; return ( 16.0 - uv ) / 16.0;
} }
@@ -681,9 +701,13 @@ public class BaseBlockRender
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
if( Minecraft.isAmbientOcclusionEnabled() ) if( Minecraft.isAmbientOcclusionEnabled() )
{
GL11.glShadeModel( GL11.GL_SMOOTH ); GL11.glShadeModel( GL11.GL_SMOOTH );
}
else else
{
GL11.glShadeModel( GL11.GL_FLAT ); GL11.glShadeModel( GL11.GL_FLAT );
}
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
@@ -706,10 +730,14 @@ public class BaseBlockRender
if( forward != null && up != null ) if( forward != null && up != null )
{ {
if( forward == ForgeDirection.UNKNOWN ) if( forward == ForgeDirection.UNKNOWN )
{
forward = ForgeDirection.SOUTH; forward = ForgeDirection.SOUTH;
}
if( up == ForgeDirection.UNKNOWN ) if( up == ForgeDirection.UNKNOWN )
{
up = ForgeDirection.UP; up = ForgeDirection.UP;
}
ForgeDirection west = Platform.crossProduct( forward, up ); ForgeDirection west = Platform.crossProduct( forward, up );
@@ -62,7 +62,9 @@ public class BlockRenderInfo
public void setTemporaryRenderIcon( IIcon IIcon ) public void setTemporaryRenderIcon( IIcon IIcon )
{ {
if( IIcon == null ) if( IIcon == null )
{
this.useTmp = false; this.useTmp = false;
}
else else
{ {
this.useTmp = true; this.useTmp = true;
@@ -151,7 +151,9 @@ public final class BusRenderHelper implements IPartRenderHelper
public void setBounds( double[] bounds ) public void setBounds( double[] bounds )
{ {
if( bounds == null || bounds.length != 6 ) if( bounds == null || bounds.length != 6 )
{
return; return;
}
this.minX = bounds[0]; this.minX = bounds[0];
this.minY = bounds[1]; this.minY = bounds[1];
@@ -301,18 +303,30 @@ public final class BusRenderHelper implements IPartRenderHelper
p.getBoxes( this.bbc ); p.getBoxes( this.bbc );
if( this.bbc.minX < 1 ) if( this.bbc.minX < 1 )
{
this.bbc.minX = 1; this.bbc.minX = 1;
}
if( this.bbc.minY < 1 ) if( this.bbc.minY < 1 )
{
this.bbc.minY = 1; this.bbc.minY = 1;
}
if( this.bbc.minZ < 1 ) if( this.bbc.minZ < 1 )
{
this.bbc.minZ = 1; this.bbc.minZ = 1;
}
if( this.bbc.maxX > 15 ) if( this.bbc.maxX > 15 )
{
this.bbc.maxX = 15; this.bbc.maxX = 15;
}
if( this.bbc.maxY > 15 ) if( this.bbc.maxY > 15 )
{
this.bbc.maxY = 15; this.bbc.maxY = 15;
}
if( this.bbc.maxZ > 15 ) if( this.bbc.maxZ > 15 )
{
this.bbc.maxZ = 15; this.bbc.maxZ = 15;
}
} }
this.setBounds( this.bbc.minX, this.bbc.minY, this.bbc.minZ, this.bbc.maxX, this.bbc.maxY, this.bbc.maxZ ); this.setBounds( this.bbc.minX, this.bbc.minY, this.bbc.minZ, this.bbc.maxX, this.bbc.maxY, this.bbc.maxZ );
@@ -384,30 +398,48 @@ public final class BusRenderHelper implements IPartRenderHelper
ForgeDirection west = ForgeDirection.UNKNOWN; ForgeDirection west = ForgeDirection.UNKNOWN;
if( forward == null || up == null ) if( forward == null || up == null )
{
return dir; return dir;
}
int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY; int west_x = forward.offsetY * up.offsetZ - forward.offsetZ * up.offsetY;
int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ; int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ;
int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX; int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX;
for( ForgeDirection dx : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection dx : ForgeDirection.VALID_DIRECTIONS )
{
if( dx.offsetX == west_x && dx.offsetY == west_y && dx.offsetZ == west_z ) if( dx.offsetX == west_x && dx.offsetY == west_y && dx.offsetZ == west_z )
{
west = dx; west = dx;
}
}
if( dir == forward ) if( dir == forward )
{
return ForgeDirection.SOUTH; return ForgeDirection.SOUTH;
}
if( dir == forward.getOpposite() ) if( dir == forward.getOpposite() )
{
return ForgeDirection.NORTH; return ForgeDirection.NORTH;
}
if( dir == up ) if( dir == up )
{
return ForgeDirection.UP; return ForgeDirection.UP;
}
if( dir == up.getOpposite() ) if( dir == up.getOpposite() )
{
return ForgeDirection.DOWN; return ForgeDirection.DOWN;
}
if( dir == west ) if( dir == west )
{
return ForgeDirection.WEST; return ForgeDirection.WEST;
}
if( dir == west.getOpposite() ) if( dir == west.getOpposite() )
{
return ForgeDirection.EAST; return ForgeDirection.EAST;
}
return ForgeDirection.UNKNOWN; return ForgeDirection.UNKNOWN;
} }
@@ -439,7 +471,9 @@ public final class BusRenderHelper implements IPartRenderHelper
public void renderBlock( int x, int y, int z, RenderBlocks renderer ) public void renderBlock( int x, int y, int z, RenderBlocks renderer )
{ {
if( !this.renderThis() ) if( !this.renderThis() )
{
return; return;
}
for( Block multiPart : AEApi.instance().definitions().blocks().multiPart().maybeBlock().asSet() ) for( Block multiPart : AEApi.instance().definitions().blocks().multiPart().maybeBlock().asSet() )
{ {
@@ -490,7 +524,9 @@ public final class BusRenderHelper implements IPartRenderHelper
public void renderBlockCurrentBounds( int x, int y, int z, RenderBlocks renderer ) public void renderBlockCurrentBounds( int x, int y, int z, RenderBlocks renderer )
{ {
if( !this.renderThis() ) if( !this.renderThis() )
{
return; return;
}
for( Block block : this.maybeBlock.asSet() ) for( Block block : this.maybeBlock.asSet() )
{ {
@@ -502,7 +538,9 @@ public final class BusRenderHelper implements IPartRenderHelper
public void renderFaceCutout( int x, int y, int z, IIcon ico, ForgeDirection face, float edgeThickness, RenderBlocks renderer ) public void renderFaceCutout( int x, int y, int z, IIcon ico, ForgeDirection face, float edgeThickness, RenderBlocks renderer )
{ {
if( !this.renderThis() ) if( !this.renderThis() )
{
return; return;
}
switch( face ) switch( face )
{ {
@@ -540,7 +578,9 @@ public final class BusRenderHelper implements IPartRenderHelper
public void renderFace( int x, int y, int z, IIcon ico, ForgeDirection face, RenderBlocks renderer ) public void renderFace( int x, int y, int z, IIcon ico, ForgeDirection face, RenderBlocks renderer )
{ {
if( !this.renderThis() ) if( !this.renderThis() )
{
return; return;
}
this.prepareBounds( renderer ); this.prepareBounds( renderer );
switch( face ) switch( face )
@@ -68,7 +68,9 @@ public class BusRenderer implements IItemRenderer
public void renderItem( ItemRenderType type, ItemStack item, Object... data ) public void renderItem( ItemRenderType type, ItemStack item, Object... data )
{ {
if( item == null ) if( item == null )
{
return; return;
}
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
@@ -103,7 +105,9 @@ public class BusRenderer implements IItemRenderer
} }
if( type == ItemRenderType.INVENTORY ) if( type == ItemRenderType.INVENTORY )
{
GL11.glTranslatef( 0.0f, -0.1f, 0.0f ); GL11.glTranslatef( 0.0f, -0.1f, 0.0f );
}
GL11.glTranslated( 0.2, 0.3, 0.1 ); GL11.glTranslated( 0.2, 0.3, 0.1 );
GL11.glScaled( 1.2, 1.2, 1. ); GL11.glScaled( 1.2, 1.2, 1. );
@@ -135,7 +139,9 @@ public class BusRenderer implements IItemRenderer
} }
if( fp != null ) if( fp != null )
{
fp.renderInventory( BusRenderHelper.INSTANCE, this.renderer ); fp.renderInventory( BusRenderHelper.INSTANCE, this.renderer );
}
} }
else else
{ {
@@ -167,7 +173,9 @@ public class BusRenderer implements IItemRenderer
{ {
part = c.createPartFromItemStack( is ); part = c.createPartFromItemStack( is );
if( part != null ) if( part != null )
{
RENDER_PART.put( id, part ); RENDER_PART.put( id, part );
}
} }
return part; return part;
@@ -51,10 +51,14 @@ public class CableRenderHelper
RenderBlocksWorkaround renderer = BusRenderer.INSTANCE.renderer; RenderBlocksWorkaround renderer = BusRenderer.INSTANCE.renderer;
if( renderer.overrideBlockTexture != null ) if( renderer.overrideBlockTexture != null )
{
BusRenderHelper.INSTANCE.setPass( 0 ); BusRenderHelper.INSTANCE.setPass( 0 );
}
if( renderer.blockAccess == null ) if( renderer.blockAccess == null )
{
renderer.blockAccess = Minecraft.getMinecraft().theWorld; renderer.blockAccess = Minecraft.getMinecraft().theWorld;
}
for( ForgeDirection s : ForgeDirection.values() ) for( ForgeDirection s : ForgeDirection.values() )
{ {
@@ -108,7 +112,9 @@ public class CableRenderHelper
o += bb.minZ < min ? 1 : 0; o += bb.minZ < min ? 1 : 0;
if( o >= 2 ) if( o >= 2 )
{
useThinFacades = true; useThinFacades = true;
}
} }
for( ForgeDirection s : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection s : ForgeDirection.VALID_DIRECTIONS )
@@ -124,7 +130,9 @@ public class CableRenderHelper
if( bb.intersectsWith( pb ) ) if( bb.intersectsWith( pb ) )
{ {
if( b == null ) if( b == null )
{
b = bb; b = bb;
}
else else
{ {
b.maxX = Math.max( b.maxX, bb.maxX ); b.maxX = Math.max( b.maxX, bb.maxX );
@@ -54,9 +54,13 @@ public class ItemRenderer implements IItemRenderer
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
if( type == ItemRenderType.ENTITY ) if( type == ItemRenderType.ENTITY )
{
GL11.glTranslatef( -0.5f, -0.5f, -0.5f ); GL11.glTranslatef( -0.5f, -0.5f, -0.5f );
}
if( type == ItemRenderType.INVENTORY ) if( type == ItemRenderType.INVENTORY )
{
GL11.glTranslatef( 0.0f, -0.1f, 0.0f ); GL11.glTranslatef( 0.0f, -0.1f, 0.0f );
}
WorldRender.INSTANCE.renderItemBlock( item, type, data ); WorldRender.INSTANCE.renderItemBlock( item, type, data );
@@ -220,7 +220,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
if( this.faces.contains( ForgeDirection.DOWN ) ) if( this.faces.contains( ForgeDirection.DOWN ) )
{ {
if( !this.renderFaces.contains( ForgeDirection.DOWN ) ) if( !this.renderFaces.contains( ForgeDirection.DOWN ) )
{
return; return;
}
if( this.isFacade ) if( this.isFacade )
{ {
@@ -257,7 +259,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
} }
} }
else else
{
super.renderFaceYNeg( par1Block, par2, par4, par6, par8Icon ); super.renderFaceYNeg( par1Block, par2, par4, par6, par8Icon );
}
} }
else else
{ {
@@ -274,7 +278,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
if( this.faces.contains( ForgeDirection.UP ) ) if( this.faces.contains( ForgeDirection.UP ) )
{ {
if( !this.renderFaces.contains( ForgeDirection.UP ) ) if( !this.renderFaces.contains( ForgeDirection.UP ) )
{
return; return;
}
if( this.isFacade ) if( this.isFacade )
{ {
@@ -311,7 +317,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
} }
} }
else else
{
super.renderFaceYPos( par1Block, par2, par4, par6, par8Icon ); super.renderFaceYPos( par1Block, par2, par4, par6, par8Icon );
}
} }
else else
{ {
@@ -328,7 +336,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
if( this.faces.contains( ForgeDirection.NORTH ) ) if( this.faces.contains( ForgeDirection.NORTH ) )
{ {
if( !this.renderFaces.contains( ForgeDirection.NORTH ) ) if( !this.renderFaces.contains( ForgeDirection.NORTH ) )
{
return; return;
}
if( this.isFacade ) if( this.isFacade )
{ {
@@ -365,7 +375,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
} }
} }
else else
{
super.renderFaceZNeg( par1Block, par2, par4, par6, par8Icon ); super.renderFaceZNeg( par1Block, par2, par4, par6, par8Icon );
}
} }
else else
{ {
@@ -382,7 +394,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
if( this.faces.contains( ForgeDirection.SOUTH ) ) if( this.faces.contains( ForgeDirection.SOUTH ) )
{ {
if( !this.renderFaces.contains( ForgeDirection.SOUTH ) ) if( !this.renderFaces.contains( ForgeDirection.SOUTH ) )
{
return; return;
}
if( this.isFacade ) if( this.isFacade )
{ {
@@ -419,7 +433,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
} }
} }
else else
{
super.renderFaceZPos( par1Block, par2, par4, par6, par8Icon ); super.renderFaceZPos( par1Block, par2, par4, par6, par8Icon );
}
} }
else else
{ {
@@ -436,7 +452,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
if( this.faces.contains( ForgeDirection.WEST ) ) if( this.faces.contains( ForgeDirection.WEST ) )
{ {
if( !this.renderFaces.contains( ForgeDirection.WEST ) ) if( !this.renderFaces.contains( ForgeDirection.WEST ) )
{
return; return;
}
if( this.isFacade ) if( this.isFacade )
{ {
@@ -473,7 +491,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
} }
} }
else else
{
super.renderFaceXNeg( par1Block, par2, par4, par6, par8Icon ); super.renderFaceXNeg( par1Block, par2, par4, par6, par8Icon );
}
} }
else else
{ {
@@ -490,7 +510,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
if( this.faces.contains( ForgeDirection.EAST ) ) if( this.faces.contains( ForgeDirection.EAST ) )
{ {
if( !this.renderFaces.contains( ForgeDirection.EAST ) ) if( !this.renderFaces.contains( ForgeDirection.EAST ) )
{
return; return;
}
if( this.isFacade ) if( this.isFacade )
{ {
@@ -527,7 +549,9 @@ public class RenderBlocksWorkaround extends RenderBlocks
} }
} }
else else
{
super.renderFaceXPos( par1Block, par2, par4, par6, par8Icon ); super.renderFaceXPos( par1Block, par2, par4, par6, par8Icon );
}
} }
else else
{ {
@@ -577,13 +601,17 @@ public class RenderBlocksWorkaround extends RenderBlocks
int o = 0; int o = 0;
for( int i = -1; i <= 1; i++ ) for( int i = -1; i <= 1; i++ )
{
for( int j = -1; j <= 1; j++ ) for( int j = -1; j <= 1; j++ )
{
for( int k = -1; k <= 1; k++ ) for( int k = -1; k <= 1; k++ )
{ {
this.lightHashTmp[o] = blk.getMixedBrightnessForBlock( this.blockAccess, x + i, y + j, z + k ); this.lightHashTmp[o] = blk.getMixedBrightnessForBlock( this.blockAccess, x + i, y + j, z + k );
o++; o++;
} }
}
}
return Arrays.hashCode( this.lightHashTmp ); return Arrays.hashCode( this.lightHashTmp );
} }
@@ -60,7 +60,9 @@ public class TESRWrapper extends TileEntitySpecialRenderer
if( b instanceof AEBaseBlock && ( (AEBaseTile) te ).requiresTESR() ) if( b instanceof AEBaseBlock && ( (AEBaseTile) te ).requiresTESR() )
{ {
if( Math.abs( x ) > this.MAX_DISTANCE || Math.abs( y ) > this.MAX_DISTANCE || Math.abs( z ) > this.MAX_DISTANCE ) if( Math.abs( x ) > this.MAX_DISTANCE || Math.abs( y ) > this.MAX_DISTANCE || Math.abs( z ) > this.MAX_DISTANCE )
{
return; return;
}
Tessellator tess = Tessellator.instance; Tessellator tess = Tessellator.instance;
@@ -266,7 +266,9 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
if( pc.isConnected( side.getOpposite() ) ) if( pc.isConnected( side.getOpposite() ) )
{ {
if( covered ) if( covered )
{
return pc.getCoveredTexture( pc.getCableColor() ); return pc.getCoveredTexture( pc.getCableColor() );
}
return pc.getGlassTexture( pc.getCableColor() ); return pc.getGlassTexture( pc.getCableColor() );
} }
} }
@@ -130,7 +130,9 @@ public class RenderBlockCharger extends BaseBlockRender
{ {
ItemStack sis = null; ItemStack sis = null;
if( tile instanceof IInventory ) if( tile instanceof IInventory )
{
sis = ( (IInventory) tile ).getStackInSlot( 0 ); sis = ( (IInventory) tile ).getStackInSlot( 0 );
}
if( sis != null ) if( sis != null )
{ {
@@ -58,12 +58,18 @@ public class RenderBlockController extends BaseBlockRender
{ {
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() );
if( isConflict ) if( isConflict )
{
lights = ExtraBlockTextures.BlockControllerColumnConflict; lights = ExtraBlockTextures.BlockControllerColumnConflict;
}
else else
{
lights = ExtraBlockTextures.BlockControllerColumnLights; lights = ExtraBlockTextures.BlockControllerColumnLights;
}
} }
else else
{
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
}
renderer.uvRotateEast = 1; renderer.uvRotateEast = 1;
renderer.uvRotateWest = 1; renderer.uvRotateWest = 1;
@@ -76,12 +82,18 @@ public class RenderBlockController extends BaseBlockRender
{ {
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() );
if( isConflict ) if( isConflict )
{
lights = ExtraBlockTextures.BlockControllerColumnConflict; lights = ExtraBlockTextures.BlockControllerColumnConflict;
}
else else
{
lights = ExtraBlockTextures.BlockControllerColumnLights; lights = ExtraBlockTextures.BlockControllerColumnLights;
}
} }
else else
{
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
}
renderer.uvRotateEast = 0; renderer.uvRotateEast = 0;
renderer.uvRotateNorth = 0; renderer.uvRotateNorth = 0;
@@ -92,12 +104,18 @@ public class RenderBlockController extends BaseBlockRender
{ {
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumnPowered.getIcon() );
if( isConflict ) if( isConflict )
{
lights = ExtraBlockTextures.BlockControllerColumnConflict; lights = ExtraBlockTextures.BlockControllerColumnConflict;
}
else else
{
lights = ExtraBlockTextures.BlockControllerColumnLights; lights = ExtraBlockTextures.BlockControllerColumnLights;
}
} }
else else
{
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerColumn.getIcon() );
}
renderer.uvRotateNorth = 1; renderer.uvRotateNorth = 1;
renderer.uvRotateSouth = 1; renderer.uvRotateSouth = 1;
@@ -109,9 +127,13 @@ public class RenderBlockController extends BaseBlockRender
renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0; renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
if( v == 0 ) if( v == 0 )
{
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerInsideA.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerInsideA.getIcon() );
}
else else
{
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerInsideB.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerInsideB.getIcon() );
}
} }
else else
{ {
@@ -119,12 +141,18 @@ public class RenderBlockController extends BaseBlockRender
{ {
blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerPowered.getIcon() ); blk.getRendererInstance().setTemporaryRenderIcon( ExtraBlockTextures.BlockControllerPowered.getIcon() );
if( isConflict ) if( isConflict )
{
lights = ExtraBlockTextures.BlockControllerConflict; lights = ExtraBlockTextures.BlockControllerConflict;
}
else else
{
lights = ExtraBlockTextures.BlockControllerLights; lights = ExtraBlockTextures.BlockControllerLights;
}
} }
else else
{
blk.getRendererInstance().setTemporaryRenderIcon( null ); blk.getRendererInstance().setTemporaryRenderIcon( null );
}
} }
boolean out = renderer.renderStandardBlock( blk, x, y, z ); boolean out = renderer.renderStandardBlock( blk, x, y, z );
@@ -148,7 +176,9 @@ public class RenderBlockController extends BaseBlockRender
private TileEntity getTileEntity( IBlockAccess world, int x, int y, int z ) private TileEntity getTileEntity( IBlockAccess world, int x, int y, int z )
{ {
if( y >= 0 ) if( y >= 0 )
{
return world.getTileEntity( x, y, z ); return world.getTileEntity( x, y, z );
}
return null; return null;
} }
} }
@@ -126,7 +126,9 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
boolean LocalEmit = emitsLight; boolean LocalEmit = emitsLight;
if( blk instanceof BlockCraftingMonitor && ct.getForward() != side ) if( blk instanceof BlockCraftingMonitor && ct.getForward() != side )
{
LocalEmit = false; LocalEmit = false;
}
this.handleSide( blk, meta, x, y, z, i, renderer, ct.getForward() == side ? theIcon : nonForward, LocalEmit, isMonitor, side, w ); this.handleSide( blk, meta, x, y, z, i, renderer, ct.getForward() == side ? theIcon : nonForward, LocalEmit, isMonitor, side, w );
} }
@@ -165,11 +167,17 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
private void renderCorner( BusRenderHelper i, RenderBlocks renderer, IBlockAccess w, int x, int y, int z, ForgeDirection up, ForgeDirection east, ForgeDirection south ) private void renderCorner( BusRenderHelper i, RenderBlocks renderer, IBlockAccess w, int x, int y, int z, ForgeDirection up, ForgeDirection east, ForgeDirection south )
{ {
if( this.isConnected( w, x, y, z, up ) ) if( this.isConnected( w, x, y, z, up ) )
{
return; return;
}
if( this.isConnected( w, x, y, z, east ) ) if( this.isConnected( w, x, y, z, east ) )
{
return; return;
}
if( this.isConnected( w, x, y, z, south ) ) if( this.isConnected( w, x, y, z, south ) )
{
return; return;
}
i.setBounds( this.gso( east, 3, ForgeDirection.WEST ), this.gso( up, 3, ForgeDirection.DOWN ), this.gso( south, 3, ForgeDirection.NORTH ), this.gso( east, 13, ForgeDirection.EAST ), this.gso( up, 13, ForgeDirection.UP ), this.gso( south, 13, ForgeDirection.SOUTH ) ); i.setBounds( this.gso( east, 3, ForgeDirection.WEST ), this.gso( up, 3, ForgeDirection.DOWN ), this.gso( south, 3, ForgeDirection.NORTH ), this.gso( east, 13, ForgeDirection.EAST ), this.gso( up, 13, ForgeDirection.UP ), this.gso( south, 13, ForgeDirection.SOUTH ) );
i.prepareBounds( renderer ); i.prepareBounds( renderer );
@@ -182,7 +190,9 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
if( side == target ) if( side == target )
{ {
if( side.offsetX > 0 || side.offsetY > 0 || side.offsetZ > 0 ) if( side.offsetX > 0 || side.offsetY > 0 || side.offsetZ > 0 )
{
return 16; return 16;
}
return 0; return 0;
} }
return def; return def;
@@ -191,7 +201,9 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
private void handleSide( AEBaseBlock blk, int meta, int x, int y, int z, BusRenderHelper i, RenderBlocks renderer, IIcon color, boolean emitsLight, boolean isMonitor, ForgeDirection side, IBlockAccess w ) private void handleSide( AEBaseBlock blk, int meta, int x, int y, int z, BusRenderHelper i, RenderBlocks renderer, IIcon color, boolean emitsLight, boolean isMonitor, ForgeDirection side, IBlockAccess w )
{ {
if( this.isConnected( w, x, y, z, side ) ) if( this.isConnected( w, x, y, z, side ) )
{
return; return;
}
i.setFacesToRender( EnumSet.of( side ) ); i.setFacesToRender( EnumSet.of( side ) );
@@ -203,9 +215,13 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
else else
{ {
if( color == ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon() ) if( color == ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon() )
{
i.setTexture( ExtraBlockTextures.BlockCraftingMonitorOuter.getIcon() ); i.setTexture( ExtraBlockTextures.BlockCraftingMonitorOuter.getIcon() );
}
else else
{
i.setTexture( ExtraBlockTextures.BlockCraftingFitSolid.getIcon() ); i.setTexture( ExtraBlockTextures.BlockCraftingFitSolid.getIcon() );
}
i.renderBlockCurrentBounds( x, y, z, renderer ); i.renderBlockCurrentBounds( x, y, z, renderer );
@@ -233,7 +249,9 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
i.renderFace( x, y, z, ExtraBlockTextures.BlockCraftingMonitorFit_Dark.getIcon(), side, renderer ); i.renderFace( x, y, z, ExtraBlockTextures.BlockCraftingMonitorFit_Dark.getIcon(), side, renderer );
} }
else else
{
i.renderBlockCurrentBounds( x, y, z, renderer ); i.renderBlockCurrentBounds( x, y, z, renderer );
}
} }
else else
{ {
@@ -267,14 +285,22 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
for( ForgeDirection a : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection a : ForgeDirection.VALID_DIRECTIONS )
{ {
if( a == side || a == side.getOpposite() ) if( a == side || a == side.getOpposite() )
{
continue; continue;
}
if( ( side.offsetX != 0 || side.offsetZ != 0 ) && ( a == ForgeDirection.NORTH || a == ForgeDirection.EAST || a == ForgeDirection.WEST || a == ForgeDirection.SOUTH ) ) if( ( side.offsetX != 0 || side.offsetZ != 0 ) && ( a == ForgeDirection.NORTH || a == ForgeDirection.EAST || a == ForgeDirection.WEST || a == ForgeDirection.SOUTH ) )
{
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLongRotated.getIcon() ); i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLongRotated.getIcon() );
}
else if( ( side.offsetY != 0 ) && ( a == ForgeDirection.EAST || a == ForgeDirection.WEST ) ) else if( ( side.offsetY != 0 ) && ( a == ForgeDirection.EAST || a == ForgeDirection.WEST ) )
{
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLongRotated.getIcon() ); i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLongRotated.getIcon() );
}
else else
{
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLong.getIcon() ); i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLong.getIcon() );
}
double width = 3.0 / 16.0; double width = 3.0 / 16.0;
@@ -334,7 +360,9 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
if( side != target ) if( side != target )
{ {
if( side.offsetX > 0 || side.offsetY > 0 || side.offsetZ > 0 ) if( side.offsetX > 0 || side.offsetY > 0 || side.offsetZ > 0 )
{
return 16; return 16;
}
return 0; return 0;
} }
return def; return def;
@@ -84,7 +84,9 @@ public class RenderBlockCraftingCPUMonitor extends RenderBlockCraftingCPU
GL11.glEndList(); GL11.glEndList();
} }
else else
{
GL11.glCallList( cmt.dspList ); GL11.glCallList( cmt.dspList );
}
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
@@ -70,15 +70,21 @@ public class RenderBlockCrank extends BaseBlockRender
{ {
TileCrank tc = (TileCrank) tile; TileCrank tc = (TileCrank) tile;
if( tc.getUp() == null || tc.getUp() == ForgeDirection.UNKNOWN ) if( tc.getUp() == null || tc.getUp() == ForgeDirection.UNKNOWN )
{
return; return;
}
Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture ); Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
if( Minecraft.isAmbientOcclusionEnabled() ) if( Minecraft.isAmbientOcclusionEnabled() )
{
GL11.glShadeModel( GL11.GL_SMOOTH ); GL11.glShadeModel( GL11.GL_SMOOTH );
}
else else
{
GL11.glShadeModel( GL11.GL_FLAT ); GL11.glShadeModel( GL11.GL_FLAT );
}
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
@@ -47,9 +47,13 @@ public class RenderBlockEnergyCube extends BaseBlockRender
int meta = (int) ( 8.0 * ( internalCurrentPower / internalMaxPower ) ); int meta = (int) ( 8.0 * ( internalCurrentPower / internalMaxPower ) );
if( meta > 7 ) if( meta > 7 )
{
meta = 7; meta = 7;
}
if( meta < 0 ) if( meta < 0 )
{
meta = 0; meta = 0;
}
renderer.setOverrideBlockTexture( blk.getIcon( 0, meta ) ); renderer.setOverrideBlockTexture( blk.getIcon( 0, meta ) );
super.renderInventory( blk, is, renderer, type, obj ); super.renderInventory( blk, is, renderer, type, obj );
@@ -112,7 +112,9 @@ public class RenderBlockInscriber extends BaseBlockRender
IOrientable te = this.getOrientable( block, world, x, y, z ); IOrientable te = this.getOrientable( block, world, x, y, z );
if( te == null ) if( te == null )
{
return false; return false;
}
ForgeDirection fdy = te.getUp(); ForgeDirection fdy = te.getUp();
ForgeDirection fdz = te.getForward(); ForgeDirection fdz = te.getForward();
@@ -178,14 +180,18 @@ public class RenderBlockInscriber extends BaseBlockRender
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
absoluteProgress = currentTime - inv.clientStart; absoluteProgress = currentTime - inv.clientStart;
if( absoluteProgress > 800 ) if( absoluteProgress > 800 )
{
inv.smash = false; inv.smash = false;
}
} }
float relativeProgress = absoluteProgress % 800 / 400.0f; float relativeProgress = absoluteProgress % 800 / 400.0f;
float progress = relativeProgress; float progress = relativeProgress;
if( progress > 1.0f ) if( progress > 1.0f )
{
progress = 1.0f - ( progress - 1.0f ); progress = 1.0f - ( progress - 1.0f );
}
press -= progress / 5.0f; press -= progress / 5.0f;
IIcon ic = ExtraBlockTextures.BlockInscriberInside.getIcon(); IIcon ic = ExtraBlockTextures.BlockInscriberInside.getIcon();
@@ -219,11 +225,17 @@ public class RenderBlockInscriber extends BaseBlockRender
int items = 0; int items = 0;
if( inv.getStackInSlot( 0 ) != null ) if( inv.getStackInSlot( 0 ) != null )
{
items++; items++;
}
if( inv.getStackInSlot( 1 ) != null ) if( inv.getStackInSlot( 1 ) != null )
{
items++; items++;
}
if( inv.getStackInSlot( 2 ) != null ) if( inv.getStackInSlot( 2 ) != null )
{
items++; items++;
}
if( relativeProgress > 1.0f || items == 0 ) if( relativeProgress > 1.0f || items == 0 )
{ {
@@ -233,7 +245,9 @@ public class RenderBlockInscriber extends BaseBlockRender
{ {
IInscriberRecipe ir = inv.getTask(); IInscriberRecipe ir = inv.getTask();
if( ir != null ) if( ir != null )
{
is = ir.getOutput().copy(); is = ir.getOutput().copy();
}
} }
this.renderItem( is, 0.0f, block, tile, tess, x, y, z, f, renderer ); this.renderItem( is, 0.0f, block, tile, tess, x, y, z, f, renderer );
@@ -73,13 +73,17 @@ public class RenderBlockPaint extends BaseBlockRender
for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS )
{ {
if( tp.isSideValid( side ) ) if( tp.isSideValid( side ) )
{
validSides.add( side ); validSides.add( side );
}
} }
for( Splotch s : tp.getDots() ) for( Splotch s : tp.getDots() )
{ {
if( !validSides.contains( s.side ) ) if( !validSides.contains( s.side ) )
{
continue; continue;
}
if( s.lumen ) if( s.lumen )
{ {
@@ -54,9 +54,13 @@ public class RenderBlockSkyChest extends BaseBlockRender
ResourceLocation loc; ResourceLocation loc;
if( is.getItemDamage() == 1 ) if( is.getItemDamage() == 1 )
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" ); loc = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
}
else else
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" ); loc = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
}
Minecraft.getMinecraft().getTextureManager().bindTexture( loc ); Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
@@ -83,12 +87,16 @@ public class RenderBlockSkyChest extends BaseBlockRender
public void renderTile( AEBaseBlock block, AEBaseTile tile, Tessellator tess, double x, double y, double z, float partialTick, RenderBlocks renderer ) public void renderTile( AEBaseBlock block, AEBaseTile tile, Tessellator tess, double x, double y, double z, float partialTick, RenderBlocks renderer )
{ {
if( !( tile instanceof TileSkyChest ) ) if( !( tile instanceof TileSkyChest ) )
{
return; return;
}
TileSkyChest skyChest = (TileSkyChest) tile; TileSkyChest skyChest = (TileSkyChest) tile;
if( !skyChest.hasWorldObj() ) if( !skyChest.hasWorldObj() )
{
return; return;
}
GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */ ); GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */ );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -96,9 +104,13 @@ public class RenderBlockSkyChest extends BaseBlockRender
ResourceLocation loc; ResourceLocation loc;
if( tile.getWorldObj().getBlockMetadata( tile.xCoord, tile.yCoord, tile.zCoord ) == 1 ) if( tile.getWorldObj().getBlockMetadata( tile.xCoord, tile.yCoord, tile.zCoord ) == 1 )
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" ); loc = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
}
else else
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" ); loc = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
}
Minecraft.getMinecraft().getTextureManager().bindTexture( loc ); Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
@@ -111,15 +123,23 @@ public class RenderBlockSkyChest extends BaseBlockRender
long distance = now - skyChest.lastEvent; long distance = now - skyChest.lastEvent;
if( skyChest.playerOpen > 0 ) if( skyChest.playerOpen > 0 )
{
skyChest.lidAngle += distance * 0.0001; skyChest.lidAngle += distance * 0.0001;
}
else else
{
skyChest.lidAngle -= distance * 0.0001; skyChest.lidAngle -= distance * 0.0001;
}
if( skyChest.lidAngle > 0.5f ) if( skyChest.lidAngle > 0.5f )
{
skyChest.lidAngle = 0.5f; skyChest.lidAngle = 0.5f;
}
if( skyChest.lidAngle < 0.0f ) if( skyChest.lidAngle < 0.0f )
{
skyChest.lidAngle = 0.0f; skyChest.lidAngle = 0.0f;
}
float lidAngle = skyChest.lidAngle; float lidAngle = skyChest.lidAngle;
lidAngle = 1.0F - lidAngle; lidAngle = 1.0F - lidAngle;
@@ -61,11 +61,17 @@ public class RenderBlockSkyCompass extends BaseBlockRender
IInventory inv = Minecraft.getMinecraft().thePlayer.inventory; IInventory inv = Minecraft.getMinecraft().thePlayer.inventory;
for( int x = 0; x < inv.getSizeInventory(); x++ ) for( int x = 0; x < inv.getSizeInventory(); x++ )
{
if( inv.getStackInSlot( x ) == is ) if( inv.getStackInSlot( x ) == is )
{
isGood = true; isGood = true;
}
}
if( !isGood ) if( !isGood )
{
type = ItemRenderType.FIRST_PERSON_MAP; type = ItemRenderType.FIRST_PERSON_MAP;
}
} }
GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */ ); GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */ );
@@ -85,15 +91,21 @@ public class RenderBlockSkyCompass extends BaseBlockRender
else else
{ {
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON ) if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
{
GL11.glRotatef( 15.3f, 0.0f, 0.0f, 1.0f ); GL11.glRotatef( 15.3f, 0.0f, 0.0f, 1.0f );
}
GL11.glScalef( 1.0F, -1F, -1F ); GL11.glScalef( 1.0F, -1F, -1F );
GL11.glScalef( 2.5f, 2.5f, 2.5f ); GL11.glScalef( 2.5f, 2.5f, 2.5f );
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON ) if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
{
GL11.glTranslatef( 0.3F, -1.65F, -0.19F ); GL11.glTranslatef( 0.3F, -1.65F, -0.19F );
}
else else
{
GL11.glTranslatef( 0.2F, -1.65F, -0.19F ); GL11.glTranslatef( 0.2F, -1.65F, -0.19F );
}
} }
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
@@ -114,8 +126,12 @@ public class RenderBlockSkyCompass extends BaseBlockRender
CompassResult cr = CompassManager.INSTANCE.getCompassDirection( 0, x, y, z ); CompassResult cr = CompassManager.INSTANCE.getCompassDirection( 0, x, y, z );
for( int i = 0; i < 3; i++ ) for( int i = 0; i < 3; i++ )
{
for( int j = 0; j < 3; j++ ) for( int j = 0; j < 3; j++ )
{
CompassManager.INSTANCE.getCompassDirection( 0, x + i - 1, y, z + j - 1 ); CompassManager.INSTANCE.getCompassDirection( 0, x + i - 1, y, z + j - 1 );
}
}
if( cr.hasResult ) if( cr.hasResult )
{ {
@@ -166,12 +182,16 @@ public class RenderBlockSkyCompass extends BaseBlockRender
public void renderTile( AEBaseBlock block, AEBaseTile tile, Tessellator tess, double x, double y, double z, float partialTick, RenderBlocks renderer ) public void renderTile( AEBaseBlock block, AEBaseTile tile, Tessellator tess, double x, double y, double z, float partialTick, RenderBlocks renderer )
{ {
if( !( tile instanceof TileSkyCompass ) ) if( !( tile instanceof TileSkyCompass ) )
{
return; return;
}
TileSkyCompass skyCompass = (TileSkyCompass) tile; TileSkyCompass skyCompass = (TileSkyCompass) tile;
if( !skyCompass.hasWorldObj() ) if( !skyCompass.hasWorldObj() )
{
return; return;
}
GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */ ); GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */ );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -189,9 +209,13 @@ public class RenderBlockSkyCompass extends BaseBlockRender
CompassResult cr = null; CompassResult cr = null;
if( skyCompass.getForward() == ForgeDirection.UP || skyCompass.getForward() == ForgeDirection.DOWN ) if( skyCompass.getForward() == ForgeDirection.UP || skyCompass.getForward() == ForgeDirection.DOWN )
{
cr = CompassManager.INSTANCE.getCompassDirection( 0, tile.xCoord, tile.yCoord, tile.zCoord ); cr = CompassManager.INSTANCE.getCompassDirection( 0, tile.xCoord, tile.yCoord, tile.zCoord );
}
else else
{
cr = new CompassResult( false, true, 0 ); cr = new CompassResult( false, true, 0 );
}
if( cr.hasResult ) if( cr.hasResult )
{ {
@@ -201,7 +225,9 @@ public class RenderBlockSkyCompass extends BaseBlockRender
this.model.renderAll( ( now / 50000.0f ) * (float) Math.PI * 500.0f ); this.model.renderAll( ( now / 50000.0f ) * (float) Math.PI * 500.0f );
} }
else else
{
this.model.renderAll( (float) ( skyCompass.getForward() == ForgeDirection.DOWN ? this.flipidiy( cr.rad ) : cr.rad ) ); this.model.renderAll( (float) ( skyCompass.getForward() == ForgeDirection.DOWN ? this.flipidiy( cr.rad ) : cr.rad ) );
}
} }
else else
{ {
@@ -185,17 +185,29 @@ public class RenderBlockWireless extends BaseBlockRender
} }
if( ForgeDirection.UP != fdz.getOpposite() ) if( ForgeDirection.UP != fdz.getOpposite() )
{
super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.UP ); super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.UP );
}
if( ForgeDirection.DOWN != fdz.getOpposite() ) if( ForgeDirection.DOWN != fdz.getOpposite() )
{
super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.DOWN ); super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.DOWN );
}
if( ForgeDirection.EAST != fdz.getOpposite() ) if( ForgeDirection.EAST != fdz.getOpposite() )
{
super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.EAST ); super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.EAST );
}
if( ForgeDirection.WEST != fdz.getOpposite() ) if( ForgeDirection.WEST != fdz.getOpposite() )
{
super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.WEST ); super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.WEST );
}
if( ForgeDirection.SOUTH != fdz.getOpposite() ) if( ForgeDirection.SOUTH != fdz.getOpposite() )
{
super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.SOUTH ); super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.SOUTH );
}
if( ForgeDirection.NORTH != fdz.getOpposite() ) if( ForgeDirection.NORTH != fdz.getOpposite() )
{
super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.NORTH ); super.renderFace( x, y, z, blk, r, renderer, ForgeDirection.NORTH );
}
ri.setTemporaryRenderIcon( null ); ri.setTemporaryRenderIcon( null );
renderer.renderAllFaces = false; renderer.renderAllFaces = false;
@@ -253,9 +253,13 @@ public class RenderDrive extends BaseBlockRender
} }
if( ( forward == ForgeDirection.UP && up == ForgeDirection.SOUTH ) || forward == ForgeDirection.DOWN ) if( ( forward == ForgeDirection.UP && up == ForgeDirection.SOUTH ) || forward == ForgeDirection.DOWN )
{
this.selectFace( renderer, west, up, forward, 3 + xx * 7, 4 + xx * 7, 1 + yy * 3, 2 + yy * 3 ); this.selectFace( renderer, west, up, forward, 3 + xx * 7, 4 + xx * 7, 1 + yy * 3, 2 + yy * 3 );
}
else else
{
this.selectFace( renderer, west, up, forward, 5 + xx * 7, 6 + xx * 7, 2 + yy * 3, 3 + yy * 3 ); this.selectFace( renderer, west, up, forward, 5 + xx * 7, 6 + xx * 7, 2 + yy * 3, 3 + yy * 3 );
}
if( stat != 0 ) if( stat != 0 )
{ {
@@ -271,16 +275,26 @@ public class RenderDrive extends BaseBlockRender
v4 = whiteIcon.getInterpolatedV( ( ( spin ) % 4 < 2 ) ? 1 : 3 ); v4 = whiteIcon.getInterpolatedV( ( ( spin ) % 4 < 2 ) ? 1 : 3 );
if( sp.isPowered() ) if( sp.isPowered() )
{
tess.setBrightness( 15 << 20 | 15 << 4 ); tess.setBrightness( 15 << 20 | 15 << 4 );
}
else else
{
tess.setBrightness( 0 ); tess.setBrightness( 0 );
}
if( stat == 1 ) if( stat == 1 )
{
Tessellator.instance.setColorOpaque_I( 0x00ff00 ); Tessellator.instance.setColorOpaque_I( 0x00ff00 );
}
if( stat == 2 ) if( stat == 2 )
{
Tessellator.instance.setColorOpaque_I( 0xffaa00 ); Tessellator.instance.setColorOpaque_I( 0xffaa00 );
}
if( stat == 3 ) if( stat == 3 )
{
Tessellator.instance.setColorOpaque_I( 0xff0000 ); Tessellator.instance.setColorOpaque_I( 0xff0000 );
}
switch( forward.offsetX + forward.offsetY * 2 + forward.offsetZ * 3 ) switch( forward.offsetX + forward.offsetY * 2 + forward.offsetZ * 3 )
{ {
@@ -70,7 +70,9 @@ public class RenderMEChest extends BaseBlockRender
renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 ); renderer.setRenderBounds( 0, 0, 0, 1, 1, 1 );
if( sp == null ) if( sp == null )
{
return false; return false;
}
ForgeDirection up = sp.getUp(); ForgeDirection up = sp.getUp();
ForgeDirection forward = sp.getForward(); ForgeDirection forward = sp.getForward();
@@ -86,7 +88,9 @@ public class RenderMEChest extends BaseBlockRender
int offsetU = -4; int offsetU = -4;
int offsetV = 8; int offsetV = 8;
if( stat == 0 ) if( stat == 0 )
{
offsetV = 3; offsetV = 3;
}
int b = world.getLightBrightnessForSkyBlocks( x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ, 0 ); int b = world.getLightBrightnessForSkyBlocks( x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ, 0 );
Tessellator.instance.setBrightness( b ); Tessellator.instance.setBrightness( b );
@@ -94,15 +98,25 @@ public class RenderMEChest extends BaseBlockRender
FlippableIcon flippableIcon = new FlippableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) ); FlippableIcon flippableIcon = new FlippableIcon( new OffsetIcon( ExtraBlockTextures.MEStorageCellTextures.getIcon(), offsetU, offsetV ) );
if( forward == ForgeDirection.EAST && ( up == ForgeDirection.NORTH || up == ForgeDirection.SOUTH ) ) if( forward == ForgeDirection.EAST && ( up == ForgeDirection.NORTH || up == ForgeDirection.SOUTH ) )
{
flippableIcon.setFlip( true, false ); flippableIcon.setFlip( true, false );
}
else if( forward == ForgeDirection.NORTH && up == ForgeDirection.EAST ) else if( forward == ForgeDirection.NORTH && up == ForgeDirection.EAST )
{
flippableIcon.setFlip( false, true ); flippableIcon.setFlip( false, true );
}
else if( forward == ForgeDirection.NORTH && up == ForgeDirection.WEST ) else if( forward == ForgeDirection.NORTH && up == ForgeDirection.WEST )
{
flippableIcon.setFlip( true, false ); flippableIcon.setFlip( true, false );
}
else if( forward == ForgeDirection.DOWN && up == ForgeDirection.EAST ) else if( forward == ForgeDirection.DOWN && up == ForgeDirection.EAST )
{
flippableIcon.setFlip( false, true ); flippableIcon.setFlip( false, true );
}
else if( forward == ForgeDirection.DOWN ) else if( forward == ForgeDirection.DOWN )
{
flippableIcon.setFlip( true, false ); flippableIcon.setFlip( true, false );
}
/* /*
* 1.7.2 * 1.7.2
@@ -123,11 +137,17 @@ public class RenderMEChest extends BaseBlockRender
Tessellator.instance.setBrightness( b ); Tessellator.instance.setBrightness( b );
if( stat == 1 ) if( stat == 1 )
{
Tessellator.instance.setColorOpaque_I( 0x00ff00 ); Tessellator.instance.setColorOpaque_I( 0x00ff00 );
}
if( stat == 2 ) if( stat == 2 )
{
Tessellator.instance.setColorOpaque_I( 0xffaa00 ); Tessellator.instance.setColorOpaque_I( 0xffaa00 );
}
if( stat == 3 ) if( stat == 3 )
{
Tessellator.instance.setColorOpaque_I( 0xff0000 ); Tessellator.instance.setColorOpaque_I( 0xff0000 );
}
this.selectFace( renderer, west, up, forward, 9, 10, 11, 12 ); this.selectFace( renderer, west, up, forward, 9, 10, 11, 12 );
this.renderFace( x, y, z, imb, ExtraBlockTextures.White.getIcon(), renderer, forward ); this.renderFace( x, y, z, imb, ExtraBlockTextures.White.getIcon(), renderer, forward );
} }
@@ -61,7 +61,9 @@ public class RenderQNB extends BaseBlockRender
{ {
TileQuantumBridge tqb = block.getTileEntity( world, x, y, z ); TileQuantumBridge tqb = block.getTileEntity( world, x, y, z );
if( tqb == null ) if( tqb == null )
{
return false; return false;
}
renderer.renderAllFaces = true; renderer.renderAllFaces = true;
@@ -120,7 +122,9 @@ public class RenderQNB extends BaseBlockRender
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F ); Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
Tessellator.instance.setBrightness( bn << 20 | bn << 4 ); Tessellator.instance.setBrightness( bn << 20 | bn << 4 );
for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS )
{
this.renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingCornerLight.getIcon(), renderer, side ); this.renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingCornerLight.getIcon(), renderer, side );
}
} }
} }
else else
@@ -146,7 +150,9 @@ public class RenderQNB extends BaseBlockRender
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F ); Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
Tessellator.instance.setBrightness( bn << 20 | bn << 4 ); Tessellator.instance.setBrightness( bn << 20 | bn << 4 );
for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS )
{
this.renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingEdgeLight.getIcon(), renderer, side ); this.renderFace( x, y, z, block, ExtraBlockTextures.BlockQRingEdgeLight.getIcon(), renderer, side );
}
} }
} }
} }
@@ -47,8 +47,12 @@ public class RenderQuartzGlass extends BaseBlockRender
Random r = new Random( 924 ); Random r = new Random( 924 );
offsets = new byte[10][10][10]; offsets = new byte[10][10][10];
for( int x = 0; x < 10; x++ ) for( int x = 0; x < 10; x++ )
{
for( int y = 0; y < 10; y++ ) for( int y = 0; y < 10; y++ )
{
r.nextBytes( offsets[x][y] ); r.nextBytes( offsets[x][y] );
}
}
} }
} }
@@ -155,18 +159,30 @@ public class RenderQuartzGlass extends BaseBlockRender
} }
if( maxX <= 0.001f ) if( maxX <= 0.001f )
{
maxX += 0.9f / 16.0f; maxX += 0.9f / 16.0f;
}
if( maxY <= 0.001f ) if( maxY <= 0.001f )
{
maxY += 0.9f / 16.0f; maxY += 0.9f / 16.0f;
}
if( maxZ <= 0.001f ) if( maxZ <= 0.001f )
{
maxZ += 0.9f / 16.0f; maxZ += 0.9f / 16.0f;
}
if( minX >= 0.999f ) if( minX >= 0.999f )
{
minX -= 0.9f / 16.0f; minX -= 0.9f / 16.0f;
}
if( minY >= 0.999f ) if( minY >= 0.999f )
{
minY -= 0.9f / 16.0f; minY -= 0.9f / 16.0f;
}
if( minZ >= 0.999f ) if( minZ >= 0.999f )
{
minZ -= 0.9f / 16.0f; minZ -= 0.9f / 16.0f;
}
renderer.setRenderBounds( minX, minY, minZ, maxX, maxY, maxZ ); renderer.setRenderBounds( minX, minY, minZ, maxX, maxY, maxZ );
@@ -136,7 +136,9 @@ public class RenderSpatialPylon extends BaseBlockRender
Tessellator.instance.setColorOpaque_I( 0xffffff ); Tessellator.instance.setColorOpaque_I( 0xffffff );
for( ForgeDirection d : ForgeDirection.VALID_DIRECTIONS ) for( ForgeDirection d : ForgeDirection.VALID_DIRECTIONS )
{
this.renderFace( x, y, z, imb, this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, d ), renderer, d ); this.renderFace( x, y, z, imb, this.getBlockTextureFromSideInside( imb, sp, displayBits, ori, d ), renderer, d );
}
} }
else else
{ {
@@ -166,16 +168,22 @@ public class RenderSpatialPylon extends BaseBlockRender
{ {
if( ori == dir || ori.getOpposite() == dir ) if( ori == dir || ori.getOpposite() == dir )
{
return blk.getRendererInstance().getTexture( dir ); return blk.getRendererInstance().getTexture( dir );
}
if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_MIDDLE ) if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_MIDDLE )
{
return ExtraBlockTextures.BlockSpatialPylonC.getIcon(); return ExtraBlockTextures.BlockSpatialPylonC.getIcon();
}
else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MIN ) else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MIN )
{
return ExtraBlockTextures.BlockSpatialPylonE.getIcon(); return ExtraBlockTextures.BlockSpatialPylonE.getIcon();
}
else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MAX ) else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MAX )
{
return ExtraBlockTextures.BlockSpatialPylonE.getIcon(); return ExtraBlockTextures.BlockSpatialPylonE.getIcon();
}
return blk.getIcon( 0, 0 ); return blk.getIcon( 0, 0 );
} }
@@ -185,16 +193,22 @@ public class RenderSpatialPylon extends BaseBlockRender
boolean good = ( displayBits & sp.DISPLAY_ENABLED ) == sp.DISPLAY_ENABLED; boolean good = ( displayBits & sp.DISPLAY_ENABLED ) == sp.DISPLAY_ENABLED;
if( ori == dir || ori.getOpposite() == dir ) if( ori == dir || ori.getOpposite() == dir )
{
return good ? ExtraBlockTextures.BlockSpatialPylon_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylon_red.getIcon(); return good ? ExtraBlockTextures.BlockSpatialPylon_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylon_red.getIcon();
}
if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_MIDDLE ) if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_MIDDLE )
{
return good ? ExtraBlockTextures.BlockSpatialPylonC_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonC_red.getIcon(); return good ? ExtraBlockTextures.BlockSpatialPylonC_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonC_red.getIcon();
}
else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MIN ) else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MIN )
{
return good ? ExtraBlockTextures.BlockSpatialPylonE_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonE_red.getIcon(); return good ? ExtraBlockTextures.BlockSpatialPylonE_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonE_red.getIcon();
}
else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MAX ) else if( ( displayBits & sp.DISPLAY_MIDDLE ) == sp.DISPLAY_END_MAX )
{
return good ? ExtraBlockTextures.BlockSpatialPylonE_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonE_red.getIcon(); return good ? ExtraBlockTextures.BlockSpatialPylonE_dim.getIcon() : ExtraBlockTextures.BlockSpatialPylonE_red.getIcon();
}
return blk.getIcon( 0, 0 ); return blk.getIcon( 0, 0 );
} }
@@ -64,7 +64,9 @@ public class AssemblerFX extends EntityFX
super.onUpdate(); super.onUpdate();
if( this.isDead ) if( this.isDead )
{
this.fi.setDead(); this.fi.setDead();
}
else else
{ {
float lifeSpan = (float) this.particleAge / (float) this.particleMaxAge; float lifeSpan = (float) this.particleAge / (float) this.particleMaxAge;
@@ -81,7 +83,9 @@ public class AssemblerFX extends EntityFX
this.time -= 4.0; this.time -= 4.0;
// if ( CommonHelper.proxy.shouldAddParticles( r ) ) // if ( CommonHelper.proxy.shouldAddParticles( r ) )
for( int x = 0; x < (int) Math.ceil( this.speed / 5 ); x++ ) for( int x = 0; x < (int) Math.ceil( this.speed / 5 ); x++ )
{
CommonHelper.proxy.spawnEffect( EffectType.Crafting, this.worldObj, this.posX, this.posY, this.posZ, null ); CommonHelper.proxy.spawnEffect( EffectType.Crafting, this.worldObj, this.posX, this.posY, this.posZ, null );
}
} }
} }
} }
@@ -38,7 +38,9 @@ public class ChargedOreFX extends EntityReddustFX
j1 = Math.max( j1 >> 20, j1 >> 4 ); j1 = Math.max( j1 >> 20, j1 >> 4 );
j1 += 3; j1 += 3;
if( j1 > 15 ) if( j1 > 15 )
{
j1 = 15; j1 = 15;
}
return j1 << 20 | j1 << 4; return j1 << 20 | j1 << 4;
} }
} }
@@ -72,7 +72,9 @@ public class CraftingFx extends EntityBreakingFX
public void renderParticle( Tessellator par1Tessellator, float partialTick, float x, float y, float z, float rx, float rz ) public void renderParticle( Tessellator par1Tessellator, float partialTick, float x, float y, float z, float rx, float rz )
{ {
if( partialTick < 0 || partialTick > 1 ) if( partialTick < 0 || partialTick > 1 )
{
return; return;
}
float f6 = this.particleTextureIndex.getMinU(); float f6 = this.particleTextureIndex.getMinU();
float f7 = this.particleTextureIndex.getMaxU(); float f7 = this.particleTextureIndex.getMaxU();
@@ -46,7 +46,9 @@ public class ItemEncodedPatternRenderer implements IItemRenderer
{ {
ItemEncodedPattern iep = (ItemEncodedPattern) item.getItem(); ItemEncodedPattern iep = (ItemEncodedPattern) item.getItem();
if( iep.getOutput( item ) != null ) if( iep.getOutput( item ) != null )
{
return true; return true;
}
} }
return false; return false;
@@ -52,7 +52,9 @@ public class PaintBallRender implements IItemRenderer
{ {
IIcon par2Icon = item.getIconIndex(); IIcon par2Icon = item.getIconIndex();
if( item.getItemDamage() >= 20 ) if( item.getItemDamage() >= 20 )
{
par2Icon = ExtraItemTextures.ItemPaintBallShimmer.getIcon(); par2Icon = ExtraItemTextures.ItemPaintBallShimmer.getIcon();
}
float f4 = par2Icon.getMinU(); float f4 = par2Icon.getMinU();
float f5 = par2Icon.getMaxU(); float f5 = par2Icon.getMaxU();
@@ -77,9 +79,13 @@ public class PaintBallRender implements IItemRenderer
float fail = 0.7f; float fail = 0.7f;
if( item.getItemDamage() >= 20 ) if( item.getItemDamage() >= 20 )
{
GL11.glColor4ub( (byte) ( full + r * fail ), (byte) ( full + g * fail ), (byte) ( full + b * fail ), (byte) 255 ); GL11.glColor4ub( (byte) ( full + r * fail ), (byte) ( full + g * fail ), (byte) ( full + b * fail ), (byte) 255 );
}
else else
{
GL11.glColor4ub( (byte) r, (byte) g, (byte) b, (byte) 255 ); GL11.glColor4ub( (byte) r, (byte) g, (byte) b, (byte) 255 );
}
if( type == ItemRenderType.INVENTORY ) if( type == ItemRenderType.INVENTORY )
{ {
@@ -99,9 +105,13 @@ public class PaintBallRender implements IItemRenderer
else else
{ {
if( type == ItemRenderType.EQUIPPED_FIRST_PERSON ) if( type == ItemRenderType.EQUIPPED_FIRST_PERSON )
{
GL11.glTranslatef( 0.0F, 0.0F, 0.0F ); GL11.glTranslatef( 0.0F, 0.0F, 0.0F );
}
else else
{
GL11.glTranslatef( -0.5F, -0.3F, 0.01F ); GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
}
ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 ); ItemRenderer.renderItemIn2D( tessellator, f5, f6, f4, f7, par2Icon.getIconWidth(), par2Icon.getIconHeight(), f12 );
GL11.glDisable( GL11.GL_CULL_FACE ); GL11.glDisable( GL11.GL_CULL_FACE );
@@ -100,7 +100,9 @@ public class ToolBiometricCardRender implements IItemRenderer
{ {
GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item ); GameProfile gp = ( (IBiometricCard) item.getItem() ).getProfile( item );
if( gp != null ) if( gp != null )
{
username = gp.getName(); username = gp.getName();
}
} }
int hash = username.length() > 0 ? username.hashCode() : 0; int hash = username.length() > 0 ? username.hashCode() : 0;
@@ -113,7 +115,9 @@ public class ToolBiometricCardRender implements IItemRenderer
AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length]; AEColor col = AEColor.values()[Math.abs( 3 + hash ) % AEColor.values().length];
if( hash == 0 ) if( hash == 0 )
{
col = AEColor.Black; col = AEColor.Black;
}
for( int x = 0; x < 8; x++ )// 8 for( int x = 0; x < 8; x++ )// 8
{ {
@@ -123,14 +127,22 @@ public class ToolBiometricCardRender implements IItemRenderer
float scale = 0.3f / 255.0f; float scale = 0.3f / 255.0f;
if( x == 0 || y == 0 || x == 7 || y == 5 ) if( x == 0 || y == 0 || x == 7 || y == 5 )
{
isLit = false; isLit = false;
}
else else
{
isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0; isLit = ( hash & ( 1 << x ) ) != 0 || ( hash & ( 1 << y ) ) != 0;
}
if( isLit ) if( isLit )
{
tessellator.setColorOpaque_I( col.mediumVariant ); tessellator.setColorOpaque_I( col.mediumVariant );
}
else else
{
tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, ( col.blackVariant & 0xff ) * scale ); tessellator.setColorOpaque_F( ( ( col.blackVariant >> 16 ) & 0xff ) * scale, ( ( col.blackVariant >> 8 ) & 0xff ) * scale, ( col.blackVariant & 0xff ) * scale );
}
tessellator.addVertexWithUV( x, y, z, u, v ); tessellator.addVertexWithUV( x, y, z, u, v );
tessellator.addVertexWithUV( x + 1, y, z, u, v ); tessellator.addVertexWithUV( x + 1, y, z, u, v );

Some files were not shown because too many files have changed in this diff Show More