From 93a16f356d89b68f535dd7bc73a74a68fd862a7b Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Sat, 16 Apr 2022 03:22:53 -0700 Subject: [PATCH] cleanup. move tweaker classes --- build.gradle | 8 ++++++++ common/build.gradle | 11 ----------- fabric/build.gradle | 7 ------- forge/build.gradle | 7 ------- .../BaritoneForgeModXD.java} | 4 ++-- tweaker/build.gradle | 13 ++++++++----- .../java/baritone/launch/BaritoneTweaker.java | 0 .../java/baritone/launch/LaunchTesting.java | 0 8 files changed, 18 insertions(+), 32 deletions(-) rename forge/src/main/java/baritone/{BaritoeModXD.java => launch/BaritoneForgeModXD.java} (87%) rename {src/launch => tweaker/src/tweaker}/java/baritone/launch/BaritoneTweaker.java (100%) rename {src/launch => tweaker/src/tweaker}/java/baritone/launch/LaunchTesting.java (100%) diff --git a/build.gradle b/build.gradle index cffa4b222..f6c3f4c83 100755 --- a/build.gradle +++ b/build.gradle @@ -73,6 +73,14 @@ allprojects { name = "ldtteam" url = "https://maven.parchmentmc.net/" } + // for the newer version of launchwrapper + maven { + name = "multimc-maven" + url = "https://files.multimc.org/maven/" + metadataSources { + artifact() + } + } mavenCentral() } } diff --git a/common/build.gradle b/common/build.gradle index 1a4e6ecc6..17efe7ea2 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -96,16 +96,6 @@ dependencies { // Do NOT use other classes from fabric loader modCompileOnly "net.fabricmc:fabric-loader:${project.fabric_version}" - // want in the pom but not to compile against as it's also provided by loom - runtimeOnly "org.spongepowered:mixin:0.8.4" - - // this makes it compile with the forge tweak stuff - implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2' - implementation('net.minecraft:launchwrapper:1.12') { - exclude module: 'lwjgl' - exclude module: 'asm-debug-all' - } - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' testImplementation 'junit:junit:4.12' @@ -123,7 +113,6 @@ jar { classifier "dev" from sourceSets.main.output, sourceSets.realmain.output, sourceSets.api.output - preserveFileTimestamps = false reproducibleFileOrder = true diff --git a/fabric/build.gradle b/fabric/build.gradle index 170bc7922..86aab9dd8 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -40,13 +40,6 @@ configurations { dependencies { modImplementation "net.fabricmc:fabric-loader:${project.fabric_version}" - // this makes it compile with the forge tweak stuff - compileOnly 'com.github.ImpactDevelopment:SimpleTweaker:1.2' - compileOnly('net.minecraft:launchwrapper:1.12') { - exclude module: 'lwjgl' - exclude module: 'asm-debug-all' - } - common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } } diff --git a/forge/build.gradle b/forge/build.gradle index 0cb039747..f1cabe46d 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -46,13 +46,6 @@ configurations { dependencies { forge "net.minecraftforge:forge:${rootProject.forge_version}" - // this makes it compile with the forge tweak stuff - compileOnly 'com.github.ImpactDevelopment:SimpleTweaker:1.2' - compileOnly('net.minecraft:launchwrapper:1.12') { - exclude module: 'lwjgl' - exclude module: 'asm-debug-all' - } - common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive false } } diff --git a/forge/src/main/java/baritone/BaritoeModXD.java b/forge/src/main/java/baritone/launch/BaritoneForgeModXD.java similarity index 87% rename from forge/src/main/java/baritone/BaritoeModXD.java rename to forge/src/main/java/baritone/launch/BaritoneForgeModXD.java index 166ee5e26..db84d62e1 100644 --- a/forge/src/main/java/baritone/BaritoeModXD.java +++ b/forge/src/main/java/baritone/launch/BaritoneForgeModXD.java @@ -15,8 +15,8 @@ * along with Baritone. If not, see . */ -package baritone;import net.minecraftforge.fml.common.Mod; +package baritone.launch;import net.minecraftforge.fml.common.Mod; @Mod("baritoe") -public class BaritoeModXD { +public class BaritoneForgeModXD { } diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 9612b4b8c..cb76d7a4d 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -51,9 +51,13 @@ sourceSets { } } } + tweaker { + compileClasspath += realmain.output + api.output + main.compileClasspath + runtimeClasspath += realmain.output + api.output + main.compileClasspath + } main { - compileClasspath += realmain.output + api.output - runtimeClasspath += realmain.output + api.output + compileClasspath += realmain.output + api.output + tweaker.output + runtimeClasspath += realmain.output + api.output + tweaker.output java { java { srcDir "$rootDir/src/launch/java" @@ -100,7 +104,7 @@ dependencies { // this makes it compile with the forge tweak stuff implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2' - implementation('net.minecraft:launchwrapper:1.12') { + implementation('net.minecraft:launchwrapper:of-2.3') { exclude module: 'lwjgl' exclude module: 'asm-debug-all' } @@ -120,8 +124,7 @@ javadoc { jar { classifier "dev" - from sourceSets.main.output, sourceSets.realmain.output, sourceSets.api.output - + from sourceSets.main.output, sourceSets.realmain.output, sourceSets.api.output, sourceSets.tweaker.output preserveFileTimestamps = false reproducibleFileOrder = true diff --git a/src/launch/java/baritone/launch/BaritoneTweaker.java b/tweaker/src/tweaker/java/baritone/launch/BaritoneTweaker.java similarity index 100% rename from src/launch/java/baritone/launch/BaritoneTweaker.java rename to tweaker/src/tweaker/java/baritone/launch/BaritoneTweaker.java diff --git a/src/launch/java/baritone/launch/LaunchTesting.java b/tweaker/src/tweaker/java/baritone/launch/LaunchTesting.java similarity index 100% rename from src/launch/java/baritone/launch/LaunchTesting.java rename to tweaker/src/tweaker/java/baritone/launch/LaunchTesting.java