From bd9889be308060eb8aaf84ba3ed3f221c8085f78 Mon Sep 17 00:00:00 2001
From: Uraneptus <uraneptus33@gmail.com>
Date: Mon, 9 Sep 2024 20:11:20 +0200
Subject: [PATCH] fix dev env

---
 Fabric/build.gradle                      | 11 +++++++----
 Forge/build.gradle                       |  4 ++--
 Xplat/build.gradle                       |  8 ++------
 build.gradle                             |  5 +++++
 gradle.properties                        |  6 +++---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 settings.gradle                          | 17 +++++++++++++++++
 7 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index e2d3afa..75429c0 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.13.9'
+    id 'fabric-loom' version '1.3.8'
 }
 
 version = "${mc_version}-${build_number}-FABRIC"
@@ -29,10 +29,13 @@ repositories {
 
 dependencies {
     minecraft "com.mojang:minecraft:${mc_version}"
-    mappings loom.officialMojangMappings()
+    mappings loom.layered() {
+        officialMojangMappings()
+        parchment("org.parchmentmc.data:parchment-1.20.1:2023.09.03@zip")
+    }
 
-    modImplementation "net.fabricmc:fabric-loader:0.14.21"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:0.83.0+1.20"
+    modImplementation "net.fabricmc:fabric-loader:0.15.6"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:0.92.1+1.20.1"
 
     compileOnly project(":Xplat")
 
diff --git a/Forge/build.gradle b/Forge/build.gradle
index c0b59cf..099ada4 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -10,8 +10,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:6.0.6'
-        classpath 'org.spongepowered:mixingradle:0.7.33'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.25'
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
diff --git a/Xplat/build.gradle b/Xplat/build.gradle
index a385011..9a25fee 100644
--- a/Xplat/build.gradle
+++ b/Xplat/build.gradle
@@ -1,16 +1,12 @@
 plugins {
     id('java')
-    // Unfortunately, VG has not published a new non-SNAPSHOT version since 2021.
-    // This may break if this snapshot gets garbage-collected. In that case, visit
-    // https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/vanillagradle/
-    // (or wherever their maven is now) and pick another snapshot version.
-    id('org.spongepowered.gradle.vanilla') version '0.2.1-20230603.203956-54' 
+    id('agency.highlysuspect.minivan') version '0.5'
 }
 
 archivesBaseName = "${project.mod_name}-xplat"
 version = "${project.mc_version}-${project.build_number}"
 
-minecraft {
+minivan {
     version(project.mc_version)
     accessWideners 'src/main/resources/neat_xplat.accesswidener'
 }
diff --git a/build.gradle b/build.gradle
index 8407a04..7d94db1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,11 @@ subprojects {
 
     repositories {
         mavenCentral()
+
+        maven {
+            name = 'Sponge / Mixin'
+            url = 'https://repo.spongepowered.org/repository/maven-public/'
+        }
     }
 
     tasks.withType(JavaCompile).configureEach {
diff --git a/gradle.properties b/gradle.properties
index 1bbba8a..ff115d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,8 +8,8 @@ org.gradle.jvmargs=-Xmx1G \
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 
 group=vazkii.neat
-forge_version=46.0.2
+forge_version=47.1.3
 mod_id=neat
-build_number=36
+build_number=37
 mod_name=Neat
-mc_version=1.20
+mc_version=1.20.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fae0804..0d18421 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-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index fb06d78..e1e4d75 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,28 @@
 pluginManagement {
     repositories {
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
         maven {
             name = 'Sponge Snapshots'
             url = 'https://repo.spongepowered.org/repository/maven-public/'
         }
+        maven {
+            name = 'Sleeping Town'
+            url = 'https://repo.sleeping.town/'
+            content {
+                includeGroup 'agency.highlysuspect'
+                includeGroup 'agency.highlysuspect.minivan'
+            }
+        }
         gradlePluginPortal()
     }
 }
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = 'Neat'
 include("Xplat", "Fabric", "Forge")