Renamed setEnabled() method in GuiElementInterface to setElementEnabled() to workaround this Forge Bug: http://www.minecraftforge.net/forum/index.php/topic,32063
This commit is contained in:
@@ -99,13 +99,13 @@ public class GuiAssetManager extends GuiScreen {
|
|||||||
inputElements = new ComposedElement(assetNameInput, fileChooser);
|
inputElements = new ComposedElement(assetNameInput, fileChooser);
|
||||||
composedElement = new ComposedElement(assetGuiEntryList, addButton, removeButton, inputElements);
|
composedElement = new ComposedElement(assetGuiEntryList, addButton, removeButton, inputElements);
|
||||||
|
|
||||||
inputElements.setEnabled(false);
|
inputElements.setElementEnabled(false);
|
||||||
|
|
||||||
assetGuiEntryList.addSelectionListener(new SelectionListener() {
|
assetGuiEntryList.addSelectionListener(new SelectionListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onSelectionChanged(int selectionIndex) {
|
public void onSelectionChanged(int selectionIndex) {
|
||||||
currentAsset = assetGuiEntryList.getElement(selectionIndex);
|
currentAsset = assetGuiEntryList.getElement(selectionIndex);
|
||||||
inputElements.setEnabled(currentAsset != null);
|
inputElements.setElementEnabled(currentAsset != null);
|
||||||
|
|
||||||
assetNameInput.setText(currentAsset != null ? currentAsset.getDisplayString() : "");
|
assetNameInput.setText(currentAsset != null ? currentAsset.getDisplayString() : "");
|
||||||
fileChooser.setAllowedExtensions(currentAsset != null ? AssetFileUtils.fileExtensionsForAssetClass(currentAsset.getClass()) : new String[0]);
|
fileChooser.setAllowedExtensions(currentAsset != null ? AssetFileUtils.fileExtensionsForAssetClass(currentAsset.getClass()) : new String[0]);
|
||||||
|
|||||||
@@ -29,8 +29,6 @@ import java.io.IOException;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import org.lwjgl.util.Point;
|
|
||||||
|
|
||||||
public class GuiObjectManager extends GuiScreen {
|
public class GuiObjectManager extends GuiScreen {
|
||||||
|
|
||||||
private boolean initialized = false;
|
private boolean initialized = false;
|
||||||
@@ -99,9 +97,9 @@ public class GuiObjectManager extends GuiScreen {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
selected.setEnabled(enabled);
|
selected.setElementEnabled(enabled);
|
||||||
normal.setEnabled(enabled);
|
normal.setElementEnabled(enabled);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -183,7 +181,7 @@ public class GuiObjectManager extends GuiScreen {
|
|||||||
public void onSelectionChanged(int selectionIndex) {
|
public void onSelectionChanged(int selectionIndex) {
|
||||||
CustomImageObject selectedObject = objectList.getElement(selectionIndex);
|
CustomImageObject selectedObject = objectList.getElement(selectionIndex);
|
||||||
if(selectedObject != null) {
|
if(selectedObject != null) {
|
||||||
disableElements.setEnabled(true);
|
disableElements.setElementEnabled(true);
|
||||||
|
|
||||||
nameInput.setText(selectedObject.getName());
|
nameInput.setText(selectedObject.getName());
|
||||||
|
|
||||||
@@ -214,7 +212,7 @@ public class GuiObjectManager extends GuiScreen {
|
|||||||
|
|
||||||
updateValuesForTransformation(objectKeyframeTimeline.getTransformations().getTransformationForTimestamp(objectKeyframeTimeline.cursorPosition));
|
updateValuesForTransformation(objectKeyframeTimeline.getTransformations().getTransformationForTimestamp(objectKeyframeTimeline.cursorPosition));
|
||||||
} else {
|
} else {
|
||||||
disableElements.setEnabled(false);
|
disableElements.setElementEnabled(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -122,9 +122,9 @@ public class GuiRenderSettings extends GuiScreen {
|
|||||||
|
|
||||||
bitrateInput = new GuiNumberInputWithText(fontRendererObj, 0, 0, 50, 1D, null, 10000D, false, " kbps");
|
bitrateInput = new GuiNumberInputWithText(fontRendererObj, 0, 0, 50, 1D, null, 10000D, false, " kbps");
|
||||||
|
|
||||||
xRes.setEnabled(false);
|
xRes.setElementEnabled(false);
|
||||||
yRes.setEnabled(false);
|
yRes.setElementEnabled(false);
|
||||||
bitrateInput.setEnabled(true);
|
bitrateInput.setElementEnabled(true);
|
||||||
|
|
||||||
framerateSlider = new GuiVideoFramerateSlider(GuiConstants.RENDER_SETTINGS_FRAMERATE_SLIDER, 0, 0, ReplayMod.replaySettings.getVideoFramerate(),
|
framerateSlider = new GuiVideoFramerateSlider(GuiConstants.RENDER_SETTINGS_FRAMERATE_SLIDER, 0, 0, ReplayMod.replaySettings.getVideoFramerate(),
|
||||||
I18n.format("replaymod.gui.rendersettings.framerate"));
|
I18n.format("replaymod.gui.rendersettings.framerate"));
|
||||||
@@ -398,8 +398,8 @@ public class GuiRenderSettings extends GuiScreen {
|
|||||||
((GuiCheckBox)button).setIsChecked(!((GuiCheckBox)button).isChecked());
|
((GuiCheckBox)button).setIsChecked(!((GuiCheckBox)button).isChecked());
|
||||||
if(button.id == GuiConstants.RENDER_SETTINGS_RESOLUTION_CHECKBOX) {
|
if(button.id == GuiConstants.RENDER_SETTINGS_RESOLUTION_CHECKBOX) {
|
||||||
boolean enabled = customResolution.isChecked();
|
boolean enabled = customResolution.isChecked();
|
||||||
xRes.setEnabled(enabled);
|
xRes.setElementEnabled(enabled);
|
||||||
yRes.setEnabled(enabled);
|
yRes.setElementEnabled(enabled);
|
||||||
} else if(button.id == GuiConstants.RENDER_SETTINGS_OUTPUT_CHOOSER) {
|
} else if(button.id == GuiConstants.RENDER_SETTINGS_OUTPUT_CHOOSER) {
|
||||||
Point mouse = MouseUtils.getMousePos();
|
Point mouse = MouseUtils.getMousePos();
|
||||||
outputFileChooser.mouseClick(mc, mouse.getX(), mouse.getY(), 0);
|
outputFileChooser.mouseClick(mc, mouse.getX(), mouse.getY(), 0);
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ public class GuiReplaySpeedSlider extends GuiButton implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,9 +85,9 @@ public class ComposedElement implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
for(GuiElement part : parts) {
|
for(GuiElement part : parts) {
|
||||||
part.setEnabled(enabled);
|
part.setElementEnabled(enabled);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public abstract class DelegatingElement implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ public class GuiAdvancedButton extends GuiButton implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class GuiAdvancedCheckBox extends GuiCheckBox implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public class GuiAdvancedTextField extends GuiTextField implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean isEnabled) {
|
public void setElementEnabled(boolean isEnabled) {
|
||||||
this.isEnabled = isEnabled;
|
this.isEnabled = isEnabled;
|
||||||
if(!isEnabled) setFocused(false);
|
if(!isEnabled) setFocused(false);
|
||||||
super.setEnabled(isEnabled);
|
super.setEnabled(isEnabled);
|
||||||
|
|||||||
@@ -17,6 +17,6 @@ public interface GuiElement {
|
|||||||
|
|
||||||
void tick(Minecraft mc);
|
void tick(Minecraft mc);
|
||||||
|
|
||||||
void setEnabled(boolean enabled);
|
void setElementEnabled(boolean enabled);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ public class GuiScrollbar extends Gui implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ public class GuiString extends Gui implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -626,7 +626,7 @@ public class GuiTextArea extends Gui implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -288,7 +288,7 @@ public class GuiTimeline extends Gui implements GuiElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setEnabled(boolean enabled) {
|
public void setElementEnabled(boolean enabled) {
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -440,7 +440,7 @@ public class GuiUploadFile extends GuiScreen implements ProgressUpdateListener {
|
|||||||
cancelUploadButton.enabled = true;
|
cancelUploadButton.enabled = true;
|
||||||
backButton.enabled = false;
|
backButton.enabled = false;
|
||||||
category.enabled = false;
|
category.enabled = false;
|
||||||
name.setEnabled(false);
|
name.setElementEnabled(false);
|
||||||
description.enabled = false;
|
description.enabled = false;
|
||||||
messageTextField.setText(I18n.format("replaymod.gui.upload.uploading"));
|
messageTextField.setText(I18n.format("replaymod.gui.upload.uploading"));
|
||||||
messageTextField.setTextColor(Color.WHITE.getRGB());
|
messageTextField.setTextColor(Color.WHITE.getRGB());
|
||||||
@@ -451,7 +451,7 @@ public class GuiUploadFile extends GuiScreen implements ProgressUpdateListener {
|
|||||||
cancelUploadButton.enabled = false;
|
cancelUploadButton.enabled = false;
|
||||||
backButton.enabled = true;
|
backButton.enabled = true;
|
||||||
category.enabled = true;
|
category.enabled = true;
|
||||||
name.setEnabled(true);
|
name.setElementEnabled(true);
|
||||||
description.enabled = true;
|
description.enabled = true;
|
||||||
if(success) {
|
if(success) {
|
||||||
messageTextField.setText(I18n.format("replaymod.gui.upload.success"));
|
messageTextField.setText(I18n.format("replaymod.gui.upload.success"));
|
||||||
|
|||||||
Reference in New Issue
Block a user