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

final variables and parameters

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:24:40 +02:00
parent 059523f543
commit 8b3a954f73
732 changed files with 9253 additions and 9256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseGui.java
+92 -92
View File
@@ -96,28 +96,28 @@ public abstract class AEBaseGui extends GuiContainer
boolean useNEI = false;
private boolean subGui;
public AEBaseGui( Container container )
public AEBaseGui( final Container container )
{
super( container );
this.subGui = switchingGuis;
switchingGuis = false;
}
protected static String join( Collection<String> toolTip, String delimiter )
protected static String join( final Collection<String> toolTip, final String delimiter )
{
final Joiner joiner = Joiner.on( delimiter );
return joiner.join( toolTip );
}
protected int getQty( GuiButton btn )
protected int getQty( final GuiButton btn )
{
try
{
DecimalFormat df = new DecimalFormat( "+#;-#" );
final DecimalFormat df = new DecimalFormat( "+#;-#" );
return df.parse( btn.displayString ).intValue();
}
catch( ParseException e )
catch( final ParseException e )
{
return 0;
}
@@ -134,7 +134,7 @@ public abstract class AEBaseGui extends GuiContainer
super.initGui();
final List<Slot> slots = this.getInventorySlots();
Iterator<Slot> i = slots.iterator();
final Iterator<Slot> i = slots.iterator();
while( i.hasNext() )
{
if( i.next() instanceof SlotME )
@@ -143,7 +143,7 @@ public abstract class AEBaseGui extends GuiContainer
}
}
for( InternalSlotME me : this.meSlots )
for( final InternalSlotME me : this.meSlots )
{
slots.add( new SlotME( me ) );
}
@@ -156,22 +156,22 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
public void drawScreen( int mouseX, int mouseY, float btn )
public void drawScreen( final int mouseX, final int mouseY, final float btn )
{
super.drawScreen( mouseX, mouseY, btn );
boolean hasClicked = Mouse.isButtonDown( 0 );
final boolean hasClicked = Mouse.isButtonDown( 0 );
if( hasClicked && this.myScrollBar != null )
{
this.myScrollBar.click( this, mouseX - this.guiLeft, mouseY - this.guiTop );
}
for( Object c : this.buttonList )
for( final Object c : this.buttonList )
{
if( c instanceof ITooltip )
{
ITooltip tooltip = (ITooltip) c;
int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
final ITooltip tooltip = (ITooltip) c;
final int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
int y = tooltip.yPos(); // ((GuiImgButton) c).yPosition;
if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
@@ -183,7 +183,7 @@ public abstract class AEBaseGui extends GuiContainer
y = 15;
}
String msg = tooltip.getMessage();
final String msg = tooltip.getMessage();
if( msg != null )
{
this.drawTooltip( x + 11, y + 4, 0, msg );
@@ -194,14 +194,14 @@ public abstract class AEBaseGui extends GuiContainer
}
}
public void drawTooltip( int par2, int par3, int forceWidth, String message )
public void drawTooltip( final int par2, final int par3, final int forceWidth, final String message )
{
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
RenderHelper.disableStandardItemLighting();
GL11.glDisable( GL11.GL_LIGHTING );
GL11.glDisable( GL11.GL_DEPTH_TEST );
String[] var4 = message.split( "\n" );
final String[] var4 = message.split( "\n" );
if( var4.length > 0 )
{
@@ -240,14 +240,14 @@ public abstract class AEBaseGui extends GuiContainer
this.zLevel = 300.0F;
itemRender.zLevel = 300.0F;
int var10 = -267386864;
final int var10 = -267386864;
this.drawGradientRect( var6 - 3, var7 - 4, var6 + var5 + 3, var7 - 3, var10, var10 );
this.drawGradientRect( var6 - 3, var7 + var9 + 3, var6 + var5 + 3, var7 + var9 + 4, var10, var10 );
this.drawGradientRect( var6 - 3, var7 - 3, var6 + var5 + 3, var7 + var9 + 3, var10, var10 );
this.drawGradientRect( var6 - 4, var7 - 3, var6 - 3, var7 + var9 + 3, var10, var10 );
this.drawGradientRect( var6 + var5 + 3, var7 - 3, var6 + var5 + 4, var7 + var9 + 3, var10, var10 );
int var11 = 1347420415;
int var12 = ( var11 & 16711422 ) >> 1 | var11 & -16777216;
final int var11 = 1347420415;
final int var12 = ( var11 & 16711422 ) >> 1 | var11 & -16777216;
this.drawGradientRect( var6 - 3, var7 - 3 + 1, var6 - 3 + 1, var7 + var9 + 3 - 1, var11, var12 );
this.drawGradientRect( var6 + var5 + 2, var7 - 3 + 1, var6 + var5 + 3, var7 + var9 + 3 - 1, var11, var12 );
this.drawGradientRect( var6 - 3, var7 - 3, var6 + var5 + 3, var7 - 3 + 1, var11, var11 );
@@ -284,10 +284,10 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
protected final void drawGuiContainerForegroundLayer( int x, int y )
protected final void drawGuiContainerForegroundLayer( final int x, final int y )
{
int ox = this.guiLeft; // (width - xSize) / 2;
int oy = this.guiTop; // (height - ySize) / 2;
final int ox = this.guiLeft; // (width - xSize) / 2;
final int oy = this.guiTop; // (height - ySize) / 2;
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
if( this.myScrollBar != null )
@@ -301,19 +301,19 @@ public abstract class AEBaseGui extends GuiContainer
public abstract void drawFG( int offsetX, int offsetY, int mouseX, int mouseY );
@Override
protected final void drawGuiContainerBackgroundLayer( float f, int x, int y )
protected final void drawGuiContainerBackgroundLayer( final float f, final int x, final int y )
{
int ox = this.guiLeft; // (width - xSize) / 2;
int oy = this.guiTop; // (height - ySize) / 2;
final int ox = this.guiLeft; // (width - xSize) / 2;
final int oy = this.guiTop; // (height - ySize) / 2;
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
this.drawBG( ox, oy, x, y );
final List<Slot> slots = this.getInventorySlots();
for( Slot slot : slots )
for( final Slot slot : slots )
{
if( slot instanceof OptionalSlotFake )
{
OptionalSlotFake fs = (OptionalSlotFake) slot;
final OptionalSlotFake fs = (OptionalSlotFake) slot;
if( fs.renderDisabled() )
{
if( fs.isEnabled() )
@@ -335,15 +335,15 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
protected void mouseClicked( int xCoord, int yCoord, int btn ) throws IOException
protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
{
this.drag_click.clear();
if( btn == 1 )
{
for( Object o : this.buttonList )
for( final Object o : this.buttonList )
{
GuiButton guibutton = (GuiButton) o;
final GuiButton guibutton = (GuiButton) o;
if( guibutton.mousePressed( this.mc, xCoord, yCoord ) )
{
super.mouseClicked( xCoord, yCoord, 0 );
@@ -356,19 +356,19 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
protected void mouseClickMove( int x, int y, int c, long d )
protected void mouseClickMove( final int x, final int y, final int c, final long d )
{
Slot slot = this.getSlot( x, y );
ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
final Slot slot = this.getSlot( x, y );
final ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
if( slot instanceof SlotFake && itemstack != null )
{
this.drag_click.add( slot );
if( this.drag_click.size() > 1 )
{
for( Slot dr : this.drag_click )
for( final Slot dr : this.drag_click )
{
PacketInventoryAction p = new PacketInventoryAction( c == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, dr.slotNumber, 0 );
final PacketInventoryAction p = new PacketInventoryAction( c == 0 ? InventoryAction.PICKUP_OR_SET_DOWN : InventoryAction.PLACE_SINGLE, dr.slotNumber, 0 );
NetworkHandler.instance.sendToServer( p );
}
}
@@ -380,9 +380,9 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
protected void handleMouseClick( Slot slot, int slotIdx, int ctrlDown, int key )
protected void handleMouseClick( final Slot slot, final int slotIdx, final int ctrlDown, final int key )
{
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if( slot instanceof SlotFake )
{
@@ -393,7 +393,7 @@ public abstract class AEBaseGui extends GuiContainer
return;
}
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
NetworkHandler.instance.sendToServer( p );
return;
@@ -410,7 +410,7 @@ public abstract class AEBaseGui extends GuiContainer
{
NetworkHandler.instance.sendToServer( ( (SlotPatternTerm) slot ).getRequest( key == 1 ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
@@ -432,7 +432,7 @@ public abstract class AEBaseGui extends GuiContainer
action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
}
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
NetworkHandler.instance.sendToServer( p );
return;
@@ -456,7 +456,7 @@ public abstract class AEBaseGui extends GuiContainer
}
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
final PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
NetworkHandler.instance.sendToServer( p );
return;
}
@@ -491,7 +491,7 @@ public abstract class AEBaseGui extends GuiContainer
if( action != null )
{
PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).mySlot.id );
final PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ( (SlotDisconnected) slot ).mySlot.id );
NetworkHandler.instance.sendToServer( p );
}
@@ -529,7 +529,7 @@ public abstract class AEBaseGui extends GuiContainer
}
else if( player.capabilities.isCreativeMode )
{
IAEItemStack slotItem = ( (SlotME) slot ).getAEStack();
final IAEItemStack slotItem = ( (SlotME) slot ).getAEStack();
if( slotItem != null )
{
action = InventoryAction.CREATIVE_DUPLICATE;
@@ -545,7 +545,7 @@ public abstract class AEBaseGui extends GuiContainer
if( action != null )
{
( (AEBaseContainer) this.inventorySlots ).setTargetStack( stack );
PacketInventoryAction p = new PacketInventoryAction( action, this.getInventorySlots().size(), 0 );
final PacketInventoryAction p = new PacketInventoryAction( action, this.getInventorySlots().size(), 0 );
NetworkHandler.instance.sendToServer( p );
}
@@ -575,7 +575,7 @@ public abstract class AEBaseGui extends GuiContainer
// a replica of the weird broken vanilla feature.
final List<Slot> slots = this.getInventorySlots();
for( Slot inventorySlot : slots )
for( final Slot inventorySlot : slots )
{
if( inventorySlot != null && inventorySlot.canTakeStack( this.mc.thePlayer ) && inventorySlot.getHasStack() && inventorySlot.inventory == slot.inventory && Container.canAddItemToSlot( inventorySlot, this.dbl_whichItem, true ) )
{
@@ -591,15 +591,15 @@ public abstract class AEBaseGui extends GuiContainer
}
@Override
protected boolean checkHotbarKeys( int keyCode )
protected boolean checkHotbarKeys( final int keyCode )
{
Slot theSlot;
final Slot theSlot;
try
{
theSlot = ObfuscationReflectionHelper.getPrivateValue( GuiContainer.class, this, "theSlot", "field_147006_u", "f" );
}
catch( Throwable t )
catch( final Throwable t )
{
return false;
}
@@ -611,7 +611,7 @@ public abstract class AEBaseGui extends GuiContainer
if( keyCode == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode() )
{
final List<Slot> slots = this.getInventorySlots();
for( Slot s : slots )
for( final Slot s : slots )
{
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
{
@@ -629,7 +629,7 @@ public abstract class AEBaseGui extends GuiContainer
}
else
{
for( Slot s : slots )
for( final Slot s : slots )
{
if( s.getSlotIndex() == j && s.inventory == ( (AEBaseContainer) this.inventorySlots ).getPlayerInv() )
{
@@ -652,10 +652,10 @@ public abstract class AEBaseGui extends GuiContainer
this.subGui = true; // in case the gui is reopened later ( i'm looking at you NEI )
}
protected Slot getSlot( int mouseX, int mouseY )
protected Slot getSlot( final int mouseX, final int mouseY )
{
final List<Slot> slots = this.getInventorySlots();
for( Slot slot : slots )
for( final Slot slot : slots )
{
// isPointInRegion
if( this.isPointInRegion( slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY ) )
@@ -674,11 +674,11 @@ public abstract class AEBaseGui extends GuiContainer
{
super.handleMouseInput();
int i = Mouse.getEventDWheel();
final int i = Mouse.getEventDWheel();
if( i != 0 && isShiftKeyDown() )
{
int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
final int x = Mouse.getEventX() * this.width / this.mc.displayWidth;
final int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
this.mouseWheelEvent( x, y, i / Math.abs( i ) );
}
else if( i != 0 && this.myScrollBar != null )
@@ -687,21 +687,21 @@ public abstract class AEBaseGui extends GuiContainer
}
}
protected void mouseWheelEvent( int x, int y, int wheel )
protected void mouseWheelEvent( final int x, final int y, final int wheel )
{
Slot slot = this.getSlot( x, y );
final Slot slot = this.getSlot( x, y );
if( slot instanceof SlotME )
{
IAEItemStack item = ( (SlotME) slot ).getAEStack();
final IAEItemStack item = ( (SlotME) slot ).getAEStack();
if( item != null )
{
( (AEBaseContainer) this.inventorySlots ).setTargetStack( item );
InventoryAction direction = wheel > 0 ? InventoryAction.ROLL_DOWN : InventoryAction.ROLL_UP;
int times = Math.abs( wheel );
final InventoryAction direction = wheel > 0 ? InventoryAction.ROLL_DOWN : InventoryAction.ROLL_UP;
final int times = Math.abs( wheel );
final int inventorySize = this.getInventorySlots().size();
for( int h = 0; h < times; h++ )
{
PacketInventoryAction p = new PacketInventoryAction( direction, inventorySize, 0 );
final PacketInventoryAction p = new PacketInventoryAction( direction, inventorySize, 0 );
NetworkHandler.instance.sendToServer( p );
}
}
@@ -713,13 +713,13 @@ public abstract class AEBaseGui extends GuiContainer
return true;
}
public void bindTexture( String base, String file )
public void bindTexture( final String base, final String file )
{
ResourceLocation loc = new ResourceLocation( base, "textures/" + file );
final ResourceLocation loc = new ResourceLocation( base, "textures/" + file );
this.mc.getTextureManager().bindTexture( loc );
}
protected void drawItem( int x, int y, ItemStack is )
protected void drawItem( final int x, final int y, final ItemStack is )
{
this.zLevel = 100.0F;
itemRender.zLevel = 100.0F;
@@ -736,7 +736,7 @@ public abstract class AEBaseGui extends GuiContainer
this.zLevel = 0.0F;
}
protected String getGuiDisplayName( String in )
protected String getGuiDisplayName( final String in )
{
return this.hasCustomInventoryName() ? this.getInventoryName() : in;
}
@@ -755,16 +755,16 @@ public abstract class AEBaseGui extends GuiContainer
return ( (AEBaseContainer) this.inventorySlots ).customName;
}
public void a( Slot s )
public void a( final Slot s )
{
this.drawSlot( s );
}
public void drawSlot( Slot s )
public void drawSlot( final Slot s )
{
if( s instanceof SlotME )
{
RenderItem pIR = this.setItemRender( this.aeRenderItem );
final RenderItem pIR = this.setItemRender( this.aeRenderItem );
try
{
this.zLevel = 100.0F;
@@ -784,7 +784,7 @@ public abstract class AEBaseGui extends GuiContainer
this.safeDrawSlot( s );
}
catch( Exception err )
catch( final Exception err )
{
AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
}
@@ -795,10 +795,10 @@ public abstract class AEBaseGui extends GuiContainer
{
try
{
ItemStack is = s.getStack();
final ItemStack is = s.getStack();
if( s instanceof AppEngSlot && ( ( (AppEngSlot) s ).renderIconWithItem() || is == null ) && ( ( (AppEngSlot) s ).shouldDisplay() ) )
{
AppEngSlot aes = (AppEngSlot) s;
final AppEngSlot aes = (AppEngSlot) s;
if( aes.getIcon() >= 0 )
{
this.bindTexture( "guis/states.png" );
@@ -806,36 +806,36 @@ public abstract class AEBaseGui extends GuiContainer
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
try
{
int uv_y = (int) Math.floor( aes.getIcon() / 16 );
int uv_x = aes.getIcon() - uv_y * 16;
final int uv_y = (int) Math.floor( aes.getIcon() / 16 );
final int uv_x = aes.getIcon() - uv_y * 16;
GL11.glEnable( GL11.GL_BLEND );
GL11.glDisable( GL11.GL_LIGHTING );
GL11.glEnable( GL11.GL_TEXTURE_2D );
GL11.glBlendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA );
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
float par1 = aes.xDisplayPosition;
float par2 = aes.yDisplayPosition;
float par3 = uv_x * 16;
float par4 = uv_y * 16;
final float par1 = aes.xDisplayPosition;
final float par2 = aes.yDisplayPosition;
final float par3 = uv_x * 16;
final float par4 = uv_y * 16;
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
final Tessellator tessellator = Tessellator.getInstance();
final WorldRenderer worldrenderer = tessellator.getWorldRenderer();
worldrenderer.startDrawingQuads();
worldrenderer.setColorRGBA_F( 1.0f, 1.0f, 1.0f, aes.getOpacityOfIcon() );
float f1 = 0.00390625F;
float f = 0.00390625F;
float par6 = 16;
final float f1 = 0.00390625F;
final float f = 0.00390625F;
final float par6 = 16;
worldrenderer.addVertexWithUV( par1 + 0, par2 + par6, this.zLevel, ( par3 + 0 ) * f, ( par4 + par6 ) * f1 );
float par5 = 16;
final 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 );
worldrenderer.setColorRGBA_F( 1.0f, 1.0f, 1.0f, 1.0f );
tessellator.draw();
}
catch( Exception err )
catch( final Exception err )
{
}
GL11.glPopAttrib();
@@ -853,7 +853,7 @@ public abstract class AEBaseGui extends GuiContainer
{
isValid = ( (SlotRestrictedInput) s ).isValid( is, this.mc.theWorld );
}
catch( Exception err )
catch( final Exception err )
{
AELog.error( err );
}
@@ -887,7 +887,7 @@ public abstract class AEBaseGui extends GuiContainer
return;
}
catch( Exception err )
catch( final Exception err )
{
AELog.warning( "[AppEng] AE prevented crash while drawing slot: " + err.toString() );
}
@@ -896,7 +896,7 @@ public abstract class AEBaseGui extends GuiContainer
this.safeDrawSlot( s );
}
private RenderItem setItemRender( RenderItem item )
private RenderItem setItemRender( final RenderItem item )
{
if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.NEI ) )
{
@@ -904,7 +904,7 @@ public abstract class AEBaseGui extends GuiContainer
}
else
{
RenderItem ri = itemRender;
final RenderItem ri = itemRender;
itemRender = item;
return ri;
}
@@ -915,24 +915,24 @@ public abstract class AEBaseGui extends GuiContainer
return true;
}
private void safeDrawSlot( Slot s )
private void safeDrawSlot( final Slot s )
{
try
{
GuiContainer.class.getDeclaredMethod( "func_146977_a_original", Slot.class ).invoke( this, s );
}
catch( Exception err )
catch( final Exception err )
{
}
}
public void bindTexture( String file )
public void bindTexture( final String file )
{
ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/" + file );
final ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/" + file );
this.mc.getTextureManager().bindTexture( loc );
}
public void func_146977_a( Slot s )
public void func_146977_a( final Slot s )
{
this.drawSlot( s );
}
src/main/java/appeng/client/gui/AEBaseMEGui.java
+13 -13
View File
@@ -35,28 +35,28 @@ import appeng.core.localization.ButtonToolTips;
public abstract class AEBaseMEGui extends AEBaseGui
{
public AEBaseMEGui( Container container )
public AEBaseMEGui( final Container container )
{
super( container );
}
public List<String> handleItemTooltip( ItemStack stack, int mouseX, int mouseY, List<String> currentToolTip )
public List<String> handleItemTooltip( final ItemStack stack, final int mouseX, final int mouseY, final List<String> currentToolTip )
{
if( stack != null )
{
Slot s = this.getSlot( mouseX, mouseY );
final Slot s = this.getSlot( mouseX, mouseY );
if( s instanceof SlotME )
{
int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
final int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
IAEItemStack myStack = null;
try
{
SlotME theSlotField = (SlotME) s;
final SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack();
}
catch( Throwable ignore )
catch( final Throwable ignore )
{
}
@@ -96,28 +96,28 @@ public abstract class AEBaseMEGui extends AEBaseGui
// Vanilla version...
// protected void drawItemStackTooltip(ItemStack stack, int x, int y)
@Override
protected void renderToolTip( ItemStack stack, int x, int y )
protected void renderToolTip( final ItemStack stack, final int x, final int y )
{
Slot s = this.getSlot( x, y );
final Slot s = this.getSlot( x, y );
if( s instanceof SlotME && stack != null )
{
int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
final int BigNumber = AEConfig.instance.useTerminalUseLargeFont() ? 999 : 9999;
IAEItemStack myStack = null;
try
{
SlotME theSlotField = (SlotME) s;
final SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack();
}
catch( Throwable ignore )
catch( final Throwable ignore )
{
}
if( myStack != null )
{
@SuppressWarnings( "unchecked" )
List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
final List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
{
@@ -133,7 +133,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
}
else if( stack.stackSize > BigNumber )
{
List var4 = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
final List var4 = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize ) );
this.drawTooltip( x, y, 0, join( var4, "\n" ) );
return;
src/main/java/appeng/client/gui/GuiNull.java
+3 -3
View File
@@ -25,18 +25,18 @@ import net.minecraft.inventory.Container;
public class GuiNull extends AEBaseGui
{
public GuiNull( Container container )
public GuiNull( final Container container )
{
super( container );
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
}
src/main/java/appeng/client/gui/config/AEConfigGui.java
+5 -5
View File
@@ -34,16 +34,16 @@ import appeng.core.AppEng;
public class AEConfigGui extends GuiConfig
{
public AEConfigGui( GuiScreen parent )
public AEConfigGui( final GuiScreen parent )
{
super( parent, getConfigElements(), AppEng.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath( AEConfig.instance.getFilePath() ) );
}
private static List<IConfigElement> getConfigElements()
{
List<IConfigElement> list = new ArrayList<IConfigElement>();
final List<IConfigElement> list = new ArrayList<IConfigElement>();
for( String cat : AEConfig.instance.getCategoryNames() )
for( final String cat : AEConfig.instance.getCategoryNames() )
{
if( cat.equals( "versionchecker" ) )
{
@@ -55,14 +55,14 @@ public class AEConfigGui extends GuiConfig
continue;
}
ConfigCategory cc = AEConfig.instance.getCategory( cat );
final ConfigCategory cc = AEConfig.instance.getCategory( cat );
if( cc.isChild() )
{
continue;
}
ConfigElement ce = new ConfigElement( cc );
final ConfigElement ce = new ConfigElement( cc );
list.add( ce );
}
src/main/java/appeng/client/gui/config/AEConfigGuiFactory.java
+2 -2
View File
@@ -30,7 +30,7 @@ public class AEConfigGuiFactory implements IModGuiFactory
{
@Override
public void initialize( Minecraft minecraftInstance )
public void initialize( final Minecraft minecraftInstance )
{
}
@@ -48,7 +48,7 @@ public class AEConfigGuiFactory implements IModGuiFactory
}
@Override
public RuntimeOptionGuiHandler getHandlerFor( RuntimeOptionCategoryElement element )
public RuntimeOptionGuiHandler getHandlerFor( final RuntimeOptionCategoryElement element )
{
return null;
}
src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java
+9 -9
View File
@@ -54,7 +54,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
GuiImgButton partition;
GuiToggleButton copyMode;
public GuiCellWorkbench( InventoryPlayer inventoryPlayer, TileCellWorkbench te )
public GuiCellWorkbench( final InventoryPlayer inventoryPlayer, final TileCellWorkbench te )
{
super( new ContainerCellWorkbench( inventoryPlayer, te ) );
this.workbench = (ContainerCellWorkbench) this.inventorySlots;
@@ -77,7 +77,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.handleButtonVisibility();
@@ -95,7 +95,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
this.drawTexturedModalRect( offsetX + 177, offsetY, 177, 0, 35, 7 + 8 * 18 );
this.drawTexturedModalRect( offsetX + 177, offsetY + ( 7 + ( 8 ) * 18 ), 177, 151, 35, 7 );
int dx = this.workbench.availableUpgrades() - 8;
final int dx = this.workbench.availableUpgrades() - 8;
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
if( dx == 8 )
{
@@ -114,7 +114,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY, 186, 0, 35 - 8, 7 + 8 * 18 );
this.drawTexturedModalRect( offsetX + 177 + 27, offsetY + ( 7 + ( 8 ) * 18 ), 186, 151, 35 - 8, 7 );
int dx = this.workbench.availableUpgrades() - 16;
final int dx = this.workbench.availableUpgrades() - 16;
this.drawTexturedModalRect( offsetX + 177 + 27 + 18, offsetY, 186, 0, 35 - 8, 7 + dx * 18 );
if( dx == 8 )
{
@@ -138,10 +138,10 @@ public class GuiCellWorkbench extends GuiUpgradeable
this.copyMode.setState( this.workbench.copyMode == CopyMode.CLEAR_ON_REMOVE );
boolean hasFuzzy = false;
IInventory inv = this.workbench.getCellUpgradeInventory();
final IInventory inv = this.workbench.getCellUpgradeInventory();
for( int x = 0; x < inv.getSizeInventory(); x++ )
{
ItemStack is = inv.getStackInSlot( x );
final ItemStack is = inv.getStackInSlot( x );
if( is != null && is.getItem() instanceof IUpgradeModule )
{
if( ( (IUpgradeModule) is.getItem() ).getType( is ) == Upgrades.FUZZY )
@@ -172,7 +172,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( final GuiButton btn )
{
try
{
@@ -190,7 +190,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
}
else if( btn == this.fuzzyMode )
{
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
FuzzyMode fz = (FuzzyMode) this.fuzzyMode.getCurrentValue();
fz = Platform.rotateEnum( fz, backwards, Settings.FUZZY_MODE.getPossibleValues() );
@@ -202,7 +202,7 @@ public class GuiCellWorkbench extends GuiUpgradeable
super.actionPerformed( btn );
}
}
catch( IOException ignored )
catch( final IOException ignored )
{
}
}
src/main/java/appeng/client/gui/implementations/GuiChest.java
+4 -4
View File
@@ -38,14 +38,14 @@ public class GuiChest extends AEBaseGui
GuiTabButton priority;
public GuiChest( InventoryPlayer inventoryPlayer, TileChest te )
public GuiChest( final InventoryPlayer inventoryPlayer, final TileChest te )
{
super( new ContainerChest( inventoryPlayer, te ) );
this.ySize = 166;
}
@Override
protected void actionPerformed( GuiButton par1GuiButton ) throws IOException
protected void actionPerformed( final GuiButton par1GuiButton ) throws IOException
{
super.actionPerformed( par1GuiButton );
@@ -64,14 +64,14 @@ public class GuiChest extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Chest.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/chest.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiCondenser.java
+5 -5
View File
@@ -45,7 +45,7 @@ public class GuiCondenser extends AEBaseGui
GuiProgressBar pb;
GuiImgButton mode;
public GuiCondenser( InventoryPlayer inventoryPlayer, TileCondenser te )
public GuiCondenser( final InventoryPlayer inventoryPlayer, final TileCondenser te )
{
super( new ContainerCondenser( inventoryPlayer, te ) );
this.cvc = (ContainerCondenser) this.inventorySlots;
@@ -53,11 +53,11 @@ public class GuiCondenser extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( this.mode == btn )
{
@@ -79,7 +79,7 @@ public class GuiCondenser extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Condenser.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -89,7 +89,7 @@ public class GuiCondenser extends AEBaseGui
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/condenser.png" );
src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java
+22 -22
View File
@@ -65,7 +65,7 @@ public class GuiCraftAmount extends AEBaseGui
private GuiBridge originalGui;
@Reflected
public GuiCraftAmount( InventoryPlayer inventoryPlayer, ITerminalHost te )
public GuiCraftAmount( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
super( new ContainerCraftAmount( inventoryPlayer, te ) );
}
@@ -75,10 +75,10 @@ public class GuiCraftAmount extends AEBaseGui
{
super.initGui();
int a = AEConfig.instance.craftItemsByStackAmounts( 0 );
int b = AEConfig.instance.craftItemsByStackAmounts( 1 );
int c = AEConfig.instance.craftItemsByStackAmounts( 2 );
int d = AEConfig.instance.craftItemsByStackAmounts( 3 );
final int a = AEConfig.instance.craftItemsByStackAmounts( 0 );
final int b = AEConfig.instance.craftItemsByStackAmounts( 1 );
final int c = AEConfig.instance.craftItemsByStackAmounts( 2 );
final int d = AEConfig.instance.craftItemsByStackAmounts( 3 );
this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 26, 22, 20, "+" + a ) );
this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 26, 28, 20, "+" + b ) );
@@ -93,13 +93,13 @@ public class GuiCraftAmount extends AEBaseGui
this.buttonList.add( this.next = new GuiButton( 0, this.guiLeft + 128, this.guiTop + 51, 38, 20, GuiText.Next.getLocal() ) );
ItemStack myIcon = null;
Object target = ( (AEBaseContainer) this.inventorySlots ).getTarget();
final Object target = ( (AEBaseContainer) this.inventorySlots ).getTarget();
final IDefinitions definitions = AEApi.instance().definitions();
final IParts parts = definitions.parts();
if( target instanceof WirelessTerminalGuiObject )
{
for( ItemStack wirelessTerminalStack : definitions.items().wirelessTerminal().maybeStack( 1 ).asSet() )
for( final ItemStack wirelessTerminalStack : definitions.items().wirelessTerminal().maybeStack( 1 ).asSet() )
{
myIcon = wirelessTerminalStack;
}
@@ -109,7 +109,7 @@ public class GuiCraftAmount extends AEBaseGui
if( target instanceof PartTerminal )
{
for( ItemStack stack : parts.terminal().maybeStack( 1 ).asSet() )
for( final ItemStack stack : parts.terminal().maybeStack( 1 ).asSet() )
{
myIcon = stack;
}
@@ -118,7 +118,7 @@ public class GuiCraftAmount extends AEBaseGui
if( target instanceof PartCraftingTerminal )
{
for( ItemStack stack : parts.craftingTerminal().maybeStack( 1 ).asSet() )
for( final ItemStack stack : parts.craftingTerminal().maybeStack( 1 ).asSet() )
{
myIcon = stack;
}
@@ -127,7 +127,7 @@ public class GuiCraftAmount extends AEBaseGui
if( target instanceof PartPatternTerminal )
{
for( ItemStack stack : parts.patternTerminal().maybeStack( 1 ).asSet() )
for( final ItemStack stack : parts.patternTerminal().maybeStack( 1 ).asSet() )
{
myIcon = stack;
}
@@ -149,13 +149,13 @@ public class GuiCraftAmount extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( GuiText.SelectAmount.getLocal(), 8, 6, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.next.displayString = isShiftKeyDown() ? GuiText.Start.getLocal() : GuiText.Next.getLocal();
@@ -167,7 +167,7 @@ public class GuiCraftAmount extends AEBaseGui
Long.parseLong( this.amountToCraft.getText() );
this.next.enabled = this.amountToCraft.getText().length() > 0;
}
catch( NumberFormatException e )
catch( final NumberFormatException e )
{
this.next.enabled = false;
}
@@ -176,7 +176,7 @@ public class GuiCraftAmount extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key ) throws IOException
protected void keyTyped( final char character, final int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -207,13 +207,13 @@ public class GuiCraftAmount extends AEBaseGui
out = "0";
}
long result = Long.parseLong( out );
final long result = Long.parseLong( out );
if( result < 0 )
{
this.amountToCraft.setText( "1" );
}
}
catch( NumberFormatException e )
catch( final NumberFormatException e )
{
// :P
}
@@ -226,7 +226,7 @@ public class GuiCraftAmount extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -243,14 +243,14 @@ public class GuiCraftAmount extends AEBaseGui
NetworkHandler.instance.sendToServer( new PacketCraftRequest( Integer.parseInt( this.amountToCraft.getText() ), isShiftKeyDown() ) );
}
}
catch( NumberFormatException e )
catch( final NumberFormatException e )
{
// nope..
this.amountToCraft.setText( "1" );
}
boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
final boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
if( isPlus || isMinus )
{
@@ -258,7 +258,7 @@ public class GuiCraftAmount extends AEBaseGui
}
}
private void addQty( int i )
private void addQty( final int i )
{
try
{
@@ -298,7 +298,7 @@ public class GuiCraftAmount extends AEBaseGui
Integer.parseInt( out );
this.amountToCraft.setText( out );
}
catch( NumberFormatException e )
catch( final NumberFormatException e )
{
// :P
}
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+58 -58
View File
@@ -74,7 +74,7 @@ public class GuiCraftConfirm extends AEBaseGui
GuiButton selectCPU;
int tooltip = -1;
public GuiCraftConfirm( InventoryPlayer inventoryPlayer, ITerminalHost te )
public GuiCraftConfirm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
super( new ContainerCraftConfirm( inventoryPlayer, te ) );
this.xSize = 238;
@@ -131,25 +131,25 @@ public class GuiCraftConfirm extends AEBaseGui
}
@Override
public void drawScreen( int mouseX, int mouseY, float btn )
public void drawScreen( final int mouseX, final int mouseY, final float btn )
{
this.updateCPUButtonText();
this.start.enabled = !( this.ccc.noCPU || this.isSimulation() );
this.selectCPU.enabled = !this.isSimulation();
int gx = ( this.width - this.xSize ) / 2;
int gy = ( this.height - this.ySize ) / 2;
final int gx = ( this.width - this.xSize ) / 2;
final int gy = ( this.height - this.ySize ) / 2;
this.tooltip = -1;
int offY = 23;
final int offY = 23;
int y = 0;
int x = 0;
for( int z = 0; z <= 4 * 5; z++ )
{
int minX = gx + 9 + x * 67;
int minY = gy + 22 + y * offY;
final int minX = gx + 9 + x * 67;
final int minY = gy + 22 + y * offY;
if( minX < mouseX && minX + 67 > mouseX )
{
@@ -179,7 +179,7 @@ public class GuiCraftConfirm extends AEBaseGui
{
if( this.ccc.myName.length() > 0 )
{
String name = this.ccc.myName.substring( 0, Math.min( 20, this.ccc.myName.length() ) );
final String name = this.ccc.myName.substring( 0, Math.min( 20, this.ccc.myName.length() ) );
btnTextText = GuiText.CraftingCPU.getLocal() + ": " + name;
}
else
@@ -202,11 +202,11 @@ public class GuiCraftConfirm extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
long BytesUsed = this.ccc.bytesUsed;
String byteUsed = NumberFormat.getInstance().format( BytesUsed );
String Add = BytesUsed > 0 ? ( byteUsed + ' ' + GuiText.BytesUsed.getLocal() ) : GuiText.CalculatingWait.getLocal();
final long BytesUsed = this.ccc.bytesUsed;
final String byteUsed = NumberFormat.getInstance().format( BytesUsed );
final String Add = BytesUsed > 0 ? ( byteUsed + ' ' + GuiText.BytesUsed.getLocal() ) : GuiText.CalculatingWait.getLocal();
this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal() + " - " + Add, 8, 7, 4210752 );
String dsp = null;
@@ -220,36 +220,36 @@ public class GuiCraftConfirm extends AEBaseGui
dsp = this.ccc.cpuBytesAvail > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.cpuBytesAvail + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.cpuCoProcessors ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A";
}
int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2;
final int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2;
this.fontRendererObj.drawString( dsp, offset, 165, 4210752 );
int sectionLength = 67;
final int sectionLength = 67;
int x = 0;
int y = 0;
int xo = 9;
int yo = 22;
int viewStart = this.myScrollBar.getCurrentScroll() * 3;
int viewEnd = viewStart + 3 * this.rows;
final int xo = 9;
final int yo = 22;
final int viewStart = this.myScrollBar.getCurrentScroll() * 3;
final int viewEnd = viewStart + 3 * this.rows;
String dspToolTip = "";
List<String> lineList = new LinkedList<String>();
final List<String> lineList = new LinkedList<String>();
int toolPosX = 0;
int toolPosY = 0;
int offY = 23;
final int offY = 23;
for( int z = viewStart; z < Math.min( viewEnd, this.visual.size() ); z++ )
{
IAEItemStack refStack = this.visual.get( z );// repo.getReferenceItem( z );
final IAEItemStack refStack = this.visual.get( z );// repo.getReferenceItem( z );
if( refStack != null )
{
GL11.glPushMatrix();
GL11.glScaled( 0.5, 0.5, 0.5 );
IAEItemStack stored = this.storage.findPrecise( refStack );
IAEItemStack pendingStack = this.pending.findPrecise( refStack );
IAEItemStack missingStack = this.missing.findPrecise( refStack );
final IAEItemStack stored = this.storage.findPrecise( refStack );
final IAEItemStack pendingStack = this.pending.findPrecise( refStack );
final IAEItemStack missingStack = this.missing.findPrecise( refStack );
int lines = 0;
@@ -266,7 +266,7 @@ public class GuiCraftConfirm extends AEBaseGui
lines++;
}
int negY = ( ( lines - 1 ) * 5 ) / 2;
final int negY = ( ( lines - 1 ) * 5 ) / 2;
int downY = 0;
if( stored != null && stored.getStackSize() > 0 )
@@ -282,7 +282,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
str = GuiText.FromStorage.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str );
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart )
@@ -307,7 +307,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
str = GuiText.Missing.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str );
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart )
@@ -332,7 +332,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
str = GuiText.ToCraft.getLocal() + ": " + str;
int w = 4 + this.fontRendererObj.getStringWidth( str );
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart )
@@ -342,10 +342,10 @@ public class GuiCraftConfirm extends AEBaseGui
}
GL11.glPopMatrix();
int posX = x * ( 1 + sectionLength ) + xo + sectionLength - 19;
int posY = y * offY + yo;
final int posX = x * ( 1 + sectionLength ) + xo + sectionLength - 19;
final int posY = y * offY + yo;
ItemStack is = refStack.copy().getItemStack();
final ItemStack is = refStack.copy().getItemStack();
if( this.tooltip == z - viewStart )
{
@@ -364,8 +364,8 @@ public class GuiCraftConfirm extends AEBaseGui
if( red )
{
int startX = x * ( 1 + sectionLength ) + xo;
int startY = posY - 4;
final int startX = x * ( 1 + sectionLength ) + xo;
final int startY = posY - 4;
drawRect( startX, startY, startX + sectionLength, startY + offY, 0x1AFF0000 );
}
@@ -388,7 +388,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.setScrollBar();
this.bindTexture( "guis/craftingreport.png" );
@@ -397,41 +397,41 @@ public class GuiCraftConfirm extends AEBaseGui
private void setScrollBar()
{
int size = this.visual.size();
final int size = this.visual.size();
this.myScrollBar.setTop( 19 ).setLeft( 218 ).setHeight( 114 );
this.myScrollBar.setRange( 0, ( size + 2 ) / 3 - this.rows, 1 );
}
public void postUpdate( List<IAEItemStack> list, byte ref )
public void postUpdate( final List<IAEItemStack> list, final byte ref )
{
switch( ref )
{
case 0:
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
this.handleInput( this.storage, l );
}
break;
case 1:
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
this.handleInput( this.pending, l );
}
break;
case 2:
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
this.handleInput( this.missing, l );
}
break;
}
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
long amt = this.getTotal( l );
final long amt = this.getTotal( l );
if( amt <= 0 )
{
@@ -439,7 +439,7 @@ public class GuiCraftConfirm extends AEBaseGui
}
else
{
IAEItemStack is = this.findVisualStack( l );
final IAEItemStack is = this.findVisualStack( l );
is.setStackSize( amt );
}
}
@@ -447,7 +447,7 @@ public class GuiCraftConfirm extends AEBaseGui
this.setScrollBar();
}
private void handleInput( IItemList<IAEItemStack> s, IAEItemStack l )
private void handleInput( final IItemList<IAEItemStack> s, final IAEItemStack l )
{
IAEItemStack a = s.findPrecise( l );
@@ -473,11 +473,11 @@ public class GuiCraftConfirm extends AEBaseGui
}
}
private long getTotal( IAEItemStack is )
private long getTotal( final IAEItemStack is )
{
IAEItemStack a = this.storage.findPrecise( is );
IAEItemStack c = this.pending.findPrecise( is );
IAEItemStack m = this.missing.findPrecise( is );
final IAEItemStack a = this.storage.findPrecise( is );
final IAEItemStack c = this.pending.findPrecise( is );
final IAEItemStack m = this.missing.findPrecise( is );
long total = 0;
@@ -499,12 +499,12 @@ public class GuiCraftConfirm extends AEBaseGui
return total;
}
private void deleteVisualStack( IAEItemStack l )
private void deleteVisualStack( final IAEItemStack l )
{
Iterator<IAEItemStack> i = this.visual.iterator();
final Iterator<IAEItemStack> i = this.visual.iterator();
while( i.hasNext() )
{
IAEItemStack o = i.next();
final IAEItemStack o = i.next();
if( o.equals( l ) )
{
i.remove();
@@ -513,9 +513,9 @@ public class GuiCraftConfirm extends AEBaseGui
}
}
private IAEItemStack findVisualStack( IAEItemStack l )
private IAEItemStack findVisualStack( final IAEItemStack l )
{
for( IAEItemStack o : this.visual )
for( final IAEItemStack o : this.visual )
{
if( o.equals( l ) )
{
@@ -523,13 +523,13 @@ public class GuiCraftConfirm extends AEBaseGui
}
}
IAEItemStack stack = l.copy();
final IAEItemStack stack = l.copy();
this.visual.add( stack );
return stack;
}
@Override
protected void keyTyped( char character, int key ) throws IOException
protected void keyTyped( final char character, final int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -542,11 +542,11 @@ public class GuiCraftConfirm extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.selectCPU )
{
@@ -554,7 +554,7 @@ public class GuiCraftConfirm extends AEBaseGui
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "Terminal.Cpu", backwards ? "Prev" : "Next" ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
@@ -571,7 +571,7 @@ public class GuiCraftConfirm extends AEBaseGui
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "Terminal.Start", "Start" ) );
}
catch( Throwable e )
catch( final Throwable e )
{
AELog.error( e );
}
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+34 -34
View File
@@ -92,12 +92,12 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
private GuiButton cancel;
private int tooltip = -1;
public GuiCraftingCPU( InventoryPlayer inventoryPlayer, Object te )
public GuiCraftingCPU( final InventoryPlayer inventoryPlayer, final Object te )
{
this( new ContainerCraftingCPU( inventoryPlayer, te ) );
}
protected GuiCraftingCPU( ContainerCraftingCPU container )
protected GuiCraftingCPU( final ContainerCraftingCPU container )
{
super( container );
this.craftingCpu = container;
@@ -115,7 +115,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -125,7 +125,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileCrafting.Cancel", "Cancel" ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
@@ -143,14 +143,14 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
private void setScrollBar()
{
int size = this.visual.size();
final int size = this.visual.size();
this.myScrollBar.setTop( SCROLLBAR_TOP ).setLeft( SCROLLBAR_LEFT ).setHeight( SCROLLBAR_HEIGHT );
this.myScrollBar.setRange( 0, ( size + 2 ) / 3 - DISPLAYED_ROWS, 1 );
}
@Override
public void drawScreen( int mouseX, int mouseY, float btn )
public void drawScreen( final int mouseX, final int mouseY, final float btn )
{
this.cancel.enabled = !this.visual.isEmpty();
@@ -164,8 +164,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
int x = 0;
for( int z = 0; z <= 4 * 5; z++ )
{
int minX = gx + 9 + x * 67;
int minY = gy + 22 + y * offY;
final int minX = gx + 9 + x * 67;
final int minY = gy + 22 + y * offY;
if( minX < mouseX && minX + 67 > mouseX )
{
@@ -189,7 +189,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
String title = this.getGuiDisplayName( GuiText.CraftingStatus.getLocal() );
@@ -208,16 +208,16 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
final int viewEnd = viewStart + 3 * 6;
String dspToolTip = "";
List<String> lineList = new LinkedList<String>();
final List<String> lineList = new LinkedList<String>();
int toolPosX = 0;
int toolPosY = 0;
int offY = 23;
final 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 );
final IAEItemStack refStack = this.visual.get( z );// repo.getReferenceItem( z );
if( refStack != null )
{
GL11.glPushMatrix();
@@ -248,19 +248,19 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
if( AEConfig.instance.useColoredCraftingStatus && ( active || scheduled ) )
{
int bgColor = ( active ? AEColor.Green.blackVariant : AEColor.Yellow.blackVariant ) | BACKGROUND_ALPHA;
int startX = ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET ) * 2;
int startY = ( ( y * offY + ITEMSTACK_TOP_OFFSET ) - 3 ) * 2;
final int bgColor = ( active ? AEColor.Green.blackVariant : AEColor.Yellow.blackVariant ) | BACKGROUND_ALPHA;
final int startX = ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET ) * 2;
final int startY = ( ( y * offY + ITEMSTACK_TOP_OFFSET ) - 3 ) * 2;
drawRect( startX, startY, startX + ( SECTION_LENGTH * 2 ), startY + ( offY * 2 ) - 2, bgColor );
}
int negY = ( ( lines - 1 ) * 5 ) / 2;
final int negY = ( ( lines - 1 ) * 5 ) / 2;
int downY = 0;
if( stored != null && stored.getStackSize() > 0 )
{
final String str = GuiText.Stored.getLocal() + ": " + converter.toWideReadableForm( stored.getStackSize() );
int w = 4 + this.fontRendererObj.getStringWidth( str );
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR );
if( this.tooltip == z - viewStart )
@@ -300,10 +300,10 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
GL11.glPopMatrix();
int posX = x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19;
int posY = y * offY + ITEMSTACK_TOP_OFFSET;
final int posX = x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19;
final int posY = y * offY + ITEMSTACK_TOP_OFFSET;
ItemStack is = refStack.copy().getItemStack();
final ItemStack is = refStack.copy().getItemStack();
if( this.tooltip == z - viewStart )
{
@@ -339,41 +339,41 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/craftingcpu.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
}
public void postUpdate( List<IAEItemStack> list, byte ref )
public void postUpdate( final List<IAEItemStack> list, final byte ref )
{
switch( ref )
{
case 0:
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
this.handleInput( this.storage, l );
}
break;
case 1:
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
this.handleInput( this.active, l );
}
break;
case 2:
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
this.handleInput( this.pending, l );
}
break;
}
for( IAEItemStack l : list )
for( final IAEItemStack l : list )
{
long amt = this.getTotal( l );
final long amt = this.getTotal( l );
if( amt <= 0 )
{
@@ -381,7 +381,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
else
{
IAEItemStack is = this.findVisualStack( l );
final IAEItemStack is = this.findVisualStack( l );
is.setStackSize( amt );
}
}
@@ -389,7 +389,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
this.setScrollBar();
}
private void handleInput( IItemList<IAEItemStack> s, IAEItemStack l )
private void handleInput( final IItemList<IAEItemStack> s, final IAEItemStack l )
{
IAEItemStack a = s.findPrecise( l );
@@ -415,7 +415,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
}
private long getTotal( IAEItemStack is )
private long getTotal( final IAEItemStack is )
{
final IAEItemStack a = this.storage.findPrecise( is );
final IAEItemStack b = this.active.findPrecise( is );
@@ -441,13 +441,13 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
return total;
}
private void deleteVisualStack( IAEItemStack l )
private void deleteVisualStack( final IAEItemStack l )
{
final Iterator<IAEItemStack> i = this.visual.iterator();
while( i.hasNext() )
{
IAEItemStack o = i.next();
final IAEItemStack o = i.next();
if( o.equals( l ) )
{
i.remove();
@@ -456,9 +456,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
}
}
private IAEItemStack findVisualStack( IAEItemStack l )
private IAEItemStack findVisualStack( final IAEItemStack l )
{
for( IAEItemStack o : this.visual )
for( final IAEItemStack o : this.visual )
{
if( o.equals( l ) )
{
src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java
+12 -12
View File
@@ -59,18 +59,18 @@ public class GuiCraftingStatus extends GuiCraftingCPU
GuiBridge originalGui;
ItemStack myIcon = null;
public GuiCraftingStatus( InventoryPlayer inventoryPlayer, ITerminalHost te )
public GuiCraftingStatus( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
super( new ContainerCraftingStatus( inventoryPlayer, te ) );
this.status = (ContainerCraftingStatus) this.inventorySlots;
Object target = this.status.getTarget();
final Object target = this.status.getTarget();
final IDefinitions definitions = AEApi.instance().definitions();
final IParts parts = definitions.parts();
if( target instanceof WirelessTerminalGuiObject )
{
for( ItemStack wirelessTerminalStack : definitions.items().wirelessTerminal().maybeStack( 1 ).asSet() )
for( final ItemStack wirelessTerminalStack : definitions.items().wirelessTerminal().maybeStack( 1 ).asSet() )
{
this.myIcon = wirelessTerminalStack;
}
@@ -80,7 +80,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
if( target instanceof PartTerminal )
{
for( ItemStack stack : parts.terminal().maybeStack( 1 ).asSet() )
for( final ItemStack stack : parts.terminal().maybeStack( 1 ).asSet() )
{
this.myIcon = stack;
}
@@ -89,7 +89,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
if( target instanceof PartCraftingTerminal )
{
for( ItemStack stack : parts.craftingTerminal().maybeStack( 1 ).asSet() )
for( final ItemStack stack : parts.craftingTerminal().maybeStack( 1 ).asSet() )
{
this.myIcon = stack;
}
@@ -98,7 +98,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
if( target instanceof PartPatternTerminal )
{
for( ItemStack stack : parts.patternTerminal().maybeStack( 1 ).asSet() )
for( final ItemStack stack : parts.patternTerminal().maybeStack( 1 ).asSet() )
{
this.myIcon = stack;
}
@@ -107,11 +107,11 @@ public class GuiCraftingStatus extends GuiCraftingCPU
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.selectCPU )
{
@@ -119,7 +119,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "Terminal.Cpu", backwards ? "Prev" : "Next" ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
@@ -148,7 +148,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
}
@Override
public void drawScreen( int mouseX, int mouseY, float btn )
public void drawScreen( final int mouseX, final int mouseY, final float btn )
{
this.updateCPUButtonText();
super.drawScreen( mouseX, mouseY, btn );
@@ -162,7 +162,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
{
if( this.status.myName.length() > 0 )
{
String name = this.status.myName.substring( 0, Math.min( 20, this.status.myName.length() ) );
final String name = this.status.myName.substring( 0, Math.min( 20, this.status.myName.length() ) );
btnTextText = GuiText.CPUs.getLocal() + ": " + name;
}
else
@@ -180,7 +180,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU
}
@Override
protected String getGuiDisplayName( String in )
protected String getGuiDisplayName( final String in )
{
return in; // the cup name is on the button
}
src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java
+6 -6
View File
@@ -40,22 +40,22 @@ public class GuiCraftingTerm extends GuiMEMonitorable
GuiImgButton clearBtn;
public GuiCraftingTerm( InventoryPlayer inventoryPlayer, ITerminalHost te )
public GuiCraftingTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
super( inventoryPlayer, te, new ContainerCraftingTerm( inventoryPlayer, te ) );
this.reservedSpace = 73;
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( final GuiButton btn )
{
super.actionPerformed( btn );
if( this.clearBtn == btn )
{
Slot s = null;
Container c = this.inventorySlots;
for( Object j : c.inventorySlots )
final Container c = this.inventorySlots;
for( final Object j : c.inventorySlots )
{
if( j instanceof SlotCraftingMatrix )
{
@@ -65,7 +65,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable
if( s != null )
{
PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 );
final PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 );
NetworkHandler.instance.sendToServer( p );
}
}
@@ -80,7 +80,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
super.drawFG( offsetX, offsetY, mouseX, mouseY );
this.fontRendererObj.drawString( GuiText.CraftingTerminal.getLocal(), 8, this.ySize - 96 + 1 - this.reservedSpace, 4210752 );
src/main/java/appeng/client/gui/implementations/GuiDrive.java
+4 -4
View File
@@ -38,14 +38,14 @@ public class GuiDrive extends AEBaseGui
GuiTabButton priority;
public GuiDrive( InventoryPlayer inventoryPlayer, TileDrive te )
public GuiDrive( final InventoryPlayer inventoryPlayer, final TileDrive te )
{
super( new ContainerDrive( inventoryPlayer, te ) );
this.ySize = 199;
}
@Override
protected void actionPerformed( GuiButton par1GuiButton ) throws IOException
protected void actionPerformed( final GuiButton par1GuiButton ) throws IOException
{
super.actionPerformed( par1GuiButton );
@@ -64,14 +64,14 @@ public class GuiDrive extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Drive.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/drive.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java
+4 -4
View File
@@ -46,7 +46,7 @@ public class GuiFormationPlane extends GuiUpgradeable
GuiTabButton priority;
GuiImgButton placeMode;
public GuiFormationPlane( InventoryPlayer inventoryPlayer, PartFormationPlane te )
public GuiFormationPlane( final InventoryPlayer inventoryPlayer, final PartFormationPlane te )
{
super( new ContainerFormationPlane( inventoryPlayer, te ) );
this.ySize = 251;
@@ -65,7 +65,7 @@ public class GuiFormationPlane extends GuiUpgradeable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.FormationPlane.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -88,11 +88,11 @@ public class GuiFormationPlane extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.priority )
{
src/main/java/appeng/client/gui/implementations/GuiGrinder.java
+3 -3
View File
@@ -29,21 +29,21 @@ import appeng.tile.grindstone.TileGrinder;
public class GuiGrinder extends AEBaseGui
{
public GuiGrinder( InventoryPlayer inventoryPlayer, TileGrinder te )
public GuiGrinder( final InventoryPlayer inventoryPlayer, final TileGrinder te )
{
super( new ContainerGrinder( inventoryPlayer, te ) );
this.ySize = 176;
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.GrindStone.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/grinder.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiIOPort.java
+7 -7
View File
@@ -47,7 +47,7 @@ public class GuiIOPort extends GuiUpgradeable
GuiImgButton fullMode;
GuiImgButton operationMode;
public GuiIOPort( InventoryPlayer inventoryPlayer, TileIOPort te )
public GuiIOPort( final InventoryPlayer inventoryPlayer, final TileIOPort te )
{
super( new ContainerIOPort( inventoryPlayer, te ) );
this.ySize = 166;
@@ -66,7 +66,7 @@ public class GuiIOPort extends GuiUpgradeable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.IOPort.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -88,18 +88,18 @@ public class GuiIOPort extends GuiUpgradeable
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
super.drawBG( offsetX, offsetY, mouseX, mouseY );
final IDefinitions definitions = AEApi.instance().definitions();
for( ItemStack cell1kStack : definitions.items().cell1k().maybeStack( 1 ).asSet() )
for( final ItemStack cell1kStack : definitions.items().cell1k().maybeStack( 1 ).asSet() )
{
this.drawItem( offsetX + 66 - 8, offsetY + 17, cell1kStack );
}
for( ItemStack driveStack : definitions.blocks().drive().maybeStack( 1 ).asSet() )
for( final ItemStack driveStack : definitions.blocks().drive().maybeStack( 1 ).asSet() )
{
this.drawItem( offsetX + 94 + 8, offsetY + 17, driveStack );
}
@@ -112,11 +112,11 @@ public class GuiIOPort extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.fullMode )
{
src/main/java/appeng/client/gui/implementations/GuiInscriber.java
+3 -3
View File
@@ -35,7 +35,7 @@ public class GuiInscriber extends AEBaseGui
final ContainerInscriber cvc;
GuiProgressBar pb;
public GuiInscriber( InventoryPlayer inventoryPlayer, TileInscriber te )
public GuiInscriber( final InventoryPlayer inventoryPlayer, final TileInscriber te )
{
super( new ContainerInscriber( inventoryPlayer, te ) );
this.cvc = (ContainerInscriber) this.inventorySlots;
@@ -58,7 +58,7 @@ public class GuiInscriber extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.pb.setFullMsg( this.cvc.getCurrentProgress() * 100 / this.cvc.getMaxProgress() + "%" );
@@ -67,7 +67,7 @@ public class GuiInscriber extends AEBaseGui
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/inscriber.png" );
this.pb.xPosition = 135 + this.guiLeft;
src/main/java/appeng/client/gui/implementations/GuiInterface.java
+4 -4
View File
@@ -47,7 +47,7 @@ public class GuiInterface extends GuiUpgradeable
GuiImgButton BlockMode;
GuiToggleButton interfaceMode;
public GuiInterface( InventoryPlayer inventoryPlayer, IInterfaceHost te )
public GuiInterface( final InventoryPlayer inventoryPlayer, final IInterfaceHost te )
{
super( new ContainerInterface( inventoryPlayer, te ) );
this.ySize = 211;
@@ -67,7 +67,7 @@ public class GuiInterface extends GuiUpgradeable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
if( this.BlockMode != null )
{
@@ -95,11 +95,11 @@ public class GuiInterface extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.priority )
{
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+34 -34
View File
@@ -68,7 +68,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
private boolean refreshList = false;
private MEGuiTextField searchField;
public GuiInterfaceTerminal( InventoryPlayer inventoryPlayer, PartInterfaceTerminal te )
public GuiInterfaceTerminal( final InventoryPlayer inventoryPlayer, final PartInterfaceTerminal te )
{
super( new ContainerInterfaceTerminal( inventoryPlayer, te ) );
this.myScrollBar = new GuiScrollbar();
@@ -94,14 +94,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
int ex = this.myScrollBar.getCurrentScroll();
final int ex = this.myScrollBar.getCurrentScroll();
Iterator<Object> o = this.inventorySlots.inventorySlots.iterator();
final Iterator<Object> o = this.inventorySlots.inventorySlots.iterator();
while( o.hasNext() )
{
if( o.next() instanceof SlotDisconnected )
@@ -113,10 +113,10 @@ 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 );
final Object lineObj = this.lines.get( ex + x );
if( lineObj instanceof ClientDCInternalInv )
{
ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
for( int z = 0; z < inv.inv.getSizeInventory(); z++ )
{
this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) );
@@ -125,7 +125,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
else if( lineObj instanceof String )
{
String name = (String) lineObj;
int rows = this.byName.get( name ).size();
final int rows = this.byName.get( name ).size();
if( rows > 1 )
{
name = name + " (" + rows + ')';
@@ -143,7 +143,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
@Override
protected void mouseClicked( int xCoord, int yCoord, int btn ) throws IOException
protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
{
this.searchField.mouseClicked( xCoord, yCoord, btn );
@@ -157,23 +157,23 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/interfaceterminal.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
int offset = 17;
int ex = this.myScrollBar.getCurrentScroll();
final int ex = this.myScrollBar.getCurrentScroll();
for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
{
Object lineObj = this.lines.get( ex + x );
final Object lineObj = this.lines.get( ex + x );
if( lineObj instanceof ClientDCInternalInv )
{
ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
GL11.glColor4f( 1, 1, 1, 1 );
int width = inv.inv.getSizeInventory() * 18;
final int width = inv.inv.getSizeInventory() * 18;
this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 139, width, 18 );
}
offset += 18;
@@ -186,7 +186,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key ) throws IOException
protected void keyTyped( final char character, final int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -206,7 +206,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
}
}
public void postUpdate( NBTTagCompound in )
public void postUpdate( final NBTTagCompound in )
{
if( in.getBoolean( "clear" ) )
{
@@ -214,27 +214,27 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.refreshList = true;
}
for( Object oKey : in.getKeySet() )
for( final Object oKey : in.getKeySet() )
{
String key = (String) oKey;
final String key = (String) oKey;
if( key.startsWith( "=" ) )
{
try
{
long id = Long.parseLong( key.substring( 1 ), Character.MAX_RADIX );
NBTTagCompound invData = in.getCompoundTag( key );
ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) );
final long id = Long.parseLong( key.substring( 1 ), Character.MAX_RADIX );
final NBTTagCompound invData = in.getCompoundTag( key );
final ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) );
for( int x = 0; x < current.inv.getSizeInventory(); x++ )
{
String which = Integer.toString( x );
final String which = Integer.toString( x );
if( invData.hasKey( which ) )
{
current.inv.setInventorySlotContents( x, ItemStack.loadItemStackFromNBT( invData.getCompoundTag( which ) ) );
}
}
}
catch( NumberFormatException ignored )
catch( final NumberFormatException ignored )
{
}
}
@@ -263,7 +263,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
final Set<Object> cachedSearch = this.getCacheForSearchTerm( searchFilterLowerCase );
final boolean rebuild = cachedSearch.isEmpty();
for( ClientDCInternalInv entry : this.byId.values() )
for( final ClientDCInternalInv entry : this.byId.values() )
{
// ignore inventory if not doing a full rebuild or cache already marks it as miss.
if( !rebuild && !cachedSearch.contains( entry ) )
@@ -277,7 +277,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
// Search if the current inventory holds a pattern containing the search term.
if( !found && !searchFilterLowerCase.isEmpty() )
{
for( ItemStack itemStack : entry.inv )
for( final ItemStack itemStack : entry.inv )
{
found = this.itemStackMatchesSearchTerm( itemStack, searchFilterLowerCase );
if( found )
@@ -307,11 +307,11 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.lines.clear();
this.lines.ensureCapacity( this.getMaxRows() );
for( String n : this.names )
for( final String n : this.names )
{
this.lines.add( n );
ArrayList<ClientDCInternalInv> clientInventories = new ArrayList<ClientDCInternalInv>();
final ArrayList<ClientDCInternalInv> clientInventories = new ArrayList<ClientDCInternalInv>();
clientInventories.addAll( this.byName.get( n ) );
Collections.sort( clientInventories );
@@ -321,14 +321,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.myScrollBar.setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 );
}
private boolean itemStackMatchesSearchTerm( ItemStack itemStack, String searchTerm )
private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm )
{
if( itemStack == null )
{
return false;
}
NBTTagCompound encodedValue = itemStack.getTagCompound();
final NBTTagCompound encodedValue = itemStack.getTagCompound();
if( encodedValue == null )
{
@@ -337,15 +337,15 @@ public class GuiInterfaceTerminal extends AEBaseGui
// Potential later use to filter by input
// NBTTagList inTag = encodedValue.getTagList( "in", 10 );
NBTTagList outTag = encodedValue.getTagList( "out", 10 );
final NBTTagList outTag = encodedValue.getTagList( "out", 10 );
for( int i = 0; i < outTag.tagCount(); i++ )
{
ItemStack parsedItemStack = ItemStack.loadItemStackFromNBT( outTag.getCompoundTagAt( i ) );
final ItemStack parsedItemStack = ItemStack.loadItemStackFromNBT( outTag.getCompoundTagAt( i ) );
if( parsedItemStack != null )
{
String displayName = Platform.getItemDisplayName( AEApi.instance().storage().createItemStack( parsedItemStack ) ).toLowerCase();
final String displayName = Platform.getItemDisplayName( AEApi.instance().storage().createItemStack( parsedItemStack ) ).toLowerCase();
if( displayName.contains( searchTerm ) )
{
return true;
@@ -365,14 +365,14 @@ public class GuiInterfaceTerminal extends AEBaseGui
*
* @return a Set matching a superset of the search term
*/
private Set<Object> getCacheForSearchTerm( String searchTerm )
private Set<Object> getCacheForSearchTerm( final String searchTerm )
{
if( !this.cachedSearches.containsKey( searchTerm ) )
{
this.cachedSearches.put( searchTerm, new HashSet<Object>() );
}
Set<Object> cache = this.cachedSearches.get( searchTerm );
final Set<Object> cache = this.cachedSearches.get( searchTerm );
if( cache.isEmpty() && searchTerm.length() > 1 )
{
@@ -393,7 +393,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
return this.names.size() + this.byId.size();
}
private ClientDCInternalInv getById( long id, long sortBy, String string )
private ClientDCInternalInv getById( final long id, final long sortBy, final String string )
{
ClientDCInternalInv o = this.byId.get( id );
src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java
+17 -17
View File
@@ -61,7 +61,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
GuiImgButton levelMode;
GuiImgButton craftingMode;
public GuiLevelEmitter( InventoryPlayer inventoryPlayer, PartLevelEmitter te )
public GuiLevelEmitter( final InventoryPlayer inventoryPlayer, final PartLevelEmitter te )
{
super( new ContainerLevelEmitter( inventoryPlayer, te ) );
}
@@ -88,10 +88,10 @@ public class GuiLevelEmitter extends GuiUpgradeable
this.fuzzyMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL );
this.craftingMode = new GuiImgButton( this.guiLeft - 18, this.guiTop + 48, Settings.CRAFT_VIA_REDSTONE, YesNo.NO );
int a = AEConfig.instance.levelByStackAmounts( 0 );
int b = AEConfig.instance.levelByStackAmounts( 1 );
int c = AEConfig.instance.levelByStackAmounts( 2 );
int d = AEConfig.instance.levelByStackAmounts( 3 );
final int a = AEConfig.instance.levelByStackAmounts( 0 );
final int b = AEConfig.instance.levelByStackAmounts( 1 );
final int c = AEConfig.instance.levelByStackAmounts( 2 );
final int d = AEConfig.instance.levelByStackAmounts( 3 );
this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 17, 22, 20, "+" + a ) );
this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 17, 28, 20, "+" + b ) );
@@ -110,9 +110,9 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
boolean notCraftingMode = this.bc.getInstalledUpgrades( Upgrades.CRAFTING ) == 0;
final boolean notCraftingMode = this.bc.getInstalledUpgrades( Upgrades.CRAFTING ) == 0;
// configure enabled status...
this.level.setEnabled( notCraftingMode );
@@ -141,7 +141,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
super.drawBG( offsetX, offsetY, mouseX, mouseY );
this.level.drawTextBox();
@@ -167,11 +167,11 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.craftingMode )
{
@@ -183,8 +183,8 @@ public class GuiLevelEmitter extends GuiUpgradeable
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.levelMode.getSetting(), backwards ) );
}
boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
final boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
if( isPlus || isMinus )
{
@@ -192,7 +192,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
}
}
private void addQty( long i )
private void addQty( final long i )
{
try
{
@@ -226,19 +226,19 @@ public class GuiLevelEmitter extends GuiUpgradeable
NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) );
}
catch( NumberFormatException e )
catch( final NumberFormatException e )
{
// nope..
this.level.setText( "0" );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
}
@Override
protected void keyTyped( char character, int key ) throws IOException
protected void keyTyped( final char character, final int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -267,7 +267,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
NetworkHandler.instance.sendToServer( new PacketValueConfig( "LevelEmitter.Value", Out ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
src/main/java/appeng/client/gui/implementations/GuiMAC.java
+3 -3
View File
@@ -36,7 +36,7 @@ public class GuiMAC extends GuiUpgradeable
final ContainerMAC container;
GuiProgressBar pb;
public GuiMAC( InventoryPlayer inventoryPlayer, TileMolecularAssembler te )
public GuiMAC( final InventoryPlayer inventoryPlayer, final TileMolecularAssembler te )
{
super( new ContainerMAC( inventoryPlayer, te ) );
this.ySize = 197;
@@ -60,14 +60,14 @@ public class GuiMAC extends GuiUpgradeable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.pb.setFullMsg( this.container.getCurrentProgress() + "%" );
super.drawFG( offsetX, offsetY, mouseX, mouseY );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.pb.xPosition = 148 + this.guiLeft;
this.pb.yPosition = 48 + this.guiTop;
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+26 -26
View File
@@ -96,12 +96,12 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
GuiImgButton searchBoxSettings;
GuiImgButton terminalStyleBox;
public GuiMEMonitorable( InventoryPlayer inventoryPlayer, ITerminalHost te )
public GuiMEMonitorable( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
this( inventoryPlayer, te, new ContainerMEMonitorable( inventoryPlayer, te ) );
}
public GuiMEMonitorable( InventoryPlayer inventoryPlayer, ITerminalHost te, ContainerMEMonitorable c )
public GuiMEMonitorable( final InventoryPlayer inventoryPlayer, final ITerminalHost te, final ContainerMEMonitorable c )
{
super( c );
@@ -145,9 +145,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
}
public void postUpdate( List<IAEItemStack> list )
public void postUpdate( final List<IAEItemStack> list )
{
for( IAEItemStack is : list )
for( final IAEItemStack is : list )
{
this.repo.postUpdate( is );
}
@@ -163,7 +163,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( final GuiButton btn )
{
if( btn == this.craftingStatusBtn )
{
@@ -172,13 +172,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
if( btn instanceof GuiImgButton )
{
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
GuiImgButton iBtn = (GuiImgButton) btn;
final GuiImgButton iBtn = (GuiImgButton) btn;
if( iBtn.getSetting() != Settings.ACTIONS )
{
Enum cv = iBtn.getCurrentValue();
Enum next = Platform.rotateEnum( cv, backwards, iBtn.getSetting().getPossibleValues() );
final Enum cv = iBtn.getCurrentValue();
final Enum next = Platform.rotateEnum( cv, backwards, iBtn.getSetting().getPossibleValues() );
if( btn == this.terminalStyleBox )
{
@@ -194,7 +194,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( iBtn.getSetting().name(), next.name() ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
@@ -224,13 +224,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.maxRows = this.getMaxRows();
this.perRow = AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) != TerminalStyle.FULL ? 9 : 9 + ( ( this.width - this.standardSize ) / 18 );
boolean hasNEI = IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.NEI );
final boolean hasNEI = IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.NEI );
int NEI = hasNEI ? 0 : 0;
final int NEI = hasNEI ? 0 : 0;
int top = hasNEI ? 22 : 0;
int magicNumber = 114 + 1;
int extraSpace = this.height - magicNumber - NEI - top - this.reservedSpace;
final int magicNumber = 114 + 1;
final int extraSpace = this.height - magicNumber - NEI - top - this.reservedSpace;
this.rows = (int) Math.floor( extraSpace / 18 );
if( this.rows > this.maxRows )
@@ -274,7 +274,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.ySize = magicNumber + this.rows * 18 + this.reservedSpace;
// this.guiTop = top;
int unusedSpace = this.height - this.ySize;
final int unusedSpace = this.height - this.ySize;
this.guiTop = (int) Math.floor( unusedSpace / ( unusedSpace < 0 ? 3.8f : 2.0f ) );
int offset = this.guiTop + 8;
@@ -315,7 +315,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
// Enum setting = AEConfig.INSTANCE.getSetting( "Terminal", SearchBoxMode.class, SearchBoxMode.AUTOSEARCH );
Enum setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
final Enum setting = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
this.searchField.setFocused( SearchBoxMode.AUTOSEARCH == setting || SearchBoxMode.NEI_AUTOSEARCH == setting );
if( this.isSubGui() )
@@ -329,7 +329,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
CraftingGridOffsetX = Integer.MAX_VALUE;
CraftingGridOffsetY = Integer.MAX_VALUE;
for( Object s : this.inventorySlots.inventorySlots )
for( final Object s : this.inventorySlots.inventorySlots )
{
if( s instanceof AppEngSlot )
{
@@ -341,7 +341,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
if( s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix )
{
Slot g = (Slot) s;
final Slot g = (Slot) s;
if( g.xDisplayPosition > 0 && g.yDisplayPosition > 0 )
{
CraftingGridOffsetX = Math.min( CraftingGridOffsetX, g.xDisplayPosition );
@@ -355,16 +355,16 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( this.myName.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
protected void mouseClicked( int xCoord, int yCoord, int btn ) throws IOException
protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
{
Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
final Enum searchMode = AEConfig.instance.settings.getSetting( Settings.SEARCH_MODE );
if( searchMode != SearchBoxMode.AUTOSEARCH && searchMode != SearchBoxMode.NEI_AUTOSEARCH )
{
@@ -391,11 +391,11 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( this.getBackground() );
int x_width = 197;
final int x_width = 197;
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, x_width, 18 );
if( this.viewCell || ( this instanceof GuiSecurity ) )
@@ -451,13 +451,13 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
return AEConfig.instance.getConfigManager().getSetting( Settings.TERMINAL_STYLE ) == TerminalStyle.SMALL ? 6 : Integer.MAX_VALUE;
}
protected void repositionSlot( AppEngSlot s )
protected void repositionSlot( final AppEngSlot s )
{
s.yDisplayPosition = s.defY + this.ySize - 78 - 5;
}
@Override
protected void keyTyped( char character, int key ) throws IOException
protected void keyTyped( final char character, final int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -505,7 +505,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
}
@Override
public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
public void updateSetting( final IConfigManager manager, final Enum settingName, final Enum newValue )
{
if( this.SortByBox != null )
{
src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java
+1 -1
View File
@@ -27,7 +27,7 @@ import appeng.container.implementations.ContainerMEPortableCell;
public class GuiMEPortableCell extends GuiMEMonitorable
{
public GuiMEPortableCell( InventoryPlayer inventoryPlayer, IPortableCell te )
public GuiMEPortableCell( final InventoryPlayer inventoryPlayer, final IPortableCell te )
{
super( inventoryPlayer, te, new ContainerMEPortableCell( inventoryPlayer, te ) );
}
src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java
+32 -32
View File
@@ -56,7 +56,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
GuiImgButton units;
int tooltip = -1;
public GuiNetworkStatus( InventoryPlayer inventoryPlayer, INetworkTool te )
public GuiNetworkStatus( final InventoryPlayer inventoryPlayer, final INetworkTool te )
{
super( new ContainerNetworkStatus( inventoryPlayer, te ) );
this.ySize = 153;
@@ -67,11 +67,11 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.units )
{
@@ -90,11 +90,11 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
@Override
public void drawScreen( int mouseX, int mouseY, float btn )
public void drawScreen( final int mouseX, final int mouseY, final float btn )
{
int gx = ( this.width - this.xSize ) / 2;
int gy = ( this.height - this.ySize ) / 2;
final int gx = ( this.width - this.xSize ) / 2;
final int gy = ( this.height - this.ySize ) / 2;
this.tooltip = -1;
@@ -102,8 +102,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
int x = 0;
for( int z = 0; z <= 4 * 5; z++ )
{
int minX = gx + 14 + x * 31;
int minY = gy + 41 + y * 18;
final int minX = gx + 14 + x * 31;
final int minY = gy + 41 + y * 18;
if( minX < mouseX && minX + 28 > mouseX )
{
@@ -127,9 +127,9 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
ContainerNetworkStatus ns = (ContainerNetworkStatus) this.inventorySlots;
final ContainerNetworkStatus ns = (ContainerNetworkStatus) this.inventorySlots;
this.fontRendererObj.drawString( GuiText.NetworkDetails.getLocal(), 8, 6, 4210752 );
@@ -139,14 +139,14 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
this.fontRendererObj.drawString( GuiText.PowerInputRate.getLocal() + ": " + Platform.formatPowerLong( ns.avgAddition, true ), 13, 143 - 10, 4210752 );
this.fontRendererObj.drawString( GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( ns.powerUsage, true ), 13, 143 - 20, 4210752 );
int sectionLength = 30;
final int sectionLength = 30;
int x = 0;
int y = 0;
int xo = 12;
int yo = 42;
int viewStart = 0;// myScrollBar.getCurrentScroll() * 5;
int viewEnd = viewStart + 5 * 4;
final int xo = 12;
final int yo = 42;
final int viewStart = 0;// myScrollBar.getCurrentScroll() * 5;
final int viewEnd = viewStart + 5 * 4;
String toolTip = "";
int toolPosX = 0;
@@ -154,7 +154,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
for( int z = viewStart; z < Math.min( viewEnd, this.repo.size() ); z++ )
{
IAEItemStack refStack = this.repo.getReferenceItem( z );
final IAEItemStack refStack = this.repo.getReferenceItem( z );
if( refStack != null )
{
GL11.glPushMatrix();
@@ -166,12 +166,12 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
str = Long.toString( refStack.getStackSize() / 1000 ) + 'k';
}
int w = this.fontRendererObj.getStringWidth( str );
final int w = this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * sectionLength + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * 18 + yo + 6 ) * 2, 4210752 );
GL11.glPopMatrix();
int posX = x * sectionLength + xo + sectionLength - 18;
int posY = y * 18 + yo;
final int posX = x * sectionLength + xo + sectionLength - 18;
final int posY = y * 18 + yo;
if( this.tooltip == z - viewStart )
{
@@ -208,17 +208,17 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/networkstatus.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
}
public void postUpdate( List<IAEItemStack> list )
public void postUpdate( final List<IAEItemStack> list )
{
this.repo.clear();
for( IAEItemStack is : list )
for( final IAEItemStack is : list )
{
this.repo.postUpdate( is );
}
@@ -229,27 +229,27 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
private void setScrollBar()
{
int size = this.repo.size();
final int size = this.repo.size();
this.myScrollBar.setTop( 39 ).setLeft( 175 ).setHeight( 78 );
this.myScrollBar.setRange( 0, ( size + 4 ) / 5 - this.rows, 1 );
}
// @Override - NEI
public List<String> handleItemTooltip( ItemStack stack, int mouseX, int mouseY, List<String> currentToolTip )
public List<String> handleItemTooltip( final ItemStack stack, final int mouseX, final int mouseY, final List<String> currentToolTip )
{
if( stack != null )
{
Slot s = this.getSlot( mouseX, mouseY );
final Slot s = this.getSlot( mouseX, mouseY );
if( s instanceof SlotME )
{
IAEItemStack myStack = null;
try
{
SlotME theSlotField = (SlotME) s;
final SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack();
}
catch( Throwable ignore )
catch( final Throwable ignore )
{
}
@@ -266,25 +266,25 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
}
// Vanilla version...
protected void drawItemStackTooltip( ItemStack stack, int x, int y )
protected void drawItemStackTooltip( final ItemStack stack, final int x, final int y )
{
Slot s = this.getSlot( x, y );
final Slot s = this.getSlot( x, y );
if( s instanceof SlotME && stack != null )
{
IAEItemStack myStack = null;
try
{
SlotME theSlotField = (SlotME) s;
final SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack();
}
catch( Throwable ignore )
catch( final Throwable ignore )
{
}
if( myStack != null )
{
List currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
final List currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
while( currentToolTip.size() > 1 )
{
src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java
+5 -5
View File
@@ -38,14 +38,14 @@ public class GuiNetworkTool extends AEBaseGui
GuiToggleButton tFacades;
public GuiNetworkTool( InventoryPlayer inventoryPlayer, INetworkTool te )
public GuiNetworkTool( final InventoryPlayer inventoryPlayer, final INetworkTool te )
{
super( new ContainerNetworkTool( inventoryPlayer, te ) );
this.ySize = 166;
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -56,7 +56,7 @@ public class GuiNetworkTool extends AEBaseGui
NetworkHandler.instance.sendToServer( new PacketValueConfig( "NetworkTool", "Toggle" ) );
}
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
@@ -73,7 +73,7 @@ public class GuiNetworkTool extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
if( this.tFacades != null )
{
@@ -85,7 +85,7 @@ public class GuiNetworkTool extends AEBaseGui
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/toolbox.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java
+5 -5
View File
@@ -48,7 +48,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
GuiImgButton encodeBtn;
GuiImgButton clearBtn;
public GuiPatternTerm( InventoryPlayer inventoryPlayer, ITerminalHost te )
public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
super( inventoryPlayer, te, new ContainerPatternTerm( inventoryPlayer, te ) );
this.container = (ContainerPatternTerm) this.inventorySlots;
@@ -56,7 +56,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
}
@Override
protected void actionPerformed( GuiButton btn )
protected void actionPerformed( final GuiButton btn )
{
super.actionPerformed( btn );
@@ -78,7 +78,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
NetworkHandler.instance.sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) );
}
}
catch( IOException e )
catch( final IOException e )
{
// TODO Auto-generated catch block
e.printStackTrace();
@@ -108,7 +108,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
if( !this.container.craftingMode )
{
@@ -136,7 +136,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
}
@Override
protected void repositionSlot( AppEngSlot s )
protected void repositionSlot( final AppEngSlot s )
{
if( s.isPlayerSide() )
{
src/main/java/appeng/client/gui/implementations/GuiPriority.java
+22 -22
View File
@@ -66,7 +66,7 @@ public class GuiPriority extends AEBaseGui
GuiBridge OriginalGui;
public GuiPriority( InventoryPlayer inventoryPlayer, IPriorityHost te )
public GuiPriority( final InventoryPlayer inventoryPlayer, final IPriorityHost te )
{
super( new ContainerPriority( inventoryPlayer, te ) );
}
@@ -76,10 +76,10 @@ public class GuiPriority extends AEBaseGui
{
super.initGui();
int a = AEConfig.instance.priorityByStacksAmounts( 0 );
int b = AEConfig.instance.priorityByStacksAmounts( 1 );
int c = AEConfig.instance.priorityByStacksAmounts( 2 );
int d = AEConfig.instance.priorityByStacksAmounts( 3 );
final int a = AEConfig.instance.priorityByStacksAmounts( 0 );
final int b = AEConfig.instance.priorityByStacksAmounts( 1 );
final int c = AEConfig.instance.priorityByStacksAmounts( 2 );
final int d = AEConfig.instance.priorityByStacksAmounts( 3 );
this.buttonList.add( this.plus1 = new GuiButton( 0, this.guiLeft + 20, this.guiTop + 32, 22, 20, "+" + a ) );
this.buttonList.add( this.plus10 = new GuiButton( 0, this.guiLeft + 48, this.guiTop + 32, 28, 20, "+" + b ) );
@@ -92,14 +92,14 @@ public class GuiPriority extends AEBaseGui
this.buttonList.add( this.minus1000 = new GuiButton( 0, this.guiLeft + 120, this.guiTop + 69, 38, 20, "-" + d ) );
ItemStack myIcon = null;
Object target = ( (AEBaseContainer) this.inventorySlots ).getTarget();
final Object target = ( (AEBaseContainer) this.inventorySlots ).getTarget();
final IDefinitions definitions = AEApi.instance().definitions();
final IParts parts = definitions.parts();
final IBlocks blocks = definitions.blocks();
if( target instanceof PartStorageBus )
{
for( ItemStack storageBusStack : parts.storageBus().maybeStack( 1 ).asSet() )
for( final ItemStack storageBusStack : parts.storageBus().maybeStack( 1 ).asSet() )
{
myIcon = storageBusStack;
}
@@ -108,7 +108,7 @@ public class GuiPriority extends AEBaseGui
if( target instanceof PartFormationPlane )
{
for( ItemStack formationPlaneStack : parts.formationPlane().maybeStack( 1 ).asSet() )
for( final ItemStack formationPlaneStack : parts.formationPlane().maybeStack( 1 ).asSet() )
{
myIcon = formationPlaneStack;
}
@@ -117,7 +117,7 @@ public class GuiPriority extends AEBaseGui
if( target instanceof TileDrive )
{
for( ItemStack driveStack : blocks.drive().maybeStack( 1 ).asSet() )
for( final ItemStack driveStack : blocks.drive().maybeStack( 1 ).asSet() )
{
myIcon = driveStack;
}
@@ -127,7 +127,7 @@ public class GuiPriority extends AEBaseGui
if( target instanceof TileChest )
{
for( ItemStack chestStack : blocks.chest().maybeStack( 1 ).asSet() )
for( final ItemStack chestStack : blocks.chest().maybeStack( 1 ).asSet() )
{
myIcon = chestStack;
}
@@ -137,7 +137,7 @@ public class GuiPriority extends AEBaseGui
if( target instanceof TileInterface )
{
for( ItemStack interfaceStack : blocks.iface().maybeStack( 1 ).asSet() )
for( final ItemStack interfaceStack : blocks.iface().maybeStack( 1 ).asSet() )
{
myIcon = interfaceStack;
}
@@ -147,7 +147,7 @@ public class GuiPriority extends AEBaseGui
if( target instanceof PartInterface )
{
for( ItemStack interfaceStack : parts.iface().maybeStack( 1 ).asSet() )
for( final ItemStack interfaceStack : parts.iface().maybeStack( 1 ).asSet() )
{
myIcon = interfaceStack;
}
@@ -169,13 +169,13 @@ public class GuiPriority extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( GuiText.Priority.getLocal(), 8, 6, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/priority.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
@@ -184,7 +184,7 @@ public class GuiPriority extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
@@ -193,8 +193,8 @@ public class GuiPriority extends AEBaseGui
NetworkHandler.instance.sendToServer( new PacketSwitchGuis( this.OriginalGui ) );
}
boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
final boolean isPlus = btn == this.plus1 || btn == this.plus10 || btn == this.plus100 || btn == this.plus1000;
final boolean isMinus = btn == this.minus1 || btn == this.minus10 || btn == this.minus100 || btn == this.minus1000;
if( isPlus || isMinus )
{
@@ -202,7 +202,7 @@ public class GuiPriority extends AEBaseGui
}
}
private void addQty( int i )
private void addQty( final int i )
{
try
{
@@ -232,19 +232,19 @@ public class GuiPriority extends AEBaseGui
NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) );
}
catch( NumberFormatException e )
catch( final NumberFormatException e )
{
// nope..
this.priority.setText( "0" );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
}
@Override
protected void keyTyped( char character, int key ) throws IOException
protected void keyTyped( final char character, final int key ) throws IOException
{
if( !this.checkHotbarKeys( key ) )
{
@@ -273,7 +273,7 @@ public class GuiPriority extends AEBaseGui
NetworkHandler.instance.sendToServer( new PacketValueConfig( "PriorityHost.Priority", out ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
src/main/java/appeng/client/gui/implementations/GuiQNB.java
+3 -3
View File
@@ -29,21 +29,21 @@ import appeng.tile.qnb.TileQuantumBridge;
public class GuiQNB extends AEBaseGui
{
public GuiQNB( InventoryPlayer inventoryPlayer, TileQuantumBridge te )
public GuiQNB( final InventoryPlayer inventoryPlayer, final TileQuantumBridge te )
{
super( new ContainerQNB( inventoryPlayer, te ) );
this.ySize = 166;
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.QuantumLinkChamber.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/chest.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java
+6 -6
View File
@@ -37,7 +37,7 @@ public class GuiQuartzKnife extends AEBaseGui
GuiTextField name;
public GuiQuartzKnife( InventoryPlayer inventoryPlayer, QuartzKnifeObj te )
public GuiQuartzKnife( final InventoryPlayer inventoryPlayer, final QuartzKnifeObj te )
{
super( new ContainerQuartzKnife( inventoryPlayer, te ) );
this.ySize = 184;
@@ -57,14 +57,14 @@ public class GuiQuartzKnife extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.QuartzCuttingKnife.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/quartzknife.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
@@ -72,17 +72,17 @@ public class GuiQuartzKnife extends AEBaseGui
}
@Override
protected void keyTyped( char character, int key ) throws IOException
protected void keyTyped( final char character, final int key ) throws IOException
{
if( this.name.textboxKeyTyped( character, key ) )
{
try
{
String Out = this.name.getText();
final String Out = this.name.getText();
( (ContainerQuartzKnife) this.inventorySlots ).setName( Out );
NetworkHandler.instance.sendToServer( new PacketValueConfig( "QuartzKnife.Name", Out ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
src/main/java/appeng/client/gui/implementations/GuiSecurity.java
+6 -6
View File
@@ -42,7 +42,7 @@ public class GuiSecurity extends GuiMEMonitorable
GuiToggleButton build;
GuiToggleButton security;
public GuiSecurity( InventoryPlayer inventoryPlayer, ITerminalHost te )
public GuiSecurity( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
{
super( inventoryPlayer, te, new ContainerSecurity( inventoryPlayer, te ) );
this.customSortOrder = false;
@@ -54,7 +54,7 @@ public class GuiSecurity extends GuiMEMonitorable
}
@Override
protected void actionPerformed( net.minecraft.client.gui.GuiButton btn )
protected void actionPerformed( final net.minecraft.client.gui.GuiButton btn )
{
super.actionPerformed( btn );
@@ -87,7 +87,7 @@ public class GuiSecurity extends GuiMEMonitorable
{
NetworkHandler.instance.sendToServer( new PacketValueConfig( "TileSecurity.ToggleOption", toggleSetting.name() ) );
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
@@ -99,7 +99,7 @@ public class GuiSecurity extends GuiMEMonitorable
{
super.initGui();
int top = this.guiTop + this.ySize - 116;
final int top = this.guiTop + this.ySize - 116;
this.buttonList.add( this.inject = new GuiToggleButton( this.guiLeft + 56, top, 11 * 16, 12 * 16, SecurityPermissions.INJECT.getUnlocalizedName(), SecurityPermissions.INJECT.getUnlocalizedTip() ) );
this.buttonList.add( this.extract = new GuiToggleButton( this.guiLeft + 56 + 18, top, 11 * 16 + 1, 12 * 16 + 1, SecurityPermissions.EXTRACT.getUnlocalizedName(), SecurityPermissions.EXTRACT.getUnlocalizedTip() ) );
@@ -112,7 +112,7 @@ public class GuiSecurity extends GuiMEMonitorable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
super.drawFG( offsetX, offsetY, mouseX, mouseY );
this.fontRendererObj.drawString( GuiText.SecurityCardEditor.getLocal(), 8, this.ySize - 96 + 1 - this.reservedSpace, 4210752 );
@@ -121,7 +121,7 @@ public class GuiSecurity extends GuiMEMonitorable
@Override
protected String getBackground()
{
ContainerSecurity cs = (ContainerSecurity) this.inventorySlots;
final ContainerSecurity cs = (ContainerSecurity) this.inventorySlots;
this.inject.setState( ( cs.security & ( 1 << SecurityPermissions.INJECT.ordinal() ) ) > 0 );
this.extract.setState( ( cs.security & ( 1 << SecurityPermissions.EXTRACT.ordinal() ) ) > 0 );
src/main/java/appeng/client/gui/implementations/GuiSkyChest.java
+3 -3
View File
@@ -31,21 +31,21 @@ import appeng.tile.storage.TileSkyChest;
public class GuiSkyChest extends AEBaseGui
{
public GuiSkyChest( InventoryPlayer inventoryPlayer, TileSkyChest te )
public GuiSkyChest( final InventoryPlayer inventoryPlayer, final TileSkyChest te )
{
super( new ContainerSkyChest( inventoryPlayer, te ) );
this.ySize = 195;
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.SkyChest.getLocal() ), 8, 8, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 2, 4210752 );
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/skychest.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java
+5 -5
View File
@@ -42,7 +42,7 @@ public class GuiSpatialIOPort extends AEBaseGui
final ContainerSpatialIOPort container;
GuiImgButton units;
public GuiSpatialIOPort( InventoryPlayer inventoryPlayer, TileSpatialIOPort te )
public GuiSpatialIOPort( final InventoryPlayer inventoryPlayer, final TileSpatialIOPort te )
{
super( new ContainerSpatialIOPort( inventoryPlayer, te ) );
this.ySize = 199;
@@ -50,11 +50,11 @@ public class GuiSpatialIOPort extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.units )
{
@@ -73,7 +73,7 @@ public class GuiSpatialIOPort extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.currentPower, false ), 13, 21, 4210752 );
this.fontRendererObj.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( this.container.maxPower, false ), 13, 31, 4210752 );
@@ -85,7 +85,7 @@ public class GuiSpatialIOPort extends AEBaseGui
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/spatialio.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiStorageBus.java
+5 -5
View File
@@ -53,7 +53,7 @@ public class GuiStorageBus extends GuiUpgradeable
GuiImgButton partition;
GuiImgButton clear;
public GuiStorageBus( InventoryPlayer inventoryPlayer, PartStorageBus te )
public GuiStorageBus( final InventoryPlayer inventoryPlayer, final PartStorageBus te )
{
super( new ContainerStorageBus( inventoryPlayer, te ) );
this.ySize = 251;
@@ -78,7 +78,7 @@ public class GuiStorageBus extends GuiUpgradeable
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.StorageBus.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -106,11 +106,11 @@ public class GuiStorageBus extends GuiUpgradeable
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
try
{
@@ -135,7 +135,7 @@ public class GuiStorageBus extends GuiUpgradeable
NetworkHandler.instance.sendToServer( new PacketConfigButton( this.storageFilter.getSetting(), backwards ) );
}
}
catch( IOException e )
catch( final IOException e )
{
AELog.error( e );
}
src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java
+6 -6
View File
@@ -54,12 +54,12 @@ public class GuiUpgradeable extends AEBaseGui
GuiImgButton craftMode;
GuiImgButton schedulingMode;
public GuiUpgradeable( InventoryPlayer inventoryPlayer, IUpgradeableHost te )
public GuiUpgradeable( final InventoryPlayer inventoryPlayer, final IUpgradeableHost te )
{
this( new ContainerUpgradeable( inventoryPlayer, te ) );
}
public GuiUpgradeable( ContainerUpgradeable te )
public GuiUpgradeable( final ContainerUpgradeable te )
{
super( te );
this.cvb = te;
@@ -95,7 +95,7 @@ public class GuiUpgradeable extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( this.getName().getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -122,7 +122,7 @@ public class GuiUpgradeable extends AEBaseGui
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.handleButtonVisibility();
@@ -174,11 +174,11 @@ public class GuiUpgradeable extends AEBaseGui
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.redstoneMode )
{
src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java
+6 -6
View File
@@ -37,7 +37,7 @@ public class GuiVibrationChamber extends AEBaseGui
final ContainerVibrationChamber cvc;
GuiProgressBar pb;
public GuiVibrationChamber( InventoryPlayer inventoryPlayer, TileVibrationChamber te )
public GuiVibrationChamber( final InventoryPlayer inventoryPlayer, final TileVibrationChamber te )
{
super( new ContainerVibrationChamber( inventoryPlayer, te ) );
this.cvc = (ContainerVibrationChamber) this.inventorySlots;
@@ -54,7 +54,7 @@ public class GuiVibrationChamber extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.VibrationChamber.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
@@ -63,17 +63,17 @@ public class GuiVibrationChamber extends AEBaseGui
if( this.cvc.getCurrentProgress() > 0 )
{
int i1 = this.cvc.getCurrentProgress();
final int i1 = this.cvc.getCurrentProgress();
this.bindTexture( "guis/vibchamber.png" );
GL11.glColor3f( 1, 1, 1 );
int l = -15;
int k = 25;
final int l = -15;
final int k = 25;
this.drawTexturedModalRect( k + 56, l + 36 + 12 - i1, 176, 12 - i1, 14, i1 + 2 );
}
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/vibchamber.png" );
this.pb.xPosition = 99 + this.guiLeft;
src/main/java/appeng/client/gui/implementations/GuiWireless.java
+10 -10
View File
@@ -41,18 +41,18 @@ public class GuiWireless extends AEBaseGui
GuiImgButton units;
public GuiWireless( InventoryPlayer inventoryPlayer, TileWireless te )
public GuiWireless( final InventoryPlayer inventoryPlayer, final TileWireless te )
{
super( new ContainerWireless( inventoryPlayer, te ) );
this.ySize = 166;
}
@Override
protected void actionPerformed( GuiButton btn ) throws IOException
protected void actionPerformed( final GuiButton btn ) throws IOException
{
super.actionPerformed( btn );
boolean backwards = Mouse.isButtonDown( 1 );
final boolean backwards = Mouse.isButtonDown( 1 );
if( btn == this.units )
{
@@ -71,27 +71,27 @@ public class GuiWireless extends AEBaseGui
}
@Override
public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Wireless.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
ContainerWireless cw = (ContainerWireless) this.inventorySlots;
final ContainerWireless cw = (ContainerWireless) this.inventorySlots;
if( cw.range > 0 )
{
String firstMessage = GuiText.Range.getLocal() + ": " + ( cw.range / 10.0 ) + " m";
String secondMessage = GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( cw.drain, true );
final String firstMessage = GuiText.Range.getLocal() + ": " + ( cw.range / 10.0 ) + " m";
final String secondMessage = GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( cw.drain, true );
int strWidth = Math.max( this.fontRendererObj.getStringWidth( firstMessage ), this.fontRendererObj.getStringWidth( secondMessage ) );
int cOffset = ( this.xSize / 2 ) - ( strWidth / 2 );
final int strWidth = Math.max( this.fontRendererObj.getStringWidth( firstMessage ), this.fontRendererObj.getStringWidth( secondMessage ) );
final int cOffset = ( this.xSize / 2 ) - ( strWidth / 2 );
this.fontRendererObj.drawString( firstMessage, cOffset, 20, 4210752 );
this.fontRendererObj.drawString( secondMessage, cOffset, 20 + 12, 4210752 );
}
}
@Override
public void drawBG( int offsetX, int offsetY, int mouseX, int mouseY )
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/wireless.png" );
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiWirelessTerm.java
+1 -1
View File
@@ -26,7 +26,7 @@ import appeng.api.implementations.guiobjects.IPortableCell;
public class GuiWirelessTerm extends GuiMEPortableCell
{
public GuiWirelessTerm( InventoryPlayer inventoryPlayer, IPortableCell te )
public GuiWirelessTerm( final InventoryPlayer inventoryPlayer, final IPortableCell te )
{
super( inventoryPlayer, te );
this.maxRows = Integer.MAX_VALUE;
src/main/java/appeng/client/gui/widgets/GuiImgButton.java
+17 -17
View File
@@ -62,7 +62,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
public String fillVar;
private Enum currentValue;
public GuiImgButton( int x, int y, Enum idx, Enum val )
public GuiImgButton( final int x, final int y, final Enum idx, final Enum val )
{
super( 0, 0, 16, "" );
@@ -166,27 +166,27 @@ public class GuiImgButton extends GuiButton implements ITooltip
}
}
private void registerApp( int iconIndex, Settings setting, Enum val, ButtonToolTips title, Object hint )
private void registerApp( final int iconIndex, final Settings setting, final Enum val, final ButtonToolTips title, final Object hint )
{
ButtonAppearance a = new ButtonAppearance();
final ButtonAppearance a = new ButtonAppearance();
a.displayName = title.getUnlocalized();
a.displayValue = (String) ( hint instanceof String ? hint : ( (ButtonToolTips) hint ).getUnlocalized() );
a.index = iconIndex;
appearances.put( new EnumPair( setting, val ), a );
}
public void setVisibility( boolean vis )
public void setVisibility( final boolean vis )
{
this.visible = vis;
this.enabled = vis;
}
@Override
public void drawButton( Minecraft par1Minecraft, int par2, int par3 )
public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3 )
{
if( this.visible )
{
int iconIndex = this.getIconIndex();
final int iconIndex = this.getIconIndex();
if( this.halfSize )
{
@@ -209,8 +209,8 @@ public class GuiImgButton extends GuiButton implements ITooltip
par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
this.hovered = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
int uv_y = (int) Math.floor( iconIndex / 16 );
int uv_x = iconIndex - uv_y * 16;
final int uv_y = (int) Math.floor( iconIndex / 16 );
final int uv_x = iconIndex - uv_y * 16;
this.drawTexturedModalRect( 0, 0, 256 - 16, 256 - 16, 16, 16 );
this.drawTexturedModalRect( 0, 0, uv_x * 16, uv_y * 16, 16, 16 );
@@ -232,8 +232,8 @@ public class GuiImgButton extends GuiButton implements ITooltip
par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
this.hovered = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
int uv_y = (int) Math.floor( iconIndex / 16 );
int uv_x = iconIndex - uv_y * 16;
final int uv_y = (int) Math.floor( iconIndex / 16 );
final int uv_x = iconIndex - uv_y * 16;
this.drawTexturedModalRect( this.xPosition, this.yPosition, 256 - 16, 256 - 16, 16, 16 );
this.drawTexturedModalRect( this.xPosition, this.yPosition, uv_x * 16, uv_y * 16, 16, 16 );
@@ -247,7 +247,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
{
if( this.buttonSetting != null && this.currentValue != null )
{
ButtonAppearance app = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) );
final ButtonAppearance app = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) );
if( app == null )
{
return 256 - 1;
@@ -275,7 +275,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
if( this.buttonSetting != null && this.currentValue != null )
{
ButtonAppearance buttonAppearance = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) );
final ButtonAppearance buttonAppearance = appearances.get( new EnumPair( this.buttonSetting, this.currentValue ) );
if( buttonAppearance == null )
{
return "No Such Message";
@@ -305,7 +305,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
}
value = PATTERN_NEW_LINE.matcher( value ).replaceAll( "\n" );
StringBuilder sb = new StringBuilder( value );
final StringBuilder sb = new StringBuilder( value );
int i = sb.lastIndexOf( "\n" );
if( i <= 0 )
@@ -352,7 +352,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
return this.visible;
}
public void set( Enum e )
public void set( final Enum e )
{
if( this.currentValue != e )
{
@@ -366,7 +366,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
final Enum setting;
final Enum value;
EnumPair( Enum a, Enum b )
EnumPair( final Enum a, final Enum b )
{
this.setting = a;
this.value = b;
@@ -379,7 +379,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
}
@Override
public boolean equals( Object obj )
public boolean equals( final Object obj )
{
if( obj == null )
{
@@ -389,7 +389,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
{
return false;
}
EnumPair other = (EnumPair) obj;
final EnumPair other = (EnumPair) obj;
return other.setting == this.setting && other.value == this.value;
}
}
src/main/java/appeng/client/gui/widgets/GuiNumberBox.java
+4 -4
View File
@@ -28,16 +28,16 @@ public class GuiNumberBox extends GuiTextField
final Class type;
public GuiNumberBox( FontRenderer fontRenderer, int x, int y, int width, int height, Class type )
public GuiNumberBox( final FontRenderer fontRenderer, final int x, final int y, final int width, final int height, final Class type )
{
super( 0, fontRenderer, x, y, width, height );
this.type = type;
}
@Override
public void writeText( String selectedText )
public void writeText( final String selectedText )
{
String original = this.getText();
final String original = this.getText();
super.writeText( selectedText );
try
@@ -55,7 +55,7 @@ public class GuiNumberBox extends GuiTextField
Double.parseDouble( this.getText() );
}
}
catch( NumberFormatException e )
catch( final NumberFormatException e )
{
this.setText( original );
}
src/main/java/appeng/client/gui/widgets/GuiProgressBar.java
+8 -8
View File
@@ -37,12 +37,12 @@ public class GuiProgressBar extends GuiButton implements ITooltip
private final String titleName;
private String fullMsg;
public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int width, int height, Direction dir )
public GuiProgressBar( final IProgressProvider source, final String texture, final int posX, final int posY, final int u, final int y, final int width, final int height, final Direction dir )
{
this( source, texture, posX, posY, u, y, width, height, dir, null );
}
public GuiProgressBar( IProgressProvider source, String texture, int posX, int posY, int u, int y, int width, int height, Direction dir, String title )
public GuiProgressBar( final IProgressProvider source, final String texture, final int posX, final int posY, final int u, final int y, final int width, final int height, final Direction dir, final String title )
{
super( posX, posY, width, "" );
this.source = source;
@@ -58,22 +58,22 @@ public class GuiProgressBar extends GuiButton implements ITooltip
}
@Override
public void drawButton( Minecraft par1Minecraft, int par2, int par3 )
public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3 )
{
if( this.visible )
{
par1Minecraft.getTextureManager().bindTexture( this.texture );
int max = this.source.getMaxProgress();
int current = this.source.getCurrentProgress();
final int max = this.source.getMaxProgress();
final int current = this.source.getCurrentProgress();
if( this.layout == Direction.VERTICAL )
{
int diff = this.height - ( max > 0 ? ( this.height * current ) / max : 0 );
final int diff = this.height - ( max > 0 ? ( this.height * current ) / max : 0 );
this.drawTexturedModalRect( this.xPosition, this.yPosition + diff, this.fill_u, this.fill_v + diff, this.width, this.height - diff );
}
else
{
int diff = this.width - ( max > 0 ? ( this.width * current ) / max : 0 );
final int diff = this.width - ( max > 0 ? ( this.width * current ) / max : 0 );
this.drawTexturedModalRect( this.xPosition, this.yPosition, this.fill_u + diff, this.fill_v, this.width - diff, this.height );
}
@@ -81,7 +81,7 @@ public class GuiProgressBar extends GuiButton implements ITooltip
}
}
public void setFullMsg( String msg )
public void setFullMsg( final String msg )
{
this.fullMsg = msg;
}
src/main/java/appeng/client/gui/widgets/GuiScrollbar.java
+8 -8
View File
@@ -37,7 +37,7 @@ public class GuiScrollbar implements IScrollSource
private int minScroll = 0;
private int currentScroll = 0;
public void draw( AEBaseGui g )
public void draw( final AEBaseGui g )
{
g.bindTexture( "minecraft", "gui/container/creative_inventory/tabs.png" );
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
@@ -48,7 +48,7 @@ public class GuiScrollbar implements IScrollSource
}
else
{
int offset = ( this.currentScroll - this.minScroll ) * ( this.height - 15 ) / this.getRange();
final int offset = ( this.currentScroll - this.minScroll ) * ( this.height - 15 ) / this.getRange();
g.drawTexturedModalRect( this.displayX, offset + this.displayY, 232, 0, this.width, 15 );
}
}
@@ -63,7 +63,7 @@ public class GuiScrollbar implements IScrollSource
return this.displayX;
}
public GuiScrollbar setLeft( int v )
public GuiScrollbar setLeft( final int v )
{
this.displayX = v;
return this;
@@ -74,7 +74,7 @@ public class GuiScrollbar implements IScrollSource
return this.displayY;
}
public GuiScrollbar setTop( int v )
public GuiScrollbar setTop( final int v )
{
this.displayY = v;
return this;
@@ -85,7 +85,7 @@ public class GuiScrollbar implements IScrollSource
return this.width;
}
public GuiScrollbar setWidth( int v )
public GuiScrollbar setWidth( final int v )
{
this.width = v;
return this;
@@ -96,13 +96,13 @@ public class GuiScrollbar implements IScrollSource
return this.height;
}
public GuiScrollbar setHeight( int v )
public GuiScrollbar setHeight( final int v )
{
this.height = v;
return this;
}
public void setRange( int min, int max, int pageSize )
public void setRange( final int min, final int max, final int pageSize )
{
this.minScroll = min;
this.maxScroll = max;
@@ -127,7 +127,7 @@ public class GuiScrollbar implements IScrollSource
return this.currentScroll;
}
public void click( AEBaseGui aeBaseGui, int x, int y )
public void click( final AEBaseGui aeBaseGui, final int x, final int y )
{
if( this.getRange() == 0 )
{
src/main/java/appeng/client/gui/widgets/GuiTabButton.java
+5 -5
View File
@@ -39,7 +39,7 @@ public class GuiTabButton extends GuiButton implements ITooltip
private int myIcon = -1;
private ItemStack myItem;
public GuiTabButton( int x, int y, int ico, String message, RenderItem ir )
public GuiTabButton( final int x, final int y, final int ico, final String message, final RenderItem ir )
{
super( 0, 0, 16, "" );
@@ -61,7 +61,7 @@ public class GuiTabButton extends GuiButton implements ITooltip
* @param message mouse over message
* @param ir renderer
*/
public GuiTabButton( int x, int y, ItemStack ico, String message, RenderItem ir )
public GuiTabButton( final int x, final int y, final ItemStack ico, final String message, final RenderItem ir )
{
super( 0, 0, 16, "" );
this.xPosition = x;
@@ -74,7 +74,7 @@ public class GuiTabButton extends GuiButton implements ITooltip
}
@Override
public void drawButton( Minecraft minecraft, int x, int y )
public void drawButton( final Minecraft minecraft, final int x, final int y )
{
if( this.visible )
{
@@ -84,13 +84,13 @@ public class GuiTabButton extends GuiButton implements ITooltip
int uv_x = ( this.hideEdge > 0 ? 11 : 13 );
int offsetX = this.hideEdge > 0 ? 1 : 0;
final int offsetX = this.hideEdge > 0 ? 1 : 0;
this.drawTexturedModalRect( this.xPosition, this.yPosition, uv_x * 16, 0, 25, 22 );
if( this.myIcon >= 0 )
{
int uv_y = (int) Math.floor( this.myIcon / 16 );
final int uv_y = (int) Math.floor( this.myIcon / 16 );
uv_x = this.myIcon - uv_y * 16;
this.drawTexturedModalRect( offsetX + this.xPosition + 3, this.yPosition + 3, uv_x * 16, uv_y * 16, 16, 16 );
src/main/java/appeng/client/gui/widgets/GuiToggleButton.java
+7 -7
View File
@@ -41,7 +41,7 @@ public class GuiToggleButton extends GuiButton implements ITooltip
private boolean isActive;
public GuiToggleButton( int x, int y, int on, int off, String displayName, String displayHint )
public GuiToggleButton( final int x, final int y, final int on, final int off, final String displayName, final String displayHint )
{
super( 0, 0, 16, "" );
this.iconIdxOn = on;
@@ -54,24 +54,24 @@ public class GuiToggleButton extends GuiButton implements ITooltip
this.height = 16;
}
public void setState( boolean isOn )
public void setState( final boolean isOn )
{
this.isActive = isOn;
}
@Override
public void drawButton( Minecraft par1Minecraft, int par2, int par3 )
public void drawButton( final Minecraft par1Minecraft, final int par2, final int par3 )
{
if( this.visible )
{
int iconIndex = this.getIconIndex();
final int iconIndex = this.getIconIndex();
GL11.glColor4f( 1.0f, 1.0f, 1.0f, 1.0f );
par1Minecraft.renderEngine.bindTexture( ExtraBlockTextures.GuiTexture( "guis/states.png" ) );
this.hovered = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
int uv_y = (int) Math.floor( iconIndex / 16 );
int uv_x = iconIndex - uv_y * 16;
final int uv_y = (int) Math.floor( iconIndex / 16 );
final int uv_x = iconIndex - uv_y * 16;
this.drawTexturedModalRect( this.xPosition, this.yPosition, 256 - 16, 256 - 16, 16, 16 );
this.drawTexturedModalRect( this.xPosition, this.yPosition, uv_x * 16, uv_y * 16, 16, 16 );
@@ -102,7 +102,7 @@ public class GuiToggleButton extends GuiButton implements ITooltip
}
value = PATTERN_NEW_LINE.matcher( value ).replaceAll( "\n" );
StringBuilder sb = new StringBuilder( value );
final StringBuilder sb = new StringBuilder( value );
int i = sb.lastIndexOf( "\n" );
if( i <= 0 )
src/main/java/appeng/client/gui/widgets/MEGuiTextField.java
+3 -3
View File
@@ -50,7 +50,7 @@ public class MEGuiTextField extends GuiTextField
* @param width absolute width
* @param height absolute height
*/
public MEGuiTextField( FontRenderer fontRenderer, int xPos, int yPos, int width, int height )
public MEGuiTextField( final FontRenderer fontRenderer, final int xPos, final int yPos, final int width, final int height )
{
super( 0, fontRenderer, xPos + PADDING, yPos + PADDING, width - 2 * PADDING - fontRenderer.getCharWidth( '_' ), height - 2 * PADDING );
@@ -61,7 +61,7 @@ public class MEGuiTextField extends GuiTextField
}
@Override
public void mouseClicked( int xPos, int yPos, int button )
public void mouseClicked( final int xPos, final int yPos, final int button )
{
super.mouseClicked( xPos, yPos, button );
@@ -78,7 +78,7 @@ public class MEGuiTextField extends GuiTextField
*
* @return true if mouse position is within the text field area
*/
public boolean isMouseIn( int xCoord, int yCoord )
public boolean isMouseIn( final int xCoord, final int yCoord )
{
final boolean withinXRange = this._xPos <= xCoord && xCoord < this._xPos + this._width;
final boolean withinYRange = this._yPos <= yCoord && yCoord < this._yPos + this._height;