From e9d221817328b4451d0d4f21179af7cccfc024c7 Mon Sep 17 00:00:00 2001 From: TheCodedOne Date: Mon, 14 May 2018 00:01:38 +0100 Subject: [PATCH] add mixins to the default arguments --- build.gradle | 5 +---- src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java | 4 ++-- src/main/java/net/fabricmc/loom/task/RunClientTask.java | 2 +- src/main/java/net/fabricmc/loom/task/RunServerTask.java | 1 + 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 08cae16..87f7696 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,6 @@ plugins { sourceCompatibility = 1.8 targetCompatibility = 1.8 -apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/maven.gradle' -apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle' - group = 'com.openmodloader' archivesBaseName = project.name version = '0.0.7-SNAPSHOT' @@ -80,4 +77,4 @@ jar { task wrapper(type: Wrapper) { gradleVersion = '3.1' -} +} \ No newline at end of file diff --git a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java index 2521bf3..cd2742a 100644 --- a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java @@ -140,7 +140,7 @@ public class GenIdeaProjectTask extends DefaultTask { ideaClient.configName = "Minecraft Client"; ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir; ideaClient.vmArgs = "-Djava.library.path=" + Constants.MINECRAFT_NATIVES.get(extension).getAbsolutePath() + " -Dfabric.development=true"; - ideaClient.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenClientTweaker --assetIndex " + version.assetIndex.id + " --assetsDir " + new File(extension.getUserCache(), "assets-" + extension.version).getAbsolutePath(); + ideaClient.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenClientTweaker --tweakClass org.spongepowered.asm.launch.MixinTweaker --assetIndex " + version.assetIndex.id + " --assetsDir " + new File(extension.getUserCache(), "assets-" + extension.version).getAbsolutePath(); runManager.appendChild(ideaClient.genRuns(runManager)); @@ -150,7 +150,7 @@ public class GenIdeaProjectTask extends DefaultTask { ideaServer.configName = "Minecraft Server"; ideaServer.runDir = "file://$PROJECT_DIR$/" + extension.runDir; ideaServer.vmArgs = "-Dfabric.development=true"; - ideaServer.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenServerTweaker"; + ideaServer.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenServerTweaker --tweakClass org.spongepowered.asm.launch.MixinTweaker"; runManager.appendChild(ideaServer.genRuns(runManager)); diff --git a/src/main/java/net/fabricmc/loom/task/RunClientTask.java b/src/main/java/net/fabricmc/loom/task/RunClientTask.java index 55b7e2e..ecf2de3 100644 --- a/src/main/java/net/fabricmc/loom/task/RunClientTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunClientTask.java @@ -68,7 +68,7 @@ public class RunClientTask extends JavaExec { libs.add(Constants.MINECRAFT_FINAL_JAR.get(extension).getAbsolutePath()); classpath(libs); - args("--tweakClass", "com.openmodloader.loader.launch.OpenClientTweaker", "--assetIndex", version.assetIndex.id, "--assetsDir", new File(extension.getUserCache(), "assets-" + extension.version).getAbsolutePath()); + args("--tweakClass", "com.openmodloader.loader.launch.OpenClientTweaker", "--tweakClass", "org.spongepowered.asm.launch.MixinTweaker", "--assetIndex", version.assetIndex.id, "--assetsDir", new File(extension.getUserCache(), "assets-" + extension.version).getAbsolutePath()); setWorkingDir(new File(getProject().getRootDir(), "run")); diff --git a/src/main/java/net/fabricmc/loom/task/RunServerTask.java b/src/main/java/net/fabricmc/loom/task/RunServerTask.java index 115a5f4..bd76d0c 100644 --- a/src/main/java/net/fabricmc/loom/task/RunServerTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunServerTask.java @@ -66,6 +66,7 @@ public class RunServerTask extends JavaExec { classpath(libs); args("--tweakClass", "com.openmodloader.loader.launch.OpenServerTweaker"); + args("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"); setWorkingDir(new File(getProject().getRootDir(), "run"));