diff --git a/build.gradle b/build.gradle
index 4e1a63cf..707740ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,25 +3,23 @@ buildscript
     repositories 
     {
         jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
+        maven { url = 'https://maven.minecraftforge.net/' }
     }
     
     dependencies 
     {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
     }
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
 
 if (project.hasProperty("dev")) 
 {
     version += "-dev" + dev
 }
 
+version = project.version
 group = "mchorse.mclib"
 archivesBaseName = "mclib"
 sourceCompatibility = targetCompatibility = "1.8"
@@ -35,14 +33,24 @@ compileJava
 
 minecraft 
 {
-    version = "${mc_version}-${forge_version}"
-    runDir = "run"
-    mappings = snapshot
-    
-    clientJvmArgs = ["-Xmx1G", "-Dfml.coreMods.load=" + coremodPath]
-    serverJvmArgs = ["-Xmx1G"]
-    
-    replace "%VERSION%", project.version
+    mappings channel: 'snapshot', version: project.snapshot
+
+    runs {
+        client {
+            workingDirectory project.file('run')
+            jvmArgs(["-Dfml.coreMods.load=" + coremodPath])
+        }
+
+        server {
+
+        }
+    }
+}
+
+
+
+dependencies {
+    minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}"
 }
 
 jar {
@@ -53,29 +61,55 @@ jar {
 
 processResources
 {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
     inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
+    inputs.property "mcversion", project.mc_version
 
-	project.version += "-" + project.minecraft.version
+	project.version += "-" + project.mc_version
 
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-                
-        expand 'version':project.version, 'mcversion':project.minecraft.version
+
+        expand 'version':project.version, 'mcversion':project.mc_version
     }
-        
+
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
     }
 }
 
+import org.apache.tools.ant.filters.ReplaceTokens
+def copyDir = "$compileJava.temporaryDir/replaced"
+
+task tokenReplace(type:Copy){
+    var test = sourceSets.main.java.sourceDirectories;
+    from(sourceSets.main.java.sourceDirectories)
+    into copyDir
+    filter(ReplaceTokens, tokens: [VERSION: project.version])
+}
+
+compileJava.setSource(copyDir)
+
+compileJava.dependsOn(tokenReplace)
+
 /* Dev build */
 task deobfJar(type: Jar) {
     from sourceSets.main.output
     classifier = 'dev'
     
     manifest {
-        attributes 'FMLCorePlugin': coremodPath, 'FMLCorePluginContainsFMLMod': 'true'
+        attributes([
+                'FMLCorePlugin': coremodPath,
+                'FMLCorePluginContainsFMLMod': 'true',
+                "Specification-Title": project.archivesBaseName,
+                "Specification-Vendor": project.vendor,
+                "Specification-Version": "1", // We are version 1 of ourselves
+                "Implementation-Title": project.name,
+                "Implementation-Version": "${version}",
+                "Implementation-Vendor" : project.vendor,
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+        ])
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index b89207eb..723483f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,5 +3,6 @@ version=2.4.2
 coremodPath=mchorse.mclib.core.McLibCM
 
 mc_version=1.12.2
-forge_version=14.23.3.2655
-snapshot=snapshot_20171003
+forge_version=14.23.5.2860
+snapshot=20171003-1.12
+vendor=McHorse
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 30d399d8..41d9927a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e18cba72..aa991fce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
diff --git a/src/main/java/mchorse/mclib/McLib.java b/src/main/java/mchorse/mclib/McLib.java
index 18f25594..8d48d804 100644
--- a/src/main/java/mchorse/mclib/McLib.java
+++ b/src/main/java/mchorse/mclib/McLib.java
@@ -46,7 +46,7 @@
 public class McLib
 {
     public static final String MOD_ID = "mclib";
-    public static final String VERSION = "%VERSION%";
+    public static final String VERSION = "@VERSION@";
 
     /* Proxies */
     public static final String CLIENT_PROXY = "mchorse.mclib.ClientProxy";
diff --git a/src/main/java/mchorse/mclib/client/gui/framework/GuiBase.java b/src/main/java/mchorse/mclib/client/gui/framework/GuiBase.java
index fe0253cf..0ab6e881 100644
--- a/src/main/java/mchorse/mclib/client/gui/framework/GuiBase.java
+++ b/src/main/java/mchorse/mclib/client/gui/framework/GuiBase.java
@@ -1,6 +1,5 @@
 package mchorse.mclib.client.gui.framework;
 
-import jline.internal.Nullable;
 import mchorse.mclib.client.gui.framework.elements.IViewport;
 import mchorse.mclib.client.gui.framework.elements.utils.GuiContext;
 import mchorse.mclib.client.gui.framework.elements.GuiElement;
@@ -56,7 +55,6 @@ public GuiBase()
      * @param <T>
      * @return null if GuiBase.screen or GuiBase.screen.root is null or if the children List is empty.
      */
-    @Nullable
     public static <T> List<T> getCurrentChildren(Class<T> clazz)
     {
         if (GuiBase.getCurrent() != null && GuiBase.getCurrent().screen != null && GuiBase.getCurrent().screen.root != null)
diff --git a/src/main/java/mchorse/mclib/core/McLibCMInfo.java b/src/main/java/mchorse/mclib/core/McLibCMInfo.java
index 5bd58a42..c51ad976 100644
--- a/src/main/java/mchorse/mclib/core/McLibCMInfo.java
+++ b/src/main/java/mchorse/mclib/core/McLibCMInfo.java
@@ -25,6 +25,6 @@ public Object getMod()
     @Override
     public String getVersion()
     {
-        return "%VERSION%";
+        return "@VERSION@";
     }
 }
\ No newline at end of file