Merge branch '1.10.2' into 1.11

372206f Merge branch '1.9.4' into 1.10.2
4a1ccea Merge branch '1.8' into 1.9.4
fb39a06 Add drone ci config
030c71c Automatically disable and re-enable Optifine's Fast Render setting before rendering a video
1fef12d Include FML handshake in recording
e86c66d Move README.md, LICENSE.md and user docs from master branch to 1.8

.drone.yml

@@ -3,10 +3,8 @@ pipeline:
     image: plugins/git
     tags: true
   build:
-    image: maven:3.3.9-jdk-8
+    image: openjdk:8
     commands:
-      - curl --fail --create-dirs -o $HOME/.gradle/init.d/mirror.gradle https://maven.johni0702.de/config/gradle
-      - curl --fail --create-dirs -o $HOME/.m2/settings.xml https://maven.johni0702.de/config/maven
       - JAVA_OPTS=-Xmx1516M ./gradlew setupDecompWorkspace
       - ./gradlew :build
   archive:

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICBidWlsZDoKICAgIGltYWdlOiBtYXZlbjozLjMuOS1qZGstOAogICAgY29tbWFuZHM6CiAgICAgIC0gY3VybCAtLWZhaWwgLS1jcmVhdGUtZGlycyAtbyAkSE9NRS8uZ3JhZGxlL2luaXQuZC9taXJyb3IuZ3JhZGxlIGh0dHBzOi8vbWF2ZW4uam9obmkwNzAyLmRlL2NvbmZpZy9ncmFkbGUKICAgICAgLSBjdXJsIC0tZmFpbCAtLWNyZWF0ZS1kaXJzIC1vICRIT01FLy5tMi9zZXR0aW5ncy54bWwgaHR0cHM6Ly9tYXZlbi5qb2huaTA3MDIuZGUvY29uZmlnL21hdmVuCiAgICAgIC0gSkFWQV9PUFRTPS1YbXgxNTE2TSAuL2dyYWRsZXcgc2V0dXBEZWNvbXBXb3Jrc3BhY2UKICAgICAgLSAuL2dyYWRsZXcgOmJ1aWxkCiAgYXJjaGl2ZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBhY2w6IHB1YmxpYy1yZWFkCiAgICByZWdpb246ICJ1cy1lYXN0LTEiCiAgICBidWNrZXQ6ICJyZXBsYXltb2QiCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzb3VyY2U6IGJ1aWxkL2xpYnMvKgogICAgc3RyaXBfcHJlZml4OiBidWlsZC9saWJzLwogICAgdGFyZ2V0OiAvCg.nzPW0_TpMIjnFZZ5Ci439QDKlaDo1a3DCH-VCYUgpx8
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICBidWlsZDoKICAgIGltYWdlOiBvcGVuamRrOjgKICAgIGNvbW1hbmRzOgogICAgICAtIEpBVkFfT1BUUz0tWG14MTUxNk0gLi9ncmFkbGV3IHNldHVwRGVjb21wV29ya3NwYWNlCiAgICAgIC0gLi9ncmFkbGV3IDpidWlsZAogIGFyY2hpdmU6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgYWNsOiBwdWJsaWMtcmVhZAogICAgcmVnaW9uOiAidXMtZWFzdC0xIgogICAgYnVja2V0OiAicmVwbGF5bW9kIgogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc291cmNlOiBidWlsZC9saWJzLyoKICAgIHN0cmlwX3ByZWZpeDogYnVpbGQvbGlicy8KICAgIHRhcmdldDogLwo.Q_jQxd73CuNh8ZTGTw31yMmBIzWprIagmaddFYovDrc

build.gradle

