From 689b7c79da7957431bbf1658b19ba80c935b7ef2 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Tue, 2 Jun 2015 12:10:32 +0200 Subject: [PATCH] Prevents GuiRenderSettings from being opened if not enough keyframes present --- .../eu/crushedpixel/replaymod/gui/GuiRenderSettings.java | 7 ------- .../replaymod/gui/overlay/GuiReplayOverlay.java | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java index 7ecca47b..9f163c0b 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java @@ -1,7 +1,6 @@ package eu.crushedpixel.replaymod.gui; import eu.crushedpixel.replaymod.ReplayMod; -import eu.crushedpixel.replaymod.chat.ChatMessageHandler; import eu.crushedpixel.replaymod.gui.elements.GuiColorPicker; import eu.crushedpixel.replaymod.gui.elements.GuiDropdown; import eu.crushedpixel.replaymod.gui.elements.GuiNumberInput; @@ -50,12 +49,6 @@ public class GuiRenderSettings extends GuiScreen { private final Minecraft mc = Minecraft.getMinecraft(); public GuiRenderSettings() { - //if not enough keyframes, abort and leave chat message - if(ReplayHandler.getPosKeyframeCount() < 2 && ReplayHandler.getTimeKeyframeCount() < 2) { - ReplayMod.chatMessageHandler.addLocalizedChatMessage("replaymod.chat.notenoughkeyframes", ChatMessageHandler.ChatMessageType.WARNING); - mc.displayGuiScreen(new GuiMouseInput(ReplayMod.overlay)); - return; - } ReplayMod.replaySender.setReplaySpeed(0); } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java index fdb5053b..8d40bbef 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/overlay/GuiReplayOverlay.java @@ -1,6 +1,7 @@ package eu.crushedpixel.replaymod.gui.overlay; import eu.crushedpixel.replaymod.ReplayMod; +import eu.crushedpixel.replaymod.chat.ChatMessageHandler; import eu.crushedpixel.replaymod.entities.CameraEntity; import eu.crushedpixel.replaymod.gui.GuiMouseInput; import eu.crushedpixel.replaymod.gui.GuiRenderSettings; @@ -95,7 +96,12 @@ public class GuiReplayOverlay extends Gui { private final GuiElement buttonExport = texturedButton(BUTTON_EXPORT_X, BOTTOM_ROW, 40, 0, 20, new Runnable() { @Override public void run() { - mc.displayGuiScreen(new GuiRenderSettings()); + //if not enough keyframes, abort and leave chat message + if(ReplayHandler.getPosKeyframeCount() < 2 && ReplayHandler.getTimeKeyframeCount() < 2) { + ReplayMod.chatMessageHandler.addLocalizedChatMessage("replaymod.chat.notenoughkeyframes", ChatMessageHandler.ChatMessageType.WARNING); + } else { + mc.displayGuiScreen(new GuiRenderSettings()); + } } }, "replaymod.gui.ingame.menu.renderpath");