From d5007692dec75800a8c0ab2b4c618bfaff53c207 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Thu, 2 Jul 2015 13:24:50 +0200 Subject: [PATCH] Opens "Please wait" GUI Screen if Replay needs to be edited by ReplayFileAppender Added ReplayExitEvent --- src/main/java/eu/crushedpixel/replaymod/ReplayMod.java | 1 + .../eu/crushedpixel/replaymod/events/ReplayExitEvent.java | 6 ++++++ .../replaymod/events/handlers/GuiEventHandler.java | 3 ++- .../eu/crushedpixel/replaymod/replay/ReplayHandler.java | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/main/java/eu/crushedpixel/replaymod/events/ReplayExitEvent.java diff --git a/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java b/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java index ee8c4fb9..440e993e 100755 --- a/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java +++ b/src/main/java/eu/crushedpixel/replaymod/ReplayMod.java @@ -103,6 +103,7 @@ public class ReplayMod { ratedFileHandler = new RatedFileHandler(); replayFileAppender = new ReplayFileAppender(); + FMLCommonHandler.instance().bus().register(replayFileAppender); replayFileAppender.start(); } diff --git a/src/main/java/eu/crushedpixel/replaymod/events/ReplayExitEvent.java b/src/main/java/eu/crushedpixel/replaymod/events/ReplayExitEvent.java new file mode 100644 index 00000000..948c3ff2 --- /dev/null +++ b/src/main/java/eu/crushedpixel/replaymod/events/ReplayExitEvent.java @@ -0,0 +1,6 @@ +package eu.crushedpixel.replaymod.events; + +import net.minecraftforge.fml.common.eventhandler.Event; + +public class ReplayExitEvent extends Event { +} diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/GuiEventHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/GuiEventHandler.java index ebc29eae..437a6ef8 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/GuiEventHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/GuiEventHandler.java @@ -166,7 +166,6 @@ public class GuiEventHandler { if(ReplayHandler.isInReplay() && event.gui instanceof GuiIngameMenu && event.button.id == GuiConstants.EXIT_REPLAY_BUTTON) { if(ReplayHandler.isInPath()) ReplayProcess.stopReplayProcess(false); - ReplayHandler.endReplay(); event.button.enabled = false; @@ -179,6 +178,8 @@ public class GuiEventHandler { mc.displayGuiScreen(new GuiMainMenu()); ReplayGuiRegistry.show(); + + ReplayHandler.endReplay(); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java index 26d4205d..678b5b1e 100755 --- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java @@ -4,6 +4,7 @@ import com.mojang.authlib.GameProfile; import eu.crushedpixel.replaymod.ReplayMod; import eu.crushedpixel.replaymod.entities.CameraEntity; import eu.crushedpixel.replaymod.events.KeyframesModifyEvent; +import eu.crushedpixel.replaymod.events.ReplayExitEvent; import eu.crushedpixel.replaymod.holders.*; import eu.crushedpixel.replaymod.registry.PlayerHandler; import eu.crushedpixel.replaymod.settings.RenderOptions; @@ -601,6 +602,8 @@ public class ReplayHandler { resetKeyframes(true); inReplay = false; + + FMLCommonHandler.instance().bus().post(new ReplayExitEvent()); } public static void setInReplay(boolean inReplay1) {