Merge branch '1.10.2' into 1.11

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

.drone.yml

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

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICBidWlsZDoKICAgIGltYWdlOiBtYXZlbjozLjMuOS1qZGstOAogICAgY29tbWFuZHM6CiAgICAgIC0gY3VybCAtLWZhaWwgLS1jcmVhdGUtZGlycyAtbyAkSE9NRS8uZ3JhZGxlL2luaXQuZC9taXJyb3IuZ3JhZGxlIGh0dHBzOi8vbWF2ZW4uam9obmkwNzAyLmRlL2NvbmZpZy9ncmFkbGUKICAgICAgLSBjdXJsIC0tZmFpbCAtLWNyZWF0ZS1kaXJzIC1vICRIT01FLy5tMi9zZXR0aW5ncy54bWwgaHR0cHM6Ly9tYXZlbi5qb2huaTA3MDIuZGUvY29uZmlnL21hdmVuCiAgICAgIC0gLi9ncmFkbGV3IHNldHVwQ0lXb3Jrc3BhY2UKICAgICAgLSAuL2dyYWRsZXcgOmJ1aWxkCiAgYXJjaGl2ZToKICAgIGltYWdlOiBwbHVnaW5zL3MzCiAgICBhY2w6IHB1YmxpYy1yZWFkCiAgICByZWdpb246ICJ1cy1lYXN0LTEiCiAgICBidWNrZXQ6ICJyZXBsYXltb2QiCiAgICBwYXRoX3N0eWxlOiB0cnVlCiAgICBzb3VyY2U6IGJ1aWxkL2xpYnMvKgogICAgc3RyaXBfcHJlZml4OiBidWlsZC9saWJzLwogICAgdGFyZ2V0OiAvCg.riE6lhwfdNUhI7LO2SxEKFOjzjaX40ne7Ae9gyP75KE
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgY2xvbmU6CiAgICBpbWFnZTogcGx1Z2lucy9naXQKICAgIHRhZ3M6IHRydWUKICBidWlsZDoKICAgIGltYWdlOiBvcGVuamRrOjgKICAgIGNvbW1hbmRzOgogICAgICAtIEpBVkFfT1BUUz0tWG14MTUxNk0gLi9ncmFkbGV3IHNldHVwRGVjb21wV29ya3NwYWNlCiAgICAgIC0gLi9ncmFkbGV3IDpidWlsZAogIGFyY2hpdmU6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgYWNsOiBwdWJsaWMtcmVhZAogICAgcmVnaW9uOiAidXMtZWFzdC0xIgogICAgYnVja2V0OiAicmVwbGF5bW9kIgogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc291cmNlOiBidWlsZC9saWJzLyoKICAgIHN0cmlwX3ByZWZpeDogYnVpbGQvbGlicy8KICAgIHRhcmdldDogLwo.Q_jQxd73CuNh8ZTGTw31yMmBIzWprIagmaddFYovDrc

.gitmodules

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

build.gradle

@@ -1,5 +1,7 @@
 import groovy.json.JsonOutput
 
+import java.util.zip.ZipInputStream
+
 buildscript {
     repositories {
         mavenCentral()
@@ -7,17 +9,23 @@ buildscript {
             name = "forge"
             url = "http://files.minecraftforge.net/maven"
         }
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/maven"
+        }
         maven {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
     }
 }
 
-apply plugin: 'forge'
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'org.spongepowered.mixin'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -26,22 +34,11 @@ version = gitDescribe()
 group= "com.replaymod"
 archivesBaseName = "replaymod"
 
-ext {
-    mixinConfigs = [
-            'compat.shaders', 'extras.playeroverview', 'recording', 'render', 'replay'
-    ].collect {"mixins.${it}.replaymod.json"}
-    mixinSrg = new File(project.buildDir, 'tmp/mixins/mixins.srg')
-    mixinRefMap = new File(project.buildDir, 'tmp/mixins/mixins.replaymod.refmap.json')
-}
-
 minecraft {
-    version = '1.7.10-10.13.4.1558-1.7.10'
+    coreMod = 'com.replaymod.core.LoadingPlugin'
+    version = '1.11-13.19.1.2188'
     runDir = "eclipse"
-    mappings = "stable_12"
-    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} ]"
+    mappings = "snapshot_20161111"
 }
 
 repositories {
@@ -50,7 +47,7 @@ repositories {
         url = "http://repo.spongepowered.org/maven/"
     }
     maven {
-        url 'https://jitpack.io'
+        url 'https://repo.spacehq.org/content/repositories/snapshots/'
     }
 }
 
