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

Actually fix mixin refmaps by removing broken containsKey

Browse Source
This commit is contained in:
Juuz
2022-01-26 15:14:18 +02:00
parent 849961adf4
commit 9acfc71003
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/fabricmc/loom/task/RemapJarTask.java
View File

@@ -71,6 +71,7 @@ import org.gradle.api.tasks.InputFiles;
import org.gradle.api.tasks.Internal;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskAction;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -254,13 +255,18 @@ public abstract class RemapJarTask extends AbstractRemapJarTask {
File inputJar = getInputFile().get().getAsFile();
try (JarFile jar = new JarFile(inputJar)) {
Attributes attributes = jar.getManifest().getMainAttributes();
@Nullable Manifest manifest = jar.getManifest();
if (attributes.containsKey(Constants.Forge.MIXIN_CONFIGS_MANIFEST_KEY)) {
return Set.of(attributes.getValue(Constants.Forge.MIXIN_CONFIGS_MANIFEST_KEY).split(","));
} else {
return Set.of();
if (manifest != null) {
Attributes attributes = manifest.getMainAttributes();
String mixinConfigs = attributes.getValue(Constants.Forge.MIXIN_CONFIGS_MANIFEST_KEY);
if (mixinConfigs != null) {
return Set.of(mixinConfigs.split(","));
}
}
return Set.of();
} catch (IOException e) {
throw new UncheckedIOException("Could not read mixin configs from input jar", e);
}