Update to 1.11.2

.drone.yml

@@ -7,6 +7,7 @@ pipeline:
     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:
     image: plugins/s3

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICBidWlsZDoKICAgIGltYWdlOiBtYXZlbjozLjMuOS1qZGstOAogICAgY29tbWFuZHM6CiAgICAgIC0gY3VybCAtLWZhaWwgLS1jcmVhdGUtZGlycyAtbyAkSE9NRS8uZ3JhZGxlL2luaXQuZC9taXJyb3IuZ3JhZGxlIGh0dHBzOi8vbWF2ZW4uam9obmkwNzAyLmRlL2NvbmZpZy9ncmFkbGUKICAgICAgLSBjdXJsIC0tZmFpbCAtLWNyZWF0ZS1kaXJzIC1vICRIT01FLy5tMi9zZXR0aW5ncy54bWwgaHR0cHM6Ly9tYXZlbi5qb2huaTA3MDIuZGUvY29uZmlnL21hdmVuCiAgICAgIC0gLi9ncmFkbGV3IDpidWlsZAogIGFyY2hpdmU6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgYWNsOiBwdWJsaWMtcmVhZAogICAgcmVnaW9uOiAidXMtZWFzdC0xIgogICAgYnVja2V0OiAicmVwbGF5bW9kIgogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc291cmNlOiBidWlsZC9saWJzLyoKICAgIHN0cmlwX3ByZWZpeDogYnVpbGQvbGlicy8KICAgIHRhcmdldDogLwo.Z6rpaLplJKQ4pzB8AjCnplgci42qEu7L4LeS0fGm4SY
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICBidWlsZDoKICAgIGltYWdlOiBtYXZlbjozLjMuOS1qZGstOAogICAgY29tbWFuZHM6CiAgICAgIC0gY3VybCAtLWZhaWwgLS1jcmVhdGUtZGlycyAtbyAkSE9NRS8uZ3JhZGxlL2luaXQuZC9taXJyb3IuZ3JhZGxlIGh0dHBzOi8vbWF2ZW4uam9obmkwNzAyLmRlL2NvbmZpZy9ncmFkbGUKICAgICAgLSBjdXJsIC0tZmFpbCAtLWNyZWF0ZS1kaXJzIC1vICRIT01FLy5tMi9zZXR0aW5ncy54bWwgaHR0cHM6Ly9tYXZlbi5qb2huaTA3MDIuZGUvY29uZmlnL21hdmVuCiAgICAgIC0gSkFWQV9PUFRTPS1YbXgxNTE2TSAuL2dyYWRsZXcgc2V0dXBEZWNvbXBXb3Jrc3BhY2UKICAgICAgLSAuL2dyYWRsZXcgOmJ1aWxkCiAgYXJjaGl2ZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBhY2w6IHB1YmxpYy1yZWFkCiAgICByZWdpb246ICJ1cy1lYXN0LTEiCiAgICBidWNrZXQ6ICJyZXBsYXltb2QiCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzb3VyY2U6IGJ1aWxkL2xpYnMvKgogICAgc3RyaXBfcHJlZml4OiBidWlsZC9saWJzLwogICAgdGFyZ2V0OiAvCg.nzPW0_TpMIjnFZZ5Ci439QDKlaDo1a3DCH-VCYUgpx8

.gitmodules

@@ -5,7 +5,3 @@
 [submodule "ReplayStudio"]
 	path = ReplayStudio
 	url = https://github.com/ReplayMod/ReplayStudio
-
-[submodule "src/main/resources/assets/replaymod/lang"]
-	path = src/main/resources/assets/replaymod/lang
-	url = https://github.com/ReplayMod/Translations

build.gradle

@@ -1,5 +1,7 @@
 import groovy.json.JsonOutput
 
