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

Improvements to Quilt JiJ (#83)

Browse Source
This commit is contained in:
Emma C. Pointer-Null
2022-05-08 04:57:17 -04:00
committed by GitHub
parent 514ba75a1e
commit 5770b9a12d
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java
View File

@@ -53,7 +53,6 @@ import org.jetbrains.annotations.Nullable;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.LoomGradlePlugin;
import net.fabricmc.loom.task.RemapTaskConfiguration;
import net.fabricmc.loom.util.ModPlatform;
import net.fabricmc.loom.util.ModUtils;
import net.fabricmc.loom.util.ZipUtils;
@@ -165,10 +164,7 @@ public final class IncludedJarFactory {
try {
FileUtils.copyFile(input, tempFile);
if (extension.getPlatform().get() == ModPlatform.QUILT) {
throw new UnsupportedOperationException("Generating Quilt mods for JiJ is not yet implemented!");
}
// TODO generate Quilt qmjs natively
ZipUtils.add(tempFile.toPath(), "fabric.mod.json", generateModForDependency(metadata).getBytes(StandardCharsets.UTF_8));
} catch (IOException e) {
throw new UncheckedIOException("Failed to add dummy mod while including %s".formatted(input), e);

2
src/main/java/net/fabricmc/loom/build/nesting/JarNester.java
View File

@@ -107,7 +107,7 @@ public class JarNester {
for (File file : jars) {
String nestedJarPath = "META-INF/jars/" + file.getName();
Preconditions.checkArgument(ModUtils.isMod(file, platform), "Cannot nest none mod jar: " + file.getName());
Preconditions.checkArgument(ModUtils.isMod(file, platform) || ModUtils.isMod(file, ModPlatform.FABRIC), "Cannot nest none mod jar: " + file.getName());
for (JsonElement nestedJar : nestedJars) {
String nestedJarString = nestedJar.getAsString();