Add guis for editing keyframes

src/main/java/com/replaymod/simplepathing/gui/GuiEditKeyframe.java

@@ -0,0 +1,213 @@
+package com.replaymod.simplepathing.gui;
+
+import com.replaymod.pathing.properties.CameraProperties;
+import com.replaymod.pathing.properties.TimestampProperty;
+import com.replaymod.replay.ReplayModReplay;
+import com.replaymod.replaystudio.pathing.change.Change;
+import com.replaymod.replaystudio.pathing.change.CombinedChange;
+import com.replaymod.replaystudio.pathing.change.UpdateKeyframeProperties;
+import com.replaymod.replaystudio.pathing.path.Keyframe;
+import com.replaymod.replaystudio.pathing.path.Path;
+import de.johni0702.minecraft.gui.container.GuiPanel;
+import de.johni0702.minecraft.gui.element.GuiButton;
+import de.johni0702.minecraft.gui.element.GuiLabel;
+import de.johni0702.minecraft.gui.element.GuiNumberField;
+import de.johni0702.minecraft.gui.element.IGuiLabel;
+import de.johni0702.minecraft.gui.layout.GridLayout;
+import de.johni0702.minecraft.gui.layout.HorizontalLayout;
+import de.johni0702.minecraft.gui.layout.VerticalLayout;
+import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
+import de.johni0702.minecraft.gui.utils.Colors;
+import org.apache.commons.lang3.tuple.Triple;
+
+import static de.johni0702.minecraft.gui.utils.Utils.link;
+
+public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends AbstractGuiPopup<T> {
+    private static GuiNumberField newGuiNumberField() {
+        return new GuiNumberField().setPrecision(0).setValidateOnFocusChange(true);
+    }
+
+    protected final Keyframe keyframe;
+    protected final Path path;
+
+    public final GuiLabel title = new GuiLabel();
+
+    public final GuiPanel inputs = new GuiPanel();
+
+    public final GuiNumberField timeMinField = newGuiNumberField().setSize(30, 20).setMinValue(0);
+    public final GuiNumberField timeSecField = newGuiNumberField().setSize(20, 20).setMinValue(0).setMaxValue(59);
+    public final GuiNumberField timeMSecField = newGuiNumberField().setSize(30, 20).setMinValue(0).setMaxValue(999);
+
+    public final GuiPanel timePanel = new GuiPanel()
+            .setLayout(new HorizontalLayout(HorizontalLayout.Alignment.RIGHT).setSpacing(3))
+            .addElements(new HorizontalLayout.Data(0.5),
+                    new GuiLabel().setI18nText("replaymod.gui.editkeyframe.timelineposition"),
+                    timeMinField, new GuiLabel().setI18nText("replaymod.gui.minutes"),
+                    timeSecField, new GuiLabel().setI18nText("replaymod.gui.seconds"),
+                    timeMSecField, new GuiLabel().setI18nText("replaymod.gui.milliseconds"));
+
+    public final GuiButton saveButton = new GuiButton().setSize(150, 20).setI18nLabel("replaymod.gui.save");
+
+    public final GuiButton cancelButton = new GuiButton()
+            .onClick(this::close).setSize(150, 20).setI18nLabel("replaymod.gui.cancel");
+
+    public final GuiPanel buttons = new GuiPanel()
+            .setLayout(new HorizontalLayout(HorizontalLayout.Alignment.CENTER).setSpacing(7))
+            .addElements(new HorizontalLayout.Data(0.5), saveButton, cancelButton);
+
+    {
+        setBackgroundColor(Colors.DARK_TRANSPARENT);
+
+        popup.setLayout(new VerticalLayout().setSpacing(10))
+                .addElements(new VerticalLayout.Data(0.5), title, inputs, timePanel, buttons);
+    }
+
+    public GuiEditKeyframe(GuiPathing gui, Path path, Keyframe keyframe, String type) {
+        super(ReplayModReplay.instance.getReplayHandler().getOverlay());
+        this.keyframe = keyframe;
+        this.path = path;
+
+        long time = keyframe.getTime();
+        timeMinField.setValue(time / 1000 / 60);
+        timeSecField.setValue(time / 1000 % 60);
+        timeMSecField.setValue(time % 1000);
+
+        title.setI18nText("replaymod.gui.editkeyframe.title." + type);
+        saveButton.onClick(() -> {
+            Change change = save();
+            long newTime = (timeMinField.getInteger() * 60 + timeSecField.getInteger()) * 1000 + timeMSecField.getInteger();
+            if (newTime != keyframe.getTime()) {
+                change = CombinedChange.createFromApplied(change, gui.moveKeyframe(path, keyframe, newTime));
+            }
+            path.getTimeline().pushChange(change);
+            close();
+        });
+    }
+
+    @Override
+    public void open() {
+        super.open();
+    }
+
+    protected abstract Change save();
+
+    public static class Spectator extends GuiEditKeyframe<Spectator> {
+        public Spectator(GuiPathing gui, Path path, Keyframe keyframe) {
+            super(gui, path, keyframe, "spec");
+
+            link(timeMinField, timeSecField, timeMSecField);
+
+            popup.forEach(IGuiLabel.class).setColor(Colors.BLACK);
+        }
+
+        @Override
+        protected Change save() {
+            return CombinedChange.createFromApplied();
+        }
+
+        @Override
+        protected Spectator getThis() {
+            return this;
+        }
+    }
+
+    public static class Time extends GuiEditKeyframe<Time> {
+        public final GuiNumberField timestampMinField = newGuiNumberField().setSize(30, 20).setMinValue(0);
+        public final GuiNumberField timestampSecField = newGuiNumberField().setSize(20, 20).setMinValue(0).setMaxValue(59);
+        public final GuiNumberField timestampMSecField = newGuiNumberField().setSize(30, 20).setMinValue(0).setMaxValue(999);
+
+        {
+            inputs.setLayout(new HorizontalLayout(HorizontalLayout.Alignment.RIGHT).setSpacing(3))
+                    .addElements(new HorizontalLayout.Data(0.5),
+                            new GuiLabel().setI18nText("replaymod.gui.editkeyframe.timestamp"),
+                            timestampMinField, new GuiLabel().setI18nText("replaymod.gui.minutes"),
+                            timestampSecField, new GuiLabel().setI18nText("replaymod.gui.seconds"),
+                            timestampMSecField, new GuiLabel().setI18nText("replaymod.gui.milliseconds"));
+        }
+
+        public Time(GuiPathing gui, Path path, Keyframe keyframe) {
+            super(gui, path, keyframe, "time");
+
+            keyframe.getValue(TimestampProperty.PROPERTY).ifPresent(time -> {
+                timestampMinField.setValue(time / 1000 / 60);
+                timestampSecField.setValue(time / 1000 % 60);
+                timestampMSecField.setValue(time % 1000);
+            });
+
+            link(timestampMinField, timestampSecField, timestampMSecField, timeMinField, timeSecField, timeMSecField);
+
+            popup.forEach(IGuiLabel.class).setColor(Colors.BLACK);
+        }
+
+        @Override
+        protected Change save() {
+            int time = (timestampMinField.getInteger() * 60 + timestampSecField.getInteger()) * 1000
+                    + timestampMSecField.getInteger();
+            Change change = UpdateKeyframeProperties.create(path, keyframe)
+                    .setValue(TimestampProperty.PROPERTY, time)
+                    .done();
+            change.apply(path.getTimeline());
+            return change;
+        }
+
+        @Override
+        protected Time getThis() {
+            return this;
+        }
+    }
+
+    public static class Position extends GuiEditKeyframe<Position> {
+        public final GuiNumberField xField = newGuiNumberField().setSize(150, 20).setPrecision(10);
+        public final GuiNumberField yField = newGuiNumberField().setSize(150, 20).setPrecision(10);
+        public final GuiNumberField zField = newGuiNumberField().setSize(150, 20).setPrecision(10);
+
+        public final GuiNumberField yawField = newGuiNumberField().setSize(150, 20).setPrecision(5);
+        public final GuiNumberField pitchField = newGuiNumberField().setSize(150, 20).setPrecision(5);
+        public final GuiNumberField rollField = newGuiNumberField().setSize(150, 20).setPrecision(5);
+
+        {
+            inputs.setLayout(new GridLayout().setCellsEqualSize(false).setColumns(4).setSpacingX(3).setSpacingY(5))
+                    .addElements(new GridLayout.Data(1, 0.5),
+                            new GuiLabel().setI18nText("replaymod.gui.editkeyframe.xpos"), xField,
+                            new GuiLabel().setI18nText("replaymod.gui.editkeyframe.camyaw"), yawField,
+                            new GuiLabel().setI18nText("replaymod.gui.editkeyframe.ypos"), yField,
+                            new GuiLabel().setI18nText("replaymod.gui.editkeyframe.campitch"), pitchField,
+                            new GuiLabel().setI18nText("replaymod.gui.editkeyframe.zpos"), zField,
+                            new GuiLabel().setI18nText("replaymod.gui.editkeyframe.camroll"), rollField);
+        }
+
+        public Position(GuiPathing gui, Path path, Keyframe keyframe) {
+            super(gui, path, keyframe, "pos");
+
+            keyframe.getValue(CameraProperties.POSITION).ifPresent(pos -> {
+                xField.setValue(pos.getLeft());
+                yField.setValue(pos.getMiddle());
+                zField.setValue(pos.getRight());
+            });
+            keyframe.getValue(CameraProperties.ROTATION).ifPresent(rot -> {
+                yawField.setValue(rot.getLeft());
+                pitchField.setValue(rot.getMiddle());
+                rollField.setValue(rot.getRight());
+            });
+
+            link(xField, yField, zField, yawField, pitchField, rollField, timeMinField, timeSecField, timeMSecField);
+
+            popup.forEach(IGuiLabel.class).setColor(Colors.BLACK);
+        }
+
+        @Override
+        protected Change save() {
+            Change change = UpdateKeyframeProperties.create(path, keyframe)
+                    .setValue(CameraProperties.POSITION, Triple.of(xField.getDouble(), yField.getDouble(), zField.getDouble()))
+                    .setValue(CameraProperties.ROTATION, Triple.of(yawField.getFloat(), pitchField.getFloat(), rollField.getFloat()))
+                    .done();
+            change.apply(path.getTimeline());
+            return change;
+        }
+
+        @Override
+        protected Position getThis() {
+            return this;
+        }
+    }
+}

