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

fix #26

dev/0.11
asie 2018-12-17 15:05:52 +01:00
parent 4a3555216d
commit e93292564d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/fabricmc/loom/util/ModProcessor.java
View File

@ -68,19 +68,25 @@ public class ModProcessor {
String fromM = "intermediary"; String fromM = "intermediary";
String toM = "named"; String toM = "named";
MinecraftProvider minecraftProvider = extension.getMinecraftProvider();
MinecraftMappedProvider mappedProvider = extension.getMinecraftMappedProvider(); MinecraftMappedProvider mappedProvider = extension.getMinecraftMappedProvider();
MappingsProvider mappingsProvider = extension.getMappingsProvider(); MappingsProvider mappingsProvider = extension.getMappingsProvider();
File mappingsFile = mappingsProvider.MAPPINGS_TINY; File mappingsFile = mappingsProvider.MAPPINGS_TINY;
Path mappings = mappingsFile.toPath(); Path mappings = mappingsFile.toPath();
Path inputPath = input.getAbsoluteFile().toPath();
Path mc = mappedProvider.MINECRAFT_INTERMEDIARY_JAR.toPath(); Path mc = mappedProvider.MINECRAFT_INTERMEDIARY_JAR.toPath();
Path[] mcDeps = mappedProvider.getMapperPaths().stream() Path[] mcDeps = mappedProvider.getMapperPaths().stream()
.map(File::toPath) .map(File::toPath)
.toArray(Path[]::new); .toArray(Path[]::new);
Collection<File> modCompileFiles = project.getConfigurations().getByName(Constants.COMPILE_MODS).getFiles(); Collection<File> modCompileFiles = project.getConfigurations().getByName(Constants.COMPILE_MODS).getFiles();
Path[] modCompiles = modCompileFiles.stream() Path[] modCompiles = modCompileFiles.stream()
.map(File::toPath) .map(p -> {
if (p.equals(input)) {
return inputPath;
} else {
return p.toPath();
}
})
.toArray(Path[]::new); .toArray(Path[]::new);
project.getLogger().lifecycle(":remapping " + input.getName() + " (TinyRemapper, " + fromM + " -> " + toM + ")"); project.getLogger().lifecycle(":remapping " + input.getName() + " (TinyRemapper, " + fromM + " -> " + toM + ")");
@ -90,14 +96,14 @@ public class ModProcessor {
.build(); .build();
try (OutputConsumerPath outputConsumer = new OutputConsumerPath(Paths.get(output.getAbsolutePath()))) { try (OutputConsumerPath outputConsumer = new OutputConsumerPath(Paths.get(output.getAbsolutePath()))) {
outputConsumer.addNonClassFiles(input.toPath()); outputConsumer.addNonClassFiles(inputPath);
if (!modCompileFiles.contains(input)) { if (!modCompileFiles.contains(input)) {
remapper.read(input.toPath()); remapper.read(inputPath);
} }
remapper.read(modCompiles); remapper.read(modCompiles);
remapper.read(mc); remapper.read(mc);
remapper.read(mcDeps); remapper.read(mcDeps);
remapper.apply(input.toPath(), outputConsumer); remapper.apply(inputPath, outputConsumer);
} catch (Exception e){ } catch (Exception e){
throw new RuntimeException("Failed to remap JAR to " + toM, e); throw new RuntimeException("Failed to remap JAR to " + toM, e);
} finally { } finally {