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

Should fix OML build part 2

Browse source
This commit is contained in:
modmuss50 2018-06-19 10:49:10 +01:00
parent 0b75f4d284
commit 65bebb6fbc
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/fabricmc/loom/task/MapJarsTask.java
View file

@ -55,7 +55,7 @@ public class MapJarsTask extends DefaultTask {
} }
if(!extension.hasPomf()){ if(!extension.hasPomf()){
this.getLogger().lifecycle("POMF version not set, skipping mapping!"); this.getLogger().lifecycle("POMF version not set, skipping mapping!");
FileUtils.copyFile(Constants.MINECRAFT_MERGED_JAR.get(extension), Constants.MINECRAFT_MAPPED_JAR.get(extension)); FileUtils.copyFile(Constants.MINECRAFT_MIXED_JAR.get(extension), Constants.MINECRAFT_MAPPED_JAR.get(extension));
return; return;
} }
if (!Constants.MAPPINGS_DIR.get(extension).exists() || extension.localMappings) { if (!Constants.MAPPINGS_DIR.get(extension).exists() || extension.localMappings) {
@ -65,7 +65,7 @@ public class MapJarsTask extends DefaultTask {
} }
this.getLogger().lifecycle(":remapping jar"); this.getLogger().lifecycle(":remapping jar");
deobfuscator = new Deobfuscator(new JarFile(Constants.MINECRAFT_MERGED_JAR.get(extension))); deobfuscator = new Deobfuscator(new JarFile(Constants.MINECRAFT_MIXED_JAR.get(extension)));
this.deobfuscator.setMappings(new MappingsEnigmaReader().read(Constants.MAPPINGS_DIR.get(extension))); this.deobfuscator.setMappings(new MappingsEnigmaReader().read(Constants.MAPPINGS_DIR.get(extension)));
writeJar(Constants.MINECRAFT_MAPPED_JAR.get(extension), new ProgressListener(), deobfuscator); writeJar(Constants.MINECRAFT_MAPPED_JAR.get(extension), new ProgressListener(), deobfuscator);

2
src/main/java/net/fabricmc/loom/task/ProcessModsTask.java
View file

@ -57,7 +57,7 @@ public class ProcessModsTask extends DefaultTask {
Constants.MINECRAFT_FINAL_JAR.get(extension).delete(); Constants.MINECRAFT_FINAL_JAR.get(extension).delete();
} }
if (mods.size() == 0) { if (mods.size() == 0) {
FileUtils.copyFile(Constants.MINECRAFT_MERGED_JAR.get(extension), Constants.MINECRAFT_MAPPED_JAR.get(extension)); FileUtils.copyFile(Constants.MINECRAFT_MERGED_JAR.get(extension), Constants.MINECRAFT_MIXED_JAR.get(extension));
} else { } else {
downloadRequiredDeps(extension); downloadRequiredDeps(extension);
new PreBakeMixins().proccess(getProject(), extension, mods); new PreBakeMixins().proccess(getProject(), extension, mods);