diff options
| author | FalsePattern <me@falsepattern.com> | 2023-11-22 16:03:56 +0100 |
|---|---|---|
| committer | makamys <makamys@outlook.com> | 2023-11-25 18:56:10 +0100 |
| commit | fc1f6948de798220b63e995c82fcf7717f66b344 (patch) | |
| tree | 13518b2a9e0b5191837061659fd8f4a3209630b0 | |
| parent | 37e900eb5a37339f2e974ee2508180f042643fe4 (diff) | |
| download | Neodymium-fc1f6948de798220b63e995c82fcf7717f66b344.tar.gz Neodymium-fc1f6948de798220b63e995c82fcf7717f66b344.tar.bz2 Neodymium-fc1f6948de798220b63e995c82fcf7717f66b344.zip | |
fix runClient
| -rw-r--r-- | buildscript/forge-1.7-mixin.gradle | 3 | ||||
| -rw-r--r-- | buildscript/forge-1.7.gradle | 9 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | project.gradle | 17 |
4 files changed, 27 insertions, 4 deletions
diff --git a/buildscript/forge-1.7-mixin.gradle b/buildscript/forge-1.7-mixin.gradle index 9612084..60210e5 100644 --- a/buildscript/forge-1.7-mixin.gradle +++ b/buildscript/forge-1.7-mixin.gradle @@ -19,10 +19,11 @@ dependencies { setTransitive false } } else { - compile('org.spongepowered:mixin:0.7.11-SNAPSHOT'){ + implementation('org.spongepowered:mixin:0.7.11-SNAPSHOT'){ setTransitive false } } + annotationProcessor('org.spongepowered:mixin:0.7.11-SNAPSHOT') } ext.outRefMapFile = "${tasks.compileJava.temporaryDir}/${project.modid}.mixin.refmap.json" diff --git a/buildscript/forge-1.7.gradle b/buildscript/forge-1.7.gradle index cd74fd8..2eaf08b 100644 --- a/buildscript/forge-1.7.gradle +++ b/buildscript/forge-1.7.gradle @@ -38,6 +38,11 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 repositories { + //Needed for forge userdev on gradle 6 + maven { + name = "Overmind forge repo mirror" + url = "https://gregtech.overminddl1.com/" + } maven { name = "chickenbones" url = "http://chickenbones.net/maven/" @@ -46,9 +51,9 @@ repositories { configurations { embed - compile.extendsFrom(embed) + implementation.extendsFrom(embed) shade - compile.extendsFrom(shade) + implementation.extendsFrom(shade) } if(project.enable_mixin.toBoolean()) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 752f5af..3ab0b72 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-4.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/project.gradle b/project.gradle index 59e2018..79d43ce 100644 --- a/project.gradle +++ b/project.gradle @@ -1,3 +1,5 @@ +import java.nio.file.Paths + jar { manifest { attributes ( @@ -5,6 +7,7 @@ jar { 'FMLAT': "neodymium_at.cfg" ) } + exclude("META-INF/**.RSA") } repositories { @@ -17,5 +20,19 @@ dependencies { compileOnly("com.falsepattern:triangulator-mc1.7.10:1.7.0:api") } +runClient { + def arguments = [] + + arguments += [ + "--mods=" + Paths.get("$projectDir").resolve(minecraft.runDir).normalize().relativize(Paths.get("$projectDir/build/libs/$archivesBaseName-${version}.jar")) + ] + + arguments += [ + "--tweakClass", "org.spongepowered.asm.launch.MixinTweaker" + ] + + args(arguments) +} + apply from: "makalibs.gradle"
\ No newline at end of file |