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

Migrate to Fabric TR

Browse Source
This commit is contained in:
shedaniel
2023-12-26 18:57:21 +08:00
parent cea4b39f22
commit 119898df76
39 changed files with 66 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/libs.versions.toml
View File

@@ -7,7 +7,7 @@ jackson = "2.16.0"
guava = "33.0.0-jre"
stitch = "0.6.2"
tiny-remapper = "1.10.23"
tiny-remapper = "0.9.0"
access-widener = "2.1.0"
mapping-io = "0.5.1"
lorenz-tiny = "4.0.2"
@@ -44,7 +44,7 @@ jackson = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref
guava = { module = "com.google.guava:guava", version.ref = "guava" }
fabric-stitch = { module = "net.fabricmc:stitch", version.ref = "stitch" }
fabric-tiny-remapper = { module = "dev.architectury:tiny-remapper", version.ref = "tiny-remapper" }
fabric-tiny-remapper = { module = "net.fabricmc:tiny-remapper", version.ref = "tiny-remapper" }
fabric-access-widener = { module = "net.fabricmc:access-widener", version.ref = "access-widener" }
fabric-mapping-io = { module = "net.fabricmc:mapping-io", version.ref = "mapping-io" }
fabric-lorenz-tiny = { module = "net.fabricmc:lorenz-tiny", version.ref = "lorenz-tiny" }

3
src/main/java/net/fabricmc/loom/api/processor/MappingProcessorContext.java
View File

