More name updates, should help in a few places
parent
252b06bfc2
commit
90746a93c1
|
@ -250,7 +250,7 @@ public class AbstractPlugin implements Plugin<Project> {
|
||||||
|
|
||||||
if (extension.isModWorkspace()) {
|
if (extension.isModWorkspace()) {
|
||||||
//only add this when not in a dev env
|
//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");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ import java.io.File;
|
||||||
public class LoomGradleExtension {
|
public class LoomGradleExtension {
|
||||||
public String version;
|
public String version;
|
||||||
public String runDir = "run";
|
public String runDir = "run";
|
||||||
public String omlVersion;
|
public String fabricVersion;
|
||||||
public String pomfVersion;
|
public String pomfVersion;
|
||||||
public String refmapName;
|
public String refmapName;
|
||||||
public boolean skipPrebake = false;
|
public boolean skipPrebake = false;
|
||||||
|
@ -42,13 +42,13 @@ public class LoomGradleExtension {
|
||||||
|
|
||||||
public String getVersionString() {
|
public String getVersionString() {
|
||||||
if (isModWorkspace()) {
|
if (isModWorkspace()) {
|
||||||
return version + "-" + omlVersion;
|
return version + "-" + fabricVersion;
|
||||||
}
|
}
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isModWorkspace() {
|
public boolean isModWorkspace() {
|
||||||
return omlVersion != null && !omlVersion.isEmpty();
|
return fabricVersion != null && !fabricVersion.isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public File getUserCache() {
|
public File getUserCache() {
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class LoomGradlePlugin extends AbstractPlugin {
|
||||||
makeTask("processMods", ProcessModsTask.class).dependsOn("mergeJars");
|
makeTask("processMods", ProcessModsTask.class).dependsOn("mergeJars");
|
||||||
makeTask("mapJars", MapJarsTask.class).dependsOn("processMods");
|
makeTask("mapJars", MapJarsTask.class).dependsOn("processMods");
|
||||||
makeTask("finaliseJars", FinaliseJar.class).dependsOn("mapJars");
|
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("extractNatives", ExtractNativesTask.class).dependsOn("download");
|
||||||
makeTask("genIdeaWorkspace", GenIdeaProjectTask.class).dependsOn("idea").setGroup("ide");
|
makeTask("genIdeaWorkspace", GenIdeaProjectTask.class).dependsOn("idea").setGroup("ide");
|
||||||
|
|
|
@ -139,8 +139,8 @@ public class GenIdeaProjectTask extends DefaultTask {
|
||||||
ideaClient.projectName = project.getName();
|
ideaClient.projectName = project.getName();
|
||||||
ideaClient.configName = "Minecraft Client";
|
ideaClient.configName = "Minecraft Client";
|
||||||
ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir;
|
ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir;
|
||||||
ideaClient.vmArgs = "-Djava.library.path=" + Constants.MINECRAFT_NATIVES.get(extension).getAbsolutePath() + " -Doml.development=true";
|
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 net.fabricmc.base.launch.FabricClientTweaker --assetIndex " + version.assetIndex.id + " --assetsDir " + new File(extension.getUserCache(), "assets-" + extension.version).getAbsolutePath();
|
||||||
|
|
||||||
runManager.appendChild(ideaClient.genRuns(runManager));
|
runManager.appendChild(ideaClient.genRuns(runManager));
|
||||||
|
|
||||||
|
@ -149,8 +149,8 @@ public class GenIdeaProjectTask extends DefaultTask {
|
||||||
ideaServer.projectName = project.getName();
|
ideaServer.projectName = project.getName();
|
||||||
ideaServer.configName = "Minecraft Server";
|
ideaServer.configName = "Minecraft Server";
|
||||||
ideaServer.runDir = "file://$PROJECT_DIR$/" + extension.runDir;
|
ideaServer.runDir = "file://$PROJECT_DIR$/" + extension.runDir;
|
||||||
ideaServer.vmArgs = "-Doml.development=true";
|
ideaServer.vmArgs = "-Dfabric.development=true";
|
||||||
ideaServer.programArgs = "--tweakClass com.openmodloader.loader.launch.OpenServerTweaker";
|
ideaServer.programArgs = "--tweakClass net.fabricmc.base.launch.FabricServerTweaker";
|
||||||
|
|
||||||
runManager.appendChild(ideaServer.genRuns(runManager));
|
runManager.appendChild(ideaServer.genRuns(runManager));
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ public class RunClientTask extends JavaExec {
|
||||||
|
|
||||||
classpath(libs);
|
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"));
|
setWorkingDir(new File(getProject().getRootDir(), "run"));
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ public class RunServerTask extends JavaExec {
|
||||||
libs.add(Constants.MINECRAFT_FINAL_JAR.get(extension).getAbsolutePath());
|
libs.add(Constants.MINECRAFT_FINAL_JAR.get(extension).getAbsolutePath());
|
||||||
classpath(libs);
|
classpath(libs);
|
||||||
|
|
||||||
args("--tweakClass", "com.openmodloader.loader.launch.OpenServerTweaker");
|
args("--tweakClass", "net.fabricmc.base.launch.FabricServerTweaker");
|
||||||
|
|
||||||
setWorkingDir(new File(getProject().getRootDir(), "run"));
|
setWorkingDir(new File(getProject().getRootDir(), "run"));
|
||||||
|
|
||||||
|
|
|
@ -121,8 +121,8 @@ public class MixinPrebaker {
|
||||||
return writer.toByteArray();
|
return writer.toByteArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String APPLIED_MIXIN_CONFIGS_FILENAME = ".oml-applied-mixin-configs";
|
public static final String APPLIED_MIXIN_CONFIGS_FILENAME = ".fabric-applied-mixin-configs";
|
||||||
public static final String MAPPINGS_FILENAME = ".oml-dev-mappings.tiny";
|
public static final String MAPPINGS_FILENAME = ".fabric-dev-mappings.tiny";
|
||||||
|
|
||||||
public static Map<String, InputStream> jarFileCache = new HashMap<>();
|
public static Map<String, InputStream> jarFileCache = new HashMap<>();
|
||||||
|
|
||||||
|
@ -170,7 +170,7 @@ public class MixinPrebaker {
|
||||||
System.out.println("Found " + mixins.size() + " mixins to pre bake");
|
System.out.println("Found " + mixins.size() + " mixins to pre bake");
|
||||||
|
|
||||||
List<String> tweakers = new ArrayList<>();
|
List<String> tweakers = new ArrayList<>();
|
||||||
tweakers.add("com.openmodloader.loader.launch.OpenTweaker");
|
tweakers.add("net.fabricmc.base.launch.FabricTweaker");
|
||||||
GlobalProperties.put("TweakClasses", tweakers);
|
GlobalProperties.put("TweakClasses", tweakers);
|
||||||
|
|
||||||
MixinBootstrap.init();
|
MixinBootstrap.init();
|
||||||
|
|
Loading…
Reference in New Issue