@@ -36,11 +36,9 @@ archivesBaseName = "replaymod"
 
 minecraft {
     coreMod = 'com.replaymod.core.LoadingPlugin'
-    version = '1.10.2-12.18.2.2099'
+    version = '1.11-13.19.1.2188'
     runDir = "eclipse"
-    mappings = "snapshot_20160518"
-    replace '@MOD_VERSION@', project.version
-    replace '@MC_VERSION@', project.minecraft.version
+    mappings = "snapshot_20161111"
 }
 
 repositories {
@@ -61,7 +59,7 @@ configurations {
 dependencies {
     compile 'org.projectlombok:lombok:1.16.4'
 
-    compile 'org.spongepowered:mixin:0.6.4-SNAPSHOT'
+    compile 'org.spongepowered:mixin:0.5.9-SNAPSHOT'
     shade 'com.googlecode.mp4parser:isoparser:1.1.7'
     shade 'org.apache.commons:commons-exec:1.3'
     shade 'com.google.apis:google-api-services-youtube:v3-rev178-1.22.0'

docs/content.md

@@ -2,14 +2,7 @@
 ## Installing the Replay Mod [replaymod]
 The **ReplayMod** requires **Minecraft Forge** to be installed.
 
-Depending on your **Replay Mod** version we recommend the following **Forge** versions:
-
-- Replay Mod 2.0.0 or later for Minecraft 1.11: Forge [1.11-13.19.1.2189](https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.11.html)
-- Replay Mod 2.0.0 or later for Minecraft 1.10.2: Forge [1.10.2-12.18.2.2099](https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.10.2.html)
-- Replay Mod 2.0.0 or later for Minecraft 1.9.4: Forge [1.9.4-12.17.0.1976](https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.9.4.html)
-- Replay Mod 2.0.0 or later for Minecraft 1.8: Forge [1.8-11.14.4.1563](https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.html)
-- Replay Mod 1.0.8 or older for Minecraft 1.8: Forge [1.8-11.14.3.1450](http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.html)
-
+For the use with the **Replay Mod**, we recommend using Forge Version `1.8-11.14.3.1450`, which can be downloaded [here](http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.html)
 Other Forge Versions might, but don't necessarily work.
 
 If you don't know how to install Forge, follow [this tutorial](https://www.youtube.com/watch?v=4i7-RystzC4).
@@ -32,10 +25,6 @@ Next, download this **Batch Script** to quickly install FFmpeg: <https://replaym
 Put the downloaded script into the folder where you extracted FFmpeg and run itt by double-clicking it.
 If you see a success message in the console, you've sucessfully installed **FFmpeg**!
 
-Alternatively, starting with ReplayMod 2.0.0-b5, you can also extract the downloaded `.7z` file into a `ffmpeg` folder
-(you have to create it, it doesn't exist by default) in your `.minecraft` folder. No need to run any **Batch Script**.
-The FFmpeg executable should end up at `.minecraft/ffmpeg/bin/ffmpeg.exe`.
-
 ### Mac OSX [mac]
 On OSX, you can install **FFmpeg** with **[Homebrew](http://brew.sh/)** using `brew install ffmpeg`.
 
@@ -48,35 +37,26 @@ If in doubt, consult the documentation of your distribution.
 ## Compatibility with other Mods [compatibility]
 ### General information [general]
 In General, the Replay Mod _should_ be compatible with most Forge Mods.
+However, due to the way that recording works, many Mods that add new Blocks, Mobs or Game Mechanics are not supported.  
+Mods that simply modify the client (like the [PixelCam Mod](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2327429-pixelcam-camera-studio-for-minecraft-1-8)
+or the [CommandGroups Mod](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2443430-command-groups-mod-order-label-and-color-command)) usually work.
+
+### Optifine [optifine]
+The **Replay Mod** is compatible with `Optifine 1.8.0 HD U D5`, which can be downloaded at <https://optifine.net/downloads>.  
+Other Optifine versions for Minecraft 1.8.0 might, but don't have to be compatible as well.
+
+> **Warning:** If you have Optifine installed, you **can not render videos** from within the Replay Mod.  
+This might change in future Replay Mod versions.
 
 ### Shaders Mod [shaders]
-[Karyonix' Shaders Mod](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1286604-shaders-mod-updated-by-karyonix)
-is no longer compatible with Minecraft Forge starting with 1.9.4. As such it is not compatible with the Replay Mod either.
-Please use [Optifine](https://optifine.net/) instead.
-
-### Custom Main Menu [custom-main-menu]
-The [Custom Main Menu](https://mods.curse.com/mc-mods/minecraft/226406-custom-main-menu) mod is often used in mod packs to customize their Main Menu with a button layout fitting the background image, links to their website / bug tracker and similar.
-If you are familiar with it, the button ids for the Replay Mod are: **17890234** (text: `replaymod.gui.replayviewer`), **17890237** (text: `replaymod.gui.replayeditor`) and **17890236** (text: `replaymod.gui.replaycenter`)
-
-Due to the nature of this Custom Main Menu mod, buttons added to the Main Menu by 3rd party mods like the **Replay Mod** will not show up by default.  
-Thus, to access the Replay Viewer/Editor/Center, you need to manually configure the position for those buttons.  
-To do so, you need to modify the Custom Main Menu configuration file.
-Usually, you can find it at `.minecraft/config/CustomMainMenu/mainmenu.json` (if you're using a mod pack launcher, it normally has its own .minecraft folder).  
-For an explanation of this config file, have a look at Custom Main Menu's page.
-
-You can find a list of already modified config files [here](https://gist.github.com/Johni0702/3f3fab81dbf7ada83d045d9fe8f345aa).
+You can use the Replay Mod together with [karyonix' Shaders Mod](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1286604-shaders-mod-updated-by-karyonix),
+but rendering videos results in **possible crashes** and **malformed videos**.
+Therefore, you have to **uninstall the Shaders Mod before rendering**.
 
 ## Troubleshooting [troubleshooting]
 If you need help installing the **Replay Mod** or **FFmpeg**, please read [this forum thread](https://www.replaymod.com/forum/thread/220) 
 by [bela333](https://www.replaymod.com/user/bela333) - it covers most of the problems that users encountered so far.
 
-## Settings [settings]
-To access the **Replay Mod Settings** from the Main Menu click the **"Mods"** button, select the **Replay Mod** from the list and
-the click the **"Config"** button.
-
-When in a Replay, you can either bind a hotkey to the **Replay Mod Settings** in Minecraft's Control settings
-or use the hotkey GUI by clicking on the arrow button in the lower left corner.
-
 # Recording [recording]
 ![](img/recording-indicator.jpg)
 The **Recording Indicator** which is displayed while recording
@@ -108,8 +88,6 @@ You can move through block similar to Spectator Mode.
 
 Using the **Mouse Wheel**, you can modify your flying speed. Scrolling **up** causes you to fly faster, while scrolling **down** slows you down.
 
-If you prefer the camera to be controlled similar to vanilla Creative Mode, you can change that in the **Replay Settings**.
-
 ### Camera Roll [roll]
 ![](img/camera-tilted.jpg)
 A Screenshot taken with a **tilted camera**
@@ -273,15 +251,13 @@ The **Keyframe Repository** with two **Path Presets**
 
 Using the `X` key, you can open the **Keyframe Repository**. Every Replay File has a separate Keyframe Repository which can contain several **Keyframe Presets**.
 
-To save the Keyframes currently on your Timeline, click the **"Save as..."** button.
-You can change a Preset's name, select it from the list and click the **"Rename"** button.
-To load a Keyframe Preset, select a Preset from the list and click the **"Load"** button.
+To save the Keyframes currently on your Timeline, click the **"Save current Path"** button.
+You can change the Preset's name using the Text Input Field in the upper right corner.  
+To load a Keyframe Preset, select a Preset from the list on the left side and click the **"Load"** button.  
 Using the **"Remove"** button, you can permanently delete a Keyframe Preset from the **Keyframe Repository**.
 
 ## Custom Objects [objects]
 
-> Custom Objects are not available in the 2.0.0 versions. They are expected to return eventually.
-
 [YouTube](_Xdpg828fbE)
 
 ### Introduction [introduction]
@@ -440,10 +416,12 @@ There are **7 Encoding Presets** you can choose from:
 
 ### Advanced Settings [advanced]
 ![](img/rendersettings-advanced.jpg)
-The **Advanced Render Settings**
+The **Advanced Render Settings** Screen
 
-#### Render Nametags [nametags]
-If you don't want to see Entity's Nametags in the rendered video, simply un-tick the checkbox. Hidden Nametags also include Nametags of **Armor Stands** and **Mobs**, **not only Players**!
+By clicking the **"Advanced Settings" Button** in the lower right corner, you can access more settings.
+
+#### Hide Nametags [nametags]
+If you don't want to see Entity's Nametags in the rendered video, simply tick the checkbox. Hidden Nametags also include Nametags of **Armor Stands** and **Mobs**, **not only Players**!
 
 #### Stabilize Camera [stabilize]
 This setting is only applicable for **Cubic Rendering** and **Equirectangular Rendering**.  
@@ -465,14 +443,14 @@ Using a **Video Editing Software** like **Adobe After Effects** or **Sony Vegas*
 
 ### Command Line Settings [commandline]
 ![](img/rendersettings-commandline.jpg)
-The **Command Line Render Settings**
+The **Command Line Render Settings** Screen
 
 
 > **Note**: This is for advanced users only. If you do not know what your're doing, leave these settings as they are.
 
 The **Replay Mod** runs [FFmpeg](http://ffmpeg.org/) via the **Command Line** to encode videos.
 
-You can customize both the **executed Command** and the **Command Line Arguments** in the **Command Line Settings** part of the **Render Settings Screen**.
+You can customize both the **executed Command** and the **Command Line Arguments** in the **Command Line Settings** Tag of the **Render Settings Screen**.
 
 #### Custom Command [command]
 If you leave the left input field blank, `ffmpeg` will be used as **command**. If you haven't set your **PATH variable** to link to your FFmpeg distribution, simply enter the full path to your FFmpeg executable (e.g. `C:/ffmpeg/ffmpeg.exe` or `/usr/local/bin/ffmpeg`).
@@ -554,7 +532,7 @@ By clicking on a player's **Name or Head**, you can **spectate** this player.
 
 Next to each player, there's a **checkbox** using which you can toggle the player's **visibility**.
 This way, you can hide certain players from the Replay.  
-Below the individual checkboxes, there are two checkbox buttons - one to **hide all players** and one to **show all players**.
+Above the individual checkboxes, there are two checkbox buttons - one to **hide all players** and one to **show all players**.
 
 If you want to **save the player visibility settings**, check **"Remember Hidden Players" checkbox**.
 If checked, invisible players will stay invisible after closing the Replay (this can of course be reverted),

src/main/java/com/replaymod/compat/ReplayModCompat.java

@@ -2,18 +2,19 @@ package com.replaymod.compat;
 
 import com.replaymod.compat.optifine.DisableFastRender;
 import com.replaymod.compat.shaders.ShaderBeginRender;
+import com.replaymod.core.ReplayMod;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.EventBus;
 
-@Mod(modid = ReplayModCompat.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
+@Mod(modid = ReplayModCompat.MOD_ID, useMetadata = true)
 public class ReplayModCompat {
     public static final String MOD_ID = "replaymod-compat";
 
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
+
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
         EventBus bus = MinecraftForge.EVENT_BUS;

src/main/java/com/replaymod/compat/shaders/mixin/MixinShadersRender.java

@@ -1,22 +0,0 @@
-package com.replaymod.compat.shaders.mixin;
-
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraftforge.client.ForgeHooksClient;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Pseudo;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Pseudo
-@Mixin(targets = "shadersmod/client/ShadersRender", remap = false)
-public abstract class MixinShadersRender {
-
-    @Inject(method = "renderHand0", at = @At("HEAD"), cancellable = true)
-    private static void replayModCompat_disableRenderHand0(EntityRenderer er, float partialTicks, int renderPass, CallbackInfo ci) {
-        if (ForgeHooksClient.renderFirstPersonHand(er.mc.renderGlobal, partialTicks, renderPass)) {
-            ci.cancel();
-        }
-    }
-
-}

src/main/java/com/replaymod/core/ReplayMod.java

@@ -34,8 +34,6 @@ import java.util.List;
 
 @Mod(modid = ReplayMod.MOD_ID,
         useMetadata = true,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
         updateJSON = "https://raw.githubusercontent.com/ReplayMod/ReplayMod/master/versions.json",
         guiFactory = "com.replaymod.core.gui.GuiFactory")
 public class ReplayMod {

src/main/java/com/replaymod/core/gui/RestoreReplayGui.java

@@ -3,7 +3,6 @@ package com.replaymod.core.gui;
 import com.google.common.io.Files;
 import com.replaymod.replaystudio.PacketData;
 import com.replaymod.replaystudio.io.ReplayInputStream;
-import com.replaymod.replaystudio.io.ReplayOutputStream;
 import com.replaymod.replaystudio.replay.ReplayFile;
 import com.replaymod.replaystudio.replay.ReplayMetaData;
 import com.replaymod.replaystudio.replay.ZipReplayFile;
@@ -46,19 +45,15 @@ public class RestoreReplayGui extends AbstractGuiScreen<RestoreReplayGui> {
                 ReplayMetaData metaData = replayFile.getMetaData();
                 if (metaData != null && metaData.getDuration() == 0) {
                     // Try to restore replay duration
-                    // We need to re-write the packet data in case there are any incomplete packets dangling at the end
-                    try (ReplayInputStream in = replayFile.getPacketData();
-                         ReplayOutputStream out = replayFile.writePacketData()) {
+                    try (ReplayInputStream in = replayFile.getPacketData()) {
                         PacketData last = null;
                         while ((last = in.readPacket()) != null) {
                             metaData.setDuration((int) last.getTime());
-                            out.write(last);
                         }
+                        replayFile.writeMetaData(metaData);
                     } catch (Throwable t) {
                         t.printStackTrace();
                     }
-                    // Write back the actual duration
-                    replayFile.writeMetaData(metaData);
                 }
                 replayFile.save();
                 replayFile.close();

src/main/java/com/replaymod/core/utils/Utils.java

@@ -1,53 +1,17 @@
 package com.replaymod.core.utils;
 
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import de.johni0702.minecraft.gui.GuiRenderer;
-import de.johni0702.minecraft.gui.RenderInfo;
-import de.johni0702.minecraft.gui.container.AbstractGuiScrollable;
-import de.johni0702.minecraft.gui.container.GuiContainer;
-import de.johni0702.minecraft.gui.container.GuiPanel;
-import de.johni0702.minecraft.gui.container.GuiScrollable;
-import de.johni0702.minecraft.gui.element.GuiButton;
-import de.johni0702.minecraft.gui.element.GuiElement;
-import de.johni0702.minecraft.gui.element.GuiLabel;
-import de.johni0702.minecraft.gui.layout.HorizontalLayout;
-import de.johni0702.minecraft.gui.layout.VerticalLayout;
-import de.johni0702.minecraft.gui.popup.GuiInfoPopup;
-import de.johni0702.minecraft.gui.utils.Colors;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.client.resources.DefaultPlayerSkin;
-import net.minecraft.crash.CrashReport;
 import net.minecraft.util.ResourceLocation;
-import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.Dimension;
 import org.lwjgl.util.ReadableDimension;
 
-import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManagerFactory;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.UUID;
 
-import static net.minecraft.client.Minecraft.getMinecraft;
-
 public class Utils {
 
     public static final BufferedImage DEFAULT_THUMBNAIL;
@@ -63,42 +27,6 @@ public class Utils {
         DEFAULT_THUMBNAIL = thumbnail;
     }
 
-
-    /**
-     * Neither the root certificate of LetsEncrypt nor the root that cross-signed it is included in the default
-     * Java keystore prior to 8u101.
-     * Therefore whenever a connection to the replaymod.com site is made, this SSLContext has to be used instead.
-     * It has been constructed to include the necessary root certificates.
-     * @see #SSL_SOCKET_FACTORY
-     */
-    public static final SSLContext SSL_CONTEXT;
-
-    /**
-     * @see #SSL_CONTEXT
-     */
-    public static final SSLSocketFactory SSL_SOCKET_FACTORY;
-
-    static {
-        // Largely from https://community.letsencrypt.org/t/134/37
-        try (InputStream in = Utils.class.getResourceAsStream("/dst_root_ca_x3.pem")){
-            Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(in);
-
-            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keyStore.load(null, null);
-            keyStore.setCertificateEntry("1", certificate);
-
-            TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            trustManagerFactory.init(keyStore);
-
-            SSLContext ctx = SSLContext.getInstance("TLS");
-            ctx.init(null, trustManagerFactory.getTrustManagers(), null);
-            SSL_CONTEXT = ctx;
-            SSL_SOCKET_FACTORY = ctx.getSocketFactory();
-        } catch (IOException | CertificateException | KeyStoreException | NoSuchAlgorithmException | KeyManagementException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     public static String convertSecondsToShortString(int seconds) {
         int hours = seconds/(60*60);
         int min = seconds/60 - hours*60;
@@ -135,7 +63,7 @@ public class Utils {
     }
 
     public static ResourceLocation getResourceLocationForPlayerUUID(UUID uuid) {
-        NetworkPlayerInfo info = getMinecraft().getConnection().getPlayerInfo(uuid);
+        NetworkPlayerInfo info = Minecraft.getMinecraft().getConnection().getPlayerInfo(uuid);
         ResourceLocation skinLocation;
         if (info != null && info.hasLocationSkin()) {
             skinLocation = info.getLocationSkin();
@@ -148,80 +76,4 @@ public class Utils {
     public static boolean isCtrlDown() {
         return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
     }
-
-    public static GuiInfoPopup error(Logger logger, GuiContainer container, CrashReport crashReport, Runnable onClose) {
-        // Convert crash report to string
-        String crashReportStr = crashReport.getCompleteReport();
-
-        // Log via logger
-        logger.error(crashReportStr);
-
-        // Try to save the crash report
-        if (crashReport.getFile() == null) {
-            try {
-                File folder = new File(getMinecraft().mcDataDir, "crash-reports");
-                File file = new File(folder, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
-                logger.debug("Saving crash report to file: {}", file);
-                crashReport.saveToFile(file);
-            } catch (Throwable t) {
-                logger.error("Saving crash report file:", t);
-            }
-        } else {
-            logger.debug("Not saving crash report as file already exists: {}", crashReport.getFile());
-        }
-
-        logger.trace("Opening crash report popup GUI");
-        GuiCrashReportPopup popup = new GuiCrashReportPopup(container, crashReportStr);
-        Futures.addCallback(popup.getFuture(), new FutureCallback<Void>() {
-            @Override
-            public void onSuccess(@Nullable Void result) {
-                logger.trace("Crash report popup closed");
-                if (onClose != null) {
-                    onClose.run();
-                }
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                logger.error("During error popup:", t);
-            }
-        });
-        return popup;
-    }
-
-    private static class GuiCrashReportPopup extends GuiInfoPopup {
-        private final GuiScrollable scrollable;
-
-        public GuiCrashReportPopup(GuiContainer container, String crashReport) {
-            super(container);
-            setBackgroundColor(Colors.DARK_TRANSPARENT);
-
-            // Add crash report to scrollable info
-            getInfo().addElements(new VerticalLayout.Data(0.5),
-                    new GuiLabel().setColor(Colors.BLACK).setI18nText("replaymod.gui.unknownerror"),
-                    scrollable = new GuiScrollable().setScrollDirection(AbstractGuiScrollable.Direction.VERTICAL)
-                            .setLayout(new VerticalLayout().setSpacing(2))
-                            .addElements(null,Arrays.stream(crashReport.replace("\t", "    ").split("\n")).map(
-                                    l -> new GuiLabel().setText(l).setColor(Colors.BLACK)).toArray(GuiElement[]::new)));
-
-            // Replace close button with panel containing close and copy buttons
-            GuiButton copyToClipboardButton = new GuiButton().setI18nLabel("chat.copy").onClick(() ->
-                    GuiScreen.setClipboardString(crashReport)).setSize(150, 20);
-            GuiButton closeButton = getCloseButton();
-            popup.removeElement(closeButton);
-            popup.addElements(new VerticalLayout.Data(1),
-                    new GuiPanel().setLayout(new HorizontalLayout().setSpacing(5)).setSize(305, 20)
-                            .addElements(null, copyToClipboardButton, closeButton));
-
-            // And open it
-            open();
-        }
-
-        @Override
-        public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
-            // Re-size the scrollable containing the crash report to 3/4 of the screen
-            scrollable.setSize(size.getWidth() * 3 / 4, size.getHeight() * 3 / 4);
-            super.draw(renderer, size, renderInfo);
-        }
-    }
 }

src/main/java/com/replaymod/editor/ReplayModEditor.java

@@ -1,41 +0,0 @@
-package com.replaymod.editor;
-
-import com.replaymod.core.ReplayMod;
-import com.replaymod.editor.handler.GuiHandler;
-import com.replaymod.online.Setting;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import org.apache.logging.log4j.Logger;
-
-@Mod(modid = ReplayModEditor.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
-public class ReplayModEditor {
-    public static final String MOD_ID = "replaymod-editor";
-
-    @Mod.Instance(MOD_ID)
-    public static ReplayModEditor instance;
-
-    private ReplayMod core;
-
-    public static Logger LOGGER;
-
-    @Mod.EventHandler
-    public void preInit(FMLPreInitializationEvent event) {
-        ReplayModEditor.LOGGER = event.getModLog();
-        core = ReplayMod.instance;
-
-        core.getSettingsRegistry().register(Setting.class);
-    }
-
-    @Mod.EventHandler
-    public void init(FMLInitializationEvent event) {
-        new GuiHandler(this).register();
-    }
-
-    public ReplayMod getCore() {
-        return core;
-    }
-}

src/main/java/com/replaymod/editor/gui/GuiReplayEditor.java

@@ -1,383 +0,0 @@
-package com.replaymod.editor.gui;
-
-import com.google.common.io.Files;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.gson.JsonObject;
-import com.replaymod.core.ReplayMod;
-import com.replaymod.core.utils.Utils;
-import com.replaymod.replaystudio.PacketData;
-import com.replaymod.replaystudio.Studio;
-import com.replaymod.replaystudio.filter.StreamFilter;
-import com.replaymod.replaystudio.io.ReplayInputStream;
-import com.replaymod.replaystudio.io.ReplayOutputStream;
-import com.replaymod.replaystudio.replay.ReplayFile;
-import com.replaymod.replaystudio.replay.ReplayMetaData;
-import com.replaymod.replaystudio.replay.ZipReplayFile;
-import com.replaymod.replaystudio.stream.PacketStream;
-import com.replaymod.replaystudio.studio.ReplayStudio;
-import de.johni0702.minecraft.gui.GuiRenderer;
-import de.johni0702.minecraft.gui.RenderInfo;
-import de.johni0702.minecraft.gui.container.GuiContainer;
-import de.johni0702.minecraft.gui.container.GuiPanel;
-import de.johni0702.minecraft.gui.container.GuiScreen;
-import de.johni0702.minecraft.gui.element.GuiButton;
-import de.johni0702.minecraft.gui.element.GuiLabel;
-import de.johni0702.minecraft.gui.element.GuiTextField;
-import de.johni0702.minecraft.gui.element.GuiTooltip;
-import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
-import de.johni0702.minecraft.gui.layout.CustomLayout;
-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.popup.GuiInfoPopup;
-import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
-import de.johni0702.minecraft.gui.utils.Colors;
-import net.minecraft.crash.CrashReport;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
-import org.lwjgl.util.ReadableDimension;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import static com.replaymod.editor.ReplayModEditor.LOGGER;
-
-public class GuiReplayEditor extends GuiScreen {
-    private final ReplayMod mod;
-
-    private volatile ProcessingStage processingStage;
-    private volatile double progress;
-    private GuiProcessingProgressPopup popup;
-
-    public GuiButton currentTabButton;
-    public GuiPanel currentTabPanel;
-
-    public final GuiPanel tabButtons = new GuiPanel(this).setLayout(new GridLayout().setSpacingX(5));
-    public final List<GuiPanel> tabPanels = new ArrayList<>();
-
-    public final GuiButton saveButton = new GuiButton().setI18nLabel("replaymod.gui.save").setSize(100, 20);
-    public final GuiButton backButton = new GuiButton().setI18nLabel("replaymod.gui.back").setSize(100, 20);
-
-    public final GuiPanel buttonPanel = new GuiPanel(this).setLayout(new HorizontalLayout().setSpacing(5))
-            .addElements(null, saveButton, backButton);
-
-    public GuiReplayEditor(GuiScreen parent, ReplayMod mod) {
-        this.mod = mod;
-        backButton.onClick(parent::display);
-
-        setTitle(new GuiLabel().setI18nText("replaymod.gui.replayeditor"));
-
-        makeTab("trim", () -> new GuiTrimPanel(this));
-        makeTab("connect", GuiPanel::new).setDisabled(); // Not yet implemented
-        makeTab("modify", GuiPanel::new).setDisabled(); // Not yet implemented
-
-        setLayout(new CustomLayout<GuiScreen>() {
-            @Override
-            protected void layout(GuiScreen container, int width, int height) {
-                // Move all inactive panels aside
-                tabPanels.forEach(e -> pos(e, Integer.MIN_VALUE, Integer.MIN_VALUE));
-
-                pos(buttonPanel, width - 10 - width(buttonPanel), height - 10 - height(buttonPanel));
-
-                if (currentTabPanel != null) {
-                    pos(currentTabPanel, 10, 50);
-                    size(currentTabPanel, width - 20, y(buttonPanel) - 10 - y(currentTabPanel));
-                }
-
-                pos(tabButtons, 10, 20);
-                size(tabButtons, width - 20, 20);
-            }
-        });
-    }
-
-    public GuiButton makeTab(String name, Supplier<GuiPanel> panel) {
-        GuiButton button =  new GuiButton().setI18nLabel("replaymod.gui.editor." + name + ".title")
-                .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.editor." + name + ".description"))
-                .setSize(Integer.MAX_VALUE, Integer.MAX_VALUE);
-        button.onClick(() -> {
-            // Remove previous tab
-            if (currentTabButton != null) {
-                currentTabButton.setEnabled();
-                removeElement(currentTabPanel);
-            }
-
-            // Activate new tab
-            currentTabButton = button.setDisabled();
-            addElements(null, currentTabPanel = panel.get());
-        });
-        // Add new tab button to tabs panel
-        tabButtons.addElements(null, button);
-        ((GridLayout) tabButtons.getLayout()).setColumns(tabButtons.getChildren().size());
-        return button;
-    }
-
-    public void save(File inputFile, PacketStream.FilterInfo...filters) {
-        save(FilenameUtils.getBaseName(inputFile.getName()), (outputFile) -> {
-            Studio studio = new ReplayStudio();
-            File tmpDir = null;
-            try {
-                File actualOutputFile  = outputFile;
-                if (outputFile.getCanonicalPath().equals(inputFile.getCanonicalPath())) {
-                    // Input and output files are identical. Due to the way the ZipReplayFile stores its temporary
-                    // data, the same replay file must not be opened twice for writing (tmp files will be deleted once
-                    // either one is closed or, on Windows, will throw an exception when deleted).
-                    tmpDir = Files.createTempDir();
-                    outputFile = new File(tmpDir, "replay.mcpr");
-                    LOGGER.debug("Output file is identical to input file, using temporary output file {} instead",
-                            outputFile);
-                }
-                try (ReplayFile outputReplay = new ZipReplayFile(studio, inputFile, outputFile);
-                     ReplayOutputStream out = outputReplay.writePacketData();
-                     ReplayFile inputReplay = new ZipReplayFile(studio, inputFile);
-                     ReplayInputStream in = inputReplay.getPacketData()) {
-                    ReplayMetaData metaData = inputReplay.getMetaData();
-                    PacketStream stream = studio.createReplayStream(in, true);
-
-                    stream.addFilter(new ProgressFilter(metaData.getDuration()));
-                    for (PacketStream.FilterInfo info : filters) {
-                        stream.addFilter(info.getFilter(), info.getFrom(), info.getTo());
-                        LOGGER.debug("Added filter {}", info);
-                    }
-
-                    LOGGER.info("Built pipeline: {}", stream);
-                    stream.start();
-
-                    long lastTimestamp = 0;
-
-                    PacketData data;
-                    while ((data = stream.next()) != null) {
-                        out.write(data);
-                        lastTimestamp = data.getTime();
-                    }
-
-                    for (PacketData d : stream.end()) {
-                        out.write(d);
-                        lastTimestamp = d.getTime();
-                    }
-
-                    updateProgress(ProcessingStage.FINALIZING, 0);
-
-                    // Update duration of new replay
-                    metaData.setDuration((int) lastTimestamp);
-                    outputReplay.writeMetaData(metaData);
-
-                    out.close();
-                    outputReplay.save();
-                }
-                if (outputFile != actualOutputFile) {
-                    LOGGER.debug("Moving temporary output file {} to {}");
-                    FileUtils.forceDelete(actualOutputFile);
-                    FileUtils.moveFile(outputFile, actualOutputFile);
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            } finally {
-                if (tmpDir != null && !FileUtils.deleteQuietly(tmpDir)) {
-                    LOGGER.warn("Failed to delete temporary directory {}", tmpDir);
-                }
-            }
-        });
-    }
-
-    public void save(String sourceName, Consumer<File> runnable) {
-        GuiTextField nameField = new GuiTextField().setSize(200, 20).setFocused(true).setText(sourceName);
-        GuiYesNoPopup popup = GuiYesNoPopup.open(this,
-                nameField
-        ).setYesI18nLabel("replaymod.gui.editor.savemode.override").setNoI18nLabel("replaymod.gui.cancel");
-        nameField.onEnter(() -> {
-            if (popup.getYesButton().isEnabled()) {
-                popup.getYesButton().onClick();
-            }
-        }).onTextChanged(obj -> {
-            popup.getYesButton().setEnabled(!nameField.getText().isEmpty());
-            popup.setYesI18nLabel("replaymod.gui.editor.savemode." +
-                    (nameField.getText().equals(sourceName) ? "override" : "newfile"));
-        });
-        Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
-            @Override
-            public void onSuccess(@Nullable Boolean result) {
-                if (result == Boolean.TRUE) {
-                    // Sanitize their input
-                    String name = nameField.getText().trim().replace("[^a-zA-Z0-9\\.\\- ]", "_");
-                    // This file is what they want
-                    File replayFolder;
-                    try {
-                        replayFolder = mod.getReplayFolder();
-                    } catch (IOException e) {
-                        Utils.error(LOGGER, GuiReplayEditor.this, CrashReport.makeCrashReport(e, "Getting replay folder"), null);
-                        return;
-                    }
-                    File targetFile = new File(replayFolder, name + ".mcpr");
-                    if (targetFile.exists()) {
-                        LOGGER.trace("Selected file already exists, asking for confirmation");
-                        Futures.addCallback(GuiYesNoPopup.open(GuiReplayEditor.this,
-                                new GuiLabel().setColor(Colors.BLACK)
-                                        .setI18nText("replaymod.gui.replaymodified.warning1", name),
-                                new GuiLabel().setColor(Colors.BLACK)
-                                        .setI18nText("replaymod.gui.replaymodified.warning2"))
-                                .setYesI18nLabel("gui.yes").setNoI18nLabel("gui.no")
-                                .getFuture(), new FutureCallback<Boolean>() {
-                            @Override
-                            public void onSuccess(@Nullable Boolean result) {
-                                if (result == Boolean.TRUE) {
-                                    LOGGER.trace("Saving output in {}", targetFile);
-                                    runEdit(() -> runnable.accept(targetFile));
-                                } else {
-                                    LOGGER.trace("Not overwriting file {}, reopening naming dialog", targetFile);
-                                    save(sourceName, runnable);
-                                }
-                            }
-
-                            @Override
-                            public void onFailure(Throwable t) {
-                                LOGGER.error("During save file confirmation dialog:", t);
-                            }
-                        });
-                    } else {
-                        LOGGER.trace("Saving output in {}", targetFile);
-                        runEdit(() -> runnable.accept(targetFile));
-                    }
-                } else {
-                    LOGGER.trace("Saving cancelled");
-                }
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                LOGGER.error("During save file dialog:", t);
-            }
-        });
-    }
-
-    public void runEdit(Runnable runnable) {
-        popup = new GuiProcessingProgressPopup(this);
-        processingStage = ProcessingStage.INITIALIZING;
-        progress = 0;
-        new Thread(() -> {
-            LOGGER.info("Starting editing of replay");
-            try {
-                runnable.run();
-            } catch (Throwable t) {
-                CrashReport crashReport = CrashReport.makeCrashReport(t, "Editing replay file");
-                mod.runLater(() -> Utils.error(LOGGER, this, crashReport, popup::close));
-                return;
-            }
-            LOGGER.info("Successfully finished editing");
-            mod.runLater(() -> {
-                popup.close();
-                GuiInfoPopup.open(this, "replaymod.gui.editor.progress.status.finished");
-            });
-        }).start();
-    }
-
-    public void updateProgress(ProcessingStage stage, double progress) {
-        if (this.processingStage != stage) {
-            LOGGER.trace("Changing state from {} to {}", this.processingStage, stage);
-        }
-        this.processingStage = stage;
-        this.progress = progress;
-    }
-
-    public ReplayMod getMod() {
-        return mod;
-    }
-
-    public enum ProcessingStage {
-        INITIALIZING("initializing", 0.01),
-        WORKING("writing.raw", 0.89),
-        FINALIZING("writing.final", 0.1),
-        DONE("finished", 0);
-
-        private final String i18nKey;
-        private final double progressFraction;
-
-        ProcessingStage(String i18nKey, double progressFraction) {
-            this.i18nKey = "replaymod.gui.editor.progress.status." + i18nKey;
-            this.progressFraction = progressFraction;
-        }
-
-        public double getOverallProgress(double progress) {
-            progress *= progressFraction;
-            for (ProcessingStage processingStage : values()) {
-                if (processingStage == this) break;
-                progress += processingStage.progressFraction;
-            }
-            return progress;
-        }
-    }
-
-    private class ProgressFilter implements StreamFilter {
-        private final long total;
-
-        public ProgressFilter(long total) {
-            this.total = total;
-        }
-
-        @Override
-        public String getName() {
-            return "progress";
-        }
-
-        @Override
-        public void init(Studio studio, JsonObject config) {
-
-        }
-
-        @Override
-        public void onStart(PacketStream stream) {
-            updateProgress(ProcessingStage.WORKING, 0);
-        }
-
-        @Override
-        public boolean onPacket(PacketStream stream, PacketData data) {
-            updateProgress(ProcessingStage.WORKING, (double) data.getTime() / total);
-            return true;
-        }
-
-        @Override
-        public void onEnd(PacketStream stream, long timestamp) {}
-    }
-
-    private class GuiProcessingProgressPopup extends AbstractGuiPopup<GuiProcessingProgressPopup> {
-        private final GuiProgressBar progressBar = new GuiProgressBar().setSize(300, 20);
-
-        {
-            popup.setLayout(new VerticalLayout().setSpacing(10));
-            popup.addElements(new VerticalLayout.Data(0.5),
-                    new GuiLabel().setI18nText("replaymod.gui.editor.progress.title").setColor(Colors.BLACK),
-                    new GuiLabel().setI18nText("replaymod.gui.editor.progress.pleasewait").setColor(Colors.BLACK),
-                    progressBar);
-        }
-
-        public GuiProcessingProgressPopup(GuiContainer container) {
-            super(container);
-            open();
-        }
-
-        @Override
-        public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
-            // Update progress bar
-            progressBar.setI18nLabel(processingStage.i18nKey);
-            progressBar.setProgress((float) processingStage.getOverallProgress(progress));
-
-            super.draw(renderer, size, renderInfo);
-        }
-
-        @Override
-        public void close() {
-            super.close();
-        }
-
-        @Override
-        protected GuiProcessingProgressPopup getThis() {
-            return this;
-        }
-    }
-}

src/main/java/com/replaymod/editor/gui/GuiTrimPanel.java

@@ -1,202 +0,0 @@
-package com.replaymod.editor.gui;
-
-import com.google.gson.JsonObject;
-import com.replaymod.core.utils.Utils;
-import com.replaymod.replaystudio.data.Marker;
-import com.replaymod.replaystudio.filter.ChangeTimestampFilter;
-import com.replaymod.replaystudio.filter.RemoveFilter;
-import com.replaymod.replaystudio.filter.SquashFilter;
-import com.replaymod.replaystudio.replay.ReplayFile;
-import com.replaymod.replaystudio.replay.ReplayMetaData;
-import com.replaymod.replaystudio.replay.ZipReplayFile;
-import com.replaymod.replaystudio.stream.PacketStream;
-import com.replaymod.replaystudio.studio.ReplayStudio;
-import de.johni0702.minecraft.gui.container.GuiPanel;
-import de.johni0702.minecraft.gui.element.GuiLabel;
-import de.johni0702.minecraft.gui.element.GuiNumberField;
-import de.johni0702.minecraft.gui.element.advanced.GuiDropdownMenu;
-import de.johni0702.minecraft.gui.layout.GridLayout;
-import de.johni0702.minecraft.gui.layout.HorizontalLayout;
-import de.johni0702.minecraft.gui.layout.VerticalLayout;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.crash.CrashReport;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOCase;
-import org.apache.commons.io.filefilter.SuffixFileFilter;
-import org.lwjgl.util.Dimension;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-
-import static com.replaymod.editor.ReplayModEditor.LOGGER;
-import static java.util.Optional.ofNullable;
-
-public class GuiTrimPanel extends GuiPanel {
-    private static GuiNumberField newGuiNumberField() {
-        return new GuiNumberField().setMaxLength(2).setSize(20, 20).setValidateOnFocusChange(true);
-    }
-
-    // Special value indicating no replay files were found
-    private static final File NO_REPLAY = new File(".");
-    // Special value for the initial "Select Marker Keyframe" entry
-    private static final Marker NO_MARKER = new Marker(); static {NO_MARKER.setTime(-1);}
-
-    private final GuiReplayEditor gui;
-
-    public final GuiDropdownMenu<File> inputReplays = new GuiDropdownMenu<File>(this)
-            .setMinSize(new Dimension(200, 20)).onSelection(i -> updateSelectedReplay())
-            .setToString(f -> f == NO_REPLAY ? "" : FilenameUtils.getBaseName(f.getName()));
-
-    public final GuiNumberField startHour = newGuiNumberField();
-    public final GuiNumberField startMin = newGuiNumberField();
-    public final GuiNumberField startSec = newGuiNumberField();
-    public final GuiNumberField startMilli = newGuiNumberField().setSize(40, 20).setMaxLength(4);
-    public final GuiDropdownMenu<Marker> startMarker = new GuiDropdownMenu<>();
-
-    public final GuiNumberField endHour = newGuiNumberField();
-    public final GuiNumberField endMin = newGuiNumberField();
-    public final GuiNumberField endSec = newGuiNumberField();
-    public final GuiNumberField endMilli = newGuiNumberField().setSize(40, 20).setMaxLength(4);
-    public final GuiDropdownMenu<Marker> endMarker = new GuiDropdownMenu<>();
-
-    public final GuiPanel timePanel = new GuiPanel(this)
-            .setLayout(new GridLayout().setCellsEqualSize(false).setSpacingX(20).setSpacingY(5).setColumns(3))
-            .addElements(new GridLayout.Data(0, 0.5),
-                    new GuiLabel().setI18nText("replaymod.gui.start"),
-                    new GuiPanel().setLayout(new HorizontalLayout().setSpacing(2)).addElements(
-                            new HorizontalLayout.Data(0.5),
-                            startHour, new GuiLabel().setI18nText("replaymod.gui.hours"),
-                            startMin, new GuiLabel().setI18nText("replaymod.gui.minutes"),
-                            startSec, new GuiLabel().setI18nText("replaymod.gui.seconds"),
-                            startMilli, new GuiLabel().setI18nText("replaymod.gui.milliseconds")
-                    ), startMarker,
-                    new GuiLabel().setI18nText("replaymod.gui.end"),
-                    new GuiPanel().setLayout(new HorizontalLayout().setSpacing(2)).addElements(
-                            new HorizontalLayout.Data(0.5),
-                            endHour, new GuiLabel().setI18nText("replaymod.gui.hours"),
-                            endMin, new GuiLabel().setI18nText("replaymod.gui.minutes"),
-                            endSec, new GuiLabel().setI18nText("replaymod.gui.seconds"),
-                            endMilli, new GuiLabel().setI18nText("replaymod.gui.milliseconds")
-                    ), endMarker);
-
-    public GuiTrimPanel(GuiReplayEditor gui) {
-        this.gui = gui;
-
-        setLayout(new VerticalLayout().setSpacing(10));
-
-        Function<Marker, String> toString = m -> {
-            if (m == NO_MARKER) {
-                return I18n.format("replaymod.gui.editor.trim.marker");
-            } else {
-                return ofNullable(m.getName()).orElse(I18n.format("replaymod.gui.ingame.unnamedmarker"))
-                        + " (" + Utils.convertSecondsToShortString(m.getTime() / 1000) + ")";
-            }
-        };
-        startMarker.setToString(toString).setMinSize(new Dimension(100, 20)).onSelection(i ->
-                onSelectedMarkerChanged(startMarker, startHour, startMin, startSec, startMilli));
-        endMarker.setToString(toString).setMinSize(new Dimension(100, 20)).onSelection(i ->
-                onSelectedMarkerChanged(endMarker, endHour, endMin, endSec, endMilli));
-
-        File[] files = null;
-        try {
-            File folder = gui.getMod().getReplayFolder();
-            files = folder.listFiles((FileFilter) new SuffixFileFilter(".mcpr", IOCase.INSENSITIVE));
-        } catch (IOException e) {
-            Utils.error(LOGGER, gui, CrashReport.makeCrashReport(e, "Listing available replays"), gui.backButton::onClick);
-        }
-        if (files == null) {
-            LOGGER.warn("Replay file list is null, has the replay folder been deleted?");
-            files = new File[0];
-        } else {
-            LOGGER.debug("Found {} replays in the replay folder", files.length);
-        }
-        if (files.length == 0) {
-            inputReplays.setValues(NO_REPLAY);
-        } else {
-            inputReplays.setValues(files);
-        }
-
-        updateSelectedReplay();
-        updateReadyState();
-
-        gui.saveButton.onClick(() -> {
-            // Read start and end times
-            int start = ((startHour.getInteger() * 60 + startMin.getInteger()) * 60 + startSec.getInteger()) * 1000 + startMilli.getInteger();
-            int end = ((endHour.getInteger() * 60 + endMin.getInteger()) * 60 + endSec.getInteger()) * 1000 + endMilli.getInteger();
-            // Configure offset of change timestamp filter
-            ChangeTimestampFilter ctf = new ChangeTimestampFilter();
-            JsonObject config = new JsonObject();
-            config.addProperty("offset", -start);
-            ctf.init(null, config);
-            // Pass filters to save dialog
-            gui.save(inputReplays.getSelectedValue(),
-                    new PacketStream.FilterInfo(new SquashFilter(), -1, start),
-                    new PacketStream.FilterInfo(ctf, start, end),
-                    new PacketStream.FilterInfo(new RemoveFilter(), end, -1)
-            );
-        });
-    }
-
-    private void onSelectedMarkerChanged(GuiDropdownMenu<Marker> dropdown, GuiNumberField hour, GuiNumberField min,
-                                         GuiNumberField sec, GuiNumberField milli) {
-        Marker marker = dropdown.getSelectedValue();
-        if (marker != NO_MARKER) {
-            int time = marker.getTime();
-            setTime(time, hour, min, sec, milli);
-        }
-    }
-
-    private void setTime(int time, GuiNumberField hour, GuiNumberField min,
-                                         GuiNumberField sec, GuiNumberField milli) {
-        milli.setValue(time % 1000); time /= 1000;
-        sec.setValue(time % 60); time /= 60;
-        min.setValue(time % 60); time /= 60;
-        hour.setValue(time);
-    }
-
-    private void updateSelectedReplay() {
-        File file = inputReplays.getSelectedValue();
-        // Load markers and meta data from replay file
-        ReplayMetaData metaData;
-        Set<Marker> markers;
-        if (file == NO_REPLAY) {
-            metaData = new ReplayMetaData();
-            markers = Collections.emptySet();
-        } else {
-            try (ReplayFile replayFile = new ZipReplayFile(new ReplayStudio(), file)) {
-                metaData = replayFile.getMetaData();
-                markers = replayFile.getMarkers().or(Collections.emptySet());
-                LOGGER.debug("Loaded {} markers from replay {}", markers.size(), file);
-            } catch (Exception e) {
-                Utils.error(LOGGER, gui, CrashReport.makeCrashReport(e, "Reading markers from replay"), null);
-                metaData = new ReplayMetaData();
-                markers = Collections.emptySet();
-            }
-        }
-
-        // Sort and add initial "Select Event Marker" element
-        List<Marker> markerList = new ArrayList<>(markers);
-        markerList.sort(Comparator.comparing(Marker::getTime));
-        markerList.add(0, NO_MARKER);
-
-        // Set marker dropdown values
-        Marker[] markerArray = markerList.stream().toArray(Marker[]::new);
-        startMarker.setValues(markerArray).setSelected(0);
-        endMarker.setValues(markerArray).setSelected(0);
-
-        // Set start and end time values
-        setTime(0, startHour, startMin, startSec, startMilli);
-        setTime(metaData.getDuration(), endHour, endMin, endSec, endMilli);
-    }
-
-    private void updateReadyState() {
-        gui.saveButton.setEnabled(inputReplays.getSelectedValue() != NO_REPLAY);
-    }
-}

src/main/java/com/replaymod/editor/handler/GuiHandler.java

@@ -1,48 +0,0 @@
-package com.replaymod.editor.handler;
-
-import com.replaymod.editor.ReplayModEditor;
-import com.replaymod.editor.gui.GuiReplayEditor;
-import de.johni0702.minecraft.gui.container.GuiScreen;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.resources.I18n;
-import net.minecraftforge.client.event.GuiScreenEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-public class GuiHandler {
-    private static final int BUTTON_REPLAY_EDITOR = 17890237;
-
-    private final ReplayModEditor mod;
-
-    public GuiHandler(ReplayModEditor mod) {
-        this.mod = mod;
-    }
-
-    public void register() {
-        MinecraftForge.EVENT_BUS.register(this);
-    }
-
-    @SubscribeEvent
-    public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) {
-        if (!(event.getGui() instanceof GuiMainMenu)) {
-            return;
-        }
-
-        GuiButton button = new GuiButton(BUTTON_REPLAY_EDITOR, event.getGui().width / 2 + 2,
-                event.getGui().height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayeditor"));
-        button.width = button.width / 2 - 2;
-        event.getButtonList().add(button);
-    }
-
-    @SubscribeEvent
-    public void onButton(GuiScreenEvent.ActionPerformedEvent.Pre event) {
-        if(!event.getButton().enabled) return;
-
-        if (event.getGui() instanceof GuiMainMenu) {
-            if (event.getButton().id == BUTTON_REPLAY_EDITOR) {
-                new GuiReplayEditor(GuiScreen.wrap(event.getGui()), mod.getCore()).display();
-            }
-        }
-    }
-}

src/main/java/com/replaymod/extras/FullBrightness.java

@@ -10,12 +10,14 @@ import de.johni0702.minecraft.gui.element.IGuiImage;
 import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.lwjgl.input.Keyboard;
 
 public class FullBrightness implements Extra {
-    private ReplayModReplay module;
+    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private static ReplayModReplay module;
 
     private final IGuiImage indicator = new GuiImage().setTexture(ReplayMod.TEXTURE, 90, 20, 19, 13).setSize(19, 13);
 
@@ -25,7 +27,6 @@ public class FullBrightness implements Extra {
 
     @Override
     public void register(final ReplayMod mod) throws Exception {
-        this.module = ReplayModReplay.instance;
         this.gameSettings = mod.getMinecraft().gameSettings;
 
         mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.lighting", Keyboard.KEY_Z, new Runnable() {

src/main/java/com/replaymod/extras/LocalizationExtra.java

@@ -12,6 +12,7 @@ import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.resources.data.IMetadataSection;
 import net.minecraft.client.resources.data.MetadataSerializer;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.Mod;
 import org.apache.commons.lang3.StringEscapeUtils;
 
 import java.awt.image.BufferedImage;
@@ -25,12 +26,11 @@ import java.util.Map;
 import java.util.Set;
 
 public class LocalizationExtra implements Extra {
-    private ReplayModOnline module;
+    @Mod.Instance(ReplayModOnline.MOD_ID)
+    private static ReplayModOnline module;
 
     @Override
     public void register(ReplayMod mod) throws Exception {
-        this.module = ReplayModOnline.instance;
-
         final Minecraft mc = mod.getMinecraft();
         Thread localizedResourcePackLoader = new Thread(new Runnable() {
             @Override
@@ -82,7 +82,7 @@ public class LocalizationExtra implements Extra {
                 availableLanguages.put(langcode, prop);
                 return true;
             } catch (ApiException e) {
-                if (e.getError() == null || e.getError().getId() != 16) { // This language has not been translated
+                if (e.getError().getId() != 16) { // This language has not been translated
                     e.printStackTrace();
                 }
             } catch(ConnectException ce) {

src/main/java/com/replaymod/extras/OpenEyeExtra.java

@@ -17,7 +17,6 @@ import de.johni0702.minecraft.gui.utils.Colors;
 import net.minecraftforge.fml.common.Loader;
 import org.apache.commons.io.FileUtils;
 
-import javax.net.ssl.HttpsURLConnection;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.net.URL;
@@ -25,10 +24,8 @@ import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 
-import static com.replaymod.core.utils.Utils.SSL_SOCKET_FACTORY;
-
 public class OpenEyeExtra implements Extra {
-    private static final String DOWNLOAD_URL = "https://www.replaymod.com/dl/openeye/" + Loader.MC_VERSION;
+    private static final String DOWNLOAD_URL = "http://www.replaymod.com/dl/openeye/" + Loader.MC_VERSION;
     private static final Setting<Boolean> ASK_FOR_OPEN_EYE = new Setting<>("advanced", "askForOpenEye", null, true);
 
     private ReplayMod mod;
@@ -72,9 +69,7 @@ public class OpenEyeExtra implements Extra {
                         File targetFile = new File("mods/" + Loader.MC_VERSION, "OpenEye.jar");
                         FileUtils.forceMkdir(targetFile.getParentFile());
 
-                        HttpsURLConnection connection = (HttpsURLConnection) new URL(DOWNLOAD_URL).openConnection();
-                        connection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
-                        ReadableByteChannel in = Channels.newChannel(connection.getInputStream());
+                        ReadableByteChannel in = Channels.newChannel(new URL(DOWNLOAD_URL).openStream());
                         FileChannel out = new FileOutputStream(targetFile).getChannel();
                         out.transferFrom(in, 0, Long.MAX_VALUE);
                     } catch (Throwable e) {

src/main/java/com/replaymod/extras/ReplayModExtras.java

@@ -12,16 +12,16 @@ import org.apache.logging.log4j.Logger;
 import java.util.Arrays;
 import java.util.List;
 
-@Mod(modid = ReplayModExtras.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
+@Mod(modid = ReplayModExtras.MOD_ID, useMetadata = true)
 public class ReplayModExtras {
     public static final String MOD_ID = "replaymod-extras";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModExtras instance;
 
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
+
     private static final List<Class<? extends Extra>> builtin = Arrays.asList(
             PlayerOverview.class,
             UriSchemeExtra.class,
@@ -44,7 +44,7 @@ public class ReplayModExtras {
         for (Class<? extends Extra> cls : builtin) {
             try {
                 Extra extra = cls.newInstance();
-                extra.register(ReplayMod.instance);
+                extra.register(core);
             } catch (Throwable t) {
                 logger.warn("Failed to load extra " + cls.getName() + ": ", t);
             }

src/main/java/com/replaymod/extras/playeroverview/PlayerOverview.java

@@ -11,10 +11,9 @@ import com.replaymod.replay.events.ReplayCloseEvent;
 import com.replaymod.replay.events.ReplayOpenEvent;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderPlayer;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 
@@ -22,15 +21,14 @@ import java.io.IOException;
 import java.util.*;
 
 public class PlayerOverview implements Extra {
-    private ReplayModReplay module;
+    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private static ReplayModReplay module;
 
     private final Set<UUID> hiddenPlayers = new HashSet<>();
     private boolean savingEnabled;
 
     @Override
     public void register(final ReplayMod mod) throws Exception {
-        this.module = ReplayModReplay.instance;
-
         mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.playeroverview", Keyboard.KEY_B, new Runnable() {
             @Override
             public void run() {
@@ -94,14 +92,6 @@ public class PlayerOverview implements Extra {
         hiddenPlayers.clear();
     }
 
-    @SubscribeEvent
-    public void oRenderHand(RenderHandEvent event) {
-        Entity view = module.getCore().getMinecraft().getRenderViewEntity();
-        if (view != null && isHidden(view.getUniqueID())) {
-            event.setCanceled(true);
-        }
-    }
-
     public boolean isSavingEnabled() {
         return savingEnabled;
     }

src/main/java/com/replaymod/extras/urischeme/UriSchemeExtra.java

@@ -4,6 +4,7 @@ import com.replaymod.core.ReplayMod;
 import com.replaymod.extras.Extra;
 import com.replaymod.online.ReplayModOnline;
 import de.johni0702.minecraft.gui.container.GuiScreen;
+import net.minecraftforge.fml.common.Mod;
 import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
@@ -12,14 +13,14 @@ import java.net.ServerSocket;
 import java.net.Socket;
 
 public class UriSchemeExtra implements Extra {
-    private ReplayModOnline module;
+    @Mod.Instance(ReplayModOnline.MOD_ID)
+    private static ReplayModOnline module;
 
     private ReplayMod mod;
 
     @Override
     public void register(final ReplayMod mod) throws Exception {
         this.mod = mod;
-        this.module = ReplayModOnline.instance;
 
         UriScheme uriScheme = UriScheme.create();
         if (uriScheme == null) {

src/main/java/com/replaymod/online/ReplayModOnline.java

@@ -26,19 +26,18 @@ import java.io.IOException;
 
 import static net.minecraft.client.Minecraft.getMinecraft;
 
-@Mod(modid = ReplayModOnline.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
+@Mod(modid = ReplayModOnline.MOD_ID, useMetadata = true)
 public class ReplayModOnline {
     public static final String MOD_ID = "replaymod-online";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModOnline instance;
 
-    private ReplayMod core;
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
 
-    private ReplayModReplay replayModule;
+    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private static ReplayModReplay replayModule;
 
     private Logger logger;
 
@@ -54,8 +53,6 @@ public class ReplayModOnline {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
-        core = ReplayMod.instance;
-        replayModule = ReplayModReplay.instance;
 
         core.getSettingsRegistry().register(Setting.class);
 
@@ -67,10 +64,8 @@ public class ReplayModOnline {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        if (!getDownloadsFolder().exists()){
-            if (!getDownloadsFolder().mkdirs()) {
-                logger.warn("Failed to create downloads folder: " + getDownloadsFolder());
-            }
+        if (!getDownloadsFolder().mkdirs()) {
+            logger.warn("Failed to create downloads folder: " + getDownloadsFolder());
         }
 
         new GuiHandler(this).register();

src/main/java/com/replaymod/online/api/ApiClient.java

@@ -15,19 +15,13 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
 import javax.imageio.ImageIO;
-import javax.net.ssl.HttpsURLConnection;
 import java.awt.image.BufferedImage;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
 import java.util.function.Consumer;
 
-import static com.replaymod.core.utils.Utils.SSL_SOCKET_FACTORY;
-
 public class ApiClient {
 
     private static final Minecraft mc = Minecraft.getMinecraft();
@@ -136,11 +130,7 @@ public class ApiClient {
         QueryBuilder builder = new QueryBuilder(ReplayModApiMethods.get_thumbnail);
         builder.put("id", file);
         URL url = new URL(builder.toString());
-        HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
-        connection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
-        try (InputStream in = connection.getInputStream()) {
-            return ImageIO.read(in);
-        }
+        return ImageIO.read(url);
     }
 
     private boolean cancelDownload = false;
@@ -153,8 +143,7 @@ public class ApiClient {
         builder.put("id", file);
         String url = builder.toString();
         URL website = new URL(url);
-        HttpsURLConnection con = (HttpsURLConnection) website.openConnection();
-        con.setSSLSocketFactory(SSL_SOCKET_FACTORY);
+        HttpURLConnection con = (HttpURLConnection) website.openConnection();
 
         int fileSize = con.getContentLength();
 

src/main/java/com/replaymod/online/api/SimpleApiClient.java

@@ -7,14 +7,12 @@ import com.google.gson.JsonParser;
 import com.replaymod.online.api.replay.holders.ApiError;
 import org.apache.commons.io.IOUtils;
 
-import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Map;
 
-import static com.replaymod.core.utils.Utils.SSL_SOCKET_FACTORY;
-
 public class SimpleApiClient {
 
     private static final JsonParser jsonParser = new JsonParser();
@@ -74,11 +72,10 @@ public class SimpleApiClient {
         // read response
         String responseContent = null;
         InputStream is = null;
-        HttpsURLConnection httpUrlConnection = null;
+        HttpURLConnection httpUrlConnection = null;
         try {
             URL url = new URL(urlString);
-            httpUrlConnection = (HttpsURLConnection) url.openConnection();
-            httpUrlConnection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
+            httpUrlConnection = (HttpURLConnection) url.openConnection();
 
             httpUrlConnection.setRequestMethod("GET");
 

src/main/java/com/replaymod/online/api/replay/FileUploader.java

@@ -9,18 +9,16 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.net.ssl.HttpsURLConnection;
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Set;
 import java.util.function.Consumer;
 
-import static com.replaymod.core.utils.Utils.SSL_SOCKET_FACTORY;
-
 @RequiredArgsConstructor
 public class FileUploader {
     private static final Gson gson = new Gson();
@@ -50,8 +48,7 @@ public class FileUploader {
             postData += "&name=" + URLEncoder.encode(filename, "UTF-8");
 
             String url = ReplayModApiMethods.upload_file + postData;
-            HttpsURLConnection con = (HttpsURLConnection) new URL(url).openConnection();
-            con.setSSLSocketFactory(SSL_SOCKET_FACTORY);
+            HttpURLConnection con = (HttpURLConnection) new URL(url).openConnection();
             con.setUseCaches(false);
             con.setDoOutput(true);
             con.setRequestMethod("POST");

src/main/java/com/replaymod/online/api/replay/ReplayModApiMethods.java

@@ -2,7 +2,7 @@ package com.replaymod.online.api.replay;
 
 public class ReplayModApiMethods {
 
-    public static final String REPLAYMOD_BASE_URL = "https://ReplayMod.com/api/";
+    public static final String REPLAYMOD_BASE_URL = "http://ReplayMod.com/api/";
 
     public static final String register = REPLAYMOD_BASE_URL+"register";
     public static final String check_authkey = REPLAYMOD_BASE_URL+"check_authkey";

src/main/java/com/replaymod/online/api/replay/holders/MinecraftVersion.java

@@ -4,7 +4,8 @@ public enum MinecraftVersion {
 
     MC_1_8("Minecraft 1.8", "1.8"),
     MC_1_9_4("Minecraft 1.9.4", "1.9.4"),
-    MC_1_10_2("Minecraft 1.10.2", "1.10.2");
+    MC_1_10_2("Minecraft 1.10.2", "1.10.2"),
+    MC_1_11("Minecraft 1.11", "1.11");
 
     private String niceName, apiName;
 

src/main/java/com/replaymod/recording/ReplayModRecording.java

@@ -14,17 +14,15 @@ import net.minecraftforge.fml.common.network.NetworkRegistry;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Keyboard;
 
-@Mod(modid = ReplayModRecording.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
+@Mod(modid = ReplayModRecording.MOD_ID, useMetadata = true)
 public class ReplayModRecording {
     public static final String MOD_ID = "replaymod-recording";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModRecording instance;
 
-    private ReplayMod core;
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
 
     private Logger logger;
 
@@ -33,7 +31,6 @@ public class ReplayModRecording {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
-        core = ReplayMod.instance;
 
         core.getSettingsRegistry().register(Setting.class);
 

src/main/java/com/replaymod/recording/handler/FMLHandshakeFilter.java

@@ -1,25 +0,0 @@
-package com.replaymod.recording.handler;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
-import net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage;
-
-/**
- * Filters out all handshake packets that were sent for recording but must
- * not actually be handled.
- * This handler is only present when connected to the integrated server as
- * otherwise all packets must be handled.
- *
- * When in single player, the game state packets must never be handled
- * otherwise wired bugs related to semi-singletons can occur.
- * See https://bugs.replaymod.com/show_bug.cgi?id=44
- */
-public class FMLHandshakeFilter extends SimpleChannelInboundHandler<FMLHandshakeMessage> {
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, FMLHandshakeMessage msg) throws Exception {
-        if (!(msg instanceof FMLHandshakeMessage.RegistryData)) {
-            // Pass on everything but RegistryData messages
-            ctx.fireChannelRead(msg);
-        }
-    }
-}

src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java

@@ -178,23 +178,23 @@ public class RecordingEventHandler {
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.OFFHAND, playerItems[1]));
             }
 
-            if (playerItems[2] != mc.thePlayer.inventory.armorInventory[0]) {
-                playerItems[2] = mc.thePlayer.inventory.armorInventory[0];
+            if (playerItems[2] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET)) {
+                playerItems[2] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.FEET, playerItems[2]));
             }
 
-            if (playerItems[3] != mc.thePlayer.inventory.armorInventory[1]) {
-                playerItems[3] = mc.thePlayer.inventory.armorInventory[1];
+            if (playerItems[3] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS)) {
+                playerItems[3] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.LEGS, playerItems[3]));
             }
 
-            if (playerItems[4] != mc.thePlayer.inventory.armorInventory[2]) {
-                playerItems[4] = mc.thePlayer.inventory.armorInventory[2];
+            if (playerItems[4] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) {
+                playerItems[4] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.CHEST, playerItems[4]));
             }
 
-            if (playerItems[5] != mc.thePlayer.inventory.armorInventory[3]) {
-                playerItems[5] = mc.thePlayer.inventory.armorInventory[3];
+            if (playerItems[5] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD)) {
+                playerItems[5] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.HEAD, playerItems[5]));
             }
 
@@ -234,7 +234,8 @@ public class RecordingEventHandler {
     @SubscribeEvent
     public void onPickupItem(ItemPickupEvent event) {
         try {
-            packetListener.save(new SPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId()));
+            packetListener.save(new SPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId(),
+                    event.pickedUp.getEntityItem().getMaxStackSize()));
         } catch(Exception e) {
             e.printStackTrace();
         }

src/main/java/com/replaymod/recording/mixin/MixinNetworkDispatcher.java

@@ -1,11 +1,7 @@
 package com.replaymod.recording.mixin;
 
-import com.replaymod.recording.handler.FMLHandshakeFilter;
-import io.netty.channel.ChannelPipeline;
 import io.netty.channel.embedded.EmbeddedChannel;
-import net.minecraftforge.fml.common.network.handshake.FMLHandshakeCodec;
 import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher;
-import net.minecraftforge.fml.relauncher.Side;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -15,32 +11,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(value = NetworkDispatcher.class, remap = false)
 public abstract class MixinNetworkDispatcher {
 
-    @Shadow
-    private Side side;
-
     @Shadow
     private EmbeddedChannel handshakeChannel;
 
     /**
-     * Always sets fml:isLocal to false on the server side.
+     * Always sets fml:isLocal to false.
      * This effectively removes the difference in the FML handshake between SP and MP
      * and forces the block/item ids, etc. to always be send.
-     * Injects a {@link FMLHandshakeFilter} on the client side to filter out
-     * those extra, unexpected packets.
+     * This might have undesired side effects but at least it works at all.
      */
     @Inject(method = "insertIntoChannel", at=@At("HEAD"))
-    public void replayModRecording_setupForLocalRecording(CallbackInfo cb) {
-        // If we're in multiplayer, everything is fine as is
-        if (!handshakeChannel.attr(NetworkDispatcher.IS_LOCAL).get()) return;
-
-        if (side == Side.SERVER) {
-            // On the server side, force all packets to be sent
-            handshakeChannel.attr(NetworkDispatcher.IS_LOCAL).set(false);
-        } else {
-            // On the client side, discard additional packets
-            ChannelPipeline pipeline = handshakeChannel.pipeline();
-            pipeline.addAfter(pipeline.context(FMLHandshakeCodec.class).name(),
-                    "replaymod_filter", new FMLHandshakeFilter());
-        }
+    public void replayModRecording_forceIsLocalToFalse(CallbackInfo cb) {
+        handshakeChannel.attr(NetworkDispatcher.IS_LOCAL).set(false);
     }
 }

src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java

@@ -26,7 +26,6 @@ import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -53,9 +52,6 @@ public class ResourcePackRecorder {
             boolean doWrite = false; // Whether we are the first and have to write it
             synchronized (replayFile) { // Need to read, modify and write the resource pack index atomically
                 Map<Integer, String> index = replayFile.getResourcePackIndex();
-                if (index == null) {
-                    index = new HashMap<>();
-                }
                 if (!index.containsValue(hash)) {
                     // Hash is unknown, we have to write the resource pack ourselves
                     doWrite = true;
@@ -190,7 +186,7 @@ public class ResourcePackRecorder {
 
             Futures.getUnchecked(mc.addScheduledTask(() -> mc.displayGuiScreen(guiScreen)));
 
-            Map<String, String> sessionInfo = ResourcePackRepository.func_190115_a();
+            Map<String, String> sessionInfo = ResourcePackRepository.getDownloadHeaders();
             repo.downloadingPacks = HttpUtil.downloadResourcePack(file, url, sessionInfo, 50 * 1024 * 1024, guiScreen, mc.getProxy());
             Futures.addCallback(repo.downloadingPacks, new FutureCallback<Object>() {
                 @Override

src/main/java/com/replaymod/render/RenderSettings.java

@@ -1,8 +1,6 @@
 package com.replaymod.render;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.Getter;
 import net.minecraft.client.resources.I18n;
 import org.lwjgl.util.ReadableColor;
 
@@ -47,7 +45,7 @@ public class RenderSettings {
         }
 
         public String getValue() {
-            return "-y -f rawvideo -pix_fmt rgb24 -s %WIDTH%x%HEIGHT% -r %FPS% -i - %FILTERS%" + preset;
+            return "-y -f rawvideo -pix_fmt rgb24 -s %WIDTH%x%HEIGHT% -r %FPS% -i - " + preset;
         }
 
         public String getFileExtension() {
@@ -66,19 +64,6 @@ public class RenderSettings {
         }
     }
 
-    @AllArgsConstructor
-    public enum AntiAliasing {
-        NONE(1), X2(2), X4(4), X8(8);
-
-        @Getter
-        private final int factor;
-
-        @Override
-        public String toString() {
-            return I18n.format("replaymod.gui.rendersettings.antialiasing." + name().toLowerCase());
-        }
-    }
-
     private final RenderMethod renderMethod;
     private final EncodingPreset encodingPreset;
     private final int videoWidth;
@@ -93,48 +78,9 @@ public class RenderSettings {
     private final boolean stabilizeRoll;
     private final ReadableColor chromaKeyingColor;
     private final boolean inject360Metadata;
-    private final AntiAliasing antiAliasing;
 
     private final String exportCommand;
     private final String exportArguments;
 
     private final boolean highPerformance;
-
-    /**
-     * @return the width of the output video during rendering, including the upscale for Anti-Aliasing.
-     */
-    public int getVideoWidth() {
-        return videoWidth * antiAliasing.getFactor();
-    }
-
-    /**
-     * @return the height of the output video during rendering, including the upscale for Anti-Aliasing.
-     */
-    public int getVideoHeight() {
-        return videoHeight * antiAliasing.getFactor();
-    }
-
-    /**
-     * @return the actual width of the output video.
-     */
-    public int getTargetVideoWidth() {
-        return videoWidth;
-    }
-
-    /**
-     * @return the actual height of the output video.
-     */
-    public int getTargetVideoHeight() {
-        return videoHeight;
-    }
-
-    public String getVideoFilters() {
-        if (antiAliasing == AntiAliasing.NONE) {
-            return "";
-        } else {
-            double factor = 1.0 / antiAliasing.getFactor();
-            return String.format("-vf scale=iw*%1$s:ih*%1$s ", factor);
-        }
-    }
-
 }

src/main/java/com/replaymod/render/ReplayModRender.java

@@ -1,39 +1,30 @@
 package com.replaymod.render;
 
 import com.replaymod.core.ReplayMod;
-import com.replaymod.render.utils.RenderJob;
-import com.replaymod.replay.events.ReplayCloseEvent;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.util.ReportedException;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
-@Mod(modid = ReplayModRender.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
+@Mod(modid = ReplayModRender.MOD_ID, useMetadata = true)
 public class ReplayModRender {
     public static final String MOD_ID = "replaymod-render";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModRender instance;
 
-    private ReplayMod core;
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
 
-    public static Logger LOGGER;
+    private Logger logger;
 
     private Configuration configuration;
-    private final List<RenderJob> renderQueue = new ArrayList<>();
 
     public ReplayMod getCore() {
         return core;
@@ -41,20 +32,12 @@ public class ReplayModRender {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        LOGGER = event.getModLog();
-        core = ReplayMod.instance;
+        logger = event.getModLog();
         configuration = new Configuration(event.getSuggestedConfigurationFile());
 
-        MinecraftForge.EVENT_BUS.register(this);
-
         core.getSettingsRegistry().register(Setting.class);
     }
 
-    @SubscribeEvent
-    public void onReplayClose(ReplayCloseEvent.Post event) {
-        renderQueue.clear();
-    }
-
     public File getVideoFolder() {
         String path = core.getSettingsRegistry().get(Setting.RENDER_PATH);
         File folder = new File(path.startsWith("./") ? core.getMinecraft().mcDataDir : null, path);
@@ -69,8 +52,4 @@ public class ReplayModRender {
     public Configuration getConfiguration() {
         return configuration;
     }
-
-    public List<RenderJob> getRenderQueue() {
-        return renderQueue;
-    }
 }

src/main/java/com/replaymod/render/VideoWriter.java

@@ -7,27 +7,17 @@ import com.replaymod.render.utils.StreamPipe;
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
-import net.minecraft.util.Util;
-import net.minecraftforge.fml.common.versioning.ComparableVersion;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.TeeOutputStream;
 import org.lwjgl.util.ReadableDimension;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import static com.replaymod.render.ReplayModRender.LOGGER;
 import static org.apache.commons.lang3.Validate.isTrue;
 
 public class VideoWriter implements FrameConsumer<RGBFrame> {
@@ -53,11 +43,10 @@ public class VideoWriter implements FrameConsumer<RGBFrame> {
                     .replace("%HEIGHT%", String.valueOf(settings.getVideoHeight()))
                     .replace("%FPS%", String.valueOf(settings.getFramesPerSecond()))
                     .replace("%FILENAME%", fileName)
-                    .replace("%BITRATE%", String.valueOf(settings.getBitRate()))
-                    .replace("%FILTERS%", settings.getVideoFilters());
+                    .replace("%BITRATE%", String.valueOf(settings.getBitRate()));
 
-        String executable = settings.getExportCommand().isEmpty() ? findFFmpeg() : settings.getExportCommand();
-        System.out.println("Starting " + executable + " with args: " + commandArgs);
+        String executable = settings.getExportCommand().isEmpty() ? "ffmpeg" : settings.getExportCommand();
+        System.out.println("Starting " + settings.getExportCommand() + " with args: " + commandArgs);
         String[] cmdline = new CommandLine(executable).addArguments(commandArgs).toStrings();
         process = new ProcessBuilder(cmdline).directory(outputFolder).start();
         File exportLogFile = new File(Minecraft.getMinecraft().mcDataDir, "export.log");
@@ -68,54 +57,6 @@ public class VideoWriter implements FrameConsumer<RGBFrame> {
         channel = Channels.newChannel(outputStream);
     }
 
-    private String findFFmpeg() {
-        switch (Util.getOSType()) {
-            case WINDOWS:
-                // Allow windows users to unpack the ffmpeg archive into a sub-folder of their .minecraft folder
-                File inDotMinecraft = new File(Minecraft.getMinecraft().mcDataDir, "ffmpeg/bin/ffmpeg.exe");
-                if (inDotMinecraft.exists()) {
-                    LOGGER.debug("FFmpeg found in .minecraft/ffmpeg");
-                    return inDotMinecraft.getAbsolutePath();
-                }
-                break;
-            case OSX:
-                // The PATH doesn't seem to be set as expected on OSX, therefore we check some common locations ourselves
-                for (String path : new String[]{"/usr/local/bin/ffmpeg", "/usr/bin/ffmpeg"}) {
-                    File file = new File(path);
-                    if (file.exists()) {
-                        LOGGER.debug("Found FFmpeg at {}", path);
-                        return path;
-                    } else {
-                        LOGGER.debug("FFmpeg not located at {}", path);
-                    }
-                }
-                // Homebrew doesn't seem to reliably symlink its installed binaries either
-                File homebrewFolder = new File("/usr/local/Cellar/ffmpeg");
-                String[] homebrewVersions = homebrewFolder.list();
-                if (homebrewVersions != null) {
-                    Optional<File> latestOpt = Arrays.stream(homebrewVersions)
-                            .map(ComparableVersion::new) // Convert file name to comparable version
-                            .sorted(Comparator.reverseOrder()) // Sort for latest version
-                            .map(ComparableVersion::toString) // Convert back to file name
-                            .map(v -> new File(new File(homebrewFolder, v), "bin/ffmpeg")) // Convert to binary files
-                            .filter(File::exists) // Filter invalid installations (missing executable)
-                            .findFirst(); // Take first one
-                    if (latestOpt.isPresent()) {
-                        File latest = latestOpt.get();
-                        LOGGER.debug("Found {} versions of FFmpeg installed with homebrew, chose {}",
-                                homebrewVersions.length, latest);
-                        return latest.getAbsolutePath();
-                    }
-                }
-                break;
-            case LINUX: // Linux users are entrusted to have their PATH configured correctly (most package manager do this)
-            case SOLARIS: // Never heard of anyone running this mod on Solaris having any problems
-            case UNKNOWN: // Unknown OS, just try to use "ffmpeg"
-        }
-        LOGGER.debug("Using default FFmpeg executable");
-        return "ffmpeg";
-    }
-
     @Override
     public void close() throws IOException {
         IOUtils.closeQuietly(outputStream);

src/main/java/com/replaymod/render/gui/GuiRenderQueue.java

@@ -1,277 +0,0 @@
-package com.replaymod.render.gui;
-
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.replaymod.render.ReplayModRender;
-import com.replaymod.render.rendering.VideoRenderer;
-import com.replaymod.render.utils.RenderJob;
-import com.replaymod.replay.ReplayHandler;
-import com.replaymod.replaystudio.pathing.path.Timeline;
-import com.replaymod.replaystudio.util.I18n;
-import de.johni0702.minecraft.gui.GuiRenderer;
-import de.johni0702.minecraft.gui.RenderInfo;
-import de.johni0702.minecraft.gui.container.AbstractGuiClickableContainer;
-import de.johni0702.minecraft.gui.container.GuiContainer;
-import de.johni0702.minecraft.gui.container.GuiPanel;
-import de.johni0702.minecraft.gui.container.GuiVerticalList;
-import de.johni0702.minecraft.gui.element.GuiButton;
-import de.johni0702.minecraft.gui.element.GuiLabel;
-import de.johni0702.minecraft.gui.element.GuiTextField;
-import de.johni0702.minecraft.gui.layout.CustomLayout;
-import de.johni0702.minecraft.gui.layout.GridLayout;
-import de.johni0702.minecraft.gui.layout.HorizontalLayout;
-import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
-import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
-import de.johni0702.minecraft.gui.utils.Colors;
-import net.minecraft.client.gui.GuiErrorScreen;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.util.ReportedException;
-import org.lwjgl.util.Dimension;
-import org.lwjgl.util.ReadableDimension;
-
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.util.List;
-
-import static com.replaymod.render.ReplayModRender.LOGGER;
-
-public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
-    private final GuiLabel title = new GuiLabel().setI18nText("replaymod.gui.renderqueue.title").setColor(Colors.BLACK);
-    private final GuiVerticalList list = new GuiVerticalList().setDrawShadow(true).setDrawSlider(true);
-    private final GuiButton addButton = new GuiButton().setI18nLabel("replaymod.gui.renderqueue.add").setSize(150, 20);
-    private final GuiButton renameButton = new GuiButton().setI18nLabel("replaymod.gui.rename").setSize(73, 20);
-    private final GuiButton removeButton = new GuiButton().setI18nLabel("replaymod.gui.remove").setSize(73, 20);
-    private final GuiButton renderButton = new GuiButton().setI18nLabel("replaymod.gui.render").setSize(150, 20);
-    private final GuiButton closeButton = new GuiButton().setI18nLabel("replaymod.gui.close").setSize(150, 20).onClick(this::close);
-
-    /*
-
-    |---------------------------------|
-    |       Add       |     Render    |
-    |---------------------------------|
-    | Rename | Remove |     Close     |
-    |---------------------------------|
-
-     */
-    private final GuiPanel buttonPanel = new GuiPanel()
-            .setLayout(new GridLayout().setSpacingX(5).setSpacingY(5).setColumns(2))
-            .addElements(null,
-                    addButton,
-                    renderButton,
-                    new GuiPanel().setLayout(new HorizontalLayout().setSpacing(4)).addElements(null,
-                            renameButton, removeButton),
-                    closeButton);
-
-    private final GuiContainer container;
-    private Entry selectedEntry;
-
-    {
-        popup.setLayout(new CustomLayout<GuiPanel>() {
-            @Override
-            protected void layout(GuiPanel container, int width, int height) {
-                pos(title, width / 2 - width(title) / 2, 0);
-                pos(list, 0, y(title) + height(title) + 5);
-                pos(buttonPanel, width / 2 - width(buttonPanel) / 2, height - height(buttonPanel));
-                size(list, width, y(buttonPanel) - y(list) - 10);
-            }
-
-            @Override
-            public ReadableDimension calcMinSize(GuiContainer<?> container) {
-                ReadableDimension screenSize = GuiRenderQueue.this.container.getMinSize();
-                return new Dimension(screenSize.getWidth() - 40,
-                        screenSize.getHeight() - 20 - buttonPanel.getMinSize().getHeight() - title.getMinSize().getHeight());
-            }
-        }).addElements(null, title, list, buttonPanel);
-    }
-
-    public GuiRenderQueue(GuiContainer container, GuiRenderSettings guiRenderSettings, ReplayHandler replayHandler, Timeline timeline) {
-        super(container);
-        this.container = container;
-        LOGGER.trace("Opening render queue popup");
-
-        setBackgroundColor(Colors.DARK_TRANSPARENT);
-
-        List<RenderJob> queue = ReplayModRender.instance.getRenderQueue();
-
-        for (RenderJob renderJob : queue) {
-            LOGGER.trace("Adding {} to job queue list", renderJob);
-            list.getListPanel().addElements(null, new Entry(renderJob));
-        }
-
-        addButton.onClick(() -> {
-            LOGGER.trace("Add button clicked");
-            // Open popup
-            GuiYesNoPopup popup = GuiYesNoPopup.open(container)
-                    .setYesI18nLabel("replaymod.gui.add").setNoI18nLabel("replaymod.gui.cancel");
-            popup.getInfo().setLayout(new HorizontalLayout(HorizontalLayout.Alignment.CENTER).setSpacing(5));
-            // Add content
-            GuiLabel label = new GuiLabel().setI18nText("replaymod.gui.renderqueue.jobname").setColor(Colors.BLACK);
-            GuiTextField nameField = new GuiTextField().setSize(150, 20).setFocused(true);
-            popup.getInfo().addElements(new HorizontalLayout.Data(0.5), label, nameField);
-            // Disable "Yes" button while name is empty
-            nameField.onTextChanged(old -> popup.getYesButton().setEnabled(!nameField.getText().isEmpty())).onEnter(() -> {
-                if (popup.getYesButton().isEnabled()) {
-                    popup.getYesButton().onClick();
-                }
-            });
-            popup.getYesButton().setDisabled();
-            // Register callback
-            Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
-                @Override
-                public void onSuccess(@Nullable Boolean result) {
-                    if (result == Boolean.TRUE) {
-                        RenderJob newJob = new RenderJob();
-                        newJob.setName(nameField.getText());
-                        newJob.setSettings(guiRenderSettings.save(false));
-                        newJob.setTimeline(timeline);
-                        LOGGER.trace("Adding new job: {}", newJob);
-                        queue.add(newJob);
-                        list.getListPanel().addElements(null, new Entry(newJob));
-                    } else {
-                        LOGGER.trace("Adding cancelled");
-                    }
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    LOGGER.error("Add Job popup:", t);
-                }
-            });
-        });
-        if (guiRenderSettings != null) {
-            addButton.setEnabled(guiRenderSettings.renderButton.isEnabled());
-        }
-
-        renameButton.onClick(() -> {
-            LOGGER.trace("Rename button clicked for {}", selectedEntry.job);
-            // Open popup
-            GuiYesNoPopup popup = GuiYesNoPopup.open(container)
-                    .setYesI18nLabel("replaymod.gui.rename").setNoI18nLabel("replaymod.gui.cancel");
-            popup.getInfo().setLayout(new HorizontalLayout(HorizontalLayout.Alignment.CENTER).setSpacing(5));
-            // Add content
-            GuiLabel label = new GuiLabel().setI18nText("replaymod.gui.renderqueue.jobname").setColor(Colors.BLACK);
-            GuiTextField nameField = new GuiTextField().setSize(150, 20).setFocused(true)
-                    .setText(selectedEntry.job.getName());
-            popup.getInfo().addElements(new HorizontalLayout.Data(0.5), label, nameField);
-            // Disable "Yes" button while name is empty
-            nameField.onTextChanged(old -> popup.getYesButton().setEnabled(!nameField.getText().isEmpty())).onEnter(() -> {
-                if (popup.getYesButton().isEnabled()) {
-                    popup.getYesButton().onClick();
-                }
-            });
-            // Register callback
-            Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
-                @Override
-                public void onSuccess(@Nullable Boolean result) {
-                    if (result == Boolean.TRUE) {
-                        LOGGER.trace("Renaming {} to \"{}\"", selectedEntry.job, nameField.getText());
-                        selectedEntry.setName(nameField.getText());
-                    } else {
-                        LOGGER.trace("Renaming cancelled");
-                    }
-                }
-
-                @Override
-                public void onFailure(Throwable t) {
-                    LOGGER.error("Rename Job popup:", t);
-                }
-            });
-        });
-
-        removeButton.onClick(() -> {
-            LOGGER.trace("Remove button clicked for {}", selectedEntry.job);
-            list.getListPanel().removeElement(selectedEntry);
-            queue.remove(selectedEntry.job);
-            selectedEntry = null;
-            updateButtons();
-        });
-
-        renderButton.onClick(() -> {
-            LOGGER.trace("Render button clicked");
-            // Close all GUIs (so settings in GuiRenderSettings are saved)
-            getMinecraft().displayGuiScreen(null);
-            // Start rendering
-            for (RenderJob renderJob : queue) {
-                LOGGER.info("Starting render job {}", renderJob);
-                try {
-                    VideoRenderer videoRenderer = new VideoRenderer(renderJob.getSettings(), replayHandler, renderJob.getTimeline());
-                    videoRenderer.renderVideo();
-                } catch (IOException e) {
-                    LOGGER.error("Rendering video:", e);
-                    GuiErrorScreen errorScreen = new GuiErrorScreen(I18n.format("replaymod.gui.rendering.error.title"),
-                            I18n.format("replaymod.gui.rendering.error.message"));
-                    getMinecraft().displayGuiScreen(errorScreen);
-                    return;
-                } catch (Throwable t) {
-                    CrashReport crashReport = CrashReport.makeCrashReport(t, "Rendering video");
-                    throw new ReportedException(crashReport);
-                }
-            }
-        });
-
-        updateButtons();
-    }
-
-    @Override
-    public void open() {
-        super.open();
-    }
-
-    @Override
-    protected GuiRenderQueue getThis() {
-        return this;
-    }
-
-    public void updateButtons() {
-        renameButton.setEnabled(selectedEntry != null);
-        removeButton.setEnabled(selectedEntry != null);
-        renderButton.setEnabled(!list.getListPanel().getChildren().isEmpty());
-    }
-
-    public class Entry extends AbstractGuiClickableContainer<Entry> {
-        public final GuiLabel label = new GuiLabel(this);
-        public final RenderJob job;
-
-        public Entry(RenderJob job) {
-            this.job = job;
-
-            setLayout(new CustomLayout<Entry>() {
-                @Override
-                protected void layout(Entry container, int width, int height) {
-                    pos(label, 5, height / 2 - height(label) / 2);
-                }
-
-                @Override
-                public ReadableDimension calcMinSize(GuiContainer<?> container) {
-                    return new Dimension(buttonPanel.calcMinSize().getWidth(), 16);
-                }
-            });
-            label.setText(job.getName());
-        }
-
-        @Override
-        protected void onClick() {
-            selectedEntry = this;
-            updateButtons();
-        }
-
-        @Override
-        public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
-            if (selectedEntry == this) {
-                renderer.drawRect(0, 0, size.getWidth(), size.getHeight(), Colors.BLACK);
-                renderer.drawRect(0, 0, 2, size.getHeight(), Colors.WHITE);
-            }
-            super.draw(renderer, size, renderInfo);
-        }
-
-        public void setName(String name) {
-            job.setName(name);
-            label.setText(name);
-        }
-
-        @Override
-        protected Entry getThis() {
-            return this;
-        }
-    }
-}

src/main/java/com/replaymod/render/gui/GuiRenderSettings.java

@@ -32,14 +32,13 @@ import net.minecraft.crash.CrashReport;
 import net.minecraft.util.ReportedException;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
-import org.lwjgl.util.Color;
 import org.lwjgl.util.Dimension;
-import org.lwjgl.util.ReadableColor;
 import org.lwjgl.util.ReadableDimension;
 
 import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
@@ -80,8 +79,8 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
                 }
             }).setMinSize(new Dimension(0, 20)).setValues(RenderSettings.EncodingPreset.values());
 
-    public final GuiNumberField videoWidth = new GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true);
-    public final GuiNumberField videoHeight = new GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true);
+    public final GuiNumberField videoWidth = new GuiNumberField().setSize(50, 20).setMinValue(1);
+    public final GuiNumberField videoHeight = new GuiNumberField().setSize(50, 20).setMinValue(1);
     public final GuiSlider frameRateSlider = new GuiSlider().onValueChanged(new Runnable() {
         @Override
         public void run() {
@@ -93,7 +92,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
             .setLayout(new HorizontalLayout(HorizontalLayout.Alignment.RIGHT).setSpacing(2))
             .addElements(new HorizontalLayout.Data(0.5), videoWidth, new GuiLabel().setText("*"), videoHeight);
 
-    public final GuiNumberField bitRateField = new GuiNumberField().setValue(10).setSize(50, 20).setValidateOnFocusChange(true);
+    public final GuiNumberField bitRateField = new GuiNumberField().setValue(10).setSize(50, 20);
     public final GuiDropdownMenu<String> bitRateUnit = new GuiDropdownMenu<String>()
             .setSize(50, 20).setValues("bps", "kbps", "mbps").setSelected("mbps");
 
@@ -150,18 +149,13 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
     public final GuiCheckbox inject360Metadata = new GuiCheckbox()
             .setI18nLabel("replaymod.gui.rendersettings.360metadata");
 
-    public final GuiDropdownMenu<RenderSettings.AntiAliasing> antiAliasingDropdown = new GuiDropdownMenu<RenderSettings.AntiAliasing>()
-            .setSize(200, 20).setValues(RenderSettings.AntiAliasing.values()).setSelected(RenderSettings.AntiAliasing.NONE);
-
     public final GuiPanel advancedPanel = new GuiPanel().setLayout(new VerticalLayout().setSpacing(15))
             .addElements(null, nametagCheckbox, new GuiPanel().setLayout(
                     new GridLayout().setCellsEqualSize(false).setColumns(2).setSpacingX(5).setSpacingY(15))
                     .addElements(new GridLayout.Data(0, 0.5),
                             new GuiLabel().setI18nText("replaymod.gui.rendersettings.stabilizecamera"), stabilizePanel,
                             chromaKeyingCheckbox, chromaKeyingColor,
-                            inject360Metadata,
-                            new GuiLabel(), // to show the anti-aliasing options in a new line
-                            new GuiLabel().setI18nText("replaymod.gui.rendersettings.antialiasing"), antiAliasingDropdown));
+                            inject360Metadata));
 
     public final GuiTextField exportCommand = new GuiTextField().setI18nHint("replaymod.gui.rendersettings.command")
             .setSize(55, 20).setMaxLength(100);
@@ -185,12 +179,6 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
 
 
     public final GuiPanel buttonPanel = new GuiPanel(contentPanel).setLayout(new HorizontalLayout().setSpacing(4));
-    public final GuiButton queueButton = new GuiButton(buttonPanel).onClick(new Runnable() {
-        @Override
-        public void run() {
-            new GuiRenderQueue(GuiRenderSettings.this, GuiRenderSettings.this, replayHandler, timeline).open();
-        }
-    }).setSize(100, 20).setI18nLabel("replaymod.gui.renderqueue.open");
     public final GuiButton renderButton = new GuiButton(buttonPanel).onClick(new Runnable() {
         @Override
         public void run() {
@@ -210,13 +198,13 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
                 throw new ReportedException(crashReport);
             }
         }
-    }).setSize(100, 20).setI18nLabel("replaymod.gui.render");
+    }).setSize(148, 20).setI18nLabel("replaymod.gui.render");
     public final GuiButton cancelButton = new GuiButton(buttonPanel).onClick(new Runnable() {
         @Override
         public void run() {
             getMinecraft().displayGuiScreen(null);
         }
-    }).setSize(100, 20).setI18nLabel("replaymod.gui.cancel");
+    }).setSize(148, 20).setI18nLabel("replaymod.gui.cancel");
 
     {
         setBackground(Background.NONE);
@@ -273,10 +261,12 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
         this.timeline = timeline;
 
         String json = getConfigProperty(ReplayModRender.instance.getConfiguration()).getString();
-        RenderSettings settings = new GsonBuilder()
-                .registerTypeAdapter(RenderSettings.class, (InstanceCreator<RenderSettings>) type -> getDefaultRenderSettings())
-                .registerTypeAdapter(ReadableColor.class, new Gson().getAdapter(Color.class))
-                .create().fromJson(json, RenderSettings.class);
+        RenderSettings settings = new GsonBuilder().registerTypeAdapter(RenderSettings.class, new InstanceCreator<RenderSettings>() {
+                    @Override
+                    public RenderSettings createInstance(Type type) {
+                        return getDefaultRenderSettings();
+                    }
+                }).create().fromJson(json, RenderSettings.class);
         load(settings);
     }
 
@@ -357,8 +347,8 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
     public void load(RenderSettings settings) {
         renderMethodDropdown.setSelected(settings.getRenderMethod());
         encodingPresetDropdown.setSelected(settings.getEncodingPreset());
-        videoWidth.setValue(settings.getTargetVideoWidth());
-        videoHeight.setValue(settings.getTargetVideoHeight());
+        videoWidth.setValue(settings.getVideoWidth());
+        videoHeight.setValue(settings.getVideoHeight());
         frameRateSlider.setValue(settings.getFramesPerSecond() - 10);
         if (settings.getBitRate() % (1 << 20) == 0) {
             bitRateField.setValue(settings.getBitRate() >> 20);
@@ -390,7 +380,6 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
             chromaKeyingColor.setColor(settings.getChromaKeyingColor());
         }
         inject360Metadata.setChecked(settings.isInject360Metadata());
-        antiAliasingDropdown.setSelected(settings.getAntiAliasing());
         exportCommand.setText(settings.getExportCommand());
         exportArguments.setText(settings.getExportArguments());
 
@@ -412,7 +401,6 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
                 stabilizeRoll.isChecked() && (serialize || stabilizeRoll.isEnabled()),
                 chromaKeyingCheckbox.isChecked() ? chromaKeyingColor.getColor() : null,
                 inject360Metadata.isChecked() && (serialize || inject360Metadata.isEnabled()),
-                antiAliasingDropdown.getSelectedValue(),
                 exportCommand.getText(),
                 exportArguments.getText(),
                 net.minecraft.client.gui.GuiScreen.isCtrlKeyDown()
@@ -427,7 +415,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
 
     private RenderSettings getDefaultRenderSettings() {
         return new RenderSettings(RenderSettings.RenderMethod.DEFAULT, RenderSettings.EncodingPreset.MP4_DEFAULT, 1920, 1080, 60, 10 << 20, null,
-                true, false, false, false, null, false, RenderSettings.AntiAliasing.NONE, "", RenderSettings.EncodingPreset.MP4_DEFAULT.getValue(), false);
+                true, false, false, false, null, false, "", RenderSettings.EncodingPreset.MP4_DEFAULT.getValue(), false);
     }
 
     @Override
@@ -443,8 +431,4 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
         return configuration.get("rendersettings", "settings", "{}",
                 "Last state of the render settings GUI. Internal use only.");
     }
-
-    public ReplayHandler getReplayHandler() {
-        return replayHandler;
-    }
 }

src/main/java/com/replaymod/render/rendering/VideoRenderer.java

@@ -1,7 +1,6 @@
 package com.replaymod.render.rendering;
 
 import com.replaymod.pathing.player.AbstractTimelinePlayer;
-import com.replaymod.pathing.player.ReplayTimer;
 import com.replaymod.pathing.properties.TimestampProperty;
 import com.replaymod.render.RenderSettings;
 import com.replaymod.render.ReplayModRender;
@@ -56,7 +55,6 @@ public class VideoRenderer implements RenderInfo {
     private boolean debugInfoWasShown;
     private Map<SoundCategory, Float> originalSoundLevels;
 
-    private TimelinePlayer timelinePlayer;
     private Future<Void> timelinePlayerFuture;
     private ChunkLoadingRenderGlobal chunkLoadingRenderGlobal;
 
@@ -176,8 +174,7 @@ public class VideoRenderer implements RenderInfo {
     }
 
     private void setup() {
-        timelinePlayer = new TimelinePlayer(replayHandler);
-        timelinePlayerFuture = timelinePlayer.start(timeline);
+        timelinePlayerFuture = new TimelinePlayer(replayHandler).start(timeline);
 
         if (!OpenGlHelper.isFramebufferEnabled()) {
             Display.setResizable(false);
@@ -229,8 +226,6 @@ public class VideoRenderer implements RenderInfo {
         if (!timelinePlayerFuture.isDone()) {
             timelinePlayerFuture.cancel(false);
         }
-        // Tear down of the timeline player might only happen the next tick after it was cancelled
-        timelinePlayer.onTick(new ReplayTimer.UpdatedEvent());
 
         if (!OpenGlHelper.isFramebufferEnabled()) {
             Display.setResizable(true);

src/main/java/com/replaymod/render/utils/RenderJob.java

@@ -1,12 +0,0 @@
-package com.replaymod.render.utils;
-
-import com.replaymod.render.RenderSettings;
-import com.replaymod.replaystudio.pathing.path.Timeline;
-import lombok.Data;
-
-@Data
-public class RenderJob {
-    private String name;
-    private Timeline timeline;
-    private RenderSettings settings;
-}

src/main/java/com/replaymod/replay/InputReplayTimer.java

@@ -147,7 +147,7 @@ public class InputReplayTimer extends WrappedTimer {
                 // TODO: Translate magic values to Keyboard.KEY_ constants
 
                 if (key == 32 && Keyboard.isKeyDown(61) && mc.ingameGUI != null) {
-                    mc.ingameGUI.getChatGUI().clearChatMessages();
+                    mc.ingameGUI.getChatGUI().clearChatMessages(false);
                 }
 
                 if (key == 31 && Keyboard.isKeyDown(61)) {

src/main/java/com/replaymod/replay/ReplayHandler.java

@@ -128,7 +128,7 @@ public class ReplayHandler {
     }
 
     private void setup() {
-        mc.ingameGUI.getChatGUI().clearChatMessages();
+        mc.ingameGUI.getChatGUI().clearChatMessages(true);
 
         NetworkManager networkManager = new NetworkManager(EnumPacketDirection.CLIENTBOUND) {
             @Override

src/main/java/com/replaymod/replay/ReplayModReplay.java

@@ -28,17 +28,15 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Optional;
 
-@Mod(modid = ReplayModReplay.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
+@Mod(modid = ReplayModReplay.MOD_ID, useMetadata = true)
 public class ReplayModReplay {
     public static final String MOD_ID = "replaymod-replay";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModReplay instance;
 
-    private ReplayMod core;
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
 
     private final CameraControllerRegistry cameraControllerRegistry = new CameraControllerRegistry();
 
@@ -53,7 +51,6 @@ public class ReplayModReplay {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
-        core = ReplayMod.instance;
 
         core.getSettingsRegistry().register(Setting.class);
 

src/main/java/com/replaymod/replay/camera/CameraEntity.java

@@ -252,15 +252,6 @@ public class CameraEntity extends EntityPlayerSP {
         return false;
     }
 
-    @Override
-    public boolean isInvisible() {
-        Entity view = mc.getRenderViewEntity();
-        if (view != this) {
-            return view.isInvisible();
-        }
-        return super.isInvisible();
-    }
-
     @Override
     public ResourceLocation getLocationSkin() {
         Entity view = mc.getRenderViewEntity();

src/main/java/com/replaymod/replay/gui/overlay/GuiEditMarkerPopup.java

@@ -16,10 +16,6 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.ReadablePoint;
 
 public class GuiEditMarkerPopup extends AbstractGuiPopup<GuiEditMarkerPopup> implements Typeable {
-    private static GuiNumberField newGuiNumberField() {
-        return new GuiNumberField().setSize(150, 20).setValidateOnFocusChange(true);
-    }
-
     private final ReplayHandler replayHandler;
     private final Marker marker;
 
@@ -27,15 +23,15 @@ public class GuiEditMarkerPopup extends AbstractGuiPopup<GuiEditMarkerPopup> imp
 
     public final GuiTextField nameField = new GuiTextField().setSize(150, 20);
     // TODO: Replace with a min/sec/msec field
-    public final GuiNumberField timeField = newGuiNumberField().setPrecision(0);
+    public final GuiNumberField timeField = new GuiNumberField().setSize(150, 20).setPrecision(0);
 
-    public final GuiNumberField xField = newGuiNumberField().setPrecision(10);
-    public final GuiNumberField yField = newGuiNumberField().setPrecision(10);
-    public final GuiNumberField zField = newGuiNumberField().setPrecision(10);
+    public final GuiNumberField xField = new GuiNumberField().setSize(150, 20).setPrecision(10);
+    public final GuiNumberField yField = new GuiNumberField().setSize(150, 20).setPrecision(10);
+    public final GuiNumberField zField = new GuiNumberField().setSize(150, 20).setPrecision(10);
 
-    public final GuiNumberField yawField = newGuiNumberField().setPrecision(5);
-    public final GuiNumberField pitchField = newGuiNumberField().setPrecision(5);
-    public final GuiNumberField rollField = newGuiNumberField().setPrecision(5);
+    public final GuiNumberField yawField = new GuiNumberField().setSize(150, 20).setPrecision(5);
+    public final GuiNumberField pitchField = new GuiNumberField().setSize(150, 20).setPrecision(5);
+    public final GuiNumberField rollField = new GuiNumberField().setSize(150, 20).setPrecision(5);
 
     public final GuiPanel inputs = GuiPanel.builder()
             .layout(new GridLayout().setColumns(2).setSpacingX(7).setSpacingY(3))

src/main/java/com/replaymod/replay/mixin/MixinViewFrustum.java

@@ -31,7 +31,7 @@ public abstract class MixinViewFrustum {
     }
 
     /**
-     * Instead of calling {@link RenderChunk#setOrigin(int, int, int)} we recreate the render chunk
+     * Instead of calling {@link RenderChunk#setPosition(int, int, int)} we recreate the render chunk
      * which seems to solve the problem that chunks are invisible when you leave an area and return
      * to it.
      * Any better fixes are welcome.
@@ -59,7 +59,7 @@ public abstract class MixinViewFrustum {
                         // Recreate render chunk instead of setting its position
                         (renderChunks[(j1 * this.countChunksY + l1) * this.countChunksX + l] =
                                 renderChunkFactory.create(world, renderGlobal, 0)
-                        ).setOrigin(blockpos.getX(), blockpos.getY(), blockpos.getZ());
+                        ).setPosition(blockpos.getX(), blockpos.getY(), blockpos.getZ());
                     }
                 }
             }

src/main/java/com/replaymod/simplepathing/InterpolatorType.java

@@ -1,54 +0,0 @@
-package com.replaymod.simplepathing;
-
-import com.replaymod.replaystudio.pathing.interpolation.CatmullRomSplineInterpolator;
-import com.replaymod.replaystudio.pathing.interpolation.CubicSplineInterpolator;
-import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
-import com.replaymod.replaystudio.pathing.interpolation.LinearInterpolator;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.function.Supplier;
-
-@AllArgsConstructor
-public enum InterpolatorType {
-    DEFAULT("default", null, null),
-    CATMULL_ROM("catmullrom", CatmullRomSplineInterpolator.class, () -> new CatmullRomSplineInterpolator(0.5)),
-    CUBIC("cubic", CubicSplineInterpolator.class, CubicSplineInterpolator::new),
-    LINEAR("linear", LinearInterpolator.class, LinearInterpolator::new);
-
-    @Getter
-    private String localizationKey;
-
-    @Getter
-    private Class<? extends Interpolator> interpolatorClass;
-
-    private Supplier<Interpolator> interpolatorConstructor;
-
-    public String getI18nName() {
-        return String.format("replaymod.gui.editkeyframe.interpolator.%1$s.name", localizationKey);
-    }
-
-    public String getI18nDescription() {
-        return String.format("replaymod.gui.editkeyframe.interpolator.%1$s.desc", localizationKey);
-    }
-
-    public static InterpolatorType fromString(String string) {
-        for (InterpolatorType t : values()) {
-            if (t.getI18nName().equals(string)) return t;
-        }
-        return CATMULL_ROM; //the default
-    }
-
-    public static InterpolatorType fromClass(Class<? extends Interpolator> cls) {
-        for (InterpolatorType type : values()) {
-            if (cls.equals(type.getInterpolatorClass())) {
-                return type;
-            }
-        }
-        return DEFAULT;
-    }
-
-    public Interpolator newInstance() {
-        return interpolatorConstructor.get();
-    }
-}

src/main/java/com/replaymod/simplepathing/ReplayModSimplePathing.java

@@ -1,37 +1,45 @@
 package com.replaymod.simplepathing;
 
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.core.events.SettingsChangedEvent;
+import com.replaymod.pathing.properties.CameraProperties;
+import com.replaymod.pathing.properties.SpectatorProperty;
+import com.replaymod.pathing.properties.TimestampProperty;
 import com.replaymod.replay.events.ReplayCloseEvent;
 import com.replaymod.replay.events.ReplayOpenEvent;
+import com.replaymod.replaystudio.pathing.PathingRegistry;
+import com.replaymod.replaystudio.pathing.impl.TimelineImpl;
+import com.replaymod.replaystudio.pathing.interpolation.CubicSplineInterpolator;
+import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
+import com.replaymod.replaystudio.pathing.interpolation.LinearInterpolator;
 import com.replaymod.replaystudio.pathing.path.Keyframe;
-import com.replaymod.simplepathing.SPTimeline.SPPath;
+import com.replaymod.replaystudio.pathing.path.Timeline;
 import com.replaymod.simplepathing.gui.GuiPathing;
 import com.replaymod.simplepathing.preview.PathPreview;
-import lombok.Getter;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.apache.logging.log4j.Logger;
 
-@Mod(modid = ReplayModSimplePathing.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        useMetadata = true)
-public class ReplayModSimplePathing {
+import java.io.IOException;
+
+@Mod(modid = ReplayModSimplePathing.MOD_ID, useMetadata = true)
+public class ReplayModSimplePathing implements PathingRegistry {
     public static final String MOD_ID = "replaymod-simplepathing";
 
-    private ReplayMod core;
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
 
-    public static Logger LOGGER;
+    private Logger logger;
 
     private GuiPathing guiPathing;
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        LOGGER = event.getModLog();
-        core = ReplayMod.instance;
+        logger = event.getModLog();
 
         core.getSettingsRegistry().register(Setting.class);
 
@@ -43,60 +51,84 @@ public class ReplayModSimplePathing {
 
     @SubscribeEvent
     public void postReplayOpen(ReplayOpenEvent.Post event) {
-        currentTimeline = new SPTimeline();
         guiPathing = new GuiPathing(core, this, event.getReplayHandler());
     }
 
     @SubscribeEvent
     public void onReplayClose(ReplayCloseEvent.Post event) {
-        currentTimeline = null;
         guiPathing = null;
-        selectedPath = null;
+        currentTimeline = createTimeline();
+        currentTimeline.createPath();
+        currentTimeline.createPath();
+        selectedKeyframe = null;
     }
 
     @SubscribeEvent
     public void onSettingsChanged(SettingsChangedEvent event) {
-        if (event.getKey() == Setting.DEFAULT_INTERPOLATION) {
+        if (event.getKey() == Setting.LINEAR_INTERPOLATION) {
             if (currentTimeline != null && guiPathing != null) {
-                updateDefaultInterpolatorType();
+                currentTimeline.applyChange(guiPathing.updateInterpolators());
             }
         }
     }
 
-    private SPTimeline currentTimeline;
+    private Timeline currentTimeline = createTimeline(); { currentTimeline.createPath(); currentTimeline.createPath(); }
+    private Keyframe selectedKeyframe;
 
-    @Getter
-    private SPPath selectedPath;
-    @Getter
-    private long selectedTime;
-
-    public boolean isSelected(Keyframe keyframe) {
-        return selectedPath != null && currentTimeline.getKeyframe(selectedPath, selectedTime) == keyframe;
+    public Keyframe getSelectedKeyframe() {
+        return selectedKeyframe;
     }
 
-    public void setSelected(SPPath path, long time) {
-        selectedPath = path;
-        selectedTime = time;
+    public void setSelectedKeyframe(Keyframe selected) {
+        this.selectedKeyframe = selected;
     }
 
-    public void setCurrentTimeline(SPTimeline newTimeline) {
-        selectedPath = null;
-        currentTimeline = newTimeline;
+    public void setCurrentTimeline(Timeline currentTimeline) {
+        if (this.currentTimeline != currentTimeline) {
+            selectedKeyframe = null;
+        }
+        this.currentTimeline = currentTimeline;
     }
 
-    public void clearCurrentTimeline() {
-        setCurrentTimeline(new SPTimeline());
-        updateDefaultInterpolatorType();
-    }
-
-    public SPTimeline getCurrentTimeline() {
+    public Timeline getCurrentTimeline() {
         return currentTimeline;
     }
 
-    private void updateDefaultInterpolatorType() {
-        InterpolatorType newDefaultType =
-                InterpolatorType.fromString(core.getSettingsRegistry().get(Setting.DEFAULT_INTERPOLATION));
-        currentTimeline.setDefaultInterpolatorType(newDefaultType);
+    @Override
+    public Timeline createTimeline() {
+        Timeline timeline = new TimelineImpl();
+
+        timeline.registerProperty(TimestampProperty.PROPERTY);
+        timeline.registerProperty(CameraProperties.POSITION);
+        timeline.registerProperty(CameraProperties.ROTATION);
+        timeline.registerProperty(SpectatorProperty.PROPERTY);
+
+        return timeline;
+    }
+
+    @Override
+    public void serializeInterpolator(JsonWriter writer, Interpolator interpolator) throws IOException {
+        if (interpolator instanceof LinearInterpolator) {
+            writer.value("linear");
+        } else if (interpolator instanceof CubicSplineInterpolator) {
+            writer.value("cubic-spline");
+        } else {
+            throw new IOException("Unknown interpolator type: " + interpolator);
+        }
+    }
+
+    @Override
+    public Interpolator deserializeInterpolator(JsonReader reader) throws IOException {
+        String type = reader.nextString();
+        switch (type) {
+            case "linear":
+                return new LinearInterpolator();
+            case "cubic-spline":
+                return new CubicSplineInterpolator();
+            default:
+                throw new IOException("Unknown interpolation type: " + type);
+
+        }
     }
 
     public ReplayMod getCore() {

src/main/java/com/replaymod/simplepathing/SPTimeline.java

@@ -1,669 +0,0 @@
-package com.replaymod.simplepathing;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import com.replaymod.pathing.properties.CameraProperties;
-import com.replaymod.pathing.properties.SpectatorProperty;
-import com.replaymod.pathing.properties.TimestampProperty;
-import com.replaymod.replaystudio.pathing.PathingRegistry;
-import com.replaymod.replaystudio.pathing.change.AddKeyframe;
-import com.replaymod.replaystudio.pathing.change.Change;
-import com.replaymod.replaystudio.pathing.change.CombinedChange;
-import com.replaymod.replaystudio.pathing.change.SetInterpolator;
-import com.replaymod.replaystudio.pathing.change.UpdateKeyframeProperties;
-import com.replaymod.replaystudio.pathing.impl.TimelineImpl;
-import com.replaymod.replaystudio.pathing.interpolation.CatmullRomSplineInterpolator;
-import com.replaymod.replaystudio.pathing.interpolation.CubicSplineInterpolator;
-import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
-import com.replaymod.replaystudio.pathing.interpolation.LinearInterpolator;
-import com.replaymod.replaystudio.pathing.path.Keyframe;
-import com.replaymod.replaystudio.pathing.path.Path;
-import com.replaymod.replaystudio.pathing.path.PathSegment;
-import com.replaymod.replaystudio.pathing.path.Timeline;
-import com.replaymod.replaystudio.pathing.property.Property;
-import com.replaymod.replaystudio.util.EntityPositionTracker;
-import com.replaymod.replaystudio.util.Location;
-import com.replaymod.simplepathing.properties.ExplicitInterpolationProperty;
-import lombok.Getter;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.crash.CrashReportCategory;
-import net.minecraft.util.ReportedException;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.tuple.Triple;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import static com.replaymod.replaystudio.pathing.change.RemoveKeyframe.create;
-import static com.replaymod.simplepathing.ReplayModSimplePathing.LOGGER;
-
-/**
- * Simplified timeline abstraction used in the SimplePathing module.
- */
-public class SPTimeline implements PathingRegistry {
-    public enum SPPath {
-        TIME,
-        POSITION,
-    }
-
-    @Getter
-    private final Timeline timeline;
-    @Getter
-    private final Path timePath;
-    @Getter
-    private final Path positionPath;
-
-    @Getter
-    private EntityPositionTracker entityTracker;
-    private InterpolatorType defaultInterpolatorType = InterpolatorType.fromString("invalid string returns default");
-
-    public SPTimeline() {
-        this(createInitialTimeline());
-    }
-
-    public SPTimeline(Timeline timeline) {
-        this.timeline = timeline;
-        this.timePath = timeline.getPaths().get(SPPath.TIME.ordinal());
-        this.positionPath = timeline.getPaths().get(SPPath.POSITION.ordinal());
-    }
-
-    public Path getPath(SPPath path) {
-        switch (path) {
-            case TIME:
-                return getTimePath();
-            case POSITION:
-                return getPositionPath();
-        }
-        throw new IllegalArgumentException("Unknown path " + path);
-    }
-
-    public Keyframe getKeyframe(SPPath path, long keyframe) {
-        return getPath(path).getKeyframe(keyframe);
-    }
-
-    public void setEntityTracker(EntityPositionTracker entityTracker) {
-        Preconditions.checkState(this.entityTracker == null, "Entity tracker already set");
-        this.entityTracker = entityTracker;
-    }
-
-    public void setDefaultInterpolatorType(InterpolatorType defaultInterpolatorType) {
-        Validate.isTrue(defaultInterpolatorType != InterpolatorType.DEFAULT, "Must not be DEFAULT");
-        this.defaultInterpolatorType = Validate.notNull(defaultInterpolatorType);
-
-        if (entityTracker != null) {
-            timeline.pushChange(updateInterpolators());
-        }
-    }
-
-    public Change setDefaultInterpolator(Interpolator interpolator) {
-        Preconditions.checkState(defaultInterpolatorType != null, "Default interpolator type not set.");
-        Validate.isInstanceOf(defaultInterpolatorType.getInterpolatorClass(), interpolator);
-
-        registerPositionInterpolatorProperties(interpolator);
-
-        Change change = CombinedChange.create(
-                positionPath.getSegments().stream()
-                        // Ignore explicitly set segments
-                        .filter(s -> !s.getStartKeyframe().getValue(ExplicitInterpolationProperty.PROPERTY).isPresent())
-                        // Ignore spectator segments
-                        .filter(s -> !isSpectatorSegment(s))
-                        // Update interpolator for every remaining segment
-                        // This will create a fragmented interpolator which is split by the updateInterpolators call
-                        .map(s -> SetInterpolator.create(s, interpolator)).toArray(Change[]::new)
-        );
-        change.apply(timeline);
-        return CombinedChange.createFromApplied(change, updateInterpolators());
-    }
-
-    public boolean isTimeKeyframe(long time) {
-        return timePath.getKeyframe(time) != null;
-    }
-
-    public boolean isPositionKeyframe(long time) {
-        return positionPath.getKeyframe(time) != null;
-    }
-
-    public boolean isSpectatorKeyframe(long time) {
-        Keyframe keyframe = positionPath.getKeyframe(time);
-        return keyframe != null && keyframe.getValue(SpectatorProperty.PROPERTY).isPresent();
-    }
-
-    public void addPositionKeyframe(long time, double posX, double posY, double posZ,
-                                    float yaw, float pitch, float roll, int spectated) {
-        LOGGER.debug("Adding position keyframe at {} pos {}/{}/{} rot {}/{}/{} entId {}",
-                time, posX, posY, posZ, yaw, pitch, roll, spectated);
-
-        Path path = positionPath;
-
-        Preconditions.checkState(positionPath.getKeyframe(time) == null, "Keyframe already exists");
-
-        Change change = AddKeyframe.create(path, time);
-        change.apply(timeline);
-        Keyframe keyframe = path.getKeyframe(time);
-
-        UpdateKeyframeProperties.Builder builder = UpdateKeyframeProperties.create(path, keyframe);
-        builder.setValue(CameraProperties.POSITION, Triple.of(posX, posY, posZ));
-        builder.setValue(CameraProperties.ROTATION, Triple.of(yaw, pitch, roll));
-        if (spectated != -1) {
-            builder.setValue(SpectatorProperty.PROPERTY, spectated);
-        }
-        UpdateKeyframeProperties updateChange = builder.done();
-        updateChange.apply(timeline);
-        change = CombinedChange.createFromApplied(change, updateChange);
-
-        // If this new keyframe formed the first segment of the path
-        if (path.getSegments().size() == 1) {
-            // then create an initial interpolator of default type
-            PathSegment segment = path.getSegments().iterator().next();
-            Interpolator interpolator = createDefaultInterpolator();
-            SetInterpolator setInterpolator = SetInterpolator.create(segment, interpolator);
-            setInterpolator.apply(timeline);
-            change = CombinedChange.createFromApplied(change, setInterpolator);
-        }
-
-        // Update interpolators for spectator keyframes
-        // while this is overkill, it is far simpler than updating differently for every possible case
-        change = CombinedChange.createFromApplied(change, updateInterpolators());
-
-        Change specPosUpdate = updateSpectatorPositions();
-        specPosUpdate.apply(timeline);
-        change = CombinedChange.createFromApplied(change, specPosUpdate);
-
-        timeline.pushChange(change);
-    }
-
-    public Change updatePositionKeyframe(long time, double posX, double posY, double posZ,
-                                    float yaw, float pitch, float roll) {
-        LOGGER.debug("Updating position keyframe at {} to pos {}/{}/{} rot {}/{}/{}",
-                time, posX, posY, posZ, yaw, pitch, roll);
-
-        Keyframe keyframe = positionPath.getKeyframe(time);
-
-        Preconditions.checkState(keyframe != null, "Keyframe does not exists");
-        Preconditions.checkState(!keyframe.getValue(SpectatorProperty.PROPERTY).isPresent(), "Cannot update spectator keyframe");
-
-        Change change = UpdateKeyframeProperties.create(positionPath, keyframe)
-                .setValue(CameraProperties.POSITION, Triple.of(posX, posY, posZ))
-                .setValue(CameraProperties.ROTATION, Triple.of(yaw, pitch, roll))
-                .done();
-        change.apply(timeline);
-        return change;
-    }
-
-    public void removePositionKeyframe(long time) {
-        LOGGER.debug("Removing position keyframe at {}", time);
-
-        Path path = positionPath;
-        Keyframe keyframe = path.getKeyframe(time);
-
-        Preconditions.checkState(keyframe != null, "No keyframe at that time");
-
-        Change change = create(path, keyframe);
-        change.apply(timeline);
-
-        // Update interpolators for spectator keyframes
-        // while this is overkill, it is far simpler than updating differently for every possible case
-        change = CombinedChange.createFromApplied(change, updateInterpolators());
-
-        Change specPosUpdate = updateSpectatorPositions();
-        specPosUpdate.apply(timeline);
-        change = CombinedChange.createFromApplied(change, specPosUpdate);
-
-        timeline.pushChange(change);
-    }
-
-    public void addTimeKeyframe(long time, int replayTime) {
-        LOGGER.debug("Adding time keyframe at {} time {}", time, replayTime);
-
-        Path path = timePath;
-
-        Preconditions.checkState(path.getKeyframe(time) == null, "Keyframe already exists");
-
-        Change change = AddKeyframe.create(path, time);
-        change.apply(timeline);
-        Keyframe keyframe = path.getKeyframe(time);
-
-        UpdateKeyframeProperties updateChange = UpdateKeyframeProperties.create(path, keyframe)
-                .setValue(TimestampProperty.PROPERTY, replayTime)
-                .done();
-        updateChange.apply(timeline);
-        change = CombinedChange.createFromApplied(change, updateChange);
-
-        // If this new keyframe formed the first segment of the path
-        if (path.getSegments().size() == 1) {
-            // then create an initial interpolator
-            PathSegment segment = path.getSegments().iterator().next();
-            Interpolator interpolator = new LinearInterpolator();
-            interpolator.registerProperty(TimestampProperty.PROPERTY);
-            SetInterpolator setInterpolator = SetInterpolator.create(segment, interpolator);
-            setInterpolator.apply(timeline);
-            change = CombinedChange.createFromApplied(change, setInterpolator);
-        }
-
-        Change specPosUpdate = updateSpectatorPositions();
-        specPosUpdate.apply(timeline);
-        change = CombinedChange.createFromApplied(change, specPosUpdate);
-
-        timeline.pushChange(change);
-    }
-
-    public Change updateTimeKeyframe(long time, int replayTime) {
-        LOGGER.debug("Updating time keyframe at {} to time {}", time, replayTime);
-
-        Keyframe keyframe = timePath.getKeyframe(time);
-
-        Preconditions.checkState(keyframe != null, "Keyframe does not exists");
-
-        Change change = UpdateKeyframeProperties.create(timePath, keyframe)
-                .setValue(TimestampProperty.PROPERTY, replayTime)
-                .done();
-        change.apply(timeline);
-        return change;
-    }
-
-    public void removeTimeKeyframe(long time) {
-        LOGGER.debug("Removing time keyframe at {}", time);
-
-        Path path = timePath;
-        Keyframe keyframe = path.getKeyframe(time);
-
-        Preconditions.checkState(keyframe != null, "No keyframe at that time");
-
-        Change change = create(path, keyframe);
-        change.apply(timeline);
-
-        Change specPosUpdate = updateSpectatorPositions();
-        specPosUpdate.apply(timeline);
-        change = CombinedChange.createFromApplied(change, specPosUpdate);
-
-        timeline.pushChange(change);
-    }
-
-    public Change setInterpolatorToDefault(long time) {
-        LOGGER.debug("Setting interpolator of position keyframe at {} to the default", time);
-
-        Keyframe keyframe = positionPath.getKeyframe(time);
-
-        Preconditions.checkState(keyframe != null, "Keyframe does not exists");
-
-        Change change = UpdateKeyframeProperties.create(positionPath, keyframe)
-                .removeProperty(ExplicitInterpolationProperty.PROPERTY)
-                .done();
-        change.apply(timeline);
-        return CombinedChange.createFromApplied(change, updateInterpolators());
-    }
-
-    public Change setInterpolator(long time, Interpolator interpolator) {
-        LOGGER.debug("Setting interpolator of position keyframe at {} to {}", time, interpolator);
-
-        Keyframe keyframe = positionPath.getKeyframe(time);
-        Preconditions.checkState(keyframe != null, "Keyframe does not exists");
-        PathSegment segment = positionPath.getSegments().stream().filter(s -> s.getStartKeyframe() == keyframe)
-                .findFirst().orElseThrow(() -> new IllegalStateException("Keyframe has no following segment."));
-
-        registerPositionInterpolatorProperties(interpolator);
-
-        Change change = CombinedChange.create(
-                UpdateKeyframeProperties.create(positionPath, keyframe)
-                        .setValue(ExplicitInterpolationProperty.PROPERTY, ObjectUtils.NULL)
-                        .done(),
-                SetInterpolator.create(segment, interpolator)
-        );
-        change.apply(timeline);
-        return CombinedChange.createFromApplied(change, updateInterpolators());
-    }
-
-    public Change moveKeyframe(SPPath spPath, long oldTime, long newTime) {
-        LOGGER.debug("Moving keyframe on {} from {} to {}", spPath, oldTime, newTime);
-        Path path = getPath(spPath);
-        Keyframe keyframe = path.getKeyframe(oldTime);
-
-        Preconditions.checkState(keyframe != null, "No keyframe at specified time");
-
-        // Interpolator of the first segment might be required later if it is the only one
-        Optional<Interpolator> firstInterpolator =
-                path.getSegments().stream().findFirst().map(PathSegment::getInterpolator);
-
-        // The interpolator of the previous segment
-        Optional<Interpolator> interpolatorBefore =
-                path.getSegments().stream().filter(s -> s.getEndKeyframe() == keyframe).findFirst().map(PathSegment::getInterpolator);
-
-        // The interpolator of the following segment
-        Optional<Interpolator> interpolatorAfter =
-                path.getSegments().stream().filter(s -> s.getStartKeyframe() == keyframe).findFirst().map(PathSegment::getInterpolator);
-
-        // First remove the old keyframe
-        Change removeChange = create(path, keyframe);
-        removeChange.apply(timeline);
-
-        // and add a new one at the correct time
-        Change addChange = AddKeyframe.create(path, newTime);
-        addChange.apply(timeline);
-
-        // Then copy over all properties
-        UpdateKeyframeProperties.Builder builder = UpdateKeyframeProperties.create(path, path.getKeyframe(newTime));
-        for (Property property : keyframe.getProperties()) {
-            copyProperty(property, keyframe, builder);
-        }
-        Change propertyChange = builder.done();
-        propertyChange.apply(timeline);
-
-
-        Change restoreInterpolatorChange;
-        Keyframe newKf = path.getKeyframe(newTime);
-        if (Iterables.getLast(path.getKeyframes()) != newKf) { // Unless this is the last keyframe
-            // the interpolator of the following segment has been lost and needs to be restored
-            restoreInterpolatorChange = interpolatorAfter.<Change>flatMap(interpolator ->
-                    path.getSegments().stream().filter(s -> s.getStartKeyframe() == newKf).findFirst().map(segment ->
-                            SetInterpolator.create(segment, interpolator)
-                    )
-            ).orElseGet(CombinedChange::create);
-        } else { // If it is the last keyframe however,
-            // the interpolator of the previous segment has been lost and needs to be restored
-            restoreInterpolatorChange = interpolatorBefore.<Change>flatMap(interpolator ->
-                    path.getSegments().stream().filter(s -> s.getEndKeyframe() == newKf).findFirst().map(segment ->
-                            SetInterpolator.create(segment, interpolator)
-                    )
-            ).orElseGet(CombinedChange::create);
-        }
-        restoreInterpolatorChange.apply(timeline);
-
-        // Finally update the interpolators
-        Change interpolatorUpdateChange;
-        if (spPath == SPPath.POSITION) {
-            // Position / Spectator keyframes need special handling
-            interpolatorUpdateChange = updateInterpolators();
-        } else {
-            // Time keyframes only need updating when only one segment of them exists
-            if (path.getSegments().size() == 1) {
-                assert firstInterpolator.isPresent() : "One segment should have existed before as well";
-                interpolatorUpdateChange = SetInterpolator.create(path.getSegments().iterator().next(), firstInterpolator.get());
-            } else {
-                interpolatorUpdateChange = CombinedChange.create(); // Noop change
-            }
-            interpolatorUpdateChange.apply(timeline);
-        }
-
-        // and update spectator positions
-        Change spectatorChange = updateSpectatorPositions();
-        spectatorChange.apply(timeline);
-
-        return CombinedChange.createFromApplied(removeChange, addChange, propertyChange,
-                restoreInterpolatorChange, interpolatorUpdateChange, spectatorChange);
-    }
-
-    // Helper method because generics cannot be defined on blocks
-    private <T> void copyProperty(Property<T> property, Keyframe from, UpdateKeyframeProperties.Builder to) {
-        from.getValue(property).ifPresent(value -> to.setValue(property, value));
-    }
-
-    private Change updateInterpolators() {
-        Collection<PathSegment> pathSegments = positionPath.getSegments();
-        // Contains updated pathsegment-interpolator mappings, may be changed multiple times over the course of this method
-        Map<PathSegment, Interpolator> updates = new HashMap<>();
-
-        // First, setup spectator interpolators
-        Interpolator interpolator = null;
-        // Iterate through all segments
-        for (PathSegment segment : pathSegments) {
-            if (isSpectatorSegment(segment)) {
-                // If the last segment was a spectator segment, then use its interpolator for this segment as well
-                if (interpolator == null) {
-                    // otherwise create a new interpolator
-                    interpolator = new LinearInterpolator();
-                    interpolator.registerProperty(SpectatorProperty.PROPERTY);
-                }
-                // Now that we have an interpolator, set it for the current segment
-                updates.put(segment, interpolator);
-            } else {
-                // Not a spectator segment, make sure we don't re-use the last interpolator (it would not be continuous)
-                interpolator = null;
-            }
-        }
-
-        // Then, if required, replace old default interpolators with new ones
-        pathSegments.stream()
-                // Ignore explicitly set segments
-                .filter(s -> !s.getStartKeyframe().getValue(ExplicitInterpolationProperty.PROPERTY).isPresent())
-                // Ignore spectator segments
-                .filter(s -> !isSpectatorSegment(s))
-                // Ignore already correct segments, should ignore all if default hasn't changed
-                .filter(s -> !s.getInterpolator().getClass().equals(defaultInterpolatorType.getInterpolatorClass()))
-                // Finally, set the interpolators
-                // This will create one interpolator per segment, they will be merged later
-                .forEach(segment -> updates.put(segment, createDefaultInterpolator()));
-
-        // All interpolators should now be set appropriately but may still be fragmented.
-        // Cleaning that up is a two step process
-
-        // Firstly, all interpolators that are not continuous need to be split up
-        Interpolator lastInterpolator = null;
-        Set<Interpolator> used = Collections.newSetFromMap(new IdentityHashMap<>());
-        for (PathSegment segment : pathSegments) {
-            if (isSpectatorSegment(segment)) {
-                lastInterpolator = null;
-                continue; // Chain broken by spectator segment
-            }
-
-            Interpolator currentInterpolator = updates.getOrDefault(segment, segment.getInterpolator());
-            if (lastInterpolator == currentInterpolator) {
-                continue; // All fine, interpolator is still continuous
-            }
-
-            // New interpolator, make sure it hasn't been used before
-            if (!used.add(interpolator)) {
-                // It has been used before, we need to clone it and use the clone instead
-                // This will create a new interpolator for each segment which will be merged later
-                currentInterpolator = cloneInterpolator(currentInterpolator);
-                updates.put(segment, currentInterpolator);
-            }
-            lastInterpolator = currentInterpolator;
-        }
-
-        // Secondly, all neighbouring interpolators that are equal need to be merged
-        lastInterpolator = null;
-        String lastInterpolatorSerialized = null;
-        for (PathSegment segment : pathSegments) {
-            if (isSpectatorSegment(segment)) {
-                lastInterpolator = null;
-                lastInterpolatorSerialized = null;
-                continue; // Spectator segments are continuous by construction
-            }
-            Interpolator currentInterpolator = updates.getOrDefault(segment, segment.getInterpolator());
-            String serialized = serializeInterpolator(currentInterpolator);
-            if (lastInterpolator != currentInterpolator && serialized.equals(lastInterpolatorSerialized)) {
-                // This interpolator is equal to the last one but not the same, needs merging
-                updates.put(segment, lastInterpolator);
-                continue;
-            }
-            // New interpolator, not related to the previous one, merged by definition
-            lastInterpolator = currentInterpolator;
-            lastInterpolatorSerialized = serialized;
-        }
-
-        Change change = CombinedChange.create(updates.entrySet().stream()
-                .map(e -> SetInterpolator.create(e.getKey(), e.getValue())).toArray(Change[]::new));
-        change.apply(timeline);
-        return change;
-    }
-
-    private boolean isSpectatorSegment(PathSegment segment) {
-        return segment.getStartKeyframe().getValue(SpectatorProperty.PROPERTY).isPresent()
-                && segment.getEndKeyframe().getValue(SpectatorProperty.PROPERTY).isPresent();
-    }
-
-    private Change updateSpectatorPositions() {
-        List<Change> changes = new ArrayList<>();
-        timePath.updateAll();
-        for (Keyframe keyframe : positionPath.getKeyframes()) {
-            Optional<Integer> spectator = keyframe.getValue(SpectatorProperty.PROPERTY);
-            if (spectator.isPresent()) {
-                Optional<Integer> time = timePath.getValue(TimestampProperty.PROPERTY, keyframe.getTime());
-                if (!time.isPresent()) {
-                    continue; // No time keyframes set at this video time, cannot determine replay time
-                }
-                Location expected = entityTracker.getEntityPositionAtTimestamp(spectator.get(), time.get());
-                if (expected == null) {
-                    continue; // We don't have any data on this entity for some reason
-                }
-                Triple<Double, Double, Double> pos = keyframe.getValue(CameraProperties.POSITION).orElse(Triple.of(0D, 0D, 0D));
-                Triple<Float, Float, Float> rot = keyframe.getValue(CameraProperties.ROTATION).orElse(Triple.of(0F, 0F, 0F));
-                Location actual = new Location(pos.getLeft(), pos.getMiddle(), pos.getRight(), rot.getLeft(), rot.getRight());
-                if (!expected.equals(actual)) {
-                    changes.add(UpdateKeyframeProperties.create(positionPath, keyframe)
-                            .setValue(CameraProperties.POSITION, Triple.of(expected.getX(), expected.getY(), expected.getZ()))
-                            .setValue(CameraProperties.ROTATION, Triple.of(expected.getYaw(), expected.getPitch(), 0f)).done()
-                    );
-                }
-            }
-        }
-        return CombinedChange.create(changes.toArray(new Change[changes.size()]));
-    }
-
-    private Interpolator createDefaultInterpolator() {
-        return registerPositionInterpolatorProperties(defaultInterpolatorType.newInstance());
-    }
-
-    private Interpolator registerPositionInterpolatorProperties(Interpolator interpolator) {
-        interpolator.registerProperty(CameraProperties.POSITION);
-        interpolator.registerProperty(CameraProperties.ROTATION);
-        return interpolator;
-    }
-
-    @Override
-    public Timeline createTimeline() {
-        return createTimelineStatic();
-    }
-
-    private static Timeline createInitialTimeline() {
-        Timeline timeline = createTimelineStatic();
-        timeline.createPath();
-        timeline.createPath();
-        return timeline;
-    }
-
-    private static Timeline createTimelineStatic() {
-        Timeline timeline = new TimelineImpl();
-
-        timeline.registerProperty(TimestampProperty.PROPERTY);
-        timeline.registerProperty(CameraProperties.POSITION);
-        timeline.registerProperty(CameraProperties.ROTATION);
-        timeline.registerProperty(SpectatorProperty.PROPERTY);
-        timeline.registerProperty(ExplicitInterpolationProperty.PROPERTY);
-
-        return timeline;
-    }
-
-    @Override
-    public void serializeInterpolator(JsonWriter writer, Interpolator interpolator) throws IOException {
-        if (interpolator instanceof LinearInterpolator) {
-            writer.value("linear");
-        } else if (interpolator instanceof CubicSplineInterpolator) {
-            writer.value("cubic-spline");
-        } else if (interpolator instanceof CatmullRomSplineInterpolator) {
-            writer.beginObject();
-            writer.name("type").value("catmull-rom-spline");
-            writer.name("alpha").value(((CatmullRomSplineInterpolator) interpolator).getAlpha());
-            writer.endObject();
-        } else {
-            throw new IOException("Unknown interpolator type: " + interpolator);
-        }
-    }
-
-    @Override
-    public Interpolator deserializeInterpolator(JsonReader reader) throws IOException {
-        String type;
-        JsonObject args;
-        switch (reader.peek()) {
-            case STRING:
-                type = reader.nextString();
-                args = null;
-                break;
-            case BEGIN_OBJECT:
-                args = new JsonParser().parse(reader).getAsJsonObject();
-                type = args.get("type").getAsString();
-                break;
-            default:
-                throw new IOException("Unexpected token: " + reader.peek());
-        }
-        switch (type) {
-            case "linear":
-                return new LinearInterpolator();
-            case "cubic-spline":
-                return new CubicSplineInterpolator();
-            case "catmull-rom-spline":
-                if (args == null || !args.has("alpha")) {
-                    throw new IOException("Missing alpha value for catmull-rom-spline.");
-                }
-                return new CatmullRomSplineInterpolator(args.get("alpha").getAsDouble());
-            default:
-                throw new IOException("Unknown interpolation type: " + type);
-
-        }
-    }
-
-    /**
-     * Clones an interpolator by de- and re-serializing it.
-     * @param interpolator The interpolator to clone
-     * @return The cloned interpolator
-     */
-    private Interpolator cloneInterpolator(Interpolator interpolator) {
-        Interpolator cloned = deserializeInterpolator(serializeInterpolator(interpolator));
-        interpolator.getKeyframeProperties().forEach(cloned::registerProperty);
-        return cloned;
-    }
-
-    /**
-     * Serializes the specific interpolator to String.
-     * Does <b>not</b> serialize the registered keyframe properties.
-     * @param interpolator The interpolator to serialize.
-     * @return The serialized interpolator
-     */
-    private String serializeInterpolator(Interpolator interpolator) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-        JsonWriter jsonWriter = new JsonWriter(new PrintWriter(baos));
-        try {
-            jsonWriter.beginArray();
-            serializeInterpolator(jsonWriter, interpolator);
-            jsonWriter.endArray();
-            jsonWriter.flush();
-        } catch (IOException e) {
-            CrashReport crash = CrashReport.makeCrashReport(e, "Serializing interpolator");
-            CrashReportCategory category = crash.makeCategory("Serializing interpolator");
-            category.setDetail("Interpolator", interpolator::toString);
-            throw new ReportedException(crash);
-        }
-
-        return baos.toString();
-    }
-
-    private Interpolator deserializeInterpolator(String json) {
-        JsonReader jsonReader = new JsonReader(new StringReader(json));
-        try {
-            jsonReader.beginArray();
-            return deserializeInterpolator(jsonReader);
-        } catch (IOException e) {
-            CrashReport crash = CrashReport.makeCrashReport(e, "De-serializing interpolator");
-            CrashReportCategory category = crash.makeCategory("De-serializing interpolator");
-            category.addCrashSection("Interpolator", json);
-            throw new ReportedException(crash);
-        }
-    }
-}

src/main/java/com/replaymod/simplepathing/Setting.java

@@ -2,25 +2,9 @@ package com.replaymod.simplepathing;
 
 import com.replaymod.core.SettingsRegistry;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
 public final class Setting<T> extends SettingsRegistry.SettingKeys<T> {
     public static final Setting<Boolean> PATH_PREVIEW = make("pathpreview", "pathpreview", true);
-    public static final SettingsRegistry.MultipleChoiceSettingKeys<String> DEFAULT_INTERPOLATION;
-
-    static {
-        String format = "replaymod.gui.editkeyframe.interpolator.%s.name";
-        DEFAULT_INTERPOLATION = new SettingsRegistry.MultipleChoiceSettingKeys<>(
-                "simplepathing", "interpolator", "replaymod.gui.settings.interpolator",
-                String.format(format, InterpolatorType.fromString("invalid returns default").getLocalizationKey())
-        );
-        DEFAULT_INTERPOLATION.setChoices(
-                Arrays.stream(InterpolatorType.values()).filter(i -> i != InterpolatorType.DEFAULT)
-                        .map(i -> String.format(format, i.getLocalizationKey()))
-                        .collect(Collectors.toList())
-        );
-    }
+    public static final Setting<Boolean> LINEAR_INTERPOLATION = make("linear_interpolation", "linearinterpolation", false);
 
     private static <T> Setting<T> make(String key, String displayName, T defaultValue) {
         return new Setting<>(key, displayName, defaultValue);

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

@@ -5,27 +5,14 @@ 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.interpolation.CatmullRomSplineInterpolator;
-import com.replaymod.replaystudio.pathing.interpolation.CubicSplineInterpolator;
-import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
-import com.replaymod.replaystudio.pathing.interpolation.LinearInterpolator;
+import com.replaymod.replaystudio.pathing.change.UpdateKeyframeProperties;
 import com.replaymod.replaystudio.pathing.path.Keyframe;
 import com.replaymod.replaystudio.pathing.path.Path;
-import com.replaymod.replaystudio.pathing.path.PathSegment;
-import com.replaymod.simplepathing.InterpolatorType;
-import com.replaymod.simplepathing.SPTimeline;
-import com.replaymod.simplepathing.SPTimeline.SPPath;
-import com.replaymod.simplepathing.Setting;
-import com.replaymod.simplepathing.properties.ExplicitInterpolationProperty;
-import de.johni0702.minecraft.gui.container.AbstractGuiContainer;
 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.GuiTooltip;
-import de.johni0702.minecraft.gui.element.IGuiClickable;
 import de.johni0702.minecraft.gui.element.IGuiLabel;
-import de.johni0702.minecraft.gui.element.advanced.GuiDropdownMenu;
 import de.johni0702.minecraft.gui.function.Typeable;
 import de.johni0702.minecraft.gui.layout.GridLayout;
 import de.johni0702.minecraft.gui.layout.HorizontalLayout;
@@ -33,16 +20,10 @@ import de.johni0702.minecraft.gui.layout.VerticalLayout;
 import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
 import de.johni0702.minecraft.gui.utils.Colors;
 import de.johni0702.minecraft.gui.utils.Consumer;
-import lombok.Getter;
-import net.minecraft.client.resources.I18n;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.commons.lang3.tuple.Triple;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.ReadablePoint;
 
-import java.util.Map;
-import java.util.Optional;
-
 import static de.johni0702.minecraft.gui.utils.Utils.link;
 
 public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends AbstractGuiPopup<T> implements Typeable {
@@ -50,11 +31,6 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
         return new GuiNumberField().setPrecision(0).setValidateOnFocusChange(true);
     }
 
-    protected static final Logger logger = LogManager.getLogger();
-
-    protected final GuiPathing guiPathing;
-
-    protected final long time;
     protected final Keyframe keyframe;
     protected final Path path;
 
@@ -87,16 +63,15 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
         setBackgroundColor(Colors.DARK_TRANSPARENT);
 
         popup.setLayout(new VerticalLayout().setSpacing(10))
-                .addElements(new VerticalLayout.Data(0.5, false), title, inputs, timePanel, buttons);
+                .addElements(new VerticalLayout.Data(0.5), title, inputs, timePanel, buttons);
     }
 
-    public GuiEditKeyframe(GuiPathing gui, SPPath path, long time, String type) {
+    public GuiEditKeyframe(GuiPathing gui, Path path, Keyframe keyframe, String type) {
         super(ReplayModReplay.instance.getReplayHandler().getOverlay());
-        this.guiPathing = gui;
-        this.time = time;
-        this.path = gui.getMod().getCurrentTimeline().getPath(path);
-        this.keyframe = this.path.getKeyframe(time);
+        this.keyframe = keyframe;
+        this.path = path;
 
+        long time = keyframe.getTime();
         Consumer<String> updateSaveButtonState = s -> saveButton.setEnabled(canSave());
         timeMinField.setValue(time / 1000 / 60).onTextChanged(updateSaveButtonState);
         timeSecField.setValue(time / 1000 % 60).onTextChanged(updateSaveButtonState);
@@ -106,11 +81,10 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
         saveButton.onClick(() -> {
             Change change = save();
             long newTime = (timeMinField.getInteger() * 60 + timeSecField.getInteger()) * 1000 + timeMSecField.getInteger();
-            if (newTime != time) {
-                change = CombinedChange.createFromApplied(change,
-                        gui.getMod().getCurrentTimeline().moveKeyframe(path, time, newTime));
+            if (newTime != keyframe.getTime()) {
+                change = CombinedChange.createFromApplied(change, gui.moveKeyframe(path, keyframe, newTime));
             }
-            gui.getMod().getCurrentTimeline().getTimeline().pushChange(change);
+            path.getTimeline().pushChange(change);
             close();
         });
     }
@@ -140,7 +114,7 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
     protected abstract Change save();
 
     public static class Spectator extends GuiEditKeyframe<Spectator> {
-        public Spectator(GuiPathing gui, SPPath path, long keyframe) {
+        public Spectator(GuiPathing gui, Path path, Keyframe keyframe) {
             super(gui, path, keyframe, "spec");
 
             link(timeMinField, timeSecField, timeMSecField);
@@ -173,10 +147,10 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
                             timestampMSecField, new GuiLabel().setI18nText("replaymod.gui.milliseconds"));
         }
 
-        public Time(GuiPathing gui, SPPath path, long keyframe) {
+        public Time(GuiPathing gui, Path path, Keyframe keyframe) {
             super(gui, path, keyframe, "time");
 
-            this.keyframe.getValue(TimestampProperty.PROPERTY).ifPresent(time -> {
+            keyframe.getValue(TimestampProperty.PROPERTY).ifPresent(time -> {
                 timestampMinField.setValue(time / 1000 / 60);
                 timestampSecField.setValue(time / 1000 % 60);
                 timestampMSecField.setValue(time % 1000);
@@ -191,7 +165,11 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
         protected Change save() {
             int time = (timestampMinField.getInteger() * 60 + timestampSecField.getInteger()) * 1000
                     + timestampMSecField.getInteger();
-            return guiPathing.getMod().getCurrentTimeline().updateTimeKeyframe(keyframe.getTime(), time);
+            Change change = UpdateKeyframeProperties.create(path, keyframe)
+                    .setValue(TimestampProperty.PROPERTY, time)
+                    .done();
+            change.apply(path.getTimeline());
+            return change;
         }
 
         @Override
@@ -201,19 +179,16 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
     }
 
     public static class Position extends GuiEditKeyframe<Position> {
-        public final GuiNumberField xField = newGuiNumberField().setSize(60, 20).setPrecision(5);
-        public final GuiNumberField yField = newGuiNumberField().setSize(60, 20).setPrecision(5);
-        public final GuiNumberField zField = newGuiNumberField().setSize(60, 20).setPrecision(5);
+        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(60, 20).setPrecision(5);
-        public final GuiNumberField pitchField = newGuiNumberField().setSize(60, 20).setPrecision(5);
-        public final GuiNumberField rollField = newGuiNumberField().setSize(60, 20).setPrecision(5);
-
-        public final InterpolationPanel interpolationPanel = new InterpolationPanel();
+        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);
 
         {
-            GuiPanel positionInputs = new GuiPanel()
-                    .setLayout(new GridLayout().setCellsEqualSize(false).setColumns(4).setSpacingX(3).setSpacingY(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,
@@ -221,20 +196,17 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
                             new GuiLabel().setI18nText("replaymod.gui.editkeyframe.campitch"), pitchField,
                             new GuiLabel().setI18nText("replaymod.gui.editkeyframe.zpos"), zField,
                             new GuiLabel().setI18nText("replaymod.gui.editkeyframe.camroll"), rollField);
-
-            inputs.setLayout(new VerticalLayout().setSpacing(10)).addElements(new VerticalLayout.Data(0.5, false),
-                    positionInputs, interpolationPanel);
         }
 
-        public Position(GuiPathing gui, SPPath path, long keyframe) {
+        public Position(GuiPathing gui, Path path, Keyframe keyframe) {
             super(gui, path, keyframe, "pos");
 
-            this.keyframe.getValue(CameraProperties.POSITION).ifPresent(pos -> {
+            keyframe.getValue(CameraProperties.POSITION).ifPresent(pos -> {
                 xField.setValue(pos.getLeft());
                 yField.setValue(pos.getMiddle());
                 zField.setValue(pos.getRight());
             });
-            this.keyframe.getValue(CameraProperties.ROTATION).ifPresent(rot -> {
+            keyframe.getValue(CameraProperties.ROTATION).ifPresent(rot -> {
                 yawField.setValue(rot.getLeft());
                 pitchField.setValue(rot.getMiddle());
                 rollField.setValue(rot.getRight());
@@ -247,176 +219,17 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
 
         @Override
         protected Change save() {
-            SPTimeline timeline = guiPathing.getMod().getCurrentTimeline();
-            Change positionChange = timeline.updatePositionKeyframe(time,
-                    xField.getDouble(), yField.getDouble(), zField.getDouble(),
-                    yawField.getFloat(), pitchField.getFloat(), rollField.getFloat()
-            );
-            Interpolator interpolator = interpolationPanel.getSettingsPanel().createInterpolator();
-            if (interpolationPanel.getInterpolatorType() == InterpolatorType.DEFAULT) {
-                return CombinedChange.createFromApplied(positionChange, timeline.setInterpolatorToDefault(time),
-                        timeline.setDefaultInterpolator(interpolator));
-            } else {
-                return CombinedChange.createFromApplied(positionChange, timeline.setInterpolator(time, interpolator));
-            }
+            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;
         }
-
-        public class InterpolationPanel extends AbstractGuiContainer<InterpolationPanel> {
-
-            @Getter
-            private SettingsPanel settingsPanel;
-
-            private GuiDropdownMenu<InterpolatorType> dropdown;
-
-            public InterpolationPanel() {
-                setLayout(new VerticalLayout());
-
-                dropdown = new GuiDropdownMenu<InterpolatorType>()
-                        .setToString(s -> I18n.format(s.getI18nName()))
-                        .setValues(InterpolatorType.values()).setHeight(20)
-                        .onSelection(i -> setSettingsPanel(dropdown.getSelectedValue()));
-
-                // set hover tooltips
-                for (Map.Entry<InterpolatorType, IGuiClickable> e : dropdown.getDropdownEntries().entrySet()) {
-                    e.getValue().setTooltip(new GuiTooltip().setI18nText(e.getKey().getI18nDescription()));
-                }
-
-                GuiPanel dropdownPanel = new GuiPanel()
-                        .setLayout(new GridLayout().setCellsEqualSize(false).setColumns(2).setSpacingX(3).setSpacingY(5))
-                        .addElements(new GridLayout.Data(1, 0.5),
-                                new GuiLabel().setI18nText("replaymod.gui.editkeyframe.interpolator"), dropdown);
-
-
-                addElements(new VerticalLayout.Data(0.5, false), dropdownPanel);
-
-                Optional<PathSegment> segment = path.getSegments().stream()
-                        .filter(s -> s.getStartKeyframe() == keyframe).findFirst();
-                if (segment.isPresent()) {
-                    Interpolator interpolator = segment.get().getInterpolator();
-                    InterpolatorType type = InterpolatorType.fromClass(interpolator.getClass());
-                    if (keyframe.getValue(ExplicitInterpolationProperty.PROPERTY).isPresent()) {
-                        dropdown.setSelected(type); // trigger the callback once to display settings panel
-                    } else {
-                        setSettingsPanel(InterpolatorType.DEFAULT);
-                    }
-                    if (getInterpolatorTypeNoDefault(type).getInterpolatorClass().isInstance(interpolator)) {
-                        //noinspection unchecked
-                        settingsPanel.loadSettings(interpolator);
-                    }
-                } else {
-                    // Disable dropdown if this is the last keyframe
-                    dropdown.setDisabled();
-                }
-            }
-
-            public void setSettingsPanel(InterpolatorType type) {
-                removeElement(this.settingsPanel);
-
-                switch (getInterpolatorTypeNoDefault(type)) {
-                    case CATMULL_ROM:
-                        settingsPanel = new CatmullRomSettingsPanel();
-                        break;
-                    case CUBIC:
-                        settingsPanel = new CubicSettingsPanel();
-                        break;
-                    case LINEAR:
-                        settingsPanel = new LinearSettingsPanel();
-                        break;
-                }
-
-                addElements(new GridLayout.Data(0.5, 0.5), settingsPanel);
-            }
-
-            protected InterpolatorType getInterpolatorTypeNoDefault(InterpolatorType interpolatorType) {
-                if (interpolatorType == InterpolatorType.DEFAULT || interpolatorType == null) {
-                    InterpolatorType defaultType = InterpolatorType.fromString(
-                            guiPathing.getMod().getCore().getSettingsRegistry().get(Setting.DEFAULT_INTERPOLATION));
-                    return defaultType;
-                }
-                return interpolatorType;
-            }
-
-            public InterpolatorType getInterpolatorType() {
-                return dropdown.getSelectedValue();
-            }
-
-            @Override
-            protected InterpolationPanel getThis() {
-                return this;
-            }
-
-            public abstract class SettingsPanel<I extends Interpolator, T extends SettingsPanel<I, T>> extends AbstractGuiContainer<T> {
-
-                public abstract void loadSettings(I interpolator);
-
-                public abstract I createInterpolator();
-            }
-
-            public class CatmullRomSettingsPanel extends SettingsPanel<CatmullRomSplineInterpolator, CatmullRomSettingsPanel> {
-                public final GuiLabel alphaLabel = new GuiLabel().setColor(Colors.BLACK)
-                        .setI18nText("replaymod.gui.editkeyframe.interpolator.catmullrom.alpha");
-                public final GuiNumberField alphaField = new GuiNumberField().setSize(100, 20).setPrecision(5)
-                        .setMinValue(0).setValidateOnFocusChange(true);
-
-                {
-                    setLayout(new HorizontalLayout(HorizontalLayout.Alignment.CENTER));
-                    addElements(new HorizontalLayout.Data(0.5), alphaLabel, alphaField);
-                }
-
-                @Override
-                public void loadSettings(CatmullRomSplineInterpolator interpolator) {
-                    alphaField.setValue(interpolator.getAlpha());
-                }
-
-                @Override
-                public CatmullRomSplineInterpolator createInterpolator() {
-                    return new CatmullRomSplineInterpolator(alphaField.getDouble());
-                }
-
-                @Override
-                protected CatmullRomSettingsPanel getThis() {
-                    return this;
-                }
-            }
-
-            public class CubicSettingsPanel extends SettingsPanel<CubicSplineInterpolator, CubicSettingsPanel> {
-
-                @Override
-                public void loadSettings(CubicSplineInterpolator interpolator) {
-                }
-
-                @Override
-                public CubicSplineInterpolator createInterpolator() {
-                    return new CubicSplineInterpolator();
-                }
-
-                @Override
-                protected CubicSettingsPanel getThis() {
-                    return this;
-                }
-            }
-
-            public class LinearSettingsPanel extends SettingsPanel<LinearInterpolator, LinearSettingsPanel> {
-
-                @Override
-                public void loadSettings(LinearInterpolator interpolator) {
-                }
-
-                @Override
-                public LinearInterpolator createInterpolator() {
-                    return new LinearInterpolator();
-                }
-
-                @Override
-                protected LinearSettingsPanel getThis() {
-                    return this;
-                }
-            }
-        }
     }
 }

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

@@ -1,5 +1,7 @@
 package com.replaymod.simplepathing.gui;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.pathing.properties.CameraProperties;
 import com.replaymod.pathing.properties.SpectatorProperty;
@@ -9,10 +11,9 @@ import com.replaymod.replaystudio.pathing.change.Change;
 import com.replaymod.replaystudio.pathing.path.Keyframe;
 import com.replaymod.replaystudio.pathing.path.Path;
 import com.replaymod.replaystudio.pathing.path.PathSegment;
+import com.replaymod.replaystudio.pathing.path.Timeline;
 import com.replaymod.replaystudio.pathing.property.Property;
 import com.replaymod.simplepathing.ReplayModSimplePathing;
-import com.replaymod.simplepathing.SPTimeline;
-import com.replaymod.simplepathing.SPTimeline.SPPath;
 import de.johni0702.minecraft.gui.GuiRenderer;
 import de.johni0702.minecraft.gui.element.advanced.AbstractGuiTimeline;
 import de.johni0702.minecraft.gui.function.Draggable;
@@ -22,6 +23,7 @@ import org.lwjgl.util.Point;
 import org.lwjgl.util.ReadableDimension;
 import org.lwjgl.util.ReadablePoint;
 
+import javax.annotation.Nullable;
 import java.util.Comparator;
 import java.util.Optional;
 
@@ -35,14 +37,14 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
     private final GuiPathing gui;
 
     /**
-     * The keyframe (time on timeline) that was last clicked on using the left mouse button.
+     * The keyframe that was last clicked on using the left mouse button.
      */
-    private long lastClickedKeyframe;
+    private Keyframe lastClickedKeyframe;
 
     /**
-     * Path of {@link #lastClickedKeyframe}.
+     * Id of the path of {@link #lastClickedKeyframe}.
      */
-    private SPPath lastClickedPath;
+    private int lastClickedPath;
 
     /**
      * The time at which {@link #lastClickedKeyframe} was updated.
@@ -87,13 +89,18 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
 
         renderer.bindTexture(ReplayMod.TEXTURE);
 
-        SPTimeline timeline = mod.getCurrentTimeline();
-
-        timeline.getTimeline().getPaths().stream().flatMap(path -> path.getKeyframes().stream()).forEach(keyframe -> {
+        for (Keyframe keyframe : Iterables.concat(Iterables.transform(mod.getCurrentTimeline().getPaths(), new Function<Path, Iterable<Keyframe>>() {
+            @Nullable
+            @Override
+            public Iterable<Keyframe> apply(@Nullable Path input) {
+                assert input != null;
+                return input.getKeyframes();
+            }
+        }))) {
             if (keyframe.getTime() >= startTime && keyframe.getTime() <= endTime) {
                 double relativeTime = keyframe.getTime() - startTime;
                 int positonX = BORDER_LEFT + (int) (relativeTime / visibleTime * visibleWidth) - KEYFRAME_SIZE / 2;
-                int u = KEYFRAME_TEXTURE_X + (mod.isSelected(keyframe) ? KEYFRAME_SIZE : 0);
+                int u = KEYFRAME_TEXTURE_X + (mod.getSelectedKeyframe() == keyframe ? KEYFRAME_SIZE : 0);
                 int v = KEYFRAME_TEXTURE_Y;
                 if (keyframe.getValue(CameraProperties.POSITION).isPresent()) {
                     if (keyframe.getValue(SpectatorProperty.PROPERTY).isPresent()) {
@@ -106,10 +113,10 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
                     renderer.drawTexturedRect(positonX, BORDER_TOP + KEYFRAME_SIZE, u, v, KEYFRAME_SIZE, KEYFRAME_SIZE);
                 }
             }
-        });
+        }
 
         // Draw colored quads on spectator path segments
-        for (PathSegment segment : timeline.getPositionPath().getSegments()) {
+        for (PathSegment segment : mod.getCurrentTimeline().getPaths().get(GuiPathing.POSITION_PATH).getSegments()) {
             if (segment.getInterpolator() == null
                     || !segment.getInterpolator().getKeyframeProperties().contains(SpectatorProperty.PROPERTY)) {
                 continue; // Not a spectator segment
@@ -118,7 +125,7 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
         }
 
         // Draw red quads on time path segments that would require time going backwards
-        for (PathSegment segment : timeline.getTimePath().getSegments()) {
+        for (PathSegment segment : mod.getCurrentTimeline().getPaths().get(GuiPathing.TIME_PATH).getSegments()) {
             long startTimestamp = segment.getStartKeyframe().getValue(TimestampProperty.PROPERTY).orElseThrow(IllegalStateException::new);
             long endTimestamp = segment.getEndKeyframe().getValue(TimestampProperty.PROPERTY).orElseThrow(IllegalStateException::new);
             if (endTimestamp >= startTimestamp) {
@@ -155,28 +162,29 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
      * @param position The raw position
      * @return Pair of path id and keyframe or null when no keyframe was clicked
      */
-    private Pair<SPPath, Long> getKeyframe(ReadablePoint position) {
+    private Pair<Integer, Keyframe> getKeyframe(ReadablePoint position) {
         int time = getTimeAt(position.getX(), position.getY());
         if (time != -1) {
             Point mouse = new Point(position);
             getContainer().convertFor(this, mouse);
             int mouseY = mouse.getY();
             if (mouseY > BORDER_TOP && mouseY < BORDER_TOP + 2 * KEYFRAME_SIZE) {
-                SPPath path;
+                Timeline timeline = gui.getMod().getCurrentTimeline();
+                int path;
                 if (mouseY <= BORDER_TOP + KEYFRAME_SIZE) {
                     // Position keyframe
-                    path = SPPath.POSITION;
+                    path = GuiPathing.POSITION_PATH;
                 } else {
                     // Time keyframe
-                    path = SPPath.TIME;
+                    path = GuiPathing.TIME_PATH;
                 }
                 int visibleTime = (int) (getZoom() * getLength());
-                int tolerance = visibleTime * KEYFRAME_SIZE / (getLastSize().getWidth() - BORDER_LEFT - BORDER_RIGHT) / 2;
-                Optional<Keyframe> keyframe = gui.getMod().getCurrentTimeline().getPath(path).getKeyframes().stream()
+                int tolerance = visibleTime * KEYFRAME_SIZE / (size.getWidth() - BORDER_LEFT - BORDER_RIGHT) / 2;
+                Optional<Keyframe> keyframe = timeline.getPaths().get(path).getKeyframes().stream()
                         .filter(k -> Math.abs(k.getTime() - time) <= tolerance)
                         .sorted(Comparator.comparing(k -> Math.abs(k.getTime() - time)))
                         .findFirst();
-                return Pair.of(path, keyframe.map(Keyframe::getTime).orElse(null));
+                return Pair.of(path, keyframe.orElse(null));
             }
         }
         return Pair.of(null, null);
@@ -185,31 +193,30 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
     @Override
     public boolean mouseClick(ReadablePoint position, int button) {
         int time = getTimeAt(position.getX(), position.getY());
-        Pair<SPPath, Long> pathKeyframePair = getKeyframe(position);
+        Pair<Integer, Keyframe> pathKeyframePair = getKeyframe(position);
         if (pathKeyframePair.getRight() != null) {
-            SPPath path = pathKeyframePair.getLeft();
             // Clicked on keyframe
-            long keyframeTime = pathKeyframePair.getRight();
+            Keyframe keyframe = pathKeyframePair.getRight();
             if (button == 0) { // Left click
                 long now = Minecraft.getSystemTime();
-                if (lastClickedKeyframe == keyframeTime) {
+                if (lastClickedKeyframe == keyframe) {
                     // 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(path, keyframeTime);
+                        Path path = gui.getMod().getCurrentTimeline().getPaths().get(pathKeyframePair.getLeft());
+                        gui.openEditKeyframePopup(path, keyframe);
                         return true;
                     }
                 }
                 // Not a double click, just update the click time and selection
                 lastClickedTime = now;
-                lastClickedKeyframe = keyframeTime;
-                lastClickedPath = path;
-                gui.getMod().setSelected(lastClickedPath, lastClickedKeyframe);
+                lastClickedKeyframe = keyframe;
+                lastClickedPath = pathKeyframePair.getLeft();
+                gui.getMod().setSelectedKeyframe(lastClickedKeyframe);
                 // We might be dragging
                 draggingStartX = position.getX();
                 dragging = true;
             } else if (button == 1) { // Right click
-                Keyframe keyframe = gui.getMod().getCurrentTimeline().getKeyframe(path, keyframeTime);
                 for (Property property : keyframe.getProperties()) {
                     applyPropertyToGame(property, keyframe);
                 }
@@ -219,11 +226,12 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
             // Clicked on timeline but not on any keyframe
             if (button == 0) { // Left click
                 setCursorPosition(time);
-                gui.getMod().setSelected(null, 0);
+                gui.getMod().setSelectedKeyframe(null);
             } else if (button == 1) { // Right click
                 if (pathKeyframePair.getLeft() != null) {
                     // Apply the value of the clicked path at the clicked position
-                    Path path = gui.getMod().getCurrentTimeline().getPath(pathKeyframePair.getLeft());
+                    Timeline timeline = gui.getMod().getCurrentTimeline();
+                    Path path = timeline.getPaths().get(pathKeyframePair.getLeft());
                     path.getKeyframes().stream().flatMap(k -> k.getProperties().stream()).distinct().forEach(
                             p -> applyPropertyToGame(p, path, time));
                 }
@@ -272,13 +280,12 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
             }
         }
         if (actuallyDragging) {
-            if (!gui.ensureEntityTracker(() -> mouseDrag(position, button, timeSinceLastCall))) return true;
             // Threshold passed
-            SPTimeline timeline = gui.getMod().getCurrentTimeline();
+            Path path = gui.getMod().getCurrentTimeline().getPaths().get(lastClickedPath);
             Point mouse = new Point(position);
             getContainer().convertFor(this, mouse);
             int mouseX = mouse.getX();
-            int width = getLastSize().getWidth();
+            int width = size.getWidth();
             int bodyWidth = width - BORDER_LEFT - BORDER_RIGHT;
             double segmentLength = getLength() * getZoom();
             double segmentTime =  segmentLength * (mouseX - BORDER_LEFT) / bodyWidth;
@@ -288,21 +295,24 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
             }
 
             // If there already is a keyframe at the target time, then increase the time by one until there is none
-            while (timeline.getKeyframe(lastClickedPath, newTime) != null) {
+            while (path.getKeyframe(newTime) != null) {
                 newTime++;
             }
 
             // First undo any previous changes
             if (draggingChange != null) {
-                draggingChange.undo(timeline.getTimeline());
+                draggingChange.undo(gui.getMod().getCurrentTimeline());
             }
 
             // Move keyframe to new position and
             // store change for later undoing / pushing to history
-            draggingChange = timeline.moveKeyframe(lastClickedPath, lastClickedKeyframe, newTime);
+            draggingChange = gui.moveKeyframe(path, lastClickedKeyframe, newTime);
 
             // Selected keyframe has been replaced
-            gui.getMod().setSelected(lastClickedPath, newTime);
+            gui.getMod().setSelectedKeyframe(path.getKeyframe(newTime));
+
+            // Path has been changed
+            path.updateAll();
         }
         return true;
     }
@@ -311,7 +321,7 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
     public boolean mouseRelease(ReadablePoint position, int button) {
         if (dragging) {
             if (actuallyDragging) {
-                gui.getMod().getCurrentTimeline().getTimeline().pushChange(draggingChange);
+                gui.getMod().getCurrentTimeline().pushChange(draggingChange);
                 draggingChange = null;
                 actuallyDragging = false;
             }

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

@@ -14,26 +14,24 @@ import com.replaymod.render.gui.GuiRenderSettings;
 import com.replaymod.replay.ReplayHandler;
 import com.replaymod.replay.camera.CameraEntity;
 import com.replaymod.replay.gui.overlay.GuiReplayOverlay;
+import com.replaymod.replaystudio.pathing.change.*;
+import com.replaymod.replaystudio.pathing.interpolation.CubicSplineInterpolator;
+import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
+import com.replaymod.replaystudio.pathing.interpolation.LinearInterpolator;
 import com.replaymod.replaystudio.pathing.path.Keyframe;
 import com.replaymod.replaystudio.pathing.path.Path;
+import com.replaymod.replaystudio.pathing.path.PathSegment;
 import com.replaymod.replaystudio.pathing.path.Timeline;
-import com.replaymod.replaystudio.pathing.serialize.TimelineSerialization;
+import com.replaymod.replaystudio.pathing.property.Property;
 import com.replaymod.replaystudio.util.EntityPositionTracker;
+import com.replaymod.replaystudio.util.Location;
 import com.replaymod.simplepathing.ReplayModSimplePathing;
-import com.replaymod.simplepathing.SPTimeline;
-import com.replaymod.simplepathing.SPTimeline.SPPath;
+import com.replaymod.simplepathing.Setting;
 import de.johni0702.minecraft.gui.GuiRenderer;
 import de.johni0702.minecraft.gui.RenderInfo;
 import de.johni0702.minecraft.gui.container.GuiContainer;
 import de.johni0702.minecraft.gui.container.GuiPanel;
-import de.johni0702.minecraft.gui.element.AbstractGuiClickable;
-import de.johni0702.minecraft.gui.element.AbstractGuiElement;
-import de.johni0702.minecraft.gui.element.GuiElement;
-import de.johni0702.minecraft.gui.element.GuiHorizontalScrollbar;
-import de.johni0702.minecraft.gui.element.GuiLabel;
-import de.johni0702.minecraft.gui.element.GuiTexturedButton;
-import de.johni0702.minecraft.gui.element.GuiTooltip;
-import de.johni0702.minecraft.gui.element.IGuiClickable;
+import de.johni0702.minecraft.gui.element.*;
 import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
 import de.johni0702.minecraft.gui.element.advanced.GuiTimelineTime;
 import de.johni0702.minecraft.gui.layout.CustomLayout;
@@ -43,8 +41,9 @@ import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
 import de.johni0702.minecraft.gui.popup.GuiInfoPopup;
 import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
 import de.johni0702.minecraft.gui.utils.Colors;
-import net.minecraft.crash.CrashReport;
+import net.minecraft.entity.Entity;
 import net.minecraftforge.fml.common.Loader;
+import org.apache.commons.lang3.tuple.Triple;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Keyboard;
@@ -56,17 +55,19 @@ import org.lwjgl.util.WritablePoint;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.IOException;
-import java.util.Collections;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 
-import static com.replaymod.core.utils.Utils.error;
-import static com.replaymod.simplepathing.ReplayModSimplePathing.LOGGER;
-
 
 /**
  * Gui plug-in to the GuiReplayOverlay for simple pathing.
  */
 public class GuiPathing {
+    public static final int TIME_PATH = 0;
+    public static final int POSITION_PATH = 1;
+
     private static final Logger logger = LogManager.getLogger();
 
     public final GuiTexturedButton playPauseButton = new GuiTexturedButton() {
@@ -90,20 +91,7 @@ public class GuiPathing {
         @Override
         public void run() {
             if (!preparePathsForPlayback()) return;
-
-            // Clone the timeline passed to the settings gui as it may be stored for later rendering in a queue
-            SPTimeline spTimeline = mod.getCurrentTimeline();
-            Timeline timeline;
-            try {
-                TimelineSerialization serialization = new TimelineSerialization(spTimeline, null);
-                String serialized = serialization.serialize(Collections.singletonMap("", spTimeline.getTimeline()));
-                timeline = serialization.deserialize(serialized).get("");
-            } catch (Throwable t) {
-                error(LOGGER, replayHandler.getOverlay(), CrashReport.makeCrashReport(t, "Cloning timeline"), () -> {});
-                return;
-            }
-
-            new GuiRenderSettings(replayHandler, timeline).display();
+            new GuiRenderSettings(replayHandler, mod.getCurrentTimeline()).display();
         }
     }).setSize(20, 20).setTexture(ReplayMod.TEXTURE, ReplayMod.TEXTURE_SIZE).setTexturePosH(40, 0)
             .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.ingame.menu.renderpath"));
@@ -290,28 +278,27 @@ public class GuiPathing {
                 if (player.isActive()) {
                     player.getFuture().cancel(false);
                 } else {
-                    Path timePath = mod.getCurrentTimeline().getTimePath();
+                    Timeline timeline = mod.getCurrentTimeline();
+                    Path timePath = timeline.getPaths().get(TIME_PATH);
 
                     if (!preparePathsForPlayback()) return;
 
                     timePath.setActive(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT));
                     // Start from cursor time unless the control key is pressed (then start from beginning)
                     int startTime = Keyboard.isKeyDown(Keyboard.KEY_LCONTROL)? 0 : GuiPathing.this.timeline.getCursorPosition();
-                    ListenableFuture<Void> future = player.start(mod.getCurrentTimeline().getTimeline(), startTime);
+                    ListenableFuture<Void> future = player.start(timeline, startTime);
                     overlay.setCloseable(false);
                     overlay.setMouseVisible(true);
                     Futures.addCallback(future, new FutureCallback<Void>() {
                         @Override
                         public void onSuccess(@Nullable Void result) {
                             overlay.setCloseable(true);
-                            timePath.setActive(true);
                         }
 
                         @Override
                         public void onFailure(Throwable t) {
                             t.printStackTrace();
                             overlay.setCloseable(true);
-                            timePath.setActive(true);
                         }
                     });
                 }
@@ -321,28 +308,26 @@ public class GuiPathing {
         positionKeyframeButton.setTexturePosH(new ReadablePoint() {
             @Override
             public int getX() {
-                SPPath keyframePath = mod.getSelectedPath();
-                long keyframeTime = mod.getSelectedTime();
-                if (keyframePath != SPPath.POSITION) {
+                Keyframe keyframe = mod.getSelectedKeyframe();
+                if (keyframe == null || !keyframe.getValue(CameraProperties.POSITION).isPresent()) {
                     // No keyframe or wrong path
-                    keyframeTime = timeline.getCursorPosition();
-                    keyframePath = mod.getCurrentTimeline().isPositionKeyframe(keyframeTime) ? SPPath.POSITION : null;
+                    keyframe = mod.getCurrentTimeline().getPaths().get(POSITION_PATH).getKeyframe(timeline.getCursorPosition());
                 }
-                if (keyframePath != SPPath.POSITION) {
+                if (keyframe == null) {
                     return replayHandler.isCameraView() ? 0 : 40;
                 } else {
-                    return mod.getCurrentTimeline().isSpectatorKeyframe(keyframeTime) ? 40 : 0;
+                    return keyframe.getValue(SpectatorProperty.PROPERTY).isPresent() ? 40 : 0;
                 }
             }
 
             @Override
             public int getY() {
-                SPPath keyframePath = mod.getSelectedPath();
-                if (keyframePath != SPPath.POSITION) {
+                Keyframe keyframe = mod.getSelectedKeyframe();
+                if (keyframe == null || !keyframe.getValue(CameraProperties.POSITION).isPresent()) {
                     // No keyframe selected but there might be one at exactly the position of the cursor
-                    keyframePath = mod.getCurrentTimeline().isPositionKeyframe(timeline.getCursorPosition()) ? SPPath.POSITION : null;
+                    keyframe = mod.getCurrentTimeline().getPaths().get(POSITION_PATH).getKeyframe(timeline.getCursorPosition());
                 }
-                return keyframePath == SPPath.POSITION ? 60 : 40;
+                return keyframe != null && keyframe.getValue(CameraProperties.POSITION).isPresent() ? 60 : 40;
             }
 
             @Override
@@ -352,7 +337,7 @@ public class GuiPathing {
         }).onClick(new Runnable() {
             @Override
             public void run() {
-                updateKeyframe(SPPath.POSITION);
+                updateKeyframe(false);
             }
         });
 
@@ -364,12 +349,12 @@ public class GuiPathing {
 
             @Override
             public int getY() {
-                SPPath keyframePath = mod.getSelectedPath();
-                if (keyframePath != SPPath.TIME) {
+                Keyframe keyframe = mod.getSelectedKeyframe();
+                if (keyframe == null || !keyframe.getValue(TimestampProperty.PROPERTY).isPresent()) {
                     // No keyframe selected but there might be one at exactly the position of the cursor
-                    keyframePath = mod.getCurrentTimeline().isTimeKeyframe(timeline.getCursorPosition()) ? SPPath.TIME : null;
+                    keyframe = mod.getCurrentTimeline().getPaths().get(TIME_PATH).getKeyframe(timeline.getCursorPosition());
                 }
-                return keyframePath == SPPath.TIME ? 100 : 80;
+                return keyframe != null && keyframe.getValue(TimestampProperty.PROPERTY).isPresent() ? 100 : 80;
             }
 
             @Override
@@ -379,7 +364,7 @@ public class GuiPathing {
         }).onClick(new Runnable() {
             @Override
             public void run() {
-                updateKeyframe(SPPath.TIME);
+                updateKeyframe(true);
             }
         });
 
@@ -401,12 +386,12 @@ public class GuiPathing {
                 }
                 try {
                     GuiKeyframeRepository gui = new GuiKeyframeRepository(
-                            mod.getCurrentTimeline(), replayHandler.getReplayFile(), mod.getCurrentTimeline().getTimeline());
+                            mod, replayHandler.getReplayFile(), mod.getCurrentTimeline());
                     Futures.addCallback(gui.getFuture(), new FutureCallback<Timeline>() {
                         @Override
                         public void onSuccess(Timeline result) {
                             if (result != null) {
-                                mod.setCurrentTimeline(new SPTimeline(result));
+                                mod.setCurrentTimeline(result);
                             }
                         }
 
@@ -432,10 +417,10 @@ public class GuiPathing {
                 @Override
                 public void onSuccess(Boolean delete) {
                     if (delete) {
-                        mod.clearCurrentTimeline();
-                        if (entityTracker != null) {
-                            mod.getCurrentTimeline().setEntityTracker(entityTracker);
-                        }
+                        Timeline timeline = mod.createTimeline();
+                        timeline.createPath();
+                        timeline.createPath();
+                        mod.setCurrentTimeline(timeline);
                     }
                 }
 
@@ -452,7 +437,7 @@ public class GuiPathing {
             // Position of the cursor
             int cursor = timeline.getCursorPosition();
             // Get the last time keyframe before the cursor
-            mod.getCurrentTimeline().getTimePath().getKeyframes().stream()
+            mod.getCurrentTimeline().getPaths().get(TIME_PATH).getKeyframes().stream()
                     .filter(it -> it.getTime() <= cursor).reduce((__, last) -> last).ifPresent(keyframe -> {
                 // Cursor position at the keyframe
                 int keyframeCursor = (int) keyframe.getTime();
@@ -468,7 +453,7 @@ public class GuiPathing {
                 // Move cursor to new position
                 timeline.setCursorPosition(keyframeCursor + cursorPassed);
                 // Deselect keyframe to allow the user to add a new one right away
-                mod.setSelected(null, 0);
+                mod.setSelectedKeyframe(null);
             });
         });
 
@@ -476,8 +461,8 @@ public class GuiPathing {
             if (!overlay.isVisible()) {
                 return;
             }
-            if (mod.getSelectedPath() != null) {
-                updateKeyframe(mod.getSelectedPath());
+            if (mod.getSelectedKeyframe() != null) {
+                updateKeyframe(mod.getSelectedKeyframe().getValue(TimestampProperty.PROPERTY).isPresent());
             }
         });
 
@@ -508,12 +493,13 @@ public class GuiPathing {
     }
 
     private boolean preparePathsForPlayback() {
-        SPTimeline timeline = mod.getCurrentTimeline();
-        timeline.getTimeline().getPaths().forEach(Path::updateAll);
+        Timeline timeline = mod.getCurrentTimeline();
+        timeline.getPaths().get(TIME_PATH).updateAll();
+        timeline.getPaths().get(POSITION_PATH).updateAll();
 
         // Make sure time keyframes's values are monotonically increasing
         int lastTime = 0;
-        for (Keyframe keyframe : timeline.getTimePath().getKeyframes()) {
+        for (Keyframe keyframe : timeline.getPaths().get(TIME_PATH).getKeyframes()) {
             int time = keyframe.getValue(TimestampProperty.PROPERTY).orElseThrow(IllegalStateException::new);
             if (time < lastTime) {
                 // We are going backwards in time
@@ -526,13 +512,6 @@ public class GuiPathing {
             lastTime = time;
         }
 
-        // Make sure there are at least two position- and two time-keyframes
-        if (timeline.getPositionPath().getSegments().isEmpty()
-                || timeline.getTimePath().getSegments().isEmpty()) {
-            GuiInfoPopup.open(replayHandler.getOverlay(), "replaymod.chat.morekeyframes");
-            return false;
-        }
-
         return true;
     }
 
@@ -540,19 +519,19 @@ public class GuiPathing {
         scrollbar.setZoom(scrollbar.getZoom() * factor);
     }
 
-    public boolean ensureEntityTracker(Runnable withDelayedTracker) {
+    /**
+     * Called when either one of the property buttons is pressed.
+     * @param isTime {@code true} for the time property button, {@code false} for the place property button
+     */
+    private void updateKeyframe(final boolean isTime) {
         if (entityTracker == null) {
-            LOGGER.debug("Entity tracker not yet loaded, delaying...");
             LoadEntityTrackerPopup popup = new LoadEntityTrackerPopup(replayHandler.getOverlay());
             entityTrackerLoadingProgress = p -> popup.progressBar.setProgress(p.floatValue());
             Futures.addCallback(entityTrackerFuture, new FutureCallback<Void>() {
                 @Override
                 public void onSuccess(@Nullable Void result) {
                     popup.close();
-                    if (mod.getCurrentTimeline().getEntityTracker() == null) {
-                        mod.getCurrentTimeline().setEntityTracker(entityTracker);
-                    }
-                    withDelayedTracker.run();
+                    updateKeyframe(isTime);
                 }
 
                 @Override
@@ -560,63 +539,184 @@ public class GuiPathing {
                     popup.close();
                 }
             });
-            return false;
+            return;
         }
-        if (mod.getCurrentTimeline().getEntityTracker() == null) {
-            mod.getCurrentTimeline().setEntityTracker(entityTracker);
-        }
-        return true;
-    }
-
-    /**
-     * Called when either one of the property buttons is pressed.
-     * @param path {@code TIME} for the time property button, {@code POSITION} for the place property button
-     */
-    private void updateKeyframe(SPPath path) {
-        LOGGER.debug("Updating keyframe on path {}" + path);
-        if (!ensureEntityTracker(() -> updateKeyframe(path))) return;
 
         int time = timeline.getCursorPosition();
-        SPTimeline timeline = mod.getCurrentTimeline();
+        Timeline timeline = mod.getCurrentTimeline();
+        Path path = timeline.getPaths().get(isTime ? TIME_PATH : POSITION_PATH);
 
-        switch (path) {
-            case TIME:
-                if (mod.getSelectedPath() == path) {
-                    LOGGER.debug("Selected keyframe is time keyframe -> removing keyframe");
-                    timeline.removeTimeKeyframe(mod.getSelectedTime());
-                    mod.setSelected(null, 0);
-                } else if (timeline.isTimeKeyframe(time)) {
-                    LOGGER.debug("Keyframe at cursor position is time keyframe -> removing keyframe");
-                    timeline.removeTimeKeyframe(time);
-                    mod.setSelected(null, 0);
-                } else {
-                    LOGGER.debug("No time keyframe found -> adding new keyframe");
-                    timeline.addTimeKeyframe(time, replayHandler.getReplaySender().currentTimeStamp());
-                    mod.setSelected(path, time);
-                }
-                break;
-            case POSITION:
-                if (mod.getSelectedPath() == path) {
-                    LOGGER.debug("Selected keyframe is position keyframe -> removing keyframe");
-                    timeline.removePositionKeyframe(mod.getSelectedTime());
-                    mod.setSelected(null, 0);
-                } else if (timeline.isPositionKeyframe(time)) {
-                    LOGGER.debug("Keyframe at cursor position is position keyframe -> removing keyframe");
-                    timeline.removePositionKeyframe(time);
-                    mod.setSelected(null, 0);
-                } else {
-                    LOGGER.debug("No position keyframe found -> adding new keyframe");
-                    CameraEntity camera = replayHandler.getCameraEntity();
-                    int spectatedId = -1;
-                    if (!replayHandler.isCameraView()) {
-                        spectatedId = replayHandler.getOverlay().getMinecraft().getRenderViewEntity().getEntityId();
-                    }
-                    timeline.addPositionKeyframe(time, camera.posX, camera.posY, camera.posZ,
-                            camera.rotationYaw, camera.rotationPitch, camera.roll, spectatedId);
-                    mod.setSelected(path, time);
-                }
-                break;
+        Keyframe keyframe = mod.getSelectedKeyframe();
+        if (keyframe != null && keyframe.getValue(TimestampProperty.PROPERTY).isPresent() ^ isTime) {
+            // Keyframe is on the wrong timeline
+            keyframe = null;
         }
+        if (keyframe == null) {
+            // No keyframe selected but there may still be one at this exact time
+            keyframe = path.getKeyframe(time);
+        }
+        Change change;
+        if (keyframe == null) {
+            change = AddKeyframe.create(path, time);
+            change.apply(timeline);
+            keyframe = path.getKeyframe(time);
+        } else {
+            change = RemoveKeyframe.create(path, keyframe);
+            change.apply(timeline);
+            keyframe = null;
+        }
+
+        if (keyframe != null) {
+            UpdateKeyframeProperties.Builder builder = UpdateKeyframeProperties.create(path, keyframe);
+            if (isTime) {
+                builder.setValue(TimestampProperty.PROPERTY, replayHandler.getReplaySender().currentTimeStamp());
+            } else {
+                CameraEntity camera = replayHandler.getCameraEntity();
+                builder.setValue(CameraProperties.POSITION, Triple.of(camera.posX, camera.posY, camera.posZ));
+                builder.setValue(CameraProperties.ROTATION, Triple.of(camera.rotationYaw, camera.rotationPitch, camera.roll));
+                if (!replayHandler.isCameraView()) {
+                    Entity spectated = replayHandler.getOverlay().getMinecraft().getRenderViewEntity();
+                    builder.setValue(SpectatorProperty.PROPERTY, spectated.getEntityId());
+                }
+            }
+            UpdateKeyframeProperties updateChange = builder.done();
+            updateChange.apply(timeline);
+            change = CombinedChange.createFromApplied(change, updateChange);
+
+            // If this new keyframe formed the first segment of the time path
+            if (isTime && path.getSegments().size() == 1) {
+                PathSegment segment = path.getSegments().iterator().next();
+                Interpolator interpolator = new LinearInterpolator();
+                interpolator.registerProperty(TimestampProperty.PROPERTY);
+                SetInterpolator setInterpolator = SetInterpolator.create(segment, interpolator);
+                setInterpolator.apply(timeline);
+                change = CombinedChange.createFromApplied(change, setInterpolator);
+            }
+        }
+
+        // Update interpolators for spectator keyframes
+        // while this is overkill, it is far simpler than updating differently for every possible case
+        if (!isTime) {
+            Change interpolators = updateInterpolators();
+            interpolators.apply(timeline);
+            change = CombinedChange.createFromApplied(change, interpolators);
+        }
+
+        Change specPosUpdate = updateSpectatorPositions();
+        specPosUpdate.apply(timeline);
+        change = CombinedChange.createFromApplied(change, specPosUpdate);
+
+        timeline.pushChange(change);
+
+        mod.setSelectedKeyframe(keyframe);
+    }
+
+    public Change updateInterpolators() {
+        boolean linearInterpolation = mod.getCore().getSettingsRegistry().get(Setting.LINEAR_INTERPOLATION);
+        List<Change> changes = new ArrayList<>();
+        Interpolator interpolator = null;
+        boolean isSpectatorInterpolator = false;
+        for (PathSegment segment : mod.getCurrentTimeline().getPaths().get(POSITION_PATH).getSegments()) {
+            if (segment.getStartKeyframe().getValue(SpectatorProperty.PROPERTY).isPresent()
+                    && segment.getEndKeyframe().getValue(SpectatorProperty.PROPERTY).isPresent()) {
+                // Spectator segment
+                if (!isSpectatorInterpolator) {
+                    isSpectatorInterpolator = true;
+                    interpolator = new LinearInterpolator();
+                    interpolator.registerProperty(SpectatorProperty.PROPERTY);
+                }
+                changes.add(SetInterpolator.create(segment, interpolator));
+            } else {
+                // Normal segment
+                if (isSpectatorInterpolator || interpolator == null) {
+                    isSpectatorInterpolator = false;
+                    interpolator = linearInterpolation ? new LinearInterpolator() : new CubicSplineInterpolator();
+                    interpolator.registerProperty(CameraProperties.POSITION);
+                    interpolator.registerProperty(CameraProperties.ROTATION);
+                }
+                changes.add(SetInterpolator.create(segment, interpolator));
+            }
+        }
+        return CombinedChange.create(changes.toArray(new Change[changes.size()]));
+    }
+
+    public Change updateSpectatorPositions() {
+        List<Change> changes = new ArrayList<>();
+        Path positionPath = mod.getCurrentTimeline().getPaths().get(POSITION_PATH);
+        Path timePath = mod.getCurrentTimeline().getPaths().get(TIME_PATH);
+        timePath.updateAll();
+        for (Keyframe keyframe : positionPath.getKeyframes()) {
+            Optional<Integer> spectator = keyframe.getValue(SpectatorProperty.PROPERTY);
+            if (spectator.isPresent()) {
+                Optional<Integer> time = timePath.getValue(TimestampProperty.PROPERTY, keyframe.getTime());
+                if (!time.isPresent()) {
+                    continue; // No time keyframes set at this video time, cannot determine replay time
+                }
+                Location expected = entityTracker.getEntityPositionAtTimestamp(spectator.get(), time.get());
+                if (expected == null) {
+                    continue; // We don't have any data on this entity for some reason
+                }
+                Triple<Double, Double, Double> pos = keyframe.getValue(CameraProperties.POSITION).orElse(Triple.of(0D, 0D, 0D));
+                Triple<Float, Float, Float> rot = keyframe.getValue(CameraProperties.ROTATION).orElse(Triple.of(0F, 0F, 0F));
+                Location actual = new Location(pos.getLeft(), pos.getMiddle(), pos.getRight(), rot.getLeft(), rot.getRight());
+                if (!expected.equals(actual)) {
+                    changes.add(UpdateKeyframeProperties.create(positionPath, keyframe)
+                            .setValue(CameraProperties.POSITION, Triple.of(expected.getX(), expected.getY(), expected.getZ()))
+                            .setValue(CameraProperties.ROTATION, Triple.of(expected.getYaw(), expected.getPitch(), 0f)).done()
+                    );
+                }
+            }
+        }
+        return CombinedChange.create(changes.toArray(new Change[changes.size()]));
+    }
+
+    public Change moveKeyframe(Path path, Keyframe keyframe, long newTime) {
+        Timeline timeline = mod.getCurrentTimeline();
+        // Interpolator might be required later (only if path is the time path)
+        Optional<Interpolator> interpolator =
+                path.getSegments().stream().findFirst().map(PathSegment::getInterpolator);
+
+        // First remove the old keyframe
+        Change removeChange = RemoveKeyframe.create(path, keyframe);
+        removeChange.apply(timeline);
+
+        // and add a new one at the correct time
+        Change addChange = AddKeyframe.create(path, newTime);
+        addChange.apply(timeline);
+        path.getKeyframe(newTime);
+
+        // Then copy over all properties
+        UpdateKeyframeProperties.Builder builder = UpdateKeyframeProperties.create(path, path.getKeyframe(newTime));
+        for (Property property : keyframe.getProperties()) {
+            copyProperty(property, keyframe, builder);
+        }
+        Change propertyChange = builder.done();
+        propertyChange.apply(timeline);
+
+        // Finally set the interpolators
+        Change interpolatorChange;
+        if (path.getTimeline().getPaths().indexOf(path) == GuiPathing.POSITION_PATH) {
+            // Position / Spectator keyframes need special handling
+            interpolatorChange = updateInterpolators();
+        } else {
+            // Time keyframes only need updating when only one segment of them exists
+            if (path.getSegments().size() == 1) {
+                interpolatorChange = SetInterpolator.create(path.getSegments().iterator().next(), interpolator.get());
+            } else {
+                interpolatorChange = CombinedChange.create(); // Noop change
+            }
+        }
+        interpolatorChange.apply(timeline);
+        // and update spectator positions
+        Change spectatorChange = updateSpectatorPositions();
+        spectatorChange.apply(timeline);
+
+        return CombinedChange.createFromApplied(removeChange, addChange, propertyChange, interpolatorChange, spectatorChange);
+    }
+
+    // Helper method because generics cannot be defined on blocks
+    private <T> void copyProperty(Property<T> property, Keyframe from, UpdateKeyframeProperties.Builder to) {
+        from.getValue(property).ifPresent(value -> to.setValue(property, value));
     }
 
     public ReplayModSimplePathing getMod() {
@@ -627,15 +727,13 @@ public class GuiPathing {
         return entityTracker;
     }
 
-    public void openEditKeyframePopup(SPPath path, long time) {
-        if (!ensureEntityTracker(() -> openEditKeyframePopup(path, time))) return;
-        Keyframe keyframe = mod.getCurrentTimeline().getKeyframe(path, time);
+    public void openEditKeyframePopup(Path path, Keyframe keyframe) {
         if (keyframe.getProperties().contains(SpectatorProperty.PROPERTY)) {
-            new GuiEditKeyframe.Spectator(this, path, keyframe.getTime()).open();
+            new GuiEditKeyframe.Spectator(this, path, keyframe).open();
         } else if (keyframe.getProperties().contains(CameraProperties.POSITION)) {
-            new GuiEditKeyframe.Position(this, path, keyframe.getTime()).open();
+            new GuiEditKeyframe.Position(this, path, keyframe).open();
         } else {
-            new GuiEditKeyframe.Time(this, path, keyframe.getTime()).open();
+            new GuiEditKeyframe.Time(this, path, keyframe).open();
         }
     }
 

src/main/java/com/replaymod/simplepathing/preview/PathPreviewRenderer.java

@@ -9,10 +9,10 @@ import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
 import com.replaymod.replaystudio.pathing.path.Keyframe;
 import com.replaymod.replaystudio.pathing.path.Path;
 import com.replaymod.replaystudio.pathing.path.PathSegment;
+import com.replaymod.replaystudio.pathing.path.Timeline;
 import com.replaymod.replaystudio.util.EntityPositionTracker;
 import com.replaymod.replaystudio.util.Location;
 import com.replaymod.simplepathing.ReplayModSimplePathing;
-import com.replaymod.simplepathing.SPTimeline;
 import com.replaymod.simplepathing.gui.GuiPathing;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
@@ -68,11 +68,11 @@ public class PathPreviewRenderer {
         if (guiPathing == null) return;
         EntityPositionTracker entityTracker = guiPathing.getEntityTracker();
 
-        SPTimeline timeline = mod.getCurrentTimeline();
+        Timeline timeline = mod.getCurrentTimeline();
         if (timeline == null) return;
-        Path path = timeline.getPositionPath();
+        Path path = timeline.getPaths().get(GuiPathing.POSITION_PATH);
         if (path.getKeyframes().isEmpty()) return;
-        Path timePath = timeline.getTimePath();
+        Path timePath = timeline.getPaths().get(GuiPathing.TIME_PATH);
 
         path.update();
 
@@ -97,8 +97,8 @@ public class PathPreviewRenderer {
                 if (spectator && entityTracker == null) {
                     continue; // Cannot render spectator positions when entity tracker is not yet loaded
                 }
-                // Spectator segments have 20 lines per second (at least 10) whereas normal segments have a fixed 100
-                long steps = spectator ? Math.max(diff / 50, 10) : 100;
+                // Spectator segments have 20 lines per second whereas normal segments have a fixed 100
+                long steps = spectator ? diff / 50 : 100;
                 Triple<Double, Double, Double> prevPos = null;
                 for (int i = 0; i <= steps; i++) {
                     long time = start.getTime() + diff * i / steps;
@@ -240,7 +240,7 @@ public class PathPreviewRenderer {
         float posY = 0f;
         float size = 10f / ReplayMod.TEXTURE_SIZE;
 
-        if (mod.isSelected(keyframe)) {
+        if (keyframe == mod.getSelectedKeyframe()) {
             posY += size;
         }
 

src/main/java/com/replaymod/simplepathing/properties/ExplicitInterpolationProperty.java

@@ -1,44 +0,0 @@
-package com.replaymod.simplepathing.properties;
-
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import com.replaymod.replaystudio.pathing.property.AbstractProperty;
-import com.replaymod.replaystudio.pathing.property.PropertyPart;
-import lombok.NonNull;
-import org.apache.commons.lang3.ObjectUtils;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * Property indicating that the next path segment's interpolator is fixed
- */
-public class ExplicitInterpolationProperty extends AbstractProperty<Object> {
-    public static final ExplicitInterpolationProperty PROPERTY = new ExplicitInterpolationProperty();
-
-    private ExplicitInterpolationProperty() {
-        super("interpolationFixed", "<internal>", null, new Object());
-    }
-
-    @Override
-    public Collection<PropertyPart<Object>> getParts() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public void applyToGame(Object value, @NonNull Object replayHandler) {
-        // dummy property, do nothing
-    }
-
-    @Override
-    public void toJson(JsonWriter writer, Object value) throws IOException {
-        writer.nullValue();
-    }
-
-    @Override
-    public Object fromJson(JsonReader reader) throws IOException {
-        reader.nextNull();
-        return ObjectUtils.NULL;
-    }
-}

src/main/resources/assets/replaymod/lang/en_US.lang

@@ -255,8 +255,6 @@ replaymod.gui.editor.trim.description=Removes the beginning and end of a Replay
 replaymod.gui.editor.connect.description=Connects multiple Replays in the specified order
 replaymod.gui.editor.modify.description=Provides several filters to modify Replay Files
 
-replaymod.gui.editor.trim.marker=Select Event Marker
-
 replaymod.gui.editor.progress.title=Editing Replay File...
 replaymod.gui.editor.progress.pleasewait=Please wait while the Replay is being edited.
 
@@ -292,7 +290,6 @@ replaymod.gui.settings.title=Replay Mod Settings
 
 replaymod.gui.settings.interpolation.linear=Linear
 replaymod.gui.settings.interpolation.cubic=Cubic
-replaymod.gui.settings.interpolation.catmullrom=Catmull Rom
 
 replaymod.gui.settings.bitrate=Video Bitrate
 replaymod.gui.settings.framerate=Video Framerate
@@ -310,7 +307,6 @@ replaymod.gui.settings.keyframecleancallback=Clear Confirmation
 replaymod.gui.settings.renderinvisible=Render invisible Entities
 replaymod.gui.settings.camera=Camera
 replaymod.gui.settings.showchat=Show Chat
-replaymod.gui.settings.interpolator=Default Interpolator
 
 replaymod.gui.settings.warning.linea=WARNING: Recording settings will be
 replaymod.gui.settings.warning.lineb=applied the next time you join a world.
@@ -374,17 +370,6 @@ replaymod.gui.editkeyframe.spec.method.shoulder.pitch=Pitch Offset
 replaymod.gui.editkeyframe.spec.method.shoulder.yaw=Rotation Angle
 replaymod.gui.editkeyframe.spec.method.shoulder.smoothness=Path Smoothness
 
-replaymod.gui.editkeyframe.interpolator=Interpolator
-replaymod.gui.editkeyframe.interpolator.default.name=Default Interpolator
-replaymod.gui.editkeyframe.interpolator.default.desc=Uses the default interpolator defined in the Replay Mod Settings.
-replaymod.gui.editkeyframe.interpolator.catmullrom.name=Catmull Rom Spline Interpolator
-replaymod.gui.editkeyframe.interpolator.catmullrom.desc=Calculates a catmull rom spline with customizable alpha value for precise tightness and smoothness of the camera path.
-replaymod.gui.editkeyframe.interpolator.catmullrom.alpha=Alpha:
-replaymod.gui.editkeyframe.interpolator.cubic.name=Cubic Spline Interpolator
-replaymod.gui.editkeyframe.interpolator.cubic.desc=Calculates a cubic equation matrix for all points for a smooth camera path.
-replaymod.gui.editkeyframe.interpolator.linear.name=Linear Interpolator
-replaymod.gui.editkeyframe.interpolator.linear.desc=Draws straight lines between the keyframes.
-
 #Render Settings GUI
 replaymod.gui.rendersettings.title=Rendering Options
 replaymod.gui.rendersettings.renderer=Rendering Method
@@ -439,18 +424,6 @@ replaymod.gui.rendersettings.presets.webm.custom=WEBM - Custom Bitrate
 replaymod.gui.rendersettings.presets.mkv.lossless=MKV - Lossless
 replaymod.gui.rendersettings.presets.png=PNG Sequence
 
-replaymod.gui.rendersettings.antialiasing=Anti-Aliasing
-replaymod.gui.rendersettings.antialiasing.none=None
-replaymod.gui.rendersettings.antialiasing.x2=2x
-replaymod.gui.rendersettings.antialiasing.x4=4x
-replaymod.gui.rendersettings.antialiasing.x8=8x
-
-#Render Queue GUI
-replaymod.gui.renderqueue.title=Render Queue
-replaymod.gui.renderqueue.open=Open Queue
-replaymod.gui.renderqueue.jobname=Job Name:
-replaymod.gui.renderqueue.add=Add current configuration
-
 #Rendering GUI
 replaymod.gui.rendering.title=Rendering Video
 replaymod.gui.rendering.pause=Pause Rendering

src/main/resources/dst_root_ca_x3.pem

@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----

src/main/resources/mcmod.info

@@ -100,23 +100,6 @@
     "screenshots": [],
     "dependencies": ["required-after:replaymod-replay"]
   },
-  {
-    "modid": "replaymod-editor",
-    "name": "Replay Mod - Replay Editor",
-    "description": "Replay Editor Module of the ReplayMod",
-    "version": "${version}",
-    "mcversion": "${mcversion}",
-    "url": "https://replaymod.com",
-    "updateUrl": "https://replaymod.com/download",
-    "authorList": [
-      "CrushedPixel",
-      "johni0702"
-    ],
-    "logoFile": "replaymod_logo.png",
-    "parent": "replaymod",
-    "screenshots": [],
-    "dependencies": []
-  },
   {
     "modid": "replaymod-extras",
     "name": "Replay Mod - Extras",

src/main/resources/mixins.compat.shaders.replaymod.json

@@ -6,9 +6,7 @@
   "client": [
     "MixinShaderEntityRenderer",
     "MixinShaderRenderChunk",
-    "MixinShaderRenderGlobal",
-    "MixinShadersRender"
+    "MixinShaderRenderGlobal"
   ],
-  "compatibilityLevel": "JAVA_8",
   "refmap": "mixins.replaymod.refmap.json"
 }

src/test/java/com/replaymod/simplepathing/SPTimelineTest.java

@@ -1,626 +0,0 @@
-package com.replaymod.simplepathing;
-
-import com.google.common.collect.Iterables;
-import com.replaymod.pathing.properties.CameraProperties;
-import com.replaymod.pathing.properties.SpectatorProperty;
-import com.replaymod.pathing.properties.TimestampProperty;
-import com.replaymod.replaystudio.pathing.change.Change;
-import com.replaymod.replaystudio.pathing.interpolation.CatmullRomSplineInterpolator;
-import com.replaymod.replaystudio.pathing.interpolation.Interpolator;
-import com.replaymod.replaystudio.pathing.interpolation.LinearInterpolator;
-import com.replaymod.replaystudio.pathing.path.Keyframe;
-import com.replaymod.replaystudio.pathing.path.Path;
-import com.replaymod.replaystudio.pathing.path.PathSegment;
-import com.replaymod.replaystudio.pathing.path.Timeline;
-import com.replaymod.replaystudio.util.EntityPositionTracker;
-import com.replaymod.replaystudio.util.Location;
-import com.replaymod.simplepathing.SPTimeline.SPPath;
-import org.apache.commons.lang3.tuple.Triple;
-import org.apache.logging.log4j.LogManager;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-public class SPTimelineTest {
-    private SPTimeline impl;
-    private Timeline timeline;
-
-    @BeforeClass
-    public static void setupLogger() {
-        ReplayModSimplePathing.LOGGER = LogManager.getLogger();
-    }
-
-    @Before
-    public void setup() {
-        impl = new SPTimeline();
-        impl.setDefaultInterpolatorType(InterpolatorType.CUBIC);
-        impl.setEntityTracker(new EntityPositionTrackerMock());
-        timeline = impl.getTimeline();
-    }
-
-    @Test
-    public void testGetPath() {
-        assertSame(impl.getTimeline().getPaths().get(0), impl.getTimePath());
-        assertSame(impl.getTimeline().getPaths().get(0), impl.getPath(SPPath.TIME));
-        assertSame(impl.getTimeline().getPaths().get(1), impl.getPositionPath());
-        assertSame(impl.getTimeline().getPaths().get(1), impl.getPath(SPPath.POSITION));
-    }
-
-    @Test
-    public void testGetKeyframe() {
-        assertSame(timeline.getPaths().get(0).insert(123), impl.getKeyframe(SPPath.TIME, 123));
-        assertSame(timeline.getPaths().get(1).insert(456), impl.getKeyframe(SPPath.POSITION, 456));
-    }
-
-    @Test
-    public void testIsTimeKeyframe() {
-        impl.getTimePath().insert(123);
-        impl.getPositionPath().insert(456);
-        impl.getPositionPath().insert(42).setValue(SpectatorProperty.PROPERTY, 42);
-        assertTrue(impl.isTimeKeyframe(123));
-        assertFalse(impl.isTimeKeyframe(456));
-        assertFalse(impl.isTimeKeyframe(789));
-        assertFalse(impl.isTimeKeyframe(42));
-    }
-
-    @Test
-    public void testIsPositionKeyframe() {
-        impl.getTimePath().insert(123);
-        impl.getPositionPath().insert(456);
-        impl.getPositionPath().insert(42).setValue(SpectatorProperty.PROPERTY, 42);
-        assertFalse(impl.isPositionKeyframe(123));
-        assertTrue(impl.isPositionKeyframe(456));
-        assertFalse(impl.isPositionKeyframe(789));
-        assertTrue(impl.isSpectatorKeyframe(42));
-    }
-
-    @Test
-    public void testIsSpectatorKeyframe() {
-        impl.getTimePath().insert(123);
-        impl.getPositionPath().insert(456);
-        impl.getPositionPath().insert(42).setValue(SpectatorProperty.PROPERTY, 42);
-        assertFalse(impl.isSpectatorKeyframe(123));
-        assertFalse(impl.isSpectatorKeyframe(456));
-        assertFalse(impl.isSpectatorKeyframe(789));
-        assertTrue(impl.isSpectatorKeyframe(42));
-    }
-
-    @Test
-    public void testAddPositionKeyframe() {
-        assertNull(timeline.peekUndoStack());
-        impl.addPositionKeyframe(0, 1, 2, 3, 4, 5, 6, -1);
-        assertNotNull(timeline.peekUndoStack());
-        Keyframe keyframe = impl.getKeyframe(SPPath.POSITION, 0);
-        assertNotNull(keyframe);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(1d, 2d, 3d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(4f, 5f, 6f)));
-        assertFalse(keyframe.getValue(SpectatorProperty.PROPERTY).isPresent());
-        timeline.undoLastChange();
-        assertNull(timeline.peekUndoStack());
-        assertNull(impl.getKeyframe(SPPath.POSITION, 0));
-    }
-
-    @Test
-    public void testAddPositionKeyframeSpectator() {
-        assertNull(timeline.peekUndoStack());
-        impl.addPositionKeyframe(0, 1, 2, 3, 4, 5, 6, 7);
-        assertNotNull(timeline.peekUndoStack());
-        Keyframe keyframe = impl.getKeyframe(SPPath.POSITION, 0);
-        assertNotNull(keyframe);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(1d, 2d, 3d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(4f, 5f, 6f)));
-        assertEquals(keyframe.getValue(SpectatorProperty.PROPERTY), Optional.of(7));
-        timeline.undoLastChange();
-        assertNull(timeline.peekUndoStack());
-        assertNull(impl.getKeyframe(SPPath.POSITION, 0));
-    }
-
-    @Test
-    public void testPositionKeyframeSpectatorPosition() {
-        Keyframe keyframe;
-        impl.addTimeKeyframe(0, 0);
-        impl.addTimeKeyframe(9, 9);
-
-        impl.addPositionKeyframe(4, 1, 2, 3, 4, 5, 6, 1);
-        keyframe = impl.getKeyframe(SPPath.POSITION, 4);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(1d, 2d, 3d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(4f, 5f, 6f)));
-
-        impl.addPositionKeyframe(6, 1, 2, 3, 4, 5, 6, 42);
-        keyframe = impl.getKeyframe(SPPath.POSITION, 6);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(12d, 0d, 0d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(0f, 0f, 0f)));
-
-        impl.addPositionKeyframe(8, 1, 2, 3, 4, 5, 6, 42);
-        keyframe = impl.getKeyframe(SPPath.POSITION, 8);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(16d, 0d, 0d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(0f, 0f, 0f)));
-
-        impl.addPositionKeyframe(10, 1, 2, 3, 4, 5, 6, 42);
-        keyframe = impl.getKeyframe(SPPath.POSITION, 10);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(1d, 2d, 3d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(4f, 5f, 6f)));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testAddPositionKeyframeDuplicate() {
-        impl.addPositionKeyframe(0, 1, 2, 3, 4, 5, 6, -1);
-        impl.addPositionKeyframe(0, 1, 2, 3, 4, 5, 6, -1);
-    }
-
-    @Test
-    public void testUpdatePositionKeyframe() {
-        impl.addPositionKeyframe(0, 1, 2, 3, 4, 5, 6, -1);
-        Change change = impl.updatePositionKeyframe(0, 7, 8, 9, 10, 11, 12);
-        assertNotNull(change);
-        Keyframe keyframe = impl.getKeyframe(SPPath.POSITION, 0);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(7d, 8d, 9d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(10f, 11f, 12f)));
-        assertFalse(keyframe.getValue(SpectatorProperty.PROPERTY).isPresent());
-        change.undo(timeline);
-        keyframe = impl.getKeyframe(SPPath.POSITION, 0);
-        assertEquals(keyframe.getValue(CameraProperties.POSITION), Optional.of(Triple.of(1d, 2d, 3d)));
-        assertEquals(keyframe.getValue(CameraProperties.ROTATION), Optional.of(Triple.of(4f, 5f, 6f)));
-        assertFalse(keyframe.getValue(SpectatorProperty.PROPERTY).isPresent());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testUpdatePositionKeyframeNoKeyframe() {
-        impl.updatePositionKeyframe(0, 1, 2, 3, 4, 5, 6);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testUpdatePositionKeyframeSpectatorKeyframe() {
-        impl.addPositionKeyframe(0, 1, 2, 3, 4, 5, 6, 7);
-        impl.updatePositionKeyframe(0, 1, 2, 3, 4, 5, 6);
-    }
-
-    @Test
-    public void testRemovePositionKeyframe() {
-        impl.addPositionKeyframe(0, 1, 2, 3, 4, 5, 6, -1);
-        impl.removePositionKeyframe(0);
-        assertNull(impl.getKeyframe(SPPath.POSITION, 0));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testRemovePositionKeyframeNoKeyframe() {
-        impl.removePositionKeyframe(0);
-    }
-
-    @Test
-    public void testAddTimeKeyframe() {
-        assertNull(timeline.peekUndoStack());
-        impl.addTimeKeyframe(0, 1);
-        assertNotNull(timeline.peekUndoStack());
-        Keyframe keyframe = impl.getKeyframe(SPPath.TIME, 0);
-        assertNotNull(keyframe);
-        assertEquals(keyframe.getValue(TimestampProperty.PROPERTY), Optional.of(1));
-        timeline.undoLastChange();
-        assertNull(timeline.peekUndoStack());
-        assertNull(impl.getKeyframe(SPPath.TIME, 0));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testAddTimeKeyframeDuplicate() {
-        impl.addTimeKeyframe(0, 1);
-        impl.addTimeKeyframe(0, 1);
-    }
-
-    @Test
-    public void testUpdateTimeKeyframe() {
-        impl.addTimeKeyframe(0, 1);
-        Change change = impl.updateTimeKeyframe(0, 2);
-        assertNotNull(change);
-        assertEquals(impl.getKeyframe(SPPath.TIME, 0).getValue(TimestampProperty.PROPERTY), Optional.of(2));
-        change.undo(timeline);
-        assertEquals(impl.getKeyframe(SPPath.TIME, 0).getValue(TimestampProperty.PROPERTY), Optional.of(1));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testUpdateTimeKeyframeNoKeyframe() {
-        impl.updateTimeKeyframe(0, 1);
-    }
-
-    @Test
-    public void testRemoveTimeKeyframe() {
-        impl.addTimeKeyframe(0, 1);
-        impl.removeTimeKeyframe(0);
-        assertNull(impl.getKeyframe(SPPath.TIME, 0));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testRemoveTimeKeyframeNoKeyframe() {
-        impl.removeTimeKeyframe(0);
-    }
-
-    /**
-     * Checks all interpolators to make sure that they are continuous and not fragmented.
-     */
-    private void assertValidInterpolators(SPPath path, int expectedNumberOfInterpolators) {
-        String str = prettyPrintInterpolators(impl, path);
-        List<Interpolator> interpolators = impl.getPath(path).getSegments().stream().map(PathSegment::getInterpolator)
-                .distinct().collect(Collectors.toList());
-        assertFalse("Not all interpolators set: " + str, interpolators.contains(null));
-        assertEquals("Mismatched interpolator number: " + str, expectedNumberOfInterpolators, interpolators.size());
-        int i = 0;
-        for (Interpolator interpolator : interpolators) {
-            Keyframe lastKeyframe = null;
-            for (PathSegment segment : interpolator.getSegments().stream()
-                    .sorted(Comparator.comparing(s -> s.getStartKeyframe().getTime())).collect(Collectors.toList())) {
-                String message = "Fragmentation in interpolator " + i + ": " + str;
-                assertTrue(message, lastKeyframe == null || segment.getStartKeyframe() == lastKeyframe);
-                lastKeyframe = segment.getEndKeyframe();
-            }
-            i++;
-        }
-    }
-
-    @Test
-    public void testAddPositionKeyframeAppend() {
-        addPosition(0, 0);
-        addPosition(1, 1);
-        addPosition(2, 1);
-        addPosition(3, 1);
-        addPosition(4, 1);
-    }
-
-    @Test
-    public void testAddPositionKeyframePrepend() {
-        addPosition(4, 0);
-        addPosition(3, 1);
-        addPosition(2, 1);
-        addPosition(1, 1);
-        addPosition(0, 1);
-    }
-
-    @Test
-    public void testAddPositionKeyframeMixed() {
-        addPosition(2, 0);
-        addPosition(4, 1);
-        addPosition(3, 1);
-        addPosition(0, 1);
-        addPosition(1, 1);
-    }
-
-    @Test
-    public void testAddPositionSpectatorKeyframe() {
-        addPosition(0, 0);
-        addSpectator(1, 1);
-        addSpectator(2, 2);
-        addPosition(4, 3);
-        addPosition(7, 3);
-        addPosition(8, 3);
-        addSpectator(3, 3);
-        addSpectator(5, 3);
-        addSpectator(6, 5);
-    }
-
-    @Test
-    public void testRemovePositionKeyframeFromStart() {
-        addPosition(0, 0);
-        addPosition(1, 1);
-        addPosition(2, 1);
-        addPosition(3, 1);
-        removePosition(0, 1);
-        removePosition(1, 1);
-        removePosition(2, 0);
-        removePosition(3, 0);
-    }
-
-    @Test
-    public void testRemovePositionKeyframeFromEnd() {
-        addPosition(0, 0);
-        addPosition(1, 1);
-        addPosition(2, 1);
-        addPosition(3, 1);
-        removePosition(3, 1);
-        removePosition(2, 1);
-        removePosition(1, 0);
-        removePosition(0, 0);
-    }
-
-    @Test
-    public void testRemovePositionKeyframeFromMiddle() {
-        addPosition(0, 0);
-        addPosition(1, 1);
-        addPosition(2, 1);
-        addPosition(3, 1);
-        removePosition(1, 1);
-        removePosition(2, 1);
-        removePosition(0, 0);
-        removePosition(3, 0);
-    }
-
-    @Test
-    public void testRemovePositionSpectatorKeyframe() {
-        addPosition(0, 0);
-        addPosition(1, 1);
-        addPosition(2, 1);
-        addSpectator(3, 1);
-        addSpectator(4, 2);
-        addSpectator(5, 2);
-        addPosition(6, 3);
-        addPosition(7, 3);
-        addSpectator(8, 3);
-        addSpectator(9, 4);
-        removePosition(4, 4);
-        removePosition(9, 3);
-        removePosition(6, 3);
-        removePosition(7, 2);
-        removePosition(0, 2);
-        removePosition(1, 2);
-        removePosition(3, 2);
-        removePosition(2, 1);
-        removePosition(5, 0);
-        removePosition(8, 0);
-    }
-
-    @Test
-    public void testAddTimeKeyframeAppend() {
-        addTime(0, 0);
-        addTime(1, 1);
-        addTime(2, 1);
-        addTime(3, 1);
-        addTime(4, 1);
-    }
-
-    @Test
-    public void testAddTimeKeyframePrepend() {
-        addTime(4, 0);
-        addTime(3, 1);
-        addTime(2, 1);
-        addTime(1, 1);
-        addTime(0, 1);
-    }
-
-    @Test
-    public void testAddTimeKeyframeMixed() {
-        addTime(2, 0);
-        addTime(4, 1);
-        addTime(3, 1);
-        addTime(0, 1);
-        addTime(1, 1);
-    }
-
-    @Test
-    public void testRemoveTimeKeyframeFromStart() {
-        addTime(0, 0);
-        addTime(1, 1);
-        addTime(2, 1);
-        addTime(3, 1);
-        removeTime(0, 1);
-        removeTime(1, 1);
-        removeTime(2, 0);
-        removeTime(3, 0);
-    }
-
-    @Test
-    public void testRemoveTimeKeyframeFromEnd() {
-        addTime(0, 0);
-        addTime(1, 1);
-        addTime(2, 1);
-        addTime(3, 1);
-        removeTime(3, 1);
-        removeTime(2, 1);
-        removeTime(1, 0);
-        removeTime(0, 0);
-    }
-
-    @Test
-    public void testRemoveTimeKeyframeFromMiddle() {
-        addTime(0, 0);
-        addTime(1, 1);
-        addTime(2, 1);
-        addTime(3, 1);
-        removeTime(1, 1);
-        removeTime(2, 1);
-        removeTime(0, 0);
-        removeTime(3, 0);
-    }
-
-    @Test
-    public void testSetInterpolator() {
-        addPosition(0, 0);
-        addPosition(1, 1);
-        addPosition(2, 1);
-        setInterpolator(1, new LinearInterpolator(), 2);
-        assertIsLinear(1);
-        Interpolator interpolator = Iterables.get(impl.getPositionPath().getSegments(), 1).getInterpolator();
-        assertTrue(interpolator.getKeyframeProperties().contains(CameraProperties.POSITION));
-        assertTrue(interpolator.getKeyframeProperties().contains(CameraProperties.ROTATION));
-        addPosition(3, 3);
-        addPosition(4, 3);
-        addPosition(5, 3);
-        setInterpolator(3, new LinearInterpolator(), 5);
-        assertIsLinear(3);
-        removePosition(2, 3);
-        removePosition(3, 3);
-        removePosition(0, 2);
-        removePosition(1, 1);
-        removePosition(4, 0);
-        removePosition(5, 0);
-    }
-
-    private void assertIsLinear(int index) {
-        assertTrue("Expected segment " + index + " to have linear interpolator: " + prettyPrintInterpolators(impl, SPPath.POSITION),
-                Iterables.get(impl.getPositionPath().getSegments(), index).getInterpolator() instanceof LinearInterpolator);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testSetInterpolatorNoKeyframe() {
-        addTime(0, 0);
-        impl.setInterpolator(0, new LinearInterpolator());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testSetInterpolatorToDefaultNoKeyframe() {
-        addTime(0, 0);
-        impl.setInterpolatorToDefault(0);
-    }
-
-    @Test
-    public void testMoveKeyframe() {
-        addPosition(1, 0);
-        addPosition(3, 1);
-        addPosition(5, 1);
-        addPosition(7, 1);
-        addSpectator(9, 1);
-        addSpectator(11, 2);
-        addSpectator(13, 2);
-        addPosition(15, 3);
-        addPosition(17, 3);
-        addPosition(19, 3);
-        setInterpolator(3, new LinearInterpolator(), 5);
-        assertIsLinear(1);
-        setInterpolator(5, new LinearInterpolator(), 5);
-        assertIsLinear(2);
-        // [P 1] C0 [P 3] L1 [P 5] L1 [P 7] C2 [S 9] L3 [S 11] L3 [S 13] C4 [P 15] C4 [P 17] C4 [P 19]
-
-        impl.moveKeyframe(SPPath.POSITION, 5, 0);
-        assertValidInterpolators(SPPath.POSITION, 6);
-        assertIsLinear(0);
-        impl.moveKeyframe(SPPath.POSITION, 0, 5);
-        assertValidInterpolators(SPPath.POSITION, 5);
-        assertIsLinear(2);
-
-        impl.moveKeyframe(SPPath.POSITION, 3, 12);
-        assertValidInterpolators(SPPath.POSITION, 7);
-        assertIsLinear(5);
-        impl.moveKeyframe(SPPath.POSITION, 12, 3);
-        assertValidInterpolators(SPPath.POSITION, 5);
-        assertIsLinear(1);
-
-        impl.moveKeyframe(SPPath.POSITION, 7, 14);
-        assertValidInterpolators(SPPath.POSITION, 4);
-        impl.moveKeyframe(SPPath.POSITION, 14, 20);
-        assertValidInterpolators(SPPath.POSITION, 4);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testSetDefaultInterpolatorDifferentType() {
-        addPosition(0, 0);
-        addPosition(1, 1);
-        impl.setDefaultInterpolator(new CatmullRomSplineInterpolator(42));
-    }
-
-    @Test
-    public void testSetDefaultInterpolatorSameType() {
-        impl.setDefaultInterpolatorType(InterpolatorType.CATMULL_ROM);
-        addPosition(0, 0);
-        addSpectator(1, 1);
-        addSpectator(2, 2);
-        addPosition(3, 3);
-        addPosition(4, 3);
-        impl.setDefaultInterpolator(new CatmullRomSplineInterpolator(42));
-        assertValidInterpolators(SPPath.POSITION, 3);
-        assertIsCatmullRom(0, 42);
-        assertIsCatmullRom(2, 42);
-        assertIsCatmullRom(3, 42);
-    }
-
-    private void assertIsCatmullRom(int index, double alpha) {
-        String str = prettyPrintInterpolators(impl, SPPath.POSITION);
-        Interpolator interpolator = Iterables.get(impl.getPositionPath().getSegments(), index).getInterpolator();
-        assertTrue("Expected segment " + index + " to be catmull rom interpolator: " + str,
-                 interpolator instanceof CatmullRomSplineInterpolator);
-        assertTrue("Expected interpolator of segment segment " + index + " to have alpha " + alpha + ": " + str,
-                ((CatmullRomSplineInterpolator) interpolator).getAlpha() == 42);
-    }
-
-    private void addPosition(int time, int expectedNumberOfInterpolators) {
-        impl.addPositionKeyframe(time, 1, 2, 3, 4, 5, 6, -1);
-        assertNotNull(impl.getKeyframe(SPPath.POSITION, time));
-        assertValidInterpolators(SPPath.POSITION, expectedNumberOfInterpolators);
-    }
-
-    private void addSpectator(int time, int expectedNumberOfInterpolators) {
-        impl.addPositionKeyframe(time, 1, 2, 3, 4, 5, 6, 42);
-        assertNotNull(impl.getKeyframe(SPPath.POSITION, time));
-        assertTrue(impl.isSpectatorKeyframe(time));
-        assertValidInterpolators(SPPath.POSITION, expectedNumberOfInterpolators);
-    }
-
-    private void addTime(int time, int expectedNumberOfInterpolators) {
-        impl.addTimeKeyframe(time, 1);
-        assertNotNull(impl.getKeyframe(SPPath.TIME, time));
-        assertValidInterpolators(SPPath.TIME, expectedNumberOfInterpolators);
-    }
-
-    private void removePosition(int time, int expectedNumberOfInterpolators) {
-        impl.removePositionKeyframe(time);
-        assertNull(impl.getKeyframe(SPPath.POSITION, time));
-        assertValidInterpolators(SPPath.POSITION, expectedNumberOfInterpolators);
-    }
-
-    private void removeTime(int time, int expectedNumberOfInterpolators) {
-        impl.removeTimeKeyframe(time);
-        assertNull(impl.getKeyframe(SPPath.TIME, time));
-        assertValidInterpolators(SPPath.TIME, expectedNumberOfInterpolators);
-    }
-
-    private void setInterpolator(int time, Interpolator interpolator, int expectedNumberOfInterpolators) {
-        impl.setInterpolator(time, interpolator);
-        assertValidInterpolators(SPPath.POSITION, expectedNumberOfInterpolators);
-    }
-
-    private void assertPositionState(String expected) {
-        assertEquals(expected, prettyPrintInterpolators(impl, SPPath.POSITION));
-    }
-
-    // Tracks only entity 42 which always is at x=time*2, y,z=0
-    private class EntityPositionTrackerMock extends EntityPositionTracker {
-        public EntityPositionTrackerMock() {
-            super(null);
-        }
-
-        @Override
-        public Location getEntityPositionAtTimestamp(int entityID, long timestamp) {
-            if (entityID == 42) {
-                return new Location(timestamp * 2, 0 ,0, 0, 0);
-            } else {
-                return null;
-            }
-        }
-    }
-
-    public static String prettyPrintInterpolators(SPTimeline timeline, SPPath spPath) {
-        return prettyPrintInterpolators(timeline, spPath, Collections.emptyMap());
-    }
-
-    public static String prettyPrintInterpolators(SPTimeline timeline, SPPath spPath, Map<PathSegment, Interpolator> updates) {
-        Map<Interpolator, String> interpolatorIdMap = new IdentityHashMap<>();
-        Path path = timeline.getPath(spPath);
-        StringBuilder sb = new StringBuilder();
-        for (Keyframe keyframe : path.getKeyframes()) {
-            if (spPath == SPPath.TIME) {
-                sb.append("[T ").append(keyframe.getTime()).append("]");
-            } else if (keyframe.getValue(SpectatorProperty.PROPERTY).isPresent()) {
-                sb.append("[S ").append(keyframe.getTime()).append("]");
-            } else {
-                sb.append("[P ").append(keyframe.getTime()).append("]");
-            }
-            path.getSegments().stream().filter(s -> s.getStartKeyframe() == keyframe).findFirst().ifPresent(segment -> {
-                Interpolator interpolator = updates.getOrDefault(segment, segment.getInterpolator());
-                String id = interpolatorIdMap.computeIfAbsent(interpolator, i ->
-                        (i instanceof LinearInterpolator ? "L" : "C") + interpolatorIdMap.size());
-                sb.append(' ').append(id).append(' ');
-            });
-        }
-        return sb.toString();
-    }
-}