Replace @Mod.Instance with direct static references

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

@@ -2,7 +2,6 @@ package com.replaymod.compat;
 
 import com.replaymod.compat.optifine.DisableFastRender;
 import com.replaymod.compat.shaders.ShaderBeginRender;
-import com.replaymod.core.ReplayMod;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -12,9 +11,6 @@ import net.minecraftforge.fml.common.eventhandler.EventBus;
 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();

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

@@ -15,14 +15,14 @@ public class ReplayModEditor {
     @Mod.Instance(MOD_ID)
     public static ReplayModEditor instance;
 
-    @Mod.Instance(ReplayMod.MOD_ID)
+    private ReplayMod core;
-    private static 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);
     }

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

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

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

@@ -12,7 +12,6 @@ import net.minecraft.client.resources.IResourcePack;
 import net.minecraft.client.resources.data.IMetadataSection;
 import net.minecraft.client.resources.data.IMetadataSerializer;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.Mod;
 import org.apache.commons.lang3.StringEscapeUtils;
 
 import java.awt.image.BufferedImage;
@@ -26,11 +25,12 @@ import java.util.Map;
 import java.util.Set;
 
 public class LocalizationExtra implements Extra {
-    @Mod.Instance(ReplayModOnline.MOD_ID)
+    private ReplayModOnline module;
-    private static ReplayModOnline module;
 
     @Override
     public void register(ReplayMod mod) throws Exception {
+        this.module = ReplayModOnline.instance;
+
         final Minecraft mc = mod.getMinecraft();
         Thread localizedResourcePackLoader = new Thread(new Runnable() {
             @Override

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

@@ -19,9 +19,6 @@ public class ReplayModExtras {
     @Mod.Instance(MOD_ID)
     public static ReplayModExtras instance;
 
-    @Mod.Instance(ReplayMod.MOD_ID)
-    private static ReplayMod core;
-
     private static final List<Class<? extends Extra>> builtin = Arrays.asList(
             PlayerOverview.class,
             UriSchemeExtra.class,
@@ -44,7 +41,7 @@ public class ReplayModExtras {
         for (Class<? extends Extra> cls : builtin) {
             try {
                 Extra extra = cls.newInstance();
-                extra.register(core);
+                extra.register(ReplayMod.instance);
             } catch (Throwable t) {
                 logger.warn("Failed to load extra " + cls.getName() + ": ", t);
             }

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

@@ -13,7 +13,6 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.input.Keyboard;
 
@@ -21,14 +20,15 @@ import java.io.IOException;
 import java.util.*;
 
 public class PlayerOverview implements Extra {
-    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private ReplayModReplay module;
-    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() {

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

@@ -4,7 +4,6 @@ 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;
@@ -13,14 +12,14 @@ import java.net.ServerSocket;
 import java.net.Socket;
 
 public class UriSchemeExtra implements Extra {
-    @Mod.Instance(ReplayModOnline.MOD_ID)
+    private ReplayModOnline module;
-    private static ReplayModOnline module;
 
     private ReplayMod mod;
 
     @Override
     public void register(final ReplayMod mod) throws Exception {
         this.mod = mod;
+        this.module = ReplayModOnline.instance;
 
         UriScheme uriScheme = UriScheme.create();
         if (uriScheme == null) {

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

@@ -33,11 +33,9 @@ public class ReplayModOnline {
     @Mod.Instance(MOD_ID)
     public static ReplayModOnline instance;
 
-    @Mod.Instance(ReplayMod.MOD_ID)
+    private ReplayMod core;
-    private static ReplayMod core;
 
-    @Mod.Instance(ReplayModReplay.MOD_ID)
+    private ReplayModReplay replayModule;
-    private static ReplayModReplay replayModule;
 
     private Logger logger;
 
@@ -53,6 +51,8 @@ public class ReplayModOnline {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
+        core = ReplayMod.instance;
+        replayModule = ReplayModReplay.instance;
 
         core.getSettingsRegistry().register(Setting.class);
 

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

@@ -21,8 +21,7 @@ public class ReplayModRecording {
     @Mod.Instance(MOD_ID)
     public static ReplayModRecording instance;
 
-    @Mod.Instance(ReplayMod.MOD_ID)
+    private ReplayMod core;
-    private static ReplayMod core;
 
     private Logger logger;
 
@@ -31,6 +30,7 @@ public class ReplayModRecording {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
+        core = ReplayMod.instance;
 
         core.getSettingsRegistry().register(Setting.class);
 

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

@@ -19,8 +19,7 @@ public class ReplayModRender {
     @Mod.Instance(MOD_ID)
     public static ReplayModRender instance;
 
-    @Mod.Instance(ReplayMod.MOD_ID)
+    private ReplayMod core;
-    private static ReplayMod core;
 
     private Logger logger;
 
@@ -33,6 +32,7 @@ public class ReplayModRender {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
+        core = ReplayMod.instance;
         configuration = new Configuration(event.getSuggestedConfigurationFile());
 
         core.getSettingsRegistry().register(Setting.class);

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

@@ -35,8 +35,7 @@ public class ReplayModReplay {
     @Mod.Instance(MOD_ID)
     public static ReplayModReplay instance;
 
-    @Mod.Instance(ReplayMod.MOD_ID)
+    private ReplayMod core;
-    private static ReplayMod core;
 
     private final CameraControllerRegistry cameraControllerRegistry = new CameraControllerRegistry();
 
@@ -51,6 +50,7 @@ public class ReplayModReplay {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
+        core = ReplayMod.instance;
 
         core.getSettingsRegistry().register(Setting.class);
 

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

@@ -30,8 +30,7 @@ import java.io.IOException;
 public class ReplayModSimplePathing implements PathingRegistry {
     public static final String MOD_ID = "replaymod-simplepathing";
 
-    @Mod.Instance(ReplayMod.MOD_ID)
+    private ReplayMod core;
-    private static ReplayMod core;
 
     private Logger logger;
 
@@ -40,6 +39,7 @@ public class ReplayModSimplePathing implements PathingRegistry {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger = event.getModLog();
+        core = ReplayMod.instance;
 
         core.getSettingsRegistry().register(Setting.class);