DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed setEnabled() method in GuiElementInterface to setElementEnabled() to workaround this Forge Bug: http://www.minecraftforge.net/forum/index.php/topic,32063

Browse Source
This commit is contained in:
CrushedPixel
2015-07-14 00:25:17 +02:00
parent a58e06703c
commit 9cf3f426aa
15 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java
View File

@@ -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]);

12
src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java
View File

@@ -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);
}
}
});

10
src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java
View File

@@ -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);

2
src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySpeedSlider.java
View File

@@ -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;
}
}

4
src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java
View File

@@ -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);
}
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/DelegatingElement.java
View File

@@ -58,7 +58,7 @@ public abstract class DelegatingElement implements GuiElement {
}
@Override
public void setEnabled(boolean enabled) {
public void setElementEnabled(boolean enabled) {
this.enabled = enabled;
}
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedButton.java
View File

@@ -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;
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedCheckBox.java
View File

@@ -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;
}
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java
View File

@@ -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);

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiElement.java
View File

@@ -17,6 +17,6 @@ public interface GuiElement {
void tick(Minecraft mc);
void setEnabled(boolean enabled);
void setElementEnabled(boolean enabled);
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiScrollbar.java
View File

@@ -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;
}
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiString.java
View File

@@ -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;
}
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java
View File

@@ -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;
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiTimeline.java
View File

@@ -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;
}
}

4
src/main/java/eu/crushedpixel/replaymod/gui/online/GuiUploadFile.java
View File

@@ -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"));