@@ -24,10 +24,9 @@
package net.fabricmc.loom.api.processor;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.tinyremapper.TinyRemapper;
public interface MappingProcessorContext {
LazyCloseable<TinyRemapper> createRemapper(MappingsNamespace from, MappingsNamespace to);

3
src/main/java/net/fabricmc/loom/api/processor/ProcessorContext.java
View File

@@ -24,12 +24,11 @@
package net.fabricmc.loom.api.processor;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJarConfiguration;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.TinyRemapper;
public interface ProcessorContext {
MinecraftJarConfiguration getJarConfiguration();

3
src/main/java/net/fabricmc/loom/api/remapping/TinyRemapperExtension.java
View File

@@ -24,10 +24,11 @@
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.
*

2
src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerEntry.java
View File

@@ -26,12 +26,12 @@ package net.fabricmc.loom.configuration.accesswidener;
import java.io.IOException;
import dev.architectury.tinyremapper.TinyRemapper;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.accesswidener.AccessWidenerVisitor;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.loom.util.fmj.ModEnvironment;
import net.fabricmc.tinyremapper.TinyRemapper;
public interface AccessWidenerEntry {
ModEnvironment environment();

2
src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerJarProcessor.java
View File

@@ -35,7 +35,6 @@ import java.util.List;
import javax.inject.Inject;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.file.RegularFileProperty;
import org.jetbrains.annotations.Nullable;
@@ -47,6 +46,7 @@ import net.fabricmc.loom.api.processor.SpecContext;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.loom.util.fmj.FabricModJson;
import net.fabricmc.loom.util.fmj.ModEnvironment;
import net.fabricmc.tinyremapper.TinyRemapper;
public class AccessWidenerJarProcessor implements MinecraftJarProcessor<AccessWidenerJarProcessor.Spec> {
private final String name;

2
src/main/java/net/fabricmc/loom/configuration/accesswidener/LocalAccessWidenerEntry.java
View File

@@ -29,7 +29,6 @@ import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import dev.architectury.tinyremapper.TinyRemapper;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.accesswidener.AccessWidenerReader;
@@ -37,6 +36,7 @@ import net.fabricmc.accesswidener.AccessWidenerVisitor;
import net.fabricmc.loom.util.Checksum;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.loom.util.fmj.ModEnvironment;
import net.fabricmc.tinyremapper.TinyRemapper;
public record LocalAccessWidenerEntry(Path path, String hash) implements AccessWidenerEntry {
public static LocalAccessWidenerEntry create(Path path) {

2
src/main/java/net/fabricmc/loom/configuration/accesswidener/ModAccessWidenerEntry.java
View File

@@ -30,7 +30,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import dev.architectury.tinyremapper.TinyRemapper;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.accesswidener.AccessWidenerReader;
@@ -41,6 +40,7 @@ import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.loom.util.fmj.FabricModJson;
import net.fabricmc.loom.util.fmj.ModEnvironment;
import net.fabricmc.tinyremapper.TinyRemapper;
/**
* {@link AccessWidenerEntry} implementation for a {@link FabricModJson}.

2
src/main/java/net/fabricmc/loom/configuration/accesswidener/TransitiveAccessWidenerMappingsProcessor.java
View File

@@ -28,7 +28,6 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.List;
import dev.architectury.tinyremapper.TinyRemapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,6 +39,7 @@ import net.fabricmc.loom.api.processor.MinecraftJarProcessor;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.mappingio.tree.MappingTree;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.TinyRemapper;
public final class TransitiveAccessWidenerMappingsProcessor implements MinecraftJarProcessor.MappingsProcessor<AccessWidenerJarProcessor.Spec> {
public static final TransitiveAccessWidenerMappingsProcessor INSTANCE = new TransitiveAccessWidenerMappingsProcessor();

2
src/main/java/net/fabricmc/loom/configuration/mods/AccessWidenerAnalyzeVisitorProvider.java
View File

@@ -27,7 +27,6 @@ package net.fabricmc.loom.configuration.mods;
import java.io.IOException;
import java.util.List;
import dev.architectury.tinyremapper.TinyRemapper;
import org.objectweb.asm.ClassVisitor;
import net.fabricmc.accesswidener.AccessWidener;
@@ -36,6 +35,7 @@ import net.fabricmc.accesswidener.AccessWidenerReader;
import net.fabricmc.loom.configuration.mods.dependency.ModDependency;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.ModPlatform;
import net.fabricmc.tinyremapper.TinyRemapper;
public record AccessWidenerAnalyzeVisitorProvider(AccessWidener accessWidener) implements TinyRemapper.AnalyzeVisitorProvider {
static AccessWidenerAnalyzeVisitorProvider createFromMods(String namespace, List<ModDependency> mods, ModPlatform platform) throws IOException {

12
src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java
View File

@@ -44,11 +44,6 @@ import java.util.regex.Pattern;
import com.google.common.base.Stopwatch;
import com.google.gson.JsonObject;
import dev.architectury.loom.util.MappingOption;
import dev.architectury.tinyremapper.InputTag;
import dev.architectury.tinyremapper.NonClassCopyMode;
import dev.architectury.tinyremapper.OutputConsumerPath;
import dev.architectury.tinyremapper.TinyRemapper;
import dev.architectury.tinyremapper.extension.mixin.MixinExtension;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.attributes.Usage;
@@ -72,6 +67,11 @@ import net.fabricmc.loom.util.service.SharedServiceManager;
import net.fabricmc.loom.util.srg.AtRemapper;
import net.fabricmc.loom.util.srg.CoreModClassRemapper;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.InputTag;
import net.fabricmc.tinyremapper.NonClassCopyMode;
import net.fabricmc.tinyremapper.OutputConsumerPath;
import net.fabricmc.tinyremapper.TinyRemapper;
import net.fabricmc.tinyremapper.extension.mixin.MixinExtension;
public class ModProcessor {
private static final String toM = MappingsNamespace.NAMED.toString();
@@ -176,8 +176,6 @@ public class ModProcessor {
TinyRemapper.Builder builder = TinyRemapper.newRemapper()
.withKnownIndyBsm(extension.getKnownIndyBsms().get())
.withMappings(TinyRemapperHelper.create(mappings, fromM, toM, false))
.logger(project.getLogger()::lifecycle)
.logUnknownInvokeDynamic(false)
.renameInvalidLocals(false)
.extraAnalyzeVisitor(AccessWidenerAnalyzeVisitorProvider.createFromMods(fromM, remapList, extension.getPlatform().get()));

3
src/main/java/net/fabricmc/loom/configuration/processors/ContextImplHelper.java
View File

@@ -28,12 +28,11 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Path;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.configuration.ConfigContext;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.loom.util.TinyRemapperHelper;
import net.fabricmc.tinyremapper.TinyRemapper;
public final class ContextImplHelper {
private ContextImplHelper() {

3
src/main/java/net/fabricmc/loom/configuration/processors/MappingProcessorContextImpl.java
View File

@@ -24,12 +24,11 @@
package net.fabricmc.loom.configuration.processors;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.api.processor.MappingProcessorContext;
import net.fabricmc.loom.configuration.ConfigContext;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.tinyremapper.TinyRemapper;
public record MappingProcessorContextImpl(ConfigContext configContext) implements MappingProcessorContext {
@Override

2
src/main/java/net/fabricmc/loom/configuration/processors/ProcessorContextImpl.java
View File

@@ -25,7 +25,6 @@
package net.fabricmc.loom.configuration.processors;
import dev.architectury.loom.util.MappingOption;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
@@ -35,6 +34,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJar;
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJarConfiguration;
import net.fabricmc.loom.util.LazyCloseable;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.TinyRemapper;
public record ProcessorContextImpl(ConfigContext configContext, MinecraftJar minecraftJar) implements ProcessorContext {
@Override

11
src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
View File

@@ -55,10 +55,6 @@ import de.oceanlabs.mcp.mcinjector.adaptors.ParameterAnnotationFixer;
import dev.architectury.loom.forge.UserdevConfig;
import dev.architectury.loom.util.MappingOption;
import dev.architectury.loom.util.TempFiles;
import dev.architectury.tinyremapper.InputTag;
import dev.architectury.tinyremapper.NonClassCopyMode;
import dev.architectury.tinyremapper.OutputConsumerPath;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import org.gradle.api.logging.LogLevel;
import org.gradle.api.logging.Logger;
@@ -93,6 +89,10 @@ import net.fabricmc.loom.util.srg.CoreModClassRemapper;
import net.fabricmc.loom.util.srg.InnerClassRemapper;
import net.fabricmc.mappingio.tree.MappingTree;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.InputTag;
import net.fabricmc.tinyremapper.NonClassCopyMode;
import net.fabricmc.tinyremapper.OutputConsumerPath;
import net.fabricmc.tinyremapper.TinyRemapper;
public class MinecraftPatchedProvider {
private static final String LOOM_PATCH_VERSION_KEY = "Loom-Patch-Version";
@@ -232,8 +232,6 @@ public class MinecraftPatchedProvider {
MemoryMappingTree mappings = mappingsService.getMappingTree();
TinyRemapper remapper = TinyRemapper.newRemapper()
.logger(logger::lifecycle)
.logUnknownInvokeDynamic(false)
.withMappings(TinyRemapperHelper.create(mappings, sourceNamespace, "official", true))
.withMappings(InnerClassRemapper.of(InnerClassRemapper.readClassNames(input), mappings, sourceNamespace, "official"))
.renameInvalidLocals(true)
@@ -244,7 +242,6 @@ public class MinecraftPatchedProvider {
MappingsProviderVerbose.saveFile(remapper);
}
remapper.prepareClasses();
return remapper;
}

4
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/SignatureFixerApplyVisitor.java
View File

@@ -29,8 +29,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import dev.architectury.tinyremapper.TinyRemapper;
import dev.architectury.tinyremapper.api.TrClass;
import org.gradle.api.Project;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.commons.Remapper;
@@ -40,6 +38,8 @@ import net.fabricmc.loom.configuration.providers.mappings.MappingConfiguration;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.TinyRemapperHelper;
import net.fabricmc.loom.util.service.SharedServiceManager;
import net.fabricmc.tinyremapper.TinyRemapper;
import net.fabricmc.tinyremapper.api.TrClass;
public record SignatureFixerApplyVisitor(Map<String, String> signatureFixes) implements TinyRemapper.ApplyVisitorProvider {
@Override

7
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/SingleJarMinecraftProvider.java
View File

@@ -28,12 +28,11 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import dev.architectury.tinyremapper.NonClassCopyMode;
import dev.architectury.tinyremapper.OutputConsumerPath;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.loom.configuration.ConfigContext;
import net.fabricmc.loom.configuration.providers.BundleMetadata;
import net.fabricmc.tinyremapper.NonClassCopyMode;
import net.fabricmc.tinyremapper.OutputConsumerPath;
import net.fabricmc.tinyremapper.TinyRemapper;
public class SingleJarMinecraftProvider extends MinecraftProvider {
private final Environment environment;

4
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java
View File

@@ -37,8 +37,6 @@ import java.util.StringJoiner;
import java.util.function.Function;
import dev.architectury.loom.util.MappingOption;
import dev.architectury.tinyremapper.OutputConsumerPath;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import net.fabricmc.loom.LoomGradleExtension;
@@ -61,6 +59,8 @@ import net.fabricmc.loom.util.service.ScopedSharedServiceManager;
import net.fabricmc.loom.util.srg.InnerClassRemapper;
import net.fabricmc.loom.util.srg.RemapObjectHolderVisitor;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.OutputConsumerPath;
import net.fabricmc.tinyremapper.TinyRemapper;
public abstract class AbstractMappedMinecraftProvider<M extends MinecraftProvider> implements MappedMinecraftProvider.ProviderImpl {
protected final M minecraftProvider;

2
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/IntermediaryMinecraftProvider.java
View File

@@ -26,7 +26,6 @@ package net.fabricmc.loom.configuration.providers.minecraft.mapped;
import java.util.List;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
@@ -35,6 +34,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SplitMinecraftProvider;
import net.fabricmc.tinyremapper.TinyRemapper;
public abstract sealed class IntermediaryMinecraftProvider<M extends MinecraftProvider> extends AbstractMappedMinecraftProvider<M> permits IntermediaryMinecraftProvider.MergedImpl, IntermediaryMinecraftProvider.SingleJarImpl, IntermediaryMinecraftProvider.SplitImpl {
public IntermediaryMinecraftProvider(Project project, M minecraftProvider) {

2
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/MojangMappedMinecraftProvider.java
View File

@@ -26,7 +26,6 @@ package net.fabricmc.loom.configuration.providers.minecraft.mapped;
import java.util.List;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
@@ -36,6 +35,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SplitMinecraftProvider;
import net.fabricmc.loom.util.SidedClassVisitor;
import net.fabricmc.tinyremapper.TinyRemapper;
public abstract sealed class MojangMappedMinecraftProvider<M extends MinecraftProvider> extends AbstractMappedMinecraftProvider<M> permits MojangMappedMinecraftProvider.MergedImpl, MojangMappedMinecraftProvider.SingleJarImpl, MojangMappedMinecraftProvider.SplitImpl {
public MojangMappedMinecraftProvider(Project project, M minecraftProvider) {

2
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/NamedMinecraftProvider.java
View File

@@ -26,7 +26,6 @@ package net.fabricmc.loom.configuration.providers.minecraft.mapped;
import java.util.List;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
@@ -36,6 +35,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SplitMinecraftProvider;
import net.fabricmc.tinyremapper.TinyRemapper;
public abstract class NamedMinecraftProvider<M extends MinecraftProvider> extends AbstractMappedMinecraftProvider<M> {
public NamedMinecraftProvider(Project project, M minecraftProvider) {

2
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/SrgMinecraftProvider.java
View File

@@ -26,7 +26,6 @@ package net.fabricmc.loom.configuration.providers.minecraft.mapped;
import java.util.List;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
@@ -36,6 +35,7 @@ import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType;
import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftProvider;
import net.fabricmc.loom.configuration.providers.minecraft.SplitMinecraftProvider;
import net.fabricmc.loom.util.SidedClassVisitor;
import net.fabricmc.tinyremapper.TinyRemapper;
public abstract sealed class SrgMinecraftProvider<M extends MinecraftProvider> extends AbstractMappedMinecraftProvider<M> permits SrgMinecraftProvider.MergedImpl, SrgMinecraftProvider.SingleJarImpl, SrgMinecraftProvider.SplitImpl {
public SrgMinecraftProvider(Project project, M minecraftProvider) {

5
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/tr/OutputRemappingHandler.java
View File

@@ -32,11 +32,10 @@ import java.nio.file.StandardCopyOption;
import java.nio.file.StandardOpenOption;
import java.util.function.BiConsumer;
import dev.architectury.tinyremapper.InputTag;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.loom.util.FileSystemUtil;
import net.fabricmc.loom.util.ThreadingUtils;
import net.fabricmc.tinyremapper.InputTag;
import net.fabricmc.tinyremapper.TinyRemapper;
public class OutputRemappingHandler {
public static void remap(TinyRemapper remapper, Path assets, Path output) throws IOException {

4
src/main/java/net/fabricmc/loom/extension/RemapperExtensionHolder.java
View File

@@ -26,8 +26,6 @@ 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;
@@ -41,6 +39,8 @@ 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

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

@@ -44,8 +44,6 @@ import javax.inject.Inject;
import com.google.gson.JsonObject;
import dev.architectury.loom.extensions.ModBuildExtensions;
import dev.architectury.tinyremapper.OutputConsumerPath;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.file.FileCollection;
@@ -89,6 +87,8 @@ import net.fabricmc.loom.util.fmj.FabricModJson;
import net.fabricmc.loom.util.fmj.FabricModJsonFactory;
import net.fabricmc.loom.util.service.BuildSharedServiceManager;
import net.fabricmc.loom.util.service.UnsafeWorkQueueHelper;
import net.fabricmc.tinyremapper.OutputConsumerPath;
import net.fabricmc.tinyremapper.TinyRemapper;
public abstract class RemapJarTask extends AbstractRemapJarTask {
@InputFiles

4
src/main/java/net/fabricmc/loom/task/ValidateAccessWidenerTask.java
View File

@@ -33,8 +33,6 @@ import java.nio.file.Files;
import javax.inject.Inject;
import dev.architectury.tinyremapper.TinyRemapper;
import dev.architectury.tinyremapper.api.TrEnvironment;
import org.gradle.api.DefaultTask;
import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.file.RegularFileProperty;
@@ -48,6 +46,8 @@ import net.fabricmc.accesswidener.AccessWidenerReader;
import net.fabricmc.accesswidener.AccessWidenerVisitor;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.tinyremapper.TinyRemapper;
import net.fabricmc.tinyremapper.api.TrEnvironment;
public abstract class ValidateAccessWidenerTask extends DefaultTask {
@SkipWhenEmpty

2
src/main/java/net/fabricmc/loom/task/ValidateMixinNameTask.java
View File

@@ -37,7 +37,6 @@ 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;
@@ -60,6 +59,7 @@ 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.

2
src/main/java/net/fabricmc/loom/task/service/JarManifestService.java
View File

@@ -30,7 +30,6 @@ import java.util.Optional;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.provider.Property;
@@ -44,6 +43,7 @@ import net.fabricmc.loom.LoomGradlePlugin;
import net.fabricmc.loom.configuration.InstallerData;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.LoomVersions;
import net.fabricmc.tinyremapper.TinyRemapper;
public abstract class JarManifestService implements BuildService<JarManifestService.Params> {
interface Params extends BuildServiceParameters {

2
src/main/java/net/fabricmc/loom/task/service/MappingsService.java
View File

@@ -28,7 +28,6 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Path;
import dev.architectury.tinyremapper.IMappingProvider;
import org.gradle.api.Project;
import net.fabricmc.loom.LoomGradleExtension;
@@ -38,6 +37,7 @@ import net.fabricmc.loom.util.service.SharedService;
import net.fabricmc.loom.util.service.SharedServiceManager;
import net.fabricmc.mappingio.MappingReader;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.IMappingProvider;
public final class MappingsService implements SharedService {
private record Options(Path mappingsFile, String from, String to, boolean remapLocals) { }

8
src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
View File

@@ -37,9 +37,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.StringJoiner;
import dev.architectury.tinyremapper.IMappingProvider;
import dev.architectury.tinyremapper.InputTag;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import org.gradle.api.invocation.Gradle;
import org.gradle.api.model.ObjectFactory;
@@ -58,6 +55,9 @@ import net.fabricmc.loom.util.kotlin.KotlinClasspathService;
import net.fabricmc.loom.util.kotlin.KotlinRemapperClassloader;
import net.fabricmc.loom.util.service.SharedService;
import net.fabricmc.loom.util.service.SharedServiceManager;
import net.fabricmc.tinyremapper.IMappingProvider;
import net.fabricmc.tinyremapper.InputTag;
import net.fabricmc.tinyremapper.TinyRemapper;
public class TinyRemapperService implements SharedService {
public static synchronized TinyRemapperService getOrCreate(SharedServiceManager serviceManager, AbstractRemapJarTask remapJarTask) {
@@ -145,7 +145,7 @@ public class TinyRemapperService implements SharedService {
}
if (useMixinExtension) {
builder.extension(new dev.architectury.tinyremapper.extension.mixin.MixinExtension());
builder.extension(new net.fabricmc.tinyremapper.extension.mixin.MixinExtension());
}
if (kotlinClasspath != null) {

2
src/main/java/net/fabricmc/loom/util/FileSystemUtil.java
View File

@@ -35,7 +35,7 @@ import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.function.Supplier;
import dev.architectury.tinyremapper.FileSystemReference;
import net.fabricmc.tinyremapper.FileSystemReference;
public final class FileSystemUtil {
public record Delegate(FileSystemReference reference) implements AutoCloseable, Supplier<FileSystem> {

5
src/main/java/net/fabricmc/loom/util/MappingsProviderVerbose.java
View File

@@ -35,12 +35,11 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Set;
import dev.architectury.tinyremapper.IMappingProvider;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.mappingio.adapter.RegularAsFlatMappingVisitor;
import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.IMappingProvider;
import net.fabricmc.tinyremapper.TinyRemapper;
public class MappingsProviderVerbose {
public static void saveFile(TinyRemapper providers) throws IOException {

3
src/main/java/net/fabricmc/loom/util/SidedClassVisitor.java
View File

@@ -26,10 +26,11 @@ package net.fabricmc.loom.util;
import java.util.Locale;
import dev.architectury.tinyremapper.TinyRemapper;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassVisitor;
import net.fabricmc.tinyremapper.TinyRemapper;
/**
* Applies the @Environment annotation to all classes.
*/

7
src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java
View File

@@ -33,8 +33,6 @@ import java.util.regex.Pattern;
import com.google.common.collect.ImmutableMap;
import dev.architectury.loom.util.MappingOption;
import dev.architectury.tinyremapper.IMappingProvider;
import dev.architectury.tinyremapper.TinyRemapper;
import org.gradle.api.Project;
import net.fabricmc.loom.LoomGradleExtension;
@@ -45,6 +43,8 @@ import net.fabricmc.mappingio.MappingReader;
import net.fabricmc.mappingio.tree.MappingTree;
import net.fabricmc.mappingio.tree.MappingTreeView;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
import net.fabricmc.tinyremapper.IMappingProvider;
import net.fabricmc.tinyremapper.TinyRemapper;
/**
* Contains shortcuts to create tiny remappers using the mappings accessibly to the project.
@@ -80,11 +80,8 @@ public final class TinyRemapperHelper {
int intermediaryNsId = mappingTree.getNamespaceId(MappingsNamespace.INTERMEDIARY.toString());
TinyRemapper.Builder builder = TinyRemapper.newRemapper()
.logUnknownInvokeDynamic(false)
.ignoreConflicts(extension.isForgeLike())
.cacheMappings(true)
.threads(Runtime.getRuntime().availableProcessors())
.logger(project.getLogger()::lifecycle)
.withMappings(create(mappingTree, fromM, toM, true))
.renameInvalidLocals(true)
.rebuildSourceFilenames(true)

2
src/main/java/net/fabricmc/loom/util/kotlin/KotlinMetadataTinyRemapperExtension.java
View File

@@ -24,7 +24,7 @@
package net.fabricmc.loom.util.kotlin;
import dev.architectury.tinyremapper.TinyRemapper;
import net.fabricmc.tinyremapper.TinyRemapper;
public interface KotlinMetadataTinyRemapperExtension extends TinyRemapper.ApplyVisitorProvider, TinyRemapper.Extension {
}

2
src/main/java/net/fabricmc/loom/util/srg/InnerClassRemapper.java
View File

@@ -35,10 +35,10 @@ import java.util.stream.Collectors;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import dev.architectury.tinyremapper.IMappingProvider;
import net.fabricmc.loom.util.FileSystemUtil;
import net.fabricmc.mappingio.tree.MappingTree;
import net.fabricmc.tinyremapper.IMappingProvider;
public class InnerClassRemapper {
public static IMappingProvider of(Set<String> fromClassNames, MappingTree mappingsWithSrg, String from, String to) throws IOException {

4
src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataTinyRemapperExtensionImpl.kt
View File

@@ -24,9 +24,9 @@
package net.fabricmc.loom.kotlin.remapping
import dev.architectury.tinyremapper.TinyRemapper
import dev.architectury.tinyremapper.api.TrClass
import net.fabricmc.loom.util.kotlin.KotlinMetadataTinyRemapperExtension
import net.fabricmc.tinyremapper.TinyRemapper
import net.fabricmc.tinyremapper.api.TrClass
import org.objectweb.asm.ClassVisitor
object KotlinMetadataTinyRemapperExtensionImpl : KotlinMetadataTinyRemapperExtension {

6
src/test/groovy/net/fabricmc/loom/test/unit/kotlin/KotlinRemapperClassloaderTest.groovy
View File

@@ -25,9 +25,6 @@
package net.fabricmc.loom.test.unit.kotlin
import kotlin.KotlinVersion
import dev.architectury.tinyremapper.api.TrClass
import dev.architectury.tinyremapper.api.TrEnvironment
import dev.architectury.tinyremapper.api.TrRemapper
import org.objectweb.asm.ClassReader
import org.objectweb.asm.tree.ClassNode
import spock.lang.Specification
@@ -35,6 +32,9 @@ import spock.lang.Specification
import net.fabricmc.loom.util.kotlin.KotlinClasspath
import net.fabricmc.loom.util.kotlin.KotlinPluginUtils
import net.fabricmc.loom.util.kotlin.KotlinRemapperClassloader
import net.fabricmc.tinyremapper.api.TrClass
import net.fabricmc.tinyremapper.api.TrEnvironment
import net.fabricmc.tinyremapper.api.TrRemapper
class KotlinRemapperClassloaderTest extends Specification {
private static String KOTLIN_VERSION = KotlinVersion.CURRENT.toString()

4
src/test/kotlin/net/fabricmc/loom/test/kotlin/KotlinClassMetadataRemappingAnnotationVisitorTest.kt
View File

@@ -24,12 +24,12 @@
package net.fabricmc.loom.test.kotlin
import dev.architectury.tinyremapper.IMappingProvider
import dev.architectury.tinyremapper.TinyRemapper
import net.fabricmc.loom.kotlin.remapping.KotlinMetadataRemappingClassVisitor
import net.fabricmc.loom.util.TinyRemapperHelper
import net.fabricmc.mappingio.MappingReader
import net.fabricmc.mappingio.tree.MemoryMappingTree
import net.fabricmc.tinyremapper.IMappingProvider
import net.fabricmc.tinyremapper.TinyRemapper
import org.junit.jupiter.api.Test
import org.objectweb.asm.ClassReader
import org.objectweb.asm.ClassVisitor