This should be done now

This commit is contained in:
Juuz
2022-01-19 17:02:55 +02:00
parent 1bedce942e
commit 47cbcbcd36
29 changed files with 339 additions and 116 deletions

View File

@@ -34,9 +34,6 @@ import java.util.Set;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import net.fabricmc.loom.util.FunnyTodoException;
import org.cadixdev.lorenz.MappingSet;
import org.cadixdev.mercury.Mercury;
import org.cadixdev.mercury.remapper.MercuryRemapper;
@@ -184,16 +181,9 @@ public class MigrateMappingsTask extends AbstractLoomTask {
mercury.getClassPath().add(intermediaryJar);
}
FunnyTodoException.yes("Forge jars");
/*if (extension.isForge()) {
mercury.getClassPath().add(minecraftMappedProvider.getSrgJar().toPath());
if (extension.isForgeAndNotOfficial()) {
mercury.getClassPath().add(minecraftMappedProvider.getForgeMappedJar().toPath());
mercury.getClassPath().add(minecraftMappedProvider.getForgeIntermediaryJar().toPath());
mercury.getClassPath().add(minecraftMappedProvider.getForgeSrgJar().toPath());
}
}*/
for (Path srgJar : extension.getMinecraftJars(MappingsNamespace.SRG)) {
mercury.getClassPath().add(srgJar);
}
mercury.getProcessors().add(MercuryRemapper.create(mappingSet));