Added some more stuff to attempt to fix forge

This commit is contained in:
coolGi
2023-02-13 19:07:50 +10:30
parent 55bf0c04f4
commit a719ec5a3e
4 changed files with 34 additions and 14 deletions
+3
View File
@@ -66,6 +66,9 @@ def loadProperties() {
for (int i = 0; i < mcVers.size(); i++) {
mcVers[i] = mcVers[i].replaceAll(".properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions
}
mcVers.sort() // Sort so it always goes from oldest to newest
int mcIndex = -1
println "Avalible MC versions: ${mcVers}"
if (project.hasProperty("mcVer")) {
+3
View File
@@ -11,6 +11,9 @@ dependencies {
// 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
// modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
// So mixins can be written in common
compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
}
+28 -14
View File
@@ -27,7 +27,7 @@ minecraft {
// mappings channel: "official", version: minecraft_version // Vanilla mappings
mappings channel: "parchment", version: "${parchment_version}-${minecraft_version}" // Parchment mappings
accessTransformer = project(":forge").file("src/main/resources/accesstransformer.cfg") // FIXME: Find a libary to use fabric's accessWidener instead of forge's own accesstransformer format
accessTransformer = project(":forge").file("src/main/resources/META-INF/accesstransformer.cfg") // FIXME: Find a libary to use fabric's accessWidener instead of forge's own accesstransformer format
runs {
client {
@@ -35,14 +35,25 @@ minecraft {
ideaModule "${rootProject.name}.${project.name}.main"
taskName "Client"
args "-mixins.config=DistantHorizons.mixins.json"
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
mods {
modClientRun {
source sourceSets.main
source project(":common").sourceSets.main
source project(":core").sourceSets.main
source project(":api").sourceSets.main
}
}
}
server {
workingDirectory project.file("run")
ideaModule "${rootProject.name}.${project.name}.main"
taskName "Server"
args "-mixins.config=DistantHorizons.mixins.json"
}
// TODO: Do this once client works
// server {
// workingDirectory project.file("run")
// ideaModule "${rootProject.name}.${project.name}.main"
// taskName "Server"
// args "-mixins.config=DistantHorizons.mixins.json"
// }
data {
workingDirectory project.file("run")
@@ -50,13 +61,16 @@ minecraft {
args '--mod', "lod", '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
taskName 'Data'
args "-mixins.config=DistantHorizons.mixins.json" // To add more mixins, you can just add a comma for another arg
// These may be needed altough im not sure
// mods {
// modDataRun {
// source sourceSets.main
// source project(":common").sourceSets.main
// }
// }
property 'mixin.env.remapRefMap', 'true'
property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
mods {
modClientRun {
source sourceSets.main
source project(":common").sourceSets.main
source project(":core").sourceSets.main
source project(":api").sourceSets.main
}
}
}
}
}