Skip to content

Commit da731e2

Browse files
committed
bs update
1 parent a9e077f commit da731e2

File tree

1 file changed

+36
-28
lines changed

1 file changed

+36
-28
lines changed

build.gradle

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//version: 1656003793falsepattern70
1+
//version: 1656003793falsepattern76
22
/*
33
DO NOT CHANGE THIS FILE!
44
@@ -311,7 +311,11 @@ configurations {
311311
repositories {
312312
maven {
313313
name = "Overmind forge repo mirror"
314-
url = "https://gregtech.overminddl1.com/"
314+
url = "https://mvn.falsepattern.com/overmind"
315+
content {
316+
includeGroup("net.minecraftforge")
317+
includeGroup("org.scala-lang")
318+
}
315319
}
316320
if(usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
317321
maven {
@@ -322,34 +326,46 @@ repositories {
322326
name = "sponge2"
323327
url = "https://mvn.falsepattern.com/sponge"
324328
}
329+
maven {
330+
name = "jitpack"
331+
url = "https://mvn.falsepattern.com/jitpack/"
332+
}
325333
}
326334
}
327335

336+
def unimixinsVersion = "0.1.15"
337+
328338
dependencies {
329339
if(usesMixins.toBoolean()) {
330340
annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
331341
annotationProcessor("com.google.guava:guava:24.1.1-jre")
332342
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')
343+
annotationProcessor("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
344+
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
345+
runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16')
340346
} 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")
347+
runtimeOnly("com.github.LegacyModdingMC.UniMixins:unimixins-all-1.7.10:$unimixinsVersion:dev")
344348
}
345349
// 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"
350+
implementation "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
351+
implementation "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
348352
minecraftNatives "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209"
349353
minecraftDeps "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
350354
minecraftDeps "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
351355
}
352356

357+
358+
if(usesMixins.toBoolean()) {
359+
configurations.implementation.dependencies.each {
360+
if (it instanceof ExternalModuleDependency) {
361+
it.exclude module: "SpongeMixins"
362+
it.exclude module: "SpongePoweredMixin"
363+
it.exclude module: "00gasstation-mc1.7.10"
364+
it.exclude module: "gtnhmixins"
365+
}
366+
}
367+
}
368+
353369
apply from: 'dependencies.gradle'
354370

355371
if(file('dependencies_override.gradle').exists()) {
@@ -446,12 +462,6 @@ runClient {
446462
def arguments = []
447463
def jvmArguments = []
448464

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-
455465
if(usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
456466
arguments += [
457467
"--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
@@ -476,12 +486,6 @@ runServer {
476486
def arguments = []
477487
def jvmArguments = []
478488

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-
485489
if (usesMixins.toBoolean() || hasMixinDeps.toBoolean()) {
486490
arguments += [
487491
"--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"
@@ -816,7 +820,7 @@ if (curseForgeProjectId != "" && System.getenv("CURSEFORGE_TOKEN") != null) {
816820
}
817821

818822
if (usesMixins.toBoolean()) {
819-
addCurseForgeRelation("requiredDependency", "gasstation")
823+
addCurseForgeRelation("requiredDependency", "unimixins")
820824
}
821825
tasks.curseforge.dependsOn(build)
822826
tasks.publish.dependsOn(tasks.curseforge)
@@ -849,7 +853,7 @@ if (modrinthProjectId != "" && System.getenv("MODRINTH_TOKEN") != null) {
849853
}
850854
}
851855
if (usesMixins.toBoolean()) {
852-
addModrinthDep("required", "project", "cdeAhgfp")
856+
addModrinthDep("required", "project", "ghjoiQAl")
853857
}
854858
tasks.modrinth.dependsOn(build)
855859
tasks.publish.dependsOn(tasks.modrinth)
@@ -1034,6 +1038,10 @@ configure(deobfParams) {
10341038
description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
10351039
}
10361040

1041+
tasks.withType(JavaCompile) {
1042+
options.encoding = 'UTF-8'
1043+
}
1044+
10371045
// Dependency Deobfuscation
10381046

10391047
def deobfMaven(mavenDep) {

0 commit comments

Comments
 (0)