From abf17b01d7bb4fddfa107a01e117cd7097b8331c Mon Sep 17 00:00:00 2001 From: TheCodedOne Date: Fri, 11 May 2018 22:57:32 +0100 Subject: [PATCH] Fix environment setup --- .../openmodloader/gradle/OpenGradlePlugin.java} | 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 | 2 +- .../gradle-plugins/com.openmodloader.gradle.properties | 1 + .../META-INF/gradle-plugins/net.fabricmc.loom.properties | 1 - 6 files changed, 8 insertions(+), 7 deletions(-) rename src/main/java/{net/fabricmc/loom/LoomGradlePlugin.java => com/openmodloader/gradle/OpenGradlePlugin.java} (94%) create mode 100644 src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties diff --git a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java b/src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java similarity index 94% rename from src/main/java/net/fabricmc/loom/LoomGradlePlugin.java rename to src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java index c5c521f..69e73b8 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java +++ b/src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java @@ -22,13 +22,14 @@ * SOFTWARE. */ -package net.fabricmc.loom; +package com.openmodloader.gradle; +import net.fabricmc.loom.AbstractPlugin; import net.fabricmc.loom.task.*; import org.gradle.api.DefaultTask; import org.gradle.api.Project; -public class LoomGradlePlugin extends AbstractPlugin { +public class OpenGradlePlugin extends AbstractPlugin { @Override public void apply(Project target) { super.apply(target); diff --git a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java index 4fa5955..08b8dbd 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 net.fabricmc.base.launch.FabricClientTweaker --assetIndex " + version.assetIndex.id + " --assetsDir " + new File(extension.getFabricUserCache(), "assets-" + extension.version).getAbsolutePath(); + ideaClient.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenClientTweaker --assetIndex " + version.assetIndex.id + " --assetsDir " + new File(extension.getFabricUserCache(), "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 net.fabricmc.base.launch.FabricServerTweaker"; + ideaServer.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenServerTweaker"; 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 4f71979..5993be8 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", "net.fabricmc.base.launch.FabricClientTweaker", "--assetIndex", version.assetIndex.id, "--assetsDir", new File(extension.getFabricUserCache(), "assets-" + extension.version).getAbsolutePath()); + args("--tweakClass", "com.openmodloader.loader.launch.OpenClientTweaker", "--assetIndex", version.assetIndex.id, "--assetsDir", new File(extension.getFabricUserCache(), "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 43bbf5f..115a5f4 100644 --- a/src/main/java/net/fabricmc/loom/task/RunServerTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunServerTask.java @@ -65,7 +65,7 @@ public class RunServerTask extends JavaExec { libs.add(Constants.MINECRAFT_FINAL_JAR.get(extension).getAbsolutePath()); classpath(libs); - args("--tweakClass", "net.fabricmc.base.launch.FabricServerTweaker"); + args("--tweakClass", "com.openmodloader.loader.launch.OpenServerTweaker"); setWorkingDir(new File(getProject().getRootDir(), "run")); diff --git a/src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties b/src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties new file mode 100644 index 0000000..ae280f1 --- /dev/null +++ b/src/main/resources/META-INF/gradle-plugins/com.openmodloader.gradle.properties @@ -0,0 +1 @@ +implementation-class=com.openmodloader.gradle.OpenGradlePlugin \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties b/src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties deleted file mode 100644 index dffb4b5..0000000 --- a/src/main/resources/META-INF/gradle-plugins/net.fabricmc.loom.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=net.fabricmc.loom.LoomGradlePlugin \ No newline at end of file