imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve mod re-mapper

Browse Source
This commit is contained in:
modmuss50
2016-10-23 17:31:56 +01:00
parent 9f959ef04d
commit e274d0c8c5
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/fabricmc/loom/util/ModRemapper.java
View File

@@ -42,17 +42,19 @@ public class ModRemapper {
LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
//TODO whats the proper way of doing this???
File libsDir = new File(project.getBuildDir(), "libs");
File modJar = new File(libsDir, project.getName() + "-" + project.getVersion() + "-unmapped.jar");
File modMappedJar = new File(libsDir, project.getName() + "-" + project.getVersion() + ".jar");
if (!modMappedJar.exists()) {
project.getLogger().error("Could not find mod jar @" + modJar.getAbsolutePath());
File debofJar = new File(libsDir, project.getName() + "-" + project.getVersion() + "-debof.jar");
File modJar = new File(libsDir, project.getName() + "-" + project.getVersion() + ".jar");
if (!modJar.exists()) {
project.getLogger().error("Could not find mod jar @" + debofJar.getAbsolutePath());
project.getLogger().error("This is can be fixed by adding a 'settings.gradle' file specifying 'rootProject.name'");
return;
}
if (modJar.exists()) {
modJar.delete();
if (debofJar.exists()) {
debofJar.delete();
}
modMappedJar.renameTo(modJar);
//Move the pre existing mod jar to the debof jar
modJar.renameTo(debofJar);
Path mappings = Constants.MAPPINGS_TINY.get(extension).toPath();
@@ -75,12 +77,16 @@ public class ModRemapper {
.withMappings(TinyUtils.createTinyMappingProvider(Constants.MAPPINGS_MIXIN_EXPORT.get(extension).toPath(), fromM, toM))
.build();
OutputConsumerPath outputConsumer = new OutputConsumerPath(modMappedJar.toPath());
outputConsumer.addNonClassFiles(modJar.toPath());
remapper.read(modJar.toPath());
OutputConsumerPath outputConsumer = new OutputConsumerPath(modJar.toPath());
//Rebof the debof jar
outputConsumer.addNonClassFiles(debofJar.toPath());
remapper.read(debofJar.toPath());
remapper.read(classpath);
remapper.apply(modJar.toPath(), outputConsumer);
remapper.apply(debofJar.toPath(), outputConsumer);
outputConsumer.finish();
remapper.finish();
//Add the debof jar to be uploaded to maven
project.getArtifacts().add("archives", debofJar);
}
}