Update Fabric/Forge to Minecraft 1.20

13 files changed, 33 insertions, 43 deletions

diff --git a/build.gradle b/build.gradle
index f1a0a8e..4c98616 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,6 @@ plugins {
 allprojects {
     group = 'me.lucko'
     version = '1.10-SNAPSHOT'
-
-    configurations {
-        compileClasspath // Fabric-loom needs this for remap jar for some reason
-    }
 }
 
 subprojects {
diff --git a/settings.gradle b/settings.gradle
index 5dd9582..82a69d0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,10 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        maven {
+            name = 'Forge'
+            url = 'https://maven.minecraftforge.net/'
+        }
         gradlePluginPortal()
     }
 }
diff --git a/spark-bukkit/build.gradle b/spark-bukkit/build.gradle
index 4c33dfc..87e9832 100644
--- a/spark-bukkit/build.gradle
+++ b/spark-bukkit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 dependencies {
@@ -29,7 +29,7 @@ processResources {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-bukkit.jar"
+    archiveFileName = "spark-${project.pluginVersion}-bukkit.jar"
 
     relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
     relocate 'net.kyori.examination', 'me.lucko.spark.lib.adventure.examination'
diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle
index 7e6b93f..7ff44cd 100644
--- a/spark-bungeecord/build.gradle
+++ b/spark-bungeecord/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 dependencies {
@@ -19,7 +19,7 @@ processResources {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-bungeecord.jar"
+    archiveFileName = "spark-${project.pluginVersion}-bungeecord.jar"
 
     relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
     relocate 'net.kyori.examination', 'me.lucko.spark.lib.adventure.examination'
diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index 23ebf31..2a32fc7 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -1,8 +1,8 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'fabric-loom' version '1.1-SNAPSHOT'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'fabric-loom' version '1.2-SNAPSHOT'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 tasks.withType(JavaCompile) {
@@ -28,9 +28,9 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft 'com.mojang:minecraft:1.19.4'
-    mappings 'net.fabricmc:yarn:1.19.4+build.1:v2'
-    modImplementation 'net.fabricmc:fabric-loader:0.14.17'
+    minecraft 'com.mojang:minecraft:1.20'
+    mappings 'net.fabricmc:yarn:1.20+build.1:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.14.21'
 
     Set<String> apiModules = [
             "fabric-api-base",
@@ -40,7 +40,7 @@ dependencies {
 
     // Add each module as a dependency
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, '0.76.0+1.19.4'))
+        modImplementation(fabricApi.module(it, '0.83.0+1.20'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.1-SNAPSHOT'))
diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle
index 16fc8f5..e7440f0 100644
--- a/spark-forge/build.gradle
+++ b/spark-forge/build.gradle
@@ -1,26 +1,15 @@
-buildscript {
-    repositories {
-        maven { url = "https://maven.minecraftforge.net" }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-    }
-}
-
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-
 tasks.withType(JavaCompile) {
     // override, compile targeting J17
     options.release = 17
 }
 
 minecraft {
-    mappings channel: 'official', version: '1.19.4'
+    mappings channel: 'official', version: '1.20'
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 }
 
@@ -30,7 +19,7 @@ configurations {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.4-45.0.1'
+    minecraft 'net.minecraftforge:forge:1.20-46.0.1'
     shade project(':spark-common')
 }
 
@@ -49,7 +38,7 @@ processResources {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-forge.jar"
+    archiveFileName = "spark-${project.pluginVersion}-forge.jar"
     configurations = [project.configurations.shade]
 
     relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
diff --git a/spark-minestom/build.gradle b/spark-minestom/build.gradle
index 788201b..22175a0 100644
--- a/spark-minestom/build.gradle
+++ b/spark-minestom/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 tasks.withType(JavaCompile) {
@@ -24,7 +24,7 @@ processResources {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-minestom.jar"
+    archiveFileName = "spark-${project.pluginVersion}-minestom.jar"
 
     dependencies {
         exclude(dependency('net.kyori:^(?!adventure-text-feature-pagination).+$'))
diff --git a/spark-nukkit/build.gradle b/spark-nukkit/build.gradle
index d2e4833..19e6b42 100644
--- a/spark-nukkit/build.gradle
+++ b/spark-nukkit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 dependencies {
@@ -23,7 +23,7 @@ processResources {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-nukkit.jar"
+    archiveFileName = "spark-${project.pluginVersion}-nukkit.jar"
 
     relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
     relocate 'net.kyori.examination', 'me.lucko.spark.lib.adventure.examination'
diff --git a/spark-sponge7/build.gradle b/spark-sponge7/build.gradle
index 0610a9a..ac9e841 100644
--- a/spark-sponge7/build.gradle
+++ b/spark-sponge7/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 dependencies {
diff --git a/spark-sponge8/build.gradle b/spark-sponge8/build.gradle
index cbd922f..486e05b 100644
--- a/spark-sponge8/build.gradle
+++ b/spark-sponge8/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 dependencies {
diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle
index 2e82cfc..fd81f90 100644
--- a/spark-velocity/build.gradle
+++ b/spark-velocity/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 dependencies {
@@ -20,7 +20,7 @@ blossom {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-velocity.jar"
+    archiveFileName = "spark-${project.pluginVersion}-velocity.jar"
 
     dependencies {
         exclude(dependency('net.kyori:^(?!adventure-text-feature-pagination).+$'))
diff --git a/spark-velocity4/build.gradle b/spark-velocity4/build.gradle
index 9b30caa..8bbb28b 100644
--- a/spark-velocity4/build.gradle
+++ b/spark-velocity4/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.kyori.blossom' version '1.3.0'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 tasks.withType(JavaCompile) {
@@ -25,7 +25,7 @@ blossom {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-velocity4.jar"
+    archiveFileName = "spark-${project.pluginVersion}-velocity4.jar"
 
     dependencies {
         exclude(dependency('net.kyori:^(?!adventure-text-feature-pagination).+$'))
diff --git a/spark-waterdog/build.gradle b/spark-waterdog/build.gradle
index c4bd382..9fb67b5 100644
--- a/spark-waterdog/build.gradle
+++ b/spark-waterdog/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 tasks.withType(JavaCompile) {
@@ -15,7 +15,8 @@ dependencies {
 
 repositories {
     maven { url 'https://repo.opencollab.dev/main/' }
-    maven { url 'https://repo.waterdog.dev/artifactory/main/' }
+    maven { url 'https://repo.waterdog.dev/releases/' }
+    maven { url 'https://repo.waterdog.dev/snapshots/' }
 }
 
 processResources {
@@ -29,7 +30,7 @@ processResources {
 }
 
 shadowJar {
-    archiveName = "spark-${project.pluginVersion}-waterdog.jar"
+    archiveFileName = "spark-${project.pluginVersion}-waterdog.jar"
 
     relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
     relocate 'net.kyori.examination', 'me.lucko.spark.lib.adventure.examination'