From 90746a93c12ca619cf2e57e602f1026fc1ea1b8a Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 25 Oct 2018 12:40:41 +0100 Subject: [PATCH] More name updates, should help in a few places --- src/main/java/net/fabricmc/loom/AbstractPlugin.java | 2 +- src/main/java/net/fabricmc/loom/LoomGradleExtension.java | 6 +++--- src/main/java/net/fabricmc/loom/LoomGradlePlugin.java | 2 +- .../java/net/fabricmc/loom/task/GenIdeaProjectTask.java | 8 ++++---- src/main/java/net/fabricmc/loom/task/RunClientTask.java | 2 +- src/main/java/net/fabricmc/loom/task/RunServerTask.java | 2 +- .../net/fabricmc/loom/util/proccessing/MixinPrebaker.java | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/AbstractPlugin.java b/src/main/java/net/fabricmc/loom/AbstractPlugin.java index 5bb6361..e0a1983 100644 --- a/src/main/java/net/fabricmc/loom/AbstractPlugin.java +++ b/src/main/java/net/fabricmc/loom/AbstractPlugin.java @@ -250,7 +250,7 @@ public class AbstractPlugin implements Plugin { if (extension.isModWorkspace()) { //only add this when not in a dev env - project1.getDependencies().add(Constants.CONFIG_MC_DEPENDENCIES, "com.openmodloader:OpenModLoader:" + extension.getVersionString() +":deobf"); + project1.getDependencies().add(Constants.CONFIG_MC_DEPENDENCIES, "net.fabricmc:fabric-base:" + extension.getVersionString() +":deobf"); } }); diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 2b91e66..fc97b29 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -31,7 +31,7 @@ import java.io.File; public class LoomGradleExtension { public String version; public String runDir = "run"; - public String omlVersion; + public String fabricVersion; public String pomfVersion; public String refmapName; public boolean skipPrebake = false; @@ -42,13 +42,13 @@ public class LoomGradleExtension { public String getVersionString() { if (isModWorkspace()) { - return version + "-" + omlVersion; + return version + "-" + fabricVersion; } return version; } public boolean isModWorkspace() { - return omlVersion != null && !omlVersion.isEmpty(); + return fabricVersion != null && !fabricVersion.isEmpty(); } public File getUserCache() { diff --git a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java index 2a551d6..3aad864 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java +++ b/src/main/java/net/fabricmc/loom/LoomGradlePlugin.java @@ -38,7 +38,7 @@ public class LoomGradlePlugin extends AbstractPlugin { makeTask("processMods", ProcessModsTask.class).dependsOn("mergeJars"); makeTask("mapJars", MapJarsTask.class).dependsOn("processMods"); makeTask("finaliseJars", FinaliseJar.class).dependsOn("mapJars"); - makeTask("setup", DefaultTask.class).dependsOn("finaliseJars").setGroup("openmodloader"); + makeTask("setup", DefaultTask.class).dependsOn("finaliseJars").setGroup("fabric"); makeTask("extractNatives", ExtractNativesTask.class).dependsOn("download"); makeTask("genIdeaWorkspace", GenIdeaProjectTask.class).dependsOn("idea").setGroup("ide"); diff --git a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java index eb47cd5..46450c9 100644 --- a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java @@ -139,8 +139,8 @@ public class GenIdeaProjectTask extends DefaultTask { ideaClient.projectName = project.getName(); ideaClient.configName = "Minecraft Client"; ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir; - ideaClient.vmArgs = "-Djava.library.path=" + Constants.MINECRAFT_NATIVES.get(extension).getAbsolutePath() + " -Doml.development=true"; - ideaClient.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenClientTweaker --assetIndex " + version.assetIndex.id + " --assetsDir " + new File(extension.getUserCache(), "assets-" + extension.version).getAbsolutePath(); + 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.getUserCache(), "assets-" + extension.version).getAbsolutePath(); runManager.appendChild(ideaClient.genRuns(runManager)); @@ -149,8 +149,8 @@ public class GenIdeaProjectTask extends DefaultTask { ideaServer.projectName = project.getName(); ideaServer.configName = "Minecraft Server"; ideaServer.runDir = "file://$PROJECT_DIR$/" + extension.runDir; - ideaServer.vmArgs = "-Doml.development=true"; - ideaServer.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenServerTweaker"; + ideaServer.vmArgs = "-Dfabric.development=true"; + ideaServer.programArgs = "--tweakClass net.fabricmc.base.launch.FabricServerTweaker"; 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 2b4b31a..cf26768 100644 --- a/src/main/java/net/fabricmc/loom/task/RunClientTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunClientTask.java @@ -73,7 +73,7 @@ public class RunClientTask extends JavaExec { classpath(libs); - args("--tweakClass", "com.openmodloader.loader.launch.OpenClientTweaker", "--assetIndex", version.assetIndex.id, "--assetsDir", new File(extension.getUserCache(), "assets-" + extension.version).getAbsolutePath()); + args("--tweakClass", "net.fabricmc.base.launch.FabricClientTweaker", "--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..43bbf5f 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", "com.openmodloader.loader.launch.OpenServerTweaker"); + args("--tweakClass", "net.fabricmc.base.launch.FabricServerTweaker"); setWorkingDir(new File(getProject().getRootDir(), "run")); diff --git a/src/main/java/net/fabricmc/loom/util/proccessing/MixinPrebaker.java b/src/main/java/net/fabricmc/loom/util/proccessing/MixinPrebaker.java index f08bbd4..8121782 100644 --- a/src/main/java/net/fabricmc/loom/util/proccessing/MixinPrebaker.java +++ b/src/main/java/net/fabricmc/loom/util/proccessing/MixinPrebaker.java @@ -121,8 +121,8 @@ public class MixinPrebaker { return writer.toByteArray(); } - public static final String APPLIED_MIXIN_CONFIGS_FILENAME = ".oml-applied-mixin-configs"; - public static final String MAPPINGS_FILENAME = ".oml-dev-mappings.tiny"; + public static final String APPLIED_MIXIN_CONFIGS_FILENAME = ".fabric-applied-mixin-configs"; + public static final String MAPPINGS_FILENAME = ".fabric-dev-mappings.tiny"; public static Map jarFileCache = new HashMap<>(); @@ -170,7 +170,7 @@ public class MixinPrebaker { System.out.println("Found " + mixins.size() + " mixins to pre bake"); List tweakers = new ArrayList<>(); - tweakers.add("com.openmodloader.loader.launch.OpenTweaker"); + tweakers.add("net.fabricmc.base.launch.FabricTweaker"); GlobalProperties.put("TweakClasses", tweakers); MixinBootstrap.init();