@@ -62,7 +59,7 @@ configurations {
 dependencies {
     compile 'org.projectlombok:lombok:1.16.4'
 
-    compile 'org.spongepowered:mixin:0.6.8-SNAPSHOT'
+    compile 'org.spongepowered:mixin:0.5.9-SNAPSHOT'
     shade 'com.googlecode.mp4parser:isoparser:1.1.7'
     shade 'org.apache.commons:commons-exec:1.3'
     shade 'com.google.apis:google-api-services-youtube:v3-rev178-1.22.0'
@@ -72,22 +69,24 @@ dependencies {
 
     shade 'org.aspectj:aspectjrt:1.8.2'
 
-    shade 'com.github.replaymod:ReplayStudio:181140c'
+    compile project(':ReplayStudio')
 
     testCompile 'junit:junit:4.11'
 }
 
+tasks['idea'].dependsOn ':ReplayStudio:preshadowJar'
+
 jar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
     dependsOn configurations.compile
     dependsOn configurations.shade
-
-    from project.mixinRefMap
+    dependsOn ':ReplayStudio:shadowJar'
 
     def shade = {files(
             configurations.compile.findAll {it.name.startsWith 'mixin-'}
                     + configurations.shade
+                    + getTasks().getByPath(':ReplayStudio:shadowJar').outputs.files
     )}
 
     def noticeDir = file("$buildDir/NOTICE")
@@ -102,6 +101,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
@@ -116,8 +136,7 @@ jar {
     manifest {
          attributes 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
                  'TweakOrder': '0',
-                 'MixinConfigs': project.mixinConfigs.join(','),
-                 'FMLCorePlugin': 'com.replaymod.core.LoadingPlugin',
+                 'FMLCorePluginContainsFMLMod': 'true',
                  'FMLAT': 'replaymod_at.cfg'
 	}
 }
@@ -157,8 +176,6 @@ processResources
 
 sourceSets {
     main {
-        // Required so resources are loaded correctly in dev env
-        output.resourcesDir = output.classesDir
         // Directly include jGui into main build
         // This could also be done by including it as a gradle subproject, however
         // doing so caused classpath issues on some IntelliJ versions.
@@ -168,13 +185,7 @@ sourceSets {
         resources {
             srcDir 'jGui/src/main/resources'
         }
-    }
-    integrationTest {
-        compileClasspath += main.runtimeClasspath + main.output
-        java {
-            srcDir file('src/integration-test/java')
-        }
-        resources.srcDir file('src/integration-test/resources')
+        refMap = "mixins.replaymod.refmap.json"
     }
 }
 
@@ -183,49 +194,10 @@ task copySrg(type: Copy, dependsOn: 'genSrgs') {
     into 'build'
 }
 
-reobf.doFirst {
-    if (project.mixinSrg.exists()) {
-        addExtraSrgFile project.mixinSrg
-    }
-}
-
-compileJava.dependsOn copySrg
-compileJava {
-    options.compilerArgs += [
-            "-AoutSrgFile=${project.mixinSrg.canonicalPath}",
-            "-AoutRefMapFile=${project.mixinRefMap.canonicalPath}",
-            "-AreobfSrgFile=${project.file('build/mcp-srg.srg').canonicalPath}"
-    ]
-}
-
 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

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

settings.gradle

@@ -0,0 +1 @@
+include 'ReplayStudio'

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,371 +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 cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-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 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();
-        FMLCommonHandler.instance().bus().register(new GuiEventHandler(timeout, stackTrace, onClosed));
-    }
-        public class GuiEventHandler {
-            final net.minecraft.client.gui.GuiScreen currentScreen = mc.currentScreen;
-            private final int timeout;
-            private final StackTraceElement[] stackTrace;
-            private final Runnable onClosed;
-            int framesPassed;
-
-            public GuiEventHandler(int timeout, StackTraceElement[] stackTrace, Runnable onClosed) {
-                this.timeout = timeout;
-                this.stackTrace = stackTrace;
-                this.onClosed = onClosed;
-            }
-
-            @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);
-                    }
-                }
-            }
-        }
-
-    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();
-        FMLCommonHandler.instance().bus().register(new PopupEventHandler(timeout, stackTrace, onClosed));
-    }
-        public class PopupEventHandler {
-            private final int timeout;
-            private final StackTraceElement[] stackTrace;
-            private final Runnable onClosed;
-            private final AbstractGuiPopup popup;
-            int framesPassed;
-
-            public PopupEventHandler(int timeout, StackTraceElement[] stackTrace, Runnable onClosed) {
-                this.timeout = timeout;
-                this.stackTrace = stackTrace;
-                this.onClosed = onClosed;
-                this.popup = getPopup(mc.currentScreen);
-                if (this.popup == null) {
-                    throw new IllegalStateException("No popup found.");
-                }
-            }
-
-            @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);
-                    }
-                }
-            }
-        }
-
-    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();
-        FMLCommonHandler.instance().bus().register(new ExpectGuiEventHandler<T>(guiClass, stackTrace, onOpen));
-    }
-        public class ExpectGuiEventHandler<T> {
-            private final Class<T> guiClass;
-            private final StackTraceElement[] stackTrace;
-            private final Consumer<T> onOpen;
-            net.minecraft.client.gui.GuiScreen currentScreen;
-            int framesPassed;
-
-            public ExpectGuiEventHandler(Class<T> guiClass, StackTraceElement[] stackTrace, Consumer<T> onOpen) {
-                this.guiClass = guiClass;
-                this.stackTrace = stackTrace;
-                this.onOpen = onOpen;
-            }
-
-            @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;
-                    }
-                }
-                future.setException(new UnexpectedGuiException(guiClass, stackTrace,
-                        foundGui == null ? currentScreen : foundGui));
-            }
-        }
-    class UnexpectedGuiException extends Exception {
-        UnexpectedGuiException(Class<?> guiClass, StackTraceElement[] stackTrace, Object foundGui) {
-            super("Expected instance of " + guiClass + " but found " + foundGui);
-            setStackTrace(Arrays.copyOfRange(stackTrace, 2, stackTrace.length));
-        }
-    }
-
-    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 cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import net.minecraft.client.Minecraft;
-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 cpw.mods.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,33 +0,0 @@
-package com.replaymod.recording;
-
-import com.replaymod.core.AbstractTask;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-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;
-
-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");
-                    MinecraftForge.EVENT_BUS.register(new EventHandler());
-                });
-            });
-        });
-    }
-
-    public class EventHandler {
-        @SubscribeEvent
-        public void onRenderIngame(RenderGameOverlayEvent.Pre event) {
-            MinecraftForge.EVENT_BUS.unregister(this);
-            runLater(() -> future.set(null));
-        }
-    }
-}

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,33 +0,0 @@
-package com.replaymod.replay;
-
-import com.replaymod.core.AbstractTask;
-import com.replaymod.replay.gui.screen.GuiReplayViewer;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import de.johni0702.minecraft.gui.function.Clickable;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.common.MinecraftForge;
-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);
-
-            MinecraftForge.EVENT_BUS.register(new EventHandler());
-        }));
-    }
-
-    public class EventHandler {
-        @SubscribeEvent
-        public void onRenderIngame(RenderGameOverlayEvent.Pre event) {
-            MinecraftForge.EVENT_BUS.unregister(this);
-            runLater(() -> future.set(null));
-        }
-    }
-}

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 cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.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.renderViewEntity == 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,27 +1,25 @@
 package com.replaymod.compat;
 
-import com.replaymod.compat.bettersprinting.DisableBetterSprinting;
 import com.replaymod.compat.optifine.DisableFastRender;
-import com.replaymod.compat.oranges17animations.HideInvisibleEntities;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.eventhandler.EventBus;
+import com.replaymod.compat.shaders.ShaderBeginRender;
+import com.replaymod.core.ReplayMod;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.eventhandler.EventBus;
 
-@Mod(modid = ReplayModCompat.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
-        useMetadata = true)
+@Mod(modid = ReplayModCompat.MOD_ID, useMetadata = true)
 public class ReplayModCompat {
     public static final String MOD_ID = "replaymod-compat";
 
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
+
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        EventBus bus = 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 cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
-import cpw.mods.fml.common.versioning.Restriction;
-import cpw.mods.fml.common.versioning.VersionRange;
-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.world.IWorldAccess;
-import net.minecraftforge.client.event.GuiOpenEvent;
-import net.minecraftforge.common.MinecraftForge;
-
-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 onEntityDestroy(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(int x, int y, int z) {}
-        @Override public void markBlockForRenderUpdate(int p_147588_1_, int p_147588_2_, int p_147588_3_) {}
-        @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(String p_180442_1_, double p_180442_2_, double p_180442_3_, double p_180442_5_, double p_180442_7_, double p_180442_9_, double p_180442_11_) {}
-        @Override public void onEntityCreate(Entity p_72703_1_) {}
-        @Override public void playRecord(String recordName, int x, int y, int z) {}
-        @Override public void broadcastSound(int p_180440_1_, int x, int y, int z, int p_180440_3_) {}
-        @Override public void playAuxSFX(EntityPlayer p_72706_1_, int p_72706_2_, int p_72706_3_, int p_72706_4_, int p_72706_5_, int p_72706_6_) {}
-        @Override public void destroyBlockPartially(int p_147587_1_, int p_147587_2_, int p_147587_3_, int p_147587_4_, int p_147587_5_) {}
-        @Override public void onStaticEntitiesChanged() {}
-    }
-}

src/main/java/com/replaymod/compat/optifine/DisableFastRender.java

