From f2c8ea7a4dd3ae786a29caa6cdadb411e53d7c67 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Thu, 8 Jun 2023 23:13:19 +0100
Subject: Update Fabric/Forge to Minecraft 1.20

---
 spark-forge/build.gradle | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'spark-forge')

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'
-- 
cgit