From e0259d0c5a561b1b8d2575320bf3532fde0a5a4c Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Mon, 31 Aug 2015 17:15:12 +0200 Subject: [PATCH] Some general warning cleanup --- .../replaymod/gui/elements/GuiAdvancedTextField.java | 2 +- .../eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java | 1 - .../eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java | 3 ++- .../replaymod/gui/replayeditor/GuiReplayEditor.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java index 8b8f943e..fa67f116 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java @@ -116,7 +116,7 @@ public class GuiAdvancedTextField extends GuiTextField implements GuiElement, Gu @Override public boolean isFocused() { - return isEnabled ? super.isFocused() : false; + return isEnabled && super.isFocused(); } @Override diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java index 60bb487f..1c33f19c 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java @@ -21,7 +21,6 @@ public class GuiDropdown extends GuiAdvancedTextFie private final int maxDropoutHeight; private int selectionIndex = -1; private boolean open = false; - private Minecraft mc = Minecraft.getMinecraft(); private List selectionListeners = new ArrayList(); private int upperIndex = 0; diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java index 9554ee7f..677c2608 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java @@ -14,7 +14,6 @@ public class GuiEntryList extends GuiAdvancedTextFi public final static int elementHeight = 14; private int selectionIndex = -1; - private Minecraft mc = Minecraft.getMinecraft(); private int visibleElements; private int upperIndex = 0; @@ -161,10 +160,12 @@ public class GuiEntryList extends GuiAdvancedTextFi return elements; } + /* public void replaceElement(int index, T replace) { elements.set(index, replace); fireSelectionChangeEvent(); } + */ public int getEntryCount() { return elements.size(); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiReplayEditor.java b/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiReplayEditor.java index b0feb646..48182a15 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiReplayEditor.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiReplayEditor.java @@ -133,7 +133,7 @@ public class GuiReplayEditor extends GuiScreen { currentTab = StudioTab.TRIM; } else if(button.id == GuiConstants.REPLAY_EDITOR_CONNECT_TAB) { currentTab = StudioTab.CONNECT; - } else if(button.id == GuiConstants.REPLAY_EDITOR_MODIFY_TAB) { + //} else if(button.id == GuiConstants.REPLAY_EDITOR_MODIFY_TAB) { //currentTab = StudioTab.MODIFY; } else if(button.id == GuiConstants.REPLAY_EDITOR_SAVE_BUTTON) { File outputFile = getSelectedFile();