From 5526ee050cfe690e4eab5d2eef5cf23c2765867b Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 10 Aug 2022 15:42:02 +0800 Subject: [PATCH] Update Architectury TinyRemapper Signed-off-by: shedaniel --- build.gradle | 3 +-- .../fabricmc/loom/configuration/CompileConfiguration.java | 5 +++-- .../fabricmc/loom/configuration/mods/ModProcessor.java | 8 ++++---- .../net/fabricmc/loom/task/ValidateMixinNameTask.java | 2 +- src/main/java/net/fabricmc/loom/util/FileSystemUtil.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index a199dea8..16a61d12 100644 --- a/build.gradle +++ b/build.gradle @@ -98,8 +98,7 @@ dependencies { } // tinyfile management - implementation ('dev.architectury:tiny-remapper:1.7.19') - // TODO: implementation ('net.fabricmc:tiny-remapper:0.8.5') + implementation ('dev.architectury:tiny-remapper:1.8.20') implementation 'net.fabricmc:access-widener:2.1.0' implementation 'net.fabricmc:mapping-io:0.2.1' diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 6839dc9e..b148d036 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -38,6 +38,7 @@ import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.ConfigurationContainer; import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.AbstractCopyTask; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.compile.JavaCompile; @@ -89,7 +90,7 @@ public final class CompileConfiguration { project.afterEvaluate(project1 -> { if (extension.shouldGenerateSrgTiny()) { - extension.createLazyConfiguration(Constants.Configurations.SRG).configure(configuration -> configuration.setTransitive(false)); + configurations.register(Constants.Configurations.SRG, configuration -> configuration.setTransitive(false)); } if (extension.isDataGenEnabled()) { @@ -255,7 +256,7 @@ public final class CompileConfiguration { if (extension.isForge()) { // Create default mod from main source set extension.mods(mods -> { - final SourceSet main = javaPluginExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME); + final SourceSet main = project.getExtensions().getByType(JavaPluginExtension.class).getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME); mods.create("main").sourceSet(main); }); } diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java index 6f3d5937..6d65386a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -85,11 +85,11 @@ public class ModProcessor { } private void stripNestedJars(Path path) { - if (!ZipUtils.contains(file.toPath(), "fabric.mod.json")) { - if (ZipUtils.contains(file.toPath(), "quilt.mod.json")) { + if (!ZipUtils.contains(path, "fabric.mod.json")) { + if (ZipUtils.contains(path, "quilt.mod.json")) { // Strip out all contained jar info as we dont want loader to try and load the jars contained in dev. try { - ZipUtils.transformJson(JsonObject.class, file.toPath(), Map.of("quilt.mod.json", json -> { + ZipUtils.transformJson(JsonObject.class, path, Map.of("quilt.mod.json", json -> { if (json.has("quilt_loader")) { json.getAsJsonObject("quilt_loader").remove("jars"); } @@ -97,7 +97,7 @@ public class ModProcessor { return json; })); } catch (IOException e) { - throw new UncheckedIOException("Failed to strip nested jars from %s".formatted(file), e); + throw new UncheckedIOException("Failed to strip nested jars from %s".formatted(path), e); } } diff --git a/src/main/java/net/fabricmc/loom/task/ValidateMixinNameTask.java b/src/main/java/net/fabricmc/loom/task/ValidateMixinNameTask.java index 2d99b4b9..e96f4d58 100644 --- a/src/main/java/net/fabricmc/loom/task/ValidateMixinNameTask.java +++ b/src/main/java/net/fabricmc/loom/task/ValidateMixinNameTask.java @@ -37,6 +37,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; +import dev.architectury.tinyremapper.extension.mixin.common.data.Constant; import org.gradle.api.GradleException; import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.provider.Property; @@ -58,7 +59,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.fabricmc.loom.util.Constants; -import net.fabricmc.tinyremapper.extension.mixin.common.data.Constant; /** * Task to validate mixin names. diff --git a/src/main/java/net/fabricmc/loom/util/FileSystemUtil.java b/src/main/java/net/fabricmc/loom/util/FileSystemUtil.java index 0a097c83..39b56336 100644 --- a/src/main/java/net/fabricmc/loom/util/FileSystemUtil.java +++ b/src/main/java/net/fabricmc/loom/util/FileSystemUtil.java @@ -35,7 +35,7 @@ import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.util.function.Supplier; -import net.fabricmc.tinyremapper.FileSystemReference; +import dev.architectury.tinyremapper.FileSystemReference; public final class FileSystemUtil { public record Delegate(FileSystemReference reference) implements AutoCloseable, Supplier {