From 8f82ca54346306d7600bfd45e1924388a41f09f3 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Fri, 17 Jul 2015 16:21:23 +0200 Subject: [PATCH] Implemented NoOverlay interface for some more GUIs --- .../java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java | 3 ++- .../java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java | 3 ++- .../java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java | 2 +- .../java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java index 371b5de7..bf661c0d 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiAssetManager.java @@ -6,6 +6,7 @@ import eu.crushedpixel.replaymod.assets.ReplayAsset; import eu.crushedpixel.replaymod.gui.elements.*; import eu.crushedpixel.replaymod.gui.elements.listeners.FileChooseListener; import eu.crushedpixel.replaymod.gui.elements.listeners.SelectionListener; +import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay; import eu.crushedpixel.replaymod.replay.ReplayHandler; import eu.crushedpixel.replaymod.utils.MouseUtils; import net.minecraft.client.gui.GuiScreen; @@ -18,7 +19,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; -public class GuiAssetManager extends GuiScreen { +public class GuiAssetManager extends GuiScreen implements GuiReplayOverlay.NoOverlay { private String screenTitle; diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java index bb09f5e4..790511b0 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java @@ -2,6 +2,7 @@ package eu.crushedpixel.replaymod.gui; import eu.crushedpixel.replaymod.ReplayMod; import eu.crushedpixel.replaymod.gui.elements.*; +import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay; import eu.crushedpixel.replaymod.holders.AdvancedPosition; import eu.crushedpixel.replaymod.holders.Keyframe; import eu.crushedpixel.replaymod.holders.Marker; @@ -22,7 +23,7 @@ import java.awt.*; import java.io.IOException; import java.util.List; -public class GuiEditKeyframe extends GuiScreen { +public class GuiEditKeyframe extends GuiScreen implements GuiReplayOverlay.NoOverlay { private enum KeyframeType { MARKER, POSITION, TIME, SPECTATOR; diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java index 10ab4caf..db433db9 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java @@ -30,7 +30,7 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -public class GuiObjectManager extends GuiScreen { +public class GuiObjectManager extends GuiScreen implements GuiReplayOverlay.NoOverlay { private boolean initialized = false; diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java index fcc28a41..a507fefa 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java @@ -3,6 +3,7 @@ package eu.crushedpixel.replaymod.gui; import eu.crushedpixel.replaymod.ReplayMod; import eu.crushedpixel.replaymod.gui.elements.*; import eu.crushedpixel.replaymod.gui.elements.listeners.SelectionListener; +import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay; import eu.crushedpixel.replaymod.holders.GuiEntryListEntry; import eu.crushedpixel.replaymod.replay.ReplayHandler; import eu.crushedpixel.replaymod.settings.EncodingPreset; @@ -32,7 +33,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -public class GuiRenderSettings extends GuiScreen { +public class GuiRenderSettings extends GuiScreen implements GuiReplayOverlay.NoOverlay { //for default file private static final String DATE_FORMAT = "yyyy_MM_dd_HH_mm_ss";