Made sodium use cursedforge and added toml to core

This commit is contained in:
coolGi2007
2022-02-10 13:10:01 +10:30
parent 7eb4339a1b
commit 932f3ca19a
6 changed files with 11 additions and 15 deletions
+3
View File
@@ -35,6 +35,9 @@ subprojects { p ->
// The following line declares the mojmap mappings
mappings loom.officialMojangMappings()
// Toml
implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
if (p != project(":forge")) {
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
// Do NOT use other classes from fabric loader unless working with fabric
-4
View File
@@ -26,8 +26,4 @@ publishing {
repositories {
// Add repositories to publish to here.
}
}
dependencies {
implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
}
+1 -1
Submodule core updated: cbcb7ca6ac...40a8f228ac
+1 -5
View File
@@ -38,7 +38,7 @@ dependencies {
}
// Sodium
modImplementation "maven.modrinth:sodium:${rootProject.sodium_version}"
modImplementation "curse.maven:sodium-394468:${rootProject.sodium_version}"
implementation "org.joml:joml:1.10.2"
// Lithium
@@ -64,10 +64,6 @@ dependencies {
*/
// Toml
implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+5 -4
View File
@@ -35,11 +35,12 @@ dependencies {
// Starlight
// modImplementation("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}")
// implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") // This is already included with forge
// forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}) // This is already included with forge
// forgeDependencies(project(":core")) { transitive false }
// Toml
shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
forgeDependencies('org.tukaani:xz:1.9')
forgeDependencies('org.apache.commons:commons-compress:1.21')
shadowMe 'org.tukaani:xz:1.9'
@@ -96,7 +97,7 @@ shadowJar {
configurations = [project.configurations.shadowMe]
relocate 'org.tukaani', 'shaded.tukaani'
relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
// relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' // This is already included with forge
relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' // This is already included with forge
relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common'
+1 -1
View File
@@ -19,7 +19,7 @@ fabric_api_version=0.37.1+1.17
modmenu_version=2.0.14
starlight_version_fabric=3442770
lithium_version=mc1.17.1-0.7.5
sodium_version=mc1.17.1-0.3.3
sodium_version=3605275
iris_version=1.17.x-v1.1.4
immersive_portals_version = 0.14-1.17