@@ -1,11 +1,10 @@
 package com.replaymod.compat.optifine;
 
 import com.replaymod.render.events.ReplayRenderEvent;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.client.FMLClientHandler;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-// TODO 1.7.10: Is this still necessary (probably, but needs checking)?
 public class DisableFastRender {
 
     private final Minecraft mc = Minecraft.getMinecraft();

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 cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.client.event.RenderLivingEvent;
-
-/**
- * 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/compat/shaders/ShaderBeginRender.java

@@ -0,0 +1,39 @@
+package com.replaymod.compat.shaders;
+
+import com.replaymod.render.hooks.EntityRendererHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+
+import java.lang.reflect.InvocationTargetException;
+
+public class ShaderBeginRender {
+
+    private final Minecraft mc = Minecraft.getMinecraft();
+
+    /**
+     *  Invokes Shaders#beginRender when rendering a video,
+     *  as this would usually get called by EntityRenderer#renderWorld,
+     *  which we're not calling during rendering.
+     */
+    @SubscribeEvent
+    public void onRenderTickStart(TickEvent.RenderTickEvent event) {
+        if (event.phase != TickEvent.Phase.START) return;
+        if (ShaderReflection.shaders_beginRender == null) return;
+        if (ShaderReflection.config_isShaders == null) return;
+
+        try {
+            // check if video is being rendered
+            if (((EntityRendererHandler.IEntityRenderer) mc.entityRenderer).replayModRender_getHandler() == null)
+                return;
+
+            // check if Shaders are enabled
+            if (!(boolean) (ShaderReflection.config_isShaders.invoke(null))) return;
+
+            ShaderReflection.shaders_beginRender.invoke(null, mc, mc.timer.elapsedPartialTicks, 0);
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

src/main/java/com/replaymod/compat/shaders/ShaderReflection.java

@@ -0,0 +1,53 @@
+package com.replaymod.compat.shaders;
+
+import net.minecraft.client.Minecraft;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+public class ShaderReflection {
+
+    // Shaders.frameTimeCounter
+    public static Field shaders_frameTimeCounter;
+
+    // Shaders.isShadowPass
+    public static Field shaders_isShadowPass;
+
+    // Shaders.beginRender()
+    public static Method shaders_beginRender;
+
+    // RenderGlobal.chunksToUpdateForced (Optifine only)
+    public static Field renderGlobal_chunksToUpdateForced;
+
+    // Config.isShaders() (Optifine only)
+    public static Method config_isShaders;
+
+    static {
+        try {
+            shaders_frameTimeCounter = Class.forName("shadersmod.client.Shaders")
+                    .getDeclaredField("frameTimeCounter");
+            shaders_frameTimeCounter.setAccessible(true);
+
+            shaders_isShadowPass = Class.forName("shadersmod.client.Shaders")
+                    .getDeclaredField("isShadowPass");
+            shaders_isShadowPass.setAccessible(true);
+
+            shaders_beginRender = Class.forName("shadersmod.client.Shaders")
+                    .getDeclaredMethod("beginRender", Minecraft.class, float.class, long.class);
+            shaders_beginRender.setAccessible(true);
+
+            renderGlobal_chunksToUpdateForced = Class.forName("net.minecraft.client.renderer.RenderGlobal")
+                    .getDeclaredField("chunksToUpdateForced");
+            renderGlobal_chunksToUpdateForced.setAccessible(true);
+
+            config_isShaders = Class.forName("Config")
+                    .getDeclaredMethod("isShaders");
+            config_isShaders.setAccessible(true);
+        } catch (ClassNotFoundException ignore) {
+            // no shaders mod installed
+        } catch (NoSuchMethodException | NoSuchFieldException e) {
+            // the method wasn't found. Has it been renamed?
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.replaymod.compat.shaders.mixin;
+
+import com.replaymod.compat.shaders.ShaderReflection;
+import com.replaymod.replay.ReplayHandler;
+import com.replaymod.replay.ReplayModReplay;
+import net.minecraft.client.renderer.EntityRenderer;
+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.CallbackInfo;
+
+@Mixin(EntityRenderer.class)
+public abstract class MixinShaderEntityRenderer {
+
+    @Inject(method = "renderWorldPass", at = @At("HEAD"))
+    private void replayModCompat_updateShaderFrameTimeCounter(CallbackInfo ignore) {
+        if (ReplayModReplay.instance.getReplayHandler() == null) return;
+        if (ShaderReflection.shaders_frameTimeCounter == null) return;
+
+        ReplayHandler replayHandler = ReplayModReplay.instance.getReplayHandler();
+        float timestamp = replayHandler.getReplaySender().currentTimeStamp() / 1000f % 3600f;
+        try {
+            ShaderReflection.shaders_frameTimeCounter.set(null, timestamp);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.replaymod.compat.shaders.mixin;
+
+import com.replaymod.render.hooks.EntityRendererHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.chunk.RenderChunk;
+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(RenderChunk.class)
+public abstract class MixinShaderRenderChunk {
+
+    private final Minecraft mc = Minecraft.getMinecraft();
+
+    /**
+     *  Changes the RenderChunk#isPlayerUpdate method that Optifine adds
+     *  to always return true while rendering so no chunks are being added
+     *  to a separate rendering queue
+     */
+    @Inject(method = "isPlayerUpdate", at = @At("HEAD"), cancellable = true)
+    private void replayModCompat_disableIsPlayerUpdate(CallbackInfoReturnable<Boolean> ci) {
+        if (((EntityRendererHandler.IEntityRenderer) mc.entityRenderer).replayModRender_getHandler() == null) return;
+        ci.setReturnValue(true);
+    }
+
+
+}

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

@@ -0,0 +1,40 @@
+package com.replaymod.compat.shaders.mixin;
+
+import com.replaymod.compat.shaders.ShaderReflection;
+import com.replaymod.render.hooks.EntityRendererHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.culling.ICamera;
+import net.minecraft.entity.Entity;
+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(RenderGlobal.class)
+public abstract class MixinShaderRenderGlobal {
+
+    private final Minecraft mc = Minecraft.getMinecraft();
+
+    @Shadow
+    public boolean displayListEntitiesDirty;
+
+    @Inject(method = "setupTerrain", at = @At("HEAD"), cancellable = true)
+    public void replayModCompat_setupTerrain(Entity viewEntity, double partialTicks, ICamera camera,
+                                             int frameCount, boolean playerSpectator, CallbackInfo ci) {
+        if (((EntityRendererHandler.IEntityRenderer) mc.entityRenderer).replayModRender_getHandler() == null) return;
+        if (ShaderReflection.shaders_isShadowPass == null) return;
+
+        // when called by the shadow pass, displayListEntitiesDirty can't be set to false, as no chunk updates
+        // are being processed. As it's being set to true by ChunkLoadingRenderGlobal#updateChunks, we have to
+        // set it to false manually to exit the loop imposed by MixinRenderGlobal#replayModRender_setupTerrain.
+        try {
+            if ((boolean) ShaderReflection.shaders_isShadowPass.get(null) == true) {
+                displayListEntitiesDirty = false;
+            }
+        } catch (IllegalAccessException ignore) {}
+
+    }
+
+}

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

@@ -1,50 +0,0 @@
-package com.replaymod.compat.shaders.mixin;
-
-import com.replaymod.render.hooks.EntityRendererHandler;
-import com.replaymod.replay.ReplayHandler;
-import com.replaymod.replay.ReplayModReplay;
-import net.minecraft.client.Minecraft;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Pseudo;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Pseudo
-@Mixin(targets = "shadersmod/client/Shaders", remap = false)
-public abstract class MixinShaders {
-
-    @Shadow static Minecraft mc;
-    @Shadow static long systemTime;
-    @Shadow static long lastSystemTime;
-    @Shadow static long diffSystemTime;
-    @Shadow static int frameCounter;
-    @Shadow static float frameTime;
-    @Shadow static float frameTimeCounter;
-
-    @Redirect(method = "beginRender", at = @At(value = "INVOKE", target = "Ljava/lang/System;currentTimeMillis()J"))
-    private static long replayModCompat_currentTimeMillis() {
-        ReplayHandler replayHandler = ReplayModReplay.instance.getReplayHandler();
-        if (replayHandler != null) {
-            systemTime = replayHandler.getReplaySender().currentTimeStamp();
-
-            // We need to manipulate all the other previous-frame-time-based variables too
-
-            lastSystemTime = 0; // Draw all frames as if they were the first ones
-            // diffSystemTime will be set to 0 by Shaders
-            // frameTime will be set to 0 by Shaders
-            frameTimeCounter = systemTime / 1000f; // will be %= 3600f by Shaders
-
-            // Set frameCounter only if rendering is in progress
-            EntityRendererHandler entityRendererHandler =
-                    ((EntityRendererHandler.IEntityRenderer) mc.entityRenderer).replayModRender_getHandler();
-            if (entityRendererHandler != null) {
-                frameCounter = entityRendererHandler.getRenderInfo().getFramesDone();
-            }
-
-            return systemTime;
-        }
-        return System.currentTimeMillis();
-    }
-
-}

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

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

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

@@ -1,94 +0,0 @@
-package com.replaymod.core;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.util.glu.GLU;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-/**
- * Insert glGetError checks after all calls to any method in any GL*, ARB* and EXT* classes
- */
-public class GLErrorTransformer implements IClassTransformer {
-    private static final String GL_CLASS = "org.lwjgl.opengl.GL";
-    private static final String GL = GL_CLASS.replace('.', '/');
-    private static final String ARB_CLASS = "org.lwjgl.opengl.ARB";
-    private static final String ARB = ARB_CLASS.replace('.', '/');
-    private static final String EXT_CLASS = "org.lwjgl.opengl.EXT";
-    private static final String EXT = EXT_CLASS.replace('.', '/');
-    private static final String GLErrorTransformer_CLASS = GLErrorTransformer.class.getName();
-    private static final String GLErrorTransformer = GLErrorTransformer_CLASS.replace('.', '/');
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass) {
-        // Ignore (anonymous) inner classes of this transformer
-        if (name.startsWith(GLErrorTransformer_CLASS)) return basicClass;
-
-        ClassReader reader = new ClassReader(basicClass);
-        ClassWriter writer = new ClassWriter(reader, 0);
-        reader.accept(new ClassVisitor(Opcodes.ASM5, writer) {
-            @Override
-            public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-                MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
-                return new MethodVisitor(Opcodes.ASM5, mv) {
-                    @Override
-                    public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
-                        super.visitMethodInsn(opcode, owner, name, desc, itf);
-                        if (owner.startsWith(GL) || owner.startsWith(ARB) || owner.startsWith(EXT)) {
-                            visitLdcInsn(owner.replace('/', '.'));
-                            visitLdcInsn(name);
-                            super.visitMethodInsn(Opcodes.INVOKESTATIC, GLErrorTransformer, "glErrorCheck", "(Ljava/lang/String;Ljava/lang/String;)V", false);
-                        }
-                    }
-
-                    @Override
-                    public void visitMaxs(int maxStack, int maxLocals) {
-                        super.visitMaxs(maxStack + 2, maxLocals);
-                    }
-                };
-            }
-        }, 0);
-        return writer.toByteArray();
-    }
-
-    private static boolean inGlBegin;
-
-    @SuppressWarnings("unused") // Called via ASM
-    public static void glErrorCheck(String cls, String method) {
-        if (method.equals("glBegin") && cls.equals(GL_CLASS + "11")) {
-            if (inGlBegin) {
-                // glBegin within glBegin
-                throw new GLError(GL11.GL_INVALID_OPERATION, cls, method);
-            }
-            inGlBegin = true;
-            return;
-        }
-        if (inGlBegin && method.equals("glEnd") && cls.equals(GL_CLASS + "11")) {
-            inGlBegin = false;
-        }
-        if (inGlBegin) {
-            return; // Cannot call glGetError in between of glBegin and glEnd
-        }
-        int err = GL11.glGetError();
-        if (err != 0) {
-            GLError e = new GLError(err, cls, method);
-            if ("true".equals(System.getProperty("replaymod.glerrors.throw", "true"))) {
-                throw e;
-            } else {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    public static class GLError extends RuntimeException {
-        private GLError(int err, String cls, String method) {
-            super(GLU.gluErrorString(err) + " (" + err + ")");
-            StackTraceElement[] stack = getStackTrace();
-            stack[0] = new StackTraceElement(cls, method, stack[0].getFileName(), stack[0].getLineNumber());
-            setStackTrace(stack);
-        }
-    }
-}

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

@@ -1,105 +0,0 @@
-package com.replaymod.core;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Redirect all calls to GL11.glEnable and GL11.glDisable to the GLStateTracker (excluding that class itself).
- */
-public class GLStateTrackerTransformer implements IClassTransformer {
-    private static final String GL11_CLASS = "org.lwjgl.opengl.GL11";
-    private static final String GL11 = GL11_CLASS.replace('.', '/');
-    private static final String glEnable = "glEnable";
-    private static final String glDisable = "glDisable";
-    private static final String GLStateTracker_CLASS = "com.replaymod.render.hooks.GLStateTracker";
-    private static final String GLStateTracker = GLStateTracker_CLASS.replace('.', '/');
-    private static final String hook_glEnable = "hook_glEnable";
-    private static final String hook_glDisable = "hook_glDisable";
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass) {
-        // Ignore (anonymous) inner classes of this transformer
-        if (name.startsWith(GLStateTrackerTransformer.class.getName())) return basicClass;
-        // Ignore the state tracker itself
-        if (name.equals(GLStateTracker_CLASS)) return basicClass;
-
-        ClassReader reader = new ClassReader(basicClass);
-        Set<Method> eligibleMethods = findEligibleMethods(reader);
-        if (eligibleMethods.isEmpty()) {
-            return basicClass;
-        }
-
-        ClassWriter writer = new ClassWriter(reader, 0);
-        reader.accept(new ClassVisitor(Opcodes.ASM5, writer) {
-            @Override
-            public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-                MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
-                if (!eligibleMethods.contains(new Method(name, desc))) {
-                    return mv;
-                }
-                return new MethodVisitor(Opcodes.ASM5, mv) {
-                    @Override
-                    public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
-                        if (owner.equals(GL11)) {
-                            if (name.equals(glEnable)) {
-                                owner = GLStateTracker;
-                                name = hook_glEnable;
-                            } else if (name.equals(glDisable)) {
-                                owner = GLStateTracker;
-                                name = hook_glDisable;
-                            }
-                        }
-                        super.visitMethodInsn(opcode, owner, name, desc, itf);
-                    }
-                };
-            }
-        }, 0);
-        return writer.toByteArray();
-    }
-
-    private Set<Method> findEligibleMethods(ClassReader reader) {
-        Set<Method> eligibleMethods = new HashSet<>();
-        reader.accept(new ClassVisitor(Opcodes.ASM5) {
-            @Override
-            public MethodVisitor visitMethod(int access, String methodName, String methodDesc, String signature, String[] exceptions) {
-                return new MethodVisitor(Opcodes.ASM5) {
-                    @Override
-                    public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
-                        if (owner.equals(GL11) && (name.equals(glEnable) || name.equals(glDisable))) {
-                            eligibleMethods.add(new Method(methodName, methodDesc));
-                        }
-                    }
-                };
-            }
-        }, ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
-        return eligibleMethods;
-    }
-
-    private static class Method {
-        private final String name, desc;
-
-        private Method(String name, String desc) {
-            this.name = name;
-            this.desc = desc;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (o == null || getClass() != o.getClass()) return false;
-            Method method = (Method) o;
-            return name.equals(method.name) && desc.equals(method.desc);
-        }
-
-        @Override
-        public int hashCode() {
-            return name.hashCode() ^ desc.hashCode();
-        }
-    }
-}

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

@@ -2,21 +2,20 @@ package com.replaymod.core;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.InputEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
 import net.minecraft.util.ReportedException;
+import net.minecraftforge.fml.client.registry.ClientRegistry;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.InputEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.lwjgl.input.Keyboard;
 
 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>();
@@ -64,7 +63,7 @@ public class KeyBindingRegistry {
 
     public void handleRepeatedKeyBindings() {
         for (Map.Entry<KeyBinding, Collection<Runnable>> entry : repeatedKeyBindingHandlers.asMap().entrySet()) {
-            if (entry.getKey().getIsKeyPressed()) {
+            if (entry.getKey().isKeyDown()) {
                 invokeKeyBindingHandlers(entry.getKey(), entry.getValue());
             }
         }
@@ -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

@@ -1,7 +1,7 @@
 package com.replaymod.core;
 
-import cpw.mods.fml.relauncher.CoreModManager;
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
+import net.minecraftforge.fml.relauncher.CoreModManager;
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 import org.apache.logging.log4j.LogManager;
 import org.spongepowered.asm.launch.MixinBootstrap;
 import org.spongepowered.asm.mixin.Mixins;
@@ -10,8 +10,6 @@ import java.io.File;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.CodeSource;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 public class LoadingPlugin implements IFMLLoadingPlugin {
@@ -22,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) {
@@ -32,8 +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.getReparseableCoremods().add(file.getName());
+                    CoreModManager.getIgnoredMods().remove(file.getName());
                 }
             } catch (URISyntaxException e) {
                 e.printStackTrace();
@@ -46,12 +42,8 @@ public class LoadingPlugin implements IFMLLoadingPlugin {
 
     @Override
     public String[] getASMTransformerClass() {
-        List<String> transformers = new ArrayList<>();
-        if ("true".equals(System.getProperty("replaymod.glerrors", "false"))) {
-            transformers.add(GLErrorTransformer.class.getName());
-        }
-        transformers.add(GLStateTrackerTransformer.class.getName());
-        return transformers.stream().toArray(String[]::new);
+        return new String[]{
+        };
     }
 
     @Override

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

@@ -6,47 +6,35 @@ 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.replay.InputReplayTimer;
 import com.replaymod.replaystudio.util.I18n;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.eventhandler.EventBus;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
 import de.johni0702.minecraft.gui.container.GuiScreen;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 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.ChatComponentText;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
 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.Loader;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.Mod.Instance;
+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 org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayDeque;
 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 {
 
@@ -59,10 +47,10 @@ public class ReplayMod {
     private static String parseMinecraftVersion() {
         CrashReport crashReport = new CrashReport("", new Throwable());
         @SuppressWarnings("unchecked")
-        List<CrashReportCategory.Entry> list = crashReport.getCategory().field_85077_c;
+        List<CrashReportCategory.Entry> list = crashReport.getCategory().children;
         for (CrashReportCategory.Entry entry : list) {
-            if ("Minecraft Version".equals(entry.func_85089_a())) {
-                return entry.func_85090_b();
+            if ("Minecraft Version".equals(entry.getKey())) {
+                return entry.getValue();
             }
         }
         return "Unknown";
@@ -77,8 +65,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();
@@ -121,8 +107,7 @@ public class ReplayMod {
 
         new MainMenuHandler().register();
 
-        FMLCommonHandler.instance().bus().register(this);
-        FMLCommonHandler.instance().bus().register(keyBindingRegistry);
+        MinecraftForge.EVENT_BUS.register(keyBindingRegistry);
 
         getKeyBindingRegistry().registerKeyBinding("replaymod.input.settings", 0, () -> {
             new GuiReplaySettings(null, settingsRegistry).display();
@@ -133,155 +118,10 @@ public class ReplayMod {
     public void postInit(FMLPostInitializationEvent event) throws IOException {
         settingsRegistry.save(); // Save default values to disk
 
-        /* TODO 1.7.10: MC crashes when setting render distance to > 16
         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
@@ -317,53 +157,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;
-
-    // 1.7.10: Cannot use MC's because it is processed only during ticks (so not at all when replay is paused)
-    private final Queue<ListenableFutureTask<?>> scheduledTasks = new ArrayDeque<>();
-
     public void runLater(Runnable runnable) {
-        if (mc.isCallingFromMinecraftThread() && inRunLater) {
-            EventBus bus = FMLCommonHandler.instance().bus();
-            bus.register(new RunLaterHelper(runnable));
-            return;
-        }
-        synchronized (scheduledTasks) {
-            scheduledTasks.add(ListenableFutureTask.create(() -> {
-                inRunLater = true;
-                try {
-                    runnable.run();
-                } finally {
-                    inRunLater = false;
-                }
-            }, null));
-        }
-    }
-
-    // in 1.7.10 apparently events can't be delivered to anonymous classes
-    @RequiredArgsConstructor
-    public class RunLaterHelper {
-        private final Runnable runnable;
-        @SubscribeEvent
-        public void onRenderTick(TickEvent.RenderTickEvent event) {
-            if (event.phase == TickEvent.Phase.START) {
-                runLater(runnable);
-                FMLCommonHandler.instance().bus().unregister(this);
-            }
-        }
-    }
-
-    @SubscribeEvent
-    public void runScheduledTasks(InputReplayTimer.RunScheduledTasks event) {
-        synchronized (scheduledTasks) {
-            while (!scheduledTasks.isEmpty()) {
-                scheduledTasks.poll().run();
-            }
+        synchronized (mc.scheduledTasks) {
+            mc.scheduledTasks.add(ListenableFutureTask.create(runnable, null));
         }
     }
 
@@ -392,13 +188,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

@@ -1,8 +1,8 @@
 package com.replaymod.core;
 
 import com.replaymod.core.events.SettingsChangedEvent;
-import cpw.mods.fml.common.FMLCommonHandler;
 import net.minecraft.client.resources.I18n;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 
 import java.lang.reflect.Field;
@@ -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/events/SettingsChangedEvent.java

@@ -1,9 +1,9 @@
 package com.replaymod.core.events;
 
 import com.replaymod.core.SettingsRegistry;
-import cpw.mods.fml.common.eventhandler.Event;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import net.minecraftforge.fml.common.eventhandler.Event;
 
 @RequiredArgsConstructor
 public class SettingsChangedEvent extends Event {

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

@@ -1,9 +1,9 @@
 package com.replaymod.core.gui;
 
 import com.replaymod.core.ReplayMod;
-import cpw.mods.fml.client.IModGuiFactory;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.client.IModGuiFactory;
 
 import java.util.Set;
 

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

@@ -1,12 +1,10 @@
 package com.replaymod.core.handler;
 
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
-
-import java.util.List;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 /**
  * 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/ModCompat.java

@@ -1,9 +1,10 @@
 package com.replaymod.core.utils;
 
 import com.replaymod.replaystudio.data.ModInfo;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.registry.GameData;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.ModContainer;
+import net.minecraftforge.fml.common.registry.GameData;
 
 import java.util.*;
 import java.util.function.Function;
@@ -16,19 +17,14 @@ public class ModCompat {
         Map<String, ModContainer> ignoreCaseMap = Loader.instance().getModList().stream()
                 .collect(Collectors.toMap(m -> m.getModId().toLowerCase(), Function.identity()));
         return Stream.concat(
-                ((Set<String>) GameData.getBlockRegistry().getKeys()).stream(),
-                ((Set<String>) GameData.getItemRegistry().getKeys()).stream()
-        ).map(ModCompat::getResourceDomain).filter(s -> !s.equals("minecraft")).distinct()
+                ((Set<ResourceLocation>) GameData.getBlockRegistry().getKeys()).stream(),
+                ((Set<ResourceLocation>) GameData.getItemRegistry().getKeys()).stream()
+        ).map(ResourceLocation::getResourceDomain).filter(s -> !s.equals("minecraft")).distinct()
                 .map(String::toLowerCase).map(ignoreCaseMap::get).filter(mod -> mod != null)
                 .map(mod -> new ModInfo(mod.getModId(), mod.getName(), mod.getVersion()))
                 .collect(Collectors.toList());
     }
 
-    private static String getResourceDomain(String name) {
-        if (!name.contains(":")) return null; // Still using old names without namespace, can't do anything, ignore
-        return name.split(":", 2)[0];
-    }
-
     public static final class ModInfoDifference {
         private final Set<ModInfo> missing = new HashSet<>();
         private final Map<ModInfo, String> differing = new HashMap<>();

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

@@ -1,6 +1,9 @@
 package com.replaymod.core.utils;
 
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.VertexBuffer;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
@@ -26,21 +29,22 @@ public class OpenGLUtils {
     }
 
     public static void drawRotatedRectWithCustomSizedTexture(int x, int y, float rotation, float u, float v, int width, int height, float textureWidth, float textureHeight) {
-        GL11.glPushMatrix();
+        GlStateManager.pushMatrix();
 
         float f4 = 1.0F / textureWidth;
         float f5 = 1.0F / textureHeight;
 
-        Tessellator tessellator = Tessellator.instance;
-        GL11.glTranslatef(x+(width/2), y+(width/2), 0);
-        GL11.glRotatef(rotation, 0, 0, 1);
-        tessellator.startDrawingQuads();
-        tessellator.addVertexWithUV(-width / 2, height / 2, 0.0D, (double) (u * f4), (double) ((v + (float) height) * f5));
-        tessellator.addVertexWithUV(width/2, height/2, 0.0D, (double)((u + (float)width) * f4), (double)((v + (float)height) * f5));
-        tessellator.addVertexWithUV(width/2, -height/2, 0.0D, (double)((u + (float)width) * f4), (double)(v * f5));
-        tessellator.addVertexWithUV(-width/2, -height/2, 0.0D, (double)(u * f4), (double)(v * f5));
+        Tessellator tessellator = Tessellator.getInstance();
+        VertexBuffer vertexBuffer = tessellator.getBuffer();
+        GlStateManager.translate(x+(width/2), y+(width/2), 0);
+        GlStateManager.rotate(rotation, 0, 0, 1);
+        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();
 
-        GL11.glPopMatrix();
+        GlStateManager.popMatrix();
     }
 }

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

@@ -1,10 +1,7 @@
 package com.replaymod.core.utils;
 
-import io.netty.buffer.Unpooled;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.network.play.server.S3FPacketCustomPayload;
-
-import java.io.IOException;
+import net.minecraft.network.play.server.SPacketCustomPayload;
 
 /**
  * Restrictions set by the server,
@@ -17,8 +14,8 @@ public class Restrictions {
     private boolean onlyFirstPerson;
     private boolean onlyRecordingPlayer;
 
-    public String handle(S3FPacketCustomPayload packet) throws IOException {
-        PacketBuffer buffer = new PacketBuffer(Unpooled.wrappedBuffer(packet.func_149168_d()));
+    public String handle(SPacketCustomPayload packet) {
+        PacketBuffer buffer = packet.getBufferData();
         while (buffer.isReadable()) {
             String name = buffer.readStringFromBuffer(64);
             boolean active = buffer.readBoolean();

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

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

src/main/java/com/replaymod/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

@@ -1,42 +0,0 @@
-package com.replaymod.editor;
-
-import com.replaymod.core.ReplayMod;
-import com.replaymod.editor.handler.GuiHandler;
-import com.replaymod.online.Setting;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-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";
-
-    @Mod.Instance(MOD_ID)
-    public static ReplayModEditor instance;
-
-    private ReplayMod core;
-
-    public static Logger LOGGER;
-
-    @Mod.EventHandler
-    public void preInit(FMLPreInitializationEvent event) {
-        ReplayModEditor.LOGGER = event.getModLog();
-        core = ReplayMod.instance;
-
-        core.getSettingsRegistry().register(Setting.class);
-    }
-
-    @Mod.EventHandler
-    public void init(FMLInitializationEvent event) {
-        new GuiHandler(this).register();
-    }
-
-    public ReplayMod getCore() {
-        return core;
-    }
-}

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

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

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

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

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

@@ -1,54 +0,0 @@
-package com.replaymod.editor.handler;
-
-import com.replaymod.editor.ReplayModEditor;
-import com.replaymod.editor.gui.GuiReplayEditor;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import de.johni0702.minecraft.gui.container.GuiScreen;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.resources.I18n;
-import net.minecraftforge.client.event.GuiScreenEvent;
-import net.minecraftforge.common.MinecraftForge;
-
-import java.util.List;
-
-public class GuiHandler {
-    private static final int BUTTON_REPLAY_EDITOR = 17890237;
-
-    private final ReplayModEditor mod;
-
-    public GuiHandler(ReplayModEditor mod) {
-        this.mod = mod;
-    }
-
-    public void register() {
-        FMLCommonHandler.instance().bus().register(this);
-        MinecraftForge.EVENT_BUS.register(this);
-    }
-
-    @SubscribeEvent
-    public void injectIntoMainMenu(GuiScreenEvent.InitGuiEvent event) {
-        if (!(event.gui 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"));
-        button.width = button.width / 2 - 2;
-        buttonList.add(button);
-    }
-
-    @SubscribeEvent
-    public void onButton(GuiScreenEvent.ActionPerformedEvent.Pre event) {
-        if(!event.button.enabled) return;
-
-        if (event.gui instanceof GuiMainMenu) {
-            if (event.button.id == BUTTON_REPLAY_EDITOR) {
-                new GuiReplayEditor(GuiScreen.wrap(event.gui), mod.getCore()).display();
-            }
-        }
-    }
-}

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

@@ -5,17 +5,19 @@ import com.replaymod.replay.ReplayHandler;
 import com.replaymod.replay.ReplayModReplay;
 import com.replaymod.replay.events.ReplayOpenEvent;
 import com.replaymod.replay.gui.overlay.GuiReplayOverlay;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
 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.common.MinecraftForge;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
 import org.lwjgl.input.Keyboard;
 
 public class FullBrightness implements Extra {
-    private ReplayModReplay module;
+    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private static ReplayModReplay module;
 
     private final IGuiImage indicator = new GuiImage().setTexture(ReplayMod.TEXTURE, 90, 20, 19, 13).setSize(19, 13);
 
@@ -25,7 +27,6 @@ public class FullBrightness implements Extra {
 
     @Override
     public void register(final ReplayMod mod) throws Exception {
-        this.module = ReplayModReplay.instance;
         this.gameSettings = mod.getMinecraft().gameSettings;
 
         mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.lighting", Keyboard.KEY_Z, new Runnable() {
@@ -40,7 +41,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

@@ -4,8 +4,6 @@ import com.replaymod.core.KeyBindingRegistry;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.replay.events.ReplayOpenEvent;
 import com.replaymod.replay.gui.overlay.GuiReplayOverlay;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import de.johni0702.minecraft.gui.GuiRenderer;
 import de.johni0702.minecraft.gui.RenderInfo;
 import de.johni0702.minecraft.gui.container.GuiContainer;
@@ -19,6 +17,8 @@ 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.common.MinecraftForge;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.util.Dimension;
 import org.lwjgl.util.ReadableDimension;
@@ -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 net.minecraftforge.fml.common.Mod;
+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/";
+    @Mod.Instance(ReplayModOnline.MOD_ID)
+    private static 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());
-
-                // Add lang files as resource pack
-                mc.addScheduledTask(() -> {
+        Thread localizedResourcePackLoader = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
                     @SuppressWarnings("unchecked")
                     List<IResourcePack> defaultResourcePacks = mc.defaultResourcePacks;
-                    defaultResourcePacks.add(new LocalizedResourcePack(languages));
-                    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

@@ -2,7 +2,6 @@ package com.replaymod.extras;
 
 import com.replaymod.core.ReplayMod;
 import com.replaymod.core.Setting;
-import cpw.mods.fml.common.Loader;
 import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
 import de.johni0702.minecraft.gui.container.GuiContainer;
 import de.johni0702.minecraft.gui.container.GuiPanel;
@@ -15,9 +14,9 @@ import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import de.johni0702.minecraft.gui.layout.VerticalLayout;
 import de.johni0702.minecraft.gui.popup.AbstractGuiPopup;
 import de.johni0702.minecraft.gui.utils.Colors;
+import 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

@@ -4,28 +4,24 @@ import com.replaymod.core.ReplayMod;
 import com.replaymod.extras.playeroverview.PlayerOverview;
 import com.replaymod.extras.urischeme.UriSchemeExtra;
 import com.replaymod.extras.youtube.YoutubeUpload;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import org.apache.logging.log4j.Logger;
 
 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)
+@Mod(modid = ReplayModExtras.MOD_ID, useMetadata = true)
 public class ReplayModExtras {
     public static final String MOD_ID = "replaymod-extras";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModExtras instance;
 
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
+
     private static final List<Class<? extends Extra>> builtin = Arrays.asList(
             PlayerOverview.class,
             UriSchemeExtra.class,
@@ -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
@@ -50,15 +44,10 @@ public class ReplayModExtras {
         for (Class<? extends Extra> cls : builtin) {
             try {
                 Extra extra = cls.newInstance();
-                extra.register(ReplayMod.instance);
-                instances.put(cls, extra);
+                extra.register(core);
             } 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

@@ -1,6 +1,7 @@
 package com.replaymod.extras.playeroverview;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.core.utils.Utils;
 import com.replaymod.extras.Extra;
@@ -8,43 +9,37 @@ import com.replaymod.replay.ReplayModReplay;
 import com.replaymod.replay.camera.CameraEntity;
 import com.replaymod.replay.events.ReplayCloseEvent;
 import com.replaymod.replay.events.ReplayOpenEvent;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-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.client.event.RenderPlayerEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 
 import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
+import java.util.*;
 
 public class PlayerOverview implements Extra {
-    private ReplayModReplay module;
+    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private static ReplayModReplay module;
 
     private final Set<UUID> hiddenPlayers = new HashSet<>();
     private boolean savingEnabled;
 
     @Override
     public void register(final ReplayMod mod) throws Exception {
-        this.module = ReplayModReplay.instance;
-
         mod.getKeyBindingRegistry().registerKeyBinding("replaymod.input.playeroverview", Keyboard.KEY_B, new Runnable() {
             @Override
             public void run() {
                 if (module.getReplayHandler() != null) {
                     @SuppressWarnings("unchecked")
-                    List<EntityPlayer> players = mod.getMinecraft().theWorld.playerEntities;
-                    players = players.stream()
-                            .filter(it -> !(it instanceof CameraEntity)) // Exclude the camera entity
-                            .collect(Collectors.toList());
+                    List<EntityPlayer> players = mod.getMinecraft().theWorld.getPlayers(EntityPlayer.class, new Predicate() {
+                        @Override
+                        public boolean apply(Object input) {
+                            return !(input instanceof CameraEntity); // Exclude the camera entity
+                        }
+                    });
                     if (!Utils.isCtrlDown()) {
                         // Hide all players that have an UUID v2 (commonly used for NPCs)
                         Iterator<EntityPlayer> iter = players.iterator();
@@ -60,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) {
@@ -92,21 +92,6 @@ public class PlayerOverview implements Extra {
         hiddenPlayers.clear();
     }
 
-    @SubscribeEvent
-    public void oRenderHand(RenderHandEvent event) {
-        Entity view = module.getCore().getMinecraft().renderViewEntity;
-        if (view != null && isHidden(view.getUniqueID())) {
-            event.setCanceled(true);
-        }
-    }
-
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
-    public void preRenderPlayer(RenderPlayerEvent.Pre event) {
-        if (isHidden(event.entityPlayer.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;
@@ -20,7 +15,9 @@ import de.johni0702.minecraft.gui.layout.HorizontalLayout;
 import de.johni0702.minecraft.gui.utils.Colors;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.potion.Potion;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+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;
@@ -40,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.createPositionedSoundRecord(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.createPositionedSoundRecord(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);
@@ -95,10 +91,12 @@ 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);
-                            renderer.drawTexturedRect(0, 0, 40, 8, size.getWidth(), size.getHeight(), 8, 8, 64, 64);
+                            if (p.isWearing(EnumPlayerModelParts.HAT)) {
+                                renderer.drawTexturedRect(0, 0, 40, 8, size.getWidth(), size.getHeight(), 8, 8, 64, 64);
+                            }
                         }
                     }.setSize(16, 16),
-                    new GuiLabel().setText(p.getDisplayName()).setColor(isSpectator(p) ? Colors.DKGREY : Colors.WHITE)
+                    new GuiLabel().setText(p.getName()).setColor(isSpectator(p) ? Colors.DKGREY : Colors.WHITE)
             ).onClick(new Runnable() {
                 @Override
                 public void run() {
@@ -142,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> {
@@ -150,7 +148,7 @@ public class PlayerOverviewGui extends GuiScreen implements Closeable {
         public int compare(EntityPlayer o1, EntityPlayer o2) {
             if (isSpectator(o1) && !isSpectator(o2)) return 1;
             if (isSpectator(o2) && !isSpectator(o1)) return -1;
-            return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName());
+            return o1.getName().compareToIgnoreCase(o2.getName());
         }
     }
 }

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

@@ -1,39 +0,0 @@
-package com.replaymod.extras.playeroverview.mixin;
-
-import com.replaymod.extras.ReplayModExtras;
-import com.replaymod.extras.playeroverview.PlayerOverview;
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.renderer.entity.RenderPlayer;
-import net.minecraft.client.renderer.entity.RendererLivingEntity;
-import net.minecraft.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-
-import java.util.UUID;
-
-/**
- * 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 methods we modify in this mixin.
- * 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 = RenderPlayer.class, priority = 1200)
-public abstract class MixinRenderPlayer extends RendererLivingEntity {
-    public MixinRenderPlayer(ModelBase p_i1261_1_, float p_i1261_2_) {
-        super(p_i1261_1_, p_i1261_2_);
-    }
-
-    @Override
-    public void doRenderShadowAndFire(Entity entity, double d1, double d2, double d3, float f1, float f2) {
-        UUID uuid = entity.getUniqueID();
-        if (!ReplayModExtras.instance.get(PlayerOverview.class).map(po -> po.isHidden(uuid)).orElse(false)) {
-            super.doRenderShadowAndFire(entity, d1, d2, d3, f1, f2);
-        }
-    }
-}

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/urischeme/UriSchemeExtra.java

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

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

@@ -3,11 +3,11 @@ package com.replaymod.extras.youtube;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.extras.Extra;
 import com.replaymod.render.gui.GuiRenderingDone;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import de.johni0702.minecraft.gui.container.GuiScreen;
 import de.johni0702.minecraft.gui.element.GuiButton;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class YoutubeUpload implements Extra {
     @Override
@@ -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

@@ -11,14 +11,14 @@ import com.replaymod.replay.events.ReplayCloseEvent;
 import com.replaymod.replaystudio.replay.ReplayFile;
 import com.replaymod.replaystudio.replay.ZipReplayFile;
 import com.replaymod.replaystudio.studio.ReplayStudio;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import de.johni0702.minecraft.gui.container.GuiScreen;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.fml.common.Mod;
+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.SubscribeEvent;
 import org.apache.logging.log4j.Logger;
 
 import java.io.File;
@@ -26,22 +26,20 @@ import java.io.IOException;
 
 import static net.minecraft.client.Minecraft.getMinecraft;
 
-@Mod(modid = ReplayModOnline.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
-        useMetadata = true)
+@Mod(modid = ReplayModOnline.MOD_ID, useMetadata = true)
 public class ReplayModOnline {
     public static final String MOD_ID = "replaymod-online";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModOnline instance;
 
-    private ReplayMod core;
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
 
-    private ReplayModReplay replayModule;
+    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private static ReplayModReplay replayModule;
 
-    public static Logger LOGGER;
+    private Logger logger;
 
     private ApiClient apiClient;
 
@@ -54,9 +52,7 @@ public class ReplayModOnline {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        LOGGER = event.getModLog();
-        core = ReplayMod.instance;
-        replayModule = ReplayModReplay.instance;
+        logger = event.getModLog();
 
         core.getSettingsRegistry().register(Setting.class);
 
@@ -68,14 +64,12 @@ public class ReplayModOnline {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        if (!getDownloadsFolder().exists()){
-            if (!getDownloadsFolder().mkdirs()) {
-                LOGGER.warn("Failed to create downloads folder: " + getDownloadsFolder());
-            }
+        if (!getDownloadsFolder().mkdirs()) {
+            logger.warn("Failed to create downloads folder: " + getDownloadsFolder());
         }
 
         new GuiHandler(this).register();
-        FMLCommonHandler.instance().bus().register(this);
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
     @Mod.EventHandler
@@ -83,10 +77,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 +91,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

@@ -5,8 +5,6 @@ import com.replaymod.online.gui.GuiLoginPrompt;
 import com.replaymod.online.gui.GuiReplayCenter;
 import com.replaymod.online.gui.GuiUploadReplay;
 import com.replaymod.replay.gui.screen.GuiReplayViewer;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
 import de.johni0702.minecraft.gui.container.GuiPanel;
 import de.johni0702.minecraft.gui.container.GuiScreen;
@@ -16,9 +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.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

@@ -10,9 +10,9 @@ 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 cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.client.Minecraft;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import javax.annotation.Nullable;
 import java.util.Iterator;
@@ -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/RealtimeTimelinePlayer.java

@@ -3,7 +3,6 @@ package com.replaymod.pathing.player;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.replaymod.replay.ReplayHandler;
 import com.replaymod.replaystudio.pathing.path.Timeline;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 /**
  * Timeline player using the system time.
@@ -33,7 +32,6 @@ public class RealtimeTimelinePlayer extends AbstractTimelinePlayer {
     }
 
     @Override
-    @SubscribeEvent // 1.7.10 doesn't yet deal properly with inherited, overridden event handlers
     public void onTick(ReplayTimer.UpdatedEvent event) {
         if (secondFrame) {
             secondFrame = false;

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

@@ -1,9 +1,9 @@
 package com.replaymod.pathing.player;
 
 import com.replaymod.core.utils.WrappedTimer;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.Event;
 import net.minecraft.util.Timer;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.eventhandler.Event;
 
 /**
  * Wrapper around the current timer that prevents the timer from advancing by itself.
@@ -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/pathing/properties/SpectatorProperty.java

@@ -8,7 +8,6 @@ import com.replaymod.replaystudio.pathing.property.PropertyPart;
 import com.replaymod.replaystudio.pathing.property.PropertyParts;
 import lombok.NonNull;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.world.World;
 
 import java.io.IOException;
@@ -37,9 +36,7 @@ public class SpectatorProperty extends AbstractProperty<Integer> {
         // Lookup entity by id, returns null if an entity with the id does not exists
         Entity target = world.getEntityByID(value);
         // Spectate entity, when called with null, returns to camera
-        if (target instanceof EntityLivingBase) {
-            handler.spectateEntity((EntityLivingBase) target);
-        }
+        handler.spectateEntity(target);
     }
 
     @Override

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

@@ -4,30 +4,25 @@ import com.replaymod.core.ReplayMod;
 import com.replaymod.core.utils.Restrictions;
 import com.replaymod.recording.handler.ConnectionEventHandler;
 import com.replaymod.recording.packet.PacketListener;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.eventhandler.EventBus;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandler;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraft.network.NetworkManager;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.eventhandler.EventBus;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Keyboard;
 
-@Mod(modid = ReplayModRecording.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
-        useMetadata = true)
+@Mod(modid = ReplayModRecording.MOD_ID, useMetadata = true)
 public class ReplayModRecording {
     public static final String MOD_ID = "replaymod-recording";
 
     @Mod.Instance(MOD_ID)
     public static ReplayModRecording instance;
 
-    private ReplayMod core;
+    @Mod.Instance(ReplayMod.MOD_ID)
+    private static ReplayMod core;
 
     private Logger logger;
 
@@ -36,7 +31,6 @@ public class ReplayModRecording {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
-        core = ReplayMod.instance;
 
         core.getSettingsRegistry().register(Setting.class);
 
@@ -54,15 +48,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

@@ -2,14 +2,14 @@ package com.replaymod.recording.gui;
 
 import com.replaymod.core.SettingsRegistry;
 import com.replaymod.recording.Setting;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.common.MinecraftForge;
-import org.lwjgl.opengl.GL11;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import static com.replaymod.core.ReplayMod.TEXTURE;
 import static com.replaymod.core.ReplayMod.TEXTURE_SIZE;
@@ -40,12 +40,13 @@ 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);
             mc.renderEngine.bindTexture(TEXTURE);
-            GL11.glEnable(GL11.GL_ALPHA_TEST);
+            GlStateManager.resetColor();
+            GlStateManager.enableAlpha();
             Gui.drawModalRectWithCustomSizedTexture(10, 10, 58, 20, 16, 16, TEXTURE_SIZE, TEXTURE_SIZE);
         }
     }

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;
@@ -10,10 +9,11 @@ import com.replaymod.replaystudio.replay.ReplayFile;
 import com.replaymod.replaystudio.replay.ReplayMetaData;
 import com.replaymod.replaystudio.replay.ZipReplayFile;
 import com.replaymod.replaystudio.studio.ReplayStudio;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.FMLNetworkEvent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.NetworkManager;
+import net.minecraft.world.WorldType;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent;
 import org.apache.logging.log4j.Logger;
 
 import java.io.File;
@@ -46,6 +46,10 @@ public class ConnectionEventHandler {
         try {
             boolean local = networkManager.isLocalChannel();
             if (local) {
+                if (mc.getIntegratedServer().getEntityWorld().getWorldType() == WorldType.DEBUG_WORLD) {
+                    logger.info("Debug World recording is not supported.");
+                    return;
+                }
                 if(!core.getSettingsRegistry().get(Setting.RECORD_SINGLEPLAYER)) {
                     logger.info("Singleplayer Recording is disabled");
                     return;
@@ -70,7 +74,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());
@@ -91,14 +95,14 @@ public class ConnectionEventHandler {
             guiOverlay.register();
 
             core.printInfoToChat("replaymod.chat.recordingstarted");
-        } catch(Throwable e) {
+        } catch(Exception e) {
             e.printStackTrace();
             core.printWarningToChat("replaymod.chat.recordingfailed");
         }
     }
 
     @SubscribeEvent
-    public void onDisconnectedFromServerEvent(FMLNetworkEvent.ClientDisconnectionFromServerEvent event) {
+    public void onDisconnectedFromServerEvent(ClientDisconnectionFromServerEvent event) {
         if (packetListener != null) {
             guiOverlay.unregister();
             guiOverlay = null;