src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java

@@ -189,7 +189,8 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
                     // Clicked the same keyframe again, potentially a double click
                     if (now - lastClickedTime < DOUBLE_CLICK_INTERVAL) {
                         // Yup, double click, open the edit keyframe gui
-                        gui.openEditKeyframePopup(keyframe);
+                        Path path = gui.getMod().getCurrentTimeline().getPaths().get(pathKeyframePair.getLeft());
+                        gui.openEditKeyframePopup(path, keyframe);
                         return true;
                     }
                 }
@@ -273,7 +274,7 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
 
             // Move keyframe to new position and
             // store change for later undoing / pushing to history
-            draggingChange = gui.moveKeyframe(lastClickedPath, lastClickedKeyframe, newTime);
+            draggingChange = gui.moveKeyframe(path, lastClickedKeyframe, newTime);
 
             // Selected keyframe has been replaced
             selectKeyframe(lastClickedPath, path.getKeyframe(newTime));

src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java

@@ -510,9 +510,8 @@ public class GuiPathing {
         return CombinedChange.create(changes.toArray(new Change[changes.size()]));
     }
 
-    public Change moveKeyframe(int pathId, Keyframe keyframe, long newTime) {
+    public Change moveKeyframe(Path path, Keyframe keyframe, long newTime) {
         Timeline timeline = mod.getCurrentTimeline();
-        Path path = timeline.getPaths().get(pathId);
         // Interpolator might be required later (only if path is the time path)
         Optional<Interpolator> interpolator =
                 path.getSegments().stream().findFirst().map(PathSegment::getInterpolator);
@@ -536,7 +535,7 @@ public class GuiPathing {
 
         // Finally set the interpolators
         Change interpolatorChange;
-        if (pathId == GuiPathing.POSITION_PATH) {
+        if (path.getTimeline().getPaths().indexOf(path) == GuiPathing.POSITION_PATH) {
             // Position / Spectator keyframes need special handling
             interpolatorChange = updateInterpolators();
         } else {
@@ -568,8 +567,14 @@ public class GuiPathing {
         return entityTracker;
     }
 
-    public void openEditKeyframePopup(Keyframe keyframe) {
+    public void openEditKeyframePopup(Path path, Keyframe keyframe) {
-
+        if (keyframe.getProperties().contains(SpectatorProperty.PROPERTY)) {
+            new GuiEditKeyframe.Spectator(this, path, keyframe).open();
+        } else if (keyframe.getProperties().contains(CameraProperties.POSITION)) {
+            new GuiEditKeyframe.Position(this, path, keyframe).open();
+        } else {
+            new GuiEditKeyframe.Time(this, path, keyframe).open();
+        }
     }
 
     private class LoadEntityTrackerPopup extends AbstractGuiPopup<LoadEntityTrackerPopup> {