diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle
index e422ef89..fabfd87d 100644
--- a/DynmapCore/build.gradle
+++ b/DynmapCore/build.gradle
@@ -1,26 +1,27 @@
 description = "DynmapCore"
 
 dependencies {
-    compile project(path: ':DynmapCoreAPI', configuration: 'shadow')
-    compile 'javax.servlet:javax.servlet-api:3.1'
-    compile 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
-    compile 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117'
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
-    compile 'org.yaml:snakeyaml:1.23'
-    compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
-    compile 'org.postgresql:postgresql:42.2.18'
+    implementation project(path: ':DynmapCoreAPI', configuration: 'shadow')
+    implementation 'javax.servlet:javax.servlet-api:3.1'
+    implementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
+    implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117'
+    implementation 'com.googlecode.json-simple:json-simple:1.1.1'
+    implementation 'org.yaml:snakeyaml:1.23'
+    implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
+    implementation 'org.postgresql:postgresql:42.2.18'
 }
 
 processResources {
     // replace stuff in mcmod.info, nothing else
-	from('src/main/resources') {
-	    include 'core.yml'
-	    include 'lightings.txt'
-	    include 'perspectives.txt'
-	    include 'shaders.txt'
-		include 'extracted/web/version.js'
-		include 'extracted/web/index.html'
-		include 'extracted/web/login.html'
+    filesMatching([
+        'core.yml',
+        'lightings.txt',
+        'perspectives.txt',
+        'shaders.txt',
+        'extracted/web/version.js',
+        'extracted/web/index.html',
+        'extracted/web/login.html',
+    ]) {
         // replace version and mcversion
         expand(
                 buildnumber: project.parent.ext.globals.buildNumber,
diff --git a/build.gradle b/build.gradle
index f286b5da..ac691e37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id  "com.github.johnrengelman.shadow" version "2.0.4"
     id  'java'
-    id  'maven'
     id  'maven-publish'
 }
 
@@ -32,7 +31,6 @@ ext {
 subprojects {  
   apply plugin: "com.github.johnrengelman.shadow"
   apply plugin: 'java'
-  apply plugin: 'maven'
   apply plugin: 'maven-publish'
 
   sourceCompatibility = 1.8
diff --git a/bukkit-helper-113-2/build.gradle b/bukkit-helper-113-2/build.gradle
index 823fe09d..f9046235 100644
--- a/bukkit-helper-113-2/build.gradle
+++ b/bukkit-helper-113-2/build.gradle
@@ -2,9 +2,9 @@
 description = 'bukkit-helper-1.13.2'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.bukkit', name: 'bukkit', version:'1.13.2-R0.1-SNAPSHOT'
-  compile group: 'org.bukkit', name: 'craftbukkit', version:'1.13.2-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.bukkit', name: 'bukkit', version:'1.13.2-R0.1-SNAPSHOT'
+  implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.13.2-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-114-1/build.gradle b/bukkit-helper-114-1/build.gradle
index 4e2e14e8..272050d6 100644
--- a/bukkit-helper-114-1/build.gradle
+++ b/bukkit-helper-114-1/build.gradle
@@ -2,9 +2,9 @@
 description = 'bukkit-helper-1.14.1'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.bukkit', name: 'bukkit', version:'1.14.1-R0.1-SNAPSHOT'
-  compile group: 'org.bukkit', name: 'craftbukkit', version:'1.14.1-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.bukkit', name: 'bukkit', version:'1.14.1-R0.1-SNAPSHOT'
+  implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.14.1-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-115/build.gradle b/bukkit-helper-115/build.gradle
index 598021f9..ab17c528 100644
--- a/bukkit-helper-115/build.gradle
+++ b/bukkit-helper-115/build.gradle
@@ -2,9 +2,9 @@
 description = 'bukkit-helper-1.15'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.bukkit', name: 'bukkit', version:'1.15-R0.1-SNAPSHOT'
-  compile group: 'org.bukkit', name: 'craftbukkit', version:'1.15-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.bukkit', name: 'bukkit', version:'1.15-R0.1-SNAPSHOT'
+  implementation group: 'org.bukkit', name: 'craftbukkit', version:'1.15-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-116-2/build.gradle b/bukkit-helper-116-2/build.gradle
index cf47cc64..0c43eaed 100644
--- a/bukkit-helper-116-2/build.gradle
+++ b/bukkit-helper-116-2/build.gradle
@@ -2,9 +2,9 @@
 description = 'bukkit-helper-1.16'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.2-R0.1-SNAPSHOT'
-  compile group: 'org.spigotmc', name: 'spigot', version:'1.16.2-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.2-R0.1-SNAPSHOT'
+  implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.2-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-116-3/build.gradle b/bukkit-helper-116-3/build.gradle
index 37f82243..4bd69ecb 100644
--- a/bukkit-helper-116-3/build.gradle
+++ b/bukkit-helper-116-3/build.gradle
@@ -2,10 +2,10 @@
 description = 'bukkit-helper-1.16.3'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.3-R0.1-SNAPSHOT'
-  compile group: 'org.spigotmc', name: 'spigot', version:'1.16.3-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.3-R0.1-SNAPSHOT'
+  implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.3-R0.1-SNAPSHOT'
 
 }
diff --git a/bukkit-helper-116-4/build.gradle b/bukkit-helper-116-4/build.gradle
index feb308df..3a8e0785 100644
--- a/bukkit-helper-116-4/build.gradle
+++ b/bukkit-helper-116-4/build.gradle
@@ -2,9 +2,9 @@
 description = 'bukkit-helper-1.16.4'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.4-R0.1-SNAPSHOT'
-  compile group: 'org.spigotmc', name: 'spigot', version:'1.16.4-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.4-R0.1-SNAPSHOT'
+  implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.4-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-116/build.gradle b/bukkit-helper-116/build.gradle
index 933e5453..09bcd248 100644
--- a/bukkit-helper-116/build.gradle
+++ b/bukkit-helper-116/build.gradle
@@ -2,9 +2,9 @@
 description = 'bukkit-helper-1.16'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.spigotmc', name: 'spigot-api', version:'1.16.1-R0.1-SNAPSHOT'
-  compile group: 'org.spigotmc', name: 'spigot', version:'1.16.1-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.16.1-R0.1-SNAPSHOT'
+  implementation group: 'org.spigotmc', name: 'spigot', version:'1.16.1-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper-117/build.gradle b/bukkit-helper-117/build.gradle
index e4bb7ec3..c6b94998 100644
--- a/bukkit-helper-117/build.gradle
+++ b/bukkit-helper-117/build.gradle
@@ -2,9 +2,9 @@
 description = 'bukkit-helper-1.17'
 
 dependencies {
-  compile project(':bukkit-helper')
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.spigotmc', name: 'spigot-api', version:'1.17-R0.1-SNAPSHOT'
-  compile group: 'org.spigotmc', name: 'spigot', version:'1.17-R0.1-SNAPSHOT'
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.17-R0.1-SNAPSHOT'
+  implementation group: 'org.spigotmc', name: 'spigot', version:'1.17-R0.1-SNAPSHOT'
 }
diff --git a/bukkit-helper/build.gradle b/bukkit-helper/build.gradle
index 2e870323..4b8aaf98 100644
--- a/bukkit-helper/build.gradle
+++ b/bukkit-helper/build.gradle
@@ -2,8 +2,8 @@
 description = 'bukkit-helper'
 
 dependencies {
-  compile project(':dynmap-api')
-  compile project(path: ':DynmapCore', configuration: 'shadow')
-  compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
-  compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2'
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
+  implementation group: 'com.google.code.gson', name: 'gson', version:'2.8.2'
 }
diff --git a/dynmap-api/build.gradle b/dynmap-api/build.gradle
index 176f41ab..b6da9f47 100644
--- a/dynmap-api/build.gradle
+++ b/dynmap-api/build.gradle
@@ -2,8 +2,8 @@
 description = "dynmap-api"
 
 dependencies {
-    compile group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
-    compile project(":DynmapCoreAPI")
+    implementation group: 'org.bukkit', name: 'bukkit', version:'1.7.10-R0.1-SNAPSHOT'
+    implementation project(":DynmapCoreAPI")
 }
 
 jar {
diff --git a/fabric-1.14.4/build.gradle b/fabric-1.14.4/build.gradle
index 82a5959e..f0352ecf 100644
--- a/fabric-1.14.4/build.gradle
+++ b/fabric-1.14.4/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
     }
 }
 apply plugin: 'fabric-loom'
@@ -33,7 +33,6 @@ dependencies {
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
     shadow project(path: ':DynmapCore', configuration: 'shadow')
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@@ -41,16 +40,9 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching('fabric.mod.json') {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/fabric-1.15.2/build.gradle b/fabric-1.15.2/build.gradle
index 82a5959e..f0352ecf 100644
--- a/fabric-1.15.2/build.gradle
+++ b/fabric-1.15.2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
     }
 }
 apply plugin: 'fabric-loom'
@@ -33,7 +33,6 @@ dependencies {
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
     shadow project(path: ':DynmapCore', configuration: 'shadow')
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@@ -41,16 +40,9 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching('fabric.mod.json') {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/fabric-1.16.1/build.gradle b/fabric-1.16.1/build.gradle
index 82a5959e..f0352ecf 100644
--- a/fabric-1.16.1/build.gradle
+++ b/fabric-1.16.1/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
     }
 }
 apply plugin: 'fabric-loom'
@@ -33,7 +33,6 @@ dependencies {
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
     shadow project(path: ':DynmapCore', configuration: 'shadow')
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@@ -41,16 +40,9 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching('fabric.mod.json') {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/fabric-1.16.2/build.gradle b/fabric-1.16.2/build.gradle
index 82a5959e..f0352ecf 100644
--- a/fabric-1.16.2/build.gradle
+++ b/fabric-1.16.2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.9'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
     }
 }
 apply plugin: 'fabric-loom'
@@ -33,7 +33,6 @@ dependencies {
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
     shadow project(path: ':DynmapCore', configuration: 'shadow')
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@@ -41,16 +40,9 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching('fabric.mod.json') {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/fabric-1.16.4/build.gradle b/fabric-1.16.4/build.gradle
index 5f08125b..f0352ecf 100644
--- a/fabric-1.16.4/build.gradle
+++ b/fabric-1.16.4/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.5.35'
+        classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.6-SNAPSHOT'
     }
 }
 apply plugin: 'fabric-loom'
@@ -33,7 +33,6 @@ dependencies {
 
     compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    shadow project(path: ':DynmapCoreAPI', configuration: 'shadow')
     shadow project(path: ':DynmapCore', configuration: 'shadow')
 
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
@@ -41,16 +40,9 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching('fabric.mod.json') {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is
diff --git a/forge-1.11.2/build.gradle b/forge-1.11.2/build.gradle
index 7e4e4547..89505d91 100644
--- a/forge-1.11.2/build.gradle
+++ b/forge-1.11.2/build.gradle
@@ -16,10 +16,10 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
-    compile 'org.yaml:snakeyaml:1.23'
-    compile 'org.spongepowered:spongeapi:7.0.0'
+    implementation project(path: ":DynmapCore", configuration: "shadow")
+    implementation 'com.googlecode.json-simple:json-simple:1.1.1'
+    implementation 'org.yaml:snakeyaml:1.23'
+    implementation 'org.spongepowered:spongeapi:7.0.0'
 }
 
 sourceCompatibility = 1.8
diff --git a/forge-1.12.2/build.gradle b/forge-1.12.2/build.gradle
index ee6a0352..fd5c1f2d 100644
--- a/forge-1.12.2/build.gradle
+++ b/forge-1.12.2/build.gradle
@@ -14,10 +14,10 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
-    compile 'com.googlecode.json-simple:json-simple:1.1.1'
-    compile 'org.yaml:snakeyaml:1.23'
-    compile 'org.spongepowered:spongeapi:7.0.0'
+    implementation project(path: ":DynmapCore", configuration: "shadow")
+    implementation 'com.googlecode.json-simple:json-simple:1.1.1'
+    implementation 'org.yaml:snakeyaml:1.23'
+    implementation 'org.spongepowered:spongeapi:7.0.0'
 }
 
 sourceCompatibility = 1.8
diff --git a/forge-1.13.2/build.gradle b/forge-1.13.2/build.gradle
index 2b6ca886..b25440c5 100644
--- a/forge-1.13.2/build.gradle
+++ b/forge-1.13.2/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven {url = "https://oss.sonatype.org/content/repositories/snapshots/"}
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 
@@ -16,7 +16,7 @@ apply plugin: 'eclipse'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.13.2-25.0.219'
 }
 
@@ -37,23 +37,13 @@ project.archivesBaseName = "${project.archivesBaseName}-forge-1.13.2"
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.13.2"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/forge-1.14.4/build.gradle b/forge-1.14.4/build.gradle
index e6aa6f75..872b0684 100644
--- a/forge-1.14.4/build.gradle
+++ b/forge-1.14.4/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -29,29 +29,19 @@ minecraft {
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.14.4"
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.14.4-28.2.10'
 }
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.14.4"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/forge-1.15.2/build.gradle b/forge-1.15.2/build.gradle
index 77ac57c2..9892576f 100644
--- a/forge-1.15.2/build.gradle
+++ b/forge-1.15.2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -29,29 +29,19 @@ minecraft {
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.15.2"
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.15.2-31.2.3'
 }
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.15.2"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/forge-1.16.1/build.gradle b/forge-1.16.1/build.gradle
index 1c86b34c..acbcc970 100644
--- a/forge-1.16.1/build.gradle
+++ b/forge-1.16.1/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -29,29 +29,19 @@ minecraft {
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.1"
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.16.1-32.0.106'
 }
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.16.1"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/forge-1.16.2/build.gradle b/forge-1.16.2/build.gradle
index f0a01700..5fe6e9bf 100644
--- a/forge-1.16.2/build.gradle
+++ b/forge-1.16.2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -29,29 +29,19 @@ minecraft {
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.2"
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.16.2-33.0.5'
 }
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.16.2"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/forge-1.16.3/build.gradle b/forge-1.16.3/build.gradle
index 1047dcf5..af5d1378 100644
--- a/forge-1.16.3/build.gradle
+++ b/forge-1.16.3/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -29,29 +29,19 @@ minecraft {
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.3"
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.16.3-34.1.19'
 }
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.16.3"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/forge-1.16.4/build.gradle b/forge-1.16.4/build.gradle
index ca0dde8f..e38b1b3a 100644
--- a/forge-1.16.4/build.gradle
+++ b/forge-1.16.4/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -29,29 +29,19 @@ minecraft {
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.4"
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.16.4-35.1.36'
 }
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.16.4"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/forge-1.16.5/build.gradle b/forge-1.16.5/build.gradle
index 9ae8dc88..8576ff29 100644
--- a/forge-1.16.5/build.gradle
+++ b/forge-1.16.5/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -29,29 +29,19 @@ minecraft {
 project.archivesBaseName = "${project.archivesBaseName}-forge-1.16.5"
 
 dependencies {
-    compile project(path: ":DynmapCore", configuration: "shadow")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
     minecraft 'net.minecraftforge:forge:1.16.5-36.0.15'
 }
 
 processResources
 {
-    inputs.property "version", project.version + '-' + project.ext.buildNumber
-    
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-                
+    filesMatching('META-INF/mods.toml') {
         // replace version and mcversion
         expand(
         	version: project.version + '-' + project.ext.buildNumber,
         	mcversion: "1.16.5"
     	)
     }
-        
-    // copy everything else, thats not the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-    }
 }
 
 shadowJar {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 28861d27..29953ea1 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 e0b3fb8d..69a97150 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-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index f4c7724b..a94d91c4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,14 +17,14 @@ include ':fabric-1.16.2'
 include ':fabric-1.16.1'
 include ':fabric-1.15.2'
 include ':fabric-1.14.4'
-//include ':forge-1.16.5'
-//include ':forge-1.16.4'
-//include ':forge-1.16.3'
-//include ':forge-1.16.2'
-//include ':forge-1.16.1'
-//include ':forge-1.15.2'
-//include ':forge-1.14.4'
-//include ':forge-1.13.2'
+include ':forge-1.16.5'
+include ':forge-1.16.4'
+include ':forge-1.16.3'
+include ':forge-1.16.2'
+include ':forge-1.16.1'
+include ':forge-1.15.2'
+include ':forge-1.14.4'
+include ':forge-1.13.2'
 //include ':forge-1.12.2'
 //include ':forge-1.11.2'
 
@@ -46,14 +46,14 @@ project(':fabric-1.16.2').projectDir = "$rootDir/fabric-1.16.2" as File
 project(':fabric-1.16.1').projectDir = "$rootDir/fabric-1.16.1" as File
 project(':fabric-1.15.2').projectDir = "$rootDir/fabric-1.15.2" as File
 project(':fabric-1.14.4').projectDir = "$rootDir/fabric-1.14.4" as File
-//project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File
-//project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File
-//project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File
-//project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File
-//project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File
-//project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File
-//project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File
-//project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
+project(':forge-1.16.5').projectDir = "$rootDir/forge-1.16.5" as File
+project(':forge-1.16.4').projectDir = "$rootDir/forge-1.16.4" as File
+project(':forge-1.16.3').projectDir = "$rootDir/forge-1.16.3" as File
+project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File
+project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File
+project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File
+project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File
+project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
 //project(':forge-1.12.2').projectDir = "$rootDir/forge-1.12.2" as File
 //project(':forge-1.11.2').projectDir = "$rootDir/forge-1.11.2" as File
 
diff --git a/spigot/build.gradle b/spigot/build.gradle
index 18b2e554..c7620282 100644
--- a/spigot/build.gradle
+++ b/spigot/build.gradle
@@ -10,22 +10,22 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.bukkit', name: 'bukkit', version: '1.7.10-R0.1-SNAPSHOT'
-    compile 'com.nijikokun.bukkit:Permissions:3.1.6'
-    compile 'me.lucko.luckperms:luckperms-api:4.3'
-    compile 'net.luckperms:api:5.0'
-    compile('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
+    implementation group: 'org.bukkit', name: 'bukkit', version: '1.7.10-R0.1-SNAPSHOT'
+    implementation 'com.nijikokun.bukkit:Permissions:3.1.6'
+    implementation 'me.lucko.luckperms:luckperms-api:4.3'
+    implementation 'net.luckperms:api:5.0'
+    implementation('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
     compileOnly 'net.skinsrestorer:skinsrestorer:14.1.0-SNAPSHOT@jar'
-    compile project(":dynmap-api")
-    compile project(path: ":DynmapCore", configuration: "shadow")
-    compile group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
-    compile group: 'de.bananaco', name: 'bPermissions', version: '2.9.1'
-    compile group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6'
-    compile group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1'
-    compile group: 'org.bstats', name: 'bstats-bukkit', version: '1.5'
-    compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
-    compile project(':bukkit-helper')
+    implementation project(":dynmap-api")
+    implementation project(path: ":DynmapCore", configuration: "shadow")
+    implementation group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'
+    implementation group: 'de.bananaco', name: 'bPermissions', version: '2.9.1'
+    implementation group: 'com.platymuus.bukkit.permissions', name: 'PermissionsBukkit', version: '1.6'
+    implementation group: 'org.anjocaido', name: 'EssentialsGroupManager', version: '2.10.1'
+    implementation group: 'org.bstats', name: 'bstats-bukkit', version: '1.5'
+    implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
+    implementation project(':bukkit-helper')
     implementation(project(':bukkit-helper-113-2')) {
         transitive = false
     }
@@ -54,8 +54,7 @@ dependencies {
 
 processResources {
     // replace stuff in mcmod.info, nothing else
-    from('src/main/resources') {
-        include "plugin.yml"
+    filesMatching('plugin.yml') {
         // replace version and mcversion
         expand(
                 buildnumber: project.parent.ext.globals.buildNumber,