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

Fixed NPE in GuiEditKeyframe caused by super.onInit() call being too late... Johni0702, did you even test that Gui? | https://trello.com/c/PmcdLgzV/

Browse Source
This commit is contained in:
CrushedPixel
2015-07-20 01:16:09 +02:00
parent 4dccf5b3b6
commit 9b76bcadcb
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java
View File

@@ -153,8 +153,6 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
buttonList.add(leftButton); buttonList.add(leftButton);
buttonList.add(rightButton); buttonList.add(rightButton);
initialized = true;
} }
@Override @Override
@@ -230,6 +228,8 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
@Override @Override
public void initGui() { public void initGui() {
super.initGui();
if (!initialized) { if (!initialized) {
String name = keyframe.getValue().getName(); String name = keyframe.getValue().getName();
if (name == null) name = ""; if (name == null) name = "";
@@ -240,10 +240,10 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
inputs.addPart(markerNameInput); inputs.addPart(markerNameInput);
} }
super.initGui();
markerNameInput.xPosition = width/2 - 100; markerNameInput.xPosition = width/2 - 100;
markerNameInput.yPosition = height/2-10; markerNameInput.yPosition = height/2-10;
initialized = true;
} }
@Override @Override
@@ -269,6 +269,8 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
@Override @Override
public void initGui() { public void initGui() {
super.initGui();
if (!initialized) { if (!initialized) {
int time = keyframe.getValue().asInt(); int time = keyframe.getValue().asInt();
@@ -281,13 +283,13 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
inputs.addPart(kfMs); inputs.addPart(kfMs);
} }
super.initGui();
kfMin.xPosition = min.xPosition; kfMin.xPosition = min.xPosition;
kfSec.xPosition = sec.xPosition; kfSec.xPosition = sec.xPosition;
kfMs.xPosition = ms.xPosition; kfMs.xPosition = ms.xPosition;
kfMin.yPosition = kfSec.yPosition = kfMs.yPosition = min.yPosition - 10 - 20; kfMin.yPosition = kfSec.yPosition = kfMs.yPosition = min.yPosition - 10 - 20;
initialized = true;
} }
@Override @Override
@@ -328,6 +330,8 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
return; return;
} }
super.initGui();
if (!initialized) { if (!initialized) {
AdvancedPosition pos = keyframe.getValue(); AdvancedPosition pos = keyframe.getValue();
xCoord = new GuiDraggingNumberInput(fontRendererObj, 0, 0, 100, null, null, RoundUtils.round2Decimals(pos.getX()), true); xCoord = new GuiDraggingNumberInput(fontRendererObj, 0, 0, 100, null, null, RoundUtils.round2Decimals(pos.getX()), true);
@@ -341,8 +345,6 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
inputs.addPart(posInputs); inputs.addPart(posInputs);
} }
super.initGui();
int w = Math.max(fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.xpos")), int w = Math.max(fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.xpos")),
Math.max(fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.ypos")), Math.max(fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.ypos")),
fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.zpos")))); fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.zpos"))));
@@ -363,6 +365,8 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
i++; i++;
} }
} }
initialized = true;
} }
@Override @Override