From 142e25ab43272c59ed4140d0a462b5d751bb0724 Mon Sep 17 00:00:00 2001
From: Su5eD <su5ed@outlook.com>
Date: Sat, 11 Nov 2023 19:14:10 +0100
Subject: [PATCH] Include shadowed fabric-loader jar with dependencies

Fixes Su5eD/Lazurite#3
---
 fabric-model-loading-api-v1/build.gradle | 2 +-
 fabric-resource-loader-v0/build.gradle   | 2 +-
 gradle.properties                        | 4 ++--
 gradle/ffapi-setup.gradle                | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fabric-model-loading-api-v1/build.gradle b/fabric-model-loading-api-v1/build.gradle
index 63610d6f9..a8bd9b36b 100644
--- a/fabric-model-loading-api-v1/build.gradle
+++ b/fabric-model-loading-api-v1/build.gradle
@@ -2,7 +2,7 @@ archivesBaseName = "fabric-model-loading-api-v1"
 version = getSubprojectVersion(project)
 
 dependencies {
-	testmodImplementation "dev.su5ed.sinytra:fabric-loader:${rootProject.forge_fabric_loader_version}"
+	testmodCompileOnly "net.fabricmc:fabric-loader:${rootProject.loader_version}"
 }
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-resource-loader-v0/build.gradle b/fabric-resource-loader-v0/build.gradle
index 5ca7a6125..402ca8be9 100644
--- a/fabric-resource-loader-v0/build.gradle
+++ b/fabric-resource-loader-v0/build.gradle
@@ -6,7 +6,7 @@ loom {
 }
 
 dependencies {
-	implementation "dev.su5ed.sinytra:fabric-loader:${rootProject.forge_fabric_loader_version}"
+	compileOnly "net.fabricmc:fabric-loader:${rootProject.loader_version}"
 }
 
 testDependencies(project, [
diff --git a/gradle.properties b/gradle.properties
index 9993044c9..10041c6d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -68,5 +68,5 @@ fabric-client-tags-api-v1-version=1.1.1
 loom.platform=forge
 forge_version=1.20.1-47.1.3
 pack_format=15
-forgified_version=1.9.30
-forge_fabric_loader_version=2.3.4+0.14.21+1.20.1
+forgified_version=1.9.31
+forge_fabric_loader_version=2.5.2+0.14.21+1.20.1
diff --git a/gradle/ffapi-setup.gradle b/gradle/ffapi-setup.gradle
index f81fa1c80..23f6599b9 100644
--- a/gradle/ffapi-setup.gradle
+++ b/gradle/ffapi-setup.gradle
@@ -199,7 +199,7 @@ dependencies {
 	javadocDeps "net.fabricmc:fabric-loader:${rootProject.loader_version}"
 	
 	// Include Forgified Fabric Loader
-	include "dev.su5ed.sinytra:fabric-loader:${rootProject.forge_fabric_loader_version}"
+	include "dev.su5ed.sinytra:fabric-loader:${rootProject.forge_fabric_loader_version}:full"
 }
 afterEvaluate {
 	javadoc {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f..744c64d12 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 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.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists