Merge branch '1.10.2' into 1.11

c6dec95 Merge branch '1.9.4' into 1.10.2
4fdfa9e Merge branch '1.8.9' into 1.9.4
44d4a25 Merge branch '1.8' into 1.9.4
01acbc6 Update to 1.8.9
1c60687 Update ReplayStudio and jGui
d9b796d Mixin'd the Shader's mods ShadersRender class to only render hands if the Forge event isn't cancelled
6bbff3b Updated Mixin to 0.6.4-SNAPSHOT and set mixin target level
6f3ac71 Add CustomMainMenu compatibility info to docs
b0a1cdf Search for ffmpeg executable in common locations to simplify setup
d465891 Fixed GuiEditPositionKeyframe's width to fit on all screen sizes Centered all rows of GuiEditPositionKeyframe's VerticalLayout
1b099f9 Add render queue
03534c6 Update docs
4388d69 Only try to create the downloads folder if it does not yet exist
7ad19aa Add mod version and accepted MC version directly to the @Mod annotation
655bea0 Replace @Mod.Instance with direct static references
458dad6 Merge pull request #4 from ReplayMod/1.8-editor
eb5ccb2 Add Replay Editor (for now, trimming only)
6498d62 Fix server game data snapshot being restored in singleplayer (fixes #44)
2c898a8 Prevent rendering without sufficient keyframes (fixes #45)
5d520a5 Fix deserialization of chroma key color (fixes #43)
c681742 Use caching maven proxy for faster and more stable drone builds
fbf165e Added Anti-Aliasing to the Render Settings

.drone.yml

@@ -7,7 +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
-      - ./gradlew setupCIWorkspace
+      - JAVA_OPTS=-Xmx1516M ./gradlew setupDecompWorkspace
       - ./gradlew :build
   archive:
     image: plugins/s3

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICBidWlsZDoKICAgIGltYWdlOiBtYXZlbjozLjMuOS1qZGstOAogICAgY29tbWFuZHM6CiAgICAgIC0gY3VybCAtLWZhaWwgLS1jcmVhdGUtZGlycyAtbyAkSE9NRS8uZ3JhZGxlL2luaXQuZC9taXJyb3IuZ3JhZGxlIGh0dHBzOi8vbWF2ZW4uam9obmkwNzAyLmRlL2NvbmZpZy9ncmFkbGUKICAgICAgLSBjdXJsIC0tZmFpbCAtLWNyZWF0ZS1kaXJzIC1vICRIT01FLy5tMi9zZXR0aW5ncy54bWwgaHR0cHM6Ly9tYXZlbi5qb2huaTA3MDIuZGUvY29uZmlnL21hdmVuCiAgICAgIC0gLi9ncmFkbGV3IHNldHVwQ0lXb3Jrc3BhY2UKICAgICAgLSAuL2dyYWRsZXcgOmJ1aWxkCiAgYXJjaGl2ZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBhY2w6IHB1YmxpYy1yZWFkCiAgICByZWdpb246ICJ1cy1lYXN0LTEiCiAgICBidWNrZXQ6ICJyZXBsYXltb2QiCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzb3VyY2U6IGJ1aWxkL2xpYnMvKgogICAgc3RyaXBfcHJlZml4OiBidWlsZC9saWJzLwogICAgdGFyZ2V0OiAvCg.riE6lhwfdNUhI7LO2SxEKFOjzjaX40ne7Ae9gyP75KE
+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()
@@ -17,8 +19,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
-        classpath 'org.spongepowered:mixingradle:0.3-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
     }
 }
 
@@ -34,13 +36,11 @@ archivesBaseName = "replaymod"
 
 minecraft {
     coreMod = 'com.replaymod.core.LoadingPlugin'
-    version = '1.8-11.14.4.1563'
+    version = '1.11-13.19.1.2188'
     runDir = "eclipse"
-    mappings = "snapshot_nodoc_20141130"
+    mappings = "snapshot_20161111"
     replace '@MOD_VERSION@', project.version
-    // Includes intentional whitespace to stop Forge from declaring the mod to be compatible with
-    // a newer srg-compatible MC version (that may be using a different protocol version)
-    replace '@MC_VERSION@', "[ ${project.minecraft.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
@@ -117,6 +138,7 @@ jar {
     manifest {
          attributes 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
                  'TweakOrder': '0',
+                 'FMLCorePluginContainsFMLMod': 'true',
                  'FMLAT': 'replaymod_at.cfg'
 	}
 }
@@ -167,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') {
@@ -185,30 +200,6 @@ setupDecompWorkspace.dependsOn copySrg
 setupDevWorkspace.dependsOn copySrg
 project.tasks.idea.dependsOn copySrg
 
-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,342 +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();
-
-        FMLCommonHandler.instance().bus().register(this);
-        MinecraftForge.EVENT_BUS.register(this);
-        addCallback(future, success -> {
-            FMLCommonHandler.instance().bus().unregister(this);
-            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) {
-                    FMLCommonHandler.instance().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);
-                    }
-                }
-            }
-        }
-        FMLCommonHandler.instance().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) {
-                    FMLCommonHandler.instance().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);
-                    }
-                }
-            }
-        }
-        FMLCommonHandler.instance().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;
-                }
-
-                FMLCommonHandler.instance().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));
-            }
-        }
-        FMLCommonHandler.instance().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.GuiSelectWorld;
-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(GuiSelectWorld.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,10 +1,8 @@
 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.fml.common.FMLCommonHandler;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.EventBus;
@@ -12,18 +10,15 @@ 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";
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        EventBus bus = FMLCommonHandler.instance().bus();
+        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,97 +0,0 @@
-package com.replaymod.compat.bettersprinting;
-
-import com.replaymod.replay.ReplayModReplay;
-import com.replaymod.replay.events.ReplayChatMessageEvent;
-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.BlockPos;
-import net.minecraft.world.IWorldAccess;
-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 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.addWorldAccess(worldAccessHook);
-        }
-    }
-
-    @SubscribeEvent(priority = EventPriority.LOW)
-    public void afterGuiOpenEvent(GuiOpenEvent event) {
-        if (ReplayModReplay.instance.getReplayHandler() != null && mc.theWorld != null) {
-            mc.theWorld.removeWorldAccess(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 IWorldAccess {
-        @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 markBlockForUpdate(BlockPos pos) {}
-        @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 playSound(String soundName, double x, double y, double z, float volume, float pitch) {}
-        @Override public void playSoundToNearExcept(EntityPlayer except, String soundName, double x, double y, double z, float volume, float pitch) {}
-        @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 onEntityAdded(Entity entityIn) {}
-        @Override public void playRecord(String recordName, BlockPos blockPosIn) {}
-        @Override public void broadcastSound(int p_180440_1_, BlockPos p_180440_2_, int p_180440_3_) {}
-        @Override public void playAusSFX(EntityPlayer p_180439_1_, int p_180439_2_, BlockPos blockPosIn, int p_180439_4_) {}
-        @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.entity.isInvisible()) {
-                event.setCanceled(true);
-            }
-        }
-    }
-}

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

@@ -16,7 +16,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 public class KeyBindingRegistry {
     private Map<String, KeyBinding> keyBindings = new HashMap<String, KeyBinding>();
@@ -86,7 +85,7 @@ public class KeyBindingRegistry {
                 CrashReport crashReport = CrashReport.makeCrashReport(cause, "Handling Key Binding");
                 CrashReportCategory category = crashReport.makeCategory("Key Binding");
                 category.addCrashSection("Key Binding", keyBinding);
-                category.addCrashSectionCallable("Handler", runnable::toString);
+                category.setDetail("Handler", runnable::toString);
                 throw new ReportedException(crashReport);
             }
         }
