fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce scope of variables

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:22:21 +02:00
parent dca09fe0a6
commit 059523f543
70 changed files with 151 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseGui.java
+6 -6
View File
@@ -818,17 +818,17 @@ public abstract class AEBaseGui extends GuiContainer
float par2 = aes.yDisplayPosition;
float par3 = uv_x * 16;
float par4 = uv_y * 16;
float par5 = 16;
float par6 = 16;
Tessellator tessellator = Tessellator.getInstance();
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
float f = 0.00390625F;
float f1 = 0.00390625F;
worldrenderer.startDrawingQuads();
worldrenderer.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
float f1 = 0.00390625F;
float f = 0.00390625F;
float par6 = 16;
worldrenderer.addVertexWithUV( par1 + 0, par2 + par6, this.zLevel, ( par3 + 0 ) * f, ( par4 + par6 ) * f1 );
float par5 = 16;
worldrenderer.addVertexWithUV( par1 + par5, par2 + par6, this.zLevel, ( par3 + par5 ) * f, ( par4 + par6 ) * f1 );
worldrenderer.addVertexWithUV( par1 + par5, par2 + 0, this.zLevel, ( par3 + par5 ) * f, ( par4 + 0 ) * f1 );
worldrenderer.addVertexWithUV( par1 + 0, par2 + 0, this.zLevel, ( par3 + 0 ) * f, ( par4 + 0 ) * f1 );
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+4 -5
View File
@@ -138,15 +138,14 @@ public class GuiCraftConfirm extends AEBaseGui
this.start.enabled = !( this.ccc.noCPU || this.isSimulation() );
this.selectCPU.enabled = !this.isSimulation();
int x = 0;
int y = 0;
int gx = ( this.width - this.xSize ) / 2;
int gy = ( this.height - this.ySize ) / 2;
int offY = 23;
this.tooltip = -1;
int offY = 23;
int y = 0;
int x = 0;
for( int z = 0; z <= 4 * 5; z++ )
{
int minX = gx + 9 + x * 67;
@@ -269,7 +268,6 @@ public class GuiCraftConfirm extends AEBaseGui
int negY = ( ( lines - 1 ) * 5 ) / 2;
int downY = 0;
boolean red = false;
if( stored != null && stored.getStackSize() > 0 )
{
@@ -295,6 +293,7 @@ public class GuiCraftConfirm extends AEBaseGui
downY += 5;
}
boolean red = false;
if( missingStack != null && missingStack.getStackSize() > 0 )
{
String str = Long.toString( missingStack.getStackSize() );
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+6 -7
View File
@@ -154,15 +154,14 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{
this.cancel.enabled = !this.visual.isEmpty();
int x = 0;
int y = 0;
final int gx = ( this.width - this.xSize ) / 2;
final int gy = ( this.height - this.ySize ) / 2;
final int offY = 23;
this.tooltip = -1;
final int offY = 23;
int y = 0;
int x = 0;
for( int z = 0; z <= 4 * 5; z++ )
{
int minX = gx + 9 + x * 67;
@@ -192,7 +191,6 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
{
final ReadableNumberConverter converter = ReadableNumberConverter.INSTANCE;
String title = this.getGuiDisplayName( GuiText.CraftingStatus.getLocal() );
if( this.craftingCpu.eta > 0 && !this.visual.isEmpty() )
@@ -216,6 +214,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
int offY = 23;
final ReadableNumberConverter converter = ReadableNumberConverter.INSTANCE;
for( int z = viewStart; z < Math.min( viewEnd, this.visual.size() ); 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 );
int lines = 0;
boolean active = false;
boolean scheduled = false;
if( stored != null && stored.getStackSize() > 0 )
{
lines++;
}
boolean active = false;
if( activeStack != null && activeStack.getStackSize() > 0 )
{
lines++;
active = true;
}
boolean scheduled = false;
if( pendingStack != null && pendingStack.getStackSize() > 0 )
{
lines++;
src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java
+1 -2
View File
@@ -65,8 +65,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable
if( s != null )
{
PacketInventoryAction p;
p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 );
PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 );
NetworkHandler.instance.sendToServer( p );
}
}
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+1 -1
View File
@@ -99,7 +99,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
int offset = 17;
int ex = this.myScrollBar.getCurrentScroll();
Iterator<Object> o = this.inventorySlots.inventorySlots.iterator();
@@ -111,6 +110,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
}
int offset = 17;
for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
{
Object lineObj = this.lines.get( ex + x );
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+1 -1
View File
@@ -393,9 +393,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
{
int x_width = 197;
this.bindTexture( this.getBackground() );
int x_width = 197;
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 );
if( this.viewCell || ( this instanceof GuiSecurity ) )
src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java
+2 -2
View File
@@ -92,14 +92,14 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
@Override
public void drawScreen( int mouseX, int mouseY, float btn )
{
int x = 0;
int y = 0;
int gx = ( this.width - this.xSize ) / 2;
int gy = ( this.height - this.ySize ) / 2;
this.tooltip = -1;
int y = 0;
int x = 0;
for( int z = 0; z <= 4 * 5; z++ )
{
int minX = gx + 14 + x * 31;
src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java
+2 -3
View File
@@ -59,9 +59,6 @@ public class GuiVibrationChamber extends AEBaseGui
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.VibrationChamber.getLocal() ), 8, 6, 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" );
if( this.cvc.getCurrentProgress() > 0 )
@@ -69,6 +66,8 @@ public class GuiVibrationChamber extends AEBaseGui
int i1 = this.cvc.getCurrentProgress();
this.bindTexture( "guis/vibchamber.png" );
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 );
}
}