From 3319d4263c0d4792d97f3d02f5e20a5c722283d9 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 17 Dec 2018 15:01:01 +0100 Subject: [PATCH] Ensure replay has ended when MP GUI is opened (fixes #134) --- .../com/replaymod/replay/handler/GuiHandler.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/replaymod/replay/handler/GuiHandler.java b/src/main/java/com/replaymod/replay/handler/GuiHandler.java index 4a98b72b..fd1116b4 100644 --- a/src/main/java/com/replaymod/replay/handler/GuiHandler.java +++ b/src/main/java/com/replaymod/replay/handler/GuiHandler.java @@ -6,6 +6,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiIngameMenu; import net.minecraft.client.gui.GuiMainMenu; +import net.minecraft.client.gui.GuiMultiplayer; import net.minecraft.client.resources.I18n; import net.minecraftforge.client.event.GuiScreenEvent; @@ -102,8 +103,8 @@ public class GuiHandler { } @SubscribeEvent - public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) { - if (!(getGui(event) instanceof GuiMainMenu)) { + public void ensureReplayStopped(GuiScreenEvent.InitGuiEvent event) { + if (!(getGui(event) instanceof GuiMainMenu || getGui(event) instanceof GuiMultiplayer)) { return; } @@ -120,7 +121,14 @@ public class GuiHandler { } } } + } + + @SubscribeEvent + public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) { + if (!(getGui(event) instanceof GuiMainMenu)) { + return; + } GuiButton button = new GuiButton(BUTTON_REPLAY_VIEWER, getGui(event).width / 2 - 100, getGui(event).height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayviewer")); button.width = button.width / 2 - 2;