From cea4b39f223e829d1e96ae2d46ba5de3dd7d5d54 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 26 Dec 2023 18:45:04 +0800 Subject: [PATCH] Fix merge conflicts --- .../fabricmc/loom/api/remapping/TinyRemapperExtension.java | 3 +-- .../fabricmc/loom/build/nesting/IncludedJarFactory.java | 2 +- .../configuration/providers/mappings/tiny/TinyJarInfo.java | 2 +- .../loom/extension/LoomGradleExtensionApiImpl.java | 7 ------- .../fabricmc/loom/extension/LoomGradleExtensionImpl.java | 5 ----- .../fabricmc/loom/extension/RemapperExtensionHolder.java | 4 ++-- 6 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/api/remapping/TinyRemapperExtension.java b/src/main/java/net/fabricmc/loom/api/remapping/TinyRemapperExtension.java index 417b77f6..2d6e6443 100644 --- a/src/main/java/net/fabricmc/loom/api/remapping/TinyRemapperExtension.java +++ b/src/main/java/net/fabricmc/loom/api/remapping/TinyRemapperExtension.java @@ -24,11 +24,10 @@ package net.fabricmc.loom.api.remapping; +import dev.architectury.tinyremapper.TinyRemapper; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import net.fabricmc.tinyremapper.TinyRemapper; - /** * A remapper extension, that has direct access to the TinyRemapper APIs. * diff --git a/src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java b/src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java index 15a40132..41431b65 100644 --- a/src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java +++ b/src/main/java/net/fabricmc/loom/build/nesting/IncludedJarFactory.java @@ -183,7 +183,7 @@ public final class IncludedJarFactory { File tempFile = new File(tempDir, input.getName()); - if (tempFile.exists() && FabricModJsonFactory.isModJar(tempFile)) { + if (tempFile.exists() && FabricModJsonFactory.isModJar(tempFile, LoomGradleExtension.get(project).getPlatform().get())) { return tempFile; } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/TinyJarInfo.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/TinyJarInfo.java index 8889ab3b..45d6137d 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/TinyJarInfo.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/TinyJarInfo.java @@ -53,9 +53,9 @@ public record TinyJarInfo(boolean v2, Optional minecraftVersionId) { private static boolean doesJarContainV2Mappings(FileSystemUtil.Delegate fs) throws IOException { try (BufferedReader reader = Files.newBufferedReader(fs.getPath("mappings", "mappings.tiny"))) { return MappingReader.detectFormat(reader) == MappingFormat.TINY_2_FILE; - } } catch (NoSuchFileException e) { return false; + } } private static Optional getMinecraftVersionId(FileSystemUtil.Delegate fs) throws IOException { diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java index cbbce7aa..657f0748 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java @@ -265,8 +265,6 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA return new LayeredMappingsDependency(getProject(), new GradleMappingContext(getProject(), builtSpec.getVersion().replace("+", "_").replace(".", "_")), builtSpec, builtSpec.getVersion()); } - protected abstract String getMinecraftVersion(); - @Override public void runs(Action> action) { action.execute(runConfigs); @@ -558,11 +556,6 @@ public abstract class LoomGradleExtensionApiImpl implements LoomGradleExtensionA throw new RuntimeException("Yeah... something is really wrong"); } - @Override - protected String getMinecraftVersion() { - throw new RuntimeException("Yeah... something is really wrong"); - } - @Override public ForgeExtensionAPI getForge() { throw new RuntimeException("Yeah... something is really wrong"); diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java index e5eaaef3..9b1ded5b 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java @@ -302,11 +302,6 @@ public class LoomGradleExtensionImpl extends LoomGradleExtensionApiImpl implemen provider.getDownloader().disallowChanges(); } - @Override - protected String getMinecraftVersion() { - return getMinecraftProvider().minecraftVersion(); - } - @Override public ForgeExtensionAPI getForge() { ModPlatform.assertPlatform(this, ModPlatform.FORGE); diff --git a/src/main/java/net/fabricmc/loom/extension/RemapperExtensionHolder.java b/src/main/java/net/fabricmc/loom/extension/RemapperExtensionHolder.java index 454e75ec..b43a37fa 100644 --- a/src/main/java/net/fabricmc/loom/extension/RemapperExtensionHolder.java +++ b/src/main/java/net/fabricmc/loom/extension/RemapperExtensionHolder.java @@ -26,6 +26,8 @@ package net.fabricmc.loom.extension; import javax.inject.Inject; +import dev.architectury.tinyremapper.TinyRemapper; +import dev.architectury.tinyremapper.api.TrClass; import org.gradle.api.model.ObjectFactory; import org.gradle.api.provider.Property; import org.gradle.api.tasks.Input; @@ -39,8 +41,6 @@ import net.fabricmc.loom.api.remapping.RemapperContext; import net.fabricmc.loom.api.remapping.RemapperExtension; import net.fabricmc.loom.api.remapping.RemapperParameters; import net.fabricmc.loom.api.remapping.TinyRemapperExtension; -import net.fabricmc.tinyremapper.TinyRemapper; -import net.fabricmc.tinyremapper.api.TrClass; public abstract class RemapperExtensionHolder { // Null when RemapperParameters.None.class