diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java index 460a8bcc..f60e6ae8 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java @@ -99,13 +99,13 @@ public class GuiAssetManager extends GuiScreen { inputElements = new ComposedElement(assetNameInput, fileChooser); composedElement = new ComposedElement(assetGuiEntryList, addButton, removeButton, inputElements); - inputElements.setEnabled(false); + inputElements.setElementEnabled(false); assetGuiEntryList.addSelectionListener(new SelectionListener() { @Override public void onSelectionChanged(int selectionIndex) { currentAsset = assetGuiEntryList.getElement(selectionIndex); - inputElements.setEnabled(currentAsset != null); + inputElements.setElementEnabled(currentAsset != null); assetNameInput.setText(currentAsset != null ? currentAsset.getDisplayString() : ""); fileChooser.setAllowedExtensions(currentAsset != null ? AssetFileUtils.fileExtensionsForAssetClass(currentAsset.getClass()) : new String[0]); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java index 816894ae..17a49ed7 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java @@ -29,8 +29,6 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import org.lwjgl.util.Point; - public class GuiObjectManager extends GuiScreen { private boolean initialized = false; @@ -99,9 +97,9 @@ public class GuiObjectManager extends GuiScreen { } @Override - public void setEnabled(boolean enabled) { - selected.setEnabled(enabled); - normal.setEnabled(enabled); + public void setElementEnabled(boolean enabled) { + selected.setElementEnabled(enabled); + normal.setElementEnabled(enabled); } }; } @@ -183,7 +181,7 @@ public class GuiObjectManager extends GuiScreen { public void onSelectionChanged(int selectionIndex) { CustomImageObject selectedObject = objectList.getElement(selectionIndex); if(selectedObject != null) { - disableElements.setEnabled(true); + disableElements.setElementEnabled(true); nameInput.setText(selectedObject.getName()); @@ -214,7 +212,7 @@ public class GuiObjectManager extends GuiScreen { updateValuesForTransformation(objectKeyframeTimeline.getTransformations().getTransformationForTimestamp(objectKeyframeTimeline.cursorPosition)); } else { - disableElements.setEnabled(false); + disableElements.setElementEnabled(false); } } }); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java index 693e9b96..fe355aed 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java @@ -122,9 +122,9 @@ public class GuiRenderSettings extends GuiScreen { bitrateInput = new GuiNumberInputWithText(fontRendererObj, 0, 0, 50, 1D, null, 10000D, false, " kbps"); - xRes.setEnabled(false); - yRes.setEnabled(false); - bitrateInput.setEnabled(true); + xRes.setElementEnabled(false); + yRes.setElementEnabled(false); + bitrateInput.setElementEnabled(true); framerateSlider = new GuiVideoFramerateSlider(GuiConstants.RENDER_SETTINGS_FRAMERATE_SLIDER, 0, 0, ReplayMod.replaySettings.getVideoFramerate(), I18n.format("replaymod.gui.rendersettings.framerate")); @@ -398,8 +398,8 @@ public class GuiRenderSettings extends GuiScreen { ((GuiCheckBox)button).setIsChecked(!((GuiCheckBox)button).isChecked()); if(button.id == GuiConstants.RENDER_SETTINGS_RESOLUTION_CHECKBOX) { boolean enabled = customResolution.isChecked(); - xRes.setEnabled(enabled); - yRes.setEnabled(enabled); + xRes.setElementEnabled(enabled); + yRes.setElementEnabled(enabled); } else if(button.id == GuiConstants.RENDER_SETTINGS_OUTPUT_CHOOSER) { Point mouse = MouseUtils.getMousePos(); outputFileChooser.mouseClick(mc, mouse.getX(), mouse.getY(), 0); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySpeedSlider.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySpeedSlider.java index 7a535083..7abc9492 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySpeedSlider.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySpeedSlider.java @@ -204,7 +204,7 @@ public class GuiReplaySpeedSlider extends GuiButton implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } } \ No newline at end of file diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java index 7c3316a5..90376fcd 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java @@ -85,9 +85,9 @@ public class ComposedElement implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { for(GuiElement part : parts) { - part.setEnabled(enabled); + part.setElementEnabled(enabled); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/DelegatingElement.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/DelegatingElement.java index 368148f7..48a30468 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/DelegatingElement.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/DelegatingElement.java @@ -58,7 +58,7 @@ public abstract class DelegatingElement implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedButton.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedButton.java index f47f4c42..6ba881b9 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedButton.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedButton.java @@ -81,7 +81,7 @@ public class GuiAdvancedButton extends GuiButton implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedCheckBox.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedCheckBox.java index b4ecd8a8..dedeb090 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedCheckBox.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedCheckBox.java @@ -52,7 +52,7 @@ public class GuiAdvancedCheckBox extends GuiCheckBox implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } } 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 5eff73a0..8f06b990 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java @@ -19,7 +19,7 @@ public class GuiAdvancedTextField extends GuiTextField implements GuiElement { } @Override - public void setEnabled(boolean isEnabled) { + public void setElementEnabled(boolean isEnabled) { this.isEnabled = isEnabled; if(!isEnabled) setFocused(false); super.setEnabled(isEnabled); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiElement.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiElement.java index 8a298a87..172757c7 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiElement.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiElement.java @@ -17,6 +17,6 @@ public interface GuiElement { void tick(Minecraft mc); - void setEnabled(boolean enabled); + void setElementEnabled(boolean enabled); } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiScrollbar.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiScrollbar.java index a17ffd06..1a42da0a 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiScrollbar.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiScrollbar.java @@ -178,7 +178,7 @@ public class GuiScrollbar extends Gui implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiString.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiString.java index e0d331d6..445a3348 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiString.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiString.java @@ -75,7 +75,7 @@ public class GuiString extends Gui implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java index 98a7d83e..d902974a 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java @@ -626,7 +626,7 @@ public class GuiTextArea extends Gui implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiTimeline.java index b5dd4831..9c8f0604 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiTimeline.java @@ -288,7 +288,7 @@ public class GuiTimeline extends Gui implements GuiElement { } @Override - public void setEnabled(boolean enabled) { + public void setElementEnabled(boolean enabled) { this.enabled = enabled; } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java index e8d32142..b5ed34b6 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java @@ -440,7 +440,7 @@ public class GuiUploadFile extends GuiScreen implements ProgressUpdateListener { cancelUploadButton.enabled = true; backButton.enabled = false; category.enabled = false; - name.setEnabled(false); + name.setElementEnabled(false); description.enabled = false; messageTextField.setText(I18n.format("replaymod.gui.upload.uploading")); messageTextField.setTextColor(Color.WHITE.getRGB()); @@ -451,7 +451,7 @@ public class GuiUploadFile extends GuiScreen implements ProgressUpdateListener { cancelUploadButton.enabled = false; backButton.enabled = true; category.enabled = true; - name.setEnabled(true); + name.setElementEnabled(true); description.enabled = true; if(success) { messageTextField.setText(I18n.format("replaymod.gui.upload.success"));