+import java.util.zip.ZipInputStream
+
 buildscript {
     repositories {
         mavenCentral()
@@ -34,13 +36,11 @@ archivesBaseName = "replaymod"
 
 minecraft {
     coreMod = 'com.replaymod.core.LoadingPlugin'
-    version = '1.11-13.19.1.2188'
+    version = '1.11.2-13.20.0.2216'
     runDir = "eclipse"
-    mappings = "snapshot_20161111"
+    mappings = "snapshot_20161220"
     replace '@MOD_VERSION@', project.version
-    // Includes intentional whitespace to stop Forge from declaring the mod to be compatible with
+    replace '@MC_VERSION@', project.minecraft.version
-    // a newer srg-compatible MC version (that may be using a different protocol version)
-    replace '@MC_VERSION@', "[ ${project.minecraft.version} ]"
 }
 
 repositories {
@@ -61,7 +61,7 @@ configurations {
 dependencies {
     compile 'org.projectlombok:lombok:1.16.4'
 
-    compile 'org.spongepowered:mixin:0.6.8-SNAPSHOT'
+    compile 'org.spongepowered:mixin:0.6.4-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'
@@ -103,6 +103,27 @@ jar {
     }
     from noticeDir
 
+    def langDir = file("$buildDir/languages")
+    doFirst {
+	try {
+        langDir.deleteDir()
+        langDir.mkdirs()
+        def dir = new File(langDir, 'assets/replaymod/lang/')
+        dir.mkdirs()
+        def zip = new ZipInputStream(new URL('http://replaymod.com/api/grab_languages').openStream())
+        def e;
+        while ((e = zip.nextEntry) != null) {
+            new File(dir, e.getName()) << zip
+            zip.closeEntry()
+        }
+	} catch(Exception e) {
+	    e.printStackTrace();
+	}
+    }
+    from (langDir) {
+        exclude '**/en_US.lang'
+    }
+
     from ({shade().collect { it.isDirectory() ? it : zipTree(it) }}) {
         exclude '**/NOTICE*'
         // exclude everything taken in from jGui for running the mod in a dev environment
@@ -168,13 +189,6 @@ sourceSets {
         }
         refMap = "mixins.replaymod.refmap.json"
     }
-    integrationTest {
-        compileClasspath += main.runtimeClasspath + main.output
-        java {
-            srcDir file('src/integration-test/java')
-        }
-        resources.srcDir file('src/integration-test/resources')
-    }
 }
 
 task copySrg(type: Copy, dependsOn: 'genSrgs') {
@@ -186,81 +200,6 @@ setupDecompWorkspace.dependsOn copySrg
 setupDevWorkspace.dependsOn copySrg
 project.tasks.idea.dependsOn copySrg
 
-
-import org.objectweb.asm.*
-
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import java.util.zip.ZipOutputStream
-
-import static org.objectweb.asm.Opcodes.ASM5
-
-// MC binaries were complied with a java version that produces invalid class files under certain circumstances
-// This causes setupCIWorkspace to be insufficient for compiling.
-// Related JDK bug: https://bugs.openjdk.java.net/browse/JDK-8066725
-// As a workaround, to use setupCIWorkspace on Drone, we modify the bin jar in-place and remove all parameter annotations.
-// WARNING: This piece of code ignores any and all gradle conventions and will probably fail horribly when run outside
-// of a single-use environment (e.g. Drone). Use setupDecompWorkspace for normal use.
-tasks.deobfMcMCP.doLast {
-    println "Applying RuntimeInvisibleParameterAnnotations workaround..."
-    File jar = getOutJar()
-    File tmp = new File((File) getTemporaryDir(), "workaround.jar")
-    tmp.withOutputStream {
-        new ZipOutputStream(it).withStream { dst ->
-            new ZipFile(jar).withCloseable { src ->
-                src.entries().each {
-                    if (it.name.startsWith("net/minecraft/") && it.name.endsWith(".class")) {
-                        def cw = new ClassWriter(0)
-                        def cv = new ClassVisitor(ASM5, cw) {
-                            @Override
-                            MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-                                return new MethodVisitor(ASM5, cv.visitMethod(access, name, desc, signature, exceptions)) {
-                                    @Override
-                                    AnnotationVisitor visitParameterAnnotation(int parameter, String pdesc, boolean visible) {
-                                        return null // Strip all parameter annotations
-                                    }
-                                }
-                            }
-                        }
-                        new ClassReader(src.getInputStream(it)).accept(cv, 0)
-                        dst.putNextEntry(new ZipEntry(it.name))
-                        dst.write(cw.toByteArray())
-                    } else {
-                        dst.putNextEntry(it)
-                        dst.write(src.getInputStream(it).bytes)
-                    }
-                }
-            }
-        }
-    }
-    jar.delete()
-    tmp.renameTo(jar)
-}
-
-task runIntegrationTest(type: JavaExec, dependsOn: ["makeStart", "jar"]) {
-    main = 'GradleStart'
-    standardOutput = System.out
-    errorOutput = System.err
-    workingDir file(minecraft.runDir)
-
-    def testDir = new File(minecraft.runDir, "integration-test")
-    doFirst {
-        testDir.deleteDir()
-        testDir.mkdirs()
-    }
-
-    doLast {
-        testDir.deleteDir()
-    }
-
-    afterEvaluate {
-        def runClient = tasks.getByName("runClient")
-        runIntegrationTest.jvmArgs = runClient.jvmArgs + "-Dfml.noGrab=true"
-        runIntegrationTest.args = runClient.args + "--gameDir" + testDir.canonicalPath
-        runIntegrationTest.classpath runClient.classpath + sourceSets.integrationTest.output
-    }
-}
-
 def generateVersionsJson() {
     // List all tags
     def stdout = new ByteArrayOutputStream()

docs/content.md

@@ -56,7 +56,7 @@ 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`)
+If you are familiar with it, the button ids for the Replay Mod are: **17890234** (text: `replaymod.gui.replayviewer`), **17890235** (text: `replaymod.gui.replayviewer`) 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.  

src/integration-test/java/IntegrationTest.java

@@ -1,30 +0,0 @@
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Entry point for running integration tests from within the IDE.
- * This is <b>not</b> called when running integration tests directly from gradle.
- */
-public class IntegrationTest {
-    public static void main(String[] args) throws Throwable {
-        // Prevent MC from grabbing our mouse during the test (it's not needed)
-        System.setProperty("fml.noGrab", "true");
-
-        // Make sure the test folder exists and is fresh
-        File gameDir = new File(System.getProperty("user.dir"), "integration-test");
-        if (gameDir.exists()) {
-            FileUtils.forceDelete(gameDir);
-        }
-        FileUtils.forceMkdir(gameDir);
-
-        // Set game dir to test folder and call regular entry point
-        List<String> argsList = new ArrayList<>(Arrays.asList(args));
-        argsList.add("--gameDir");
-        argsList.add(gameDir.getCanonicalPath());
-        GradleStart.main(argsList.toArray(new String[argsList.size()]));
-    }
-}

src/integration-test/java/com/replaymod/core/AbstractTask.java

@@ -1,340 +0,0 @@
-package com.replaymod.core;
-
-import com.google.common.collect.Iterables;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import de.johni0702.minecraft.gui.container.AbstractGuiOverlay;
-import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
-import de.johni0702.minecraft.gui.container.GuiContainer;
-import de.johni0702.minecraft.gui.container.GuiOverlay;
-import de.johni0702.minecraft.gui.container.GuiScreen;
-import de.johni0702.minecraft.gui.element.GuiButton;
-import de.johni0702.minecraft.gui.element.GuiElement;
-import de.johni0702.minecraft.gui.element.GuiTexturedButton;
-import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
-import de.johni0702.minecraft.gui.utils.Consumer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import org.lwjgl.input.Keyboard;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.concurrent.TimeoutException;
-
-import static com.replaymod.core.ReplayModIntegrationTest.LOGGER;
-import static com.replaymod.core.utils.Utils.addCallback;
-
-public abstract class AbstractTask implements Task {
-    public static Task create(Consumer<AbstractTask> init) {
-        return new AbstractTask() {
-            @Override
-            protected void init() {
-                init.consume(this);
-            }
-        };
-    }
-
-    public static final Minecraft mc = Minecraft.getMinecraft();
-    public final ReplayMod core = ReplayMod.instance;
-    public SettableFuture<Void> future;
-
-    @Override
-    public ListenableFuture<Void> execute() {
-        future = SettableFuture.create();
-
-        MinecraftForge.EVENT_BUS.register(this);
-        addCallback(future, success -> {
-            MinecraftForge.EVENT_BUS.unregister(this);
-        }, error -> {});
-
-        init();
-
-        return future;
-    }
-
-    protected void init() {}
-
-    protected void runLater(Runnable runnable) {
-        core.runLater(() -> {
-            try {
-                runnable.run();
-            } catch (Throwable t) {
-                future.setException(t);
-            }
-        });
-    }
-
-    public void expectGuiClosed(Runnable onClosed) {
-        expectGuiClosed0(10, onClosed);
-    }
-
-    public void expectGuiClosed(int timeout, Runnable onClosed) {
-        expectGuiClosed0(timeout, onClosed);
-    }
-
-    private void expectGuiClosed0(int timeout, Runnable onClosed) {
-        StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-        class EventHandler {
-            final net.minecraft.client.gui.GuiScreen currentScreen = mc.currentScreen;
-            int framesPassed;
-
-            @SubscribeEvent
-            public void onGuiOpen(TickEvent.RenderTickEvent event) {
-                if (event.phase != TickEvent.Phase.START) return;
-                if (currentScreen != mc.currentScreen) {
-                    MinecraftForge.EVENT_BUS.unregister(this);
-                    onClosed.run();
-                } else {
-                    if (framesPassed < timeout) {
-                        framesPassed++;
-                    } else {
-                        Object gui = (gui = GuiScreen.from(currentScreen)) == null ? currentScreen : gui;
-                        Exception e = new TimeoutException("Timeout while waiting for " + gui + " to be closed.");
-                        e.setStackTrace(Arrays.copyOfRange(stackTrace, 3, stackTrace.length));
-                        future.setException(e);
-                    }
-                }
-            }
-        }
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
-    public void expectPopupClosed(Runnable onClosed) {
-        expectPopupClosed0(10, onClosed);
-    }
-
-    public void expectPopupClosed(int timeout, Runnable onClosed) {
-        expectPopupClosed0(timeout, onClosed);
-    }
-
-    private void expectPopupClosed0(int timeout, Runnable onClosed) {
-        StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-        AbstractGuiPopup popup = getPopup(mc.currentScreen);
-        if (popup == null) {
-            throw new IllegalStateException("No popup found.");
-        }
-        class EventHandler {
-            int framesPassed;
-
-            @SubscribeEvent
-            public void onGuiOpen(TickEvent.RenderTickEvent event) {
-                if (event.phase != TickEvent.Phase.START) return;
-                if (getPopup(mc.currentScreen) != popup) {
-                    MinecraftForge.EVENT_BUS.unregister(this);
-                    onClosed.run();
-                } else {
-                    if (framesPassed < timeout) {
-                        framesPassed++;
-                    } else {
-                        Exception e = new TimeoutException("Timeout while waiting for " + popup + " to be closed.");
-                        e.setStackTrace(Arrays.copyOfRange(stackTrace, 3, stackTrace.length));
-                        future.setException(e);
-                    }
-                }
-            }
-        }
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
-    private AbstractGuiPopup getPopup(net.minecraft.client.gui.GuiScreen minecraft) {
-        GuiContainer<?> container = GuiOverlay.from(minecraft);
-        if (container == null) {
-            container = GuiScreen.from(minecraft);
-        }
-        if (container != null) {
-            while (container.getContainer() != null) {
-                container = container.getContainer();
-            }
-            GuiElement popup = Iterables.getLast(container.getChildren());
-            if (popup instanceof AbstractGuiPopup) {
-                return (AbstractGuiPopup) popup;
-            }
-        }
-        return null;
-    }
-
-    public <T> void expectGui(Class<T> guiClass, Consumer<T> onOpen) {
-        StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-        class EventHandler {
-            net.minecraft.client.gui.GuiScreen currentScreen;
-            int framesPassed;
-
-            @SubscribeEvent
-            public void onGuiOpen(TickEvent.RenderTickEvent event) {
-                if (event.phase != TickEvent.Phase.START) return;
-                if (currentScreen != mc.currentScreen) {
-                    currentScreen = mc.currentScreen;
-                    framesPassed = 0;
-                }
-                if (framesPassed < 10) {
-                    framesPassed++;
-                    return;
-                }
-
-                MinecraftForge.EVENT_BUS.unregister(this);
-
-                Object foundGui = null;
-                if (AbstractGuiScreen.class.isAssignableFrom(guiClass)) {
-                    AbstractGuiScreen guiScreen = GuiScreen.from(currentScreen);
-                    if (guiClass.isInstance(guiScreen)) {
-                        onOpen.consume(guiClass.cast(guiScreen));
-                        return;
-                    }
-                    foundGui = guiScreen;
-                } else if (AbstractGuiOverlay.class.isAssignableFrom(guiClass)) {
-                    AbstractGuiOverlay guiScreen = GuiOverlay.from(currentScreen);
-                    if (guiClass.isInstance(guiScreen)) {
-                        onOpen.consume(guiClass.cast(guiScreen));
-                        return;
-                    }
-                    foundGui = guiScreen;
-                } else if (AbstractGuiPopup.class.isAssignableFrom(guiClass)) {
-                    AbstractGuiPopup popup = getPopup(currentScreen);
-                    if (guiClass.isInstance(popup)) {
-                        onOpen.consume(guiClass.cast(popup));
-                        return;
-                    }
-                } else {
-                    if (guiClass.isInstance(currentScreen)) {
-                        onOpen.consume(guiClass.cast(currentScreen));
-                        return;
-                    }
-                }
-                class UnexpectedGuiException extends Exception {
-                    UnexpectedGuiException(Object foundGui) {
-                        super("Expected instance of " + guiClass + " but found " + foundGui);
-                        setStackTrace(Arrays.copyOfRange(stackTrace, 2, stackTrace.length));
-                    }
-                }
-                future.setException(new UnexpectedGuiException(foundGui == null ? currentScreen : foundGui));
-            }
-        }
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
-    }
-
-    private void clickNow(int x, int y) {
-        try {
-            Method method = net.minecraft.client.gui.GuiScreen.class
-                    .getDeclaredMethod("mouseClicked", int.class, int.class, int.class);
-            method.setAccessible(true);
-            method.invoke(mc.currentScreen, x, y, 0);
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-            future.setException(e);
-        }
-    }
-
-    public void click(int x, int y) {
-        runLater(() -> {
-            LOGGER.info("Clicking at {}/{}", x, y);
-            clickNow(x, y);
-        });
-    }
-
-    private void dragNow(int x, int y) {
-        try {
-            Method method = net.minecraft.client.gui.GuiScreen.class
-                    .getDeclaredMethod("mouseClickMove", int.class, int.class, int.class, long.class);
-            method.setAccessible(true);
-            method.invoke(mc.currentScreen, x, y, 0, 0);
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-            future.setException(e);
-        }
-    }
-
-    public void drag(int x, int y) {
-        runLater(() -> {
-            LOGGER.info("Dragging to {}/{}", x, y);
-            dragNow(x, y);
-        });
-    }
-
-    public void click(GuiButton button) {
-        runLater(() -> {
-            if (!button.isEnabled()) {
-                future.setException(new IllegalStateException("Button is disabled: " + button.getLabel()));
-                return;
-            }
-            LOGGER.info("Clicking button {}", button.getLabel());
-            button.onClick();
-        });
-    }
-
-    public void click(GuiTexturedButton button) {
-        runLater(() -> {
-            if (!button.isEnabled()) {
-                future.setException(new IllegalStateException("Button is disabled: " + button.getTexture()));
-                return;
-            }
-            LOGGER.info("Clicking textured button {}", button.getTexture());
-            button.onClick();
-        });
-    }
-
-    public void click(String buttonText) {
-        runLater(() -> {
-            LOGGER.info("Clicking button {}", buttonText);
-            try {
-                Field field = net.minecraft.client.gui.GuiScreen.class.getDeclaredField("buttonList");
-                field.setAccessible(true);
-                @SuppressWarnings("unchecked")
-                List<net.minecraft.client.gui.GuiButton> buttonList = (List)
-                        field.get(mc.currentScreen);
-
-                net.minecraft.client.gui.GuiButton button = null;
-                for (net.minecraft.client.gui.GuiButton guiButton : buttonList) {
-                    if (guiButton.displayString.equals(buttonText)) {
-                        button = guiButton;
-                    }
-                }
-                if (button == null) {
-                    future.setException(new NoSuchElementException("No button with label: " + buttonText));
-                    return;
-                }
-
-                clickNow(button.xPosition + 5, button.yPosition + 5);
-            } catch (IllegalAccessException | NoSuchFieldException e) {
-                future.setException(e);
-            }
-        });
-    }
-
-    public void type(String string) {
-        for (char c : string.toCharArray()) {
-            press(c, Keyboard.getKeyIndex(String.valueOf(c).toUpperCase()));
-        }
-    }
-
-    public void press(int keyCode) {
-        String keyName = Keyboard.getKeyName(keyCode);
-        char character = keyName.length() == 1 ? keyName.charAt(0) : '\0';
-        press(character, keyCode);
-    }
-
-    public void press(char character, int keyCode) {
-        runLater(() -> {
-            LOGGER.info("Pressing key {}", Keyboard.getKeyName(keyCode));
-            if (mc.currentScreen == null || mc.currentScreen.allowUserInput) {
-                KeyBinding.onTick(keyCode);
-                FMLCommonHandler.instance().fireKeyInput();
-            }
-            if (mc.currentScreen != null) {
-                try {
-                    Method method = net.minecraft.client.gui.GuiScreen.class
-                            .getDeclaredMethod("keyTyped", char.class, int.class);
-                    method.setAccessible(true);
-                    method.invoke(mc.currentScreen, character, keyCode);
-                } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-                    future.setException(e);
-                }
-            }
-        });
-    }
-}

src/integration-test/java/com/replaymod/core/CompositeTask.java

@@ -1,41 +0,0 @@
-package com.replaymod.core;
-
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
-
-import static com.replaymod.core.ReplayModIntegrationTest.LOGGER;
-import static com.replaymod.core.utils.Utils.addCallback;
-
-public class CompositeTask implements Task {
-    private SettableFuture<Void> future;
-    protected final Task[] children;
-
-    public CompositeTask(Task[] children) {
-        this.children = children;
-    }
-
-    @Override
-    public ListenableFuture<Void> execute() {
-        future = SettableFuture.create();
-        executeChild(0);
-        return future;
-    }
-
-    private void executeChild(int childIndex) {
-        if (future.isDone()) return;
-        if (childIndex < children.length) {
-            ReplayMod.instance.runLater(() -> {
-                try {
-                    Task task = children[childIndex];
-                    LOGGER.info("Running task {}", task);
-                    ListenableFuture<Void> childFuture = task.execute();
-                    addCallback(childFuture, done -> executeChild(childIndex + 1), err -> future.setException(err));
-                } catch (Throwable t) {
-                    future.setException(t);
-                }
-            });
-        } else {
-            future.set(null);
-        }
-    }
-}

src/integration-test/java/com/replaymod/core/ReplayModIntegrationTest.java

@@ -1,73 +0,0 @@
-package com.replaymod.core;
-
-import com.replaymod.core.regression.RegressionTest60;
-import com.replaymod.core.regression.RegressionTest61;
-import com.replaymod.core.regression.RegressionTest62;
-import com.replaymod.extra.DownloadOpenEye;
-import com.replaymod.online.SkipLogin;
-import com.replaymod.recording.CreateSPWorld;
-import com.replaymod.recording.ExitSPWorld;
-import com.replaymod.replay.ExitReplay;
-import com.replaymod.replay.LoadReplay;
-import com.replaymod.replay.OpenReplayViewer;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import org.apache.logging.log4j.Logger;
-
-import static com.replaymod.core.AbstractTask.mc;
-import static com.replaymod.core.ReplayModIntegrationTest.MOD_ID;
-import static com.replaymod.core.utils.Utils.addCallback;
-
-/**
- * Helper mod that initiates the integration tests.
- */
-@Mod(modid = MOD_ID)
-public class ReplayModIntegrationTest {
-    public static final String MOD_ID = "replaymod-integration-test";
-
-    public static Logger LOGGER;
-
-    @Mod.EventHandler
-    public void init(FMLPreInitializationEvent event) {
-        LOGGER = event.getModLog();
-
-        // Make sure the game window doesn't have to remain in focus during the test
-        mc.gameSettings.pauseOnLostFocus = false;
-
-        runTasks(
-                new SkipLogin(),
-                new DownloadOpenEye(),
-                new CreateSPWorld(),
-                new Wait(5000),
-                new ExitSPWorld(),
-                new OpenReplayViewer(),
-                new LoadReplay(),
-
-                new RegressionTest60(),
-                new RegressionTest61(),
-                new RegressionTest62(),
-
-                // new AbstractTask() {}, // Uncomment to not exit on success (useful for writing more tests)
-                new ExitReplay()
-        );
-    }
-
-    private void runTasks(Task... tests) {
-        addCallback(new CompositeTask(tests).execute(), success -> {
-            if (!Minecraft.getMinecraft().hasCrashed) {
-                LOGGER.info("===================================================");
-                LOGGER.info("=                 ALL TESTS PASSED                =");
-                LOGGER.info("===================================================");
-                FMLCommonHandler.instance().exitJava(0, false);
-            }
-        }, error -> {
-            LOGGER.error("Failed task:", error);
-            LOGGER.error("===================================================");
-            LOGGER.error("=                  TEST FAILED                    =");
-            LOGGER.error("===================================================");
-            FMLCommonHandler.instance().exitJava(1, false);
-        });
-    }
-}

src/integration-test/java/com/replaymod/core/Task.java

@@ -1,35 +0,0 @@
-package com.replaymod.core;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-public interface Task {
-    ListenableFuture<Void> execute();
-
-    static Task click(int x, int y) {
-        return AbstractTask.create(task -> {
-            task.click(x, y);
-            task.runLater(() -> task.future.set(null));
-        });
-    }
-
-    static Task drag(int x, int y) {
-        return AbstractTask.create(task -> {
-            task.drag(x, y);
-            task.runLater(() -> task.future.set(null));
-        });
-    }
-
-    static Task pressKey(int keyCode) {
-        return AbstractTask.create(task -> {
-            task.press(keyCode);
-            task.runLater(() -> task.future.set(null));
-        });
-    }
-
-    static Task pressKey(char character, int keyCode) {
-        return AbstractTask.create(task -> {
-            task.press(character, keyCode);
-            task.runLater(() -> task.future.set(null));
-        });
-    }
-}

src/integration-test/java/com/replaymod/core/Utils.java

@@ -1,9 +0,0 @@
-package com.replaymod.core;
-
-public class Utils {
-    public static void times(int x, Runnable runnable) {
-        for (int i = 0; i < x; i++) {
-            runnable.run();
-        }
-    }
-}

src/integration-test/java/com/replaymod/core/Wait.java

@@ -1,21 +0,0 @@
-package com.replaymod.core;
-
-public class Wait extends AbstractTask {
-    private final int duration;
-
-    public Wait(int duration) {
-        this.duration = duration;
-    }
-
-    @Override
-    protected void init() {
-        new Thread(() -> {
-            try {
-                Thread.sleep(duration);
-                runLater(() -> future.set(null));
-            } catch (InterruptedException e) {
-                runLater(() -> future.setException(e));
-            }
-        }).start();
-    }
-}

src/integration-test/java/com/replaymod/core/regression/RegressionTest60.java

@@ -1,59 +0,0 @@
-package com.replaymod.core.regression;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.core.CompositeTask;
-import com.replaymod.core.Task;
-import com.replaymod.replay.SpectatePlayer;
-import com.replaymod.replay.overlay.OverlayGui;
-import com.replaymod.simplepathing.GuiPathingTasks;
-import com.replaymod.simplepathing.gui.GuiEditKeyframe;
-import org.lwjgl.input.Keyboard;
-
-import static com.replaymod.core.AbstractTask.mc;
-import static com.replaymod.core.Utils.times;
-
-/**
- * Regression test: #60 Crash in path preview when two spectator keyframes are closer than 50ms
- */
-public class RegressionTest60 extends CompositeTask {
-    public RegressionTest60() {
-        super(new Task[]{
-                new SpectatePlayer(),
-                OverlayGui.whileOpened(
-                        // Place first spectator keyframe
-                        new GuiPathingTasks.ClickPositionKeyframeButton(),
-                        // Place second spectator keyframe
-                        Task.click(130, 50),
-                        new GuiPathingTasks.ClickPositionKeyframeButton(),
-                        // Move second keyframe to 20ms on the keyframe timeline
-                        AbstractTask.create(task -> {
-                            // Double click keyframe
-                            task.click(130, 50);
-                            task.click(130, 50);
-                            task.expectGui(GuiEditKeyframe.Spectator.class, gui -> {
-                                // Set ms field to 20
-                                task.click(mc.currentScreen.width / 2 + 80, mc.currentScreen.height / 2);
-                                times(4, () -> task.press(Keyboard.KEY_BACK));
-                                task.type("20");
-                                // Set other fields to 0
-                                times(2, () -> {
-                                    task.press(Keyboard.KEY_TAB);
-                                    times(4, () -> task.press(Keyboard.KEY_BACK));
-                                    task.press(Keyboard.KEY_0);
-                                });
-                                task.click(gui.saveButton);
-                                task.expectPopupClosed(() -> task.future.set(null));
-                            });
-                        }),
-                        // Place second spectator keyframe
-                        new GuiPathingTasks.ClickPositionKeyframeButton()
-                ),
-                // Stop spectating player
-                new SpectatePlayer.End(),
-                // Enable path preview
-                Task.pressKey(Keyboard.KEY_H),
-                new GuiPathingTasks.ClearKeyframeTimeline(),
-                Task.pressKey(Keyboard.KEY_H),
-        });
-    }
-}

src/integration-test/java/com/replaymod/core/regression/RegressionTest61.java

@@ -1,35 +0,0 @@
-package com.replaymod.core.regression;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.core.CompositeTask;
-import com.replaymod.core.Task;
-import com.replaymod.replay.overlay.OverlayGui;
-import com.replaymod.simplepathing.GuiPathingTasks;
-import com.replaymod.simplepathing.gui.GuiEditKeyframe;
-
-/**
- * Regression test: #61 NPE when saving in edit keyframe gui of last keyframe
- */
-public class RegressionTest61 extends CompositeTask {
-    public RegressionTest61() {
-        super(new Task[]{
-                OverlayGui.whileOpened(
-                        // Place keyframe
-                        Task.click(130, 50),
-                        new GuiPathingTasks.ClickPositionKeyframeButton(),
-                        AbstractTask.create(task -> {
-                            // Double click keyframe
-                            task.click(130, 50);
-                            task.click(130, 50);
-                            task.expectGui(GuiEditKeyframe.Position.class, gui -> {
-                                task.click(gui.saveButton);
-                                task.expectPopupClosed(() -> task.future.set(null));
-                            });
-                        }),
-                        // Place second spectator keyframe
-                        new GuiPathingTasks.ClickPositionKeyframeButton()
-                ),
-                new GuiPathingTasks.ClearKeyframeTimeline(),
-        });
-    }
-}

src/integration-test/java/com/replaymod/core/regression/RegressionTest62.java

@@ -1,28 +0,0 @@
-package com.replaymod.core.regression;
-
-import com.replaymod.core.CompositeTask;
-import com.replaymod.core.Task;
-import com.replaymod.replay.overlay.OverlayGui;
-import com.replaymod.simplepathing.GuiPathingTasks;
-
-/**
- * Regression test: #62 Swapping the only two existing keyframes causes NPE
- */
-public class RegressionTest62 extends CompositeTask {
-    public RegressionTest62() {
-        super(new Task[]{
-                OverlayGui.whileOpened(
-                        // Place first keyframe
-                        Task.click(130, 50),
-                        new GuiPathingTasks.ClickPositionKeyframeButton(),
-                        // Place second keyframe
-                        Task.click(150, 50),
-                        new GuiPathingTasks.ClickPositionKeyframeButton(),
-                        // Move first keyframe past second keyframe
-                        Task.click(130,50),
-                        Task.drag(170,50)
-                ),
-                new GuiPathingTasks.ClearKeyframeTimeline()
-        });
-    }
-}

src/integration-test/java/com/replaymod/extra/DownloadOpenEye.java

@@ -1,25 +0,0 @@
-package com.replaymod.extra;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.extras.OpenEyeExtra;
-import net.minecraftforge.fml.common.Loader;
-
-import java.io.File;
-import java.nio.file.NoSuchFileException;
-
-public class DownloadOpenEye extends AbstractTask {
-    @Override
-    protected void init() {
-        expectGui(OpenEyeExtra.OfferGui.class, offerGui -> {
-            click(offerGui.yesButton);
-            expectGuiClosed(20 * 1000, () -> {
-                File targetFile = new File(mc.mcDataDir, "mods/" + Loader.MC_VERSION + "/OpenEye.jar");
-                if (!targetFile.exists()) {
-                    future.setException(new NoSuchFileException(targetFile.getAbsolutePath()));
-                } else {
-                    future.set(null);
-                }
-            });
-        });
-    }
-}

src/integration-test/java/com/replaymod/online/SkipLogin.java

@@ -1,14 +0,0 @@
-package com.replaymod.online;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.online.gui.GuiLoginPrompt;
-
-public class SkipLogin extends AbstractTask {
-    @Override
-    protected void init() {
-        expectGui(GuiLoginPrompt.class, gui -> {
-            click(gui.cancelButton);
-            expectGuiClosed(() -> future.set(null));
-        });
-    }
-}

src/integration-test/java/com/replaymod/recording/CreateSPWorld.java

@@ -1,32 +0,0 @@
-package com.replaymod.recording;
-
-import com.replaymod.core.AbstractTask;
-import net.minecraft.client.gui.GuiCreateWorld;
-import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.gui.GuiWorldSelection;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-public class CreateSPWorld extends AbstractTask {
-    @Override
-    protected void init() {
-        expectGui(GuiMainMenu.class, mainMenu -> {
-            click("Singleplayer");
-            expectGui(GuiWorldSelection.class, selectWorld -> {
-                click("Create New World");
-                expectGui(GuiCreateWorld.class, createWorld -> {
-                    click("Create New World");
-                    class EventHandler {
-                        @SubscribeEvent
-                        public void onRenderIngame(RenderGameOverlayEvent.Pre event) {
-                            MinecraftForge.EVENT_BUS.unregister(this);
-                            runLater(() -> future.set(null));
-                        }
-                    }
-                    MinecraftForge.EVENT_BUS.register(new EventHandler());
-                });
-            });
-        });
-    }
-}

src/integration-test/java/com/replaymod/recording/ExitSPWorld.java

@@ -1,36 +0,0 @@
-package com.replaymod.recording;
-
-import com.replaymod.core.AbstractTask;
-import net.minecraft.client.gui.GuiIngameMenu;
-import net.minecraft.client.gui.GuiMainMenu;
-import org.apache.commons.io.filefilter.DirectoryFileFilter;
-
-import java.io.IOException;
-
-public class ExitSPWorld extends AbstractTask {
-    @Override
-    protected void init() {
-        mc.displayInGameMenu();
-        expectGui(GuiIngameMenu.class, ingameMenu -> {
-            click("Save and Quit to Title");
-            expectGui(GuiMainMenu.class, mainMenu -> new Thread(() -> {
-                try {
-                    while (true) {
-                        String[] dirs = core.getReplayFolder().list(DirectoryFileFilter.DIRECTORY);
-                        if (dirs == null) {
-                            future.setException(new NullPointerException("dirs is null"));
-                            return;
-                        }
-                        if (dirs.length == 0) {
-                            runLater(() -> future.set(null));
-                            return;
-                        }
-                        Thread.sleep(10);
-                    }
-                } catch (IOException | InterruptedException e) {
-                    future.setException(e);
-                }
-            }).start());
-        });
-    }
-}

src/integration-test/java/com/replaymod/replay/ExitReplay.java

@@ -1,16 +0,0 @@
-package com.replaymod.replay;
-
-import com.replaymod.core.AbstractTask;
-import net.minecraft.client.gui.GuiIngameMenu;
-import net.minecraft.client.gui.GuiMainMenu;
-
-public class ExitReplay extends AbstractTask {
-    @Override
-    protected void init() {
-        mc.displayInGameMenu();
-        expectGui(GuiIngameMenu.class, ingameMenu -> {
-            click("Exit Replay");
-            expectGui(GuiMainMenu.class, mainMenu -> future.set(null));
-        });
-    }
-}

src/integration-test/java/com/replaymod/replay/LoadReplay.java

@@ -1,32 +0,0 @@
-package com.replaymod.replay;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.replay.gui.screen.GuiReplayViewer;
-import de.johni0702.minecraft.gui.function.Clickable;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import org.lwjgl.util.Point;
-import org.lwjgl.util.ReadableDimension;
-
-public class LoadReplay extends AbstractTask {
-    @Override
-    protected void init() {
-        expectGui(GuiReplayViewer.class, replayViewer -> runLater(() -> {
-            ReadableDimension size = replayViewer.getMaxSize();
-            // Select first entry
-            replayViewer.forEach(Clickable.class).mouseClick(new Point(size.getWidth() / 2, 40), 0);
-            // Load first replay
-            click(replayViewer.loadButton);
-
-            class EventHandler {
-                @SubscribeEvent
-                public void onRenderIngame(RenderGameOverlayEvent.Pre event) {
-                    MinecraftForge.EVENT_BUS.unregister(this);
-                    runLater(() -> future.set(null));
-                }
-            }
-            MinecraftForge.EVENT_BUS.register(new EventHandler());
-        }));
-    }
-}

src/integration-test/java/com/replaymod/replay/OpenReplayViewer.java

@@ -1,15 +0,0 @@
-package com.replaymod.replay;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.replay.gui.screen.GuiReplayViewer;
-import net.minecraft.client.gui.GuiMainMenu;
-
-public class OpenReplayViewer extends AbstractTask {
-    @Override
-    protected void init() {
-        expectGui(GuiMainMenu.class, mainMenu -> {
-            click("Replay Viewer");
-            expectGui(GuiReplayViewer.class, replayViewer -> future.set(null));
-        });
-    }
-}

src/integration-test/java/com/replaymod/replay/SpectatePlayer.java

@@ -1,42 +0,0 @@
-package com.replaymod.replay;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.extras.playeroverview.PlayerOverviewGui;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import org.lwjgl.input.Keyboard;
-
-import java.util.concurrent.TimeoutException;
-
-public class SpectatePlayer extends AbstractTask {
-    @Override
-    protected void init() {
-        press(Keyboard.KEY_B);
-        expectGui(PlayerOverviewGui.class, overview -> {
-            click(overview.getMaxSize().getWidth() / 2 - 60, 60);
-            press(Keyboard.KEY_ESCAPE);
-            expectGuiClosed(() -> future.set(null));
-        });
-    }
-
-    public static class End extends AbstractTask {
-        private int timeout;
-
-        @Override
-        protected void init() {
-            runLater(() -> press(Keyboard.KEY_LSHIFT));
-        }
-
-        @SubscribeEvent
-        public void onTick(TickEvent.RenderTickEvent event) {
-            if (event.phase != TickEvent.Phase.START) return;
-            if (timeout++ > 20) {
-                future.setException(new TimeoutException("Camera hasn't stopped spectating."));
-                return;
-            }
-            if (mc.getRenderViewEntity() == mc.thePlayer) {
-                future.set(null);
-            }
-        }
-    }
-}

src/integration-test/java/com/replaymod/replay/overlay/OverlayGui.java

@@ -1,33 +0,0 @@
-package com.replaymod.replay.overlay;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.core.CompositeTask;
-import com.replaymod.core.Task;
-import com.replaymod.replay.gui.overlay.GuiReplayOverlay;
-import org.lwjgl.input.Keyboard;
-
-public class OverlayGui {
-    public static Task whileOpened(Task...tasks) {
-        Task[] nTasks = new Task[tasks.length + 2];
-        System.arraycopy(tasks, 0, nTasks, 1, tasks.length);
-        nTasks[0] = new Open();
-        nTasks[tasks.length + 1] = new Close();
-        return new CompositeTask(nTasks);
-    }
-
-    public static class Open extends AbstractTask {
-        @Override
-        protected void init() {
-            press(Keyboard.KEY_T);
-            expectGui(GuiReplayOverlay.class, done -> future.set(null));
-        }
-    }
-
-    public static class Close extends AbstractTask {
-        @Override
-        protected void init() {
-            press(Keyboard.KEY_ESCAPE);
-            expectGuiClosed(() -> future.set(null));
-        }
-    }
-}

src/integration-test/java/com/replaymod/simplepathing/GuiPathingTasks.java

@@ -1,35 +0,0 @@
-package com.replaymod.simplepathing;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.replay.gui.overlay.GuiReplayOverlay;
-import com.replaymod.simplepathing.gui.GuiPathing;
-import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
-import org.lwjgl.input.Keyboard;
-
-public abstract class GuiPathingTasks extends AbstractTask {
-    @Override
-    protected void init() {
-        expectGui(GuiReplayOverlay.class, ign -> init0(ReplayModSimplePathing.instance.getGuiPathing()));
-    }
-
-    protected abstract void init0(GuiPathing guiPathing);
-
-    public static class ClickPositionKeyframeButton extends GuiPathingTasks {
-        @Override
-        protected void init0(GuiPathing guiPathing) {
-            click(guiPathing.positionKeyframeButton);
-            runLater(() -> future.set(null));
-        }
-    }
-
-    public static class ClearKeyframeTimeline extends AbstractTask {
-        @Override
-        protected void init() {
-            press(Keyboard.KEY_C);
-            expectGui(GuiYesNoPopup.class, popup -> {
-                click(popup.getYesButton());
-                expectGuiClosed(() -> future.set(null));
-            });
-        }
-    }
-}

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

@@ -1,8 +1,6 @@
 package com.replaymod.compat;
 
-import com.replaymod.compat.bettersprinting.DisableBetterSprinting;
 import com.replaymod.compat.optifine.DisableFastRender;
-import com.replaymod.compat.oranges17animations.HideInvisibleEntities;
 import com.replaymod.compat.shaders.ShaderBeginRender;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
@@ -12,7 +10,6 @@ import net.minecraftforge.fml.common.eventhandler.EventBus;
 @Mod(modid = ReplayModCompat.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
 public class ReplayModCompat {
     public static final String MOD_ID = "replaymod-compat";
@@ -22,8 +19,6 @@ public class ReplayModCompat {
         EventBus bus = MinecraftForge.EVENT_BUS;
         bus.register(new ShaderBeginRender());
         bus.register(new DisableFastRender());
-        bus.register(new HideInvisibleEntities());
-        DisableBetterSprinting.register();
     }
 
 }

src/main/java/com/replaymod/compat/bettersprinting/DisableBetterSprinting.java

@@ -1,102 +0,0 @@
-package com.replaymod.compat.bettersprinting;
-
-import com.replaymod.replay.ReplayModReplay;
-import com.replaymod.replay.events.ReplayChatMessageEvent;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.PlayerControllerMP;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IWorldEventListener;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.GuiOpenEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.ModContainer;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.versioning.DefaultArtifactVersion;
-import net.minecraftforge.fml.common.versioning.Restriction;
-import net.minecraftforge.fml.common.versioning.VersionRange;
-
-import javax.annotation.Nullable;
-import java.util.Collections;
-
-/**
- * Old Better Sprinting versions replace the vanilla player with their own, overridden instance (replacing the camera entity).
- *
- * See: https://github.com/chylex/Better-Sprinting/blob/1.8/src/main/java/chylex/bettersprinting/client/player/impl/LogicImplOverride.java
- */
-public class DisableBetterSprinting {
-    private static final VersionRange OLD_VERSION = VersionRange.newRange(null,
-            Collections.singletonList(new Restriction(null, false, new DefaultArtifactVersion("2.0.0"), false)));
-    private static final String LOGIC_CLASS_NAME = "chylex.bettersprinting.client.player.impl.LogicImplOverride";
-    private static final String CONTROLLER_OVERRIDE_CLASS_NAME = LOGIC_CLASS_NAME + ".PlayerControllerMPOverride";
-
-    public static void register() {
-        Loader.instance().getModList().stream()
-                .filter(mod -> mod.getModId().equalsIgnoreCase("bettersprinting"))
-                .findFirst()
-                .map(ModContainer::getProcessedVersion).filter(OLD_VERSION::containsVersion)
-                .ifPresent($_ -> MinecraftForge.EVENT_BUS.register(new DisableBetterSprinting()));
-    }
-
-    private DisableBetterSprinting() {}
-
-    private final Minecraft mc = Minecraft.getMinecraft();
-    private PlayerControllerMP originalController;
-    private BetterSprintingWorldAccess worldAccessHook = new BetterSprintingWorldAccess();
-
-    @SubscribeEvent(priority = EventPriority.HIGH)
-    public void beforeGuiOpenEvent(GuiOpenEvent event) {
-        if (ReplayModReplay.instance.getReplayHandler() != null && mc.theWorld != null) {
-            // During replay, get ready to revert BetterSprinting's overwritten playerController
-            originalController = mc.playerController;
-            mc.theWorld.addEventListener(worldAccessHook);
-        }
-    }
-
-    @SubscribeEvent(priority = EventPriority.LOW)
-    public void afterGuiOpenEvent(GuiOpenEvent event) {
-        if (ReplayModReplay.instance.getReplayHandler() != null && mc.theWorld != null) {
-            mc.theWorld.addEventListener(worldAccessHook);
-        }
-    }
-
-    @SubscribeEvent
-    public void onReplayChatMessage(ReplayChatMessageEvent event) {
-        // Suppress this message if it's the Better Sprinting warning message
-        for (StackTraceElement elem : Thread.currentThread().getStackTrace()) {
-            if (LOGIC_CLASS_NAME.equals(elem.getClassName())) {
-                event.setCanceled(true);
-                return;
-            }
-        }
-    }
-
-    private class BetterSprintingWorldAccess implements IWorldEventListener {
-        @Override
-        public void onEntityRemoved(Entity entityIn) {
-            if (mc.playerController != null && mc.playerController.getClass().getName().equals(CONTROLLER_OVERRIDE_CLASS_NAME)) {
-                // Someone has secretly swapped out the player controller and is about to substitute their own player entity.
-                // This is the right time to destroy their plan.
-                mc.playerController = originalController;
-            }
-        }
-
-        @Override public void notifyBlockUpdate(World worldIn, BlockPos pos, IBlockState oldState, IBlockState newState, int flags) {}
-        @Override public void notifyLightSet(BlockPos pos) {}
-        @Override public void markBlockRangeForRenderUpdate(int x1, int y1, int z1, int x2, int y2, int z2) {}
-        @Override public void playSoundToAllNearExcept(@Nullable EntityPlayer player, SoundEvent soundIn, SoundCategory category, double x, double y, double z, float volume, float pitch) {}
-        @Override public void playRecord(SoundEvent soundIn, BlockPos pos) {}
-        @Override public void spawnParticle(int p_180442_1_, boolean p_180442_2_, double p_180442_3_, double p_180442_5_, double p_180442_7_, double p_180442_9_, double p_180442_11_, double p_180442_13_, int... p_180442_15_) {}
-        @Override public void func_190570_a(int p_190570_1_, boolean p_190570_2_, boolean p_190570_3_, double p_190570_4_, double p_190570_6_, double p_190570_8_, double p_190570_10_, double p_190570_12_, double p_190570_14_, int... p_190570_16_) {}
-        @Override public void onEntityAdded(Entity entityIn) {}
-        @Override public void broadcastSound(int p_180440_1_, BlockPos p_180440_2_, int p_180440_3_) {}
-        @Override public void playEvent(EntityPlayer player, int type, BlockPos blockPosIn, int data) {}
-        @Override public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {}
-    }
-}

src/main/java/com/replaymod/compat/oranges17animations/HideInvisibleEntities.java

@@ -1,28 +0,0 @@
-package com.replaymod.compat.oranges17animations;
-
-import com.replaymod.replay.camera.CameraEntity;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.client.event.RenderLivingEvent;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-/**
- * Orange seems to have copied vast parts of the RendererLivingEntity into their ArmorAnimation class which cancels the RenderLivingEvent.Pre and calls its own code instead.
- * This breaks our mixin which assures that, even though the camera is in spectator mode, it cannot see invisible entities.
- *
- * To fix this issue, we simply cancel the RenderLivingEvent.Pre before it gets to ArmorAnimation if the entity is invisible.
- */
-public class HideInvisibleEntities {
-    private final Minecraft mc = Minecraft.getMinecraft();
-    private final boolean modLoaded = Loader.isModLoaded("animations");
-
-    @SubscribeEvent(priority = EventPriority.HIGH)
-    public void preRenderLiving(RenderLivingEvent.Pre event) {
-        if (modLoaded) {
-            if (mc.thePlayer instanceof CameraEntity && event.getEntity().isInvisible()) {
-                event.setCanceled(true);
-            }
-        }
-    }
-}

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

@@ -20,7 +20,6 @@ public class LoadingPlugin implements IFMLLoadingPlugin {
         Mixins.addConfiguration("mixins.render.replaymod.json");
         Mixins.addConfiguration("mixins.replay.replaymod.json");
         Mixins.addConfiguration("mixins.compat.shaders.replaymod.json");
-        Mixins.addConfiguration("mixins.extras.playeroverview.replaymod.json");
 
         CodeSource codeSource = getClass().getProtectionDomain().getCodeSource();
         if (codeSource != null) {

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

@@ -26,9 +26,6 @@ import net.minecraftforge.fml.common.ModContainer;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.eventhandler.EventBus;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -39,7 +36,6 @@ import java.util.List;
         useMetadata = true,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         updateJSON = "https://raw.githubusercontent.com/ReplayMod/ReplayMod/master/versions.json",
         guiFactory = "com.replaymod.core.gui.GuiFactory")
 public class ReplayMod {
@@ -163,36 +159,9 @@ public class ReplayMod {
         });
     }
 
-    /**
-     * Set when the currently running code has been scheduled by runLater.
-     * If this is the case, subsequent calls to runLater have to be delayed until all scheduled tasks have been
-     * processed, otherwise a livelock may occur.
-     */
-    private boolean inRunLater = false;
-
     public void runLater(Runnable runnable) {
-        if (mc.isCallingFromMinecraftThread() && inRunLater) {
-            EventBus bus = MinecraftForge.EVENT_BUS;
-            bus.register(new Object() {
-                @SubscribeEvent
-                public void onRenderTick(TickEvent.RenderTickEvent event) {
-                    if (event.phase == TickEvent.Phase.START) {
-                        runLater(runnable);
-                        bus.unregister(this);
-                    }
-                }
-            });
-            return;
-        }
         synchronized (mc.scheduledTasks) {
-            mc.scheduledTasks.add(ListenableFutureTask.create(() -> {
+            mc.scheduledTasks.add(ListenableFutureTask.create(runnable, null));
-                inRunLater = true;
-                try {
-                    runnable.run();
-                } finally {
-                    inRunLater = false;
-                }
-            }, null));
         }
     }
 

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()) {
-                    try (ReplayInputStream in = replayFile.getPacketData();
-                         ReplayOutputStream out = replayFile.writePacketData()) {
                         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/Restrictions.java

@@ -17,7 +17,7 @@ public class Restrictions {
     public String handle(SPacketCustomPayload packet) {
         PacketBuffer buffer = packet.getBufferData();
         while (buffer.isReadable()) {
-            String name = buffer.readStringFromBuffer(64);
+            String name = buffer.readString(64);
             boolean active = buffer.readBoolean();
 //            if ("no_xray".equals(name)) {
 //                noXray = active;

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

@@ -1,9 +1,7 @@
 package com.replaymod.core.utils;
 
-import com.google.common.net.PercentEscaper;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import de.johni0702.minecraft.gui.GuiRenderer;
 import de.johni0702.minecraft.gui.RenderInfo;
 import de.johni0702.minecraft.gui.container.AbstractGuiScrollable;
@@ -17,43 +15,24 @@ 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 lombok.SneakyThrows;
 import net.minecraft.client.gui.GuiScreen;
 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.commons.io.Charsets;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.Dimension;
 import org.lwjgl.util.ReadableDimension;
 
-import javax.annotation.Nonnull;
 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.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-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 java.util.function.Consumer;
 
 import static net.minecraft.client.Minecraft.getMinecraft;
 
@@ -72,42 +51,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;
@@ -143,22 +86,6 @@ public class Utils {
         return mail.matches("^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$");
     }
 
-    private static final PercentEscaper REPLAY_NAME_ENCODER = new PercentEscaper(".-_ ", false);
-
-    public static String replayNameToFileName(String replayName) {
-        return REPLAY_NAME_ENCODER.escape(replayName) + ".mcpr";
-    }
-
-    @SneakyThrows(UnsupportedEncodingException.class)
-    public static String fileNameToReplayName(String fileName) {
-        String baseName = FilenameUtils.getBaseName(fileName);
-        try {
-            return URLDecoder.decode(baseName, Charsets.UTF_8.name());
-        } catch (IllegalArgumentException e) {
-            return baseName;
-        }
-    }
-
     public static ResourceLocation getResourceLocationForPlayerUUID(UUID uuid) {
         NetworkPlayerInfo info = getMinecraft().getConnection().getPlayerInfo(uuid);
         ResourceLocation skinLocation;
@@ -174,20 +101,6 @@ public class Utils {
         return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
     }
 
-    public static <T> void addCallback(ListenableFuture<T> future, Consumer<T> onSuccess, Consumer<Throwable> onFailure) {
-        Futures.addCallback(future, new FutureCallback<T>() {
-            @Override
-            public void onSuccess(@Nullable T result) {
-                onSuccess.accept(result);
-            }
-
-            @Override
-            public void onFailure(@Nonnull Throwable t) {
-                onFailure.accept(t);
-            }
-        });
-    }
-
     public static GuiInfoPopup error(Logger logger, GuiContainer container, CrashReport crashReport, Runnable onClose) {
         // Convert crash report to string
         String crashReportStr = crashReport.getCompleteReport();

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

@@ -11,7 +11,6 @@ import org.apache.logging.log4j.Logger;
 @Mod(modid = ReplayModEditor.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
 public class ReplayModEditor {
     public static final String MOD_ID = "replaymod-editor";

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

@@ -1,6 +1,5 @@
 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;
@@ -35,7 +34,7 @@ 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;
@@ -58,9 +57,6 @@ public class GuiReplayEditor extends GuiScreen {
     public GuiButton currentTabButton;
     public GuiPanel currentTabPanel;
 
-    public final GuiLabel warningLabel = new GuiLabel(this).setColor(Colors.RED)
-            .setI18nText("replaymod.gui.editor.disclaimer");
-
     public final GuiPanel tabButtons = new GuiPanel(this).setLayout(new GridLayout().setSpacingX(5));
     public final List<GuiPanel> tabPanels = new ArrayList<>();
 
@@ -86,18 +82,15 @@ public class GuiReplayEditor extends GuiScreen {
                 // Move all inactive panels aside
                 tabPanels.forEach(e -> pos(e, Integer.MIN_VALUE, Integer.MIN_VALUE));
 
-                pos(warningLabel, 10, 22);
-                size(warningLabel, width - 20, 10);
-
-                pos(tabButtons, 10, y(warningLabel) + height(warningLabel) + 2);
-                size(tabButtons, width - 20, 20);
-
                 pos(buttonPanel, width - 10 - width(buttonPanel), height - 10 - height(buttonPanel));
 
                 if (currentTabPanel != null) {
-                    pos(currentTabPanel, 10, y(tabButtons) + height(tabButtons) + 10);
+                    pos(currentTabPanel, 10, 50);
                     size(currentTabPanel, width - 20, y(buttonPanel) - 10 - y(currentTabPanel));
                 }
+
+                pos(tabButtons, 10, 20);
+                size(tabButtons, width - 20, 20);
             }
         });
     }
@@ -124,23 +117,12 @@ public class GuiReplayEditor extends GuiScreen {
     }
 
     public void save(File inputFile, PacketStream.FilterInfo...filters) {
-        save(Utils.fileNameToReplayName(inputFile.getName()), (outputFile) -> {
+        save(FilenameUtils.getBaseName(inputFile.getName()), (outputFile) -> {
             Studio studio = new ReplayStudio();
-            File tmpDir = null;
+            try (ReplayFile outputReplay = new ZipReplayFile(studio, inputFile, outputFile);
-            try {
+                 ReplayOutputStream out = outputReplay.writePacketData()) {
-                File actualOutputFile  = outputFile;
+                // The input replay file MUST be closed before saving the output file
-                if (outputFile.getCanonicalPath().equals(inputFile.getCanonicalPath())) {
+                try (ReplayFile inputReplay = new ZipReplayFile(studio, inputFile);
-                    // 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);
@@ -172,21 +154,11 @@ public class GuiReplayEditor extends GuiScreen {
                     // 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);
                 }
+                out.close();
+                outputReplay.save();
             } catch (IOException e) {
                 throw new RuntimeException(e);
-            } finally {
-                if (tmpDir != null && !FileUtils.deleteQuietly(tmpDir)) {
-                    LOGGER.warn("Failed to delete temporary directory {}", tmpDir);
-                }
             }
         });
     }
@@ -219,7 +191,7 @@ public class GuiReplayEditor extends GuiScreen {
                         Utils.error(LOGGER, GuiReplayEditor.this, CrashReport.makeCrashReport(e, "Getting replay folder"), null);
                         return;
                     }
-                    File targetFile = new File(replayFolder, Utils.replayNameToFileName(name));
+                    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,

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

@@ -20,6 +20,7 @@ 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;
@@ -38,10 +39,6 @@ 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
@@ -51,18 +48,18 @@ public class GuiTrimPanel extends GuiPanel {
 
     public final GuiDropdownMenu<File> inputReplays = new GuiDropdownMenu<File>(this)
             .setMinSize(new Dimension(200, 20)).onSelection(i -> updateSelectedReplay())
-            .setToString(f -> f == NO_REPLAY ? "" : Utils.fileNameToReplayName(f.getName()));
+            .setToString(f -> f == NO_REPLAY ? "" : FilenameUtils.getBaseName(f.getName()));
 
-    public final GuiNumberField startHour = newGuiNumberField();
+    public final GuiNumberField startHour = new GuiNumberField().setSize(20, 20).setMaxLength(2);
-    public final GuiNumberField startMin = newGuiNumberField();
+    public final GuiNumberField startMin = new GuiNumberField().setSize(20, 20).setMaxLength(2);
-    public final GuiNumberField startSec = newGuiNumberField();
+    public final GuiNumberField startSec = new GuiNumberField().setSize(20, 20).setMaxLength(2);
-    public final GuiNumberField startMilli = newGuiNumberField().setSize(40, 20).setMaxLength(4);
+    public final GuiNumberField startMilli = new GuiNumberField().setSize(40, 20).setMaxLength(4);
     public final GuiDropdownMenu<Marker> startMarker = new GuiDropdownMenu<>();
 
-    public final GuiNumberField endHour = newGuiNumberField();
+    public final GuiNumberField endHour = new GuiNumberField().setSize(20, 20).setMaxLength(2);
-    public final GuiNumberField endMin = newGuiNumberField();
+    public final GuiNumberField endMin = new GuiNumberField().setSize(20, 20).setMaxLength(2);
-    public final GuiNumberField endSec = newGuiNumberField();
+    public final GuiNumberField endSec = new GuiNumberField().setSize(20, 20).setMaxLength(2);
-    public final GuiNumberField endMilli = newGuiNumberField().setSize(40, 20).setMaxLength(4);
+    public final GuiNumberField endMilli = new GuiNumberField().setSize(40, 20).setMaxLength(4);
     public final GuiDropdownMenu<Marker> endMarker = new GuiDropdownMenu<>();
 
     public final GuiPanel timePanel = new GuiPanel(this)

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

@@ -1,106 +1,102 @@
 package com.replaymod.extras;
 
+import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
 import com.replaymod.core.ReplayMod;
+import com.replaymod.online.ReplayModOnline;
+import com.replaymod.online.api.ApiClient;
+import com.replaymod.online.api.ApiException;
+import lombok.RequiredArgsConstructor;
 import net.minecraft.client.Minecraft;
 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 org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
+import java.net.ConnectException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import static com.replaymod.extras.ReplayModExtras.LOGGER;
 
 public class LocalizationExtra implements Extra {
-    private static final String ZIP_FILE_URL = "https://github.com/ReplayMod/Translations/archive/master.zip";
+    private ReplayModOnline module;
-    private static final String LANG_PREFIX = "Translations-master/";
 
     @Override
     public void register(ReplayMod mod) throws Exception {
-        final Minecraft mc = mod.getMinecraft();
+        this.module = ReplayModOnline.instance;
-        if (Boolean.parseBoolean(System.getProperty("replaymod.offline", "false"))) {
-            return;
-        }
-        Thread localizedResourcePackLoader = new Thread(() -> {
-            try {
-                // Download zip of lang files
-                LOGGER.debug("Downloading languages from {}", ZIP_FILE_URL);
-                Map<String, byte[]> languages = new HashMap<>();
-                try (InputStream urlIn = new URL(ZIP_FILE_URL).openStream();
-                     ZipInputStream in = new ZipInputStream(urlIn)) {
-                    ZipEntry entry;
-                    while ((entry = in.getNextEntry()) != null) {
-                        String name = entry.getName();
-                        if (!name.startsWith(LANG_PREFIX) || !name.endsWith(".lang")) {
-                           continue;
-                        }
-                        name = name.substring(LANG_PREFIX.length());
-                        languages.put(name, IOUtils.toByteArray(in));
-                        LOGGER.debug("Added language file {}", name);
-                    }
-                }
-                LOGGER.debug("Downloaded {} languages", languages.size());
 
-                // Add lang files as resource pack
+        final Minecraft mc = mod.getMinecraft();
-                mc.addScheduledTask(() -> {
+        Thread localizedResourcePackLoader = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
                     @SuppressWarnings("unchecked")
                     List<IResourcePack> defaultResourcePacks = mc.defaultResourcePacks;
-                    defaultResourcePacks.add(new LocalizedResourcePack(languages));
+                    defaultResourcePacks.add(new LocalizedResourcePack(module.getApiClient()));
-                    mc.getLanguageManager().onResourceManagerReload(mc.getResourceManager());
+                    mc.addScheduledTask(new Runnable() {
-                    LOGGER.debug("Added language files to resource packs and reloaded LanguageManager");
+                        @Override
-                });
+                        public void run() {
-            } catch (Throwable t) {
+                            mc.refreshResources();
-                LOGGER.error("Loading localized resource pack:", t);
+                        }
+                    });
+                } catch(Exception e) {
+                    e.printStackTrace();
+                }
             }
         }, "localizedResourcePackLoader");
-        localizedResourcePackLoader.setDaemon(true);
         localizedResourcePackLoader.start();
     }
 
+    @RequiredArgsConstructor
     public static class LocalizedResourcePack implements IResourcePack {
-        private final Pattern LANG_PATTERN = Pattern.compile("^lang/([.+].lang)$");
+        private final ApiClient apiClient;
-        private final Map<String, byte[]> languages;
+        private Map<String, String> availableLanguages = new HashMap<>();
-
+        private boolean websiteAvailable = true;
-        public LocalizedResourcePack(Map<String, byte[]> languages) {
-            this.languages = languages;
-        }
 
         @Override
         public InputStream getInputStream(ResourceLocation loc) {
-            if (!"replaymod".equals(loc.getResourceDomain())) return null;
+            if(!loc.getResourcePath().endsWith(".lang")) return null;
-            Matcher matcher = LANG_PATTERN.matcher(loc.getResourcePath());
+            String langcode = loc.getResourcePath().split("/")[1].split("\\.")[0];
-            if (matcher.matches()) {
+            if(availableLanguages.containsKey(langcode)) return new ByteArrayInputStream(availableLanguages.get(langcode).getBytes(Charsets.UTF_8));
-                byte[] bytes = languages.get(matcher.group());
-                if (bytes != null) {
-                    return new ByteArrayInputStream(bytes);
-                }
-            }
             return null;
         }
 
         @Override
         public boolean resourceExists(ResourceLocation loc) {
-            // Assumes that getInputStream returns a ByteArrayInputStream that doesn't need to be closed
+            if(!(loc.getResourcePath().endsWith(".lang"))) return false;
-            return getInputStream(loc) != null;
+            String langcode = loc.getResourcePath().split("/")[1].split("\\.")[0];
+            if(availableLanguages.containsKey(langcode)) return true;
+            if(!websiteAvailable) return false;
+            try {
+                if (Boolean.parseBoolean(System.getProperty("replaymod.offline", "false"))) {
+                    return false;
+                }
+                String lang = apiClient.getTranslation(langcode);
+                String prop = StringEscapeUtils.unescapeHtml4(lang);
+                availableLanguages.put(langcode, prop);
+                return true;
+            } catch (ApiException e) {
+                if (e.getError().getId() != 16) { // This language has not been translated
+                    e.printStackTrace();
+                }
+            } catch(ConnectException ce) {
+                websiteAvailable = false;
+                ce.printStackTrace();
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+            return false;
         }
 
         @Override
         public Set<String> getResourceDomains() {
-            return ImmutableSet.of("replaymod");
+            return ImmutableSet.of("minecraft", "replaymod");
         }
 
         @Override

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;
@@ -43,7 +40,7 @@ public class OpenEyeExtra implements Extra {
         }
     }
 
-    public class OfferGui extends AbstractGuiScreen<OfferGui> {
+    private class OfferGui extends AbstractGuiScreen<OfferGui> {
         public final GuiScreen parent;
         public final GuiPanel textPanel = new GuiPanel().setLayout(new VerticalLayout().setSpacing(3))
                 .addElements(new VerticalLayout.Data(0.5),
@@ -69,12 +66,10 @@ public class OpenEyeExtra implements Extra {
                 GuiPopup popup = new GuiPopup(OfferGui.this);
                 new Thread(() -> {
                     try {
-                        File targetFile = new File(mod.getMinecraft().mcDataDir, "mods/" + Loader.MC_VERSION + "/OpenEye.jar");
+                        File targetFile = new File("mods/" + Loader.MC_VERSION, "OpenEye.jar");
                         FileUtils.forceMkdir(targetFile.getParentFile());
 
-                        HttpsURLConnection connection = (HttpsURLConnection) new URL(DOWNLOAD_URL).openConnection();
+                        ReadableByteChannel in = Channels.newChannel(new URL(DOWNLOAD_URL).openStream());
-                        connection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
-                        ReadableByteChannel in = Channels.newChannel(connection.getInputStream());
                         FileChannel out = new FileOutputStream(targetFile).getChannel();
                         out.transferFrom(in, 0, Long.MAX_VALUE);
                     } catch (Throwable e) {
@@ -107,7 +102,7 @@ public class OpenEyeExtra implements Extra {
         }
     }
 
-    public static final class GuiPopup extends AbstractGuiPopup<GuiPopup> {
+    private static final class GuiPopup extends AbstractGuiPopup<GuiPopup> {
         GuiPopup(GuiContainer container) {
             super(container);
             popup.addElements(null, new GuiIndicator().setColor(Colors.BLACK));

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

@@ -10,15 +10,11 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import org.apache.logging.log4j.Logger;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 
 @Mod(modid = ReplayModExtras.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
 public class ReplayModExtras {
     public static final String MOD_ID = "replaymod-extras";
@@ -36,13 +32,11 @@ public class ReplayModExtras {
             OpenEyeExtra.class
     );
 
-    private final Map<Class<? extends Extra>, Extra> instances = new HashMap<>();
+    private Logger logger;
-
-    public static Logger LOGGER;
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        LOGGER = event.getModLog();
+        logger = event.getModLog();
     }
 
     @Mod.EventHandler
@@ -51,14 +45,9 @@ public class ReplayModExtras {
             try {
                 Extra extra = cls.newInstance();
                 extra.register(ReplayMod.instance);
-                instances.put(cls, extra);
             } catch (Throwable t) {
-                LOGGER.warn("Failed to load extra " + cls.getName() + ": ", t);
+                logger.warn("Failed to load extra " + cls.getName() + ": ", t);
             }
         }
     }
-
-    public <T extends Extra> Optional<T> get(Class<T> cls) {
-        return Optional.ofNullable(instances.get(cls)).map(cls::cast);
-    }
 }

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

@@ -9,9 +9,9 @@ import com.replaymod.replay.ReplayModReplay;
 import com.replaymod.replay.camera.CameraEntity;
 import com.replaymod.replay.events.ReplayCloseEvent;
 import com.replaymod.replay.events.ReplayOpenEvent;
-import net.minecraft.entity.Entity;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
@@ -34,7 +34,7 @@ public class PlayerOverview implements Extra {
             public void run() {
                 if (module.getReplayHandler() != null) {
                     @SuppressWarnings("unchecked")
-                    List<EntityPlayer> players = mod.getMinecraft().theWorld.getPlayers(EntityPlayer.class, new Predicate() {
+                    List<EntityPlayer> players = mod.getMinecraft().world.getPlayers(EntityPlayer.class, new Predicate() {
                         @Override
                         public boolean apply(Object input) {
                             return !(input instanceof CameraEntity); // Exclude the camera entity
@@ -56,6 +56,12 @@ public class PlayerOverview implements Extra {
         });
 
         MinecraftForge.EVENT_BUS.register(this);
+
+        RenderManager renderManager = mod.getMinecraft().getRenderManager();
+        @SuppressWarnings("unchecked")
+        Map<String, RenderPlayer> skinMap = renderManager.skinMap;
+        skinMap.put("default", new PlayerRenderHook(this, renderManager, false));
+        skinMap.put("slim", new PlayerRenderHook(this, renderManager, true));
     }
 
     public boolean isHidden(UUID uuid) {
@@ -86,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/playeroverview/PlayerOverviewGui.java

@@ -4,15 +4,10 @@ import com.replaymod.core.utils.Utils;
 import com.replaymod.replay.ReplayModReplay;
 import de.johni0702.minecraft.gui.GuiRenderer;
 import de.johni0702.minecraft.gui.RenderInfo;
-import de.johni0702.minecraft.gui.container.GuiClickable;
+import de.johni0702.minecraft.gui.container.*;
-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.container.GuiVerticalList;
 import de.johni0702.minecraft.gui.element.GuiCheckbox;
 import de.johni0702.minecraft.gui.element.GuiImage;
 import de.johni0702.minecraft.gui.element.GuiLabel;
-import de.johni0702.minecraft.gui.element.GuiTooltip;
 import de.johni0702.minecraft.gui.element.IGuiCheckbox;
 import de.johni0702.minecraft.gui.function.Closeable;
 import de.johni0702.minecraft.gui.layout.CustomLayout;
@@ -42,7 +37,6 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
     public final GuiVerticalList playersScrollable = new GuiVerticalList(contentPanel)
             .setDrawSlider(true).setDrawShadow(true);
     public final GuiCheckbox saveCheckbox = new GuiCheckbox(contentPanel)
-            .setTooltip(new GuiTooltip().setI18nText("replaymod.gui.playeroverview.remembersettings.description"))
             .setI18nLabel("replaymod.gui.playeroverview.remembersettings");
     public final GuiCheckbox checkAll = new GuiCheckbox(contentPanel){
         @Override
@@ -50,14 +44,14 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
             getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
             playersScrollable.forEach(IGuiCheckbox.class).setChecked(true);
         }
-    }.setLabel("").setChecked(true).setTooltip(new GuiTooltip().setI18nText("replaymod.gui.playeroverview.showall"));
+    }.setLabel("").setChecked(true);
     public final GuiCheckbox uncheckAll = new GuiCheckbox(contentPanel){
         @Override
         public void onClick() {
             getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1.0F));
             playersScrollable.forEach(IGuiCheckbox.class).setChecked(false);
         }
-    }.setLabel("").setChecked(false).setTooltip(new GuiTooltip().setI18nText("replaymod.gui.playeroverview.hideall"));
+    }.setLabel("").setChecked(false);
 
     {
         setBackground(Background.NONE);

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

@@ -0,0 +1,20 @@
+package com.replaymod.extras.playeroverview;
+
+import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.renderer.culling.ICamera;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderPlayer;
+
+public class PlayerRenderHook extends RenderPlayer {
+    private final PlayerOverview extra;
+
+    public PlayerRenderHook(PlayerOverview extra, RenderManager renderManager, boolean useSmallArms) {
+        super(renderManager, useSmallArms);
+        this.extra = extra;
+    }
+
+    @Override
+    public boolean shouldRender(AbstractClientPlayer entity, ICamera camera, double camX, double camY, double camZ) {
+        return !extra.isHidden(entity.getUniqueID()) && super.shouldRender(entity, camera, camX, camY, camZ);
+    }
+}

src/main/java/com/replaymod/extras/playeroverview/mixin/MixinRender.java

@@ -1,40 +0,0 @@
-package com.replaymod.extras.playeroverview.mixin;
-
-import com.replaymod.extras.ReplayModExtras;
-import com.replaymod.extras.playeroverview.PlayerOverview;
-import net.minecraft.client.renderer.culling.ICamera;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-/**
- * This mixin prevents players that are hidden in the PlayerOverview from being rendered.
- *
- * Cancelling the RenderPlayerEvent.Pre is insufficient because it affects neither the shadows nor the fire texture.
- * See: https://github.com/MinecraftForge/MinecraftForge/issues/2987
- *
- * The previous solution was to overwrite the RenderPlayer instances which has been dropped in favor of this one
- * because it is less compatible with other mods whereas this one should be fine as long as no other mod completely
- * overwrites the shouldRender method.
- * One example of the previous solution breaking is when used with VanillaEnhancements because it replaces the
- * RenderManager with a new custom one which in turn will reset our registered RenderPlayer instances because
- * it does so after we have already registered with the old RenderManager.
- */
-@Mixin(value = Render.class, priority = 1200)
-public abstract class MixinRender {
-    @Inject(method = "shouldRender", at=@At("HEAD"), cancellable = true)
-    public void replayModExtras_isPlayerHidden(Entity entity, ICamera camera, double camX, double camY, double camZ, CallbackInfoReturnable<Boolean> ci) {
-        ReplayModExtras.instance.get(PlayerOverview.class).ifPresent(playerOverview -> {
-            if (entity instanceof EntityPlayer) {
-                EntityPlayer player = (EntityPlayer) entity;
-                if (playerOverview.isHidden(player.getUniqueID())) {
-                    ci.setReturnValue(false);
-                }
-            }
-        });
-    }
-}

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

@@ -25,7 +25,6 @@ public class LinuxUriScheme extends UriScheme {
                 "Icon=" + iconFile.getAbsolutePath().replace("\\", "\\\\").replace("\"", "\\\"") + "\n" +
                 "Type=Application\n" +
                 "Terminal=false\n" +
-                "NoDisplay=true\n" +
                 "MimeType=x-scheme-handler/replaymod;";
 
         FileOutputStream out = new FileOutputStream(file);

src/main/java/com/replaymod/extras/youtube/YoutubeUploader.java

@@ -36,8 +36,6 @@ import java.security.GeneralSecurityException;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.replaymod.extras.ReplayModExtras.LOGGER;
-
 public class YoutubeUploader {
     private static final String CLIENT_ID = "743126594724-mfe7pj1k7e47uu5pk4503c8st9vj9ibu.apps.googleusercontent.com";
     private static final String CLIENT_SECRET = "gMwcy3mRYCRamCIjJIYP7rqc";
@@ -139,7 +137,7 @@ public class YoutubeUploader {
 
             CommandLine commandLine = new CommandLine(settings.getExportCommand());
             commandLine.addArguments(args);
-            LOGGER.info("Re-encoding for ODS with {} {}", settings.getExportCommand(), args);
+            System.out.println("Re-encoding for ODS with " + settings.getExportCommand() + args);
             Process process = new ProcessBuilder(commandLine.toStrings()).directory(videoFile.getParentFile()).start();
 
             final AtomicBoolean active = new AtomicBoolean(true);
@@ -151,7 +149,7 @@ public class YoutubeUploader {
                         char c = (char) in.read();
                         if (c == '\r') {
                             String str = sb.toString();
-                            LOGGER.debug("[FFmpeg] {}", str);
+                            System.out.println(str);
                             if (str.startsWith("frame=")) {
                                 str = str.substring(6).trim();
                                 str = str.substring(0, str.indexOf(' '));

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

@@ -29,7 +29,6 @@ import static net.minecraft.client.Minecraft.getMinecraft;
 @Mod(modid = ReplayModOnline.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
 public class ReplayModOnline {
     public static final String MOD_ID = "replaymod-online";
@@ -41,7 +40,7 @@ public class ReplayModOnline {
 
     private ReplayModReplay replayModule;
 
-    public static Logger LOGGER;
+    private Logger logger;
 
     private ApiClient apiClient;
 
@@ -54,7 +53,7 @@ public class ReplayModOnline {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        LOGGER = event.getModLog();
+        logger = event.getModLog();
         core = ReplayMod.instance;
         replayModule = ReplayModReplay.instance;
 
@@ -70,7 +69,7 @@ public class ReplayModOnline {
     public void init(FMLInitializationEvent event) {
         if (!getDownloadsFolder().exists()){
             if (!getDownloadsFolder().mkdirs()) {
-                LOGGER.warn("Failed to create downloads folder: " + getDownloadsFolder());
+                logger.warn("Failed to create downloads folder: " + getDownloadsFolder());
             }
         }
 
@@ -83,10 +82,7 @@ public class ReplayModOnline {
         // Initial login prompt
         if (!core.getSettingsRegistry().get(Setting.SKIP_LOGIN_PROMPT)) {
             if (!isLoggedIn()) {
-                core.runLater(() -> {
+                new GuiLoginPrompt(apiClient, null, null, false).display();
-                    GuiScreen parent = GuiScreen.wrap(getMinecraft().currentScreen);
-                    new GuiLoginPrompt(apiClient, parent, parent, false).display();
-                });
             }
         }
     }
@@ -100,7 +96,7 @@ public class ReplayModOnline {
     }
 
     public Logger getLogger() {
-        return LOGGER;
+        return logger;
     }
 
     public ApiClient getApiClient() {

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.*;
-import java.io.File;
+import java.net.HttpURLConnection;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
 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();
+        return ImageIO.read(url);
-        connection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
-        try (InputStream in = connection.getInputStream()) {
-            return ImageIO.read(in);
-        }
     }
 
     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();
+        HttpURLConnection con = (HttpURLConnection) website.openConnection();
-        con.setSSLSocketFactory(SSL_SOCKET_FACTORY);
 
         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 = (HttpURLConnection) url.openConnection();
-            httpUrlConnection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
 
             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();
+            HttpURLConnection con = (HttpURLConnection) new URL(url).openConnection();
-            con.setSSLSocketFactory(SSL_SOCKET_FACTORY);
             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

@@ -5,7 +5,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_11("Minecraft 1.11", "1.11");
+    MC_1_11("Minecraft 1.11", "1.11"),
+    MC_1_11_2("Minecraft 1.11.2", "1.11.2");
 
     private String niceName, apiName;
 

src/main/java/com/replaymod/online/gui/GuiLoginPrompt.java

@@ -21,7 +21,7 @@ public class GuiLoginPrompt extends AbstractGuiScreen<GuiLoginPrompt> {
     private GuiLabel noAccountLabel = new GuiLabel(this).setI18nText("replaymod.gui.login.noacc");
     private GuiLabel statusLabel = new GuiLabel(this);
     private GuiButton loginButton = new GuiButton(this).setI18nLabel("replaymod.gui.login").setSize(150, 20).setEnabled(false);
-    public GuiButton cancelButton = new GuiButton(this).setI18nLabel("replaymod.gui.cancel").setSize(150, 20);
+    private GuiButton cancelButton = new GuiButton(this).setI18nLabel("replaymod.gui.cancel").setSize(150, 20);
     private GuiButton registerButton = new GuiButton(this).setI18nLabel("replaymod.gui.register").setSize(150, 20);
     private GuiTextField username = new GuiTextField(this).setSize(145, 20).setMaxLength(16).setFocused(true);
     private GuiPasswordField password = new GuiPasswordField(this).setSize(145, 20)

src/main/java/com/replaymod/online/gui/GuiReplayCenter.java

@@ -28,7 +28,6 @@ import de.johni0702.minecraft.gui.container.GuiScreen;
 import de.johni0702.minecraft.gui.element.GuiButton;
 import de.johni0702.minecraft.gui.element.GuiImage;
 import de.johni0702.minecraft.gui.element.GuiLabel;
-import de.johni0702.minecraft.gui.element.GuiTooltip;
 import de.johni0702.minecraft.gui.element.IGuiButton;
 import de.johni0702.minecraft.gui.element.advanced.GuiResourceLoadingList;
 import de.johni0702.minecraft.gui.layout.CustomLayout;
@@ -37,6 +36,8 @@ import de.johni0702.minecraft.gui.layout.VerticalLayout;
 import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
 import de.johni0702.minecraft.gui.utils.Colors;
 import de.johni0702.minecraft.gui.utils.Consumer;
+import net.minecraftforge.fml.common.FMLLog;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.logging.log4j.core.helpers.Strings;
 import org.lwjgl.util.Dimension;
 import org.lwjgl.util.ReadableDimension;
@@ -49,8 +50,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.replaymod.online.ReplayModOnline.LOGGER;
-
 public class GuiReplayCenter extends GuiScreen {
     private final ReplayModOnline mod;
     private final ApiClient apiClient;
@@ -110,7 +109,6 @@ public class GuiReplayCenter extends GuiScreen {
         public void run() {
             GuiReplayEntry selected = list.getSelected();
             replayButtonPanel.forEach(IGuiButton.class).setEnabled(selected != null);
-            replayButtonPanel.forEach(IGuiButton.class).setTooltip(null);
             if (selected != null) {
                 int replayId = selected.fileInfo.getId();
                 boolean favorited = favoritedReplays.contains(replayId);
@@ -125,22 +123,10 @@ public class GuiReplayCenter extends GuiScreen {
                 favoriteButton.setI18nLabel("replaymod.gui.center." + (favorited ? "unfavorite" : "favorite"));
                 // Only allow button usage for either unfavorite or favorite after they've actually downloaded it
                 favoriteButton.setEnabled(favorited || selected.downloaded);
-                if (favoriteButton.isEnabled()) {
-                    favoriteButton.setTooltip(null);
-                } else {
-                    favoriteButton.setTooltip(new GuiTooltip().setI18nText("replaymod.gui.center.downloadrequired"));
-                }
 
                 // Similar for like/dislike buttons
                 likeButton.setEnabled(selected.downloaded);
                 dislikeButton.setEnabled(selected.downloaded);
-                if (likeButton.isEnabled()) {
-                    likeButton.setTooltip(null);
-                    dislikeButton.setTooltip(null);
-                } else {
-                    likeButton.setTooltip(new GuiTooltip().setI18nText("replaymod.gui.center.downloadrequired"));
-                    dislikeButton.setTooltip(new GuiTooltip().setI18nText("replaymod.gui.center.downloadrequired"));
-                }
                 likeButton.setI18nLabel("replaymod.gui." + (liked ? "removelike" : "like"));
                 dislikeButton.setI18nLabel("replaymod.gui." + (disliked ? "removedislike" : "dislike"));
             }
@@ -336,7 +322,7 @@ public class GuiReplayCenter extends GuiScreen {
                             }
                         });
                     } catch (Exception e) {
-                        LOGGER.error("Could not load Replay File {}", fileInfo.getId(), e);
+                        FMLLog.getLogger().error("Could not load Replay File " + fileInfo.getId(), e);
                     }
                 }
             }
@@ -417,7 +403,7 @@ public class GuiReplayCenter extends GuiScreen {
             this.downloaded = downloaded;
             ReplayMetaData metaData = fileInfo.getMetadata();
 
-            name.setText(ChatFormatting.UNDERLINE + Utils.fileNameToReplayName(fileInfo.getName()));
+            name.setText(ChatFormatting.UNDERLINE + FilenameUtils.getBaseName(fileInfo.getName()));
             author.setI18nText("replaymod.gui.center.author",
                     "" + ChatFormatting.GRAY + ChatFormatting.ITALIC, fileInfo.getOwner());
             if (Strings.isEmpty(metaData.getServerName())) {

src/main/java/com/replaymod/online/gui/GuiSaveModifiedReplay.java

@@ -2,7 +2,6 @@ package com.replaymod.online.gui;
 
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
-import com.replaymod.core.utils.Utils;
 import de.johni0702.minecraft.gui.container.GuiPanel;
 import de.johni0702.minecraft.gui.container.GuiScreen;
 import de.johni0702.minecraft.gui.element.GuiButton;
@@ -28,7 +27,7 @@ public class GuiSaveModifiedReplay extends GuiScreen {
         @Override
         public void run() {
             String resultName = name.getText().trim().replace("[^a-zA-Z0-9\\.\\- ]", "_");
-            final File resultFile = new File(file.getParentFile(), Utils.replayNameToFileName(resultName));
+            final File resultFile = new File(file.getParentFile(), resultName + ".mcpr");
             if (resultFile.exists()) {
                 Futures.addCallback(GuiYesNoPopup.open(GuiSaveModifiedReplay.this,
                         new GuiLabel().setI18nText("replaymod.gui.replaymodified.warning1", resultName).setColor(Colors.BLACK),

src/main/java/com/replaymod/online/gui/GuiUploadReplay.java

@@ -17,12 +17,7 @@ import com.replaymod.replaystudio.studio.ReplayStudio;
 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.*;
-import de.johni0702.minecraft.gui.element.GuiCheckbox;
-import de.johni0702.minecraft.gui.element.GuiImage;
-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.GuiDropdownMenu;
 import de.johni0702.minecraft.gui.element.advanced.GuiProgressBar;
 import de.johni0702.minecraft.gui.element.advanced.GuiTextArea;
@@ -38,6 +33,7 @@ import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.util.ReportedException;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
@@ -134,7 +130,7 @@ public class GuiUploadReplay extends GuiScreen {
         }
 
         // Apply to gui
-        name.setText(Utils.fileNameToReplayName(file.getName()));
+        name.setText(FilenameUtils.getBaseName(file.getName()));
         int secs = metaData.getDuration() / 1000;
         durationLabel.setI18nText("replaymod.gui.upload.duration", secs / 60, secs % 60);
         hideServerIP.setEnabled(!metaData.isSingleplayer());
@@ -238,8 +234,6 @@ public class GuiUploadReplay extends GuiScreen {
         });
 
         validateInputs();
-        name.onTextChanged(s -> validateInputs());
-        tags.onTextChanged(s -> validateInputs());
     }
 
     public void validateInputs() {

src/main/java/com/replaymod/pathing/gui/GuiKeyframeRepository.java

@@ -4,7 +4,6 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.SettableFuture;
 import com.replaymod.core.ReplayMod;
-import com.replaymod.core.utils.Utils;
 import com.replaymod.replay.ReplayModReplay;
 import com.replaymod.replaystudio.pathing.PathingRegistry;
 import com.replaymod.replaystudio.pathing.path.Path;
@@ -12,11 +11,7 @@ import com.replaymod.replaystudio.pathing.path.Timeline;
 import com.replaymod.replaystudio.replay.ReplayFile;
 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.*;
-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.container.GuiVerticalList;
 import de.johni0702.minecraft.gui.element.GuiButton;
 import de.johni0702.minecraft.gui.element.GuiLabel;
 import de.johni0702.minecraft.gui.element.GuiTextField;
@@ -46,16 +41,9 @@ public class GuiKeyframeRepository extends GuiScreen implements Closeable {
     public final GuiButton overwriteButton = new GuiButton(buttonPanel).onClick(new Runnable() {
         @Override
         public void run() {
-            GuiYesNoPopup popup = GuiYesNoPopup.open(GuiKeyframeRepository.this,
+            timelines.put(selectedEntry.name, currentTimeline);
-                    new GuiLabel().setI18nText("replaymod.gui.keyframerepo.overwrite").setColor(Colors.BLACK)
+            overwriteButton.setDisabled();
-            ).setYesI18nLabel("gui.yes").setNoI18nLabel("gui.no");
+            save();
-            Utils.addCallback(popup.getFuture(), doIt -> {
-                if (doIt) {
-                    timelines.put(selectedEntry.name, currentTimeline);
-                    overwriteButton.setDisabled();
-                    save();
-                }
-            }, Throwable::printStackTrace);
         }
     }).setSize(75, 20).setI18nLabel("replaymod.gui.overwrite").setDisabled();
     public final GuiButton saveAsButton = new GuiButton(buttonPanel).onClick(new Runnable() {

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

@@ -4,8 +4,6 @@ import com.replaymod.core.ReplayMod;
 import com.replaymod.core.utils.Restrictions;
 import com.replaymod.recording.handler.ConnectionEventHandler;
 import com.replaymod.recording.packet.PacketListener;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandler;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraft.network.NetworkManager;
 import net.minecraftforge.fml.common.Mod;
@@ -19,7 +17,6 @@ import org.lwjgl.input.Keyboard;
 @Mod(modid = ReplayModRecording.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
 public class ReplayModRecording {
     public static final String MOD_ID = "replaymod-recording";
@@ -57,12 +54,9 @@ public class ReplayModRecording {
         EventBus bus = MinecraftForge.EVENT_BUS;
         bus.register(connectionEventHandler = new ConnectionEventHandler(logger, core));
 
-        NetworkRegistry.INSTANCE.newChannel(Restrictions.PLUGIN_CHANNEL, new RestrictionsChannelHandler());
+        NetworkRegistry.INSTANCE.newSimpleChannel(Restrictions.PLUGIN_CHANNEL);
     }
 
-    @ChannelHandler.Sharable
-    private static class RestrictionsChannelHandler extends ChannelDuplexHandler {}
-
     public void initiateRecording(NetworkManager networkManager) {
         connectionEventHandler.onConnectedToServerEvent(networkManager);
     }

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

@@ -2,7 +2,6 @@ package com.replaymod.recording.handler;
 
 import com.replaymod.core.ReplayMod;
 import com.replaymod.core.utils.ModCompat;
-import com.replaymod.core.utils.Utils;
 import com.replaymod.recording.Setting;
 import com.replaymod.recording.gui.GuiRecordingOverlay;
 import com.replaymod.recording.packet.PacketListener;
@@ -78,7 +77,7 @@ public class ConnectionEventHandler {
             File folder = core.getReplayFolder();
 
             String name = sdf.format(Calendar.getInstance().getTime());
-            File currentFile = new File(folder, Utils.replayNameToFileName(name));
+            File currentFile = new File(folder, name + ".mcpr");
             ReplayFile replayFile = new ZipReplayFile(new ReplayStudio(), currentFile);
 
             replayFile.writeModInfo(ModCompat.getInstalledNetworkMods());

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

@@ -57,7 +57,7 @@ public class RecordingEventHandler {
 
     public void onPlayerJoin() {
         try {
-            packetListener.save(new SPacketSpawnPlayer(mc.thePlayer));
+            packetListener.save(new SPacketSpawnPlayer(mc.player));
         } catch(Exception e1) {
             e1.printStackTrace();
         }
@@ -65,7 +65,7 @@ public class RecordingEventHandler {
 
     public void onPlayerRespawn() {
         try {
-            packetListener.save(new SPacketSpawnPlayer(mc.thePlayer));
+            packetListener.save(new SPacketSpawnPlayer(mc.player));
         } catch(Exception e) {
             e.printStackTrace();
         }
@@ -93,7 +93,7 @@ public class RecordingEventHandler {
     @SubscribeEvent
     public void onPlayerTick(PlayerTickEvent e) {
         try {
-            if(e.player != mc.thePlayer) return;
+            if(e.player != mc.player) return;
 
             boolean force = false;
             if(lastX == null || lastY == null || lastZ == null) {
@@ -168,62 +168,62 @@ public class RecordingEventHandler {
 			 */
 
             //Inventory Handling
-            if (playerItems[0] != mc.thePlayer.getHeldItem(EnumHand.MAIN_HAND)) {
+            if (playerItems[0] != mc.player.getHeldItem(EnumHand.MAIN_HAND)) {
-                playerItems[0] = mc.thePlayer.getHeldItem(EnumHand.MAIN_HAND);
+                playerItems[0] = mc.player.getHeldItem(EnumHand.MAIN_HAND);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.MAINHAND, playerItems[0]));
             }
 
-            if (playerItems[1] != mc.thePlayer.getHeldItem(EnumHand.OFF_HAND)) {
+            if (playerItems[1] != mc.player.getHeldItem(EnumHand.OFF_HAND)) {
-                playerItems[1] = mc.thePlayer.getHeldItem(EnumHand.OFF_HAND);
+                playerItems[1] = mc.player.getHeldItem(EnumHand.OFF_HAND);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.OFFHAND, playerItems[1]));
             }
 
-            if (playerItems[2] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET)) {
+            if (playerItems[2] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.FEET)) {
-                playerItems[2] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET);
+                playerItems[2] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.FEET);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.FEET, playerItems[2]));
             }
 
-            if (playerItems[3] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS)) {
+            if (playerItems[3] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.LEGS)) {
-                playerItems[3] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS);
+                playerItems[3] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.LEGS);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.LEGS, playerItems[3]));
             }
 
-            if (playerItems[4] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) {
+            if (playerItems[4] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) {
-                playerItems[4] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
+                playerItems[4] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.CHEST, playerItems[4]));
             }
 
-            if (playerItems[5] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD)) {
+            if (playerItems[5] != mc.player.getItemStackFromSlot(EntityEquipmentSlot.HEAD)) {
-                playerItems[5] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
+                playerItems[5] = mc.player.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
                 packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.HEAD, playerItems[5]));
             }
 
             //Leaving Ride
 
-            if((!mc.thePlayer.isRiding() && lastRiding != -1) ||
+            if((!mc.player.isRiding() && lastRiding != -1) ||
-                    (mc.thePlayer.isRiding() && lastRiding != mc.thePlayer.getRidingEntity().getEntityId())) {
+                    (mc.player.isRiding() && lastRiding != mc.player.getRidingEntity().getEntityId())) {
-                if(!mc.thePlayer.isRiding()) {
+                if(!mc.player.isRiding()) {
                     lastRiding = -1;
                 } else {
-                    lastRiding = mc.thePlayer.getRidingEntity().getEntityId();
+                    lastRiding = mc.player.getRidingEntity().getEntityId();
                 }
                 packetListener.save(new SPacketEntityAttach(e.player, e.player.getRidingEntity()));
             }
 
             //Sleeping
-            if(!mc.thePlayer.isPlayerSleeping() && wasSleeping) {
+            if(!mc.player.isPlayerSleeping() && wasSleeping) {
                 packetListener.save(new SPacketAnimation(e.player, 2));
                 wasSleeping = false;
             }
 
             // Active hand (e.g. eating, drinking, blocking)
-            if (mc.thePlayer.isHandActive() ^ wasHandActive || mc.thePlayer.getActiveHand() != lastActiveHand) {
+            if (mc.player.isHandActive() ^ wasHandActive || mc.player.getActiveHand() != lastActiveHand) {
-                wasHandActive = mc.thePlayer.isHandActive();
+                wasHandActive = mc.player.isHandActive();
-                lastActiveHand = mc.thePlayer.getActiveHand();
+                lastActiveHand = mc.player.getActiveHand();
                 EntityDataManager dataManager = new EntityDataManager(null);
                 int state = (wasHandActive ? 1 : 0) | (lastActiveHand == EnumHand.OFF_HAND ? 2 : 0);
                 dataManager.register(EntityLiving.HAND_STATES, (byte) state);
-                packetListener.save(new SPacketEntityMetadata(mc.thePlayer.getEntityId(), dataManager, true));
+                packetListener.save(new SPacketEntityMetadata(mc.player.getEntityId(), dataManager, true));
             }
 
         } catch(Exception e1) {
@@ -244,7 +244,7 @@ public class RecordingEventHandler {
     @SubscribeEvent
     public void onSleep(PlayerSleepInBedEvent event) {
         try {
-            if (event.getEntityPlayer() != mc.thePlayer) {
+            if (event.getEntityPlayer() != mc.player) {
                 return;
             }
 
@@ -260,7 +260,7 @@ public class RecordingEventHandler {
     @SubscribeEvent
     public void enterMinecart(MinecartInteractEvent event) {
         try {
-            if(event.getEntity() != mc.thePlayer) {
+            if(event.getEntity() != mc.player) {
                 return;
             }
 
@@ -273,7 +273,7 @@ public class RecordingEventHandler {
     }
 
     public void onBlockBreakAnim(int breakerId, BlockPos pos, int progress) {
-        EntityPlayer thePlayer = mc.thePlayer;
+        EntityPlayer thePlayer = mc.player;
         if (thePlayer != null && breakerId == thePlayer.getEntityId()) {
             packetListener.save(new SPacketBlockBreakAnim(breakerId, pos, progress));
         }

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

@@ -37,14 +37,14 @@ public abstract class MixinNetHandlerPlayClient {
      */
     @Inject(method = "handlePlayerListItem", at=@At("HEAD"))
     public void recordOwnJoin(SPacketPlayerListItem packet, CallbackInfo ci) {
-        if (gameController.thePlayer == null) return;
+        if (gameController.player == null) return;
 
         RecordingEventHandler handler = getRecordingEventHandler();
         if (handler != null && packet.getAction() == SPacketPlayerListItem.Action.ADD_PLAYER) {
             for (SPacketPlayerListItem.AddPlayerData data : packet.getEntries()) {
                 if (data.getProfile() == null || data.getProfile().getId() == null) continue;
                 // Only add spawn packet for our own player and only if he isn't known yet
-                if (data.getProfile().getId().equals(Minecraft.getMinecraft().thePlayer.getGameProfile().getId())
+                if (data.getProfile().getId().equals(Minecraft.getMinecraft().player.getGameProfile().getId())
                         && !playerInfoMap.containsKey(data.getProfile().getId())) {
                     handler.onPlayerJoin();
                 }

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

@@ -23,6 +23,6 @@ public abstract class MixinPlayerControllerMP implements RecordingEventHandler.R
     @Redirect(method = "onPlayerDestroyBlock", at = @At(value = "INVOKE",
             target = "Lnet/minecraft/world/World;playEvent(ILnet/minecraft/util/math/BlockPos;I)V"))
     public void replayModRecording_playEvent_fixed(World world, int type, BlockPos pos, int data) {
-        world.playEvent(mc.thePlayer, type, pos, data);
+        world.playEvent(mc.player, type, pos, data);
     }
 }

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

@@ -38,7 +38,7 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa
     @Inject(method = "playSound", at = @At("HEAD"))
     public void replayModRecording_recordClientSound(EntityPlayer player, double x, double y, double z, SoundEvent sound, SoundCategory category,
                           float volume, float pitch, CallbackInfo ci) {
-        if (player == mc.thePlayer) {
+        if (player == mc.player) {
             RecordingEventHandler handler = replayModRecording_getRecordingEventHandler();
             if (handler != null) {
                 handler.onClientSound(sound, category, x, y, z, volume, pitch);
@@ -50,7 +50,7 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa
     // These are handled in the World class, so we override the method in WorldClient and add our special handling.
     @Override
     public void playEvent(EntityPlayer player, int type, BlockPos pos, int data) {
-        if (player == mc.thePlayer) {
+        if (player == mc.player) {
             // We caused this event, the server won't send it to us
             RecordingEventHandler handler = replayModRecording_getRecordingEventHandler();
             if (handler != null) {

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

@@ -15,12 +15,7 @@ import net.minecraft.network.EnumPacketDirection;
 import net.minecraft.network.Packet;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.datasync.EntityDataManager;
-import net.minecraft.network.play.server.SPacketCollectItem;
+import net.minecraft.network.play.server.*;
-import net.minecraft.network.play.server.SPacketCustomPayload;
-import net.minecraft.network.play.server.SPacketDisconnect;
-import net.minecraft.network.play.server.SPacketResourcePackSend;
-import net.minecraft.network.play.server.SPacketSpawnMob;
-import net.minecraft.network.play.server.SPacketSpawnPlayer;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
 import org.apache.logging.log4j.LogManager;
@@ -160,8 +155,8 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
                 Packet packet = (Packet) msg;
 
                 if(packet instanceof SPacketCollectItem) {
-                    if(mc.thePlayer != null ||
+                    if(mc.player != null ||
-                            ((SPacketCollectItem) packet).getEntityID() == mc.thePlayer.getEntityId()) {
+                            ((SPacketCollectItem) packet).getEntityID() == mc.player.getEntityId()) {
                         super.channelRead(ctx, msg);
                         return;
                     }
@@ -233,7 +228,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
         }
         ByteBuf byteBuf = Unpooled.buffer();
         PacketBuffer packetBuffer = new PacketBuffer(byteBuf);
-        packetBuffer.writeVarIntToBuffer(packetId);
+        packetBuffer.writeVarInt(packetId);
         packet.writePacketData(packetBuffer);
 
         byteBuf.readerIndex(0);

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;

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

@@ -21,7 +21,6 @@ import java.util.List;
 @Mod(modid = ReplayModRender.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
 public class ReplayModRender {
     public static final String MOD_ID = "replaymod-render";

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

@@ -2,7 +2,6 @@ package com.replaymod.render;
 
 import com.replaymod.render.frame.RGBFrame;
 import com.replaymod.render.rendering.FrameConsumer;
-import com.replaymod.render.rendering.VideoRenderer;
 import com.replaymod.render.utils.ByteBufferPool;
 import com.replaymod.render.utils.StreamPipe;
 import net.minecraft.client.Minecraft;
@@ -33,7 +32,6 @@ import static org.apache.commons.lang3.Validate.isTrue;
 
 public class VideoWriter implements FrameConsumer<RGBFrame> {
 
-    private final VideoRenderer renderer;
     private final RenderSettings settings;
     private final Process process;
     private final OutputStream outputStream;
@@ -43,9 +41,8 @@ public class VideoWriter implements FrameConsumer<RGBFrame> {
 
     private ByteArrayOutputStream ffmpegLog = new ByteArrayOutputStream(4096);
 
-    public VideoWriter(final VideoRenderer renderer) throws IOException {
+    public VideoWriter(final RenderSettings settings) throws IOException {
-        this.renderer = renderer;
+        this.settings = settings;
-        this.settings = renderer.getRenderSettings();
 
         File outputFolder = settings.getOutputFile().getParentFile();
         FileUtils.forceMkdir(outputFolder);
@@ -60,13 +57,9 @@ public class VideoWriter implements FrameConsumer<RGBFrame> {
                     .replace("%FILTERS%", settings.getVideoFilters());
 
         String executable = settings.getExportCommand().isEmpty() ? findFFmpeg() : settings.getExportCommand();
-        LOGGER.info("Starting {} with args: {}", executable, commandArgs);
+        System.out.println("Starting " + executable + " with args: " + commandArgs);
         String[] cmdline = new CommandLine(executable).addArguments(commandArgs).toStrings();
-        try {
+        process = new ProcessBuilder(cmdline).directory(outputFolder).start();
-            process = new ProcessBuilder(cmdline).directory(outputFolder).start();
-        } catch (IOException e) {
-            throw new NoFFmpegException(e);
-        }
         File exportLogFile = new File(Minecraft.getMinecraft().mcDataDir, "export.log");
         OutputStream exportLogOut = new TeeOutputStream(new FileOutputStream(exportLogFile), ffmpegLog);
         new StreamPipe(process.getInputStream(), exportLogOut).start();
@@ -159,16 +152,6 @@ public class VideoWriter implements FrameConsumer<RGBFrame> {
             if (aborted) {
                 return;
             }
-            try {
-                // Check whether this is a failure right at the beginning of the rendering process
-                // or at some later point (ffmpeg won't print the output file until the first frame
-                // has been written to stdin, so we can't already check for invalid args in <init>).
-                getVideoFile();
-            } catch (FFmpegStartupException e) {
-                // Possibly invalid ffmpeg arguments
-                renderer.setFailure(e);
-                return;
-            }
             CrashReport report = CrashReport.makeCrashReport(t, "Exporting frame");
             CrashReportCategory exportDetails = report.makeCategory("Export details");
             exportDetails.addCrashSection("Export command", settings.getExportCommand());
@@ -190,7 +173,7 @@ public class VideoWriter implements FrameConsumer<RGBFrame> {
         aborted = true;
     }
 
-    public File getVideoFile() throws FFmpegStartupException {
+    public File getVideoFile() {
         String log = ffmpegLog.toString();
         for (String line : log.split("\n")) {
             if (line.startsWith("Output #0")) {
@@ -198,30 +181,6 @@ public class VideoWriter implements FrameConsumer<RGBFrame> {
                 return new File(settings.getOutputFile().getParentFile(), fileName);
             }
         }
-        throw new FFmpegStartupException(settings, log);
+        throw new IllegalStateException("No output file found.");
-    }
-
-    public static class NoFFmpegException extends IOException {
-        public NoFFmpegException(Throwable cause) {
-            super(cause);
-        }
-    }
-
-    public static class FFmpegStartupException extends IOException {
-        private final RenderSettings settings;
-        private final String log;
-
-        public FFmpegStartupException(RenderSettings settings, String log) {
-            this.settings = settings;
-            this.log = log;
-        }
-
-        public RenderSettings getSettings() {
-            return settings;
-        }
-
-        public String getLog() {
-            return log;
-        }
     }
 }

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

@@ -1,109 +0,0 @@
-package com.replaymod.render.gui;
-
-import com.replaymod.render.RenderSettings;
-import com.replaymod.render.VideoWriter;
-import de.johni0702.minecraft.gui.container.GuiPanel;
-import de.johni0702.minecraft.gui.container.GuiScreen;
-import de.johni0702.minecraft.gui.container.GuiVerticalList;
-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.CustomLayout;
-import de.johni0702.minecraft.gui.layout.HorizontalLayout;
-import de.johni0702.minecraft.gui.layout.VerticalLayout;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.crash.CrashReportCategory;
-import net.minecraft.util.ReportedException;
-
-import java.util.Arrays;
-import java.util.function.Consumer;
-
-import static com.replaymod.render.ReplayModRender.LOGGER;
-
-public class GuiExportFailed extends GuiScreen {
-    public static GuiExportFailed tryToRecover(VideoWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
-        // Always log the error first
-        LOGGER.error("Rendering video:", e);
-
-        RenderSettings settings = e.getSettings();
-        // Check whether the user has configured some custom ffmpeg arguments
-        if (settings.getEncodingPreset().getValue().equals(settings.getExportArguments())) {
-            // If they haven't, then this is probably a faulty ffmpeg installation and there's nothing we can do
-            CrashReport crashReport = CrashReport.makeCrashReport(e, "Exporting video");
-            CrashReportCategory details = crashReport.makeCategory("Export details");
-            details.addCrashSection("Settings", settings);
-            details.addCrashSection("FFmpeg log", e.getLog());
-            throw new ReportedException(crashReport);
-        } else {
-            // If they have, ask them whether it was intentional
-            GuiExportFailed gui = new GuiExportFailed(e, doRestart);
-            gui.display();
-            return gui;
-        }
-    }
-
-    private final GuiLabel logLabel = new GuiLabel(this)
-            .setI18nText("replaymod.gui.rendering.error.ffmpeglog");
-    private final GuiVerticalList logList = new GuiVerticalList(this).setDrawShadow(true);
-    private final GuiButton resetButton = new GuiButton().setI18nLabel("gui.yes").setSize(100, 20);
-    private final GuiButton abortButton = new GuiButton().setI18nLabel("gui.no").setSize(100, 20);
-    private final GuiPanel info = new GuiPanel(this)
-            .setLayout(new VerticalLayout().setSpacing(4))
-            .addElements(new VerticalLayout.Data(0.5),
-                    new GuiLabel().setI18nText("replaymod.gui.rendering.error.ffmpegargs.1"),
-                    new GuiLabel().setI18nText("replaymod.gui.rendering.error.ffmpegargs.2"),
-                    new GuiLabel(),
-                    new GuiPanel().setLayout(new HorizontalLayout(HorizontalLayout.Alignment.CENTER).setSpacing(5))
-                            .addElements(null, resetButton, abortButton)
-            );
-
-    {
-        setLayout(new CustomLayout<GuiScreen>() {
-            @Override
-            protected void layout(GuiScreen container, int width, int height) {
-                pos(info, width/2 - width(info)/2, (height/2 - height(info) - 30) / 2 + 30);
-                pos(logLabel, width/2 - width(logLabel)/2, height/2 + 4);
-                pos(logList, 10, y(logLabel) + height(logLabel) + 4);
-                size(logList, width - 10 - x(logList), height - 10 - y(logList));
-            }
-        });
-
-        setTitle(new GuiLabel().setI18nText("replaymod.gui.rendering.error.title"));
-        setBackground(Background.DIRT);
-    }
-
-    public GuiExportFailed(VideoWriter.FFmpegStartupException e, Consumer<RenderSettings> doRestart) {
-        logList.getListPanel().addElements(null,
-                Arrays.stream(e.getLog().replace("\t", "    ").split("\n"))
-                        .map(l -> new GuiLabel().setText(l))
-                        .toArray(GuiElement[]::new));
-
-        resetButton.onClick(() -> {
-            RenderSettings oldSettings = e.getSettings();
-            doRestart.accept(new RenderSettings(
-                    oldSettings.getRenderMethod(),
-                    oldSettings.getEncodingPreset(),
-                    oldSettings.getVideoWidth(),
-                    oldSettings.getVideoHeight(),
-                    oldSettings.getFramesPerSecond(),
-                    oldSettings.getBitRate(),
-                    oldSettings.getOutputFile(),
-                    oldSettings.isRenderNameTags(),
-                    oldSettings.isStabilizeYaw(),
-                    oldSettings.isStabilizePitch(),
-                    oldSettings.isStabilizeRoll(),
-                    oldSettings.getChromaKeyingColor(),
-                    oldSettings.isInject360Metadata(),
-                    oldSettings.getAntiAliasing(),
-                    oldSettings.getExportCommand(),
-                    oldSettings.getEncodingPreset().getValue(),
-                    oldSettings.isHighPerformance()
-            ));
-        });
-
-        abortButton.onClick(() -> {
-            // Assume they know what they're doing
-            getMinecraft().displayGuiScreen(null);
-        });
-    }
-}

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

@@ -1,11 +1,8 @@
 package com.replaymod.render.gui;
 
-import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
-import com.replaymod.core.utils.Utils;
 import com.replaymod.render.ReplayModRender;
-import com.replaymod.render.VideoWriter;
 import com.replaymod.render.rendering.VideoRenderer;
 import com.replaymod.render.utils.RenderJob;
 import com.replaymod.replay.ReplayHandler;
@@ -14,7 +11,6 @@ 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.AbstractGuiScreen;
 import de.johni0702.minecraft.gui.container.GuiContainer;
 import de.johni0702.minecraft.gui.container.GuiPanel;
 import de.johni0702.minecraft.gui.container.GuiVerticalList;
@@ -29,10 +25,12 @@ 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;
@@ -64,8 +62,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
                             renameButton, removeButton),
                     closeButton);
 
-    private final AbstractGuiScreen container;
+    private final GuiContainer container;
-    private final ReplayHandler replayHandler;
     private Entry selectedEntry;
 
     {
@@ -87,10 +84,9 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
         }).addElements(null, title, list, buttonPanel);
     }
 
-    public GuiRenderQueue(AbstractGuiScreen container, GuiRenderSettings guiRenderSettings, ReplayHandler replayHandler, Timeline timeline) {
+    public GuiRenderQueue(GuiContainer container, GuiRenderSettings guiRenderSettings, ReplayHandler replayHandler, Timeline timeline) {
         super(container);
         this.container = container;
-        this.replayHandler = replayHandler;
         LOGGER.trace("Opening render queue popup");
 
         setBackgroundColor(Colors.DARK_TRANSPARENT);
@@ -192,46 +188,30 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
 
         renderButton.onClick(() -> {
             LOGGER.trace("Render button clicked");
-            processQueue(queue);
+            // 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();
     }
 
-    private void processQueue(Iterable<RenderJob> queue) {
-        // Close all GUIs (so settings in GuiRenderSettings are saved)
-        getMinecraft().displayGuiScreen(null);
-        // Start rendering
-        int jobsDone = 0;
-        for (RenderJob renderJob : queue) {
-            LOGGER.info("Starting render job {}", renderJob);
-            try {
-                VideoRenderer videoRenderer = new VideoRenderer(renderJob.getSettings(), replayHandler, renderJob.getTimeline());
-                videoRenderer.renderVideo();
-            } catch (VideoWriter.NoFFmpegException 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 (VideoWriter.FFmpegStartupException e) {
-                int jobsToSkip = jobsDone;
-                GuiExportFailed.tryToRecover(e, newSettings -> {
-                    // Update current job with fixed ffmpeg arguments
-                    renderJob.setSettings(newSettings);
-                    // Restart queue, skipping the already completed jobs
-                    processQueue(Iterables.skip(queue, jobsToSkip));
-                });
-                return;
-            } catch (Throwable t) {
-                Utils.error(LOGGER, this, CrashReport.makeCrashReport(t, "Rendering video"), () -> {});
-                container.display(); // Re-show the queue popup and the new error popup
-                return;
-            }
-            jobsDone++;
-        }
-    }
-
     @Override
     public void open() {
         super.open();

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

@@ -7,7 +7,6 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.InstanceCreator;
 import com.replaymod.render.RenderSettings;
 import com.replaymod.render.ReplayModRender;
-import com.replaymod.render.VideoWriter;
 import com.replaymod.render.rendering.VideoRenderer;
 import com.replaymod.replay.ReplayHandler;
 import com.replaymod.replaystudio.pathing.path.Timeline;
@@ -30,6 +29,7 @@ import de.johni0702.minecraft.gui.utils.Utils;
 import net.minecraft.client.gui.GuiErrorScreen;
 import net.minecraft.client.resources.I18n;
 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;
@@ -39,13 +39,11 @@ import org.lwjgl.util.ReadableDimension;
 
 import javax.annotation.Nullable;
 import java.io.File;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 
-import static com.replaymod.core.utils.Utils.error;
-import static com.replaymod.render.ReplayModRender.LOGGER;
-
 public class GuiRenderSettings extends GuiScreen implements Closeable {
     public final GuiPanel contentPanel = new GuiPanel(this).setBackgroundColor(Colors.DARK_TRANSPARENT);
     public final GuiVerticalList settingsList = new GuiVerticalList(contentPanel).setDrawSlider(true);
@@ -82,8 +80,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 videoWidth = new GuiNumberField().setSize(50, 20).setMinValue(1);
-    public final GuiNumberField videoHeight = new GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true);
+    public final GuiNumberField videoHeight = new GuiNumberField().setSize(50, 20).setMinValue(1);
     public final GuiSlider frameRateSlider = new GuiSlider().onValueChanged(new Runnable() {
         @Override
         public void run() {
@@ -95,7 +93,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");
 
@@ -201,21 +199,15 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
             try {
                 VideoRenderer videoRenderer = new VideoRenderer(save(false), replayHandler, timeline);
                 videoRenderer.renderVideo();
-            } catch (VideoWriter.NoFFmpegException e) {
+            } catch (IOException e) {
-                LOGGER.error("Rendering video:", e);
+                e.printStackTrace();
+
                 GuiErrorScreen errorScreen = new GuiErrorScreen(I18n.format("replaymod.gui.rendering.error.title"),
                         I18n.format("replaymod.gui.rendering.error.message"));
                 getMinecraft().displayGuiScreen(errorScreen);
-            } catch (VideoWriter.FFmpegStartupException e) {
-                GuiExportFailed.tryToRecover(e, newSettings -> {
-                    // Update settings with fixed ffmpeg arguments
-                    exportArguments.setText(newSettings.getExportArguments());
-                    // Restart rendering, this will also save the changed ffmpeg arguments
-                    renderButton.onClick();
-                });
             } catch (Throwable t) {
-                error(LOGGER, GuiRenderSettings.this, CrashReport.makeCrashReport(t, "Rendering video"), () -> {});
+                CrashReport crashReport = CrashReport.makeCrashReport(t, "Rendering video");
-                display(); // Re-show the render settings gui and the new error popup
+                throw new ReportedException(crashReport);
             }
         }
     }).setSize(100, 20).setI18nLabel("replaymod.gui.render");

src/main/java/com/replaymod/render/metadata/MetadataInjector.java

@@ -4,6 +4,7 @@ import com.coremedia.iso.IsoFile;
 import com.coremedia.iso.boxes.*;
 import com.google.common.primitives.Bytes;
 import com.googlecode.mp4parser.BasicContainer;
+import net.minecraftforge.fml.common.FMLLog;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
@@ -12,8 +13,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import static com.replaymod.render.ReplayModRender.LOGGER;
-
 public class MetadataInjector {
 
     private static final String STITCHING_SOFTWARE = "Minecraft ReplayMod";
@@ -97,7 +96,7 @@ public class MetadataInjector {
             videoFileOutputStream = new FileOutputStream(videoFile);
             tempIsoFile.getBox(videoFileOutputStream.getChannel());
         } catch(Exception e) {
-            LOGGER.error("360 Degree Metadata couldn't be injected", e);
+            FMLLog.getLogger().error("360 Degree Metadata couldn't be injected", e);
         } finally {
             IOUtils.closeQuietly(tempIsoFile);
             IOUtils.closeQuietly(videoFileOutputStream);

src/main/java/com/replaymod/render/mixin/MixinFrustum.java

@@ -1,23 +0,0 @@
-package com.replaymod.render.mixin;
-
-import com.replaymod.render.hooks.EntityRendererHandler;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.culling.Frustum;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(Frustum.class)
-public abstract class MixinFrustum {
-    @Inject(method = "isBoxInFrustum", at = @At("HEAD"), cancellable = true)
-    public void isBoxInFrustum(double minX, double minY, double minZ, double maxX, double maxY, double maxZ, CallbackInfoReturnable<Boolean> ci) {
-        EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
-        if (handler != null && handler.omnidirectional && handler.data == null) {
-            // Normally the camera is always facing the direction of the omnidirectional image face that is currently
-            // getting rendered. With ODS however, the camera is always facing forwards and the turning happens in the
-            // vertex shader (non-trivial due to stereo). As such, all chunks need to be rendered all the time for ODS.
-            ci.setReturnValue(true);
-        }
-    }
-}

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

@@ -39,7 +39,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 
 import static com.google.common.collect.Iterables.getLast;
-import static com.replaymod.render.ReplayModRender.LOGGER;
 import static net.minecraft.client.renderer.GlStateManager.*;
 import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT;
 import static org.lwjgl.opengl.GL11.GL_DEPTH_BUFFER_BIT;
@@ -67,7 +66,6 @@ public class VideoRenderer implements RenderInfo {
     private final GuiVideoRenderer gui;
     private boolean paused;
     private boolean cancelled;
-    private volatile Throwable failureCause;
 
     private Framebuffer guiFramebuffer;
     private int displayWidth, displayHeight;
@@ -78,7 +76,7 @@ public class VideoRenderer implements RenderInfo {
         this.timeline = timeline;
         this.gui = new GuiVideoRenderer(this);
         this.renderingPipeline = Pipelines.newPipeline(settings.getRenderMethod(), this,
-                videoWriter = new VideoWriter(this) {
+                videoWriter = new VideoWriter(settings) {
             @Override
             public void consume(RGBFrame frame) {
                 gui.updatePreview(frame);
@@ -91,7 +89,7 @@ public class VideoRenderer implements RenderInfo {
      * Render this video.
      * @return {@code true} if rendering was successful, {@code false} if the user aborted rendering (or the window was closed)
      */
-    public boolean renderVideo() throws Throwable {
+    public boolean renderVideo() {
         MinecraftForge.EVENT_BUS.post(new ReplayRenderEvent.Pre(this));
 
         setup();
@@ -140,10 +138,6 @@ public class VideoRenderer implements RenderInfo {
 
         MinecraftForge.EVENT_BUS.post(new ReplayRenderEvent.Post(this));
 
-        if (failureCause != null) {
-            throw failureCause;
-        }
-
         return !cancelled;
     }
 
@@ -253,13 +247,7 @@ public class VideoRenderer implements RenderInfo {
 
         new SoundHandler().playRenderSuccessSound();
 
-        try {
+        new GuiRenderingDone(ReplayModRender.instance, videoWriter.getVideoFile(), totalFrames, settings).display();
-            if (!hasFailed()) {
-                new GuiRenderingDone(ReplayModRender.instance, videoWriter.getVideoFile(), totalFrames, settings).display();
-            }
-        } catch (VideoWriter.FFmpegStartupException e) {
-            setFailure(e);
-        }
 
         // Finally, resize the Minecraft framebuffer to the actual width/height of the window
         mc.resize(displayWidth, displayHeight);
@@ -335,7 +323,7 @@ public class VideoRenderer implements RenderInfo {
                     return;
                 }
             }
-        } while (paused && !hasFailed());
+        } while (paused);
     }
 
     private boolean displaySizeChanged() {
@@ -376,20 +364,6 @@ public class VideoRenderer implements RenderInfo {
         renderingPipeline.cancel();
     }
 
-    public boolean hasFailed() {
-        return failureCause != null;
-    }
-
-    public synchronized void setFailure(Throwable cause) {
-        if (this.failureCause != null) {
-            LOGGER.error("Further failure during failed rendering: ", cause);
-        } else {
-            LOGGER.error("Failure during rendering: ", cause);
-            this.failureCause = cause;
-            cancel();
-        }
-    }
-
     private class TimelinePlayer extends AbstractTimelinePlayer {
         public TimelinePlayer(ReplayHandler replayHandler) {
             super(replayHandler);

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

@@ -12,7 +12,7 @@ import java.io.InputStream;
 
 public class SoundHandler {
 
-    private final ResourceLocation successSoundLocation = new ResourceLocation("replaymod", "render_success.wav");
+    private final ResourceLocation successSoundLocation = new ResourceLocation("replaymod", "renderSuccess.wav");
 
     public void playRenderSuccessSound() {
         playSound(successSoundLocation);

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

@@ -110,12 +110,12 @@ public class ReplayHandler {
 
         channel.close().awaitUninterruptibly();
 
-        if (mc.thePlayer instanceof CameraEntity) {
+        if (mc.player instanceof CameraEntity) {
-            mc.thePlayer.setDead();
+            mc.player.setDead();
         }
 
-        if (mc.theWorld != null) {
+        if (mc.world != null) {
-            mc.theWorld.sendQuittingDisconnectingPacket();
+            mc.world.sendQuittingDisconnectingPacket();
             mc.loadWorld(null);
         }
 
@@ -124,8 +124,6 @@ public class ReplayHandler {
 
         ReplayModReplay.instance.replayHandler = null;
 
-        mc.displayGuiScreen(null);
-
         MinecraftForge.EVENT_BUS.post(new ReplayCloseEvent.Post(this));
     }
 
@@ -211,9 +209,6 @@ public class ReplayHandler {
      */
     public void spectateEntity(Entity e) {
         CameraEntity cameraEntity = getCameraEntity();
-        if (cameraEntity == null) {
-            return; // Cannot spectate if we have no camera
-        }
         if (e == null || e == cameraEntity) {
             spectating = null;
             e = cameraEntity;
@@ -246,7 +241,7 @@ public class ReplayHandler {
      * @return {@code true} if the camera is the view entity, {@code false} otherwise
      */
     public boolean isCameraView() {
-        return mc.thePlayer instanceof CameraEntity && mc.thePlayer == mc.getRenderViewEntity();
+        return mc.player instanceof CameraEntity && mc.player == mc.getRenderViewEntity();
     }
 
     /**
@@ -254,7 +249,7 @@ public class ReplayHandler {
      * @return The camera entity or {@code null} if it does not yet exist
      */
     public CameraEntity getCameraEntity() {
-        return mc.thePlayer instanceof CameraEntity ? (CameraEntity) mc.thePlayer : null;
+        return mc.player instanceof CameraEntity ? (CameraEntity) mc.player : null;
     }
 
     public UUID getSpectatedUUID() {
@@ -334,7 +329,7 @@ public class ReplayHandler {
                 replaySender.setReplaySpeed(0);
 
                 mc.getConnection().getNetworkManager().processReceivedPackets();
-                for (Entity entity : mc.theWorld.loadedEntityList) {
+                for (Entity entity : mc.world.loadedEntityList) {
                     if (entity instanceof EntityOtherPlayerMP) {
                         EntityOtherPlayerMP e = (EntityOtherPlayerMP) entity;
                         e.setPosition(e.otherPlayerMPX, e.otherPlayerMPY, e.otherPlayerMPZ);

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

@@ -6,11 +6,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.core.utils.ModCompat;
-import com.replaymod.replay.camera.CameraController;
+import com.replaymod.replay.camera.*;
-import com.replaymod.replay.camera.CameraControllerRegistry;
-import com.replaymod.replay.camera.CameraEntity;
-import com.replaymod.replay.camera.ClassicCameraController;
-import com.replaymod.replay.camera.VanillaCameraController;
 import com.replaymod.replay.gui.overlay.GuiMarkerTimeline;
 import com.replaymod.replay.gui.screen.GuiModCompatWarning;
 import com.replaymod.replay.handler.GuiHandler;
@@ -35,7 +31,6 @@ import java.util.Optional;
 @Mod(modid = ReplayModReplay.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
 public class ReplayModReplay {
     public static final String MOD_ID = "replaymod-replay";
@@ -47,7 +42,7 @@ public class ReplayModReplay {
 
     private final CameraControllerRegistry cameraControllerRegistry = new CameraControllerRegistry();
 
-    public static Logger LOGGER;
+    private Logger logger;
 
     protected ReplayHandler replayHandler;
 
@@ -57,7 +52,7 @@ public class ReplayModReplay {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        LOGGER = event.getModLog();
+        logger = event.getModLog();
         core = ReplayMod.instance;
 
         core.getSettingsRegistry().register(Setting.class);
@@ -104,7 +99,6 @@ public class ReplayModReplay {
                         @Override
                         public void onSuccess(NoGuiScreenshot result) {
                             try {
-                                core.printInfoToChat("replaymod.chat.savingthumb");
                                 replayHandler.getReplayFile().writeThumb(result.getImage());
                                 core.printInfoToChat("replaymod.chat.savedthumb");
                             } catch (IOException e) {
@@ -115,7 +109,6 @@ public class ReplayModReplay {
                         @Override
                         public void onFailure(Throwable t) {
                             t.printStackTrace();
-                            core.printWarningToChat("replaymod.chat.failedthumb");
                         }
                     });
                 }
@@ -181,9 +174,6 @@ public class ReplayModReplay {
     }
 
     public void startReplay(ReplayFile replayFile, boolean checkModCompat) throws IOException {
-        if (replayHandler != null) {
-            replayHandler.endReplay();
-        }
         if (checkModCompat) {
             ModCompat.ModInfoDifference modDifference = new ModCompat.ModInfoDifference(replayFile.getModInfo());
             if (!modDifference.getMissing().isEmpty() || !modDifference.getDiffering().isEmpty()) {
@@ -199,7 +189,7 @@ public class ReplayModReplay {
     }
 
     public Logger getLogger() {
-        return LOGGER;
+        return logger;
     }
 
     public CameraControllerRegistry getCameraControllerRegistry() {

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

@@ -2,16 +2,15 @@ package com.replaymod.replay;
 
 import com.google.common.base.Preconditions;
 import com.google.common.io.Files;
-import com.replaymod.core.ReplayMod;
+import com.google.common.util.concurrent.ListenableFutureTask;
 import com.replaymod.core.utils.Restrictions;
 import com.replaymod.replay.camera.CameraEntity;
 import com.replaymod.replaystudio.replay.ReplayFile;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
+import io.netty.channel.ChannelInboundHandlerAdapter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityOtherPlayerMP;
 import net.minecraft.client.gui.GuiDownloadTerrain;
@@ -36,6 +35,7 @@ import java.io.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 /**
  * Sends replay packets to netty channels.
@@ -43,7 +43,7 @@ import java.util.Map;
  * the replay restart from the beginning.
  */
 @Sharable
-public class ReplaySender extends ChannelDuplexHandler {
+public class ReplaySender extends ChannelInboundHandlerAdapter {
     /**
      * These packets are ignored completely during replay.
      */
@@ -242,7 +242,6 @@ public class ReplaySender extends ChannelDuplexHandler {
         try {
             channelInactive(ctx);
             ctx.channel().pipeline().close();
-            FileUtils.deleteDirectory(tempResourcePackFolder);
         } catch(Exception e) {
             e.printStackTrace();
         }
@@ -258,8 +257,8 @@ public class ReplaySender extends ChannelDuplexHandler {
         // Entity#addedToChunk is not set and it is therefore not updated every tick.
         // To counteract this, we need to manually update it's position if it hasn't been added
         // to any chunk yet.
-        if (mc.theWorld != null) {
+        if (mc.world != null) {
-            for (EntityPlayer playerEntity : mc.theWorld.playerEntities) {
+            for (EntityPlayer playerEntity : mc.world.playerEntities) {
                 if (!playerEntity.addedToChunk && playerEntity instanceof EntityOtherPlayerMP) {
                     playerEntity.onLivingUpdate();
                 }
@@ -293,7 +292,7 @@ public class ReplaySender extends ChannelDuplexHandler {
                     // If we do not give minecraft time to tick, there will be dead entity artifacts left in the world
                     // Therefore we have to remove all loaded, dead entities manually if we are in sync mode.
                     // We do this after every SpawnX packet and after the destroy entities packet.
-                    if (!asyncMode && mc.theWorld != null) {
+                    if (!asyncMode && mc.world != null) {
                         if (p instanceof SPacketSpawnPlayer
                                 || p instanceof SPacketSpawnObject
                                 || p instanceof SPacketSpawnMob
@@ -301,7 +300,7 @@ public class ReplaySender extends ChannelDuplexHandler {
                                 || p instanceof SPacketSpawnPainting
                                 || p instanceof SPacketSpawnExperienceOrb
                                 || p instanceof SPacketDestroyEntities) {
-                            World world = mc.theWorld;
+                            World world = mc.world;
                             for (int i = 0; i < world.loadedEntityList.size(); ++i) {
                                 Entity entity = world.loadedEntityList.get(i);
                                 if (entity.isDead) {
@@ -332,7 +331,7 @@ public class ReplaySender extends ChannelDuplexHandler {
         ByteBuf bb = Unpooled.wrappedBuffer(bytes);
         PacketBuffer pb = new PacketBuffer(bb);
 
-        int i = pb.readVarIntFromBuffer();
+        int i = pb.readVarInt();
 
         Packet p = EnumConnectionState.PLAY.getPacket(EnumPacketDirection.CLIENTBOUND, i);
         p.readPacketData(pb);
@@ -384,13 +383,6 @@ public class ReplaySender extends ChannelDuplexHandler {
 
         if(BAD_PACKETS.contains(p.getClass())) return null;
 
-        if (p instanceof SPacketCustomPayload) {
-            SPacketCustomPayload packet = (SPacketCustomPayload) p;
-            if ("MC|BOpen".equals(packet.getChannelName())) {
-                return null;
-            }
-        }
-
         if(p instanceof SPacketResourcePackSend) {
             SPacketResourcePackSend packet = (SPacketResourcePackSend) p;
             String url = packet.getURL();
@@ -464,19 +456,22 @@ public class ReplaySender extends ChannelDuplexHandler {
                 }
             }
 
-            new Runnable() {
+            new Callable<Void>() {
                 @Override
                 @SuppressWarnings("unchecked")
-                public void run() {
+                public Void call() {
-                    if (mc.theWorld == null || !mc.isCallingFromMinecraftThread()) {
+                    if (mc.world == null || !mc.isCallingFromMinecraftThread()) {
-                        ReplayMod.instance.runLater(this);
+                        synchronized(mc.scheduledTasks) {
-                        return;
+                            mc.scheduledTasks.add(ListenableFutureTask.create(this));
+                        }
+                        return null;
                     }
 
                     CameraEntity cent = replayHandler.getCameraEntity();
                     cent.setCameraPosition(ppl.getX(), ppl.getY(), ppl.getZ());
+                    return null;
                 }
-            }.run();
+            }.call();
         }
 
         if(p instanceof SPacketChangeGameState) {
@@ -513,22 +508,9 @@ public class ReplaySender extends ChannelDuplexHandler {
     }
 
     @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        // The embedded channel's event loop will consider every thread to be in it and as such provides no
+        FileUtils.deleteDirectory(tempResourcePackFolder);
-        // guarantees that only one thread is using the pipeline at any one time.
+        super.channelInactive(ctx);
-        // For reading the replay sender (either sync or async) is the only thread ever writing.
-        // For writing it may very well happen that multiple threads want to use the pipline at the same time.
-        // It's unclear whether the EmbeddedChannel is supposed to be thread-safe (the behavior of the event loop
-        // does suggest that). However it seems like it either isn't (likely) or there is a race condition.
-        // See: https://www.replaymod.com/forum/thread/1752#post8045 (https://paste.replaymod.com/lotacatuwo)
-        // To work around this issue, we just outright drop all write/flush requests (they aren't needed anyway).
-        // This still leaves channel handlers upstream with the threading issue but they all seem to cope well with it.
-        promise.setSuccess();
-    }
-
-    @Override
-    public void flush(ChannelHandlerContext ctx) throws Exception {
-        // See write method above
     }
 
     /**
@@ -756,9 +738,6 @@ public class ReplaySender extends ChannelDuplexHandler {
             }
 
             synchronized (this) {
-                if (timestamp == lastTimeStamp) { // Do nothing if we're already there
-                    return;
-                }
                 if (timestamp < lastTimeStamp) { // Restart the replay if we need to go backwards in time
                     hasWorldLoaded = false;
                     lastTimeStamp = 0;

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

@@ -5,7 +5,6 @@ import com.replaymod.core.events.SettingsChangedEvent;
 import com.replaymod.core.utils.Utils;
 import com.replaymod.replay.ReplayModReplay;
 import com.replaymod.replay.Setting;
-import com.replaymod.replay.events.ReplayChatMessageEvent;
 import com.replaymod.replaystudio.util.Location;
 import lombok.Getter;
 import lombok.Setter;
@@ -25,7 +24,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.text.ITextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.EntityViewRenderEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
@@ -41,7 +39,7 @@ import java.util.function.Function;
 
 /**
  * The camera entity used as the main player entity during replay viewing.
- * During a replay {@link Minecraft#thePlayer} should be an instance of this class.
+ * During a replay {@link Minecraft#player} should be an instance of this class.
  * Camera movement is controlled by a separate {@link CameraController}.
  */
 public class CameraEntity extends EntityPlayerSP {
@@ -158,9 +156,9 @@ public class CameraEntity extends EntityPlayerSP {
             // entity is recreated and we have to spectate a new entity
             UUID spectating = ReplayModReplay.instance.getReplayHandler().getSpectatedUUID();
             if (spectating != null && (view.getUniqueID() != spectating
-                    || view.worldObj != worldObj)
+                    || view.world != world)
-                    || worldObj.getEntityByID(view.getEntityId()) != view) {
+                    || world.getEntityByID(view.getEntityId()) != view) {
-                view = worldObj.getPlayerEntityByUUID(spectating);
+                view = world.getPlayerEntityByUUID(spectating);
                 if (view != null) {
                     mc.setRenderViewEntity(view);
                 } else {
@@ -179,17 +177,17 @@ public class CameraEntity extends EntityPlayerSP {
     @Override
     public void preparePlayerToSpawn() {
         // Make sure our world is up-to-date in case of world changes
-        if (mc.theWorld != null) {
+        if (mc.world != null) {
-            worldObj = mc.theWorld;
+            world = mc.world;
         }
         super.preparePlayerToSpawn();
     }
 
     @Override
-    public void setAngles(float yaw, float pitch) {
+    public void setRotation(float yaw, float pitch) {
         if (mc.getRenderViewEntity() == this) {
             // Only update camera rotation when the camera is the view
-            super.setAngles(yaw, pitch);
+            super.setRotation(yaw, pitch);
         }
     }
 
@@ -254,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();
@@ -386,12 +375,6 @@ public class CameraEntity extends EntityPlayerSP {
                 && (e instanceof EntityPlayer || e instanceof EntityLiving || e instanceof EntityItemFrame);
     }
 
-    @Override
-    public void addChatMessage(ITextComponent message) {
-        if (MinecraftForge.EVENT_BUS.post(new ReplayChatMessageEvent(this))) return;
-        super.addChatMessage(message);
-    }
-
     private class EventHandler {
         @SubscribeEvent
         public void onPreClientTick(TickEvent.ClientTickEvent event) {
@@ -456,8 +439,8 @@ public class CameraEntity extends EntityPlayerSP {
                     mc.entityRenderer.itemRenderer.itemStackOffHand = player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND);
 
 
-                    mc.thePlayer.renderArmYaw = mc.thePlayer.prevRenderArmYaw = player.rotationYaw;
+                    mc.player.renderArmYaw = mc.player.prevRenderArmYaw = player.rotationYaw;
-                    mc.thePlayer.renderArmPitch = mc.thePlayer.prevRenderArmPitch = player.rotationPitch;
+                    mc.player.renderArmPitch = mc.player.prevRenderArmPitch = player.rotationPitch;
                 }
             }
         }
@@ -468,45 +451,5 @@ public class CameraEntity extends EntityPlayerSP {
                 event.setRoll(roll);
             }
         }
-
-        private boolean heldItemTooltipsWasTrue;
-
-        @SubscribeEvent
-        public void preRenderGameOverlay(RenderGameOverlayEvent.Pre event) {
-            switch (event.getType()) {
-                case ALL:
-                    heldItemTooltipsWasTrue = mc.gameSettings.heldItemTooltips;
-                    mc.gameSettings.heldItemTooltips = false;
-                    break;
-                case ARMOR:
-                case HEALTH:
-                case FOOD:
-                case AIR:
-                case HOTBAR:
-                case EXPERIENCE:
-                case HEALTHMOUNT:
-                case JUMPBAR:
-                case POTION_ICONS:
-                    event.setCanceled(true);
-                    break;
-                case HELMET:
-                case PORTAL:
-                case CROSSHAIRS:
-                case BOSSHEALTH:
-                case BOSSINFO:
-                case SUBTITLES:
-                case TEXT:
-                case CHAT:
-                case PLAYER_LIST:
-                case DEBUG:
-                    break;
-            }
-        }
-
-        @SubscribeEvent
-        public void postRenderGameOverlay(RenderGameOverlayEvent.Post event) {
-            if (event.getType() != RenderGameOverlayEvent.ElementType.ALL) return;
-            mc.gameSettings.heldItemTooltips = heldItemTooltipsWasTrue;
-        }
     }
 }

src/main/java/com/replaymod/replay/events/ReplayChatMessageEvent.java

@@ -1,14 +0,0 @@
-package com.replaymod.replay.events;
-
-import com.replaymod.replay.camera.CameraEntity;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import net.minecraftforge.fml.common.eventhandler.Cancelable;
-import net.minecraftforge.fml.common.eventhandler.Event;
-
-@Cancelable
-@RequiredArgsConstructor
-public class ReplayChatMessageEvent extends Event {
-    @Getter
-    private final CameraEntity cameraEntity;
-}

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 xField = new GuiNumberField().setSize(150, 20).setPrecision(10);
-    public final GuiNumberField yField = newGuiNumberField().setPrecision(10);
+    public final GuiNumberField yField = new GuiNumberField().setSize(150, 20).setPrecision(10);
-    public final GuiNumberField zField = newGuiNumberField().setPrecision(10);
+    public final GuiNumberField zField = new GuiNumberField().setSize(150, 20).setPrecision(10);
 
-    public final GuiNumberField yawField = newGuiNumberField().setPrecision(5);
+    public final GuiNumberField yawField = new GuiNumberField().setSize(150, 20).setPrecision(5);
-    public final GuiNumberField pitchField = newGuiNumberField().setPrecision(5);
+    public final GuiNumberField pitchField = new GuiNumberField().setSize(150, 20).setPrecision(5);
-    public final GuiNumberField rollField = newGuiNumberField().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/gui/overlay/GuiMarkerTimeline.java

@@ -58,7 +58,7 @@ public class GuiMarkerTimeline extends AbstractGuiTimeline<GuiMarkerTimeline> im
 
     protected void drawMarker(GuiRenderer renderer, ReadableDimension size, Marker marker) {
         int visibleLength = (int) (getLength() * getZoom());
-        int markerPos = MathHelper.clamp_int(marker.getTime(), getOffset(), getOffset() + visibleLength);
+        int markerPos = MathHelper.clamp(marker.getTime(), getOffset(), getOffset() + visibleLength);
         double positionInVisible = markerPos - getOffset();
         double fractionOfVisible = positionInVisible / visibleLength;
         int markerX = (int) (BORDER_LEFT + fractionOfVisible * (size.getWidth() - BORDER_LEFT - BORDER_RIGHT));
@@ -99,7 +99,7 @@ public class GuiMarkerTimeline extends AbstractGuiTimeline<GuiMarkerTimeline> im
         int visibleLength = (int) (getLength() * getZoom());
         int contentWidth = lastSize.getWidth() - BORDER_LEFT - BORDER_RIGHT;
         for (Marker marker : replayHandler.getMarkers()) {
-            int markerPos = MathHelper.clamp_int(marker.getTime(), getOffset(), getOffset() + visibleLength);
+            int markerPos = MathHelper.clamp(marker.getTime(), getOffset(), getOffset() + visibleLength);
             double positionInVisible = markerPos - getOffset();
             double fractionOfVisible = positionInVisible / visibleLength;
             int markerX = (int) (BORDER_LEFT + fractionOfVisible * contentWidth);

src/main/java/com/replaymod/replay/gui/screen/GuiReplayViewer.java

@@ -28,7 +28,9 @@ import de.johni0702.minecraft.gui.utils.Consumer;
 import net.minecraft.client.gui.GuiErrorScreen;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.Util;
+import net.minecraftforge.fml.common.FMLLog;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOCase;
 import org.apache.commons.io.filefilter.SuffixFileFilter;
 import org.apache.logging.log4j.LogManager;
@@ -45,8 +47,6 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static com.replaymod.replay.ReplayModReplay.LOGGER;
-
 public class GuiReplayViewer extends GuiScreen {
     private final ReplayModReplay mod;
 
@@ -91,7 +91,7 @@ public class GuiReplayViewer extends GuiScreen {
                             obj.consume(() -> new GuiReplayEntry(file, metaData, theThumb));
                         }
                     } catch (Exception e) {
-                        LOGGER.error("Could not load Replay File {}", file.getName(), e);
+                        FMLLog.getLogger().error("Could not load Replay File " + file.getName(), e);
                     }
                 }
             } catch (IOException e) {
@@ -155,7 +155,7 @@ public class GuiReplayViewer extends GuiScreen {
         @Override
         public void run() {
             final File file = list.getSelected().file;
-            String name = Utils.fileNameToReplayName(file.getName());
+            String name = FilenameUtils.getBaseName(file.getName());
             final GuiTextField nameField = new GuiTextField().setSize(200, 20).setFocused(true).setText(name);
             final GuiYesNoPopup popup = GuiYesNoPopup.open(GuiReplayViewer.this,
                     new GuiLabel().setI18nText("replaymod.gui.viewer.rename.name").setColor(Colors.BLACK),
@@ -171,16 +171,16 @@ public class GuiReplayViewer extends GuiScreen {
                 }
             }).onTextChanged(obj -> {
                 popup.getYesButton().setEnabled(!nameField.getText().isEmpty()
-                        && !new File(file.getParentFile(), Utils.replayNameToFileName(nameField.getText())).exists());
+                        && !new File(file.getParentFile(), nameField.getText() + ".mcpr").exists());
             });
             Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
                 @Override
                 public void onSuccess(Boolean delete) {
                     if (delete) {
                         // Sanitize their input
-                        String name = nameField.getText().trim();
+                        String name = nameField.getText().trim().replace("[^a-zA-Z0-9\\.\\- ]", "_");
                         // This file is what they want
-                        File targetFile = new File(file.getParentFile(), Utils.replayNameToFileName(name));
+                        File targetFile = new File(file.getParentFile(), name + ".mcpr");
                         try {
                             // Finally, try to move it
                             FileUtils.moveFile(file, targetFile);
@@ -302,7 +302,7 @@ public class GuiReplayViewer extends GuiScreen {
         public GuiReplayEntry(File file, ReplayMetaData metaData, BufferedImage thumbImage) {
             this.file = file;
 
-            name.setText(ChatFormatting.UNDERLINE + Utils.fileNameToReplayName(file.getName()));
+            name.setText(ChatFormatting.UNDERLINE + FilenameUtils.getBaseName(file.getName()));
             if (Strings.isEmpty(metaData.getServerName())) {
                 server.setI18nText("replaymod.gui.iphidden").setColor(Colors.DARK_RED);
             } else {

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

@@ -13,10 +13,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 
 public class GuiHandler {
     private static final int BUTTON_EXIT_SERVER = 1;
+    private static final int BUTTON_RETURN_TO_GAME = 4;
     private static final int BUTTON_ACHIEVEMENTS = 5;
     private static final int BUTTON_STATS = 6;
     private static final int BUTTON_OPEN_TO_LAN = 7;
@@ -46,9 +46,7 @@ public class GuiHandler {
             // Pause replay when menu is opened
             mod.getReplayHandler().getReplaySender().setReplaySpeed(0);
 
-            GuiButton achievements = null, stats = null, openToLan = null;
+            for(GuiButton b : new ArrayList<>(event.getButtonList())) {
-            List<GuiButton> buttonList = event.getButtonList();
-            for(GuiButton b : new ArrayList<>(buttonList)) {
                 switch (b.id) {
                     // Replace "Exit Server" button with "Exit Replay" button
                     case BUTTON_EXIT_SERVER:
@@ -57,38 +55,14 @@ public class GuiHandler {
                         break;
                     // Remove "Achievements", "Stats" and "Open to LAN" buttons
                     case BUTTON_ACHIEVEMENTS:
-                        buttonList.remove(achievements = b);
-                        break;
                     case BUTTON_STATS:
-                        buttonList.remove(stats = b);
-                        break;
                     case BUTTON_OPEN_TO_LAN:
-                        buttonList.remove(openToLan = b);
+                        event.getButtonList().remove(b);
-                        break;
+                }
+                // Move all buttons except the "Return to game" button upwards
+                if (b.id != BUTTON_RETURN_TO_GAME) {
+                    b.yPosition -= 48;
                 }
-            }
-            if (achievements != null && stats != null) {
-                moveAllButtonsDirectlyBelowUpwards(buttonList, achievements.yPosition,
-                        achievements.xPosition, stats.xPosition + stats.width);
-            }
-            if (openToLan != null) {
-                moveAllButtonsDirectlyBelowUpwards(buttonList, openToLan.yPosition,
-                        openToLan.xPosition, openToLan.xPosition + openToLan.width);
-            }
-        }
-    }
-
-    /**
-     * Moves all buttons that are within a rectangle below a certain y coordinate upwards by 24 units.
-     * @param buttons List of buttons
-     * @param belowY The Y limit
-     * @param xStart Left x limit of the rectangle
-     * @param xEnd Right x limit of the rectangle
-     */
-    private void moveAllButtonsDirectlyBelowUpwards(List<GuiButton> buttons, int belowY, int xStart, int xEnd) {
-        for (GuiButton button : buttons) {
-            if (button.yPosition >= belowY && button.xPosition <= xEnd && button.xPosition + button.width >= xStart) {
-                button.yPosition -= 24;
             }
         }
     }

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

@@ -17,7 +17,7 @@ public abstract class MixinGuiSpectator {
     @Inject(method = "onHotbarSelected", at = @At("HEAD"), cancellable = true)
     public void isInReplay(int i, CallbackInfo ci) {
         // Prevent spectator gui from opening while in a replay
-        if (mc.thePlayer instanceof CameraEntity) {
+        if (mc.player instanceof CameraEntity) {
             ci.cancel();
         }
     }

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

@@ -33,8 +33,8 @@ public abstract class MixinPlayerControllerMP {
 
     @Inject(method = "isSpectator", at=@At("HEAD"), cancellable = true)
     private void replayModReplay_isSpectator(CallbackInfoReturnable<Boolean> ci) {
-        if (mc.thePlayer instanceof CameraEntity) { // this check should in theory not be required
+        if (mc.player instanceof CameraEntity) { // this check should in theory not be required
-            ci.setReturnValue(mc.thePlayer.isSpectator());
+            ci.setReturnValue(mc.player.isSpectator());
         }
     }
 }

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

@@ -0,0 +1,22 @@
+package com.replaymod.replay.mixin;
+
+import com.replaymod.replay.camera.CameraEntity;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.entity.RenderArmorStand;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.entity.player.EntityPlayer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(RenderArmorStand.class)
+public abstract class MixinRenderArmorStand {
+    @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true)
+    private void replayModReplay_canRenderInvisibleName(EntityArmorStand entity, CallbackInfoReturnable<Boolean> ci) {
+        EntityPlayer thePlayer = Minecraft.getMinecraft().player;
+        if (thePlayer instanceof CameraEntity && entity.isInvisible()) {
+            ci.setReturnValue(false);
+        }
+    }
+}

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

@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 public abstract class MixinRenderLivingBase {
     @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true)
     private void replayModReplay_canRenderInvisibleName(EntityLivingBase entity, CallbackInfoReturnable<Boolean> ci) {
-        EntityPlayer thePlayer = Minecraft.getMinecraft().thePlayer;
+        EntityPlayer thePlayer = Minecraft.getMinecraft().player;
         if (thePlayer instanceof CameraEntity && entity.isInvisible()) {
             ci.setReturnValue(false);
         }

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

@@ -43,8 +43,8 @@ public abstract class MixinViewFrustum {
             return;
         }
 
-        int i = MathHelper.floor_double(viewEntityX) - 8;
+        int i = MathHelper.floor(viewEntityX) - 8;
-        int j = MathHelper.floor_double(viewEntityZ) - 8;
+        int j = MathHelper.floor(viewEntityZ) - 8;
         int k = this.countChunksX * 16;
 
         for (int l = 0; l < this.countChunksX; ++l) {

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,32 +1,38 @@
 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;
-import org.lwjgl.input.Keyboard;
+
+import java.io.IOException;
 
 @Mod(modid = ReplayModSimplePathing.MOD_ID,
         version = "@MOD_VERSION@",
         acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
         useMetadata = true)
-public class ReplayModSimplePathing {
+public class ReplayModSimplePathing implements PathingRegistry {
     public static final String MOD_ID = "replaymod-simplepathing";
 
-    @Mod.Instance(MOD_ID)
-    public static ReplayModSimplePathing instance;
-
     private ReplayMod core;
 
     public static Logger LOGGER;
@@ -44,77 +50,88 @@ public class ReplayModSimplePathing {
 
         PathPreview pathPreview = new PathPreview(this);
         pathPreview.register();
-
-        core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.keyframerepository", Keyboard.KEY_X, () -> {
-            if (guiPathing != null) guiPathing.keyframeRepoButtonPressed();
-        });
-        core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.clearkeyframes", Keyboard.KEY_C, () -> {
-            if (guiPathing != null) guiPathing.clearKeyframesButtonPressed();
-        });
-        core.getKeyBindingRegistry().registerRepeatedKeyBinding("replaymod.input.synctimeline", Keyboard.KEY_V, () -> {
-            if (guiPathing != null) guiPathing.syncTimeButtonPressed();
-        });
-        core.getKeyBindingRegistry().registerRaw(Keyboard.KEY_DELETE, () -> {
-            if (guiPathing != null) guiPathing.deleteButtonPressed();
-        });
     }
 
     @SubscribeEvent
     public void postReplayOpen(ReplayOpenEvent.Post event) {
-        clearCurrentTimeline();
         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
+    public Keyframe getSelectedKeyframe() {
-    private SPPath selectedPath;
+        return selectedKeyframe;
-    @Getter
-    private long selectedTime;
-
-    public boolean isSelected(Keyframe keyframe) {
-        return selectedPath != null && currentTimeline.getKeyframe(selectedPath, selectedTime) == keyframe;
     }
 
-    public void setSelected(SPPath path, long time) {
+    public void setSelectedKeyframe(Keyframe selected) {
-        selectedPath = path;
+        this.selectedKeyframe = selected;
-        selectedTime = time;
     }
 
-    public void setCurrentTimeline(SPTimeline newTimeline) {
+    public void setCurrentTimeline(Timeline currentTimeline) {
-        selectedPath = null;
+        if (this.currentTimeline != currentTimeline) {
-        currentTimeline = newTimeline;
+            selectedKeyframe = null;
-        updateDefaultInterpolatorType();
+        }
+        this.currentTimeline = currentTimeline;
     }
 
-    public void clearCurrentTimeline() {
+    public Timeline getCurrentTimeline() {
-        setCurrentTimeline(new SPTimeline());
-    }
-
-    public SPTimeline getCurrentTimeline() {
         return currentTimeline;
     }
 
-    private void updateDefaultInterpolatorType() {
+    @Override
-        InterpolatorType newDefaultType =
+    public Timeline createTimeline() {
-                InterpolatorType.fromString(core.getSettingsRegistry().get(Setting.DEFAULT_INTERPOLATION));
+        Timeline timeline = new TimelineImpl();
-        currentTimeline.setDefaultInterpolatorType(newDefaultType);
+
+        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,680 +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;
-
-    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 that will be lost once we remove the old keyframe and has to be restored afterwards
-        Optional<Interpolator> lostInterpolator = path.getSegments().stream().filter(s -> {
-            // If this is the last keyframe,
-            if (Iterables.getLast(path.getKeyframes()) == keyframe) {
-                return s.getEndKeyframe() == keyframe; // the previous interpolator will be lost
-            } else { // otherwise
-                return s.getStartKeyframe() == keyframe; // the following interpolator will be lost
-            }
-        }).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 = lostInterpolator.<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 = path.getSegments().stream().filter(s -> s.getEndKeyframe() == newKf)
-                    .findFirst().flatMap(segment -> lostInterpolator.map(interpolator -> {
-                        // additionally, if the interpolation of this keyframe was set to explicit, that property
-                        // has to be transferred to the start keyframe of the new segment
-                        if (newKf.getValue(ExplicitInterpolationProperty.PROPERTY).isPresent()) {
-                            return CombinedChange.create(
-                                    SetInterpolator.create(segment, interpolator),
-                                    UpdateKeyframeProperties.create(path, segment.getStartKeyframe())
-                                            .setValue(ExplicitInterpolationProperty.PROPERTY, ObjectUtils.NULL).done()
-                            );
-                        } else {
-                            return 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;
+    public static final Setting<Boolean> LINEAR_INTERPOLATION = make("linear_interpolation", "linearinterpolation", false);
-
-    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())
-        );
-    }
 
     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.change.UpdateKeyframeProperties;
-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.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 org.apache.commons.lang3.tuple.Triple;
-import net.minecraft.client.resources.I18n;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 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;
 
@@ -90,13 +66,12 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
                 .addElements(new VerticalLayout.Data(0.5, false), 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.keyframe = keyframe;
-        this.time = time;
+        this.path = path;
-        this.path = gui.getMod().getCurrentTimeline().getPath(path);
-        this.keyframe = this.path.getKeyframe(time);
 
+        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,14 +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) {
+            if (newTime != keyframe.getTime()) {
-                change = CombinedChange.createFromApplied(change,
+                change = CombinedChange.createFromApplied(change, gui.moveKeyframe(path, keyframe, newTime));
-                        gui.getMod().getCurrentTimeline().moveKeyframe(path, time, newTime));
-                if (gui.getMod().getSelectedPath() == path && gui.getMod().getSelectedTime() == time) {
-                    gui.getMod().setSelected(path, newTime);
-                }
             }
-            gui.getMod().getCurrentTimeline().getTimeline().pushChange(change);
+            path.getTimeline().pushChange(change);
             close();
         });
     }
@@ -143,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);
@@ -176,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);
@@ -194,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
@@ -212,11 +187,8 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
         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();
-
         {
-            GuiPanel positionInputs = new GuiPanel()
+            inputs.setLayout(new GridLayout().setCellsEqualSize(false).setColumns(4).setSpacingX(3).setSpacingY(5))
-                    .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,
@@ -224,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());
@@ -250,181 +219,17 @@ public abstract class GuiEditKeyframe<T extends GuiEditKeyframe<T>> extends Abst
 
         @Override
         protected Change save() {
-            SPTimeline timeline = guiPathing.getMod().getCurrentTimeline();
+            Change change = UpdateKeyframeProperties.create(path, keyframe)
-            Change positionChange = timeline.updatePositionKeyframe(time,
+                    .setValue(CameraProperties.POSITION, Triple.of(xField.getDouble(), yField.getDouble(), zField.getDouble()))
-                    xField.getDouble(), yField.getDouble(), zField.getDouble(),
+                    .setValue(CameraProperties.ROTATION, Triple.of(yawField.getFloat(), pitchField.getFloat(), rollField.getFloat()))
-                    yawField.getFloat(), pitchField.getFloat(), rollField.getFloat()
+                    .done();
-            );
+            change.apply(path.getTimeline());
-            if (interpolationPanel.getSettingsPanel() == null) {
+            return change;
-                // The last keyframe doesn't have interpolator settings because there is no segment following it
-                return positionChange;
-            }
-            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));
-            }
         }
 
         @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);
-                        type = 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();
+        for (Keyframe keyframe : Iterables.concat(Iterables.transform(mod.getCurrentTimeline().getPaths(), new Function<Path, Iterable<Keyframe>>() {
-
+            @Nullable
-        timeline.getTimeline().getPaths().stream().flatMap(path -> path.getKeyframes().stream()).forEach(keyframe -> {
+            @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;
+                int tolerance = visibleTime * KEYFRAME_SIZE / (size.getWidth() - BORDER_LEFT - BORDER_RIGHT) / 2;
-                Optional<Keyframe> keyframe = gui.getMod().getCurrentTimeline().getPath(path).getKeyframes().stream()
+                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;
+                lastClickedKeyframe = keyframe;
-                lastClickedPath = path;
+                lastClickedPath = pathKeyframePair.getLeft();
-                gui.getMod().setSelected(lastClickedPath, lastClickedKeyframe);
+                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

@@ -1,12 +1,10 @@
 package com.replaymod.simplepathing.gui;
 
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import com.replaymod.core.ReplayMod;
-import com.replaymod.core.utils.Utils;
 import com.replaymod.pathing.gui.GuiKeyframeRepository;
 import com.replaymod.pathing.player.RealtimeTimelinePlayer;
 import com.replaymod.pathing.properties.CameraProperties;
@@ -16,26 +14,25 @@ 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.property.Property;
 import com.replaymod.replaystudio.pathing.serialize.TimelineSerialization;
 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.Setting;
-import com.replaymod.simplepathing.SPTimeline.SPPath;
 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.*;
-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.advanced.GuiProgressBar;
 import de.johni0702.minecraft.gui.element.advanced.GuiTimelineTime;
 import de.johni0702.minecraft.gui.layout.CustomLayout;
@@ -46,7 +43,9 @@ 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;
@@ -58,7 +57,10 @@ import org.lwjgl.util.WritablePoint;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import static com.replaymod.core.utils.Utils.error;
@@ -69,6 +71,9 @@ 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() {
@@ -94,11 +99,10 @@ public class GuiPathing {
             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 = mod.getCurrentTimeline();
-            Timeline timeline;
             try {
-                TimelineSerialization serialization = new TimelineSerialization(spTimeline, null);
+                TimelineSerialization serialization = new TimelineSerialization(mod, null);
-                String serialized = serialization.serialize(Collections.singletonMap("", spTimeline.getTimeline()));
+                String serialized = serialization.serialize(Collections.singletonMap("", timeline));
                 timeline = serialization.deserialize(serialized).get("");
             } catch (Throwable t) {
                 error(LOGGER, replayHandler.getOverlay(), CrashReport.makeCrashReport(t, "Cloning timeline"), () -> {});
@@ -257,7 +261,6 @@ public class GuiPathing {
         }
     };
 
-    private final ReplayMod core;
     private final ReplayModSimplePathing mod;
     private final ReplayHandler replayHandler;
     private final RealtimeTimelinePlayer player;
@@ -267,7 +270,6 @@ public class GuiPathing {
     private SettableFuture<Void> entityTrackerFuture;
 
     public GuiPathing(final ReplayMod core, final ReplayModSimplePathing mod, final ReplayHandler replayHandler) {
-        this.core = core;
         this.mod = mod;
         this.replayHandler = replayHandler;
         this.player = new RealtimeTimelinePlayer(replayHandler);
@@ -294,34 +296,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);
-                    core.printInfoToChat("replaymod.chat.pathstarted");
                     Futures.addCallback(future, new FutureCallback<Void>() {
                         @Override
                         public void onSuccess(@Nullable Void result) {
-                            if (future.isCancelled()) {
-                                core.printInfoToChat("replaymod.chat.pathinterrupted");
-                            } else {
-                                core.printInfoToChat("replaymod.chat.pathfinished");
-                            }
                             overlay.setCloseable(true);
-                            timePath.setActive(true);
                         }
 
                         @Override
                         public void onFailure(Throwable t) {
                             t.printStackTrace();
                             overlay.setCloseable(true);
-                            timePath.setActive(true);
                         }
                     });
                 }
@@ -331,28 +326,26 @@ public class GuiPathing {
         positionKeyframeButton.setTexturePosH(new ReadablePoint() {
             @Override
             public int getX() {
-                SPPath keyframePath = mod.getSelectedPath();
+                Keyframe keyframe = mod.getSelectedKeyframe();
-                long keyframeTime = mod.getSelectedTime();
+                if (keyframe == null || !keyframe.getValue(CameraProperties.POSITION).isPresent()) {
-                if (keyframePath != SPPath.POSITION) {
                     // No keyframe or wrong path
-                    keyframeTime = timeline.getCursorPosition();
+                    keyframe = mod.getCurrentTimeline().getPaths().get(POSITION_PATH).getKeyframe(timeline.getCursorPosition());
-                    keyframePath = mod.getCurrentTimeline().isPositionKeyframe(keyframeTime) ? SPPath.POSITION : null;
                 }
-                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();
+                Keyframe keyframe = mod.getSelectedKeyframe();
-                if (keyframePath != SPPath.POSITION) {
+                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
@@ -362,7 +355,7 @@ public class GuiPathing {
         }).onClick(new Runnable() {
             @Override
             public void run() {
-                updateKeyframe(SPPath.POSITION);
+                updateKeyframe(false);
             }
         });
 
@@ -374,12 +367,12 @@ public class GuiPathing {
 
             @Override
             public int getY() {
-                SPPath keyframePath = mod.getSelectedPath();
+                Keyframe keyframe = mod.getSelectedKeyframe();
-                if (keyframePath != SPPath.TIME) {
+                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
@@ -389,7 +382,7 @@ public class GuiPathing {
         }).onClick(new Runnable() {
             @Override
             public void run() {
-                updateKeyframe(SPPath.TIME);
+                updateKeyframe(true);
             }
         });
 
@@ -403,90 +396,94 @@ public class GuiPathing {
             }
         });
 
-        startLoadingEntityTracker();
+        core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.keyframerepository", Keyboard.KEY_X, new Runnable() {
-    }
+            @Override
+            public void run() {
+                if (!overlay.isVisible()) {
+                    return;
+                }
+                try {
+                    GuiKeyframeRepository gui = new GuiKeyframeRepository(
+                            mod, replayHandler.getReplayFile(), mod.getCurrentTimeline());
+                    Futures.addCallback(gui.getFuture(), new FutureCallback<Timeline>() {
+                        @Override
+                        public void onSuccess(Timeline result) {
+                            if (result != null) {
+                                mod.setCurrentTimeline(result);
+                            }
+                        }
 
-    public void keyframeRepoButtonPressed() {
+                        @Override
-        try {
+                        public void onFailure(Throwable t) {
-            GuiKeyframeRepository gui = new GuiKeyframeRepository(
+                            t.printStackTrace();
-                    mod.getCurrentTimeline(), replayHandler.getReplayFile(), mod.getCurrentTimeline().getTimeline());
+                            core.printWarningToChat("Error loading timeline: " + t.getMessage());
-            Futures.addCallback(gui.getFuture(), new FutureCallback<Timeline>() {
+                        }
+                    });
+                    gui.display();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    core.printWarningToChat("Error loading timeline: " + e.getMessage());
+                }
+            }
+        });
+
+        core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.clearkeyframes", Keyboard.KEY_C, () -> {
+            GuiYesNoPopup popup = GuiYesNoPopup.open(overlay,
+                    new GuiLabel().setI18nText("replaymod.gui.clearcallback.title").setColor(Colors.BLACK)
+            ).setYesI18nLabel("gui.yes").setNoI18nLabel("gui.no");
+            Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
                 @Override
-                public void onSuccess(Timeline result) {
+                public void onSuccess(Boolean delete) {
-                    if (result != null) {
+                    if (delete) {
-                        mod.setCurrentTimeline(new SPTimeline(result));
+                        Timeline timeline = mod.createTimeline();
+                        timeline.createPath();
+                        timeline.createPath();
+                        mod.setCurrentTimeline(timeline);
                     }
                 }
 
                 @Override
                 public void onFailure(Throwable t) {
                     t.printStackTrace();
-                    core.printWarningToChat("Error loading timeline: " + t.getMessage());
                 }
             });
-            gui.display();
+        });
-        } catch (IOException e) {
-            e.printStackTrace();
-            core.printWarningToChat("Error loading timeline: " + e.getMessage());
-        }
-    }
 
-    public void clearKeyframesButtonPressed() {
+        core.getKeyBindingRegistry().registerRepeatedKeyBinding("replaymod.input.synctimeline", Keyboard.KEY_V, () -> {
-        GuiYesNoPopup popup = GuiYesNoPopup.open(replayHandler.getOverlay(),
+            // Current replay time
-                new GuiLabel().setI18nText("replaymod.gui.clearcallback.title").setColor(Colors.BLACK)
+            int time = replayHandler.getReplaySender().currentTimeStamp();
-        ).setYesI18nLabel("gui.yes").setNoI18nLabel("gui.no");
+            // Position of the cursor
-        Futures.addCallback(popup.getFuture(), new FutureCallback<Boolean>() {
+            int cursor = timeline.getCursorPosition();
-            @Override
+            // Get the last time keyframe before the cursor
-            public void onSuccess(Boolean delete) {
+            mod.getCurrentTimeline().getPaths().get(TIME_PATH).getKeyframes().stream()
-                if (delete) {
+                    .filter(it -> it.getTime() <= cursor).reduce((__, last) -> last).ifPresent(keyframe -> {
-                    mod.clearCurrentTimeline();
+                // Cursor position at the keyframe
-                    if (entityTracker != null) {
+                int keyframeCursor = (int) keyframe.getTime();
-                        mod.getCurrentTimeline().setEntityTracker(entityTracker);
+                // Replay time at the keyframe
-                    }
+                // This is a keyframe from the time path, so it _should_ always have a time property
-                }
+                int keyframeTime = keyframe.getValue(TimestampProperty.PROPERTY).get();
+                // Replay time passed
+                int timePassed = time - keyframeTime;
+                // Speed (set to 1 when shift is held)
+                double speed = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? 1 : overlay.getSpeedSliderValue();
+                // Cursor time passed
+                int cursorPassed = (int) (timePassed / speed);
+                // Move cursor to new position
+                timeline.setCursorPosition(keyframeCursor + cursorPassed);
+                // Deselect keyframe to allow the user to add a new one right away
+                mod.setSelectedKeyframe(null);
+            });
+        });
+
+        core.getKeyBindingRegistry().registerRaw(Keyboard.KEY_DELETE, () -> {
+            if (!overlay.isVisible()) {
+                return;
             }
-
+            if (mod.getSelectedKeyframe() != null) {
-            @Override
+                updateKeyframe(mod.getSelectedKeyframe().getValue(TimestampProperty.PROPERTY).isPresent());
-            public void onFailure(Throwable t) {
-                t.printStackTrace();
             }
         });
-    }
 
-    public void syncTimeButtonPressed() {
-        // Current replay time
-        int time = replayHandler.getReplaySender().currentTimeStamp();
-        // Position of the cursor
-        int cursor = timeline.getCursorPosition();
-        // Get the last time keyframe before the cursor
-        mod.getCurrentTimeline().getTimePath().getKeyframes().stream()
-                .filter(it -> it.getTime() <= cursor).reduce((__, last) -> last).ifPresent(keyframe -> {
-            // Cursor position at the keyframe
-            int keyframeCursor = (int) keyframe.getTime();
-            // Replay time at the keyframe
-            // This is a keyframe from the time path, so it _should_ always have a time property
-            int keyframeTime = keyframe.getValue(TimestampProperty.PROPERTY).get();
-            // Replay time passed
-            int timePassed = time - keyframeTime;
-            // Speed (set to 1 when shift is held)
-            double speed = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) ? 1 : replayHandler.getOverlay().getSpeedSliderValue();
-            // Cursor time passed
-            int cursorPassed = (int) (timePassed / speed);
-            // 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);
-        });
-    }
-
-    public void deleteButtonPressed() {
-        if (mod.getSelectedPath() != null) {
-            updateKeyframe(mod.getSelectedPath());
-        }
-    }
-
-    private void startLoadingEntityTracker() {
-        Preconditions.checkState(entityTrackerFuture == null);
         // Start loading entity tracker
         entityTrackerFuture = SettableFuture.create();
         new Thread(() -> {
@@ -499,13 +496,12 @@ public class GuiPathing {
                     }
                 });
                 logger.info("Loaded entity tracker in " + (System.currentTimeMillis() - start) + "ms");
-            } catch (Throwable e) {
+            } catch (IOException e) {
                 logger.error("Loading entity tracker:", e);
                 mod.getCore().runLater(() -> {
                     mod.getCore().printWarningToChat("Error loading entity tracker: %s", e.getLocalizedMessage());
                     entityTrackerFuture.setException(e);
                 });
-                return;
             }
             entityTracker = tracker;
             mod.getCore().runLater(() -> {
@@ -515,12 +511,13 @@ public class GuiPathing {
     }
 
     private boolean preparePathsForPlayback() {
-        SPTimeline timeline = mod.getCurrentTimeline();
+        Timeline timeline = mod.getCurrentTimeline();
-        timeline.getTimeline().getPaths().forEach(Path::updateAll);
+        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
@@ -534,8 +531,8 @@ public class GuiPathing {
         }
 
         // Make sure there are at least two position- and two time-keyframes
-        if (timeline.getPositionPath().getSegments().isEmpty()
+        if (timeline.getPaths().get(POSITION_PATH).getSegments().isEmpty()
-                || timeline.getTimePath().getSegments().isEmpty()) {
+                || timeline.getPaths().get(TIME_PATH).getSegments().isEmpty()) {
             GuiInfoPopup.open(replayHandler.getOverlay(), "replaymod.chat.morekeyframes");
             return false;
         }
@@ -547,85 +544,204 @@ 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) {
+                    updateKeyframe(isTime);
-                        mod.getCurrentTimeline().setEntityTracker(entityTracker);
-                    }
-                    withDelayedTracker.run();
                 }
 
                 @Override
                 public void onFailure(@Nonnull Throwable t) {
-                    String message = "Failed to load entity tracker, pathing will be unavailable.";
+                    popup.close();
-                    GuiReplayOverlay overlay = replayHandler.getOverlay();
-                    Utils.error(LOGGER, overlay, CrashReport.makeCrashReport(t, message), 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) {
+        Keyframe keyframe = mod.getSelectedKeyframe();
-            case TIME:
+        if (keyframe != null && keyframe.getValue(TimestampProperty.PROPERTY).isPresent() ^ isTime) {
-                if (mod.getSelectedPath() == path) {
+            // Keyframe is on the wrong timeline
-                    LOGGER.debug("Selected keyframe is time keyframe -> removing keyframe");
+            keyframe = null;
-                    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;
         }
+        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() {
@@ -636,15 +752,13 @@ public class GuiPathing {
         return entityTracker;
     }
 
-    public void openEditKeyframePopup(SPPath path, long time) {
+    public void openEditKeyframePopup(Path path, Keyframe keyframe) {
-        if (!ensureEntityTracker(() -> openEditKeyframePopup(path, time))) return;
-        Keyframe keyframe = mod.getCurrentTimeline().getKeyframe(path, time);
         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
+                // Spectator segments have 20 lines per second whereas normal segments have a fixed 100
-                long steps = spectator ? Math.max(diff / 50, 10) : 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

@@ -0,0 +1,526 @@
+replaymod.title=Replay Mod
+
+#Website API translations
+replaymod.api.parammissing=Required parameter missing: %1$s
+replaymod.api.invalidvalue=Invalid value passed for parameter %1$s - Possible values: %2$s
+replaymod.api.invalidlogin=Invalid login data provided
+replaymod.api.invalidauthkey=Invalid authentication key provided
+replaymod.api.notenoughspace=Not enough space left to upload this file. Consider purchasing Premium on ReplayMod.com
+replaymod.api.invalidfile=This file is invalid
+replaymod.api.fileduplicate=This file has already been uploaded
+replaymod.api.filenoexist=This file does not exist
+replaymod.api.nopermissions=You don't have permission to access this file
+replaymod.api.alreadyrated=You already rated this file
+replaymod.api.usernoexist=This user does not exist
+replaymod.api.invalidcategory=Invalid file category
+replaymod.api.nofilesuploaded=No files uploaded
+replaymod.api.toomanyvalues=Too many values passed for %1$s
+replaymod.api.noparameters=At least one parameter required. Parameters: %1$s
+replaymod.api.invalidfilename=File name must be between 5 and 30 characters long
+replaymod.api.unknownlang=This language has not been translated
+replaymod.api.zippingerror=An error occured while zipping the language files
+replaymod.api.usernameexists=This username is already taken
+replaymod.api.mailexists=This Email address is already linked to an account
+replaymod.api.invalidmail=Invalid Email Address
+replaymod.api.nopermissions=You don't have permission to do this
+replaymod.api.authfailed=Authentication to the Minecraft Session Servers failed
+replaymod.api.mcuserexists=A ReplayMod account is already associated with this Minecraft account
+replaymod.api.filetoobig=The uploaded file is too big
+replaymod.api.usernametoolong=The username is too long
+replaymod.api.descriptiontoolong=The description is too long
+replaymod.api.passwordlength=The password has to be between 5 and 1024 characters long
+replaymod.api.suspended=Your account has been suspended
+
+#All of the chat messages
+replaymod.chat.recordingstarted=Recording started
+replaymod.chat.recordingfailed=Failed to start recording
+
+replaymod.chat.savingthumb=Saving Thumbnail...
+replaymod.chat.savedthumb=Thumbnail has been successfully saved
+replaymod.chat.failedthumb=Thumbnail could not be saved
+
+replaymod.chat.addedmarker=Event Marker has been added
+
+#Chat messages displayed in Replay Viewer
+replaymod.chat.morekeyframes=At least 2 position keyframes and 2 time keyframes required
+replaymod.chat.negativetime=Camera Paths can't play time backwards. Please consult your nearest time lord for assistance.
+replaymod.chat.pathstarted=Camera Path started
+replaymod.chat.pathfinished=Camera Path finished
+replaymod.chat.pathinterrupted=Camera Path canceled
+
+#Replay Categories
+replaymod.category=Category
+replaymod.category.survival=Survival
+replaymod.category.minigame=Minigame
+replaymod.category.build=Build
+replaymod.category.misc=Miscellaneous
+
+#Common GUI-related strings
+replaymod.gui.replay=Replay
+replaymod.gui.login=Login
+replaymod.gui.logout=Logout
+replaymod.gui.cancel=Cancel
+replaymod.gui.username=Username
+replaymod.gui.password=Password
+replaymod.gui.back=Back
+replaymod.gui.duration=Duration
+replaymod.gui.load=Load
+replaymod.gui.download=Download
+replaymod.gui.like=Like
+replaymod.gui.dislike=Dislike
+replaymod.gui.removelike=Remove Like
+replaymod.gui.removedislike=Remove Dislike
+replaymod.gui.save=Save
+replaymod.gui.upload=Upload
+replaymod.gui.rename=Rename
+replaymod.gui.remove=Remove
+replaymod.gui.add=Add
+replaymod.gui.start=Start
+replaymod.gui.end=End
+replaymod.gui.delete=Delete
+replaymod.gui.recording=Recording
+replaymod.gui.speed=Speed
+replaymod.gui.register=Register
+replaymod.gui.mail=Email Address
+replaymod.gui.loading=Loading
+replaymod.gui.pleasewait=Please wait
+replaymod.gui.render=Render
+replaymod.gui.iphidden=Server IP Hidden
+replaymod.gui.overwrite=Overwrite
+replaymod.gui.saveas=Save as ...
+replaymod.gui.done=Done
+replaymod.gui.close=Close
+replaymod.gui.notagain=Don't show again
+
+replaymod.gui.renderdonetitle=Video rendered
+replaymod.gui.openfolder=Open Video Folder
+replaymod.gui.youtubeupload=Upload to YouTube
+replaymod.gui.renderdone1=Your video was successfully rendered.
+replaymod.gui.renderdone2=How would you like to proceed?
+replaymod.gui.videotitle=Title
+replaymod.gui.videodescription=Description
+replaymod.gui.videotags=Tags,Tags,Tags
+replaymod.gui.videothumbnail=Video Thumbnail
+replaymod.gui.videovisibility.private=Private
+replaymod.gui.videovisibility.unlisted=Unlisted
+replaymod.gui.videovisibility.public=Public
+replaymod.gui.ytuploadprogress.auth=[1/4] Authorization
+replaymod.gui.ytuploadprogress.prepare_video=[2/4] Preparing video: %%d%%%%
+replaymod.gui.ytuploadprogress.upload=[3/4] Uploading: %%d%%%%
+replaymod.gui.ytuploadprogress.cleanup=[4/4] Cleanup
+replaymod.gui.ytuploadprogress.done=Done: %s
+replaymod.gui.titleempty=Title cannot be empty
+replaymod.gui.videothumbnailtoolarge=Thumbnail size exceeds 2MB
+replaymod.gui.videothumbnailformat=Thumbnail has to be either JPEG or PNG format
+
+replaymod.gui.original=Original
+replaymod.gui.modified=Modified
+
+replaymod.gui.outdated=There is a newer Replay Mod version available. Please download it from replaymod.com
+
+replaymod.gui.hours=h
+replaymod.gui.minutes=min
+replaymod.gui.seconds=sec
+replaymod.gui.milliseconds=ms
+
+replaymod.gui.pitch=Pitch
+replaymod.gui.yaw=Yaw
+replaymod.gui.roll=Roll
+
+replaymod.gui.camera=Camera
+replaymod.gui.position=Position
+
+replaymod.gui.unknownerror=An unknown error occured
+
+replaymod.gui.exit=Exit Replay
+replaymod.gui.java=Java 1.7 or newer required
+replaymod.gui.morereplays=At least one Replay required
+
+replaymod.gui.loggedin=LOGGED IN
+replaymod.gui.loggedout=LOGGED OUT
+
+replaymod.gui.mainmenu=Main Menu
+replaymod.gui.settings=Settings
+
+replaymod.gui.keyframerepo.delete=Are you sure you want to delete these keyframes?
+
+replaymod.gui.restorereplay1=It seems like Minecraft has not quit normally.
+replaymod.gui.restorereplay2=The Replay "%1$s" was not saved correctly.
+replaymod.gui.restorereplay3=Do you wish to recover it?
+
+replaymod.gui.loadentitytracker=Loading entity positions: %%d%%%%
+
+#Only change these if it's neccessary
+replaymod.gui.replayviewer=Replay Viewer
+replaymod.gui.replaycenter=Replay Center
+replaymod.gui.replaysettings=Replay Settings
+replaymod.gui.replayeditor=Replay Editor
+
+#Login GUI
+replaymod.gui.login.title=Login to ReplayMod.com
+replaymod.gui.login.logging=Logging in...
+replaymod.gui.login.incorrect=Incorrect username or password
+replaymod.gui.login.connectionerror=Could not connect to ReplayMod.com
+
+replaymod.gui.login.skip=Skip
+
+replaymod.gui.register.title=Register on ReplayMod.com
+replaymod.gui.register.confirmpw=Confirm Password
+
+replaymod.gui.register.disclaimer=By registering an account, you agree to the Replay Mod's Terms of Service: https://replaymod.com/legal/terms
+
+replaymod.gui.register.error.nomatch=Passwords don't match
+replaymod.gui.register.error.shortusername=Username has to be at least 5 characters long
+replaymod.gui.register.error.invalidname=Username may only contain letters and numbers
+replaymod.gui.register.error.shortpw=Password has to be at least 5 characters long
+replaymod.gui.register.error.longpw=Password has to be at most 1024 characters long
+replaymod.gui.register.error.authfailed=Could not authenticate your Minecraft account
+
+#Replay Viewer GUI
+replaymod.gui.viewer.rename.title=Rename Replay
+replaymod.gui.viewer.rename.name=Replay Name
+replaymod.gui.viewer.replayfolder=Open Replay Folder...
+replaymod.gui.viewer.noauth=Log in to upload a Replay
+replaymod.gui.viewer.alreadyuploaded=This Replay has already been uploaded
+
+replaymod.gui.viewer.delete.linea=Are you sure you want to delete this replay?
+replaymod.gui.viewer.delete.failed1=Your OS did not allow us to move the replay. There is
+replaymod.gui.viewer.delete.failed2=nothing we can do about this. You have to do it yourself.
+replaymod.gui.viewer.delete.lineb='%1$s' will be lost forever! (a long time!)
+
+replaymod.gui.viewer.download.title=Downloading Replay File...
+replaymod.gui.viewer.download.message=Please wait while "%1$s" is being downloaded.
+
+replaymod.gui.viewer.chooser.title=Choose Replay File
+replaymod.gui.viewer.chooser.message=You have a modified version of "%1$s" on your computer. Which Replay do you want to load?
+
+replaymod.gui.login.noacc=Don't have an account yet?
+
+#Replay Center GUI
+replaymod.gui.center.logoutcallback=Do you really want to log out?
+replaymod.gui.center.top.recent=Recent
+replaymod.gui.center.top.best=Best
+replaymod.gui.center.top.downloaded=Downloaded
+replaymod.gui.center.top.favorited=Favorited
+replaymod.gui.center.top.search=Search
+
+replaymod.gui.center.search.filters=Search Filters
+replaymod.gui.center.search.gametype=Gametype
+replaymod.gui.center.search.order=Sort by
+replaymod.gui.center.search.order.best=Best
+replaymod.gui.center.search.order.recent=Recent
+replaymod.gui.center.search.name=Replay Name
+replaymod.gui.center.search.server=Server IP (Multiplayer only)
+replaymod.gui.center.search.category=Filter by Category
+replaymod.gui.center.search.version=Filter by Version
+
+replaymod.gui.center.downloadrequired=Download the Replay to rate or favorite it
+
+replaymod.gui.center.favorite=Favorite
+replaymod.gui.center.unfavorite=Unfavorite
+replaymod.gui.center.favorites=Favorites
+
+replaymod.gui.center.author=by %1$s%2$s
+
+#Upload GUI
+replaymod.gui.upload.title=Upload File
+replaymod.gui.upload.start=Start Upload
+replaymod.gui.upload.cancel=Cancel Upload
+replaymod.gui.upload.tagshint=Tags separated by comma
+replaymod.gui.upload.namehint=Replay Title
+replaymod.gui.upload.descriptionhint=Description
+replaymod.gui.upload.duration=Duration: %02dm%02ds
+replaymod.gui.upload.uploading=Uploading...
+replaymod.gui.upload.success=File has been successfully uploaded
+replaymod.gui.upload.canceled=Upload has been canceled
+replaymod.gui.upload.hideip2=Hide Server IP (%s)
+replaymod.gui.upload.nothumbnail=Missing Thumbnail. Please create a Thumbnail in the Replay using the %1$s key.
+replaymod.gui.upload.tryagain=Try again?
+
+replaymod.gui.upload.error.name.length=The Replay Name has to be between 5 and 30 characters long
+replaymod.gui.upload.error.name=The Replay Name may not contain special characters
+replaymod.gui.upload.error.tags=Tags may only contain letters and are separated using a comma
+
+#Replay Editor
+replaymod.gui.editor.replayfile=Replay File
+
+replaymod.gui.editor.savemode.override=Replace Source File
+replaymod.gui.editor.savemode.newfile=Save to new File
+
+replaymod.gui.editor.trim.title=Trim Replay
+replaymod.gui.editor.connect.title=Connect Replays
+replaymod.gui.editor.modify.title=Modify Replay
+
+replaymod.gui.editor.trim.description=Removes the beginning and end of a Replay File, only keeping the Replay between the given timestamps
+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.
+
+replaymod.gui.editor.progress.status.initializing=Initializing
+replaymod.gui.editor.progress.status.writing.raw=Rewriting Replay...
+replaymod.gui.editor.progress.status.writing.final=Writing File to disk...
+replaymod.gui.editor.progress.status.finished=Finished Editing!
+
+replaymod.gui.editor.disclaimer=The Replay Editor is an experimental feature and may contain bugs.
+
+#Cancel Replay GUI
+replaymod.gui.cancelrender.title=Cancel Rendering
+replaymod.gui.cancelrender.message=Are you sure that you want to cancel the current rendering process?
+#Saving Replay GUI
+replaymod.gui.replaysaving.title=Saving Replay File...
+replaymod.gui.replaysaving.message=Please wait while your recent Replay is being saved.
+replaymod.gui.replaymodified.message=Replay was modified. Would you like to save the changes?
+replaymod.gui.replaymodified.yes=Save Modified Replay
+replaymod.gui.replaymodified.no=Discard Changes
+replaymod.gui.replaymodified.warning1=A Replay named "%1$s" already exists.
+replaymod.gui.replaymodified.warning2=Are you sure you want to replace it?
+
+#Player Overview GUI
+replaymod.gui.playeroverview.visible=Visible
+replaymod.gui.playeroverview.hideall=Hide all
+replaymod.gui.playeroverview.showall=Show all
+replaymod.gui.playeroverview.spectate=Spectate Player
+replaymod.gui.playeroverview.remembersettings=Remember Hidden Players
+replaymod.gui.playeroverview.remembersettings.description=Saves Player Visibility in Replay File
+
+#Replay Mod Settings GUI
+replaymod.gui.settings.title=Replay Mod Settings
+
+replaymod.gui.settings.interpolation.linear=Linear
+replaymod.gui.settings.interpolation.cubic=Cubic
+
+replaymod.gui.settings.bitrate=Video Bitrate
+replaymod.gui.settings.framerate=Video Framerate
+replaymod.gui.settings.notifications=Enable Notifications
+replaymod.gui.settings.recordserver=Record Server
+replaymod.gui.settings.recordsingleplayer=Record Singleplayer
+replaymod.gui.settings.indicator=Recording Indicator
+replaymod.gui.settings.lighting=Ambient Lighting
+replaymod.gui.settings.forcechunks=Force Render Chunks
+replaymod.gui.settings.resources=Server Resource Packs
+replaymod.gui.settings.interpolation=Path Interpolation
+replaymod.gui.settings.linearinterpolation=Linear Path Interpolation
+replaymod.gui.settings.pathpreview=Show Path Preview
+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.warning.linea=WARNING: Recording settings will be
+replaymod.gui.settings.warning.lineb=applied the next time you join a world.
+
+#Replay Mod Keybindings
+replaymod.input.lighting=Toggle Lighting
+replaymod.input.thumbnail=Capture Thumbnail
+replaymod.input.playeroverview=Player Overview
+replaymod.input.clearkeyframes=Clear Keyframes
+replaymod.input.synctimeline=Synchronize Timeline
+replaymod.input.keyframerepository=Open Keyframe Presets
+replaymod.input.rollclockwise=Roll Clockwise
+replaymod.input.rollcounterclockwise=Roll Counterclockwise
+replaymod.input.resettilt=Reset Camera Tilt
+replaymod.input.playpause=Play/Pause Replay
+replaymod.input.marker=Add Event Marker
+replaymod.input.pathpreview=Toggle Path Preview
+replaymod.input.assetmanager=Asset Manager
+replaymod.input.objectmanager=Object Manager
+replaymod.input.interpolation=Toggle Interpolation
+replaymod.input.settings=ReplayMod Settings
+
+# CameraControllers
+replaymod.camera.classic=Classic
+replaymod.camera.vanilla=Vanilla-ish
+
+#Keyframe Presets GUI
+replaymod.gui.keyframerepository.title=Keyframe Repository
+replaymod.gui.keyframerepository.presets=Keyframe Presets
+replaymod.gui.keyframerepository.positionkeyframes=Position Keyframes
+replaymod.gui.keyframerepository.timekeyframes=Time Keyframes
+
+replaymod.gui.keyframerepository.savecurrent=Save current Path
+
+replaymod.gui.keyframerepository.noentries=No Presets available
+
+replaymod.gui.keyframerepository.preset.defaultname=New Keyframe Preset
+replaymod.gui.keyframerepository.duplicate=This Preset already exists
+
+#Edit Keyframe GUI
+replaymod.gui.editkeyframe.title.pos=Edit Position Keyframe
+replaymod.gui.editkeyframe.title.time=Edit Time Keyframe
+replaymod.gui.editkeyframe.title.marker=Edit Event Marker
+replaymod.gui.editkeyframe.title.spec=Edit Spectator Keyframe
+replaymod.gui.editkeyframe.xpos=X Position
+replaymod.gui.editkeyframe.ypos=Y Position
+replaymod.gui.editkeyframe.zpos=Z Position
+replaymod.gui.editkeyframe.campitch=Camera Pitch
+replaymod.gui.editkeyframe.camyaw=Camera Yaw
+replaymod.gui.editkeyframe.camroll=Camera Roll
+replaymod.gui.editkeyframe.timelineposition=Timeline Position
+replaymod.gui.editkeyframe.markername=Event Marker Name
+replaymod.gui.editkeyframe.timestamp=Time Index
+
+replaymod.gui.editkeyframe.spec.method=Spectating Method
+replaymod.gui.editkeyframe.spec.method.firstperson=First Person
+replaymod.gui.editkeyframe.spec.method.shoulder=Shoulder Camera
+
+replaymod.gui.editkeyframe.spec.method.shoulder.distance=Camera Distance
+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
+
+#Render Settings GUI
+replaymod.gui.rendersettings.title=Rendering Options
+replaymod.gui.rendersettings.renderer=Rendering Method
+
+replaymod.gui.rendersettings.renderer.default=Default Rendering
+replaymod.gui.rendersettings.renderer.tiled=Tiled Rendering
+replaymod.gui.rendersettings.renderer.stereoscopic=Stereoscopic Rendering
+replaymod.gui.rendersettings.renderer.cubic=Cubic Rendering
+replaymod.gui.rendersettings.renderer.equirectangular=Equirectangular Rendering
+replaymod.gui.rendersettings.renderer.ods=ODS Rendering
+
+replaymod.gui.rendersettings.renderer.default.description=Renders the video in the specified resolution. Fastest Rendering Option.
+replaymod.gui.rendersettings.renderer.stereoscopic.description=Renders the video as a stereoscopic (side-by-side) 3D movie, usable by different 3D technologies. The image for one eye is half the width of the video
+replaymod.gui.rendersettings.renderer.cubic.description=Renders the video with a 360 degree panoramic view, using Cubic Projection. This is usable by several 360 degree video players (and the Oculus Rift), for example VR Player.
+replaymod.gui.rendersettings.renderer.equirectangular.description=Renders the video with a 360 degree panoramic view, using Equirectangular Projection. This is usable by YouTube's new 360 degree video function, and several video players (and the Oculus Rift), for example VR Player.
+replaymod.gui.rendersettings.renderer.ods.description=Renders the video with a stereoscopic 3D 360 degree panoramic view, also called VR Video. This is usable by YouTube's new VR video function.
+
+replaymod.gui.rendersettings.customresolution=Video Resolution
+replaymod.gui.rendersettings.customresolution.warning.cubic=Cubic Rendering requires an aspect ratio of 4:3
+replaymod.gui.rendersettings.customresolution.warning.equirectangular=Equirectangular Rendering requires an aspect ratio of 2:1
+replaymod.gui.rendersettings.customresolution.warning.yuv420=For this preset, the width and height values need to be even numbers
+replaymod.gui.rendersettings.customresolution.warning.ods=ODS Rendering requires an aspect ratio of 1:1
+replaymod.gui.rendersettings.resolution=Video Resolution
+replaymod.gui.rendersettings.interpolation=Path Interpolation
+replaymod.gui.rendersettings.forcechunks=Force Render Chunks
+replaymod.gui.rendersettings.framerate=Video Framerate
+replaymod.gui.rendersettings.quality=Video Quality
+replaymod.gui.rendersettings.chromakey=Chroma Keying
+replaymod.gui.rendersettings.skycolor=Sky Color
+replaymod.gui.rendersettings.nametags=Render Name Tags
+replaymod.gui.rendersettings.outputfile=Output File
+replaymod.gui.rendersettings.360metadata=Inject 360° Metadata
+replaymod.gui.rendersettings.360metadata.error=360° Metadata can only be added to Equirectangular videos in MP4 format
+
+replaymod.gui.rendersettings.command=Command
+replaymod.gui.rendersettings.arguments=Command Line Arguments
+replaymod.gui.rendersettings.ffmpeg.description=If you are an advanced user, you can customize the command line parameters used to export the video. For more information, check http://replaymod.com/docs
+
+replaymod.gui.rendersettings.stabilizecamera=Stabilize Camera
+replaymod.gui.rendersettings.exportyoutube=Export for YouTube
+
+replaymod.gui.rendersettings.video=Video Settings
+replaymod.gui.rendersettings.advanced=Advanced Settings
+replaymod.gui.rendersettings.commandline=Command Line Settings
+
+replaymod.gui.rendersettings.presets=Encoding Presets
+replaymod.gui.rendersettings.presets.mp4.custom=MP4 - Custom Bitrate
+replaymod.gui.rendersettings.presets.mp4.high=MP4 - High Quality
+replaymod.gui.rendersettings.presets.mp4.default=MP4 - Default Quality
+replaymod.gui.rendersettings.presets.mp4.potato=MP4 - Potato Quality
+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
+replaymod.gui.rendering.resume=Resume Rendering
+replaymod.gui.rendering.cancel=Cancel Rendering
+replaymod.gui.rendering.cancel.callback=Are you sure?
+replaymod.gui.rendering.preview=Show Preview (Performance might suffer)
+replaymod.gui.rendering.progress=Frames rendered: %1$d / %2$d
+replaymod.gui.rendering.timetaken=Render Time
+replaymod.gui.rendering.timeleft=Time Left
+
+#Render Errors
+replaymod.gui.rendering.error.title=Rendering Failed
+replaymod.gui.rendering.error.optifine=Please uninstall Optifine before rendering.
+replaymod.gui.rendering.error.message=To render a video, you need to have ffmpeg installed. http://ffmpeg.org
+
+#Ingame Menu
+replaymod.gui.ingame.menu.addposkeyframe=Add Position Keyframe
+replaymod.gui.ingame.menu.removeposkeyframe=Remove Position Keyframe
+replaymod.gui.ingame.menu.addspeckeyframe=Add Spectator Keyframe
+replaymod.gui.ingame.menu.removespeckeyframe=Remove Spectator Keyframe
+replaymod.gui.ingame.menu.addtimekeyframe=Add Time Keyframe
+replaymod.gui.ingame.menu.removetimekeyframe=Remove Time Keyframe
+replaymod.gui.ingame.menu.pause=Pause Replay
+replaymod.gui.ingame.menu.unpause=Unpause Replay
+replaymod.gui.ingame.menu.renderpath=Render Camera Path
+replaymod.gui.ingame.menu.playpath=Play Camera Path from Cursor Position
+replaymod.gui.ingame.menu.playpathfromstart=Play Camera Path from Start
+replaymod.gui.ingame.menu.pausepath=Pause Camera Path
+replaymod.gui.ingame.menu.zoomin=Zoom in
+replaymod.gui.ingame.menu.zoomout=Zoom out
+
+replaymod.gui.ingame.unnamedmarker=Unnamed Event Marker
+
+#Clear Keyframe Callback
+replaymod.gui.clearcallback.title=Clear all Keyframes?
+replaymod.gui.clearcallback.message=This Callback can be disabled in the Replay Settings.
+
+#Asset Manager Gui
+replaymod.gui.assets.title=Asset Manager
+replaymod.gui.assets.filechooser=Asset File
+replaymod.gui.assets.defaultname=New Asset
+replaymod.gui.assets.emptylist=No Assets available
+replaymod.gui.assets.namehint=Asset Name
+replaymod.gui.assets.changefile=Change Asset File
+replaymod.gui.assets.noselection=No Asset selected
+
+#Object Manager Gui
+replaymod.gui.objects.properties.anchor=Anchor Point
+replaymod.gui.objects.properties.position=Position
+replaymod.gui.objects.properties.scale=Scale
+replaymod.gui.objects.properties.orientation=Orientation
+replaymod.gui.objects.properties.opacity=Opacity
+replaymod.gui.objects.properties.name=Object Name
+replaymod.gui.objects.empty=No Objects added
+replaymod.gui.objects.defaultname=New Object
+replaymod.gui.objects=Custom Objects
+
+#Errors
+replaymod.error.unknownrestriction1=This replay cannot be played with your current version.
+replaymod.error.unknownrestriction2=It tried to enforce %s which is unknown.
+replaymod.error.negativetime1=Some of your time keyframes are out of order.
+replaymod.error.negativetime2=Going backwards in time is not supported.
+replaymod.error.negativetime3=The invalid parts are marked in red.
+
+#Replay Mod Incompatibility Warning
+replaymod.gui.modwarning.title=Incompatibility detected
+replaymod.gui.modwarning.message1=A possible incompatibility between your current
+replaymod.gui.modwarning.message2=Minecraft version and this Replay has been detected.
+replaymod.gui.modwarning.message3=Loading this Replay may result in errors or a crash.
+replaymod.gui.modwarning.name=Mod Name:
+replaymod.gui.modwarning.id=Mod Id:
+replaymod.gui.modwarning.missing=Missing Mods
+replaymod.gui.modwarning.version=Different Mod Versions
+replaymod.gui.modwarning.version.expected=Expected
+replaymod.gui.modwarning.version.found=Found
+
+#OpenEye
+replaymod.gui.offeropeneye1=Do you want to install OpenEye?
+replaymod.gui.offeropeneye2=OpenEye is a mod that collects anonymous information
+replaymod.gui.offeropeneye3=about the mods being run and any crashes that happen.
+replaymod.gui.offeropeneye4=
+replaymod.gui.offeropeneye5=OpenEye can be disabled at any time and is completely optional.
+replaymod.gui.offeropeneye6=More information is available at https://openeye.openmods.info/faq
+replaymod.gui.offeropeneye7=Clicking Yes will download OpenEye and place it in your mods folder.
+replaymod.gui.offeropeneye8=It will then be active the next time you start Minecraft.