Updated quilt and fixed up some issues related to it

This commit is contained in:
coolGi
2023-04-26 20:17:16 +09:30
parent e6273fa6a4
commit d708867c74
4 changed files with 10 additions and 9 deletions
+5 -4
View File
@@ -89,7 +89,7 @@ forgix {
}
subprojects { p ->
// Does the same as "p == project(":common") || p == project(":fabric") || p == project(":quilt") || p == project(":forge")"
// Does the same as "p == project(":common") || p == project(":fabric") || p == project(":quilt") || p == project(":forge") || p == project("WhateverWeAddLaterOn")"
// Useful later on so we dont have duplicated code
def isMinecraftSubProject = p != project(":core") && p != project(":api")
@@ -112,7 +112,7 @@ subprojects { p ->
// set up custom configurations (configurations are a way to handle dependencies)
configurations {
// extends the shadowJar configuration
// extends the shadowJar configuration
shadowMe
// have implemented dependencies automatically embedded in the final jar
implementation.extendsFrom(shadowMe)
@@ -156,8 +156,9 @@ subprojects { p ->
annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
// Log4j
shadowMe("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
shadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
// TODO: Change to shadowMe later to work in the standalone jar
implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
// JOML
implementation("org.joml:joml:${rootProject.joml_version}")
+2 -2
View File
@@ -1,5 +1,5 @@
plugins {
id "org.quiltmc.loom" version "0.12.+"
id "org.quiltmc.loom" version "1.1.+"
}
loom {
@@ -54,7 +54,7 @@ dependencies {
// Quilted Fabric API
modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilted_api_version}" // For now until quilt has a better way of doing this, just use quilt's qfapi
// addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.quilted_api_version))
// addModJar(fabricApi.module("fabric-events-interaction-v0" , rootProject.quilted_api_version))
// addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.quilted_api_version))
// addModJar(fabricApi.module("fabric-key-binding-api-v1", rootProject.quilted_api_version))
// addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.quilted_api_version))
+1 -1
View File
@@ -56,7 +56,7 @@
},
"access_widener": "lod.accesswidener",
"mixins": [
"mixin": [
"DistantHorizons.fabricLike.mixins.json",
"DistantHorizons.quilt.mixins.json"
],
+2 -2
View File
@@ -33,8 +33,8 @@ fabric_api_version=0.67.1+1.18.2
enable_bclib=1
enable_canvas=0
quilt_loader_version=0.18.4-pre.1-SNAPSHOT
quilted_api_version=1.0.0-beta.9+0.51.1-1.18.2-SNAPSHOT
quilt_loader_version=0.19.0-beta.13
quilted_api_version=1.0.0-beta.28+0.67.0-1.18.2
# Quilt mod versions
### Most of the time quilt uses the same stuff as fabric, so this is empty atm ###