From 76a2a704dd0f9da8e2ad3bd7f224963dc8838fde Mon Sep 17 00:00:00 2001
From: GiantLuigi4 <49770992+GiantLuigi4@users.noreply.github.com>
Date: Thu, 21 Sep 2023 22:40:01 -0400
Subject: [PATCH] update gradle

---
 build.gradle                             | 20 +++++--------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 settings.gradle                          | 37 ++++++++++++++----------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2e9950b..b0eef22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'eclipse'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '5.1.+'
+    id 'net.neoforged.gradle' version '[6.0.18,6.2)'
     id 'org.spongepowered.mixin' version '0.7.+'
 }
 
@@ -12,10 +12,11 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 minecraft {
-    mappings channel: 'official', version: '1.19.2'
+    mappings channel: 'official', version: '1.20.1'
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
+    copyIdeResources = true
     runs {
         client {
             properties 'mixin.env.remapRefMap': 'true'
@@ -73,17 +74,17 @@ repositories{
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.2-43.2.10'
+    minecraft 'net.neoforged:forge:1.20.1-47.1.65'
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
     
-    implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:2ec6581622")
-    implementation fg.deobf("curse.maven:SU-370704:4485052")
-    implementation fg.deobf("curse.maven:spark-361579:4381167")
+//    implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:2ec6581622")
+//    implementation fg.deobf("curse.maven:SU-370704:4485052")
+//    implementation fg.deobf("curse.maven:spark-361579:4381167")
 
 //    implementation fg.deobf("flatdir.lib:mcef:1.2.4")
 //    implementation fg.deobf("flatdir.lib:smallerunits:2.1.3")
 
-    compileOnly fg.deobf("curse.maven:vivecraft-667903:4409427")
+//    compileOnly fg.deobf("curse.maven:vivecraft-667903:4409427")
 }
 
 sourceSets {
@@ -133,8 +134,3 @@ apply plugin: 'org.spongepowered.mixin'
 mixin {
     add sourceSets.main, "webdisplays.refmap.json"
 }
-
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'deobf'
-}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a125b5f..20365b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
diff --git a/settings.gradle b/settings.gradle
index 914d1ff..d495ccb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,20 +1,27 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net/' }
-    }
-    resolutionStrategy {
-        eachPlugin {
-            switch (requested.id.toString()) {
-                case "net.minecraftforge.gradle": {
-                    useModule("${requested.id}:ForgeGradle:${requested.version}")
-                    break
-                }
-                case "org.spongepowered.mixin": {
-                    useModule("org.spongepowered:mixingradle:${requested.version}")
-                    break;
-                }
-            }
+        maven {
+            name = 'NeoForged'
+            url = 'https://maven.neoforged.net/releases'
         }
     }
-}
\ No newline at end of file
+//    resolutionStrategy {
+//        eachPlugin {
+//            switch (requested.id.toString()) {
+//                case "net.minecraftforge.gradle": {
+//                    useModule("${requested.id}:ForgeGradle:${requested.version}")
+//                    break
+//                }
+//                case "org.spongepowered.mixin": {
+//                    useModule("org.spongepowered:mixingradle:${requested.version}")
+//                    break;
+//                }
+//            }
+//        }
+//    }
+}
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}