hibiscus-client
/
fabric-loom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small tweaks

dev/0.11
modmuss50 2018-06-18 16:41:50 +01:00
parent 527000ed24
commit cc23189335
No known key found for this signature in database
GPG Key ID: 773D17BE8BF49C82
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/openmodloader/gradle/OpenGradlePlugin.java
View File

@ -36,9 +36,9 @@ public class OpenGradlePlugin extends AbstractPlugin {
makeTask("download", DownloadTask.class); makeTask("download", DownloadTask.class);
makeTask("mergeJars", MergeJarsTask.class).dependsOn("download"); makeTask("mergeJars", MergeJarsTask.class).dependsOn("download");
makeTask("mapJars", MapJarsTask.class).dependsOn("mergeJars"); makeTask("processMods", ProcessModsTask.class).dependsOn("mergeJars");
makeTask("processMods", ProcessModsTask.class).dependsOn("mapJars"); makeTask("mapJars", MapJarsTask.class).dependsOn("processMods");
makeTask("setup", DefaultTask.class).dependsOn("processMods").setGroup("openmodloader"); makeTask("setup", DefaultTask.class).dependsOn("mapJars").setGroup("openmodloader");
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");

2
src/main/java/net/fabricmc/loom/AbstractPlugin.java
View File

@ -252,7 +252,7 @@ public class AbstractPlugin implements Plugin<Project> {
} }
}); });
project.getTasks().getByName("build").doLast(task -> { project.getTasks().getByName("jar").doLast(task -> {
project.getLogger().lifecycle(":remapping mods"); project.getLogger().lifecycle(":remapping mods");
LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
try { try {

6
src/main/java/net/fabricmc/loom/util/proccessing/PreBakeMixins.java
View File

@ -40,13 +40,13 @@ public class PreBakeMixins {
String[] args = new String[mods.size() + 4]; String[] args = new String[mods.size() + 4];
args[0] = "-m"; args[0] = "-m";
args[1] = Constants.MAPPINGS_TINY.get(extension).getAbsolutePath(); args[1] = Constants.MAPPINGS_TINY.get(extension).getAbsolutePath();
args[2] = Constants.MINECRAFT_MAPPED_JAR.get(extension).getAbsolutePath(); args[2] = Constants.MINECRAFT_MERGED_JAR.get(extension).getAbsolutePath();
args[3] = Constants.MINECRAFT_FINAL_JAR.get(extension).getAbsolutePath(); args[3] = Constants.MINECRAFT_MAPPED_JAR.get(extension).getAbsolutePath();
for (int i = 0; i < mods.size(); i++) { for (int i = 0; i < mods.size(); i++) {
args[i + 4] = mods.get(i).getAbsolutePath(); args[i + 4] = mods.get(i).getAbsolutePath();
} }
project.getLogger().lifecycle(":preBaking mixins"); project.getLogger().lifecycle(":preBaking mixins");
ProcessModsTask.addFile(Constants.MINECRAFT_MAPPED_JAR.get(extension), this); ProcessModsTask.addFile(Constants.MINECRAFT_MERGED_JAR.get(extension), this);
MixinPrebaker.main(args); MixinPrebaker.main(args);
} }