Merge pull request #1911 from thatsIch/e-scope-too-broad
Reduce scope of variables
This commit is contained in:
commit
e52400bf26
|
@ -408,21 +408,15 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
public void registerBlockIcons( IIconRegister iconRegistry )
|
public void registerBlockIcons( IIconRegister iconRegistry )
|
||||||
{
|
{
|
||||||
final BlockRenderInfo info = this.getRendererInstance();
|
final BlockRenderInfo info = this.getRendererInstance();
|
||||||
final FlippableIcon topIcon;
|
final FlippableIcon topIcon = this.optionalIcon( iconRegistry, this.getTextureName(), null );
|
||||||
final FlippableIcon bottomIcon;
|
final FlippableIcon bottomIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon );
|
||||||
final FlippableIcon sideIcon;
|
final FlippableIcon sideIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Side", topIcon );
|
||||||
final FlippableIcon eastIcon;
|
final FlippableIcon eastIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "East", sideIcon );
|
||||||
final FlippableIcon westIcon;
|
final FlippableIcon westIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "West", sideIcon );
|
||||||
final FlippableIcon southIcon;
|
final FlippableIcon southIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Front", sideIcon );
|
||||||
final FlippableIcon northIcon;
|
final FlippableIcon northIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Back", sideIcon );
|
||||||
|
|
||||||
this.blockIcon = topIcon = this.optionalIcon( iconRegistry, this.getTextureName(), null );
|
this.blockIcon = topIcon;
|
||||||
bottomIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Bottom", topIcon );
|
|
||||||
sideIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Side", topIcon );
|
|
||||||
eastIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "East", sideIcon );
|
|
||||||
westIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "West", sideIcon );
|
|
||||||
southIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Front", sideIcon );
|
|
||||||
northIcon = this.optionalIcon( iconRegistry, this.getTextureName() + "Back", sideIcon );
|
|
||||||
|
|
||||||
info.updateIcons( bottomIcon, topIcon, northIcon, southIcon, eastIcon, westIcon );
|
info.updateIcons( bottomIcon, topIcon, northIcon, southIcon, eastIcon, westIcon );
|
||||||
}
|
}
|
||||||
|
@ -557,7 +551,6 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
|
|
||||||
final ForgeDirection forward = ori.getForward();
|
final ForgeDirection forward = ori.getForward();
|
||||||
final ForgeDirection up = ori.getUp();
|
final ForgeDirection up = ori.getUp();
|
||||||
ForgeDirection west = ForgeDirection.UNKNOWN;
|
|
||||||
|
|
||||||
if( forward == null || up == null )
|
if( forward == null || up == null )
|
||||||
{
|
{
|
||||||
|
@ -568,6 +561,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature
|
||||||
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;
|
||||||
|
|
||||||
|
ForgeDirection west = ForgeDirection.UNKNOWN;
|
||||||
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 )
|
||||||
|
|
|
@ -103,8 +103,6 @@ public class AEBaseItemBlock extends ItemBlock
|
||||||
ForgeDirection up = ForgeDirection.UNKNOWN;
|
ForgeDirection up = ForgeDirection.UNKNOWN;
|
||||||
ForgeDirection forward = ForgeDirection.UNKNOWN;
|
ForgeDirection forward = ForgeDirection.UNKNOWN;
|
||||||
|
|
||||||
IOrientable ori = null;
|
|
||||||
|
|
||||||
if( this.blockType instanceof AEBaseTileBlock )
|
if( this.blockType instanceof AEBaseTileBlock )
|
||||||
{
|
{
|
||||||
if( this.blockType instanceof BlockLightDetector )
|
if( this.blockType instanceof BlockLightDetector )
|
||||||
|
@ -167,6 +165,7 @@ public class AEBaseItemBlock extends ItemBlock
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IOrientable ori = null;
|
||||||
if( this.blockType instanceof IOrientableBlock )
|
if( this.blockType instanceof IOrientableBlock )
|
||||||
{
|
{
|
||||||
ori = ( (IOrientableBlock) this.blockType ).getOrientable( w, x, y, z );
|
ori = ( (IOrientableBlock) this.blockType ).getOrientable( w, x, y, z );
|
||||||
|
|
|
@ -84,13 +84,12 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
|
||||||
double ry = 0.5 + y;
|
double ry = 0.5 + y;
|
||||||
double rz = 0.5 + z;
|
double rz = 0.5 + z;
|
||||||
|
|
||||||
double dx = 0;
|
|
||||||
double dz = 0;
|
|
||||||
|
|
||||||
rx += up.offsetX * d0;
|
rx += up.offsetX * d0;
|
||||||
ry += up.offsetY * d0;
|
ry += up.offsetY * d0;
|
||||||
rz += up.offsetZ * d0;
|
rz += up.offsetZ * d0;
|
||||||
|
|
||||||
|
double dz = 0;
|
||||||
|
double dx = 0;
|
||||||
switch( r.nextInt( 4 ) )
|
switch( r.nextInt( 4 ) )
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
|
|
|
@ -140,7 +140,6 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean isVisual )
|
||||||
{
|
{
|
||||||
TileSkyChest sk = this.getTileEntity( w, x, y, z );
|
TileSkyChest sk = this.getTileEntity( w, x, y, z );
|
||||||
double sc = 0.06;
|
|
||||||
ForgeDirection o = ForgeDirection.UNKNOWN;
|
ForgeDirection o = ForgeDirection.UNKNOWN;
|
||||||
|
|
||||||
if( sk != null )
|
if( sk != null )
|
||||||
|
@ -152,6 +151,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
|
||||||
double offsetY = o.offsetY == 0 ? 0.06 : 0.0;
|
double offsetY = o.offsetY == 0 ? 0.06 : 0.0;
|
||||||
double offsetZ = o.offsetZ == 0 ? 0.06 : 0.0;
|
double offsetZ = o.offsetZ == 0 ? 0.06 : 0.0;
|
||||||
|
|
||||||
|
double sc = 0.06;
|
||||||
return Collections.singletonList( AxisAlignedBB.getBoundingBox( Math.max( 0.0, offsetX - o.offsetX * sc ), Math.max( 0.0, offsetY - o.offsetY * sc ), Math.max( 0.0, offsetZ - o.offsetZ * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.offsetX * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.offsetY * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.offsetZ * sc ) ) );
|
return Collections.singletonList( AxisAlignedBB.getBoundingBox( Math.max( 0.0, offsetX - o.offsetX * sc ), Math.max( 0.0, offsetY - o.offsetY * sc ), Math.max( 0.0, offsetZ - o.offsetZ * sc ), Math.min( 1.0, ( 1.0 - offsetX ) - o.offsetX * sc ), Math.min( 1.0, ( 1.0 - offsetY ) - o.offsetY * sc ), Math.min( 1.0, ( 1.0 - offsetZ ) - o.offsetZ * sc ) ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -818,14 +818,14 @@ public abstract class AEBaseGui extends GuiContainer
|
||||||
float par2 = aes.yDisplayPosition;
|
float par2 = aes.yDisplayPosition;
|
||||||
float par3 = uv_x * 16;
|
float par3 = uv_x * 16;
|
||||||
float par4 = uv_y * 16;
|
float par4 = uv_y * 16;
|
||||||
float par5 = 16;
|
|
||||||
float par6 = 16;
|
|
||||||
|
|
||||||
float f = 0.00390625F;
|
|
||||||
float f1 = 0.00390625F;
|
|
||||||
tessellator.startDrawingQuads();
|
tessellator.startDrawingQuads();
|
||||||
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
|
tessellator.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
|
||||||
|
float f1 = 0.00390625F;
|
||||||
|
float f = 0.00390625F;
|
||||||
|
float par6 = 16;
|
||||||
tessellator.addVertexWithUV( par1 + 0, par2 + par6, this.zLevel, ( par3 + 0 ) * f, ( par4 + par6 ) * f1 );
|
tessellator.addVertexWithUV( par1 + 0, par2 + par6, this.zLevel, ( par3 + 0 ) * f, ( par4 + par6 ) * f1 );
|
||||||
|
float par5 = 16;
|
||||||
tessellator.addVertexWithUV( par1 + par5, par2 + par6, this.zLevel, ( par3 + par5 ) * f, ( par4 + par6 ) * f1 );
|
tessellator.addVertexWithUV( par1 + par5, par2 + par6, this.zLevel, ( par3 + par5 ) * f, ( par4 + par6 ) * f1 );
|
||||||
tessellator.addVertexWithUV( par1 + par5, par2 + 0, this.zLevel, ( par3 + par5 ) * f, ( par4 + 0 ) * f1 );
|
tessellator.addVertexWithUV( par1 + par5, par2 + 0, this.zLevel, ( par3 + par5 ) * f, ( par4 + 0 ) * f1 );
|
||||||
tessellator.addVertexWithUV( par1 + 0, par2 + 0, this.zLevel, ( par3 + 0 ) * f, ( par4 + 0 ) * f1 );
|
tessellator.addVertexWithUV( par1 + 0, par2 + 0, this.zLevel, ( par3 + 0 ) * f, ( par4 + 0 ) * f1 );
|
||||||
|
|
|
@ -138,15 +138,14 @@ public class GuiCraftConfirm extends AEBaseGui
|
||||||
this.start.enabled = !( this.ccc.noCPU || this.isSimulation() );
|
this.start.enabled = !( this.ccc.noCPU || this.isSimulation() );
|
||||||
this.selectCPU.enabled = !this.isSimulation();
|
this.selectCPU.enabled = !this.isSimulation();
|
||||||
|
|
||||||
int x = 0;
|
|
||||||
int y = 0;
|
|
||||||
|
|
||||||
int gx = ( this.width - this.xSize ) / 2;
|
int gx = ( this.width - this.xSize ) / 2;
|
||||||
int gy = ( this.height - this.ySize ) / 2;
|
int gy = ( this.height - this.ySize ) / 2;
|
||||||
int offY = 23;
|
|
||||||
|
|
||||||
this.tooltip = -1;
|
this.tooltip = -1;
|
||||||
|
|
||||||
|
int offY = 23;
|
||||||
|
int y = 0;
|
||||||
|
int x = 0;
|
||||||
for( int z = 0; z <= 4 * 5; z++ )
|
for( int z = 0; z <= 4 * 5; z++ )
|
||||||
{
|
{
|
||||||
int minX = gx + 9 + x * 67;
|
int minX = gx + 9 + x * 67;
|
||||||
|
@ -269,7 +268,6 @@ public class GuiCraftConfirm extends AEBaseGui
|
||||||
|
|
||||||
int negY = ( ( lines - 1 ) * 5 ) / 2;
|
int negY = ( ( lines - 1 ) * 5 ) / 2;
|
||||||
int downY = 0;
|
int downY = 0;
|
||||||
boolean red = false;
|
|
||||||
|
|
||||||
if( stored != null && stored.getStackSize() > 0 )
|
if( stored != null && stored.getStackSize() > 0 )
|
||||||
{
|
{
|
||||||
|
@ -295,6 +293,7 @@ public class GuiCraftConfirm extends AEBaseGui
|
||||||
downY += 5;
|
downY += 5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean red = false;
|
||||||
if( missingStack != null && missingStack.getStackSize() > 0 )
|
if( missingStack != null && missingStack.getStackSize() > 0 )
|
||||||
{
|
{
|
||||||
String str = Long.toString( missingStack.getStackSize() );
|
String str = Long.toString( missingStack.getStackSize() );
|
||||||
|
|
|
@ -154,15 +154,14 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
|
||||||
{
|
{
|
||||||
this.cancel.enabled = !this.visual.isEmpty();
|
this.cancel.enabled = !this.visual.isEmpty();
|
||||||
|
|
||||||
int x = 0;
|
|
||||||
int y = 0;
|
|
||||||
|
|
||||||
final int gx = ( this.width - this.xSize ) / 2;
|
final int gx = ( this.width - this.xSize ) / 2;
|
||||||
final int gy = ( this.height - this.ySize ) / 2;
|
final int gy = ( this.height - this.ySize ) / 2;
|
||||||
final int offY = 23;
|
|
||||||
|
|
||||||
this.tooltip = -1;
|
this.tooltip = -1;
|
||||||
|
|
||||||
|
final int offY = 23;
|
||||||
|
int y = 0;
|
||||||
|
int x = 0;
|
||||||
for( int z = 0; z <= 4 * 5; z++ )
|
for( int z = 0; z <= 4 * 5; z++ )
|
||||||
{
|
{
|
||||||
int minX = gx + 9 + x * 67;
|
int minX = gx + 9 + x * 67;
|
||||||
|
@ -192,7 +191,6 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
|
||||||
@Override
|
@Override
|
||||||
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
|
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
|
||||||
{
|
{
|
||||||
final ReadableNumberConverter converter = ReadableNumberConverter.INSTANCE;
|
|
||||||
String title = this.getGuiDisplayName( GuiText.CraftingStatus.getLocal() );
|
String title = this.getGuiDisplayName( GuiText.CraftingStatus.getLocal() );
|
||||||
|
|
||||||
if( this.craftingCpu.eta > 0 && !this.visual.isEmpty() )
|
if( this.craftingCpu.eta > 0 && !this.visual.isEmpty() )
|
||||||
|
@ -216,6 +214,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
|
||||||
|
|
||||||
int offY = 23;
|
int offY = 23;
|
||||||
|
|
||||||
|
final ReadableNumberConverter converter = ReadableNumberConverter.INSTANCE;
|
||||||
for( int z = viewStart; z < Math.min( viewEnd, this.visual.size() ); z++ )
|
for( int z = viewStart; z < Math.min( viewEnd, this.visual.size() ); z++ )
|
||||||
{
|
{
|
||||||
IAEItemStack refStack = this.visual.get( z );// repo.getReferenceItem( z );
|
IAEItemStack refStack = this.visual.get( z );// repo.getReferenceItem( z );
|
||||||
|
@ -229,18 +228,18 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
|
||||||
final IAEItemStack pendingStack = this.pending.findPrecise( refStack );
|
final IAEItemStack pendingStack = this.pending.findPrecise( refStack );
|
||||||
|
|
||||||
int lines = 0;
|
int lines = 0;
|
||||||
boolean active = false;
|
|
||||||
boolean scheduled = false;
|
|
||||||
|
|
||||||
if( stored != null && stored.getStackSize() > 0 )
|
if( stored != null && stored.getStackSize() > 0 )
|
||||||
{
|
{
|
||||||
lines++;
|
lines++;
|
||||||
}
|
}
|
||||||
|
boolean active = false;
|
||||||
if( activeStack != null && activeStack.getStackSize() > 0 )
|
if( activeStack != null && activeStack.getStackSize() > 0 )
|
||||||
{
|
{
|
||||||
lines++;
|
lines++;
|
||||||
active = true;
|
active = true;
|
||||||
}
|
}
|
||||||
|
boolean scheduled = false;
|
||||||
if( pendingStack != null && pendingStack.getStackSize() > 0 )
|
if( pendingStack != null && pendingStack.getStackSize() > 0 )
|
||||||
{
|
{
|
||||||
lines++;
|
lines++;
|
||||||
|
|
|
@ -66,8 +66,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable
|
||||||
|
|
||||||
if( s != null )
|
if( s != null )
|
||||||
{
|
{
|
||||||
PacketInventoryAction p;
|
PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 );
|
||||||
p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 );
|
|
||||||
NetworkHandler.instance.sendToServer( p );
|
NetworkHandler.instance.sendToServer( p );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,7 +98,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
|
||||||
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
|
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.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 );
|
||||||
|
|
||||||
int offset = 17;
|
|
||||||
int ex = this.myScrollBar.getCurrentScroll();
|
int ex = this.myScrollBar.getCurrentScroll();
|
||||||
|
|
||||||
Iterator<Object> o = this.inventorySlots.inventorySlots.iterator();
|
Iterator<Object> o = this.inventorySlots.inventorySlots.iterator();
|
||||||
|
@ -110,6 +109,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int offset = 17;
|
||||||
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++ )
|
||||||
{
|
{
|
||||||
Object lineObj = this.lines.get( ex + x );
|
Object lineObj = this.lines.get( ex + x );
|
||||||
|
|
|
@ -393,9 +393,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
|
||||||
@Override
|
@Override
|
||||||
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
|
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
|
||||||
{
|
{
|
||||||
int x_width = 197;
|
|
||||||
|
|
||||||
this.bindTexture( this.getBackground() );
|
this.bindTexture( this.getBackground() );
|
||||||
|
int x_width = 197;
|
||||||
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 ) )
|
||||||
|
|
|
@ -91,14 +91,14 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen( int mouseX, int mouseY, float btn )
|
public void drawScreen( int mouseX, int mouseY, float btn )
|
||||||
{
|
{
|
||||||
int x = 0;
|
|
||||||
int y = 0;
|
|
||||||
|
|
||||||
int gx = ( this.width - this.xSize ) / 2;
|
int gx = ( this.width - this.xSize ) / 2;
|
||||||
int gy = ( this.height - this.ySize ) / 2;
|
int gy = ( this.height - this.ySize ) / 2;
|
||||||
|
|
||||||
this.tooltip = -1;
|
this.tooltip = -1;
|
||||||
|
|
||||||
|
int y = 0;
|
||||||
|
int x = 0;
|
||||||
for( int z = 0; z <= 4 * 5; z++ )
|
for( int z = 0; z <= 4 * 5; z++ )
|
||||||
{
|
{
|
||||||
int minX = gx + 14 + x * 31;
|
int minX = gx + 14 + x * 31;
|
||||||
|
|
|
@ -59,9 +59,6 @@ public class GuiVibrationChamber extends AEBaseGui
|
||||||
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.VibrationChamber.getLocal() ), 8, 6, 4210752 );
|
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.VibrationChamber.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 );
|
||||||
|
|
||||||
int k = 25;
|
|
||||||
int l = -15;
|
|
||||||
|
|
||||||
this.pb.setFullMsg( this.cvc.aePerTick * this.cvc.getCurrentProgress() / 100 + " AE/t" );
|
this.pb.setFullMsg( this.cvc.aePerTick * this.cvc.getCurrentProgress() / 100 + " AE/t" );
|
||||||
|
|
||||||
if( this.cvc.getCurrentProgress() > 0 )
|
if( this.cvc.getCurrentProgress() > 0 )
|
||||||
|
@ -69,6 +66,8 @@ public class GuiVibrationChamber extends AEBaseGui
|
||||||
int i1 = this.cvc.getCurrentProgress();
|
int i1 = this.cvc.getCurrentProgress();
|
||||||
this.bindTexture( "guis/vibchamber.png" );
|
this.bindTexture( "guis/vibchamber.png" );
|
||||||
GL11.glColor3f( 1, 1, 1 );
|
GL11.glColor3f( 1, 1, 1 );
|
||||||
|
int l = -15;
|
||||||
|
int k = 25;
|
||||||
this.drawTexturedModalRect( k + 56, l + 36 + 12 - i1, 176, 12 - i1, 14, i1 + 2 );
|
this.drawTexturedModalRect( k + 56, l + 36 + 12 - i1, 176, 12 - i1, 14, i1 + 2 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -415,15 +415,13 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
|
||||||
|
|
||||||
public void preRenderInWorld( B block, IBlockAccess world, int x, int y, int z, RenderBlocks renderer )
|
public void preRenderInWorld( B block, IBlockAccess world, int x, int y, int z, RenderBlocks renderer )
|
||||||
{
|
{
|
||||||
ForgeDirection forward = ForgeDirection.SOUTH;
|
|
||||||
ForgeDirection up = ForgeDirection.UP;
|
|
||||||
|
|
||||||
BlockRenderInfo info = block.getRendererInstance();
|
BlockRenderInfo info = block.getRendererInstance();
|
||||||
IOrientable te = this.getOrientable( block, world, x, y, z );
|
IOrientable te = this.getOrientable( block, world, x, y, z );
|
||||||
if( te != null )
|
if( te != null )
|
||||||
{
|
{
|
||||||
forward = te.getForward();
|
ForgeDirection forward = te.getForward();
|
||||||
up = te.getUp();
|
ForgeDirection up = te.getUp();
|
||||||
|
|
||||||
renderer.uvRotateBottom = info.getTexture( ForgeDirection.DOWN ).setFlip( getOrientation( ForgeDirection.DOWN, forward, up ) );
|
renderer.uvRotateBottom = info.getTexture( ForgeDirection.DOWN ).setFlip( getOrientation( ForgeDirection.DOWN, forward, up ) );
|
||||||
renderer.uvRotateTop = info.getTexture( ForgeDirection.UP ).setFlip( getOrientation( ForgeDirection.UP, forward, up ) );
|
renderer.uvRotateTop = info.getTexture( ForgeDirection.UP ).setFlip( getOrientation( ForgeDirection.UP, forward, up ) );
|
||||||
|
@ -510,9 +508,7 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
|
||||||
double offsetY = 0.0;
|
double offsetY = 0.0;
|
||||||
double offsetZ = 0.0;
|
double offsetZ = 0.0;
|
||||||
double layerAX = 0.0;
|
double layerAX = 0.0;
|
||||||
double layerAY = 0.0;
|
|
||||||
double layerAZ = 0.0;
|
double layerAZ = 0.0;
|
||||||
double layerBX = 0.0;
|
|
||||||
double layerBY = 0.0;
|
double layerBY = 0.0;
|
||||||
double layerBZ = 0.0;
|
double layerBZ = 0.0;
|
||||||
|
|
||||||
|
@ -569,6 +565,8 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
|
||||||
offsetY += y;
|
offsetY += y;
|
||||||
offsetZ += z;
|
offsetZ += z;
|
||||||
|
|
||||||
|
double layerBX = 0.0;
|
||||||
|
double layerAY = 0.0;
|
||||||
this.renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
|
this.renderFace( tess, offsetX, offsetY, offsetZ, layerAX, layerAY, layerAZ, layerBX, layerBY, layerBZ,
|
||||||
// u -> u
|
// u -> u
|
||||||
0, 1.0,
|
0, 1.0,
|
||||||
|
@ -681,11 +679,11 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
|
||||||
|
|
||||||
public void renderTile( B block, T tile, Tessellator tess, double x, double y, double z, float f, RenderBlocks renderer )
|
public void renderTile( B block, T tile, Tessellator tess, double x, double y, double z, float f, RenderBlocks renderer )
|
||||||
{
|
{
|
||||||
ForgeDirection forward = ForgeDirection.SOUTH;
|
|
||||||
ForgeDirection up = ForgeDirection.UP;
|
|
||||||
|
|
||||||
renderer.uvRotateBottom = renderer.uvRotateTop = renderer.uvRotateEast = renderer.uvRotateWest = renderer.uvRotateNorth = renderer.uvRotateSouth = 0;
|
renderer.uvRotateBottom = renderer.uvRotateTop = renderer.uvRotateEast = renderer.uvRotateWest = renderer.uvRotateNorth = renderer.uvRotateSouth = 0;
|
||||||
|
|
||||||
|
ForgeDirection up = ForgeDirection.UP;
|
||||||
|
ForgeDirection forward = ForgeDirection.SOUTH;
|
||||||
this.applyTESRRotation( x, y, z, forward, up );
|
this.applyTESRRotation( x, y, z, forward, up );
|
||||||
|
|
||||||
Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
|
Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.locationBlocksTexture );
|
||||||
|
|
|
@ -396,7 +396,6 @@ public final class BusRenderHelper implements IPartRenderHelper
|
||||||
{
|
{
|
||||||
ForgeDirection forward = this.az;
|
ForgeDirection forward = this.az;
|
||||||
ForgeDirection up = this.ay;
|
ForgeDirection up = this.ay;
|
||||||
ForgeDirection west = ForgeDirection.UNKNOWN;
|
|
||||||
|
|
||||||
if( forward == null || up == null )
|
if( forward == null || up == null )
|
||||||
{
|
{
|
||||||
|
@ -407,6 +406,7 @@ public final class BusRenderHelper implements IPartRenderHelper
|
||||||
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;
|
||||||
|
|
||||||
|
ForgeDirection west = ForgeDirection.UNKNOWN;
|
||||||
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 )
|
||||||
|
|
|
@ -122,9 +122,9 @@ public class CableRenderHelper
|
||||||
IFacadePart fPart = iFacadeContainer.getFacade( s );
|
IFacadePart fPart = iFacadeContainer.getFacade( s );
|
||||||
if( fPart != null )
|
if( fPart != null )
|
||||||
{
|
{
|
||||||
AxisAlignedBB b = null;
|
|
||||||
fPart.setThinFacades( useThinFacades );
|
fPart.setThinFacades( useThinFacades );
|
||||||
AxisAlignedBB pb = fPart.getPrimaryBox();
|
AxisAlignedBB pb = fPart.getPrimaryBox();
|
||||||
|
AxisAlignedBB b = null;
|
||||||
for( AxisAlignedBB bb : boxes )
|
for( AxisAlignedBB bb : boxes )
|
||||||
{
|
{
|
||||||
if( bb.intersectsWith( pb ) )
|
if( bb.intersectsWith( pb ) )
|
||||||
|
|
|
@ -57,7 +57,6 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
|
||||||
@Override
|
@Override
|
||||||
public boolean renderInWorld( B blk, IBlockAccess w, int x, int y, int z, RenderBlocks renderer )
|
public boolean renderInWorld( B blk, IBlockAccess w, int x, int y, int z, RenderBlocks renderer )
|
||||||
{
|
{
|
||||||
IIcon theIcon = null;
|
|
||||||
boolean formed = false;
|
boolean formed = false;
|
||||||
boolean emitsLight = false;
|
boolean emitsLight = false;
|
||||||
|
|
||||||
|
@ -70,7 +69,7 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
|
||||||
int meta = w.getBlockMetadata( x, y, z ) & 3;
|
int meta = w.getBlockMetadata( x, y, z ) & 3;
|
||||||
|
|
||||||
boolean isMonitor = blk.getClass() == BlockCraftingMonitor.class;
|
boolean isMonitor = blk.getClass() == BlockCraftingMonitor.class;
|
||||||
theIcon = blk.getIcon( ForgeDirection.SOUTH.ordinal(), meta | ( formed ? 8 : 0 ) );
|
IIcon theIcon = blk.getIcon( ForgeDirection.SOUTH.ordinal(), meta | ( formed ? 8 : 0 ) );
|
||||||
|
|
||||||
IIcon nonForward = theIcon;
|
IIcon nonForward = theIcon;
|
||||||
if( isMonitor )
|
if( isMonitor )
|
||||||
|
@ -301,10 +300,9 @@ public class RenderBlockCraftingCPU<B extends BlockCraftingUnit, T extends TileC
|
||||||
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLong.getIcon() );
|
i.setTexture( ExtraBlockTextures.BlockCraftingUnitRingLong.getIcon() );
|
||||||
}
|
}
|
||||||
|
|
||||||
double width = 3.0 / 16.0;
|
|
||||||
|
|
||||||
if( !( i.getBound( a ) < 0.001 || i.getBound( a ) > 15.999 ) )
|
if( !( i.getBound( a ) < 0.001 || i.getBound( a ) > 15.999 ) )
|
||||||
{
|
{
|
||||||
|
double width = 3.0 / 16.0;
|
||||||
switch( a )
|
switch( a )
|
||||||
{
|
{
|
||||||
case DOWN:
|
case DOWN:
|
||||||
|
|
|
@ -63,11 +63,8 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
|
||||||
|
|
||||||
Tessellator tess = Tessellator.instance;
|
Tessellator tess = Tessellator.instance;
|
||||||
|
|
||||||
int lumen = 14 << 20 | 14 << 4;
|
|
||||||
int brightness = imb.getMixedBrightnessForBlock( world, x, y, z );
|
int brightness = imb.getMixedBrightnessForBlock( world, x, y, z );
|
||||||
|
|
||||||
double offsetConstant = 0.001;
|
|
||||||
|
|
||||||
EnumSet<ForgeDirection> validSides = EnumSet.noneOf( ForgeDirection.class );
|
EnumSet<ForgeDirection> validSides = EnumSet.noneOf( ForgeDirection.class );
|
||||||
|
|
||||||
for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS )
|
for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS )
|
||||||
|
@ -78,6 +75,8 @@ public class RenderBlockPaint extends BaseBlockRender<BlockPaint, TilePaint>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double offsetConstant = 0.001;
|
||||||
|
int lumen = 14 << 20 | 14 << 4;
|
||||||
for( Splotch s : tp.getDots() )
|
for( Splotch s : tp.getDots() )
|
||||||
{
|
{
|
||||||
if( !validSides.contains( s.side ) )
|
if( !validSides.contains( s.side ) )
|
||||||
|
|
|
@ -61,12 +61,11 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
|
||||||
|
|
||||||
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
|
Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
|
||||||
|
|
||||||
final float lidAngle = 0.0f;
|
|
||||||
|
|
||||||
GL11.glScalef( 1.0F, -1F, -1F );
|
GL11.glScalef( 1.0F, -1F, -1F );
|
||||||
GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
|
GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
|
||||||
|
|
||||||
this.model.chestLid.offsetY = -( 0.9f / 16.0f );
|
this.model.chestLid.offsetY = -( 0.9f / 16.0f );
|
||||||
|
final float lidAngle = 0.0f;
|
||||||
this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F );
|
this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F );
|
||||||
this.model.renderAll();
|
this.model.renderAll();
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,6 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
|
||||||
|
|
||||||
this.selectFace( renderer, west, up, forward, 5, 16 - 5, 9, 12 );
|
this.selectFace( renderer, west, up, forward, 5, 16 - 5, 9, 12 );
|
||||||
|
|
||||||
int offsetU = -4;
|
|
||||||
int offsetV = 8;
|
int offsetV = 8;
|
||||||
if( stat == 0 )
|
if( stat == 0 )
|
||||||
{
|
{
|
||||||
|
@ -96,6 +95,7 @@ public class RenderMEChest extends BaseBlockRender<BlockChest, TileChest>
|
||||||
Tessellator.instance.setBrightness( b );
|
Tessellator.instance.setBrightness( b );
|
||||||
Tessellator.instance.setColorOpaque_I( 0xffffff );
|
Tessellator.instance.setColorOpaque_I( 0xffffff );
|
||||||
|
|
||||||
|
int offsetU = -4;
|
||||||
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 ) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -118,8 +118,8 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
|
||||||
renderMax = 12.1f / 16.0f;
|
renderMax = 12.1f / 16.0f;
|
||||||
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
|
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
|
||||||
|
|
||||||
int bn = 15;
|
|
||||||
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
|
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
|
||||||
|
int bn = 15;
|
||||||
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 )
|
||||||
{
|
{
|
||||||
|
@ -146,8 +146,8 @@ public class RenderQNB extends BaseBlockRender<BlockQuantumBase, TileQuantumBrid
|
||||||
renderMax = 16.01f / 16.0f;
|
renderMax = 16.01f / 16.0f;
|
||||||
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
|
renderer.setRenderBounds( renderMin, renderMin, renderMin, renderMax, renderMax, renderMax );
|
||||||
|
|
||||||
int bn = 15;
|
|
||||||
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
|
Tessellator.instance.setColorOpaque_F( 1.0F, 1.0F, 1.0F );
|
||||||
|
int bn = 15;
|
||||||
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 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -49,18 +49,12 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
|
||||||
{
|
{
|
||||||
Tessellator tess = Tessellator.instance;
|
Tessellator tess = Tessellator.instance;
|
||||||
|
|
||||||
float Point2 = 6.0f / 16.0f;
|
|
||||||
float Point3 = 7.0f / 16.0f;
|
float Point3 = 7.0f / 16.0f;
|
||||||
float Point13 = 10.0f / 16.0f;
|
|
||||||
float Point12 = 9.0f / 16.0f;
|
float Point12 = 9.0f / 16.0f;
|
||||||
|
|
||||||
float singlePixel = 1.0f / 16.0f;
|
|
||||||
float renderBottom = 5.0f / 16.0f;
|
float renderBottom = 5.0f / 16.0f;
|
||||||
float renderTop = 10.0f / 16.0f;
|
float renderTop = 10.0f / 16.0f;
|
||||||
|
|
||||||
float bottom = 7.0f / 16.0f;
|
|
||||||
float top = 8.0f / 16.0f;
|
|
||||||
|
|
||||||
float xOff = 0.0f;
|
float xOff = 0.0f;
|
||||||
float yOff = 0.0f;
|
float yOff = 0.0f;
|
||||||
float zOff = 0.0f;
|
float zOff = 0.0f;
|
||||||
|
@ -68,6 +62,7 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
|
||||||
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
|
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
|
||||||
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
|
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
|
||||||
|
|
||||||
|
float singlePixel = 1.0f / 16.0f;
|
||||||
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
|
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
|
||||||
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
|
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
|
||||||
|
|
||||||
|
@ -78,6 +73,10 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
|
||||||
blk.getRendererInstance().setTemporaryRenderIcon( Blocks.hopper.getIcon( 0, 0 ) );
|
blk.getRendererInstance().setTemporaryRenderIcon( Blocks.hopper.getIcon( 0, 0 ) );
|
||||||
renderer.renderAllFaces = true;
|
renderer.renderAllFaces = true;
|
||||||
|
|
||||||
|
float top = 8.0f / 16.0f;
|
||||||
|
float bottom = 7.0f / 16.0f;
|
||||||
|
float Point13 = 10.0f / 16.0f;
|
||||||
|
float Point2 = 6.0f / 16.0f;
|
||||||
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
|
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
|
||||||
|
|
||||||
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
|
this.renderInvBlock( EnumSet.allOf( ForgeDirection.class ), blk, is, tess, 0xffffff, renderer );
|
||||||
|
@ -100,23 +99,10 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
|
||||||
{
|
{
|
||||||
IOrientable te = ( (IOrientableBlock) block ).getOrientable( world, x, y, z );
|
IOrientable te = ( (IOrientableBlock) block ).getOrientable( world, x, y, z );
|
||||||
|
|
||||||
float Point2 = 6.0f / 16.0f;
|
|
||||||
float Point3 = 7.0f / 16.0f;
|
|
||||||
float Point13 = 10.0f / 16.0f;
|
|
||||||
float Point12 = 9.0f / 16.0f;
|
|
||||||
|
|
||||||
float singlePixel = 1.0f / 16.0f;
|
|
||||||
float renderBottom = 5.0f / 16.0f;
|
|
||||||
float renderTop = 10.0f / 16.0f;
|
|
||||||
|
|
||||||
float bottom = 7.0f / 16.0f;
|
|
||||||
float top = 8.0f / 16.0f;
|
|
||||||
|
|
||||||
float xOff = 0.0f;
|
|
||||||
float yOff = 0.0f;
|
|
||||||
float zOff = 0.0f;
|
|
||||||
|
|
||||||
renderer.renderAllFaces = true;
|
renderer.renderAllFaces = true;
|
||||||
|
float zOff = 0.0f;
|
||||||
|
float yOff = 0.0f;
|
||||||
|
float xOff = 0.0f;
|
||||||
if( te != null )
|
if( te != null )
|
||||||
{
|
{
|
||||||
ForgeDirection forward = te.getUp();
|
ForgeDirection forward = te.getUp();
|
||||||
|
@ -125,10 +111,15 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
|
||||||
zOff = forward.offsetZ * -( 4.0f / 16.0f );
|
zOff = forward.offsetZ * -( 4.0f / 16.0f );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float renderTop = 10.0f / 16.0f;
|
||||||
|
float renderBottom = 5.0f / 16.0f;
|
||||||
|
float Point12 = 9.0f / 16.0f;
|
||||||
|
float Point3 = 7.0f / 16.0f;
|
||||||
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
|
renderer.setRenderBounds( Point3 + xOff, renderBottom + yOff, Point3 + zOff, Point12 + xOff, renderTop + yOff, Point12 + zOff );
|
||||||
super.renderInWorld( block, world, x, y, z, renderer );
|
super.renderInWorld( block, world, x, y, z, renderer );
|
||||||
|
|
||||||
int r = ( x + y + z ) % 2;
|
int r = ( x + y + z ) % 2;
|
||||||
|
float singlePixel = 1.0f / 16.0f;
|
||||||
if( r == 0 )
|
if( r == 0 )
|
||||||
{
|
{
|
||||||
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
|
renderer.setRenderBounds( Point3 + xOff, renderTop + yOff, Point3 + zOff, Point3 + singlePixel + xOff, renderTop + singlePixel + yOff, Point3 + singlePixel + zOff );
|
||||||
|
@ -148,6 +139,10 @@ public class RenderQuartzTorch extends BaseBlockRender<AEBaseBlock, AEBaseTile>
|
||||||
|
|
||||||
block.getRendererInstance().setTemporaryRenderIcon( Blocks.hopper.getIcon( 0, 0 ) );
|
block.getRendererInstance().setTemporaryRenderIcon( Blocks.hopper.getIcon( 0, 0 ) );
|
||||||
|
|
||||||
|
float top = 8.0f / 16.0f;
|
||||||
|
float bottom = 7.0f / 16.0f;
|
||||||
|
float Point13 = 10.0f / 16.0f;
|
||||||
|
float Point2 = 6.0f / 16.0f;
|
||||||
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
|
renderer.setRenderBounds( Point2 + xOff, bottom + yOff, Point2 + zOff, Point13 + xOff, top + yOff, Point3 + zOff );
|
||||||
boolean out = renderer.renderStandardBlock( block, x, y, z );
|
boolean out = renderer.renderStandardBlock( block, x, y, z );
|
||||||
|
|
||||||
|
|
|
@ -59,10 +59,10 @@ public class RenderSpatialPylon extends BaseBlockRender<BlockSpatialPylon, TileS
|
||||||
TileSpatialPylon sp = imb.getTileEntity( world, x, y, z );
|
TileSpatialPylon sp = imb.getTileEntity( world, x, y, z );
|
||||||
|
|
||||||
int displayBits = ( sp == null ) ? 0 : sp.getDisplayBits();
|
int displayBits = ( sp == null ) ? 0 : sp.getDisplayBits();
|
||||||
ForgeDirection ori = ForgeDirection.UNKNOWN;
|
|
||||||
|
|
||||||
if( displayBits != 0 )
|
if( displayBits != 0 )
|
||||||
{
|
{
|
||||||
|
ForgeDirection ori = ForgeDirection.UNKNOWN;
|
||||||
if( ( displayBits & TileSpatialPylon.DISPLAY_Z ) == TileSpatialPylon.DISPLAY_X )
|
if( ( displayBits & TileSpatialPylon.DISPLAY_Z ) == TileSpatialPylon.DISPLAY_X )
|
||||||
{
|
{
|
||||||
ori = ForgeDirection.EAST;
|
ori = ForgeDirection.EAST;
|
||||||
|
|
|
@ -85,7 +85,6 @@ public class CraftingFx extends EntityBreakingFX
|
||||||
float offX = (float) ( this.prevPosX + ( this.posX - this.prevPosX ) * partialTick );
|
float offX = (float) ( this.prevPosX + ( this.posX - this.prevPosX ) * partialTick );
|
||||||
float offY = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * partialTick );
|
float offY = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * partialTick );
|
||||||
float offZ = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * partialTick );
|
float offZ = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * partialTick );
|
||||||
float f14 = 1.0F;
|
|
||||||
|
|
||||||
int blkX = MathHelper.floor_double( offX );
|
int blkX = MathHelper.floor_double( offX );
|
||||||
int blkY = MathHelper.floor_double( offY );
|
int blkY = MathHelper.floor_double( offY );
|
||||||
|
@ -97,6 +96,7 @@ public class CraftingFx extends EntityBreakingFX
|
||||||
offZ -= interpPosZ;
|
offZ -= interpPosZ;
|
||||||
|
|
||||||
// AELog.info( "" + partialTick );
|
// AELog.info( "" + partialTick );
|
||||||
|
float f14 = 1.0F;
|
||||||
par1Tessellator.setColorRGBA_F( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha );
|
par1Tessellator.setColorRGBA_F( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha );
|
||||||
par1Tessellator.addVertexWithUV( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale, f7, f9 );
|
par1Tessellator.addVertexWithUV( offX - x * scale - rx * scale, offY - y * scale, offZ - z * scale - rz * scale, f7, f9 );
|
||||||
par1Tessellator.addVertexWithUV( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale, f7, f8 );
|
par1Tessellator.addVertexWithUV( offX - x * scale + rx * scale, offY + y * scale, offZ - z * scale + rz * scale, f7, f8 );
|
||||||
|
|
|
@ -79,7 +79,6 @@ public class EnergyFx extends EntityBreakingFX
|
||||||
float f11 = (float) ( this.prevPosX + ( this.posX - this.prevPosX ) * par2 - interpPosX );
|
float f11 = (float) ( this.prevPosX + ( this.posX - this.prevPosX ) * par2 - interpPosX );
|
||||||
float f12 = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * par2 - interpPosY );
|
float f12 = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * par2 - interpPosY );
|
||||||
float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ );
|
float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * par2 - interpPosZ );
|
||||||
float f14 = 1.0F;
|
|
||||||
|
|
||||||
int blkX = MathHelper.floor_double( this.posX );
|
int blkX = MathHelper.floor_double( this.posX );
|
||||||
int blkY = MathHelper.floor_double( this.posY );
|
int blkY = MathHelper.floor_double( this.posY );
|
||||||
|
@ -87,6 +86,7 @@ public class EnergyFx extends EntityBreakingFX
|
||||||
|
|
||||||
if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
|
if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
|
||||||
{
|
{
|
||||||
|
float f14 = 1.0F;
|
||||||
par1Tessellator.setColorRGBA_F( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha );
|
par1Tessellator.setColorRGBA_F( this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, this.particleAlpha );
|
||||||
par1Tessellator.addVertexWithUV( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10, f7, f9 );
|
par1Tessellator.addVertexWithUV( f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10, f7, f9 );
|
||||||
par1Tessellator.addVertexWithUV( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10, f7, f8 );
|
par1Tessellator.addVertexWithUV( f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10, f7, f8 );
|
||||||
|
|
|
@ -60,7 +60,6 @@ public class PaintBallRender implements IItemRenderer
|
||||||
float f5 = par2Icon.getMaxU();
|
float f5 = par2Icon.getMaxU();
|
||||||
float f6 = par2Icon.getMinV();
|
float f6 = par2Icon.getMinV();
|
||||||
float f7 = par2Icon.getMaxV();
|
float f7 = par2Icon.getMaxV();
|
||||||
float f12 = 0.0625F;
|
|
||||||
|
|
||||||
ItemPaintBall ipb = (ItemPaintBall) item.getItem();
|
ItemPaintBall ipb = (ItemPaintBall) item.getItem();
|
||||||
|
|
||||||
|
@ -75,11 +74,10 @@ public class PaintBallRender implements IItemRenderer
|
||||||
int g = ( colorValue >> 8 ) & 0xff;
|
int g = ( colorValue >> 8 ) & 0xff;
|
||||||
int b = ( colorValue ) & 0xff;
|
int b = ( colorValue ) & 0xff;
|
||||||
|
|
||||||
int full = (int) ( 255 * 0.3 );
|
|
||||||
float fail = 0.7f;
|
|
||||||
|
|
||||||
if( item.getItemDamage() >= 20 )
|
if( item.getItemDamage() >= 20 )
|
||||||
{
|
{
|
||||||
|
float fail = 0.7f;
|
||||||
|
int full = (int) ( 255 * 0.3 );
|
||||||
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
|
||||||
|
@ -112,6 +110,7 @@ public class PaintBallRender implements IItemRenderer
|
||||||
{
|
{
|
||||||
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
||||||
}
|
}
|
||||||
|
float f12 = 0.0625F;
|
||||||
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 );
|
||||||
|
|
|
@ -58,7 +58,6 @@ public class ToolBiometricCardRender implements IItemRenderer
|
||||||
float f5 = par2Icon.getMaxU();
|
float f5 = par2Icon.getMaxU();
|
||||||
float f6 = par2Icon.getMinV();
|
float f6 = par2Icon.getMinV();
|
||||||
float f7 = par2Icon.getMaxV();
|
float f7 = par2Icon.getMaxV();
|
||||||
float f12 = 0.0625F;
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.instance;
|
Tessellator tessellator = Tessellator.instance;
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
|
@ -83,6 +82,7 @@ public class ToolBiometricCardRender implements IItemRenderer
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
||||||
|
float f12 = 0.0625F;
|
||||||
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 );
|
||||||
|
@ -111,7 +111,6 @@ public class ToolBiometricCardRender implements IItemRenderer
|
||||||
GL11.glDisable( GL11.GL_LIGHTING );
|
GL11.glDisable( GL11.GL_LIGHTING );
|
||||||
|
|
||||||
tessellator.startDrawingQuads();
|
tessellator.startDrawingQuads();
|
||||||
float z = 0;
|
|
||||||
|
|
||||||
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 )
|
||||||
|
@ -119,12 +118,12 @@ public class ToolBiometricCardRender implements IItemRenderer
|
||||||
col = AEColor.Black;
|
col = AEColor.Black;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
float z = 0;
|
||||||
for( int x = 0; x < 8; x++ )// 8
|
for( int x = 0; x < 8; x++ )// 8
|
||||||
{
|
{
|
||||||
for( int y = 0; y < 6; y++ )// 6
|
for( int y = 0; y < 6; y++ )// 6
|
||||||
{
|
{
|
||||||
boolean isLit = false;
|
boolean isLit = false;
|
||||||
float scale = 0.3f / 255.0f;
|
|
||||||
|
|
||||||
if( x == 0 || y == 0 || x == 7 || y == 5 )
|
if( x == 0 || y == 0 || x == 7 || y == 5 )
|
||||||
{
|
{
|
||||||
|
@ -141,6 +140,7 @@ public class ToolBiometricCardRender implements IItemRenderer
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
float scale = 0.3f / 255.0f;
|
||||||
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 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,6 @@ public class ToolColorApplicatorRender implements IItemRenderer
|
||||||
float f5 = par2Icon.getMaxU();
|
float f5 = par2Icon.getMaxU();
|
||||||
float f6 = par2Icon.getMinV();
|
float f6 = par2Icon.getMinV();
|
||||||
float f7 = par2Icon.getMaxV();
|
float f7 = par2Icon.getMaxV();
|
||||||
float f12 = 0.0625F;
|
|
||||||
|
|
||||||
Tessellator tessellator = Tessellator.instance;
|
Tessellator tessellator = Tessellator.instance;
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
|
@ -92,6 +91,7 @@ public class ToolColorApplicatorRender implements IItemRenderer
|
||||||
{
|
{
|
||||||
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
GL11.glTranslatef( -0.5F, -0.3F, 0.01F );
|
||||||
}
|
}
|
||||||
|
float f12 = 0.0625F;
|
||||||
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 );
|
||||||
|
@ -112,9 +112,7 @@ public class ToolColorApplicatorRender implements IItemRenderer
|
||||||
}
|
}
|
||||||
GL11.glDisable( GL11.GL_LIGHTING );
|
GL11.glDisable( GL11.GL_LIGHTING );
|
||||||
|
|
||||||
AEColor col = null;
|
AEColor col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item );
|
||||||
|
|
||||||
col = ( (ToolColorApplicator) item.getItem() ).getActiveColor( item );
|
|
||||||
|
|
||||||
if( col != null )
|
if( col != null )
|
||||||
{
|
{
|
||||||
|
|
|
@ -475,7 +475,6 @@ public abstract class AEBaseContainer extends Container
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemStack tis = null;
|
|
||||||
AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots!
|
AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots!
|
||||||
|
|
||||||
if( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessible )
|
if( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessible )
|
||||||
|
@ -484,7 +483,7 @@ public abstract class AEBaseContainer extends Container
|
||||||
}
|
}
|
||||||
if( clickSlot != null && clickSlot.getHasStack() )
|
if( clickSlot != null && clickSlot.getHasStack() )
|
||||||
{
|
{
|
||||||
tis = clickSlot.getStack();
|
ItemStack tis = clickSlot.getStack();
|
||||||
|
|
||||||
if( tis == null )
|
if( tis == null )
|
||||||
{
|
{
|
||||||
|
|
|
@ -91,9 +91,6 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
|
||||||
@Override
|
@Override
|
||||||
protected void setupConfig()
|
protected void setupConfig()
|
||||||
{
|
{
|
||||||
int x = 8;
|
|
||||||
int y = 29;
|
|
||||||
int offset = 0;
|
|
||||||
|
|
||||||
IInventory cell = this.upgradeable.getInventoryByName( "cell" );
|
IInventory cell = this.upgradeable.getInventoryByName( "cell" );
|
||||||
this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.invPlayer ) );
|
this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.invPlayer ) );
|
||||||
|
@ -102,6 +99,9 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
|
||||||
IInventory upgradeInventory = new Upgrades();
|
IInventory upgradeInventory = new Upgrades();
|
||||||
// null, 3 * 8 );
|
// null, 3 * 8 );
|
||||||
|
|
||||||
|
int offset = 0;
|
||||||
|
int y = 29;
|
||||||
|
int x = 8;
|
||||||
for( int w = 0; w < 7; w++ )
|
for( int w = 0; w < 7; w++ )
|
||||||
{
|
{
|
||||||
for( int z = 0; z < 9; z++ )
|
for( int z = 0; z < 9; z++ )
|
||||||
|
|
|
@ -217,7 +217,6 @@ public class ContainerCraftConfirm extends AEBaseContainer
|
||||||
|
|
||||||
for( IAEItemStack out : plan )
|
for( IAEItemStack out : plan )
|
||||||
{
|
{
|
||||||
IAEItemStack m = null;
|
|
||||||
|
|
||||||
IAEItemStack o = out.copy();
|
IAEItemStack o = out.copy();
|
||||||
o.reset();
|
o.reset();
|
||||||
|
@ -230,6 +229,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
|
||||||
IStorageGrid sg = this.getGrid().getCache( IStorageGrid.class );
|
IStorageGrid sg = this.getGrid().getCache( IStorageGrid.class );
|
||||||
IMEInventory<IAEItemStack> items = sg.getItemInventory();
|
IMEInventory<IAEItemStack> items = sg.getItemInventory();
|
||||||
|
|
||||||
|
IAEItemStack m = null;
|
||||||
if( c != null && this.result.isSimulation() )
|
if( c != null && this.result.isSimulation() )
|
||||||
{
|
{
|
||||||
m = o.copy();
|
m = o.copy();
|
||||||
|
|
|
@ -153,7 +153,6 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres
|
||||||
|
|
||||||
if( ( s == this.top && bot != null ) || ( s == this.bottom && top != null ) )
|
if( ( s == this.top && bot != null ) || ( s == this.bottom && top != null ) )
|
||||||
{
|
{
|
||||||
boolean isValid = false;
|
|
||||||
ItemStack otherSlot = null;
|
ItemStack otherSlot = null;
|
||||||
if( s == this.top )
|
if( s == this.top )
|
||||||
{
|
{
|
||||||
|
@ -172,6 +171,7 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres
|
||||||
}
|
}
|
||||||
|
|
||||||
// everything else
|
// everything else
|
||||||
|
boolean isValid = false;
|
||||||
for( IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() )
|
for( IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() )
|
||||||
{
|
{
|
||||||
if( Platform.isSameItemPrecise( recipe.getTopOptional().orNull(), otherSlot ) )
|
if( Platform.isSameItemPrecise( recipe.getTopOptional().orNull(), otherSlot ) )
|
||||||
|
|
|
@ -76,8 +76,6 @@ public class ContainerLevelEmitter extends ContainerUpgradeable
|
||||||
@Override
|
@Override
|
||||||
protected void setupConfig()
|
protected void setupConfig()
|
||||||
{
|
{
|
||||||
int x = 80 + 44;
|
|
||||||
int y = 40;
|
|
||||||
|
|
||||||
IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" );
|
IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" );
|
||||||
if( this.availableUpgrades() > 0 )
|
if( this.availableUpgrades() > 0 )
|
||||||
|
@ -98,6 +96,8 @@ public class ContainerLevelEmitter extends ContainerUpgradeable
|
||||||
}
|
}
|
||||||
|
|
||||||
IInventory inv = this.upgradeable.getInventoryByName( "config" );
|
IInventory inv = this.upgradeable.getInventoryByName( "config" );
|
||||||
|
int y = 40;
|
||||||
|
int x = 80 + 44;
|
||||||
this.addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) );
|
this.addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -107,10 +107,9 @@ public class ContainerNetworkStatus extends AEBaseContainer
|
||||||
this.maxPower = (long) ( 100.0 * eg.getMaxStoredPower() );
|
this.maxPower = (long) ( 100.0 * eg.getMaxStoredPower() );
|
||||||
}
|
}
|
||||||
|
|
||||||
PacketMEInventoryUpdate piu;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
piu = new PacketMEInventoryUpdate();
|
PacketMEInventoryUpdate piu = new PacketMEInventoryUpdate();
|
||||||
|
|
||||||
for( Class<? extends IGridHost> machineClass : this.network.getMachinesClasses() )
|
for( Class<? extends IGridHost> machineClass : this.network.getMachinesClasses() )
|
||||||
{
|
{
|
||||||
|
|
|
@ -133,11 +133,11 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
|
||||||
|
|
||||||
protected void setupConfig()
|
protected void setupConfig()
|
||||||
{
|
{
|
||||||
int x = 80;
|
|
||||||
int y = 40;
|
|
||||||
this.setupUpgrades();
|
this.setupUpgrades();
|
||||||
|
|
||||||
IInventory inv = this.upgradeable.getInventoryByName( "config" );
|
IInventory inv = this.upgradeable.getInventoryByName( "config" );
|
||||||
|
int y = 40;
|
||||||
|
int x = 80;
|
||||||
this.addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) );
|
this.addSlotToContainer( new SlotFakeTypeOnly( inv, 0, x, y ) );
|
||||||
|
|
||||||
if( this.supportCapacity() )
|
if( this.supportCapacity() )
|
||||||
|
|
|
@ -115,14 +115,14 @@ public final class AEConfig extends Configuration implements IConfigurableObject
|
||||||
|
|
||||||
FMLCommonHandler.instance().bus().register( this );
|
FMLCommonHandler.instance().bus().register( this );
|
||||||
|
|
||||||
final double DEFAULT_IC2_EXCHANGE = 2.0;
|
|
||||||
final double DEFAULT_RTC_EXCHANGE = 1.0 / 11256.0;
|
|
||||||
final double DEFAULT_RF_EXCHANGE = 0.5;
|
|
||||||
final double DEFAULT_MEKANISM_EXCHANGE = 0.2;
|
final double DEFAULT_MEKANISM_EXCHANGE = 0.2;
|
||||||
|
|
||||||
PowerUnits.MK.conversionRatio = this.get( "PowerRatios", "Mekanism", DEFAULT_MEKANISM_EXCHANGE ).getDouble( DEFAULT_MEKANISM_EXCHANGE );
|
PowerUnits.MK.conversionRatio = this.get( "PowerRatios", "Mekanism", DEFAULT_MEKANISM_EXCHANGE ).getDouble( DEFAULT_MEKANISM_EXCHANGE );
|
||||||
|
final double DEFAULT_IC2_EXCHANGE = 2.0;
|
||||||
PowerUnits.EU.conversionRatio = this.get( "PowerRatios", "IC2", DEFAULT_IC2_EXCHANGE ).getDouble( DEFAULT_IC2_EXCHANGE );
|
PowerUnits.EU.conversionRatio = this.get( "PowerRatios", "IC2", DEFAULT_IC2_EXCHANGE ).getDouble( DEFAULT_IC2_EXCHANGE );
|
||||||
|
final double DEFAULT_RTC_EXCHANGE = 1.0 / 11256.0;
|
||||||
PowerUnits.WA.conversionRatio = this.get( "PowerRatios", "RotaryCraft", DEFAULT_RTC_EXCHANGE ).getDouble( DEFAULT_RTC_EXCHANGE );
|
PowerUnits.WA.conversionRatio = this.get( "PowerRatios", "RotaryCraft", DEFAULT_RTC_EXCHANGE ).getDouble( DEFAULT_RTC_EXCHANGE );
|
||||||
|
final double DEFAULT_RF_EXCHANGE = 0.5;
|
||||||
PowerUnits.RF.conversionRatio = this.get( "PowerRatios", "ThermalExpansion", DEFAULT_RF_EXCHANGE ).getDouble( DEFAULT_RF_EXCHANGE );
|
PowerUnits.RF.conversionRatio = this.get( "PowerRatios", "ThermalExpansion", DEFAULT_RF_EXCHANGE ).getDouble( DEFAULT_RF_EXCHANGE );
|
||||||
|
|
||||||
double usageEffective = this.get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 );
|
double usageEffective = this.get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 );
|
||||||
|
|
|
@ -238,12 +238,11 @@ public class ApiPart implements IPartHelper
|
||||||
|
|
||||||
public ClassNode getReader( String name )
|
public ClassNode getReader( String name )
|
||||||
{
|
{
|
||||||
ClassReader cr;
|
|
||||||
String path = '/' + name.replace( ".", "/" ) + ".class";
|
String path = '/' + name.replace( ".", "/" ) + ".class";
|
||||||
InputStream is = this.getClass().getResourceAsStream( path );
|
InputStream is = this.getClass().getResourceAsStream( path );
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
cr = new ClassReader( is );
|
ClassReader cr = new ClassReader( is );
|
||||||
|
|
||||||
ClassNode cn = new ClassNode();
|
ClassNode cn = new ClassNode();
|
||||||
cr.accept( cn, ClassReader.EXPAND_FRAMES );
|
cr.accept( cn, ClassReader.EXPAND_FRAMES );
|
||||||
|
|
|
@ -54,10 +54,9 @@ public final class GridCacheRegistry implements IGridCacheRegistry
|
||||||
|
|
||||||
for( Class<? extends IGridCache> iface : this.caches.keySet() )
|
for( Class<? extends IGridCache> iface : this.caches.keySet() )
|
||||||
{
|
{
|
||||||
Constructor<? extends IGridCache> c;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
c = this.caches.get( iface ).getConstructor( IGrid.class );
|
Constructor<? extends IGridCache> c = this.caches.get( iface ).getConstructor( IGrid.class );
|
||||||
map.put( iface, c.newInstance( g ) );
|
map.put( iface, c.newInstance( g ) );
|
||||||
}
|
}
|
||||||
catch( NoSuchMethodException e )
|
catch( NoSuchMethodException e )
|
||||||
|
|
|
@ -544,7 +544,6 @@ public enum GuiBridge implements IGuiHandler
|
||||||
{
|
{
|
||||||
if( te instanceof IActionHost && this.requiredPermission != null )
|
if( te instanceof IActionHost && this.requiredPermission != null )
|
||||||
{
|
{
|
||||||
boolean requirePower = false;
|
|
||||||
|
|
||||||
IGridNode gn = ( (IActionHost) te ).getActionableNode();
|
IGridNode gn = ( (IActionHost) te ).getActionableNode();
|
||||||
if( gn != null )
|
if( gn != null )
|
||||||
|
@ -552,6 +551,7 @@ public enum GuiBridge implements IGuiHandler
|
||||||
IGrid g = gn.getGrid();
|
IGrid g = gn.getGrid();
|
||||||
if( g != null )
|
if( g != null )
|
||||||
{
|
{
|
||||||
|
boolean requirePower = false;
|
||||||
if( requirePower )
|
if( requirePower )
|
||||||
{
|
{
|
||||||
IEnergyGrid eg = g.getCache( IEnergyGrid.class );
|
IEnergyGrid eg = g.getCache( IEnergyGrid.class );
|
||||||
|
|
|
@ -40,13 +40,12 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
|
||||||
public void onPacketData( INetworkInfo network, FMLProxyPacket packet, EntityPlayer player )
|
public void onPacketData( INetworkInfo network, FMLProxyPacket packet, EntityPlayer player )
|
||||||
{
|
{
|
||||||
ByteBuf stream = packet.payload();
|
ByteBuf stream = packet.payload();
|
||||||
int packetType = -1;
|
|
||||||
|
|
||||||
player = Minecraft.getMinecraft().thePlayer;
|
player = Minecraft.getMinecraft().thePlayer;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
packetType = stream.readInt();
|
int packetType = stream.readInt();
|
||||||
AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
|
AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
|
||||||
pack.clientPacketData( network, pack, player );
|
pack.clientPacketData( network, pack, player );
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,11 +39,10 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp
|
||||||
public void onPacketData( INetworkInfo manager, FMLProxyPacket packet, EntityPlayer player )
|
public void onPacketData( INetworkInfo manager, FMLProxyPacket packet, EntityPlayer player )
|
||||||
{
|
{
|
||||||
ByteBuf stream = packet.payload();
|
ByteBuf stream = packet.payload();
|
||||||
int packetType = -1;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
packetType = stream.readInt();
|
int packetType = stream.readInt();
|
||||||
AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
|
AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
|
||||||
pack.serverPacketData( manager, pack, player );
|
pack.serverPacketData( manager, pack, player );
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,10 +92,9 @@ public class PacketCraftRequest extends AppEngPacket
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<ICraftingJob> futureJob = null;
|
|
||||||
|
|
||||||
cca.whatToMake.setStackSize( this.amount );
|
cca.whatToMake.setStackSize( this.amount );
|
||||||
|
|
||||||
|
Future<ICraftingJob> futureJob = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ICraftingGrid cg = g.getCache( ICraftingGrid.class );
|
ICraftingGrid cg = g.getCache( ICraftingGrid.class );
|
||||||
|
|
|
@ -98,13 +98,13 @@ public class ToolDebugCard extends AEBaseItem
|
||||||
IPathingGrid pg = g.getCache( IPathingGrid.class );
|
IPathingGrid pg = g.getCache( IPathingGrid.class );
|
||||||
if( pg.getControllerState() == ControllerState.CONTROLLER_ONLINE )
|
if( pg.getControllerState() == ControllerState.CONTROLLER_ONLINE )
|
||||||
{
|
{
|
||||||
int length = 0;
|
|
||||||
|
|
||||||
Set<IGridNode> next = new HashSet<IGridNode>();
|
Set<IGridNode> next = new HashSet<IGridNode>();
|
||||||
next.add( node );
|
next.add( node );
|
||||||
|
|
||||||
int maxLength = 10000;
|
int maxLength = 10000;
|
||||||
|
|
||||||
|
int length = 0;
|
||||||
outer:
|
outer:
|
||||||
while( !next.isEmpty() )
|
while( !next.isEmpty() )
|
||||||
{
|
{
|
||||||
|
|
|
@ -65,10 +65,10 @@ public class ToolEraser extends AEBaseItem
|
||||||
Block blk = world.getBlock( x, y, z );
|
Block blk = world.getBlock( x, y, z );
|
||||||
int meta = world.getBlockMetadata( x, y, z );
|
int meta = world.getBlockMetadata( x, y, z );
|
||||||
|
|
||||||
int blocks = 0;
|
|
||||||
List<WorldCoord> next = new LinkedList<WorldCoord>();
|
List<WorldCoord> next = new LinkedList<WorldCoord>();
|
||||||
next.add( new WorldCoord( x, y, z ) );
|
next.add( new WorldCoord( x, y, z ) );
|
||||||
|
|
||||||
|
int blocks = 0;
|
||||||
while( blocks < BLOCK_ERASE_LIMIT && !next.isEmpty() )
|
while( blocks < BLOCK_ERASE_LIMIT && !next.isEmpty() )
|
||||||
{
|
{
|
||||||
List<WorldCoord> c = next;
|
List<WorldCoord> c = next;
|
||||||
|
|
|
@ -70,15 +70,14 @@ public class FMPEvent
|
||||||
|
|
||||||
BlockCoord pos = new BlockCoord( hit.blockX, hit.blockY, hit.blockZ ).offset( hit.sideHit );
|
BlockCoord pos = new BlockCoord( hit.blockX, hit.blockY, hit.blockZ ).offset( hit.sideHit );
|
||||||
ItemStack held = player.getHeldItem();
|
ItemStack held = player.getHeldItem();
|
||||||
TMultiPart part = null;
|
|
||||||
|
|
||||||
Block blk = null;
|
|
||||||
|
|
||||||
if( held == null )
|
if( held == null )
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Block blk = null;
|
||||||
|
TMultiPart part = null;
|
||||||
if( held.getItem() instanceof AEBaseItemBlock )
|
if( held.getItem() instanceof AEBaseItemBlock )
|
||||||
{
|
{
|
||||||
AEBaseItemBlock ib = (AEBaseItemBlock) held.getItem();
|
AEBaseItemBlock ib = (AEBaseItemBlock) held.getItem();
|
||||||
|
|
|
@ -633,10 +633,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
|
||||||
|
|
||||||
private boolean usePlan( int x, IAEItemStack itemStack )
|
private boolean usePlan( int x, IAEItemStack itemStack )
|
||||||
{
|
{
|
||||||
boolean changed = false;
|
|
||||||
InventoryAdaptor adaptor = this.getAdaptor( x );
|
InventoryAdaptor adaptor = this.getAdaptor( x );
|
||||||
this.isWorking = true;
|
this.isWorking = true;
|
||||||
|
|
||||||
|
boolean changed = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
this.destination = this.gridProxy.getStorage().getItemInventory();
|
this.destination = this.gridProxy.getStorage().getItemInventory();
|
||||||
|
|
|
@ -99,10 +99,9 @@ public class MultiCraftingTracker
|
||||||
}
|
}
|
||||||
else if( craftingJob != null )
|
else if( craftingJob != null )
|
||||||
{
|
{
|
||||||
ICraftingJob job = null;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
ICraftingJob job = null;
|
||||||
if( craftingJob.isDone() )
|
if( craftingJob.isDone() )
|
||||||
{
|
{
|
||||||
job = craftingJob.get();
|
job = craftingJob.get();
|
||||||
|
|
|
@ -166,8 +166,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
|
||||||
throw new IllegalStateException( "No pattern here!" );
|
throw new IllegalStateException( "No pattern here!" );
|
||||||
}
|
}
|
||||||
|
|
||||||
int offset = 0;
|
|
||||||
this.condensedInputs = new IAEItemStack[tmpInputs.size()];
|
this.condensedInputs = new IAEItemStack[tmpInputs.size()];
|
||||||
|
int offset = 0;
|
||||||
for( IAEItemStack io : tmpInputs.values() )
|
for( IAEItemStack io : tmpInputs.values() )
|
||||||
{
|
{
|
||||||
this.condensedInputs[offset] = io;
|
this.condensedInputs[offset] = io;
|
||||||
|
|
|
@ -101,12 +101,12 @@ public class NEI implements INEI, IContainerTooltipHandler, IIntegrationModule
|
||||||
// crafting terminal...
|
// crafting terminal...
|
||||||
Method registerGuiOverlay = this.apiClass.getDeclaredMethod( "registerGuiOverlay", Class.class, String.class, IStackPositioner.class );
|
Method registerGuiOverlay = this.apiClass.getDeclaredMethod( "registerGuiOverlay", Class.class, String.class, IStackPositioner.class );
|
||||||
Class overlayHandler = Class.forName( "codechicken.nei.api.IOverlayHandler" );
|
Class overlayHandler = Class.forName( "codechicken.nei.api.IOverlayHandler" );
|
||||||
Class<NEICraftingHandler> defaultHandler = NEICraftingHandler.class;
|
|
||||||
|
|
||||||
Method registrar = this.apiClass.getDeclaredMethod( "registerGuiOverlayHandler", Class.class, overlayHandler, String.class );
|
Method registrar = this.apiClass.getDeclaredMethod( "registerGuiOverlayHandler", Class.class, overlayHandler, String.class );
|
||||||
registerGuiOverlay.invoke( this.apiClass, GuiCraftingTerm.class, "crafting", new TerminalCraftingSlotFinder() );
|
registerGuiOverlay.invoke( this.apiClass, GuiCraftingTerm.class, "crafting", new TerminalCraftingSlotFinder() );
|
||||||
registerGuiOverlay.invoke( this.apiClass, GuiPatternTerm.class, "crafting", new TerminalCraftingSlotFinder() );
|
registerGuiOverlay.invoke( this.apiClass, GuiPatternTerm.class, "crafting", new TerminalCraftingSlotFinder() );
|
||||||
|
|
||||||
|
Class<NEICraftingHandler> defaultHandler = NEICraftingHandler.class;
|
||||||
Constructor defaultConstructor = defaultHandler.getConstructor( int.class, int.class );
|
Constructor defaultConstructor = defaultHandler.getConstructor( int.class, int.class );
|
||||||
registrar.invoke( this.apiClass, GuiCraftingTerm.class, defaultConstructor.newInstance( 6, 75 ), "crafting" );
|
registrar.invoke( this.apiClass, GuiCraftingTerm.class, defaultConstructor.newInstance( 6, 75 ), "crafting" );
|
||||||
registrar.invoke( this.apiClass, GuiPatternTerm.class, defaultConstructor.newInstance( 6, 75 ), "crafting" );
|
registrar.invoke( this.apiClass, GuiPatternTerm.class, defaultConstructor.newInstance( 6, 75 ), "crafting" );
|
||||||
|
|
|
@ -160,7 +160,6 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag
|
||||||
int targetZ = max.z - min.z - 1;
|
int targetZ = max.z - min.z - 1;
|
||||||
int maxSize = this.getMaxStoredDim( is );
|
int maxSize = this.getMaxStoredDim( is );
|
||||||
|
|
||||||
int floorBuffer = 64;
|
|
||||||
World destination = this.getWorld( is );
|
World destination = this.getWorld( is );
|
||||||
|
|
||||||
if( ( scale.x == 0 && scale.y == 0 && scale.z == 0 ) || ( scale.x == targetX && scale.y == targetY && scale.z == targetZ ) )
|
if( ( scale.x == 0 && scale.y == 0 && scale.z == 0 ) || ( scale.x == targetX && scale.y == targetY && scale.z == targetZ ) )
|
||||||
|
@ -172,6 +171,7 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag
|
||||||
destination = this.createNewWorld( is );
|
destination = this.createNewWorld( is );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int floorBuffer = 64;
|
||||||
StorageHelper.getInstance().swapRegions( w, destination, min.x + 1, min.y + 1, min.z + 1, 1, floorBuffer + 1, 1, targetX - 1, targetY - 1, targetZ - 1 );
|
StorageHelper.getInstance().swapRegions( w, destination, min.x + 1, min.y + 1, min.z + 1, 1, floorBuffer + 1, 1, targetX - 1, targetY - 1, targetZ - 1 );
|
||||||
this.setStoredSize( is, targetX, targetY, targetZ );
|
this.setStoredSize( is, targetX, targetY, targetZ );
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,6 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
|
||||||
public boolean onItemUse( ItemStack is, EntityPlayer p, World w, int x, int y, int z, int side, float hitX, float hitY, float hitZ )
|
public boolean onItemUse( ItemStack is, EntityPlayer p, World w, int x, int y, int z, int side, float hitX, float hitY, float hitZ )
|
||||||
{
|
{
|
||||||
Block blk = w.getBlock( x, y, z );
|
Block blk = w.getBlock( x, y, z );
|
||||||
double powerPerUse = 100;
|
|
||||||
|
|
||||||
ItemStack paintBall = this.getColor( is );
|
ItemStack paintBall = this.getColor( is );
|
||||||
|
|
||||||
|
@ -143,6 +142,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double powerPerUse = 100;
|
||||||
if( paintBall != null && paintBall.getItem() instanceof ItemSnowball )
|
if( paintBall != null && paintBall.getItem() instanceof ItemSnowball )
|
||||||
{
|
{
|
||||||
ForgeDirection orientation = ForgeDirection.getOrientation( side );
|
ForgeDirection orientation = ForgeDirection.getOrientation( side );
|
||||||
|
|
|
@ -211,9 +211,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
|
||||||
Entity entity = null;
|
Entity entity = null;
|
||||||
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
|
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
|
||||||
double closest = 9999999.0D;
|
double closest = 9999999.0D;
|
||||||
int l;
|
|
||||||
|
|
||||||
for( l = 0; l < list.size(); ++l )
|
for( int l = 0; l < list.size(); ++l )
|
||||||
{
|
{
|
||||||
Entity entity1 = (Entity) list.get( l );
|
Entity entity1 = (Entity) list.get( l );
|
||||||
|
|
||||||
|
@ -335,9 +334,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
|
||||||
Entity entity = null;
|
Entity entity = null;
|
||||||
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
|
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
|
||||||
double closest = 9999999.0D;
|
double closest = 9999999.0D;
|
||||||
int l;
|
|
||||||
|
|
||||||
for( l = 0; l < list.size(); ++l )
|
for( int l = 0; l < list.size(); ++l )
|
||||||
{
|
{
|
||||||
Entity entity1 = (Entity) list.get( l );
|
Entity entity1 = (Entity) list.get( l );
|
||||||
|
|
||||||
|
|
|
@ -308,9 +308,9 @@ public class PathGridCache implements IPathingGrid
|
||||||
|
|
||||||
private int calculateRequiredChannels()
|
private int calculateRequiredChannels()
|
||||||
{
|
{
|
||||||
int depth = 0;
|
|
||||||
this.semiOpen.clear();
|
this.semiOpen.clear();
|
||||||
|
|
||||||
|
int depth = 0;
|
||||||
for( IGridNode nodes : this.requireChannels )
|
for( IGridNode nodes : this.requireChannels )
|
||||||
{
|
{
|
||||||
if( !this.semiOpen.contains( nodes ) )
|
if( !this.semiOpen.contains( nodes ) )
|
||||||
|
|
|
@ -64,13 +64,6 @@ public class SpatialPylonCache implements ISpatialCache
|
||||||
|
|
||||||
public void reset( IGrid grid )
|
public void reset( IGrid grid )
|
||||||
{
|
{
|
||||||
int reqX = 0;
|
|
||||||
int reqY = 0;
|
|
||||||
int reqZ = 0;
|
|
||||||
int requirePylonBlocks = 1;
|
|
||||||
|
|
||||||
double minPower = 0;
|
|
||||||
double maxPower = 0;
|
|
||||||
|
|
||||||
this.clusters = new HashMap<SpatialPylonCluster, SpatialPylonCluster>();
|
this.clusters = new HashMap<SpatialPylonCluster, SpatialPylonCluster>();
|
||||||
this.ioPorts = new LinkedList<TileSpatialIOPort>();
|
this.ioPorts = new LinkedList<TileSpatialIOPort>();
|
||||||
|
@ -120,6 +113,8 @@ public class SpatialPylonCache implements ISpatialCache
|
||||||
this.captureMax.z = Math.max( this.captureMax.z, cl.max.z );
|
this.captureMax.z = Math.max( this.captureMax.z, cl.max.z );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double maxPower = 0;
|
||||||
|
double minPower = 0;
|
||||||
if( this.hasRegion() )
|
if( this.hasRegion() )
|
||||||
{
|
{
|
||||||
this.isValid = this.captureMax.x - this.captureMin.x > 1 && this.captureMax.y - this.captureMin.y > 1 && this.captureMax.z - this.captureMin.z > 1;
|
this.isValid = this.captureMax.x - this.captureMin.x > 1 && this.captureMax.y - this.captureMin.y > 1 && this.captureMax.z - this.captureMin.z > 1;
|
||||||
|
@ -149,10 +144,10 @@ public class SpatialPylonCache implements ISpatialCache
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
reqX = this.captureMax.x - this.captureMin.x;
|
int reqX = this.captureMax.x - this.captureMin.x;
|
||||||
reqY = this.captureMax.y - this.captureMin.y;
|
int reqY = this.captureMax.y - this.captureMin.y;
|
||||||
reqZ = this.captureMax.z - this.captureMin.z;
|
int reqZ = this.captureMax.z - this.captureMin.z;
|
||||||
requirePylonBlocks = Math.max( 6, ( ( reqX * reqZ + reqX * reqY + reqY * reqZ ) * 3 ) / 8 );
|
int requirePylonBlocks = Math.max( 6, ( ( reqX * reqZ + reqX * reqY + reqY * reqZ ) * 3 ) / 8 );
|
||||||
|
|
||||||
this.efficiency = (double) pylonBlocks / (double) requirePylonBlocks;
|
this.efficiency = (double) pylonBlocks / (double) requirePylonBlocks;
|
||||||
|
|
||||||
|
|
|
@ -1292,12 +1292,12 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
|
||||||
this.lastTime = System.nanoTime();
|
this.lastTime = System.nanoTime();
|
||||||
this.elapsedTime = 0;
|
this.elapsedTime = 0;
|
||||||
|
|
||||||
int itemCount = 0;
|
|
||||||
final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
|
final IItemList<IAEItemStack> list = AEApi.instance().storage().createItemList();
|
||||||
|
|
||||||
this.getListOfItem( list, CraftingItemList.ACTIVE );
|
this.getListOfItem( list, CraftingItemList.ACTIVE );
|
||||||
this.getListOfItem( list, CraftingItemList.PENDING );
|
this.getListOfItem( list, CraftingItemList.PENDING );
|
||||||
|
|
||||||
|
int itemCount = 0;
|
||||||
for( IAEItemStack ge : list )
|
for( IAEItemStack ge : list )
|
||||||
{
|
{
|
||||||
itemCount += ge.getStackSize();
|
itemCount += ge.getStackSize();
|
||||||
|
|
|
@ -128,9 +128,8 @@ public class QuantumCalculator extends MBCalculator
|
||||||
{
|
{
|
||||||
TileQuantumBridge te = (TileQuantumBridge) w.getTileEntity( x, y, z );
|
TileQuantumBridge te = (TileQuantumBridge) w.getTileEntity( x, y, z );
|
||||||
|
|
||||||
byte flags;
|
|
||||||
|
|
||||||
num++;
|
num++;
|
||||||
|
byte flags;
|
||||||
if( num == 5 )
|
if( num == 5 )
|
||||||
{
|
{
|
||||||
flags = num;
|
flags = num;
|
||||||
|
|
|
@ -79,9 +79,8 @@ public class QuantumCluster implements ILocatable, IAECluster
|
||||||
@Override
|
@Override
|
||||||
public void updateStatus( boolean updateGrid )
|
public void updateStatus( boolean updateGrid )
|
||||||
{
|
{
|
||||||
long qe;
|
|
||||||
|
|
||||||
qe = this.center.getQEFrequency();
|
long qe = this.center.getQEFrequency();
|
||||||
|
|
||||||
if( this.thisSide != qe && this.thisSide != -qe )
|
if( this.thisSide != qe && this.thisSide != -qe )
|
||||||
{
|
{
|
||||||
|
|
|
@ -128,7 +128,6 @@ public class MEIInventoryWrapper implements IMEInventory<IAEItemStack>
|
||||||
@Override
|
@Override
|
||||||
public IAEItemStack extractItems( IAEItemStack request, Actionable mode, BaseActionSource src )
|
public IAEItemStack extractItems( IAEItemStack request, Actionable mode, BaseActionSource src )
|
||||||
{
|
{
|
||||||
ItemStack Gathered = null;
|
|
||||||
ItemStack Req = request.getItemStack();
|
ItemStack Req = request.getItemStack();
|
||||||
|
|
||||||
int request_stackSize = Req.stackSize;
|
int request_stackSize = Req.stackSize;
|
||||||
|
@ -140,6 +139,7 @@ public class MEIInventoryWrapper implements IMEInventory<IAEItemStack>
|
||||||
|
|
||||||
Req.stackSize = request_stackSize;
|
Req.stackSize = request_stackSize;
|
||||||
|
|
||||||
|
ItemStack Gathered = null;
|
||||||
if( this.adaptor != null )
|
if( this.adaptor != null )
|
||||||
{
|
{
|
||||||
Gathered = this.adaptor.removeItems( Req.stackSize, Req, null );
|
Gathered = this.adaptor.removeItems( Req.stackSize, Req, null );
|
||||||
|
|
|
@ -141,12 +141,12 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>
|
||||||
|
|
||||||
public TickRateModulation onTick()
|
public TickRateModulation onTick()
|
||||||
{
|
{
|
||||||
boolean changed = false;
|
|
||||||
|
|
||||||
LinkedList<IAEItemStack> changes = new LinkedList<IAEItemStack>();
|
LinkedList<IAEItemStack> changes = new LinkedList<IAEItemStack>();
|
||||||
|
|
||||||
int high = 0;
|
|
||||||
this.list.resetStatus();
|
this.list.resetStatus();
|
||||||
|
int high = 0;
|
||||||
|
boolean changed = false;
|
||||||
for( ItemSlot is : this.adaptor )
|
for( ItemSlot is : this.adaptor )
|
||||||
{
|
{
|
||||||
CachedItemStack old = this.memory.get( is.slot );
|
CachedItemStack old = this.memory.get( is.slot );
|
||||||
|
|
|
@ -168,10 +168,9 @@ public class NetworkInventoryHandler<T extends IAEStack<T>> implements IMEInvent
|
||||||
IGrid gn = n.getGrid();
|
IGrid gn = n.getGrid();
|
||||||
if( gn != this.security.myGrid )
|
if( gn != this.security.myGrid )
|
||||||
{
|
{
|
||||||
int playerID = -1;
|
|
||||||
|
|
||||||
ISecurityGrid sg = gn.getCache( ISecurityGrid.class );
|
ISecurityGrid sg = gn.getCache( ISecurityGrid.class );
|
||||||
playerID = sg.getOwner();
|
int playerID = sg.getOwner();
|
||||||
|
|
||||||
if( !this.security.hasPermission( playerID, permission ) )
|
if( !this.security.hasPermission( playerID, permission ) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -921,11 +921,10 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
|
||||||
|
|
||||||
for( int x = 0; x < 7; x++ )
|
for( int x = 0; x < 7; x++ )
|
||||||
{
|
{
|
||||||
ItemStack is = null;
|
|
||||||
IPart p = this.getPart( ForgeDirection.getOrientation( x ) );
|
IPart p = this.getPart( ForgeDirection.getOrientation( x ) );
|
||||||
if( p != null )
|
if( p != null )
|
||||||
{
|
{
|
||||||
is = p.getItemStack( PartItemStack.Network );
|
ItemStack is = p.getItemStack( PartItemStack.Network );
|
||||||
|
|
||||||
data.writeShort( Item.getIdFromItem( is.getItem() ) );
|
data.writeShort( Item.getIdFromItem( is.getItem() ) );
|
||||||
data.writeShort( is.getItemDamage() );
|
data.writeShort( is.getItemDamage() );
|
||||||
|
|
|
@ -161,9 +161,6 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
|
||||||
protected void renderStaticWithIcon( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, IIcon activeIcon )
|
protected void renderStaticWithIcon( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer, IIcon activeIcon )
|
||||||
{
|
{
|
||||||
int minX = 1;
|
int minX = 1;
|
||||||
int minY = 1;
|
|
||||||
int maxX = 15;
|
|
||||||
int maxY = 15;
|
|
||||||
|
|
||||||
final ForgeDirection e = rh.getWorldX();
|
final ForgeDirection e = rh.getWorldX();
|
||||||
final ForgeDirection u = rh.getWorldY();
|
final ForgeDirection u = rh.getWorldY();
|
||||||
|
@ -175,16 +172,19 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
|
||||||
minX = 0;
|
minX = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int maxX = 15;
|
||||||
if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) )
|
if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) )
|
||||||
{
|
{
|
||||||
maxX = 16;
|
maxX = 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int minY = 1;
|
||||||
if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) )
|
if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) )
|
||||||
{
|
{
|
||||||
minY = 0;
|
minY = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int maxY = 15;
|
||||||
if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) )
|
if( this.isAnnihilationPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) )
|
||||||
{
|
{
|
||||||
maxY = 16;
|
maxY = 16;
|
||||||
|
|
|
@ -284,9 +284,6 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
|
||||||
public void renderStatic( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer )
|
public void renderStatic( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer )
|
||||||
{
|
{
|
||||||
int minX = 1;
|
int minX = 1;
|
||||||
int minY = 1;
|
|
||||||
int maxX = 15;
|
|
||||||
int maxY = 15;
|
|
||||||
|
|
||||||
ForgeDirection e = rh.getWorldX();
|
ForgeDirection e = rh.getWorldX();
|
||||||
ForgeDirection u = rh.getWorldY();
|
ForgeDirection u = rh.getWorldY();
|
||||||
|
@ -298,16 +295,19 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
|
||||||
minX = 0;
|
minX = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int maxX = 15;
|
||||||
if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) )
|
if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + e.offsetX, y + e.offsetY, z + e.offsetZ ), this.side ) )
|
||||||
{
|
{
|
||||||
maxX = 16;
|
maxX = 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int minY = 1;
|
||||||
if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) )
|
if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x - u.offsetX, y - u.offsetY, z - u.offsetZ ), this.side ) )
|
||||||
{
|
{
|
||||||
minY = 0;
|
minY = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int maxY = 15;
|
||||||
if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) )
|
if( this.isTransitionPlane( te.getWorldObj().getTileEntity( x + u.offsetX, y + u.offsetY, z + u.offsetZ ), this.side ) )
|
||||||
{
|
{
|
||||||
maxY = 16;
|
maxY = 16;
|
||||||
|
|
|
@ -288,8 +288,6 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
|
||||||
private int calculateMaximumAmountToImport( InventoryAdaptor myAdaptor, IAEItemStack whatToImport, IMEMonitor<IAEItemStack> inv, FuzzyMode fzMode )
|
private int calculateMaximumAmountToImport( InventoryAdaptor myAdaptor, IAEItemStack whatToImport, IMEMonitor<IAEItemStack> inv, FuzzyMode fzMode )
|
||||||
{
|
{
|
||||||
final int toSend = Math.min( this.itemToSend, 64 );
|
final int toSend = Math.min( this.itemToSend, 64 );
|
||||||
final ItemStack simResult;
|
|
||||||
final IAEItemStack itemAmountNotStorable;
|
|
||||||
final ItemStack itemStackToImport;
|
final ItemStack itemStackToImport;
|
||||||
|
|
||||||
if( whatToImport == null )
|
if( whatToImport == null )
|
||||||
|
@ -301,6 +299,8 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
|
||||||
itemStackToImport = whatToImport.getItemStack();
|
itemStackToImport = whatToImport.getItemStack();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final IAEItemStack itemAmountNotStorable;
|
||||||
|
final ItemStack simResult;
|
||||||
if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
|
if( this.getInstalledUpgrades( Upgrades.FUZZY ) > 0 )
|
||||||
{
|
{
|
||||||
simResult = myAdaptor.simulateSimilarRemove( toSend, itemStackToImport, fzMode, this.configDestination( inv ) );
|
simResult = myAdaptor.simulateSimilarRemove( toSend, itemStackToImport, fzMode, this.configDestination( inv ) );
|
||||||
|
|
|
@ -433,9 +433,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
|
||||||
|
|
||||||
baseY += 7.0 / 16.0;
|
baseY += 7.0 / 16.0;
|
||||||
|
|
||||||
double par10 = 0;
|
|
||||||
// double par11 = 0;
|
// double par11 = 0;
|
||||||
double Zero = 0;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* double d5 = (double)IIcon.func_94209_e(); double d6 = (double)IIcon.func_94206_g(); double d7 =
|
* double d5 = (double)IIcon.func_94209_e(); double d6 = (double)IIcon.func_94206_g(); double d7 =
|
||||||
|
@ -475,9 +473,6 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
|
||||||
double var38 = baseX + 0.5D;
|
double var38 = baseX + 0.5D;
|
||||||
double var40 = baseZ - 0.5D;
|
double var40 = baseZ - 0.5D;
|
||||||
double var42 = baseZ + 0.5D;
|
double var42 = baseZ + 0.5D;
|
||||||
double var44 = 0.0625D;
|
|
||||||
double var422 = 0.1915D + 1.0 / 16.0;
|
|
||||||
double TorchLen = 0.625D;
|
|
||||||
|
|
||||||
double toff = 0.0d;
|
double toff = 0.0d;
|
||||||
|
|
||||||
|
@ -493,11 +488,16 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
|
||||||
var12.setBrightness( 11 << 20 | 11 << 4 );
|
var12.setBrightness( 11 << 20 | 11 << 4 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double TorchLen = 0.625D;
|
||||||
|
double var44 = 0.0625D;
|
||||||
|
double Zero = 0;
|
||||||
|
double par10 = 0;
|
||||||
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var20, var22 );
|
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var20, var22 );
|
||||||
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20, var26 );
|
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20, var26 );
|
||||||
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24, var26 );
|
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24, var26 );
|
||||||
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24, var22 );
|
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + TorchLen - toff, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24, var22 );
|
||||||
|
|
||||||
|
double var422 = 0.1915D + 1.0 / 16.0;
|
||||||
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24b, var22b );
|
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) - var44, var24b, var22b );
|
||||||
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24b, var26b );
|
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) + var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var24b, var26b );
|
||||||
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20b, var26b );
|
this.addVertexWithUV( baseX + Zero * ( 1.0D - TorchLen ) - var44, baseY + var422, baseZ + par10 * ( 1.0D - TorchLen ) + var44, var20b, var26b );
|
||||||
|
|
|
@ -59,11 +59,8 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
|
||||||
public void notifyNeighbors()
|
public void notifyNeighbors()
|
||||||
{
|
{
|
||||||
// cache of inventory state.
|
// cache of inventory state.
|
||||||
int[][] sideData = null;
|
|
||||||
List<ISidedInventory> inventories = null;
|
|
||||||
List<InvSot> slots = null;
|
|
||||||
|
|
||||||
inventories = new ArrayList<ISidedInventory>();
|
List<ISidedInventory> inventories = new ArrayList<ISidedInventory>();
|
||||||
int slotCount = 0;
|
int slotCount = 0;
|
||||||
|
|
||||||
for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS )
|
for( ForgeDirection side : ForgeDirection.VALID_DIRECTIONS )
|
||||||
|
@ -77,6 +74,8 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<InvSot> slots = null;
|
||||||
|
int[][] sideData = null;
|
||||||
if( inventories.isEmpty() || slotCount == 0 )
|
if( inventories.isEmpty() || slotCount == 0 )
|
||||||
{
|
{
|
||||||
inventories = null;
|
inventories = null;
|
||||||
|
|
|
@ -464,10 +464,10 @@ public class PartCable extends AEBasePart implements IPartCable
|
||||||
if( Platform.isServer() )
|
if( Platform.isServer() )
|
||||||
{
|
{
|
||||||
IGridNode node = this.getGridNode();
|
IGridNode node = this.getGridNode();
|
||||||
int howMany = 0;
|
|
||||||
|
|
||||||
if( node != null )
|
if( node != null )
|
||||||
{
|
{
|
||||||
|
int howMany = 0;
|
||||||
for( IGridConnection gc : node.getConnections() )
|
for( IGridConnection gc : node.getConnections() )
|
||||||
{
|
{
|
||||||
howMany = Math.max( gc.getUsedChannels(), howMany );
|
howMany = Math.max( gc.getUsedChannels(), howMany );
|
||||||
|
@ -815,11 +815,11 @@ public class PartCable extends AEBasePart implements IPartCable
|
||||||
TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ );
|
TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ );
|
||||||
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
|
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
|
||||||
IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
|
IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
|
||||||
boolean isGlass = false;
|
|
||||||
AEColor myColor = this.getCableColor();
|
AEColor myColor = this.getCableColor();
|
||||||
|
|
||||||
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of ) ) );
|
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of ) ) );
|
||||||
|
|
||||||
|
boolean isGlass = false;
|
||||||
if( ghh != null && partHost != null && ghh.getCableConnectionType( of.getOpposite() ) == AECableType.GLASS && partHost.getPart( of.getOpposite() ) == null && partHost.getColor() != AEColor.Transparent )
|
if( ghh != null && partHost != null && ghh.getCableConnectionType( of.getOpposite() ) == AECableType.GLASS && partHost.getPart( of.getOpposite() ) == null && partHost.getColor() != AEColor.Transparent )
|
||||||
{
|
{
|
||||||
isGlass = true;
|
isGlass = true;
|
||||||
|
|
|
@ -365,7 +365,6 @@ public class PartDenseCable extends PartCable
|
||||||
TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ );
|
TileEntity te = this.tile.getWorldObj().getTileEntity( x + of.offsetX, y + of.offsetY, z + of.offsetZ );
|
||||||
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
|
IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
|
||||||
IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
|
IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
|
||||||
boolean isGlass = false;
|
|
||||||
AEColor myColor = this.getCableColor();
|
AEColor myColor = this.getCableColor();
|
||||||
/*
|
/*
|
||||||
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS &&
|
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS &&
|
||||||
|
@ -434,6 +433,7 @@ public class PartDenseCable extends PartCable
|
||||||
rh.renderBlock( x, y, z, renderer );
|
rh.renderBlock( x, y, z, renderer );
|
||||||
|
|
||||||
rh.setFacesToRender( EnumSet.allOf( ForgeDirection.class ) );
|
rh.setFacesToRender( EnumSet.allOf( ForgeDirection.class ) );
|
||||||
|
boolean isGlass = false;
|
||||||
if( !isGlass )
|
if( !isGlass )
|
||||||
{
|
{
|
||||||
this.setSmartConnectionRotations( of, renderer );
|
this.setSmartConnectionRotations( of, renderer );
|
||||||
|
|
|
@ -149,9 +149,9 @@ public class PartP2PLiquids extends PartP2PTunnel<PartP2PLiquids> implements IFl
|
||||||
}
|
}
|
||||||
|
|
||||||
int available = resource.amount;
|
int available = resource.amount;
|
||||||
int used = 0;
|
|
||||||
|
|
||||||
i = list.iterator();
|
i = list.iterator();
|
||||||
|
int used = 0;
|
||||||
while( i.hasNext() )
|
while( i.hasNext() )
|
||||||
{
|
{
|
||||||
PartP2PLiquids l = i.next();
|
PartP2PLiquids l = i.next();
|
||||||
|
|
|
@ -193,8 +193,6 @@ public final class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implemen
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int total = 0;
|
|
||||||
|
|
||||||
Stack<PartP2PRFPower> stack = this.getDepth();
|
Stack<PartP2PRFPower> stack = this.getDepth();
|
||||||
|
|
||||||
for( PartP2PRFPower t : stack )
|
for( PartP2PRFPower t : stack )
|
||||||
|
@ -207,6 +205,7 @@ public final class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implemen
|
||||||
|
|
||||||
stack.push( this );
|
stack.push( this );
|
||||||
|
|
||||||
|
int total = 0;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
for( PartP2PRFPower t : this.getOutputs() )
|
for( PartP2PRFPower t : this.getOutputs() )
|
||||||
|
@ -235,8 +234,6 @@ public final class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implemen
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int total = 0;
|
|
||||||
|
|
||||||
Stack<PartP2PRFPower> stack = this.getDepth();
|
Stack<PartP2PRFPower> stack = this.getDepth();
|
||||||
|
|
||||||
for( PartP2PRFPower t : stack )
|
for( PartP2PRFPower t : stack )
|
||||||
|
@ -249,6 +246,7 @@ public final class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implemen
|
||||||
|
|
||||||
stack.push( this );
|
stack.push( this );
|
||||||
|
|
||||||
|
int total = 0;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
for( PartP2PRFPower t : this.getOutputs() )
|
for( PartP2PRFPower t : this.getOutputs() )
|
||||||
|
|
|
@ -88,10 +88,9 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
PartP2PTunnel tunnel;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
tunnel = this.proxy.getP2P().getInput( this.freq );
|
PartP2PTunnel tunnel = this.proxy.getP2P().getInput( this.freq );
|
||||||
if( this.getClass().isInstance( tunnel ) )
|
if( this.getClass().isInstance( tunnel ) )
|
||||||
{
|
{
|
||||||
return (T) tunnel;
|
return (T) tunnel;
|
||||||
|
|
|
@ -454,10 +454,9 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
IEnergyGrid eg;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
eg = this.gridProxy.getEnergy();
|
IEnergyGrid eg = this.gridProxy.getEnergy();
|
||||||
IEnergySource src = this;
|
IEnergySource src = this;
|
||||||
|
|
||||||
// Base 1, increase by 1 for each card
|
// Base 1, increase by 1 for each card
|
||||||
|
|
|
@ -100,10 +100,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
|
||||||
{
|
{
|
||||||
if( this.cb.requiresDynamicRender )
|
if( this.cb.requiresDynamicRender )
|
||||||
{
|
{
|
||||||
TileCableBus tcb;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance();
|
TileCableBus tcb = (TileCableBus) BlockCableBus.tesrTile.newInstance();
|
||||||
tcb.copyFrom( this );
|
tcb.copyFrom( this );
|
||||||
this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb );
|
this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb );
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,10 +30,9 @@ public class TileCableBusTESR extends TileCableBus
|
||||||
{
|
{
|
||||||
if( !this.cb.requiresDynamicRender )
|
if( !this.cb.requiresDynamicRender )
|
||||||
{
|
{
|
||||||
TileCableBus tcb;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance();
|
TileCableBus tcb = (TileCableBus) BlockCableBus.noTesrTile.newInstance();
|
||||||
tcb.copyFrom( this );
|
tcb.copyFrom( this );
|
||||||
this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb );
|
this.getWorldObj().setTileEntity( this.xCoord, this.yCoord, this.zCoord, tcb );
|
||||||
}
|
}
|
||||||
|
|
|
@ -343,10 +343,9 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
||||||
{
|
{
|
||||||
double stash = 0.0;
|
double stash = 0.0;
|
||||||
|
|
||||||
IEnergyGrid eg;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
eg = this.gridProxy.getEnergy();
|
IEnergyGrid eg = this.gridProxy.getEnergy();
|
||||||
stash = eg.extractAEPower( amt, mode, PowerMultiplier.ONE );
|
stash = eg.extractAEPower( amt, mode, PowerMultiplier.ONE );
|
||||||
if( stash >= amt )
|
if( stash >= amt )
|
||||||
{
|
{
|
||||||
|
@ -950,7 +949,6 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
||||||
{
|
{
|
||||||
if( TileChest.this.getTile() instanceof IActionHost && requiredPermission != null )
|
if( TileChest.this.getTile() instanceof IActionHost && requiredPermission != null )
|
||||||
{
|
{
|
||||||
boolean requirePower = false;
|
|
||||||
|
|
||||||
IGridNode gn = ( (IActionHost) TileChest.this.getTile() ).getActionableNode();
|
IGridNode gn = ( (IActionHost) TileChest.this.getTile() ).getActionableNode();
|
||||||
if( gn != null )
|
if( gn != null )
|
||||||
|
@ -958,6 +956,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
|
||||||
IGrid g = gn.getGrid();
|
IGrid g = gn.getGrid();
|
||||||
if( g != null )
|
if( g != null )
|
||||||
{
|
{
|
||||||
|
boolean requirePower = false;
|
||||||
if( requirePower )
|
if( requirePower )
|
||||||
{
|
{
|
||||||
IEnergyGrid eg = g.getCache( IEnergyGrid.class );
|
IEnergyGrid eg = g.getCache( IEnergyGrid.class );
|
||||||
|
|
|
@ -205,7 +205,6 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
|
||||||
|
|
||||||
private void recalculateDisplay()
|
private void recalculateDisplay()
|
||||||
{
|
{
|
||||||
int oldState = 0;
|
|
||||||
|
|
||||||
boolean currentActive = this.gridProxy.isActive();
|
boolean currentActive = this.gridProxy.isActive();
|
||||||
if( currentActive )
|
if( currentActive )
|
||||||
|
@ -235,6 +234,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
|
||||||
this.state |= ( this.getCellStatus( x ) << ( 3 * x ) );
|
this.state |= ( this.getCellStatus( x ) << ( 3 * x ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int oldState = 0;
|
||||||
if( oldState != this.state )
|
if( oldState != this.state )
|
||||||
{
|
{
|
||||||
this.markForUpdate();
|
this.markForUpdate();
|
||||||
|
|
|
@ -171,7 +171,6 @@ public final class ASMIntegration implements IClassTransformer
|
||||||
}
|
}
|
||||||
|
|
||||||
String iFace = null;
|
String iFace = null;
|
||||||
String iName = null;
|
|
||||||
|
|
||||||
if( an.values.get( 0 ).equals( "iface" ) )
|
if( an.values.get( 0 ).equals( "iface" ) )
|
||||||
{
|
{
|
||||||
|
@ -182,6 +181,7 @@ public final class ASMIntegration implements IClassTransformer
|
||||||
iFace = (String) an.values.get( 3 );
|
iFace = (String) an.values.get( 3 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String iName = null;
|
||||||
if( an.values.get( 0 ).equals( "iname" ) )
|
if( an.values.get( 0 ).equals( "iname" ) )
|
||||||
{
|
{
|
||||||
iName = ( (String[]) an.values.get( 1 ) )[1];
|
iName = ( (String[]) an.values.get( 1 ) )[1];
|
||||||
|
|
|
@ -187,9 +187,6 @@ public class Platform
|
||||||
PowerUnits displayUnits = AEConfig.instance.selectedPowerUnit();
|
PowerUnits displayUnits = AEConfig.instance.selectedPowerUnit();
|
||||||
p = PowerUnits.AE.convertTo( displayUnits, p );
|
p = PowerUnits.AE.convertTo( displayUnits, p );
|
||||||
|
|
||||||
int offset = 0;
|
|
||||||
String level = "";
|
|
||||||
String[] preFixes = { "k", "M", "G", "T", "P", "T", "P", "E", "Z", "Y" };
|
|
||||||
String unitName = displayUnits.name();
|
String unitName = displayUnits.name();
|
||||||
|
|
||||||
if( displayUnits == PowerUnits.WA )
|
if( displayUnits == PowerUnits.WA )
|
||||||
|
@ -202,6 +199,20 @@ public class Platform
|
||||||
unitName = "J";
|
unitName = "J";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String[] preFixes = new String[] {
|
||||||
|
"k",
|
||||||
|
"M",
|
||||||
|
"G",
|
||||||
|
"T",
|
||||||
|
"P",
|
||||||
|
"T",
|
||||||
|
"P",
|
||||||
|
"E",
|
||||||
|
"Z",
|
||||||
|
"Y"
|
||||||
|
};
|
||||||
|
String level = "";
|
||||||
|
int offset = 0;
|
||||||
while( p > 1000 && offset < preFixes.length )
|
while( p > 1000 && offset < preFixes.length )
|
||||||
{
|
{
|
||||||
p /= 1000;
|
p /= 1000;
|
||||||
|
@ -1372,9 +1383,8 @@ public class Platform
|
||||||
if( hitEntities )
|
if( hitEntities )
|
||||||
{
|
{
|
||||||
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
|
List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
|
||||||
int l;
|
|
||||||
|
|
||||||
for( l = 0; l < list.size(); ++l )
|
for( int l = 0; l < list.size(); ++l )
|
||||||
{
|
{
|
||||||
Entity entity1 = (Entity) list.get( l );
|
Entity entity1 = (Entity) list.get( l );
|
||||||
|
|
||||||
|
@ -1634,7 +1644,6 @@ public class Platform
|
||||||
{
|
{
|
||||||
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
for( ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS )
|
||||||
{
|
{
|
||||||
int offset = 0;
|
|
||||||
|
|
||||||
int[] sides = ( (ISidedInventory) target ).getAccessibleSlotsFromSide( dir.ordinal() );
|
int[] sides = ( (ISidedInventory) target ).getAccessibleSlotsFromSide( dir.ordinal() );
|
||||||
|
|
||||||
|
@ -1643,6 +1652,7 @@ public class Platform
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int offset = 0;
|
||||||
for( int side : sides )
|
for( int side : sides )
|
||||||
{
|
{
|
||||||
int c = ( side << ( offset % 8 ) ) ^ ( 1 << dir.ordinal() );
|
int c = ( side << ( offset % 8 ) ) ^ ( 1 << dir.ordinal() );
|
||||||
|
@ -1729,10 +1739,10 @@ public class Platform
|
||||||
|
|
||||||
public static void configurePlayer( EntityPlayer player, ForgeDirection side, TileEntity tile )
|
public static void configurePlayer( EntityPlayer player, ForgeDirection side, TileEntity tile )
|
||||||
{
|
{
|
||||||
float pitch = 0.0f;
|
|
||||||
float yaw = 0.0f;
|
|
||||||
player.yOffset = 1.8f;
|
player.yOffset = 1.8f;
|
||||||
|
|
||||||
|
float yaw = 0.0f;
|
||||||
|
float pitch = 0.0f;
|
||||||
switch( side )
|
switch( side )
|
||||||
{
|
{
|
||||||
case DOWN:
|
case DOWN:
|
||||||
|
|
|
@ -446,7 +446,6 @@ public final class MeteoritePlacer
|
||||||
|
|
||||||
public boolean spawnMeteorite( IMeteoriteWorld w, int x, int y, int z )
|
public boolean spawnMeteorite( IMeteoriteWorld w, int x, int y, int z )
|
||||||
{
|
{
|
||||||
int validBlocks = 0;
|
|
||||||
|
|
||||||
if( !w.hasNoSky() )
|
if( !w.hasNoSky() )
|
||||||
{
|
{
|
||||||
|
@ -502,6 +501,7 @@ public final class MeteoritePlacer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int validBlocks = 0;
|
||||||
for( int i = x - 15; i < x + 15; i++ )
|
for( int i = x - 15; i < x + 15; i++ )
|
||||||
{
|
{
|
||||||
for( int j = y - 15; j < y + 15; j++ )
|
for( int j = y - 15; j < y + 15; j++ )
|
||||||
|
|
Loading…
Reference in a new issue