Skip to content

Commit e0462f1

Browse files
committed
update buildscript
1 parent df5a5c5 commit e0462f1

File tree

2 files changed

+25
-33
lines changed

2 files changed

+25
-33
lines changed

build.gradle

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//version: 1656003793falsepattern70
1+
//version: 1656003793falsepattern72
22
/*
33
DO NOT CHANGE THIS FILE!
44
@@ -325,31 +325,36 @@ repositories {
325325
}
326326
}
327327

328+
def unimixinsVersion = "0.1.14"
329+
328330
dependencies {
329331
if(usesMixins.toBoolean()) {
330-
annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
331-
annotationProcessor("com.google.guava:guava:24.1.1-jre")
332-
annotationProcessor("com.google.code.gson:gson:2.8.6")
333-
annotationProcessor("com.llamalad7:MixinExtras:0.1.1-gasstation")
334-
annotationProcessor("org.spongepowered:mixin:0.8.5-gasstation_7")
335-
compile("org.spongepowered:mixin:0.8.5-gasstation_7")
336-
compile("com.llamalad7:MixinExtras:0.1.1-gasstation")
337-
compile("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
338-
runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
339-
testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16')
332+
annotationProcessor("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
333+
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
334+
runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16')
340335
} else if(hasMixinDeps.toBoolean()) {
341-
runtime("com.llamalad7:MixinExtras:0.1.1-gasstation")
342-
runtime("org.spongepowered:mixin:0.8.5-gasstation_7")
343-
runtime("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
336+
runtimeOnly("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
344337
}
345338
// Latest LWJGL
346-
compile "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
347-
compile "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
339+
implementation "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
340+
implementation "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
348341
minecraftNatives "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209"
349342
minecraftDeps "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
350343
minecraftDeps "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
351344
}
352345

346+
347+
if(usesMixins.toBoolean()) {
348+
configurations.implementation.dependencies.each {
349+
if (it instanceof ExternalModuleDependency) {
350+
it.exclude module: "SpongeMixins"
351+
it.exclude module: "SpongePoweredMixin"
352+
it.exclude module: "00gasstation-mc1.7.10"
353+
it.exclude module: "gtnhmixins"
354+
}
355+
}
356+
}
357+
353358
apply from: 'dependencies.gradle'
354359

355360
if(file('dependencies_override.gradle').exists()) {
@@ -446,12 +451,6 @@ runClient {
446451
def arguments = []
447452
def jvmArguments = []
448453

449-
if (usesMixins.toBoolean()) {
450-
arguments += [
451-
"--mods=" + Paths.get("$projectDir").resolve(minecraft.runDir).normalize().relativize(Paths.get("$projectDir/build/libs/$archivesBaseName-${version}.jar"))
452-
]
453-
}
454-
455454
if(usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
456455
arguments += [
457456
"--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
@@ -476,12 +475,6 @@ runServer {
476475
def arguments = []
477476
def jvmArguments = []
478477

479-
if (usesMixins.toBoolean()) {
480-
arguments += [
481-
"--mods=" + Paths.get("$projectDir").resolve(minecraft.runDir).normalize().relativize(Paths.get("$projectDir/build/libs/$archivesBaseName-${version}.jar"))
482-
]
483-
}
484-
485478
if (usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
486479
arguments += [
487480
"--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
@@ -816,7 +809,7 @@ if (curseForgeProjectId != "" && System.getenv("CURSEFORGE_TOKEN") != null) {
816809
}
817810

818811
if (usesMixins.toBoolean()) {
819-
addCurseForgeRelation("requiredDependency", "gasstation")
812+
addCurseForgeRelation("requiredDependency", "unimixins")
820813
}
821814
tasks.curseforge.dependsOn(build)
822815
tasks.publish.dependsOn(tasks.curseforge)
@@ -849,7 +842,7 @@ if (modrinthProjectId != "" && System.getenv("MODRINTH_TOKEN") != null) {
849842
}
850843
}
851844
if (usesMixins.toBoolean()) {
852-
addModrinthDep("required", "project", "cdeAhgfp")
845+
addModrinthDep("required", "project", "ghjoiQAl")
853846
}
854847
tasks.modrinth.dependsOn(build)
855848
tasks.publish.dependsOn(tasks.modrinth)

dependencies.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ dependencies {
88
compileOnly("org.jetbrains:annotations:24.0.1")
99

1010
//Mod deps
11-
compileOnly("org.spongepowered:mixin:0.8.5-gasstation_7")
12-
compileOnly("com.llamalad7:MixinExtras:0.1.1-gasstation")
13-
compileOnly("com.falsepattern:00gasstation-mc1.7.10:0.5.1:dev")
11+
def unimixinsVersion = "0.1.14"
12+
compileOnly("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
1413
}

0 commit comments

Comments
 (0)