cleanup. move tweaker classes

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()
     }
 }

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
 

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 }
 }

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 }
 }

forge/src/main/java/baritone/launch/BaritoneForgeModXD.java

@@ -15,8 +15,8 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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 {
 }

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