Get editor module compiling on 1.13

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

@@ -7,6 +7,7 @@ import com.replaymod.core.gui.RestoreReplayGui;
 import com.replaymod.core.handler.MainMenuHandler;
 import com.replaymod.core.utils.OpenGLUtils;
 import com.replaymod.core.versions.MCVer;
+import com.replaymod.editor.ReplayModEditor;
 import com.replaymod.online.ReplayModOnline;
 import com.replaymod.recording.ReplayModRecording;
 import com.replaymod.render.ReplayModRender;
@@ -170,6 +171,7 @@ public class ReplayMod implements Module {
         modules.add(new ReplayModOnline(this, replayModule));
         modules.add(new ReplayModRender(this));
         modules.add(new ReplayModSimplePathing(this));
+        modules.add(new ReplayModEditor(this));
 
         //#if MC>=11300
         settingsRegistry.register();

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

@@ -1,48 +1,28 @@
 package com.replaymod.editor;
 
+import com.replaymod.core.Module;
 import com.replaymod.core.ReplayMod;
 import com.replaymod.editor.handler.GuiHandler;
 import com.replaymod.online.Setting;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-//#if MC>=10800
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-//#else
-//$$ import cpw.mods.fml.common.Mod;
-//$$ import cpw.mods.fml.common.event.FMLInitializationEvent;
-//$$ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-//#endif
-
-@Mod(modid = ReplayModEditor.MOD_ID,
-        version = "@MOD_VERSION@",
-        acceptedMinecraftVersions = "@MC_VERSION@",
-        acceptableRemoteVersions = "*",
-        //#if MC>=10800
-        clientSideOnly = true,
-        //#endif
-        useMetadata = true)
-public class ReplayModEditor {
-    public static final String MOD_ID = "replaymod-editor";
-
-    @Mod.Instance(MOD_ID)
+public class ReplayModEditor implements Module {
+    { instance = this; }
     public static ReplayModEditor instance;
 
     private ReplayMod core;
 
-    public static Logger LOGGER;
+    public static Logger LOGGER = LogManager.getLogger();
 
-    @Mod.EventHandler
-    public void preInit(FMLPreInitializationEvent event) {
-        ReplayModEditor.LOGGER = event.getModLog();
-        core = ReplayMod.instance;
+    public ReplayModEditor(ReplayMod core) {
+        this.core = core;
 
         core.getSettingsRegistry().register(Setting.class);
     }
 
-    @Mod.EventHandler
-    public void init(FMLInitializationEvent event) {
+    @Override
+    public void initClient() {
         new GuiHandler(this).register();
     }
 

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

@@ -34,10 +34,10 @@ 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 de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
 import net.minecraft.crash.CrashReport;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.lwjgl.util.ReadableDimension;
 
 import javax.annotation.Nullable;
 import java.io.File;

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

@@ -22,10 +22,10 @@ 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 de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.crash.CrashReport;
 import org.apache.commons.lang3.tuple.Pair;
-import org.lwjgl.util.Dimension;
 
 import javax.annotation.Nullable;
 import java.io.File;

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

@@ -9,7 +9,12 @@ import net.minecraft.client.resources.I18n;
 import net.minecraftforge.client.event.GuiScreenEvent;
 
 //#if MC>=10800
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+//#if MC>=11300
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import java.util.ArrayList;
+//#else
+//$$ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+//#endif
 //#else
 //$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 //#endif
@@ -37,9 +42,16 @@ public class GuiHandler {
         }
 
         GuiButton button = new GuiButton(BUTTON_REPLAY_EDITOR, getGui(event).width / 2 + 2,
-                getGui(event).height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayeditor"));
+                getGui(event).height / 4 + 10 + 3 * 24, I18n.format("replaymod.gui.replayeditor")) {
+            //#if MC>=11300
+            @Override
+            public void onClick(double mouseX, double mouseY) {
+                onButton(new GuiScreenEvent.ActionPerformedEvent.Pre(getGui(event), this, new ArrayList<>()));
+            }
+            //#endif
+        };
         button.width = button.width / 2 - 2;
-        getButtonList(event).add(button);
+        addButton(event, button);
     }
 
     @SubscribeEvent

versions/common.gradle

@@ -274,7 +274,6 @@ sourceSets {
     main {
         java {
             exclude 'com/replaymod/compat'
-            exclude 'com/replaymod/editor'
             exclude 'com/replaymod/extras'
             exclude 'com/replaymod/restrictions'
         }