diff --git a/build.gradle b/build.gradle
index 941ef09..5efaafe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,8 +88,10 @@ jar {
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd"-"HH:mm:ssZ"),
             "TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
             "TweakOrder": "0",
-            "FMLCorePluginContainsFMLMod": "de.enzaxd.viaforge.injection.MixinLoader",
-            "MixinConfigs": "mixins.${mod_id}.json"
+            "FMLCorePluginContainsFMLMod": "true",
+            "FMLCorePlugin": "de.enzaxd.viaforge.injection.MixinLoader",
+            "MixinConfigs": "mixins.${mod_id}.json",
+            "ForceLoadAsMod": "true"
     )
     enabled = false
 }
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755
diff --git a/src/main/java/de/enzaxd/viaforge/ViaForge.java b/src/main/java/de/enzaxd/viaforge/ViaForge.java
index 895f090..5354f74 100644
--- a/src/main/java/de/enzaxd/viaforge/ViaForge.java
+++ b/src/main/java/de/enzaxd/viaforge/ViaForge.java
@@ -20,11 +20,16 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.logging.Logger;
 
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+
+@Mod(modid = "viaforge", name = "ViaForge", version = "1.0.0")
 public class ViaForge {
 
     public final static int SHARED_VERSION = 340;
 
-    private static final ViaForge instance = new ViaForge();
+    private static ViaForge instance = null;
+    { instance = this; } // called when forge initializes the mod
     private final Logger jLogger = new JLoggerToLog4j(LogManager.getLogger("ViaForge"));
     private final CompletableFuture<Void> initFuture = new CompletableFuture<>();
     private ExecutorService asyncExecutor;
@@ -37,7 +42,8 @@ public class ViaForge {
         return instance;
     }
 
-    public void start() {
+    @Mod.EventHandler
+    public void init(FMLPreInitializationEvent event) {
         ThreadFactory factory = new ThreadFactoryBuilder().setDaemon(true).setNameFormat("ViaForge-%d").build();
         asyncExecutor = Executors.newFixedThreadPool(8, factory);
 
diff --git a/src/main/java/de/enzaxd/viaforge/injection/mixins/MixinMinecraft.java b/src/main/java/de/enzaxd/viaforge/injection/mixins/MixinMinecraft.java
deleted file mode 100644
index b8a2eb8..0000000
--- a/src/main/java/de/enzaxd/viaforge/injection/mixins/MixinMinecraft.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.enzaxd.viaforge.injection.mixins;
-
-import de.enzaxd.viaforge.ViaForge;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.main.GameConfiguration;
-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(Minecraft.class)
-public abstract class MixinMinecraft {
-
-    @Inject(method = "<init>", at = @At("RETURN"))
-    public void injectConstructor(GameConfiguration p_i45547_1_, CallbackInfo ci) {
-        try {
-            ViaForge.getInstance().start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/src/main/java/de/enzaxd/viaforge/protocol/ProtocolCollection.java b/src/main/java/de/enzaxd/viaforge/protocol/ProtocolCollection.java
index 2855fdd..412b621 100644
--- a/src/main/java/de/enzaxd/viaforge/protocol/ProtocolCollection.java
+++ b/src/main/java/de/enzaxd/viaforge/protocol/ProtocolCollection.java
@@ -62,6 +62,6 @@ public enum ProtocolCollection {
         for (ProtocolCollection coll : values())
             if (coll.getVersion().getVersion() == id)
                 return coll.getVersion();
-        return null;
+        return R1_12_2.getVersion();
     }
 }
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
new file mode 100644
index 0000000..483c41c
--- /dev/null
+++ b/src/main/resources/mcmod.info
@@ -0,0 +1,16 @@
+[
+  {
+    "modid": "viaforge",
+    "name": "ViaForge",
+    "description": "",
+    "version": "1.0.0",
+    "mcversion": "1.12.2",
+    "url": "https://github.com/FlorianMichael/ViaForge",
+    "updateUrl": "",
+    "authorList": [],
+    "credits": "",
+    "logoFile": "",
+    "screenshots": [],
+    "dependencies": []
+  }
+]
diff --git a/src/main/resources/mixins.viaforge.json b/src/main/resources/mixins.viaforge.json
index ea8e8d0..050b5fb 100644
--- a/src/main/resources/mixins.viaforge.json
+++ b/src/main/resources/mixins.viaforge.json
@@ -11,7 +11,6 @@
         "MixinGuiMultiplayer",
         "MixinGuiScreenAddServer",
         "MixinGuiScreenServerList",
-        "MixinMinecraft",
         "MixinNetworkManagerChInit"
     ],
     "verbose": true
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
new file mode 100644
index 0000000..efafd46
--- /dev/null
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "ViaForge",
+        "pack_format": 3
+    }
+}