diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/gui')
9 files changed, 72 insertions, 41 deletions
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java index 2e08493d0d..7da3d1a35c 100644 --- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java @@ -15,7 +15,7 @@ public class Gui_ID_Registry { static {} private static void registerGuiHandlers(final Gui_Types MU_GuiType, - final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) { + final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) { for (final Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses) { final MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass); classMap.put(tileGuiHandlerClass, guiId); @@ -28,7 +28,7 @@ public class Gui_ID_Registry { MU_GuiId guiId = classMap.get(guiHandlerClass); if (guiId == null) { for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classGuiIdEntry : classMap - .entrySet()) { + .entrySet()) { if (((Class<?>) classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) { guiId = classGuiIdEntry.getValue(); break; diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java index 6cd3925b46..71d3b36470 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_CircuitProgrammer.java @@ -17,8 +17,8 @@ import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; public class GUI_CircuitProgrammer extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/CircuitProgrammer.png"); + GTPlusPlus.ID, + "textures/gui/CircuitProgrammer.png"); public GUI_CircuitProgrammer(final InventoryPlayer player_inventory, final TileEntityCircuitProgrammer te) { super(new Container_CircuitProgrammer(player_inventory, te)); diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java index eb019b500f..60e0f0e67e 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java @@ -17,8 +17,8 @@ import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; public class GUI_DecayablesChest extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/FishTrap.png"); + GTPlusPlus.ID, + "textures/gui/FishTrap.png"); public GUI_DecayablesChest(final InventoryPlayer player_inventory, final TileEntityDecayablesChest te) { super(new Container_DecayablesChest(player_inventory, te)); diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java index c67ab36856..d57ef408d0 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_FishTrap.java @@ -17,8 +17,8 @@ import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; public class GUI_FishTrap extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/FishTrap.png"); + GTPlusPlus.ID, + "textures/gui/FishTrap.png"); public GUI_FishTrap(final InventoryPlayer player_inventory, final TileEntityFishTrap te) { super(new Container_FishTrap(player_inventory, te)); diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java index e08ca4e67b..bed8707fc4 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_PestKiller.java @@ -25,8 +25,8 @@ import gtPlusPlus.core.util.math.MathUtils; public class GUI_PestKiller extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/PestKiller.png"); + GTPlusPlus.ID, + "textures/gui/PestKiller.png"); private final TileEntityPestKiller mTileKiller; public GUI_PestKiller(final InventoryPlayer player_inventory, final TileEntityPestKiller te) { @@ -98,8 +98,19 @@ public class GUI_PestKiller extends GuiContainer { this.fontRendererObj.drawString("Tier: 1", 4, 18, 4210752); this.fontRendererObj.drawString("Range: 5x5", 4, 30, 4210752); this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752); - this.fontRendererObj.drawString("" + aTile.getTank().getFluid().getLocalizedName(), 4, 54, 4210752); - this.fontRendererObj.drawString("Amount: " + aTile.getTank().getFluidAmount(), 4, 64, 4210752); + this.fontRendererObj.drawString( + "" + aTile.getTank() + .getFluid() + .getLocalizedName(), + 4, + 54, + 4210752); + this.fontRendererObj.drawString( + "Amount: " + aTile.getTank() + .getFluidAmount(), + 4, + 64, + 4210752); didRender = true; } else if (aTier == 2) { if (aTank != null && aTank.getFluidAmount() > 0) { @@ -115,8 +126,19 @@ public class GUI_PestKiller extends GuiContainer { this.fontRendererObj.drawString("Tier: 2", 4, 18, 4210752); this.fontRendererObj.drawString("Range: 9x9", 4, 30, 4210752); this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752); - this.fontRendererObj.drawString("" + aTile.getTank().getFluid().getLocalizedName(), 4, 54, 4210752); - this.fontRendererObj.drawString("Amount: " + aTile.getTank().getFluidAmount(), 4, 64, 4210752); + this.fontRendererObj.drawString( + "" + aTile.getTank() + .getFluid() + .getLocalizedName(), + 4, + 54, + 4210752); + this.fontRendererObj.drawString( + "Amount: " + aTile.getTank() + .getFluidAmount(), + 4, + 64, + 4210752); didRender = true; } } diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java index db8019a93a..3707855641 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java @@ -18,8 +18,8 @@ import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; public class GUI_ProjectTable extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/ProjectTable.png"); + GTPlusPlus.ID, + "textures/gui/ProjectTable.png"); public GUI_ProjectTable(final InventoryPlayer player_inventory, final TileEntityProjectTable tile) { super(new Container_ProjectTable(player_inventory, tile)); diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java index e453c61641..9afa2b4ce1 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java @@ -20,8 +20,8 @@ import gtPlusPlus.core.gui.GUI_Base_Tile_Entity; public class GUI_SuperJukebox extends GUI_Base_Tile_Entity { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/SuperJukebox.png"); + GTPlusPlus.ID, + "textures/gui/SuperJukebox.png"); private final Container_SuperJukebox mThisContainer; public GUI_SuperJukebox(final InventoryPlayer player_inventory, final TileEntitySuperJukebox te) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java index d3b30c87c1..6595b510c0 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java @@ -22,8 +22,8 @@ import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; public class GUI_VolumetricFlaskSetter extends GuiContainer { private static final ResourceLocation mGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/VolumetricFlaskSetter.png"); + GTPlusPlus.ID, + "textures/gui/VolumetricFlaskSetter.png"); private Container_VolumetricFlaskSetter mContainer; private boolean mIsOpen = false; private GuiValueField mText; @@ -76,14 +76,14 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer { // Keyboard.enableRepeatEvents(true); mIsOpen = true; this.mText = new GuiValueField( - this.fontRendererObj, - 26, - 31, - this.width / 2 - 62, - this.height / 2 - 52, - 106, - 14, - this); + this.fontRendererObj, + 26, + 31, + this.width / 2 - 62, + this.height / 2 - 52, + 106, + 14, + this); mText.setMaxStringLength(5); mText.setEnableBackgroundDrawing(true); mText.setText("0"); @@ -137,7 +137,8 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer { } else { if (isNumber(par2) || isNumber(par1)) { log("Pressed number."); - if (this.mText.getText().equals("0")) { + if (this.mText.getText() + .equals("0")) { this.mText.textboxKeyTyped(par1, par2); sendUpdateToServer(); } else { diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java index 5e6973ab2a..698aa1951a 100644 --- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java +++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java @@ -17,7 +17,7 @@ public class GuiValueField extends GuiTextField { private final GUI_VolumetricFlaskSetter mGUI; public GuiValueField(FontRenderer aFontRenderer, int aX, int aY, int aScreenLocationX, int aScreenLocationY, - int aWidth, int aHeight, GUI_VolumetricFlaskSetter aGUI) { + int aWidth, int aHeight, GUI_VolumetricFlaskSetter aGUI) { super(aFontRenderer, aX, aY, aWidth, aHeight); mFontRenderer = aFontRenderer; mScreenLocationX = aScreenLocationX; @@ -32,8 +32,8 @@ public class GuiValueField extends GuiTextField { public boolean isBackgroundDrawingEnabled() { Field enableBackgroundDrawing = ReflectionUtils.getField( - GuiTextField.class, - !CORE_Preloader.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing"); + GuiTextField.class, + !CORE_Preloader.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing"); if (enableBackgroundDrawing != null) { return ReflectionUtils.getFieldValue(enableBackgroundDrawing, this); } @@ -42,7 +42,7 @@ public class GuiValueField extends GuiTextField { public int getLineScrollOffset() { Field lineScrollOffset = ReflectionUtils - .getField(GuiTextField.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset"); + .getField(GuiTextField.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset"); if (lineScrollOffset != null) { return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this); } @@ -52,8 +52,8 @@ public class GuiValueField extends GuiTextField { public boolean didClickInTextField(int aX, int aY) { mGUI.log("Clicked at X:" + aX + ", Y:" + aY); boolean aDidClick = aX >= this.mScreenLocationX && aX < this.mScreenLocationX + this.width - && aY >= this.mScreenLocationY - && aY < this.mScreenLocationY + this.height; + && aY >= this.mScreenLocationY + && aY < this.mScreenLocationY + this.height; mGUI.log("Did click in textbox? " + aDidClick); mGUI.log("Expected Region: X:" + mScreenLocationX + "-" + (this.mScreenLocationX + this.width)); mGUI.log("Expected Region: Y:" + mScreenLocationY + "-" + (this.mScreenLocationY + this.height)); @@ -78,16 +78,24 @@ public class GuiValueField extends GuiTextField { } if (aButton == 0) { mGUI.log("Left clicked in text box."); - String s = this.mFontRenderer - .trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth()); - this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset()); + String s = this.mFontRenderer.trimStringToWidth( + this.getText() + .substring(getLineScrollOffset()), + this.getWidth()); + this.setCursorPosition( + this.mFontRenderer.trimStringToWidth(s, l) + .length() + getLineScrollOffset()); } else if (aButton == 1) { mGUI.log("Right clicked in text box."); mGUI.setText(0); mGUI.sendUpdateToServer(); - String s = this.mFontRenderer - .trimStringToWidth(this.getText().substring(getLineScrollOffset()), this.getWidth()); - this.setCursorPosition(this.mFontRenderer.trimStringToWidth(s, l).length() + getLineScrollOffset()); + String s = this.mFontRenderer.trimStringToWidth( + this.getText() + .substring(getLineScrollOffset()), + this.getWidth()); + this.setCursorPosition( + this.mFontRenderer.trimStringToWidth(s, l) + .length() + getLineScrollOffset()); } } else { mGUI.log("Clicked, but no focus."); |