diff --git a/build.gradle b/build.gradle
index 600ce812..757f363b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,10 @@
 buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
     }
 }
 
@@ -18,18 +17,18 @@ apply plugin: 'net.minecraftforge.gradle'
 
 def getGitRef() {
     try {
-        def stdout = new ByteArrayOutputStream()
+        final def stdout = new ByteArrayOutputStream()
         exec {
             commandLine 'git', 'rev-parse', '--short', 'HEAD'
             standardOutput = stdout
         }
         return stdout.toString().trim()
-    } catch (Throwable ignored) {
+    } catch (final Throwable ignored) {
         return "unknown"
     }
 }
 
-String semver = "${version_major}.${version_minor}.${version_patch}"
+final def semver = "${version_major}.${version_minor}.${version_patch}"
 
 String build_number = System.getenv("PROMOTED_NUMBER");
 if (build_number == null)
@@ -41,8 +40,7 @@ version = "${semver}+${build_number}"
 group = mod_group
 archivesBaseName = "${mod_name.replace(' ', '-')}-MC${minecraft_version}-Forge"
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
-compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaVersion.VERSION_1_8
+java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
 repositories {
     mavenCentral()
diff --git a/gradle.properties b/gradle.properties
index 34c7ce2f..6a4a3e4a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,8 +7,8 @@ minecraft_version=1.16.5
 minecraft_version_min=1.16.5
 mappings_channel=snapshot
 mappings_version=20201028-1.16.3
-forge_version=36.0.46
-forge_version_min=36.0.34
+forge_version=36.1.13
+forge_version_min=36.1.0
 
 mod_group=li.cil.oc2
 mod_id=oc2
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1d5b29fb..1c4bcc29 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip