From 0f024a9de98d7754c24ca35c1d6c715c74522138 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Mon, 13 Jul 2015 22:08:41 +0200 Subject: [PATCH] Cleaned up ReplayHandler by unifying selectedKeyframe and selectedMarkerKeyframe into selectedKeyframe, thus only being able to select one Keyframe at once --- .../replaymod/events/handlers/KeyInputHandler.java | 6 ++++++ .../crushedpixel/replaymod/gui/GuiEditKeyframe.java | 4 ++-- .../gui/elements/timelines/GuiKeyframeTimeline.java | 5 +++-- .../gui/elements/timelines/GuiMarkerTimeline.java | 8 ++++---- .../crushedpixel/replaymod/replay/ReplayHandler.java | 11 +++-------- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/events/handlers/KeyInputHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/handlers/KeyInputHandler.java index 863adb56..a7f6097a 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/handlers/KeyInputHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/handlers/KeyInputHandler.java @@ -155,6 +155,12 @@ public class KeyInputHandler { if(!ReplayHandler.isInReplay() || (mc.currentScreen != null && !(mc.currentScreen instanceof GuiMouseInput))) return; + if(kb.getKeyCode() == Keyboard.KEY_DELETE) { + if(ReplayHandler.getSelectedKeyframe() != null) { + + } + } + if(kb.getKeyDescription().equals("key.chat") && (kb.isPressed() || kb.getKeyCode() == keyCode)) { mc.displayGuiScreen(new GuiMouseInput(ReplayMod.overlay)); } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java index b0fd1ce1..9a071214 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java @@ -258,12 +258,12 @@ public class GuiEditKeyframe extends GuiScreen { if(keyframeType != KeyframeType.MARKER) { ReplayHandler.removeKeyframe(keyframe); ReplayHandler.addKeyframe(keyframeBackup); - ReplayHandler.selectKeyframe(keyframeBackup); } else { ReplayHandler.getMarkerKeyframes().remove(keyframe); ReplayHandler.getMarkerKeyframes().add(keyframeBackup); - ReplayHandler.selectMarkerKeyframe(keyframeBackup); } + + ReplayHandler.selectKeyframe(keyframeBackup); } else { keyframe.setRealTimestamp(TimestampUtils.calculateTimestamp(min.getIntValue(), sec.getIntValue(), ms.getIntValue())); if(keyframeType == KeyframeType.POSITION) { diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java index 409fafb3..41b93bcb 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java @@ -1,8 +1,9 @@ package eu.crushedpixel.replaymod.gui.elements.timelines; import eu.crushedpixel.replaymod.gui.GuiEditKeyframe; -import eu.crushedpixel.replaymod.holders.Keyframe; import eu.crushedpixel.replaymod.holders.AdvancedPosition; +import eu.crushedpixel.replaymod.holders.Keyframe; +import eu.crushedpixel.replaymod.holders.Marker; import eu.crushedpixel.replaymod.holders.TimestampValue; import eu.crushedpixel.replaymod.replay.ReplayHandler; import net.minecraft.client.Minecraft; @@ -195,7 +196,7 @@ public class GuiKeyframeTimeline extends GuiTimeline { drawKeyframe(kf, bodyWidth, leftTime, rightTime, segmentLength); } - if(ReplayHandler.getSelectedKeyframe() != null) { + if(ReplayHandler.getSelectedKeyframe() != null && !(ReplayHandler.getSelectedKeyframe().getValue() instanceof Marker)) { drawKeyframe(ReplayHandler.getSelectedKeyframe(), bodyWidth, leftTime, rightTime, segmentLength); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java index e20003bb..82ee531f 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiMarkerTimeline.java @@ -43,7 +43,7 @@ public class GuiMarkerTimeline extends GuiTimeline { closest = ReplayHandler.getMarkerKeyframes().getClosestKeyframeForTimestamp((int) time, tolerance); } - ReplayHandler.selectMarkerKeyframe(closest); + ReplayHandler.selectKeyframe(closest); if(closest == null) { //if no keyframe clicked, jump in time ReplayMod.overlay.performJump(getTimeAt(mouseX, mouseY)); @@ -126,12 +126,12 @@ public class GuiMarkerTimeline extends GuiTimeline { //Draw Keyframe logos for(Keyframe kf : ReplayHandler.getMarkerKeyframes()) { - if (kf != null && !kf.equals(ReplayHandler.getSelectedMarkerKeyframe())) + if (kf != null && !kf.equals(ReplayHandler.getSelectedKeyframe())) drawKeyframe(kf, bodyWidth, leftTime, rightTime, segmentLength); } - if(ReplayHandler.getSelectedMarkerKeyframe() != null) { - drawKeyframe(ReplayHandler.getSelectedMarkerKeyframe(), bodyWidth, leftTime, rightTime, segmentLength); + if(ReplayHandler.getSelectedKeyframe() != null && ReplayHandler.getSelectedKeyframe().getValue() instanceof Marker) { + drawKeyframe(ReplayHandler.getSelectedKeyframe(), bodyWidth, leftTime, rightTime, segmentLength); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java index c5e6e5a4..fde036bd 100755 --- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java @@ -47,7 +47,6 @@ public class ReplayHandler { private static int realTimelinePosition = 0; private static Keyframe selectedKeyframe; - private static Keyframe selectedMarkerKeyframe; private static boolean inPath = false; private static CameraEntity cameraEntity; @@ -228,7 +227,7 @@ public class ReplayHandler { } public static void toggleMarker() { - if(selectedMarkerKeyframe != null) markerKeyframes.remove(selectedMarkerKeyframe); + if(selectedKeyframe.getValue() instanceof Marker) markerKeyframes.remove(selectedKeyframe); else { AdvancedPosition pos = new AdvancedPosition(mc.getRenderViewEntity(), false); int timestamp = ReplayMod.replaySender.currentTimeStamp(); @@ -314,7 +313,7 @@ public class ReplayHandler { mc.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() { @Override public void confirmClicked(boolean result, int id) { - if (result) { + if(result) { resetKeyframes(resetMarkers); } @@ -341,11 +340,9 @@ public class ReplayHandler { } public static boolean isSelected(Keyframe kf) { - return kf == selectedKeyframe || kf == selectedMarkerKeyframe; + return kf == selectedKeyframe; } - public static void selectMarkerKeyframe(Keyframe kf) { selectedMarkerKeyframe = kf; } - public static boolean isInReplay() { return inReplay; } @@ -508,8 +505,6 @@ public class ReplayHandler { return selectedKeyframe; } - public static Keyframe getSelectedMarkerKeyframe() { return selectedMarkerKeyframe; } - public static int getRealTimelineCursor() { return realTimelinePosition; }