@@ -101,12 +100,7 @@ public class KeyBindingRegistry {
                 CrashReport crashReport = CrashReport.makeCrashReport(cause, "Handling Raw Key Binding");
                 CrashReportCategory category = crashReport.makeCategory("Key Binding");
                 category.addCrashSection("Key Code", keyCode);
-                category.addCrashSectionCallable("Handler", new Callable() {
-                    @Override
-                    public Object call() throws Exception {
-                        return runnable;
-                    }
-                });
+                category.setDetail("Handler", runnable::toString);
                 throw new ReportedException(crashReport);
             }
         }

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) {
@@ -30,7 +29,7 @@ public class LoadingPlugin implements IFMLLoadingPlugin {
                 if (file.isFile()) {
                     // This forces forge to reexamine the jar file for FML mods
                     // Should eventually be handled by Mixin itself, maybe?
-                    CoreModManager.getLoadedCoremods().remove(file.getName());
+                    CoreModManager.getIgnoredMods().remove(file.getName());
                 }
             } catch (URISyntaxException e) {
                 e.printStackTrace();

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

@@ -6,7 +6,6 @@ import com.replaymod.core.gui.GuiReplaySettings;
 import com.replaymod.core.gui.RestoreReplayGui;
 import com.replaymod.core.handler.MainMenuHandler;
 import com.replaymod.core.utils.OpenGLUtils;
-import com.replaymod.render.utils.SoundHandler;
 import com.replaymod.replaystudio.util.I18n;
 import de.johni0702.minecraft.gui.container.GuiScreen;
 import lombok.Getter;
@@ -14,10 +13,11 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
-import net.minecraft.util.*;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.*;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -26,21 +26,16 @@ 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;
 import java.io.IOException;
 import java.util.List;
-import java.util.Queue;
 
 @Mod(modid = ReplayMod.MOD_ID,
         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 {
@@ -72,8 +67,6 @@ public class ReplayMod {
 
     @Deprecated
     public static Configuration config;
-    @Deprecated
-    public static SoundHandler soundHandler = new SoundHandler();
 
     private final KeyBindingRegistry keyBindingRegistry = new KeyBindingRegistry();
     private final SettingsRegistry settingsRegistry = new SettingsRegistry();
@@ -116,7 +109,7 @@ public class ReplayMod {
 
         new MainMenuHandler().register();
 
-        FMLCommonHandler.instance().bus().register(keyBindingRegistry);
+        MinecraftForge.EVENT_BUS.register(keyBindingRegistry);
 
         getKeyBindingRegistry().registerKeyBinding("replaymod.input.settings", 0, () -> {
             new GuiReplaySettings(null, settingsRegistry).display();
@@ -130,150 +123,7 @@ public class ReplayMod {
         if(!FMLClientHandler.instance().hasOptifine())
             GameSettings.Options.RENDER_DISTANCE.setValueMax(64f);
 
-        if (System.getProperty("replaymod.render.file") != null) {
-            final File file = new File(System.getProperty("replaymod.render.file"));
-            if (!file.exists()) {
-                throw new IOException("File \"" + file.getPath() + "\" not found.");
-            }
-
-            final String path = System.getProperty("replaymod.render.path");
-            String type = System.getProperty("replaymod.render.type");
-            String bitrate = System.getProperty("replaymod.render.bitrate");
-            String fps = System.getProperty("replaymod.render.fps");
-            String waitForChunks = System.getProperty("replaymod.render.waitforchunks");
-            String linearMovement = System.getProperty("replaymod.render.linearmovement");
-            String skyColor = System.getProperty("replaymod.render.skycolor");
-            String width = System.getProperty("replaymod.render.width");
-            String height = System.getProperty("replaymod.render.height");
-            String exportCommand = System.getProperty("replaymod.render.exportcommand");
-            String exportCommandArgs = System.getProperty("replaymod.render.exportcommandargs");
-            /*
-            final RenderOptions options = new RenderOptions();
-            if (bitrate != null) {
-                options.setBitrate(bitrate);
-            }
-            if (fps != null) {
-                options.setFps(Integer.parseInt(fps));
-            }
-            if (waitForChunks != null) {
-                options.setWaitForChunks(Boolean.parseBoolean(waitForChunks));
-            }
-            if (linearMovement != null) {
-                options.setLinearMovement(Boolean.parseBoolean(linearMovement));
-            }
-            if (skyColor != null) {
-                if (skyColor.startsWith("0x")) {
-                    options.setSkyColor(Integer.parseInt(skyColor.substring(2), 16));
-                } else {
-                    options.setSkyColor(Integer.parseInt(skyColor));
-                }
-            }
-            if (width != null) {
-                options.setWidth(Integer.parseInt(width));
-            }
-            if (height != null) {
-                options.setHeight(Integer.parseInt(height));
-            }
-
-            if (exportCommand != null) {
-                options.setExportCommand(exportCommand);
-            }
-            if (exportCommandArgs != null) {
-                options.setExportCommandArgs(exportCommandArgs);
-            } else {
-                options.setExportCommandArgs(EncodingPreset.MP4DEFAULT.getCommandLineArgs());
-            }
-
-            options.setOutputFile(new File(String.valueOf(System.currentTimeMillis())));
-
-            Pipelines.Preset pipelinePreset = Pipelines.Preset.DEFAULT;
-            if (type != null) {
-                String[] parts = type.split(":");
-                type = parts[0].toUpperCase();
-                if ("NORMAL".equals(type) || "DEFAULT".equals(type)) {
-                    pipelinePreset = Pipelines.Preset.DEFAULT;
-                } else if ("STEREO".equals(type) || "STEREOSCOPIC".equals(type)) {
-                    pipelinePreset = Pipelines.Preset.STEREOSCOPIC;
-                } else if ("CUBIC".equals(type)) {
-                    if (parts.length < 2) {
-                        throw new IllegalArgumentException("Cubic renderer requires boolean for whether it's stable.");
-                    }
-                    pipelinePreset = Pipelines.Preset.CUBIC;
-                } else if ("EQUIRECTANGULAR".equals(type)) {
-                    if (parts.length < 2) {
-                        throw new IllegalArgumentException("Equirectangular renderer requires boolean for whether it's stable.");
-                    }
-                    pipelinePreset = Pipelines.Preset.EQUIRECTANGULAR;
-                } else if ("ODS".equals(type)) {
-                    if (parts.length < 2) {
-                        throw new IllegalArgumentException("ODS renderer requires boolean for whether it's stable.");
-                    }
-                    pipelinePreset = Pipelines.Preset.ODS;
-                } else {
-                    throw new IllegalArgumentException("Unknown type: " + parts[0]);
-                }
-            }
-            options.setMode(pipelinePreset);
-            */
-
-            @SuppressWarnings("unchecked")
-            Queue<ListenableFutureTask> tasks = mc.scheduledTasks;
-            synchronized (mc.scheduledTasks) {
-                tasks.add(ListenableFutureTask.create(new Runnable() {
-                    @Override
-                    public void run() {
-                        String renderDistance = System.getProperty("replaymod.render.mc.renderdistance");
-                        String clouds = System.getProperty("replaymod.render.mc.clouds");
-                        if (renderDistance != null) {
-                            mc.gameSettings.renderDistanceChunks = Integer.parseInt(renderDistance);
-                        }
-                        if (clouds != null) {
-                            mc.gameSettings.clouds = Boolean.parseBoolean(clouds);
-                        }
-
-                        System.out.println("Loading replay...");
-                        // TODO
-//                        try {
-//                            ReplayHandler.startReplay(file, false);
-//                        } catch (Throwable t) {
-//                            t.printStackTrace();
-//                            FMLCommonHandler.instance().exitJava(1, false);
-//                        }
-//
-//                        int index = 0;
-//                        if (path != null) {
-//                            for (KeyframeSet set : ReplayHandler.getKeyframeRepository()) {
-//                                if (set.getName().equals(path)) {
-//                                    break;
-//                                }
-//                                index++;
-//                            }
-//                            if (index >= ReplayHandler.getKeyframeRepository().length) {
-//                                throw new IllegalArgumentException("No path named \"" + path + "\".");
-//                            }
-//                        } else if (ReplayHandler.getKeyframeRepository().length == 0) {
-//                            throw new IllegalArgumentException("Replay file has no paths defined.");
-//                        }
-//                        ReplayHandler.useKeyframePresetFromRepository(index);
-//
-//                        System.out.println("Rendering started...");
-//                        try {
-//                            ReplayProcess.startReplayProcess(options, true);
-//                        } catch (Throwable t) {
-//                            t.printStackTrace();
-//                            FMLCommonHandler.instance().exitJava(1, false);
-//                        }
-//                        if (mc.hasCrashed) {
-//                            System.out.println(mc.crashReporter.getCompleteReport());
-//                        }
-//                        System.out.println("Rendering done. Shutting down...");
-//                        mc.shutdown();
-                    }
-                }, null));
-            }
-
-            testIfMoeshAndExitMinecraft();
-        }
+        testIfMoeshAndExitMinecraft();
 
         runLater(() -> {
             // Cleanup deleted corrupted replays
@@ -309,38 +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 = FMLCommonHandler.instance().bus();
-            bus.register(new Object() {
-                @SubscribeEvent
-                public void onRenderTick(TickEvent.RenderTickEvent event) {
-                    if (event.phase == TickEvent.Phase.START) {
-                        runLater(runnable);
-                        bus.unregister(this);
-                    }
-                }
-            });
-            return;
-        }
-        @SuppressWarnings("unchecked")
-        Queue<ListenableFutureTask> tasks = mc.scheduledTasks;
         synchronized (mc.scheduledTasks) {
-            tasks.add(ListenableFutureTask.create(() -> {
-                inRunLater = true;
-                try {
-                    runnable.run();
-                } finally {
-                    inRunLater = false;
-                }
-            }, null));
+            mc.scheduledTasks.add(ListenableFutureTask.create(runnable, null));
         }
     }
 
@@ -369,13 +190,13 @@ public class ReplayMod {
     private void printToChat(boolean warning, String message, Object... args) {
         if (getSettingsRegistry().get(Setting.NOTIFICATIONS)) {
             // Some nostalgia: "§8[§6Replay Mod§8]§r Your message goes here"
-            ChatStyle coloredDarkGray = new ChatStyle().setColor(EnumChatFormatting.DARK_GRAY);
-            ChatStyle coloredGold = new ChatStyle().setColor(EnumChatFormatting.GOLD);
-            IChatComponent text = new ChatComponentText("[").setChatStyle(coloredDarkGray)
-                    .appendSibling(new ChatComponentTranslation("replaymod.title").setChatStyle(coloredGold))
-                    .appendSibling(new ChatComponentText("] "))
-                    .appendSibling(new ChatComponentTranslation(message, args).setChatStyle(new ChatStyle()
-                            .setColor(warning ? EnumChatFormatting.RED : EnumChatFormatting.DARK_GREEN)));
+            Style coloredDarkGray = new Style().setColor(TextFormatting.DARK_GRAY);
+            Style coloredGold = new Style().setColor(TextFormatting.GOLD);
+            ITextComponent text = new TextComponentString("[").setStyle(coloredDarkGray)
+                    .appendSibling(new TextComponentTranslation("replaymod.title").setStyle(coloredGold))
+                    .appendSibling(new TextComponentString("] "))
+                    .appendSibling(new TextComponentTranslation(message, args).setStyle(new Style()
+                            .setColor(warning ? TextFormatting.RED : TextFormatting.DARK_GREEN)));
             // Send message to chat GUI
             // The ingame GUI is initialized at startup, therefore this is possible before the client is connected
             mc.ingameGUI.getChatGUI().printChatMessage(text);

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

@@ -2,8 +2,8 @@ package com.replaymod.core;
 
 import com.replaymod.core.events.SettingsChangedEvent;
 import net.minecraft.client.resources.I18n;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -83,7 +83,7 @@ public class SettingsRegistry {
             throw new IllegalArgumentException("Default type " + key.getDefault().getClass() + " not supported.");
         }
         settings.put(key, value);
-        FMLCommonHandler.instance().bus().post(new SettingsChangedEvent(this, key));
+        MinecraftForge.EVENT_BUS.post(new SettingsChangedEvent(this, key));
     }
 
     public void save() {

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

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

src/main/java/com/replaymod/core/handler/MainMenuHandler.java

@@ -6,8 +6,6 @@ import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-import java.util.List;
-
 /**
  * Moves certain buttons on the main menu upwards so we can inject our own.
  */
@@ -18,14 +16,12 @@ public class MainMenuHandler {
 
     @SubscribeEvent
     public void onInit(GuiScreenEvent.InitGuiEvent.Post event) {
-        if (event.gui instanceof GuiMainMenu) {
-            @SuppressWarnings("unchecked")
-            List<GuiButton> buttonList = event.buttonList;
-            for (GuiButton button : buttonList) {
+        if (event.getGui() instanceof GuiMainMenu) {
+            for (GuiButton button : event.getButtonList()) {
                 // Buttons that aren't in a rectangle directly above our space don't need moving
-                if (button.xPosition + button.width < event.gui.width / 2 - 100
-                        || button.xPosition > event.gui.width / 2 + 100
-                        || button.yPosition > event.gui.height / 4 + 10 + 4 * 24) continue;
+                if (button.xPosition + button.width < event.getGui().width / 2 - 100
+                        || button.xPosition > event.getGui().width / 2 + 100
+                        || button.yPosition > event.getGui().height / 4 + 10 + 4 * 24) continue;
                 // Move button up to make space for two rows of buttons
                 // and then move back down by 10 to compensate for the space to the exit button that was already there
                 button.yPosition -= 2 * 24 - 10;

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

@@ -2,7 +2,8 @@ package com.replaymod.core.utils;
 
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
@@ -34,14 +35,14 @@ public class OpenGLUtils {
         float f5 = 1.0F / textureHeight;
 
         Tessellator tessellator = Tessellator.getInstance();
-        WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+        VertexBuffer vertexBuffer = tessellator.getBuffer();
         GlStateManager.translate(x+(width/2), y+(width/2), 0);
         GlStateManager.rotate(rotation, 0, 0, 1);
-        worldrenderer.startDrawingQuads();
-        worldrenderer.addVertexWithUV(-width / 2, height / 2, 0.0D, (double) (u * f4), (double) ((v + (float) height) * f5));
-        worldrenderer.addVertexWithUV(width/2, height/2, 0.0D, (double)((u + (float)width) * f4), (double)((v + (float)height) * f5));
-        worldrenderer.addVertexWithUV(width/2, -height/2, 0.0D, (double)((u + (float)width) * f4), (double)(v * f5));
-        worldrenderer.addVertexWithUV(-width/2, -height/2, 0.0D, (double)(u * f4), (double)(v * f5));
+        vertexBuffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
+        vertexBuffer.pos(-width / 2, height / 2, 0.0D).tex((double) (u * f4), (double) ((v + (float) height) * f5)).endVertex();
+        vertexBuffer.pos(width/2, height/2, 0.0D).tex((double)((u + (float)width) * f4), (double)((v + (float)height) * f5)).endVertex();
+        vertexBuffer.pos(width/2, -height/2, 0.0D).tex((double)((u + (float)width) * f4), (double)(v * f5)).endVertex();
+        vertexBuffer.pos(-width/2, -height/2, 0.0D).tex((double)(u * f4), (double)(v * f5)).endVertex();
         tessellator.draw();
 
         GlStateManager.popMatrix();

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

@@ -1,7 +1,7 @@
 package com.replaymod.core.utils;
 
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
+import net.minecraft.network.play.server.SPacketCustomPayload;
 
 /**
  * Restrictions set by the server,
@@ -14,7 +14,7 @@ public class Restrictions {
     private boolean onlyFirstPerson;
     private boolean onlyRecordingPlayer;
 
-    public String handle(S3FPacketCustomPayload packet) {
+    public String handle(SPacketCustomPayload packet) {
         PacketBuffer buffer = packet.getBufferData();
         while (buffer.isReadable()) {
             String name = buffer.readStringFromBuffer(64);

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,24 +86,8 @@ 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().getNetHandler().getPlayerInfo(uuid);
+        NetworkPlayerInfo info = getMinecraft().getConnection().getPlayerInfo(uuid);
         ResourceLocation skinLocation;
         if (info != null && info.hasLocationSkin()) {
             skinLocation = info.getLocationSkin();
@@ -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/core/utils/WrappedTimer.java

@@ -27,7 +27,7 @@ public class WrappedTimer extends Timer {
         to.elapsedPartialTicks = from.elapsedPartialTicks;
         to.lastSyncSysClock = from.lastSyncSysClock;
         to.lastSyncHRClock = from.lastSyncHRClock;
-        to.field_74285_i = from.field_74285_i;
+        to.counter = from.counter;
         to.timeSyncAdjustment = from.timeSyncAdjustment;
     }
 }

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 {
-                File actualOutputFile  = outputFile;
-                if (outputFile.getCanonicalPath().equals(inputFile.getCanonicalPath())) {
-                    // Input and output files are identical. Due to the way the ZipReplayFile stores its temporary
-                    // data, the same replay file must not be opened twice for writing (tmp files will be deleted once
-                    // either one is closed or, on Windows, will throw an exception when deleted).
-                    tmpDir = Files.createTempDir();
-                    outputFile = new File(tmpDir, "replay.mcpr");
-                    LOGGER.debug("Output file is identical to input file, using temporary output file {} instead",
-                            outputFile);
-                }
-                try (ReplayFile outputReplay = new ZipReplayFile(studio, inputFile, outputFile);
-                     ReplayOutputStream out = outputReplay.writePacketData();
-                     ReplayFile inputReplay = new ZipReplayFile(studio, inputFile);
+            try (ReplayFile outputReplay = new ZipReplayFile(studio, inputFile, outputFile);
+                 ReplayOutputStream out = outputReplay.writePacketData()) {
+                // The input replay file MUST be closed before saving the output file
+                try (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 startMin = newGuiNumberField();
-    public final GuiNumberField startSec = newGuiNumberField();
-    public final GuiNumberField startMilli = newGuiNumberField().setSize(40, 20).setMaxLength(4);
+    public final GuiNumberField startHour = new GuiNumberField().setSize(20, 20).setMaxLength(2);
+    public final GuiNumberField startMin = new GuiNumberField().setSize(20, 20).setMaxLength(2);
+    public final GuiNumberField startSec = new GuiNumberField().setSize(20, 20).setMaxLength(2);
+    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 endMin = newGuiNumberField();
-    public final GuiNumberField endSec = newGuiNumberField();
-    public final GuiNumberField endMilli = newGuiNumberField().setSize(40, 20).setMaxLength(4);
+    public final GuiNumberField endHour = new GuiNumberField().setSize(20, 20).setMaxLength(2);
+    public final GuiNumberField endMin = new GuiNumberField().setSize(20, 20).setMaxLength(2);
+    public final GuiNumberField endSec = new GuiNumberField().setSize(20, 20).setMaxLength(2);
+    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/editor/handler/GuiHandler.java

@@ -8,11 +8,8 @@ import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-import java.util.List;
-
 public class GuiHandler {
     private static final int BUTTON_REPLAY_EDITOR = 17890237;
 
@@ -23,31 +20,28 @@ public class GuiHandler {
     }
 
     public void register() {
-        FMLCommonHandler.instance().bus().register(this);
         MinecraftForge.EVENT_BUS.register(this);
     }
 
     @SubscribeEvent
     public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) {
-        if (!(event.gui instanceof GuiMainMenu)) {
+        if (!(event.getGui() instanceof GuiMainMenu)) {
             return;
         }
 
-        @SuppressWarnings("unchecked")
-        List<GuiButton> buttonList = event.buttonList;
-        GuiButton button = new GuiButton(BUTTON_REPLAY_EDITOR, event.gui.width / 2 + 2,
-                event.gui.height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayeditor"));
+        GuiButton button = new GuiButton(BUTTON_REPLAY_EDITOR, event.getGui().width / 2 + 2,
+                event.getGui().height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayeditor"));
         button.width = button.width / 2 - 2;
-        buttonList.add(button);
+        event.getButtonList().add(button);
     }
 
     @SubscribeEvent
     public void onButton(GuiScreenEvent.ActionPerformedEvent.Pre event) {
-        if(!event.button.enabled) return;
+        if(!event.getButton().enabled) return;
 
-        if (event.gui instanceof GuiMainMenu) {
-            if (event.button.id == BUTTON_REPLAY_EDITOR) {
-                new GuiReplayEditor(GuiScreen.wrap(event.gui), mod.getCore()).display();
+        if (event.getGui() instanceof GuiMainMenu) {
+            if (event.getButton().id == BUTTON_REPLAY_EDITOR) {
+                new GuiReplayEditor(GuiScreen.wrap(event.getGui()), mod.getCore()).display();
             }
         }
     }

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

@@ -9,7 +9,7 @@ import de.johni0702.minecraft.gui.element.GuiImage;
 import de.johni0702.minecraft.gui.element.IGuiImage;
 import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import net.minecraft.client.settings.GameSettings;
-import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.lwjgl.input.Keyboard;
@@ -40,7 +40,7 @@ public class FullBrightness implements Extra {
             }
         });
 
-        FMLCommonHandler.instance().bus().register(this);
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     @SubscribeEvent

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

@@ -17,7 +17,7 @@ import de.johni0702.minecraft.gui.layout.GridLayout;
 import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import de.johni0702.minecraft.gui.layout.LayoutData;
 import net.minecraft.client.resources.I18n;
-import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.Dimension;
@@ -35,7 +35,7 @@ public class HotkeyButtons implements Extra {
     public void register(ReplayMod mod) throws Exception {
         this.mod = mod;
 
-        FMLCommonHandler.instance().bus().register(this);
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     @SubscribeEvent

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

@@ -1,110 +1,106 @@
 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.IMetadataSerializer;
+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 static final String LANG_PREFIX = "Translations-master/";
+    private ReplayModOnline module;
 
     @Override
     public void register(ReplayMod mod) throws Exception {
-        final Minecraft mc = mod.getMinecraft();
-        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());
+        this.module = ReplayModOnline.instance;
 
-                // Add lang files as resource pack
-                mc.addScheduledTask(() -> {
+        final Minecraft mc = mod.getMinecraft();
+        Thread localizedResourcePackLoader = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
                     @SuppressWarnings("unchecked")
                     List<IResourcePack> defaultResourcePacks = mc.defaultResourcePacks;
-                    defaultResourcePacks.add(new LocalizedResourcePack(languages));
-                    mc.getLanguageManager().onResourceManagerReload(mc.getResourceManager());
-                    LOGGER.debug("Added language files to resource packs and reloaded LanguageManager");
-                });
-            } catch (Throwable t) {
-                LOGGER.error("Loading localized resource pack:", t);
+                    defaultResourcePacks.add(new LocalizedResourcePack(module.getApiClient()));
+                    mc.addScheduledTask(new Runnable() {
+                        @Override
+                        public void run() {
+                            mc.refreshResources();
+                        }
+                    });
+                } 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 Map<String, byte[]> languages;
-
-        public LocalizedResourcePack(Map<String, byte[]> languages) {
-            this.languages = languages;
-        }
+        private final ApiClient apiClient;
+        private Map<String, String> availableLanguages = new HashMap<>();
+        private boolean websiteAvailable = true;
 
         @Override
         public InputStream getInputStream(ResourceLocation loc) {
-            if (!"replaymod".equals(loc.getResourceDomain())) return null;
-            Matcher matcher = LANG_PATTERN.matcher(loc.getResourcePath());
-            if (matcher.matches()) {
-                byte[] bytes = languages.get(matcher.group());
-                if (bytes != null) {
-                    return new ByteArrayInputStream(bytes);
-                }
-            }
+            if(!loc.getResourcePath().endsWith(".lang")) return null;
+            String langcode = loc.getResourcePath().split("/")[1].split("\\.")[0];
+            if(availableLanguages.containsKey(langcode)) return new ByteArrayInputStream(availableLanguages.get(langcode).getBytes(Charsets.UTF_8));
             return null;
         }
 
         @Override
         public boolean resourceExists(ResourceLocation loc) {
-            // Assumes that getInputStream returns a ByteArrayInputStream that doesn't need to be closed
-            return getInputStream(loc) != null;
+            if(!(loc.getResourcePath().endsWith(".lang"))) return false;
+            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 getResourceDomains() {
-            return ImmutableSet.of("replaymod");
+        public Set<String> getResourceDomains() {
+            return ImmutableSet.of("minecraft", "replaymod");
         }
 
         @Override
-        public IMetadataSection getPackMetadata(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException {
+        public <T extends IMetadataSection> T getPackMetadata(MetadataSerializer metadataSerializer, String metadataSectionName) throws IOException {
             return null;
         }
 

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();
-                        connection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
-                        ReadableByteChannel in = Channels.newChannel(connection.getInputStream());
+                        ReadableByteChannel in = Channels.newChannel(new URL(DOWNLOAD_URL).openStream());
                         FileChannel out = new FileOutputStream(targetFile).getChannel();
                         out.transferFrom(in, 0, Long.MAX_VALUE);
                     } catch (Throwable e) {
@@ -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<>();
-
-    public static Logger LOGGER;
+    private 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,11 +9,10 @@ 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.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 
@@ -56,8 +55,13 @@ public class PlayerOverview implements Extra {
             }
         });
 
-        FMLCommonHandler.instance().bus().register(this);
         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) {
@@ -88,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.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.container.*;
 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;
@@ -21,7 +16,8 @@ import de.johni0702.minecraft.gui.utils.Colors;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EnumPlayerModelParts;
-import net.minecraft.potion.Potion;
+import net.minecraft.init.MobEffects;
+import net.minecraft.init.SoundEvents;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.util.Dimension;
 import org.lwjgl.util.ReadableDimension;
@@ -41,22 +37,21 @@ 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
         public void onClick() {
-            getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(BUTTON_SOUND, 1.0F));
+            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.create(BUTTON_SOUND, 1.0F));
+            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);
@@ -96,7 +91,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
                         public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
                             renderer.bindTexture(texture);
                             renderer.drawTexturedRect(0, 0, 8, 8, 16, 16, 8, 8, 64, 64);
-                            if (p.func_175148_a(EnumPlayerModelParts.HAT)) {
+                            if (p.isWearing(EnumPlayerModelParts.HAT)) {
                                 renderer.drawTexturedRect(0, 0, 40, 8, size.getWidth(), size.getHeight(), 8, 8, 64, 64);
                             }
                         }
@@ -145,7 +140,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
     }
 
     private static boolean isSpectator(EntityPlayer e) {
-        return e.isInvisible() && e.getActivePotionEffect(Potion.invisibility) == null;
+        return e.isInvisible() && e.getActivePotionEffect(MobEffects.INVISIBILITY) == null;
     }
 
     private static final class PlayerComparator implements Comparator<EntityPlayer> {

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/YoutubeUpload.java

@@ -17,8 +17,8 @@ public class YoutubeUpload implements Extra {
 
     @SubscribeEvent
     public void onGuiOpen(GuiScreenEvent.InitGuiEvent.Post event) {
-        if (GuiScreen.from(event.gui) instanceof GuiRenderingDone) {
-            GuiRenderingDone gui = (GuiRenderingDone) GuiScreen.from(event.gui);
+        if (GuiScreen.from(event.getGui()) instanceof GuiRenderingDone) {
+            GuiRenderingDone gui = (GuiRenderingDone) GuiScreen.from(event.getGui());
             // Check if there already is a youtube button
             if (gui.actionsPanel.getChildren().stream().anyMatch(it -> it instanceof YoutubeButton)) {
                 return; // Button already added

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

@@ -12,8 +12,8 @@ import com.replaymod.replaystudio.replay.ReplayFile;
 import com.replaymod.replaystudio.replay.ZipReplayFile;
 import com.replaymod.replaystudio.studio.ReplayStudio;
 import de.johni0702.minecraft.gui.container.GuiScreen;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
@@ -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,12 +69,12 @@ 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());
             }
         }
 
         new GuiHandler(this).register();
-        FMLCommonHandler.instance().bus().register(this);
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     @Mod.EventHandler
@@ -83,10 +82,7 @@ public class ReplayModOnline {
         // Initial login prompt
         if (!core.getSettingsRegistry().get(Setting.SKIP_LOGIN_PROMPT)) {
             if (!isLoggedIn()) {
-                core.runLater(() -> {
-                    GuiScreen parent = GuiScreen.wrap(getMinecraft().currentScreen);
-                    new GuiLoginPrompt(apiClient, parent, parent, false).display();
-                });
+                new GuiLoginPrompt(apiClient, null, null, 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.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
 import java.util.function.Consumer;
 
-import static com.replaymod.core.utils.Utils.SSL_SOCKET_FACTORY;
-
 public class ApiClient {
 
     private static final Minecraft mc = Minecraft.getMinecraft();
@@ -136,11 +130,7 @@ public class ApiClient {
         QueryBuilder builder = new QueryBuilder(ReplayModApiMethods.get_thumbnail);
         builder.put("id", file);
         URL url = new URL(builder.toString());
-        HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();
-        connection.setSSLSocketFactory(SSL_SOCKET_FACTORY);
-        try (InputStream in = connection.getInputStream()) {
-            return ImageIO.read(in);
-        }
+        return ImageIO.read(url);
     }
 
     private boolean cancelDownload = false;
@@ -153,8 +143,7 @@ public class ApiClient {
         builder.put("id", file);
         String url = builder.toString();
         URL website = new URL(url);
-        HttpsURLConnection con = (HttpsURLConnection) website.openConnection();
-        con.setSSLSocketFactory(SSL_SOCKET_FACTORY);
+        HttpURLConnection con = (HttpURLConnection) website.openConnection();
 
         int fileSize = con.getContentLength();
 

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

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

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

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

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

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

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

@@ -2,7 +2,10 @@ package com.replaymod.online.api.replay.holders;
 
 public enum MinecraftVersion {
 
-    MC_1_8("Minecraft 1.8", "1.8");
+    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");
 
     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.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.*;
 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/online/handler/GuiHandler.java

@@ -14,11 +14,9 @@ import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.io.File;
-import java.util.List;
 
 public class GuiHandler {
     private static final int BUTTON_REPLAY_CENTER = 17890236;
@@ -30,26 +28,23 @@ public class GuiHandler {
     }
 
     public void register() {
-        FMLCommonHandler.instance().bus().register(this);
         MinecraftForge.EVENT_BUS.register(this);
     }
 
     @SubscribeEvent
     public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) {
-        if (!(event.gui instanceof GuiMainMenu)) {
+        if (!(event.getGui() instanceof GuiMainMenu)) {
             return;
         }
 
-        @SuppressWarnings("unchecked")
-        List<GuiButton> buttonList = event.buttonList;
-        GuiButton button = new GuiButton(BUTTON_REPLAY_CENTER, event.gui.width / 2 - 100,
-                event.gui.height / 4 + 10 + 4 * 24, I18n.format("replaymod.gui.replaycenter"));
-        buttonList.add(button);
+        GuiButton button = new GuiButton(BUTTON_REPLAY_CENTER, event.getGui().width / 2 - 100,
+                event.getGui().height / 4 + 10 + 4 * 24, I18n.format("replaymod.gui.replaycenter"));
+        event.getButtonList().add(button);
     }
 
     @SubscribeEvent
     public void injectIntoReplayViewer(GuiScreenEvent.InitGuiEvent.Post event) {
-        AbstractGuiScreen guiScreen = GuiScreen.from(event.gui);
+        AbstractGuiScreen guiScreen = GuiScreen.from(event.getGui());
         if (!(guiScreen instanceof GuiReplayViewer)) {
             return;
         }
@@ -75,15 +70,15 @@ public class GuiHandler {
 
     @SubscribeEvent
     public void onButton(GuiScreenEvent.ActionPerformedEvent.Pre event) {
-        if(!event.button.enabled) return;
+        if(!event.getButton().enabled) return;
 
-        if (event.gui instanceof GuiMainMenu) {
-            if (event.button.id == BUTTON_REPLAY_CENTER) {
+        if (event.getGui() instanceof GuiMainMenu) {
+            if (event.getButton().id == BUTTON_REPLAY_CENTER) {
                 GuiReplayCenter replayCenter = new GuiReplayCenter(mod);
                 if (mod.isLoggedIn()) {
                     replayCenter.display();
                 } else {
-                    new GuiLoginPrompt(mod.getApiClient(), GuiScreen.wrap(event.gui), replayCenter, true).display();
+                    new GuiLoginPrompt(mod.getApiClient(), GuiScreen.wrap(event.getGui()), replayCenter, true).display();
                 }
             }
         }

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.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.container.*;
 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,
-                    new GuiLabel().setI18nText("replaymod.gui.keyframerepo.overwrite").setColor(Colors.BLACK)
-            ).setYesI18nLabel("gui.yes").setNoI18nLabel("gui.no");
-            Utils.addCallback(popup.getFuture(), doIt -> {
-                if (doIt) {
-                    timelines.put(selectedEntry.name, currentTimeline);
-                    overwriteButton.setDisabled();
-                    save();
-                }
-            }, Throwable::printStackTrace);
+            timelines.put(selectedEntry.name, currentTimeline);
+            overwriteButton.setDisabled();
+            save();
         }
     }).setSize(75, 20).setI18nLabel("replaymod.gui.overwrite").setDisabled();
     public final GuiButton saveAsButton = new GuiButton(buttonPanel).onClick(new Runnable() {

src/main/java/com/replaymod/pathing/player/AbstractTimelinePlayer.java

@@ -11,7 +11,7 @@ import com.replaymod.replaystudio.pathing.path.Keyframe;
 import com.replaymod.replaystudio.pathing.path.Path;
 import com.replaymod.replaystudio.pathing.path.Timeline;
 import net.minecraft.client.Minecraft;
-import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import javax.annotation.Nullable;
@@ -65,7 +65,7 @@ public abstract class AbstractTimelinePlayer {
         }
 
         replayHandler.getReplaySender().setSyncModeAndWait();
-        FMLCommonHandler.instance().bus().register(this);
+        MinecraftForge.EVENT_BUS.register(this);
         lastTime = 0;
         mc.timer = new ReplayTimer(mc.timer);
         mc.timer.timerSpeed = 1;
@@ -87,7 +87,7 @@ public abstract class AbstractTimelinePlayer {
             mc.timer = ((ReplayTimer) mc.timer).getWrapped();
             replayHandler.getReplaySender().setReplaySpeed(0);
             replayHandler.getReplaySender().setAsyncMode(true);
-            FMLCommonHandler.instance().bus().unregister(this);
+            MinecraftForge.EVENT_BUS.unregister(this);
             return;
         }
         long time = getTimePassed();

src/main/java/com/replaymod/pathing/player/ReplayTimer.java

@@ -2,7 +2,7 @@ package com.replaymod.pathing.player;
 
 import com.replaymod.core.utils.WrappedTimer;
 import net.minecraft.util.Timer;
-import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.Event;
 
 /**
@@ -20,7 +20,7 @@ public class ReplayTimer extends WrappedTimer {
         copy(this, state); // Save our current state
         super.updateTimer(); // Update current state
         copy(state, this); // Restore our old state
-        FMLCommonHandler.instance().bus().post(new UpdatedEvent());
+        MinecraftForge.EVENT_BUS.post(new UpdatedEvent());
     }
 
     public Timer getWrapped() {

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

@@ -4,10 +4,8 @@ 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.FMLCommonHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -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";
@@ -54,15 +51,12 @@ public class ReplayModRecording {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        EventBus bus = FMLCommonHandler.instance().bus();
+        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/gui/GuiRecordingOverlay.java

@@ -40,7 +40,7 @@ public class GuiRecordingOverlay {
      */
     @SubscribeEvent
     public void renderRecordingIndicator(RenderGameOverlayEvent.Post event) {
-        if (event.type != RenderGameOverlayEvent.ElementType.ALL) return;
+        if (event.getType() != RenderGameOverlayEvent.ElementType.ALL) return;
         if (settingsRegistry.get(Setting.INDICATOR)) {
             FontRenderer fontRenderer = mc.fontRendererObj;
             fontRenderer.drawString(I18n.format("replaymod.gui.recording").toUpperCase(), 30, 18 - (fontRenderer.FONT_HEIGHT / 2), 0xffffffff);

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;
@@ -67,6 +66,9 @@ public class ConnectionEventHandler {
                 worldName = mc.getIntegratedServer().getWorldName();
             } else if (Minecraft.getMinecraft().getCurrentServerData() != null) {
                 worldName = Minecraft.getMinecraft().getCurrentServerData().serverIP;
+            } else if (Minecraft.getMinecraft().isConnectedToRealms()) {
+                // we can't access the server name without tapping too deep in the Realms Library
+                worldName = "A Realms Server";
             } else {
                 logger.info("Recording not started as the world is neither local nor remote (probably a replay).");
                 return;
@@ -75,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

@@ -1,24 +1,22 @@
 package com.replaymod.recording.handler;
 
 import com.replaymod.recording.packet.PacketListener;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import net.minecraft.client.Minecraft;
+import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
+import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.Packet;
-import net.minecraft.network.PacketBuffer;
+import net.minecraft.network.datasync.EntityDataManager;
 import net.minecraft.network.play.server.*;
-import net.minecraft.network.play.server.S14PacketEntity.S17PacketEntityLookMove;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.SoundEvent;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.minecart.MinecartInteractEvent;
 import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
-import net.minecraftforge.event.entity.player.PlayerUseItemEvent;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
@@ -32,24 +30,24 @@ public class RecordingEventHandler {
     private final PacketListener packetListener;
 
     private Double lastX, lastY, lastZ;
-    private ItemStack[] playerItems = new ItemStack[5];
+    private ItemStack[] playerItems = new ItemStack[6];
     private int ticksSinceLastCorrection;
     private boolean wasSleeping;
     private int lastRiding = -1;
     private Integer rotationYawHeadBefore;
+    private boolean wasHandActive;
+    private EnumHand lastActiveHand;
 
     public RecordingEventHandler(PacketListener packetListener) {
         this.packetListener = packetListener;
     }
 
     public void register() {
-        FMLCommonHandler.instance().bus().register(this);
         MinecraftForge.EVENT_BUS.register(this);
         ((RecordingEventSender) mc.renderGlobal).setRecordingEventHandler(this);
     }
 
     public void unregister() {
-        FMLCommonHandler.instance().bus().unregister(this);
         MinecraftForge.EVENT_BUS.unregister(this);
         RecordingEventSender recordingEventSender = ((RecordingEventSender) mc.renderGlobal);
         if (recordingEventSender.getRecordingEventHandler() == this) {
@@ -59,7 +57,7 @@ public class RecordingEventHandler {
 
     public void onPlayerJoin() {
         try {
-            packetListener.save(spawnPlayer(mc.thePlayer));
+            packetListener.save(new SPacketSpawnPlayer(mc.thePlayer));
         } catch(Exception e1) {
             e1.printStackTrace();
         }
@@ -67,39 +65,28 @@ public class RecordingEventHandler {
 
     public void onPlayerRespawn() {
         try {
-            packetListener.save(spawnPlayer(mc.thePlayer));
+            packetListener.save(new SPacketSpawnPlayer(mc.thePlayer));
         } catch(Exception e) {
             e.printStackTrace();
         }
     }
 
-    private S0CPacketSpawnPlayer spawnPlayer(EntityPlayer player) {
+    public void onClientSound(SoundEvent sound, SoundCategory category,
+                              double x, double y, double z, float volume, float pitch) {
         try {
-            S0CPacketSpawnPlayer packet = new S0CPacketSpawnPlayer();
-
-            ByteBuf bb = Unpooled.buffer();
-            PacketBuffer pb = new PacketBuffer(bb);
-
-            pb.writeVarIntToBuffer(player.getEntityId());
-            pb.writeUuid(EntityPlayer.getUUID(player.getGameProfile()));
-
-            pb.writeInt(MathHelper.floor_double(player.posX * 32.0D));
-            pb.writeInt(MathHelper.floor_double(player.posY * 32.0D));
-            pb.writeInt(MathHelper.floor_double(player.posZ * 32.0D));
-            pb.writeByte((byte) ((int) (player.rotationYaw * 256.0F / 360.0F)));
-            pb.writeByte((byte) ((int) (player.rotationPitch * 256.0F / 360.0F)));
-
-            ItemStack itemstack = player.inventory.getCurrentItem();
-            pb.writeShort(itemstack == null ? 0 : Item.getIdFromItem(itemstack.getItem()));
-
-            player.getDataWatcher().writeTo(pb);
-
-            packet.readPacketData(pb);
-
-            return packet;
+            // Send to all other players in ServerWorldEventHandler#playSoundToAllNearExcept
+            packetListener.save(new SPacketSoundEffect(sound, category, x, y, z, volume, pitch));
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void onClientEffect(int type, BlockPos pos, int data) {
+        try {
+            // Send to all other players in ServerWorldEventHandler#playEvent
+            packetListener.save(new SPacketEffect(type, pos, data, false));
         } catch(Exception e) {
             e.printStackTrace();
-            return null;
         }
     }
 
@@ -131,19 +118,14 @@ public class RecordingEventHandler {
             lastZ = e.player.posZ;
 
             Packet packet;
-            if(force || Math.abs(dx) > 4.0 || Math.abs(dy) > 4.0 || Math.abs(dz) > 4.0) {
-                int x = MathHelper.floor_double(e.player.posX * 32.0D);
-                int y = MathHelper.floor_double(e.player.posY * 32.0D);
-                int z = MathHelper.floor_double(e.player.posZ * 32.0D);
-                byte yaw = (byte) ((int) (e.player.rotationYaw * 256.0F / 360.0F));
-                byte pitch = (byte) ((int) (e.player.rotationPitch * 256.0F / 360.0F));
-                packet = new S18PacketEntityTeleport(e.player.getEntityId(), x, y, z, yaw, pitch, e.player.onGround);
+            if (force || Math.abs(dx) > 8.0 || Math.abs(dy) > 8.0 || Math.abs(dz) > 8.0) {
+                packet = new SPacketEntityTeleport(e.player);
             } else {
                 byte newYaw = (byte) ((int) (e.player.rotationYaw * 256.0F / 360.0F));
                 byte newPitch = (byte) ((int) (e.player.rotationPitch * 256.0F / 360.0F));
 
-                packet = new S17PacketEntityLookMove(e.player.getEntityId(),
-                        (byte) Math.round(dx * 32), (byte) Math.round(dy * 32), (byte) Math.round(dz * 32),
+                packet = new SPacketEntity.S17PacketEntityLookMove(e.player.getEntityId(),
+                        (short) Math.round(dx * 4096), (short) Math.round(dy * 4096), (short) Math.round(dz * 4096),
                         newYaw, newPitch, e.player.onGround);
             }
 
@@ -153,37 +135,16 @@ public class RecordingEventHandler {
             int rotationYawHead = ((int)(e.player.rotationYawHead * 256.0F / 360.0F));
 
             if(!Objects.equals(rotationYawHead, rotationYawHeadBefore)) {
-                S19PacketEntityHeadLook head = new S19PacketEntityHeadLook();
-                ByteBuf bb1 = Unpooled.buffer();
-                PacketBuffer pb1 = new PacketBuffer(bb1);
-
-                pb1.writeVarIntToBuffer(e.player.getEntityId());
-                pb1.writeByte(rotationYawHead);
-
-                head.readPacketData(pb1);
-
-                packetListener.save(head);
-
+                packetListener.save(new SPacketEntityHeadLook(e.player, (byte) rotationYawHead));
                 rotationYawHeadBefore = rotationYawHead;
             }
 
-            S12PacketEntityVelocity vel = new S12PacketEntityVelocity(e.player.getEntityId(), e.player.motionX, e.player.motionY, e.player.motionZ);
-            packetListener.save(vel);
+            packetListener.save(new SPacketEntityVelocity(e.player.getEntityId(), e.player.motionX, e.player.motionY, e.player.motionZ));
 
             //Animation Packets
             //Swing Animation
-            if(e.player.swingProgressInt == 1) {
-                S0BPacketAnimation pac = new S0BPacketAnimation();
-
-                ByteBuf bb = Unpooled.buffer();
-                PacketBuffer pb = new PacketBuffer(bb);
-
-                pb.writeVarIntToBuffer(e.player.getEntityId());
-                pb.writeByte(0);
-
-                pac.readPacketData(pb);
-
-                packetListener.save(pac);
+            if (e.player.isSwingInProgress && e.player.swingProgressInt == -1) {
+                packetListener.save(new SPacketAnimation(e.player, e.player.swingingHand == EnumHand.MAIN_HAND ? 0 : 3));
             }
 
 			/*
@@ -207,77 +168,64 @@ public class RecordingEventHandler {
 			 */
 
             //Inventory Handling
-            if(playerItems[0] != mc.thePlayer.getHeldItem()) {
-                playerItems[0] = mc.thePlayer.getHeldItem();
-                S04PacketEntityEquipment pee = new S04PacketEntityEquipment(e.player.getEntityId(), 0, playerItems[0]);
-                packetListener.save(pee);
+            if (playerItems[0] != mc.thePlayer.getHeldItem(EnumHand.MAIN_HAND)) {
+                playerItems[0] = mc.thePlayer.getHeldItem(EnumHand.MAIN_HAND);
+                packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.MAINHAND, playerItems[0]));
             }
 
-            if(playerItems[1] != mc.thePlayer.inventory.armorInventory[0]) {
-                playerItems[1] = mc.thePlayer.inventory.armorInventory[0];
-                S04PacketEntityEquipment pee = new S04PacketEntityEquipment(e.player.getEntityId(), 1, playerItems[1]);
-                packetListener.save(pee);
+            if (playerItems[1] != mc.thePlayer.getHeldItem(EnumHand.OFF_HAND)) {
+                playerItems[1] = mc.thePlayer.getHeldItem(EnumHand.OFF_HAND);
+                packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.OFFHAND, playerItems[1]));
             }
 
-            if(playerItems[2] != mc.thePlayer.inventory.armorInventory[1]) {
-                playerItems[2] = mc.thePlayer.inventory.armorInventory[1];
-                S04PacketEntityEquipment pee = new S04PacketEntityEquipment(e.player.getEntityId(), 2, playerItems[2]);
-                packetListener.save(pee);
+            if (playerItems[2] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET)) {
+                playerItems[2] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.FEET);
+                packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.FEET, playerItems[2]));
             }
 
-            if(playerItems[3] != mc.thePlayer.inventory.armorInventory[2]) {
-                playerItems[3] = mc.thePlayer.inventory.armorInventory[2];
-                S04PacketEntityEquipment pee = new S04PacketEntityEquipment(e.player.getEntityId(), 3, playerItems[3]);
-                packetListener.save(pee);
+            if (playerItems[3] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS)) {
+                playerItems[3] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.LEGS);
+                packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.LEGS, playerItems[3]));
             }
 
-            if(playerItems[4] != mc.thePlayer.inventory.armorInventory[3]) {
-                playerItems[4] = mc.thePlayer.inventory.armorInventory[3];
-                S04PacketEntityEquipment pee = new S04PacketEntityEquipment(e.player.getEntityId(), 4, playerItems[4]);
-                packetListener.save(pee);
+            if (playerItems[4] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST)) {
+                playerItems[4] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
+                packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.CHEST, playerItems[4]));
+            }
+
+            if (playerItems[5] != mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD)) {
+                playerItems[5] = mc.thePlayer.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
+                packetListener.save(new SPacketEntityEquipment(e.player.getEntityId(), EntityEquipmentSlot.HEAD, playerItems[5]));
             }
 
             //Leaving Ride
 
             if((!mc.thePlayer.isRiding() && lastRiding != -1) ||
-                    (mc.thePlayer.isRiding() && lastRiding != mc.thePlayer.ridingEntity.getEntityId())) {
+                    (mc.thePlayer.isRiding() && lastRiding != mc.thePlayer.getRidingEntity().getEntityId())) {
                 if(!mc.thePlayer.isRiding()) {
                     lastRiding = -1;
                 } else {
-                    lastRiding = mc.thePlayer.ridingEntity.getEntityId();
+                    lastRiding = mc.thePlayer.getRidingEntity().getEntityId();
                 }
-
-                S1BPacketEntityAttach pea = new S1BPacketEntityAttach();
-
-                ByteBuf buf = Unpooled.buffer();
-                PacketBuffer pbuf = new PacketBuffer(buf);
-
-                pbuf.writeInt(e.player.getEntityId());
-                pbuf.writeInt(lastRiding);
-                pbuf.writeBoolean(false);
-
-                pea.readPacketData(pbuf);
-
-                packetListener.save(pea);
+                packetListener.save(new SPacketEntityAttach(e.player, e.player.getRidingEntity()));
             }
 
             //Sleeping
             if(!mc.thePlayer.isPlayerSleeping() && wasSleeping) {
-                S0BPacketAnimation pac = new S0BPacketAnimation();
-
-                ByteBuf bb = Unpooled.buffer();
-                PacketBuffer pb = new PacketBuffer(bb);
-
-                pb.writeVarIntToBuffer(e.player.getEntityId());
-                pb.writeByte(2);
-
-                pac.readPacketData(pb);
-
-                packetListener.save(pac);
-
+                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) {
+                wasHandActive = mc.thePlayer.isHandActive();
+                lastActiveHand = mc.thePlayer.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));
+            }
+
         } catch(Exception e1) {
             e1.printStackTrace();
         }
@@ -286,27 +234,8 @@ public class RecordingEventHandler {
     @SubscribeEvent
     public void onPickupItem(ItemPickupEvent event) {
         try {
-            packetListener.save(new S0DPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId()));
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @SubscribeEvent
-    public void onStartEating(PlayerUseItemEvent.Start event) {
-        try {
-            if(!event.entityPlayer.isEating()) return;
-            S0BPacketAnimation packet = new S0BPacketAnimation();
-
-            ByteBuf bb = Unpooled.buffer();
-            PacketBuffer pb = new PacketBuffer(bb);
-
-            pb.writeVarIntToBuffer(event.entityPlayer.getEntityId());
-            pb.writeByte(3);
-
-            packet.readPacketData(pb);
-
-            packetListener.save(packet);
+            packetListener.save(new SPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId(),
+                    event.pickedUp.getEntityItem().getMaxStackSize()));
         } catch(Exception e) {
             e.printStackTrace();
         }
@@ -315,21 +244,11 @@ public class RecordingEventHandler {
     @SubscribeEvent
     public void onSleep(PlayerSleepInBedEvent event) {
         try {
-            if(event.entityPlayer != mc.thePlayer) {
+            if (event.getEntityPlayer() != mc.thePlayer) {
                 return;
             }
 
-            S0APacketUseBed pub = new S0APacketUseBed();
-
-            ByteBuf buf = Unpooled.buffer();
-            PacketBuffer pbuf = new PacketBuffer(buf);
-
-            pbuf.writeVarIntToBuffer(event.entityPlayer.getEntityId());
-            pbuf.writeBlockPos(event.pos);
-
-            pub.readPacketData(pbuf);
-
-            packetListener.save(pub);
+            packetListener.save(new SPacketUseBed(event.getEntityPlayer(), event.getPos()));
 
             wasSleeping = true;
 
@@ -341,24 +260,13 @@ public class RecordingEventHandler {
     @SubscribeEvent
     public void enterMinecart(MinecartInteractEvent event) {
         try {
-            if(event.player != mc.thePlayer) {
+            if(event.getEntity() != mc.thePlayer) {
                 return;
             }
 
-            S1BPacketEntityAttach pea = new S1BPacketEntityAttach();
+            packetListener.save(new SPacketEntityAttach(event.getPlayer(), event.getMinecart()));
 
-            ByteBuf buf = Unpooled.buffer();
-            PacketBuffer pbuf = new PacketBuffer(buf);
-
-            pbuf.writeInt(event.player.getEntityId());
-            pbuf.writeInt(event.minecart.getEntityId());
-            pbuf.writeBoolean(false);
-
-            pea.readPacketData(pbuf);
-
-            packetListener.save(pea);
-
-            lastRiding = event.minecart.getEntityId();
+            lastRiding = event.getMinecart().getEntityId();
         } catch(Exception e) {
             e.printStackTrace();
         }
@@ -367,7 +275,7 @@ public class RecordingEventHandler {
     public void onBlockBreakAnim(int breakerId, BlockPos pos, int progress) {
         EntityPlayer thePlayer = mc.thePlayer;
         if (thePlayer != null && breakerId == thePlayer.getEntityId()) {
-            packetListener.save(new S25PacketBlockBreakAnim(breakerId, pos, progress));
+            packetListener.save(new SPacketBlockBreakAnim(breakerId, pos, progress));
         }
     }
 

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

@@ -4,15 +4,14 @@ import com.replaymod.recording.handler.RecordingEventHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.client.network.NetworkPlayerInfo;
-import net.minecraft.network.play.server.S07PacketRespawn;
-import net.minecraft.network.play.server.S38PacketPlayerListItem;
+import net.minecraft.network.play.server.SPacketPlayerListItem;
+import net.minecraft.network.play.server.SPacketRespawn;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -37,18 +36,16 @@ public abstract class MixinNetHandlerPlayClient {
      * @param ci Callback info
      */
     @Inject(method = "handlePlayerListItem", at=@At("HEAD"))
-    public void recordOwnJoin(S38PacketPlayerListItem packet, CallbackInfo ci) {
+    public void recordOwnJoin(SPacketPlayerListItem packet, CallbackInfo ci) {
         if (gameController.thePlayer == null) return;
 
         RecordingEventHandler handler = getRecordingEventHandler();
-        if (handler != null && packet.func_179768_b() == S38PacketPlayerListItem.Action.ADD_PLAYER) {
-            @SuppressWarnings("unchecked")
-            List<S38PacketPlayerListItem.AddPlayerData> dataList = packet.func_179767_a();
-            for (S38PacketPlayerListItem.AddPlayerData data : dataList) {
-                if (data.func_179962_a() == null || data.func_179962_a().getId() == null) continue;
+        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.func_179962_a().getId().equals(Minecraft.getMinecraft().thePlayer.getGameProfile().getId())
-                        && !playerInfoMap.containsKey(data.func_179962_a().getId())) {
+                if (data.getProfile().getId().equals(Minecraft.getMinecraft().thePlayer.getGameProfile().getId())
+                        && !playerInfoMap.containsKey(data.getProfile().getId())) {
                     handler.onPlayerJoin();
                 }
             }
@@ -58,12 +55,12 @@ public abstract class MixinNetHandlerPlayClient {
     /**
      * Record the own player entity respawning.
      * We cannot use the {@link net.minecraftforge.event.entity.EntityJoinWorldEvent} because that would also include
-     * the first spawn which is already handled by {@link #recordOwnJoin(S38PacketPlayerListItem, CallbackInfo)}.
+     * the first spawn which is already handled by {@link #recordOwnJoin(SPacketPlayerListItem, CallbackInfo)}.
      * @param packet The packet
      * @param ci Callback info
      */
     @Inject(method = "handleRespawn", at=@At("RETURN"))
-    public void recordOwnRespawn(S07PacketRespawn packet, CallbackInfo ci) {
+    public void recordOwnRespawn(SPacketRespawn packet, CallbackInfo ci) {
         RecordingEventHandler handler = getRecordingEventHandler();
         if (handler != null) {
             handler.onPlayerRespawn();

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

@@ -0,0 +1,28 @@
+package com.replaymod.recording.mixin;
+
+import com.replaymod.recording.handler.RecordingEventHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(PlayerControllerMP.class)
+public abstract class MixinPlayerControllerMP implements RecordingEventHandler.RecordingEventSender {
+
+    @Shadow
+    private Minecraft mc;
+
+    // Redirects the call to playEvent without the initial player argument to the method with that argument
+    // The new method will then play it and (if applicable) record it. (See MixinWorldClient)
+    // This is necessary for the block break event (particles and sound) to be recorded. Otherwise it looks like the
+    // event was emitted because of a packet (player will be null) and not as it actually was (by the player).
+    @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);
+    }
+}

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

@@ -2,7 +2,7 @@ package com.replaymod.recording.mixin;
 
 import com.replaymod.recording.handler.RecordingEventHandler;
 import net.minecraft.client.renderer.RenderGlobal;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

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

@@ -0,0 +1,62 @@
+package com.replaymod.recording.mixin;
+
+import com.replaymod.recording.handler.RecordingEventHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.profiler.Profiler;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.SoundEvent;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldProvider;
+import net.minecraft.world.storage.ISaveHandler;
+import net.minecraft.world.storage.WorldInfo;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(WorldClient.class)
+public abstract class MixinWorldClient extends World implements RecordingEventHandler.RecordingEventSender {
+    @Shadow
+    private Minecraft mc;
+
+    protected MixinWorldClient(ISaveHandler saveHandlerIn, WorldInfo info, WorldProvider providerIn, Profiler profilerIn, boolean client) {
+        super(saveHandlerIn, info, providerIn, profilerIn, client);
+    }
+
+    private RecordingEventHandler replayModRecording_getRecordingEventHandler() {
+        return ((RecordingEventHandler.RecordingEventSender) mc.renderGlobal).getRecordingEventHandler();
+    }
+
+    // Sounds that are emitted by thePlayer no longer take the long way over the server
+    // but are instead played directly by the client. The server only sends these sounds to
+    // other clients so we have to record them manually.
+    // E.g. Block place sounds
+    @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) {
+            RecordingEventHandler handler = replayModRecording_getRecordingEventHandler();
+            if (handler != null) {
+                handler.onClientSound(sound, category, x, y, z, volume, pitch);
+            }
+        }
+    }
+
+    // Same goes for level events (also called effects). E.g. door open, block break, etc.
+    // 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) {
+            // We caused this event, the server won't send it to us
+            RecordingEventHandler handler = replayModRecording_getRecordingEventHandler();
+            if (handler != null) {
+                handler.onClientEffect(type, pos, data);
+            }
+        }
+        super.playEvent(player, type, pos, data);
+    }
+}

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

@@ -9,21 +9,24 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import net.minecraft.client.Minecraft;
-import net.minecraft.entity.DataWatcher;
 import net.minecraft.entity.Entity;
 import net.minecraft.network.EnumConnectionState;
 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.*;
-import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.fml.common.network.internal.FMLProxyPacket;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -84,16 +87,13 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
 
     public void save(Packet packet) {
         try {
-            if(packet instanceof S0CPacketSpawnPlayer) {
-                UUID uuid = ((S0CPacketSpawnPlayer) packet).func_179819_c();
+            if(packet instanceof SPacketSpawnPlayer) {
+                UUID uuid = ((SPacketSpawnPlayer) packet).getUniqueId();
                 Set<String> uuids = new HashSet<>(Arrays.asList(metaData.getPlayers()));
                 uuids.add(uuid.toString());
                 metaData.setPlayers(uuids.toArray(new String[uuids.size()]));
                 saveMetaData();
             }
-            if (packet instanceof S46PacketSetCompressionLevel) {
-                return; // Replay data is never compressed on the packet level
-            }
 
             byte[] bytes = getPacketData(packet);
             long now = System.currentTimeMillis();
@@ -154,16 +154,16 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
             try {
                 Packet packet = (Packet) msg;
 
-                if(packet instanceof S0DPacketCollectItem) {
+                if(packet instanceof SPacketCollectItem) {
                     if(mc.thePlayer != null ||
-                            ((S0DPacketCollectItem) packet).func_149353_d() == mc.thePlayer.getEntityId()) {
+                            ((SPacketCollectItem) packet).getEntityID() == mc.thePlayer.getEntityId()) {
                         super.channelRead(ctx, msg);
                         return;
                     }
                 }
 
-                if (packet instanceof S48PacketResourcePackSend) {
-                    save(resourcePackRecorder.handleResourcePack((S48PacketResourcePackSend) packet));
+                if (packet instanceof SPacketResourcePackSend) {
+                    save(resourcePackRecorder.handleResourcePack((SPacketResourcePackSend) packet));
                     return;
                 }
 
@@ -176,10 +176,10 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
 
                 save(packet);
 
-                if (packet instanceof S3FPacketCustomPayload) {
-                    S3FPacketCustomPayload p = (S3FPacketCustomPayload) packet;
+                if (packet instanceof SPacketCustomPayload) {
+                    SPacketCustomPayload p = (SPacketCustomPayload) packet;
                     if (Restrictions.PLUGIN_CHANNEL.equals(p.getChannelName())) {
-                        packet = new S40PacketDisconnect(new ChatComponentText("Please update to view this replay."));
+                        packet = new SPacketDisconnect(new TextComponentString("Please update to view this replay."));
                         save(packet);
                     }
                 }
@@ -192,27 +192,31 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
         super.channelRead(ctx, msg);
     }
 
+    private <T> void DataManager_set(EntityDataManager dataManager, EntityDataManager.DataEntry<T> entry) {
+        dataManager.register(entry.getKey(), entry.getValue());
+    }
+
     @SuppressWarnings("unchecked")
     private byte[] getPacketData(Packet packet) throws IOException {
-        if(packet instanceof S0FPacketSpawnMob) {
-            S0FPacketSpawnMob p = (S0FPacketSpawnMob) packet;
-            if (p.field_149043_l == null) {
-                p.field_149043_l = new DataWatcher(null);
-                if(p.func_149027_c() != null) {
-                    for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>) p.func_149027_c()) {
-                        p.field_149043_l.addObject(wo.getDataValueId(), wo.getObject());
+        if (packet instanceof SPacketSpawnMob) {
+            SPacketSpawnMob p = (SPacketSpawnMob) packet;
+            if (p.dataManager == null) {
+                p.dataManager = new EntityDataManager(null);
+                if (p.getDataManagerEntries() != null) {
+                    for (EntityDataManager.DataEntry<?> entry : p.getDataManagerEntries()) {
+                        DataManager_set(p.dataManager, entry);
                     }
                 }
             }
         }
 
-        if(packet instanceof S0CPacketSpawnPlayer) {
-            S0CPacketSpawnPlayer p = (S0CPacketSpawnPlayer) packet;
-            if (p.field_148960_i == null) {
-                p.field_148960_i = new DataWatcher(null);
-                if(p.func_148944_c() != null) {
-                    for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>) p.func_148944_c()) {
-                        p.field_148960_i.addObject(wo.getDataValueId(), wo.getObject());
+        if (packet instanceof SPacketSpawnPlayer) {
+            SPacketSpawnPlayer p = (SPacketSpawnPlayer) packet;
+            if (p.watcher == null) {
+                p.watcher = new EntityDataManager(null);
+                if (p.getDataManagerEntries() != null) {
+                    for (EntityDataManager.DataEntry<?> entry : p.getDataManagerEntries()) {
+                        DataManager_set(p.watcher, entry);
                     }
                 }
             }

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

@@ -9,15 +9,14 @@ import com.replaymod.replaystudio.replay.ReplayFile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreenWorking;
 import net.minecraft.client.gui.GuiYesNo;
-import net.minecraft.client.gui.GuiYesNoCallback;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.multiplayer.ServerList;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.resources.ResourcePackRepository;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.client.C19PacketResourcePackStatus;
-import net.minecraft.network.play.server.S48PacketResourcePackSend;
+import net.minecraft.network.play.client.CPacketResourcePackStatus;
+import net.minecraft.network.play.server.SPacketResourcePackSend;
 import net.minecraft.util.HttpUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
@@ -27,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;
 
 /**
@@ -54,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;
@@ -75,12 +70,12 @@ public class ResourcePackRecorder {
         }
     }
 
-    public synchronized S48PacketResourcePackSend handleResourcePack(S48PacketResourcePackSend packet) {
+    public synchronized SPacketResourcePackSend handleResourcePack(SPacketResourcePackSend packet) {
         final int requestId = nextRequestId++;
-        final NetHandlerPlayClient netHandler = mc.getNetHandler();
+        final NetHandlerPlayClient netHandler = mc.getConnection();
         final NetworkManager netManager = netHandler.getNetworkManager();
-        final String url = packet.func_179783_a();
-        final String hash = packet.func_179784_b();
+        final String url = packet.getURL();
+        final String hash = packet.getHash();
 
         if (url.startsWith("level://")) {
             String levelName = url.substring("level://".length());
@@ -88,65 +83,60 @@ public class ResourcePackRecorder {
             final File levelDir = new File(savesDir, levelName);
 
             if (levelDir.isFile()) {
-                netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.ACCEPTED));
-                Futures.addCallback(mc.getResourcePackRepository().func_177319_a(levelDir), new FutureCallback() {
+                netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED));
+                Futures.addCallback(mc.getResourcePackRepository().setResourcePackInstance(levelDir), new FutureCallback<Object>() {
                     @Override
                     public void onSuccess(Object result) {
                         recordResourcePack(levelDir, requestId);
-                        netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
+                        netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
                     }
 
                     @Override
                     public void onFailure(@Nonnull Throwable throwable) {
-                        netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
+                        netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.FAILED_DOWNLOAD));
                     }
                 });
             } else {
-                netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
+                netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.FAILED_DOWNLOAD));
             }
         } else {
             final ServerData serverData = mc.getCurrentServerData();
             if (serverData != null && serverData.getResourceMode() == ServerData.ServerResourceMode.ENABLED) {
-                netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.ACCEPTED));
+                netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED));
                 downloadResourcePackFuture(requestId, url, hash);
             } else if (serverData != null && serverData.getResourceMode() != ServerData.ServerResourceMode.PROMPT) {
-                netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.DECLINED));
+                netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.DECLINED));
             } else {
-                // Lambdas MUST NOT be used with methods that need re-obfuscation in FG prior to 2.2 (will result in AbstractMethodError)
-                //noinspection Convert2Lambda
-                mc.addScheduledTask(() -> mc.displayGuiScreen(new GuiYesNo(new GuiYesNoCallback() {
-                    @Override
-                    public void confirmClicked(boolean result, int id) {
-                        if (serverData != null) {
-                            serverData.setResourceMode(result ? ServerData.ServerResourceMode.ENABLED : ServerData.ServerResourceMode.DISABLED);
-                        }
-                        if (result) {
-                            netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.ACCEPTED));
-                            ResourcePackRecorder.this.downloadResourcePackFuture(requestId, url, hash);
-                        } else {
-                            netManager.sendPacket(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.DECLINED));
-                        }
-
-                        ServerList.func_147414_b(serverData);
-                        mc.displayGuiScreen(null);
+                mc.addScheduledTask(() -> mc.displayGuiScreen(new GuiYesNo((result, id) -> {
+                    if (serverData != null) {
+                        serverData.setResourceMode(result ? ServerData.ServerResourceMode.ENABLED : ServerData.ServerResourceMode.DISABLED);
                     }
+                    if (result) {
+                        netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.ACCEPTED));
+                        downloadResourcePackFuture(requestId, url, hash);
+                    } else {
+                        netManager.sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.DECLINED));
+                    }
+
+                    ServerList.saveSingleServer(serverData);
+                    mc.displayGuiScreen(null);
                 }, I18n.format("multiplayer.texturePrompt.line1"), I18n.format("multiplayer.texturePrompt.line2"), 0)));
             }
         }
 
-        return new S48PacketResourcePackSend("replay://" + requestId, "");
+        return new SPacketResourcePackSend("replay://" + requestId, "");
     }
 
     private void downloadResourcePackFuture(int requestId, String url, final String hash) {
         Futures.addCallback(downloadResourcePack(requestId, url, hash), new FutureCallback() {
             @Override
             public void onSuccess(Object result) {
-                mc.getNetHandler().addToSendQueue(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
+                mc.getConnection().sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.SUCCESSFULLY_LOADED));
             }
 
             @Override
             public void onFailure(@Nonnull Throwable throwable) {
-                mc.getNetHandler().addToSendQueue(new C19PacketResourcePackStatus(hash, C19PacketResourcePackStatus.Action.FAILED_DOWNLOAD));
+                mc.getConnection().sendPacket(new CPacketResourcePackStatus(CPacketResourcePackStatus.Action.FAILED_DOWNLOAD));
             }
         });
     }
@@ -171,16 +161,16 @@ public class ResourcePackRecorder {
         }
 
         final File file = new File(repo.dirServerResourcepacks, fileName);
-        repo.field_177321_h.lock();
+        repo.lock.lock();
         try {
-            repo.func_148529_f();
+            repo.clearResourcePack();
 
             if (file.exists() && hash.length() == 40) {
                 try {
                     String fileHash = Hashing.sha1().hashBytes(Files.toByteArray(file)).toString();
                     if (fileHash.equals(hash)) {
                         recordResourcePack(file, requestId);
-                        return repo.func_177319_a(file);
+                        return repo.setResourcePackInstance(file);
                     }
 
                     logger.warn("File " + file + " had wrong hash (expected " + hash + ", found " + fileHash + "). Deleting it.");
@@ -196,13 +186,13 @@ public class ResourcePackRecorder {
 
             Futures.getUnchecked(mc.addScheduledTask(() -> mc.displayGuiScreen(guiScreen)));
 
-            Map sessionInfo = Minecraft.getSessionInfo();
-            repo.field_177322_i = HttpUtil.func_180192_a(file, url, sessionInfo, 50 * 1024 * 1024, guiScreen, mc.getProxy());
-            Futures.addCallback(repo.field_177322_i, new FutureCallback() {
+            Map<String, String> sessionInfo = ResourcePackRepository.getDownloadHeaders();
+            repo.downloadingPacks = HttpUtil.downloadResourcePack(file, url, sessionInfo, 50 * 1024 * 1024, guiScreen, mc.getProxy());
+            Futures.addCallback(repo.downloadingPacks, new FutureCallback<Object>() {
                 @Override
                 public void onSuccess(Object value) {
                     recordResourcePack(file, requestId);
-                    repo.func_177319_a(file);
+                    repo.setResourcePackInstance(file);
                 }
 
                 @Override
@@ -210,9 +200,9 @@ public class ResourcePackRecorder {
                     throwable.printStackTrace();
                 }
             });
-            return repo.field_177322_i;
+            return repo.downloadingPacks;
         } finally {
-            repo.field_177321_h.unlock();
+            repo.lock.unlock();
         }
     }
 

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

@@ -5,8 +5,8 @@ import com.replaymod.render.utils.RenderJob;
 import com.replaymod.replay.events.ReplayCloseEvent;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.util.ReportedException;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -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";
@@ -46,7 +45,7 @@ public class ReplayModRender {
         core = ReplayMod.instance;
         configuration = new Configuration(event.getSuggestedConfigurationFile());
 
-        FMLCommonHandler.instance().bus().register(this);
+        MinecraftForge.EVENT_BUS.register(this);
 
         core.getSettingsRegistry().register(Setting.class);
     }

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 {
-        this.renderer = renderer;
-        this.settings = renderer.getRenderSettings();
+    public VideoWriter(final RenderSettings settings) throws IOException {
+        this.settings = settings;
 
         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();
-        } catch (IOException e) {
-            throw new NoFFmpegException(e);
-        }
+        process = new ProcessBuilder(cmdline).directory(outputFolder).start();
         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);
-    }
-
-    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;
-        }
+        throw new IllegalStateException("No output file found.");
     }
 }

src/main/java/com/replaymod/render/capturer/ODSFrameCapturer.java

@@ -75,9 +75,9 @@ public class ODSFrameCapturer implements FrameCapturer<ODSOpenGlFrame> {
             linkState(1, "lightMapEnabled");
             linkState(2, "hurtTextureEnabled");
             final Program.Uniform uniform = shaderProgram.getUniformVariable("fogEnabled");
-            previousFogState = GlStateManager.fogState.field_179049_a;
+            previousFogState = GlStateManager.fogState.fog;
             uniform.set(previousFogState.currentState);
-            GlStateManager.fogState.field_179049_a = new BooleanState(previousFogState.capability) {
+            GlStateManager.fogState.fog = new BooleanState(previousFogState.capability) {
                 @Override
                 public void setState(boolean state) {
                     super.setState(state);
@@ -135,7 +135,7 @@ public class ODSFrameCapturer implements FrameCapturer<ODSOpenGlFrame> {
         for (int i = 0; i < 3; i++) {
             GlStateManager.textureState[i].texture2DState = previousStates[i];
         }
-        GlStateManager.fogState.field_179049_a = previousFogState;
+        GlStateManager.fogState.fog = previousFogState;
     }
 
     private class CubicStereoFrameCapturer extends CubicPboOpenGlFrameCapturer {

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 ReplayHandler replayHandler;
+    private final GuiContainer container;
     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 videoHeight = new GuiNumberField().setSize(50, 20).setMinValue(1).setValidateOnFocusChange(true);
+    public final GuiNumberField videoWidth = new GuiNumberField().setSize(50, 20).setMinValue(1);
+    public final GuiNumberField videoHeight = new GuiNumberField().setSize(50, 20).setMinValue(1);
     public final GuiSlider frameRateSlider = new GuiSlider().onValueChanged(new Runnable() {
         @Override
         public void run() {
@@ -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) {
-                LOGGER.error("Rendering video:", e);
+            } catch (IOException 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"), () -> {});
-                display(); // Re-show the render settings gui and the new error popup
+                CrashReport crashReport = CrashReport.makeCrashReport(t, "Rendering video");
+                throw new ReportedException(crashReport);
             }
         }
     }).setSize(100, 20).setI18nLabel("replaymod.gui.render");

src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java

@@ -10,13 +10,13 @@ import net.minecraft.client.renderer.chunk.RenderChunk;
 
 import java.lang.reflect.Field;
 import java.util.Iterator;
-import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.PriorityBlockingQueue;
 
 public class ChunkLoadingRenderGlobal {
 
     private final RenderGlobal hooked;
     private final ChunkRenderDispatcher renderDispatcher;
-    private final JailingQueue<?> workerJailingQueue;
+    private final JailingQueue<ChunkCompileTaskGenerator> workerJailingQueue;
     private final CustomChunkRenderWorker renderWorker;
     private int frame;
 
@@ -27,10 +27,10 @@ public class ChunkLoadingRenderGlobal {
         this.renderWorker = new CustomChunkRenderWorker(renderDispatcher, new RegionRenderCacheBuilder());
 
         int workerThreads = renderDispatcher.listThreadedWorkers.size();
-        BlockingQueue<Object> queueChunkUpdates = renderDispatcher.queueChunkUpdates;
+        PriorityBlockingQueue<ChunkCompileTaskGenerator> queueChunkUpdates = renderDispatcher.queueChunkUpdates;
         workerJailingQueue = new JailingQueue<>(queueChunkUpdates);
         renderDispatcher.queueChunkUpdates = workerJailingQueue;
-        ChunkCompileTaskGenerator element = new ChunkCompileTaskGenerator(null, null);
+        ChunkCompileTaskGenerator element = new ChunkCompileTaskGenerator(null, null, 0);
         element.finish();
         for (int i = 0; i < workerThreads; i++) {
             queueChunkUpdates.add(element);
@@ -51,7 +51,6 @@ public class ChunkLoadingRenderGlobal {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public void updateChunks() {
         while (renderDispatcher.runChunkUploads(0)) {
             hooked.displayListEntitiesDirty = true;
@@ -59,7 +58,7 @@ public class ChunkLoadingRenderGlobal {
 
         while (!renderDispatcher.queueChunkUpdates.isEmpty()) {
             try {
-                renderWorker.processTask((ChunkCompileTaskGenerator) renderDispatcher.queueChunkUpdates.poll());
+                renderWorker.processTask(renderDispatcher.queueChunkUpdates.poll());
             } catch (InterruptedException ignored) { }
         }
 
@@ -69,7 +68,7 @@ public class ChunkLoadingRenderGlobal {
 
             renderDispatcher.updateChunkNow(renderchunk);
 
-            renderchunk.setNeedsUpdate(false);
+            renderchunk.clearNeedsUpdate();
             iterator.remove();
         }
     }

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/MixinEffectRenderer.java

@@ -1,47 +0,0 @@
-package com.replaymod.render.mixin;
-
-import com.replaymod.render.hooks.EntityRendererHandler;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.client.particle.EntityFX;
-import net.minecraft.client.renderer.WorldRenderer;
-import net.minecraft.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(EffectRenderer.class)
-public abstract class MixinEffectRenderer {
-    @Redirect(method = "renderParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/EntityFX;func_180434_a(Lnet/minecraft/client/renderer/WorldRenderer;Lnet/minecraft/entity/Entity;FFFFFF)V"))
-    private void renderNormalParticle(EntityFX fx, WorldRenderer worldRenderer, Entity view, float partialTicks,
-                                float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) {
-        renderParticle(fx, worldRenderer, view, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
-    }
-
-    @Redirect(method = "renderLitParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/EntityFX;func_180434_a(Lnet/minecraft/client/renderer/WorldRenderer;Lnet/minecraft/entity/Entity;FFFFFF)V"))
-    private void renderLitParticle(EntityFX fx, WorldRenderer worldRenderer, Entity view, float partialTicks,
-                                 float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) {
-        renderParticle(fx, worldRenderer, view, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
-    }
-
-    private void renderParticle(EntityFX fx, WorldRenderer worldRenderer, Entity view, float partialTicks,
-                                 float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) {
-        EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
-        if (handler != null && handler.omnidirectional) {
-            // Align all particles towards the camera
-            double dx = fx.prevPosX + (fx.posX - fx.prevPosX) * partialTicks - view.posX;
-            double dy = fx.prevPosY + (fx.posY - fx.prevPosY) * partialTicks - view.posY;
-            double dz = fx.prevPosZ + (fx.posZ - fx.prevPosZ) * partialTicks - view.posZ;
-            double pitch = -Math.atan2(dy, Math.sqrt(dx * dx + dz * dz));
-            double yaw = -Math.atan2(dx, dz);
-
-            rotX = (float) Math.cos(yaw);
-            rotZ = (float) Math.sin(yaw);
-            rotXZ = (float) Math.cos(pitch);
-
-            rotYZ = (float) (-rotZ * Math.sin(pitch));
-            rotXY = (float) (rotX * Math.sin(pitch));
-        }
-        fx.func_180434_a(worldRenderer, view, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
-    }
-}

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

@@ -12,7 +12,7 @@ import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.settings.GameSettings;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.math.RayTraceResult;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.ReadableColor;
 import org.lwjgl.util.glu.Project;
@@ -118,10 +118,10 @@ public abstract class MixinEntityRenderer implements EntityRendererHandler.IEnti
     @Shadow
     public abstract void renderHand(float partialTicks, int renderPass);
 
-    @Redirect(method = "renderWorldPass", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;drawSelectionBox(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/MovingObjectPosition;IF)V"))
-    private void replayModRender_drawSelectionBox(RenderGlobal instance, EntityPlayer player, MovingObjectPosition mop, int alwaysZero, float partialTicks) {
+    @Redirect(method = "renderWorldPass", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;drawSelectionBox(Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/math/RayTraceResult;IF)V"))
+    private void replayModRender_drawSelectionBox(RenderGlobal instance, EntityPlayer player, RayTraceResult rtr, int alwaysZero, float partialTicks) {
         if (replayModRender_handler == null) {
-            instance.drawSelectionBox(player, mop, alwaysZero, partialTicks);
+            instance.drawSelectionBox(player, rtr, alwaysZero, partialTicks);
         }
     }
 

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/mixin/MixinParticleManager.java

@@ -0,0 +1,47 @@
+package com.replaymod.render.mixin;
+
+import com.replaymod.render.hooks.EntityRendererHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.particle.ParticleManager;
+import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ParticleManager.class)
+public abstract class MixinParticleManager {
+    @Redirect(method = "renderParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/Particle;renderParticle(Lnet/minecraft/client/renderer/VertexBuffer;Lnet/minecraft/entity/Entity;FFFFFF)V"))
+    private void renderNormalParticle(Particle particle, VertexBuffer vertexBuffer, Entity view, float partialTicks,
+                                      float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) {
+        renderParticle(particle, vertexBuffer, view, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
+    }
+
+    @Redirect(method = "renderLitParticles", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/Particle;renderParticle(Lnet/minecraft/client/renderer/VertexBuffer;Lnet/minecraft/entity/Entity;FFFFFF)V"))
+    private void renderLitParticle(Particle particle, VertexBuffer vertexBuffer, Entity view, float partialTicks,
+                                 float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) {
+        renderParticle(particle, vertexBuffer, view, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
+    }
+
+    private void renderParticle(Particle particle, VertexBuffer vertexBuffer, Entity view, float partialTicks,
+                                 float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) {
+        EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
+        if (handler != null && handler.omnidirectional) {
+            // Align all particles towards the camera
+            double dx = particle.prevPosX + (particle.posX - particle.prevPosX) * partialTicks - view.posX;
+            double dy = particle.prevPosY + (particle.posY - particle.prevPosY) * partialTicks - view.posY;
+            double dz = particle.prevPosZ + (particle.posZ - particle.prevPosZ) * partialTicks - view.posZ;
+            double pitch = -Math.atan2(dy, Math.sqrt(dx * dx + dz * dz));
+            double yaw = -Math.atan2(dx, dz);
+
+            rotX = (float) Math.cos(yaw);
+            rotZ = (float) Math.sin(yaw);
+            rotXZ = (float) Math.cos(pitch);
+
+            rotYZ = (float) (-rotZ * Math.sin(pitch));
+            rotXY = (float) (rotX * Math.sin(pitch));
+        }
+        particle.renderParticle(vertexBuffer, view, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
+    }
+}

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

@@ -7,15 +7,14 @@ import net.minecraft.entity.Entity;
 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;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Render.class)
 public abstract class MixinRender {
-    @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true)
-    private void replayModRender_areAllNamesHidden(Entity entity, CallbackInfoReturnable<Boolean> ci) {
+    @Inject(method = "renderLivingLabel", at = @At("HEAD"), cancellable = true)
+    private void replayModRender_areAllNamesHidden(Entity entityIn, String str, double x, double y, double z, int maxDistance, CallbackInfo ci) {
         EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
         if (handler != null && !handler.getSettings().isRenderNameTags()) {
-            ci.setReturnValue(false);
             ci.cancel();
         }
     }

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

@@ -3,16 +3,13 @@ package com.replaymod.render.mixin;
 import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
 import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher;
-import net.minecraft.client.renderer.chunk.RenderChunk;
 import net.minecraft.client.renderer.culling.ICamera;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(RenderGlobal.class)
 public abstract class MixinRenderGlobal {
@@ -37,6 +34,8 @@ public abstract class MixinRenderGlobal {
 
             do {
                 setupTerrain(viewEntity, partialTicks, camera, replayModRender_hook.nextFrameId(), playerSpectator);
+
+                replayModRender_hook.updateChunks();
             } while (displayListEntitiesDirty);
 
             displayListEntitiesDirty = true;
@@ -46,13 +45,6 @@ public abstract class MixinRenderGlobal {
         }
     }
 
-    @Inject(method = "isPositionInRenderChunk", at = @At("HEAD"), cancellable = true)
-    public void replayModRender_isPositionInRenderChunk(BlockPos pos, RenderChunk chunk, CallbackInfoReturnable<Boolean> ci) {
-        if (replayModRender_hook != null) {
-            ci.setReturnValue(true);
-        }
-    }
-
     @Inject(method = "updateChunks", at = @At("HEAD"), cancellable = true)
     public void replayModRender_updateChunks(long finishTimeNano, CallbackInfo ci) {
         if (replayModRender_hook != null) {

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

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(RenderManager.class)
 public abstract class MixinRenderManager {
@@ -19,7 +19,7 @@ public abstract class MixinRenderManager {
     private float playerViewY;
 
     @Inject(method = "doRenderEntity", at = @At("HEAD"))
-    private void replayModRender_reorientForCubicRendering(Entity entity, double dx, double dy, double dz, float iDoNotKnow, float partialTicks, boolean iDoNotCare, CallbackInfoReturnable ci) {
+    private void replayModRender_reorientForCubicRendering(Entity entity, double dx, double dy, double dz, float iDoNotKnow, float partialTicks, boolean iDoNotCare, CallbackInfo ci) {
         EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
         if (handler != null && handler.omnidirectional) {
             double pitch = -Math.atan2(dy, Math.sqrt(dx * dx + dz * dz));

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

@@ -1,21 +0,0 @@
-package com.replaymod.render.mixin;
-
-import com.replaymod.render.hooks.EntityRendererHandler;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.RendererLivingEntity;
-import net.minecraft.entity.EntityLivingBase;
-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(RendererLivingEntity.class)
-public abstract class MixinRendererLivingEntity {
-    @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true)
-    private void replayModRender_areAllNamesHidden(EntityLivingBase entity, CallbackInfoReturnable<Boolean> ci) {
-        EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
-        if (handler != null && !handler.getSettings().isRenderNameTags()) {
-            ci.setReturnValue(false); //this calls the cancel method
-        }
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.replaymod.render.rendering;
 
-import com.replaymod.core.ReplayMod;
 import com.replaymod.pathing.player.AbstractTimelinePlayer;
 import com.replaymod.pathing.player.ReplayTimer;
 import com.replaymod.pathing.properties.TimestampProperty;
@@ -14,17 +13,18 @@ import com.replaymod.render.gui.GuiRenderingDone;
 import com.replaymod.render.gui.GuiVideoRenderer;
 import com.replaymod.render.hooks.ChunkLoadingRenderGlobal;
 import com.replaymod.render.metadata.MetadataInjector;
+import com.replaymod.render.utils.SoundHandler;
 import com.replaymod.replay.ReplayHandler;
 import com.replaymod.replaystudio.pathing.path.Keyframe;
 import com.replaymod.replaystudio.pathing.path.Path;
 import com.replaymod.replaystudio.pathing.path.Timeline;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SoundCategory;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.util.SoundCategory;
 import net.minecraft.util.Timer;
-import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.common.MinecraftForge;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.Display;
 import org.lwjgl.util.Dimension;
@@ -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;
@@ -55,7 +54,7 @@ public class VideoRenderer implements RenderInfo {
     private int fps;
     private boolean mouseWasGrabbed;
     private boolean debugInfoWasShown;
-    private Map originalSoundLevels;
+    private Map<SoundCategory, Float> originalSoundLevels;
 
     private TimelinePlayer timelinePlayer;
     private Future<Void> timelinePlayerFuture;
@@ -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,8 +89,8 @@ 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 {
-        FMLCommonHandler.instance().bus().post(new ReplayRenderEvent.Pre(this));
+    public boolean renderVideo() {
+        MinecraftForge.EVENT_BUS.post(new ReplayRenderEvent.Pre(this));
 
         setup();
 
@@ -138,11 +136,7 @@ public class VideoRenderer implements RenderInfo {
 
         finish();
 
-        FMLCommonHandler.instance().bus().post(new ReplayRenderEvent.Post(this));
-
-        if (failureCause != null) {
-            throw failureCause;
-        }
+        MinecraftForge.EVENT_BUS.post(new ReplayRenderEvent.Post(this));
 
         return !cancelled;
     }
@@ -202,9 +196,9 @@ public class VideoRenderer implements RenderInfo {
         for (SoundCategory category : SoundCategory.values()) {
             mutedSounds.put(category, 0f);
         }
-        originalSoundLevels = mc.gameSettings.mapSoundLevels;
-        mutedSounds.put(SoundCategory.MASTER, (Float) originalSoundLevels.get(SoundCategory.MASTER));
-        mc.gameSettings.mapSoundLevels = mutedSounds;
+        originalSoundLevels = mc.gameSettings.soundLevels;
+        mutedSounds.put(SoundCategory.MASTER, originalSoundLevels.get(SoundCategory.MASTER));
+        mc.gameSettings.soundLevels = mutedSounds;
 
         fps = settings.getFramesPerSecond();
 
@@ -225,9 +219,6 @@ public class VideoRenderer implements RenderInfo {
 
         updateDisplaySize();
 
-        ScaledResolution scaled = new ScaledResolution(mc, displayWidth, displayHeight);
-        gui.toMinecraft().setWorldAndResolution(mc, scaled.getScaledWidth(), scaled.getScaledHeight());
-
         chunkLoadingRenderGlobal = new ChunkLoadingRenderGlobal(mc.renderGlobal);
 
         // Set up our own framebuffer to render the GUI to
@@ -248,21 +239,15 @@ public class VideoRenderer implements RenderInfo {
         if (mouseWasGrabbed) {
             mc.mouseHelper.grabMouseCursor();
         }
-        mc.gameSettings.mapSoundLevels = originalSoundLevels;
+        mc.gameSettings.soundLevels = originalSoundLevels;
         mc.displayGuiScreen(null);
         if (chunkLoadingRenderGlobal != null) {
             chunkLoadingRenderGlobal.uninstall();
         }
 
-        ReplayMod.soundHandler.playRenderSuccessSound();
+        new SoundHandler().playRenderSuccessSound();
 
-        try {
-            if (!hasFailed()) {
-                new GuiRenderingDone(ReplayModRender.instance, videoWriter.getVideoFile(), totalFrames, settings).display();
-            }
-        } catch (VideoWriter.FFmpegStartupException e) {
-            setFailure(e);
-        }
+        new GuiRenderingDone(ReplayModRender.instance, videoWriter.getVideoFile(), totalFrames, settings).display();
 
         // Finally, resize the Minecraft framebuffer to the actual width/height of the window
         mc.resize(displayWidth, displayHeight);
@@ -298,7 +283,7 @@ public class VideoRenderer implements RenderInfo {
 
             mc.entityRenderer.setupOverlayRendering();
 
-            ScaledResolution scaled = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
+            ScaledResolution scaled = new ScaledResolution(mc);
             gui.toMinecraft().setWorldAndResolution(mc, scaled.getScaledWidth(), scaled.getScaledHeight());
 
             try {
@@ -338,7 +323,7 @@ public class VideoRenderer implements RenderInfo {
                     return;
                 }
             }
-        } while (paused && !hasFailed());
+        } while (paused);
     }
 
     private boolean displaySizeChanged() {
@@ -379,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/JailingQueue.java

@@ -2,15 +2,18 @@ package com.replaymod.render.utils;
 
 import com.google.common.base.Preconditions;
 
-import java.util.*;
-import java.util.concurrent.BlockingQueue;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-public class JailingQueue<T> extends AbstractQueue<T> implements BlockingQueue<T> {
-    private final BlockingQueue<T> delegate;
+public class JailingQueue<T> extends PriorityBlockingQueue<T> {
+    private final PriorityBlockingQueue<T> delegate;
     private final Set<Thread> jailed = new HashSet<Thread>();
 
-    public JailingQueue(BlockingQueue<T> delegate) {
+    public JailingQueue(PriorityBlockingQueue<T> delegate) {
         this.delegate = delegate;
     }
 
@@ -59,13 +62,13 @@ public class JailingQueue<T> extends AbstractQueue<T> implements BlockingQueue<T
     }
 
     @Override
-    public void put(T t) throws InterruptedException {
+    public void put(T t) {
         tryAccess();
         delegate.put(t);
     }
 
     @Override
-    public boolean offer(T t, long timeout, TimeUnit unit) throws InterruptedException {
+    public boolean offer(T t, long timeout, TimeUnit unit) {
         tryAccess();
         return delegate.offer(t, timeout, unit);
     }

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/InputReplayTimer.java

@@ -143,10 +143,11 @@ public class InputReplayTimer extends WrappedTimer {
 
                 // Following are a ton of vanilla keyboard shortcuts, some are removed as they're useless in the
                 // replay viewer as of now
+                // TODO Update maybe add new key bindings
                 // TODO: Translate magic values to Keyboard.KEY_ constants
 
                 if (key == 32 && Keyboard.isKeyDown(61) && mc.ingameGUI != null) {
-                    mc.ingameGUI.getChatGUI().clearChatMessages();
+                    mc.ingameGUI.getChatGUI().clearChatMessages(false);
                 }
 
                 if (key == 31 && Keyboard.isKeyDown(61)) {