From e76606425e7c05562d646c3a5803177d0d048339 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Wed, 1 Oct 2025 00:14:20 +0300 Subject: [PATCH] Move most Architectury classes into dev.architectury.loom The remaining classes are either API types like ModPlatform or single classes that make sense in specific packages next to e.g. other implementations of the same interface. --- .../AccessTransformerEntry.java | 2 +- .../AccessTransformerJarProcessor.java | 3 +- .../AccessTransformerService.java | 7 +- .../accesstransformer}/AtClassRemapper.java | 6 +- .../loom/accesstransformer}/Aw2At.java | 4 +- .../loom/extensions/ModBuildExtensions.java | 4 +- .../loom/forge}/CoreModClassRemapper.java | 6 +- .../loom}/forge/FieldMappingsMigrator.java | 5 +- .../{util => forge}/ForgeLoggerConfig.java | 2 +- .../ForgeMigratedMappingConfiguration.java | 3 +- .../loom/forge/ForgeSourcesService.java | 4 +- .../loom/forge}/InnerClassRemapper.java | 2 +- .../loom}/forge/MappingsMigrator.java | 2 +- .../MethodInheritanceMappingsMigrator.java | 5 +- .../loom/forge}/RemapObjectHolderVisitor.java | 2 +- .../loom/forge/config}/ConfigValue.java | 2 +- .../loom/forge/config}/ForgeRunTemplate.java | 4 +- .../forge/{ => config}/UserdevConfig.java | 3 +- .../forge/dependency}/DependencyProvider.java | 4 +- .../dependency}/DependencyProviders.java | 2 +- .../dependency}/ForgeLibrariesProvider.java | 8 +- .../loom/forge/dependency}/ForgeProvider.java | 2 +- .../forge/dependency}/ForgeRunsProvider.java | 12 +-- .../dependency}/ForgeUniversalProvider.java | 2 +- .../dependency}/ForgeUserdevProvider.java | 12 ++- .../loom/forge/dependency}/PatchProvider.java | 2 +- .../loom/forge/dependency}/SrgProvider.java | 2 +- .../minecraft/ForgeMinecraftProvider.java | 3 +- .../MergedForgeMinecraftProvider.java | 3 +- .../minecraft}/MinecraftPatchedProvider.java | 31 +++---- .../SingleJarForgeMinecraftProvider.java | 3 +- .../loom/mappings}/ForgeMappingsMerger.java | 9 +-- .../loom/mappings}/MCPReader.java | 2 +- .../loom/mappings}/MappingException.java | 4 +- .../{util => mappings}/MappingOption.java | 2 +- .../mappings/crane/CraneMappingLayer.java | 2 +- .../mappings/crane/CraneMappingsSpec.java | 2 +- .../loom}/mcpconfig/DependencySet.java | 8 +- .../loom}/mcpconfig/McpConfigData.java | 2 +- .../loom}/mcpconfig/McpConfigFunction.java | 9 +-- .../loom}/mcpconfig/McpConfigProvider.java | 4 +- .../loom}/mcpconfig/McpConfigStep.java | 5 +- .../loom}/mcpconfig/McpExecutor.java | 6 +- .../loom}/mcpconfig/McpExecutorBuilder.java | 24 +++--- .../loom}/mcpconfig/package-info.java | 2 +- .../mcpconfig/steplogic/ConstantLogic.java | 2 +- .../steplogic/DownloadManifestFileLogic.java | 2 +- .../mcpconfig/steplogic/FunctionLogic.java | 4 +- .../mcpconfig/steplogic/InjectLogic.java | 4 +- .../steplogic/ListLibrariesLogic.java | 2 +- .../loom}/mcpconfig/steplogic/NoOpLogic.java | 2 +- .../loom}/mcpconfig/steplogic/PatchLogic.java | 4 +- .../loom}/mcpconfig/steplogic/StepLogic.java | 6 +- .../loom}/mcpconfig/steplogic/StripLogic.java | 6 +- .../loom/metadata/ModMetadataFile.java | 2 +- .../loom/metadata/QuiltModJson.java | 2 +- .../loom/util/DependencyDownloader.java | 6 +- .../architectury}/loom/util/LfWriter.java | 2 +- .../architectury}/loom/util/LoggerFilter.java | 2 +- .../architectury}/loom/util/PropertyUtil.java | 2 +- .../loom/util/ThreadingUtils.java | 4 +- .../architectury}/loom/util/Version.java | 2 +- .../loom/util/collection}/CollectionUtil.java | 2 +- .../loom/util/{ => collection}/Multimap.java | 2 +- .../util/{ => collection}/MultimapImpl.java | 2 +- .../loom/util/function/FsPathConsumer.java | 2 +- .../loom/util/function/IoConsumer.java | 2 +- .../fabricmc/loom/LoomGradleExtension.java | 16 ++-- .../configuration/CompileConfiguration.java | 22 ++--- .../accesswidener/AccessWidenerFile.java | 2 +- .../SingleJarDecompileConfiguration.java | 2 +- .../configuration/ide/RunConfigSettings.java | 4 +- .../loom/configuration/mods/ModProcessor.java | 8 +- .../processors/ProcessorContextImpl.java | 2 +- .../LayeredMappingSpecBuilderImpl.java | 4 +- .../mappings/MappingConfiguration.java | 10 +-- .../minecraft/MinecraftJarConfiguration.java | 2 +- .../AbstractMappedMinecraftProvider.java | 10 +-- .../minecraft/tr/OutputRemappingHandler.java | 80 ------------------- .../extension/LoomGradleExtensionImpl.java | 4 +- .../task/GenerateForgePatchedSourcesTask.java | 12 +-- .../loom/task/RemapTaskConfiguration.java | 4 +- .../task/launch/GenerateDLIConfigTask.java | 6 +- .../task/launch/GenerateLog4jConfigTask.java | 2 +- .../task/service/LorenzMappingService.java | 2 +- .../net/fabricmc/loom/util/Constants.java | 2 +- .../loom/util/TinyRemapperHelper.java | 5 +- .../loom/test/unit/VersionTest.groovy | 3 +- .../AccessTransformerJarProcessorTest.groovy | 2 +- .../loom/test/unit/forge/Aw2AtTest.groovy | 2 +- .../test/unit/forge/ConfigValueTest.groovy | 3 +- .../test/unit/forge/DependencySetTest.groovy | 7 +- .../unit/forge/ForgeRunTemplateTest.groovy | 2 +- .../loom/test/unit/forge/SrgMergerTest.groovy | 2 +- 94 files changed, 214 insertions(+), 303 deletions(-) rename src/main/java/{net/fabricmc/loom/configuration => dev/architectury/loom}/accesstransformer/AccessTransformerEntry.java (97%) rename src/main/java/{net/fabricmc/loom/configuration => dev/architectury/loom}/accesstransformer/AccessTransformerJarProcessor.java (98%) rename src/main/java/dev/architectury/loom/{forge/tool => accesstransformer}/AccessTransformerService.java (96%) rename src/main/java/{net/fabricmc/loom/util/srg => dev/architectury/loom/accesstransformer}/AtClassRemapper.java (97%) rename src/main/java/{net/fabricmc/loom/util/aw2at => dev/architectury/loom/accesstransformer}/Aw2At.java (98%) rename src/main/java/{net/fabricmc/loom/util/srg => dev/architectury/loom/forge}/CoreModClassRemapper.java (98%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/forge/FieldMappingsMigrator.java (98%) rename src/main/java/dev/architectury/loom/{util => forge}/ForgeLoggerConfig.java (98%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/forge/ForgeMigratedMappingConfiguration.java (98%) rename src/main/java/{net/fabricmc/loom/util/srg => dev/architectury/loom/forge}/InnerClassRemapper.java (99%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/forge/MappingsMigrator.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/forge/MethodInheritanceMappingsMigrator.java (98%) rename src/main/java/{net/fabricmc/loom/util/srg => dev/architectury/loom/forge}/RemapObjectHolderVisitor.java (98%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/config}/ConfigValue.java (97%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/config}/ForgeRunTemplate.java (98%) rename src/main/java/dev/architectury/loom/forge/{ => config}/UserdevConfig.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/DependencyProvider.java (94%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/DependencyProviders.java (98%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/ForgeLibrariesProvider.java (98%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/ForgeProvider.java (98%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/ForgeRunsProvider.java (95%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/ForgeUniversalProvider.java (97%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/ForgeUserdevProvider.java (93%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/PatchProvider.java (98%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/dependency}/SrgProvider.java (99%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/forge/minecraft/ForgeMinecraftProvider.java (94%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/forge/minecraft/MergedForgeMinecraftProvider.java (94%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom/forge/minecraft}/MinecraftPatchedProvider.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/forge/minecraft/SingleJarForgeMinecraftProvider.java (96%) rename src/main/java/{net/fabricmc/loom/util/srg => dev/architectury/loom/mappings}/ForgeMappingsMerger.java (98%) rename src/main/java/{net/fabricmc/loom/util/srg => dev/architectury/loom/mappings}/MCPReader.java (99%) rename src/main/java/{net/fabricmc/loom/util => dev/architectury/loom/mappings}/MappingException.java (96%) rename src/main/java/dev/architectury/loom/{util => mappings}/MappingOption.java (89%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/mappings/crane/CraneMappingLayer.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers => dev/architectury/loom}/mappings/crane/CraneMappingsSpec.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/DependencySet.java (92%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/McpConfigData.java (97%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/McpConfigFunction.java (92%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/McpConfigProvider.java (95%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/McpConfigStep.java (93%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/McpExecutor.java (97%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/McpExecutorBuilder.java (91%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/package-info.java (94%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/ConstantLogic.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/DownloadManifestFileLogic.java (97%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/FunctionLogic.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/InjectLogic.java (95%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/ListLibrariesLogic.java (97%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/NoOpLogic.java (96%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/PatchLogic.java (95%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/StepLogic.java (93%) rename src/main/java/{net/fabricmc/loom/configuration/providers/forge => dev/architectury/loom}/mcpconfig/steplogic/StripLogic.java (95%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/DependencyDownloader.java (98%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/LfWriter.java (97%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/LoggerFilter.java (98%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/PropertyUtil.java (97%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/ThreadingUtils.java (98%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/Version.java (99%) rename src/main/java/{net/fabricmc/loom/util/function => dev/architectury/loom/util/collection}/CollectionUtil.java (99%) rename src/main/java/dev/architectury/loom/util/{ => collection}/Multimap.java (95%) rename src/main/java/dev/architectury/loom/util/{ => collection}/MultimapImpl.java (96%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/function/FsPathConsumer.java (97%) rename src/main/java/{net/fabricmc => dev/architectury}/loom/util/function/IoConsumer.java (96%) delete mode 100644 src/main/java/net/fabricmc/loom/configuration/providers/minecraft/tr/OutputRemappingHandler.java diff --git a/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerEntry.java b/src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerEntry.java similarity index 97% rename from src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerEntry.java rename to src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerEntry.java index f8d4942a..8fe36220 100644 --- a/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerEntry.java +++ b/src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerEntry.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.accesstransformer; +package dev.architectury.loom.accesstransformer; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java b/src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerJarProcessor.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java rename to src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerJarProcessor.java index a9d0c203..218cb7bd 100644 --- a/src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java +++ b/src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerJarProcessor.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.accesstransformer; +package dev.architectury.loom.accesstransformer; import java.io.File; import java.io.FileNotFoundException; @@ -40,7 +40,6 @@ import javax.inject.Inject; import dev.architectury.at.AccessTransformSet; import dev.architectury.at.io.AccessTransformFormats; -import dev.architectury.loom.forge.tool.AccessTransformerService; import dev.architectury.loom.util.TempFiles; import org.gradle.api.Project; import org.gradle.api.logging.Logger; diff --git a/src/main/java/dev/architectury/loom/forge/tool/AccessTransformerService.java b/src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerService.java similarity index 96% rename from src/main/java/dev/architectury/loom/forge/tool/AccessTransformerService.java rename to src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerService.java index 22b0db31..cbd27d2d 100644 --- a/src/main/java/dev/architectury/loom/forge/tool/AccessTransformerService.java +++ b/src/main/java/dev/architectury/loom/accesstransformer/AccessTransformerService.java @@ -1,4 +1,4 @@ -package dev.architectury.loom.forge.tool; +package dev.architectury.loom.accesstransformer; import java.io.File; import java.io.IOException; @@ -10,7 +10,9 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; -import dev.architectury.loom.forge.UserdevConfig; +import dev.architectury.loom.forge.config.UserdevConfig; +import dev.architectury.loom.forge.tool.ForgeToolService; +import dev.architectury.loom.util.DependencyDownloader; import dev.architectury.loom.util.TempFiles; import org.gradle.api.Project; import org.gradle.api.file.ConfigurableFileCollection; @@ -24,7 +26,6 @@ import org.gradle.api.tasks.Nested; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionMeta; -import net.fabricmc.loom.util.DependencyDownloader; import net.fabricmc.loom.util.FileSystemUtil; import net.fabricmc.loom.util.LoomVersions; import net.fabricmc.loom.util.service.Service; diff --git a/src/main/java/net/fabricmc/loom/util/srg/AtClassRemapper.java b/src/main/java/dev/architectury/loom/accesstransformer/AtClassRemapper.java similarity index 97% rename from src/main/java/net/fabricmc/loom/util/srg/AtClassRemapper.java rename to src/main/java/dev/architectury/loom/accesstransformer/AtClassRemapper.java index f87c2371..9e2107e2 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/AtClassRemapper.java +++ b/src/main/java/dev/architectury/loom/accesstransformer/AtClassRemapper.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.srg; +package dev.architectury.loom.accesstransformer; import java.io.IOException; import java.io.StringReader; @@ -34,19 +34,17 @@ import java.util.ArrayList; import java.util.List; import java.util.function.UnaryOperator; +import dev.architectury.loom.util.collection.CollectionUtil; import org.gradle.api.Project; import org.gradle.api.logging.Logger; import net.fabricmc.loom.build.IntermediaryNamespaces; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.FileSystemUtil; -import net.fabricmc.loom.util.function.CollectionUtil; import net.fabricmc.mappingio.tree.MappingTree; /** * Remaps AT classes from SRG to Yarn. - * - * @author Juuz */ public final class AtClassRemapper { public static void remap(Project project, Path jar, MappingTree mappings) throws IOException { diff --git a/src/main/java/net/fabricmc/loom/util/aw2at/Aw2At.java b/src/main/java/dev/architectury/loom/accesstransformer/Aw2At.java similarity index 98% rename from src/main/java/net/fabricmc/loom/util/aw2at/Aw2At.java rename to src/main/java/dev/architectury/loom/accesstransformer/Aw2At.java index 72662d51..5d9632a0 100644 --- a/src/main/java/net/fabricmc/loom/util/aw2at/Aw2At.java +++ b/src/main/java/dev/architectury/loom/accesstransformer/Aw2At.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.aw2at; +package dev.architectury.loom.accesstransformer; import java.io.BufferedReader; import java.io.File; @@ -46,8 +46,6 @@ import net.fabricmc.loom.task.RemapJarTask; /** * Converts AW files to AT files. - * - * @author Juuz */ public final class Aw2At { public static void setup(Project project, RemapJarTask remapJar) { diff --git a/src/main/java/dev/architectury/loom/extensions/ModBuildExtensions.java b/src/main/java/dev/architectury/loom/extensions/ModBuildExtensions.java index f3a35310..13f74807 100644 --- a/src/main/java/dev/architectury/loom/extensions/ModBuildExtensions.java +++ b/src/main/java/dev/architectury/loom/extensions/ModBuildExtensions.java @@ -18,14 +18,14 @@ import java.util.jar.Manifest; import dev.architectury.at.AccessTransformSet; import dev.architectury.at.io.AccessTransformFormats; +import dev.architectury.loom.accesstransformer.Aw2At; +import dev.architectury.loom.util.LfWriter; import org.gradle.api.provider.Provider; import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.task.service.MappingsService; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.FileSystemUtil; -import net.fabricmc.loom.util.LfWriter; -import net.fabricmc.loom.util.aw2at.Aw2At; import net.fabricmc.loom.util.service.ServiceFactory; public final class ModBuildExtensions { diff --git a/src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java b/src/main/java/dev/architectury/loom/forge/CoreModClassRemapper.java similarity index 98% rename from src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java rename to src/main/java/dev/architectury/loom/forge/CoreModClassRemapper.java index e08cae6a..77f13b29 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java +++ b/src/main/java/dev/architectury/loom/forge/CoreModClassRemapper.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.srg; +package dev.architectury.loom.forge; import java.io.IOException; import java.io.Reader; @@ -41,19 +41,17 @@ import java.util.regex.Pattern; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import dev.architectury.loom.util.collection.CollectionUtil; import org.gradle.api.Project; import org.gradle.api.logging.Logger; import net.fabricmc.loom.build.IntermediaryNamespaces; import net.fabricmc.loom.util.FileSystemUtil; import net.fabricmc.loom.util.ModPlatform; -import net.fabricmc.loom.util.function.CollectionUtil; import net.fabricmc.mappingio.tree.MappingTree; /** * Remaps coremod class names from SRG to Yarn. - * - * @author Juuz */ public final class CoreModClassRemapper { private static final Pattern CLASS_NAME_PATTERN = Pattern.compile("^(.*')((?:com\\.mojang\\.|net\\.minecraft\\.)[A-Za-z0-9.-_$]+)('.*)$"); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMappingsMigrator.java b/src/main/java/dev/architectury/loom/forge/FieldMappingsMigrator.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMappingsMigrator.java rename to src/main/java/dev/architectury/loom/forge/FieldMappingsMigrator.java index d471cdc3..766fa414 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/FieldMappingsMigrator.java +++ b/src/main/java/dev/architectury/loom/forge/FieldMappingsMigrator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge; import java.io.BufferedReader; import java.io.IOException; @@ -41,7 +41,9 @@ import java.util.concurrent.ConcurrentHashMap; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import dev.architectury.loom.forge.minecraft.MinecraftPatchedProvider; import dev.architectury.loom.util.Stopwatch; +import dev.architectury.loom.util.ThreadingUtils; import org.gradle.api.Project; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -54,7 +56,6 @@ import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider; import net.fabricmc.loom.util.FileSystemUtil; -import net.fabricmc.loom.util.ThreadingUtils; import net.fabricmc.mappingio.MappingReader; import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter; import net.fabricmc.mappingio.tree.MappingTree; diff --git a/src/main/java/dev/architectury/loom/util/ForgeLoggerConfig.java b/src/main/java/dev/architectury/loom/forge/ForgeLoggerConfig.java similarity index 98% rename from src/main/java/dev/architectury/loom/util/ForgeLoggerConfig.java rename to src/main/java/dev/architectury/loom/forge/ForgeLoggerConfig.java index ff4cbb1d..e9ad0a06 100644 --- a/src/main/java/dev/architectury/loom/util/ForgeLoggerConfig.java +++ b/src/main/java/dev/architectury/loom/forge/ForgeLoggerConfig.java @@ -1,4 +1,4 @@ -package dev.architectury.loom.util; +package dev.architectury.loom.forge; import java.io.File; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeMigratedMappingConfiguration.java b/src/main/java/dev/architectury/loom/forge/ForgeMigratedMappingConfiguration.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeMigratedMappingConfiguration.java rename to src/main/java/dev/architectury/loom/forge/ForgeMigratedMappingConfiguration.java index 87fe9719..284c2f38 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeMigratedMappingConfiguration.java +++ b/src/main/java/dev/architectury/loom/forge/ForgeMigratedMappingConfiguration.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -31,6 +31,7 @@ import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.util.List; +import dev.architectury.loom.forge.dependency.ForgeProvider; import dev.architectury.loom.util.Stopwatch; import org.gradle.api.Project; diff --git a/src/main/java/dev/architectury/loom/forge/ForgeSourcesService.java b/src/main/java/dev/architectury/loom/forge/ForgeSourcesService.java index 73852273..89e48153 100644 --- a/src/main/java/dev/architectury/loom/forge/ForgeSourcesService.java +++ b/src/main/java/dev/architectury/loom/forge/ForgeSourcesService.java @@ -16,7 +16,9 @@ import java.util.function.BiConsumer; import java.util.function.Predicate; import dev.architectury.loom.forge.tool.ForgeToolExecutor; +import dev.architectury.loom.util.DependencyDownloader; import dev.architectury.loom.util.TempFiles; +import dev.architectury.loom.util.ThreadingUtils; import org.apache.commons.io.output.NullOutputStream; import org.gradle.api.Project; import org.gradle.api.file.ConfigurableFileCollection; @@ -36,11 +38,9 @@ import net.fabricmc.loom.task.GenerateSourcesTask; import net.fabricmc.loom.task.service.MappingsService; import net.fabricmc.loom.task.service.SourceRemapperService; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.DependencyDownloader; import net.fabricmc.loom.util.FileSystemUtil; import net.fabricmc.loom.util.LoomVersions; import net.fabricmc.loom.util.Pair; -import net.fabricmc.loom.util.ThreadingUtils; import net.fabricmc.loom.util.TinyRemapperHelper; import net.fabricmc.loom.util.service.Service; import net.fabricmc.loom.util.service.ServiceFactory; diff --git a/src/main/java/net/fabricmc/loom/util/srg/InnerClassRemapper.java b/src/main/java/dev/architectury/loom/forge/InnerClassRemapper.java similarity index 99% rename from src/main/java/net/fabricmc/loom/util/srg/InnerClassRemapper.java rename to src/main/java/dev/architectury/loom/forge/InnerClassRemapper.java index fe00a07f..d73ffb0d 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/InnerClassRemapper.java +++ b/src/main/java/dev/architectury/loom/forge/InnerClassRemapper.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.srg; +package dev.architectury.loom.forge; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MappingsMigrator.java b/src/main/java/dev/architectury/loom/forge/MappingsMigrator.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/MappingsMigrator.java rename to src/main/java/dev/architectury/loom/forge/MappingsMigrator.java index e5171541..411b15ce 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MappingsMigrator.java +++ b/src/main/java/dev/architectury/loom/forge/MappingsMigrator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MethodInheritanceMappingsMigrator.java b/src/main/java/dev/architectury/loom/forge/MethodInheritanceMappingsMigrator.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/MethodInheritanceMappingsMigrator.java rename to src/main/java/dev/architectury/loom/forge/MethodInheritanceMappingsMigrator.java index 1d0d0195..53dbde0c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MethodInheritanceMappingsMigrator.java +++ b/src/main/java/dev/architectury/loom/forge/MethodInheritanceMappingsMigrator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge; import java.io.BufferedReader; import java.io.IOException; @@ -41,7 +41,8 @@ import java.util.Set; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import dev.architectury.loom.util.Multimap; +import dev.architectury.loom.forge.minecraft.MinecraftPatchedProvider; +import dev.architectury.loom.util.collection.Multimap; import org.gradle.api.Project; import org.gradle.api.logging.Logger; import org.objectweb.asm.ClassReader; diff --git a/src/main/java/net/fabricmc/loom/util/srg/RemapObjectHolderVisitor.java b/src/main/java/dev/architectury/loom/forge/RemapObjectHolderVisitor.java similarity index 98% rename from src/main/java/net/fabricmc/loom/util/srg/RemapObjectHolderVisitor.java rename to src/main/java/dev/architectury/loom/forge/RemapObjectHolderVisitor.java index b965a0fb..5b606e31 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/RemapObjectHolderVisitor.java +++ b/src/main/java/dev/architectury/loom/forge/RemapObjectHolderVisitor.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.srg; +package dev.architectury.loom.forge; import java.io.IOException; import java.nio.file.Files; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ConfigValue.java b/src/main/java/dev/architectury/loom/forge/config/ConfigValue.java similarity index 97% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ConfigValue.java rename to src/main/java/dev/architectury/loom/forge/config/ConfigValue.java index f804fd29..0bb939b1 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ConfigValue.java +++ b/src/main/java/dev/architectury/loom/forge/config/ConfigValue.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.config; import java.io.Serializable; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java b/src/main/java/dev/architectury/loom/forge/config/ForgeRunTemplate.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java rename to src/main/java/dev/architectury/loom/forge/config/ForgeRunTemplate.java index c707b4c6..e69877ec 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunTemplate.java +++ b/src/main/java/dev/architectury/loom/forge/config/ForgeRunTemplate.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.config; import java.io.Serializable; import java.util.ArrayList; @@ -35,11 +35,11 @@ import java.util.stream.Collectors; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import dev.architectury.loom.util.collection.CollectionUtil; import org.gradle.api.Named; import net.fabricmc.loom.configuration.ide.RunConfigSettings; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.function.CollectionUtil; public record ForgeRunTemplate( String name, diff --git a/src/main/java/dev/architectury/loom/forge/UserdevConfig.java b/src/main/java/dev/architectury/loom/forge/config/UserdevConfig.java similarity index 96% rename from src/main/java/dev/architectury/loom/forge/UserdevConfig.java rename to src/main/java/dev/architectury/loom/forge/config/UserdevConfig.java index c96b62da..5e279139 100644 --- a/src/main/java/dev/architectury/loom/forge/UserdevConfig.java +++ b/src/main/java/dev/architectury/loom/forge/config/UserdevConfig.java @@ -1,4 +1,4 @@ -package dev.architectury.loom.forge; +package dev.architectury.loom.forge.config; import java.io.IOException; import java.util.List; @@ -10,7 +10,6 @@ import com.mojang.datafixers.util.Either; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunTemplate; import net.fabricmc.loom.util.IOFunction; public record UserdevConfig( diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/DependencyProvider.java similarity index 94% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/DependencyProvider.java index ba34f1a6..8b615a1a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/DependencyProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.File; import java.nio.file.Path; @@ -52,7 +52,7 @@ public abstract class DependencyProvider { return addDependency(project, object, target); } - static Dependency addDependency(Project project, Object object, String target) { + public static Dependency addDependency(Project project, Object object, String target) { if (object instanceof File || object instanceof Path) { object = project.files(object); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProviders.java b/src/main/java/dev/architectury/loom/forge/dependency/DependencyProviders.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProviders.java rename to src/main/java/dev/architectury/loom/forge/dependency/DependencyProviders.java index 7114f90d..8b8deda3 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/DependencyProviders.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/DependencyProviders.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/ForgeLibrariesProvider.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/ForgeLibrariesProvider.java index fd6bb440..8712d288 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeLibrariesProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/ForgeLibrariesProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.IOException; import java.nio.file.Files; @@ -31,8 +31,11 @@ import java.util.ArrayList; import java.util.List; import dev.architectury.loom.forge.ModDirTransformerDiscovererPatch; +import dev.architectury.loom.forge.RemapObjectHolderVisitor; +import dev.architectury.loom.mappings.ForgeMappingsMerger; import dev.architectury.loom.neoforge.LaunchHandlerPatcher; import dev.architectury.loom.util.ClassVisitorUtil; +import dev.architectury.loom.util.PropertyUtil; import org.gradle.api.Project; import org.gradle.api.artifacts.Dependency; import org.gradle.api.artifacts.ModuleDependency; @@ -51,9 +54,6 @@ import net.fabricmc.loom.util.Checksum; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.ExceptionUtil; import net.fabricmc.loom.util.FileSystemUtil; -import net.fabricmc.loom.util.PropertyUtil; -import net.fabricmc.loom.util.srg.ForgeMappingsMerger; -import net.fabricmc.loom.util.srg.RemapObjectHolderVisitor; import net.fabricmc.mappingio.tree.MemoryMappingTree; public class ForgeLibrariesProvider { diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/ForgeProvider.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/ForgeProvider.java index 1be328d0..50817ec7 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/ForgeProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.File; import java.nio.file.Path; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/ForgeRunsProvider.java similarity index 95% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/ForgeRunsProvider.java index 257a827a..374475c1 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/ForgeRunsProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.File; import java.io.IOException; @@ -36,8 +36,12 @@ import java.util.stream.StreamSupport; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import dev.architectury.loom.forge.UserdevConfig; -import dev.architectury.loom.util.Multimap; +import dev.architectury.loom.forge.config.ConfigValue; +import dev.architectury.loom.forge.config.ForgeRunTemplate; +import dev.architectury.loom.forge.config.UserdevConfig; +import dev.architectury.loom.util.DependencyDownloader; +import dev.architectury.loom.util.Version; +import dev.architectury.loom.util.collection.Multimap; import org.gradle.api.NamedDomainObjectContainer; import org.gradle.api.NamedDomainObjectSet; import org.gradle.api.Project; @@ -48,8 +52,6 @@ import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.ModSettings; import net.fabricmc.loom.configuration.ide.RunConfigSettings; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.DependencyDownloader; -import net.fabricmc.loom.util.Version; import net.fabricmc.loom.util.gradle.SourceSetHelper; import net.fabricmc.loom.util.gradle.SourceSetReference; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/ForgeUniversalProvider.java similarity index 97% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/ForgeUniversalProvider.java index 1ebe08a2..1667a666 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUniversalProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/ForgeUniversalProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.File; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/ForgeUserdevProvider.java similarity index 93% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/ForgeUserdevProvider.java index c75f0408..9bfbf183 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/ForgeUserdevProvider.java @@ -1,7 +1,7 @@ /* * This file is part of fabric-loom, licensed under the MIT License (MIT). * - * Copyright (c) 2020-2023 FabricMC + * Copyright (c) 2020-2025 FabricMC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.File; import java.io.Reader; @@ -33,7 +33,7 @@ import java.nio.file.StandardCopyOption; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.mojang.serialization.JsonOps; -import dev.architectury.loom.forge.UserdevConfig; +import dev.architectury.loom.forge.config.UserdevConfig; import org.gradle.api.Project; import net.fabricmc.loom.configuration.DependencyInfo; @@ -44,7 +44,7 @@ public class ForgeUserdevProvider extends DependencyProvider { private File userdevJar; private JsonObject json; private UserdevConfig config; - Path joinedPatches; + private Path joinedPatches; public ForgeUserdevProvider(Project project) { super(project); @@ -97,4 +97,8 @@ public class ForgeUserdevProvider extends DependencyProvider { public UserdevConfig getConfig() { return config; } + + public Path getJoinedPatches() { + return joinedPatches; + } } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/PatchProvider.java similarity index 98% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/PatchProvider.java index 1a420d0f..7266c86c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/PatchProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/PatchProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java b/src/main/java/dev/architectury/loom/forge/dependency/SrgProvider.java similarity index 99% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java rename to src/main/java/dev/architectury/loom/forge/dependency/SrgProvider.java index 10cd7adb..fbc94612 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java +++ b/src/main/java/dev/architectury/loom/forge/dependency/SrgProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.dependency; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/ForgeMinecraftProvider.java b/src/main/java/dev/architectury/loom/forge/minecraft/ForgeMinecraftProvider.java similarity index 94% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/ForgeMinecraftProvider.java rename to src/main/java/dev/architectury/loom/forge/minecraft/ForgeMinecraftProvider.java index 9c81f391..9c55e450 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/ForgeMinecraftProvider.java +++ b/src/main/java/dev/architectury/loom/forge/minecraft/ForgeMinecraftProvider.java @@ -22,11 +22,10 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.minecraft; +package dev.architectury.loom.forge.minecraft; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.configuration.ConfigContext; -import net.fabricmc.loom.configuration.providers.forge.MinecraftPatchedProvider; import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftMetadataProvider; import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftProvider; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/MergedForgeMinecraftProvider.java b/src/main/java/dev/architectury/loom/forge/minecraft/MergedForgeMinecraftProvider.java similarity index 94% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/MergedForgeMinecraftProvider.java rename to src/main/java/dev/architectury/loom/forge/minecraft/MergedForgeMinecraftProvider.java index 846411eb..eda36c6c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/MergedForgeMinecraftProvider.java +++ b/src/main/java/dev/architectury/loom/forge/minecraft/MergedForgeMinecraftProvider.java @@ -22,14 +22,13 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.minecraft; +package dev.architectury.loom.forge.minecraft; import java.io.IOException; import java.nio.file.Path; import java.util.List; import net.fabricmc.loom.configuration.ConfigContext; -import net.fabricmc.loom.configuration.providers.forge.MinecraftPatchedProvider; import net.fabricmc.loom.configuration.providers.minecraft.MergedMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftMetadataProvider; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java b/src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java rename to src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java index a9bc6cfc..9fecb27b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java +++ b/src/main/java/dev/architectury/loom/forge/minecraft/MinecraftPatchedProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge; +package dev.architectury.loom.forge.minecraft; import java.io.ByteArrayInputStream; import java.io.File; @@ -51,13 +51,25 @@ import java.util.stream.Stream; import com.google.common.base.Preconditions; import de.oceanlabs.mcp.mcinjector.adaptors.ParameterAnnotationFixer; -import dev.architectury.loom.forge.UserdevConfig; -import dev.architectury.loom.forge.tool.AccessTransformerService; +import dev.architectury.loom.accesstransformer.AccessTransformerService; +import dev.architectury.loom.forge.CoreModClassRemapper; +import dev.architectury.loom.forge.InnerClassRemapper; +import dev.architectury.loom.forge.config.UserdevConfig; +import dev.architectury.loom.forge.dependency.DependencyProvider; +import dev.architectury.loom.forge.dependency.ForgeProvider; +import dev.architectury.loom.forge.dependency.ForgeUserdevProvider; +import dev.architectury.loom.forge.dependency.PatchProvider; import dev.architectury.loom.forge.tool.ForgeToolValueSource; +import dev.architectury.loom.mappings.MappingOption; +import dev.architectury.loom.mcpconfig.McpConfigProvider; +import dev.architectury.loom.mcpconfig.McpExecutor; +import dev.architectury.loom.mcpconfig.McpExecutorBuilder; import dev.architectury.loom.neoforge.SidedJarIndexGenerator; -import dev.architectury.loom.util.MappingOption; +import dev.architectury.loom.util.DependencyDownloader; import dev.architectury.loom.util.Stopwatch; import dev.architectury.loom.util.TempFiles; +import dev.architectury.loom.util.ThreadingUtils; +import dev.architectury.loom.util.function.FsPathConsumer; import org.gradle.api.Project; import org.gradle.api.file.FileCollection; import org.gradle.api.logging.Logger; @@ -71,23 +83,14 @@ import org.objectweb.asm.tree.ClassNode; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.build.IntermediaryNamespaces; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigProvider; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpExecutor; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpExecutorBuilder; -import net.fabricmc.loom.configuration.providers.forge.minecraft.ForgeMinecraftProvider; import net.fabricmc.loom.configuration.providers.mappings.TinyMappingsService; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.DependencyDownloader; import net.fabricmc.loom.util.FileSystemUtil; -import net.fabricmc.loom.util.ThreadingUtils; import net.fabricmc.loom.util.TinyRemapperHelper; import net.fabricmc.loom.util.ZipUtils; -import net.fabricmc.loom.util.function.FsPathConsumer; import net.fabricmc.loom.util.service.ScopedServiceFactory; import net.fabricmc.loom.util.service.ServiceFactory; -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; @@ -655,7 +658,7 @@ public class MinecraftPatchedProvider { public enum Type { CLIENT_ONLY("client", "client", (patch, userdev) -> patch.clientPatches), SERVER_ONLY("server", "server", (patch, userdev) -> patch.serverPatches), - MERGED("merged", "joined", (patch, userdev) -> userdev.joinedPatches); + MERGED("merged", "joined", (patch, userdev) -> userdev.getJoinedPatches()); private final String id; private final String mcpId; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/SingleJarForgeMinecraftProvider.java b/src/main/java/dev/architectury/loom/forge/minecraft/SingleJarForgeMinecraftProvider.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/SingleJarForgeMinecraftProvider.java rename to src/main/java/dev/architectury/loom/forge/minecraft/SingleJarForgeMinecraftProvider.java index ed421294..ed1ce96b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/minecraft/SingleJarForgeMinecraftProvider.java +++ b/src/main/java/dev/architectury/loom/forge/minecraft/SingleJarForgeMinecraftProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.minecraft; +package dev.architectury.loom.forge.minecraft; import java.nio.file.Path; import java.util.List; @@ -30,7 +30,6 @@ import java.util.List; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.ConfigContext; import net.fabricmc.loom.configuration.providers.BundleMetadata; -import net.fabricmc.loom.configuration.providers.forge.MinecraftPatchedProvider; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftMetadataProvider; import net.fabricmc.loom.configuration.providers.minecraft.SingleJarEnvType; import net.fabricmc.loom.configuration.providers.minecraft.SingleJarMinecraftProvider; diff --git a/src/main/java/net/fabricmc/loom/util/srg/ForgeMappingsMerger.java b/src/main/java/dev/architectury/loom/mappings/ForgeMappingsMerger.java similarity index 98% rename from src/main/java/net/fabricmc/loom/util/srg/ForgeMappingsMerger.java rename to src/main/java/dev/architectury/loom/mappings/ForgeMappingsMerger.java index 832a255b..24fcac3b 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/ForgeMappingsMerger.java +++ b/src/main/java/dev/architectury/loom/mappings/ForgeMappingsMerger.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.srg; +package dev.architectury.loom.mappings; import java.io.BufferedReader; import java.io.IOException; @@ -36,14 +36,13 @@ import java.util.Set; import java.util.function.Consumer; import com.google.common.base.Preconditions; -import dev.architectury.loom.util.Multimap; +import dev.architectury.loom.forge.dependency.SrgProvider; +import dev.architectury.loom.util.collection.CollectionUtil; +import dev.architectury.loom.util.collection.Multimap; import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.api.mappings.layered.MappingContext; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; -import net.fabricmc.loom.configuration.providers.forge.SrgProvider; -import net.fabricmc.loom.util.MappingException; -import net.fabricmc.loom.util.function.CollectionUtil; import net.fabricmc.mappingio.FlatMappingVisitor; import net.fabricmc.mappingio.MappingReader; import net.fabricmc.mappingio.MappingVisitor; diff --git a/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java b/src/main/java/dev/architectury/loom/mappings/MCPReader.java similarity index 99% rename from src/main/java/net/fabricmc/loom/util/srg/MCPReader.java rename to src/main/java/dev/architectury/loom/mappings/MCPReader.java index 19d576c1..c9e06a28 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/MCPReader.java +++ b/src/main/java/dev/architectury/loom/mappings/MCPReader.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.srg; +package dev.architectury.loom.mappings; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/util/MappingException.java b/src/main/java/dev/architectury/loom/mappings/MappingException.java similarity index 96% rename from src/main/java/net/fabricmc/loom/util/MappingException.java rename to src/main/java/dev/architectury/loom/mappings/MappingException.java index de70536e..aea8ec6c 100644 --- a/src/main/java/net/fabricmc/loom/util/MappingException.java +++ b/src/main/java/dev/architectury/loom/mappings/MappingException.java @@ -22,12 +22,10 @@ * SOFTWARE. */ -package net.fabricmc.loom.util; +package dev.architectury.loom.mappings; /** * An exception that occurs when processing obfuscation mappings. - * - * @author Juuz */ public class MappingException extends RuntimeException { public MappingException(String message) { diff --git a/src/main/java/dev/architectury/loom/util/MappingOption.java b/src/main/java/dev/architectury/loom/mappings/MappingOption.java similarity index 89% rename from src/main/java/dev/architectury/loom/util/MappingOption.java rename to src/main/java/dev/architectury/loom/mappings/MappingOption.java index 4946634e..def21c0f 100644 --- a/src/main/java/dev/architectury/loom/util/MappingOption.java +++ b/src/main/java/dev/architectury/loom/mappings/MappingOption.java @@ -1,4 +1,4 @@ -package dev.architectury.loom.util; +package dev.architectury.loom.mappings; import net.fabricmc.loom.api.LoomGradleExtensionAPI; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/crane/CraneMappingLayer.java b/src/main/java/dev/architectury/loom/mappings/crane/CraneMappingLayer.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/mappings/crane/CraneMappingLayer.java rename to src/main/java/dev/architectury/loom/mappings/crane/CraneMappingLayer.java index 6f7a36a0..f9ccc2cc 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/crane/CraneMappingLayer.java +++ b/src/main/java/dev/architectury/loom/mappings/crane/CraneMappingLayer.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.mappings.crane; +package dev.architectury.loom.mappings.crane; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/crane/CraneMappingsSpec.java b/src/main/java/dev/architectury/loom/mappings/crane/CraneMappingsSpec.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/mappings/crane/CraneMappingsSpec.java rename to src/main/java/dev/architectury/loom/mappings/crane/CraneMappingsSpec.java index 04c98170..4b5dcd85 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/crane/CraneMappingsSpec.java +++ b/src/main/java/dev/architectury/loom/mappings/crane/CraneMappingsSpec.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.mappings.crane; +package dev.architectury.loom.mappings.crane; import net.fabricmc.loom.api.mappings.layered.MappingContext; import net.fabricmc.loom.api.mappings.layered.spec.FileSpec; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/DependencySet.java b/src/main/java/dev/architectury/loom/mcpconfig/DependencySet.java similarity index 92% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/DependencySet.java rename to src/main/java/dev/architectury/loom/mcpconfig/DependencySet.java index a65f83ca..762b4d46 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/DependencySet.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/DependencySet.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; -import static net.fabricmc.loom.configuration.providers.forge.ConfigValue.PREVIOUS_OUTPUT_SUFFIX; +import static dev.architectury.loom.forge.config.ConfigValue.PREVIOUS_OUTPUT_SUFFIX; import java.util.ArrayDeque; import java.util.ArrayList; @@ -40,8 +40,8 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; -import net.fabricmc.loom.util.function.CollectionUtil; +import dev.architectury.loom.forge.config.ConfigValue; +import dev.architectury.loom.util.collection.CollectionUtil; public final class DependencySet { private final Map allSteps; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigData.java b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigData.java similarity index 97% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigData.java rename to src/main/java/dev/architectury/loom/mcpconfig/McpConfigData.java index 77ed09f5..4ba0a356 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigData.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigData.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigFunction.java b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigFunction.java similarity index 92% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigFunction.java rename to src/main/java/dev/architectury/loom/mcpconfig/McpConfigFunction.java index 0a072e72..9dc08f0a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigFunction.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigFunction.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; import java.io.IOException; import java.io.Serializable; @@ -32,12 +32,11 @@ import java.util.List; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import dev.architectury.loom.forge.config.ConfigValue; +import dev.architectury.loom.mcpconfig.steplogic.StepLogic; +import dev.architectury.loom.util.collection.CollectionUtil; import org.jetbrains.annotations.Nullable; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.StepLogic; -import net.fabricmc.loom.util.function.CollectionUtil; - /** * An executable program for {@linkplain McpConfigStep steps}. * diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigProvider.java b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigProvider.java similarity index 95% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigProvider.java rename to src/main/java/dev/architectury/loom/mcpconfig/McpConfigProvider.java index 9bcaaf1c..9b60b4a9 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigProvider.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigProvider.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; import java.io.Reader; import java.nio.file.Files; @@ -31,10 +31,10 @@ import java.nio.file.StandardCopyOption; import com.google.gson.Gson; import com.google.gson.JsonObject; +import dev.architectury.loom.forge.dependency.DependencyProvider; import org.gradle.api.Project; import net.fabricmc.loom.configuration.DependencyInfo; -import net.fabricmc.loom.configuration.providers.forge.DependencyProvider; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.DeletingFileVisitor; import net.fabricmc.loom.util.ZipUtils; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigStep.java b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigStep.java similarity index 93% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigStep.java rename to src/main/java/dev/architectury/loom/mcpconfig/McpConfigStep.java index c88cd5ce..3ea1d546 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpConfigStep.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/McpConfigStep.java @@ -22,15 +22,14 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; import java.io.Serializable; import java.util.HashMap; import java.util.Map; import com.google.gson.JsonObject; - -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; +import dev.architectury.loom.forge.config.ConfigValue; public record McpConfigStep(String type, String name, Map config) implements Serializable { private static final String TYPE_KEY = "type"; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutor.java b/src/main/java/dev/architectury/loom/mcpconfig/McpExecutor.java similarity index 97% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutor.java rename to src/main/java/dev/architectury/loom/mcpconfig/McpExecutor.java index 49ab4304..b0358c8a 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutor.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/McpExecutor.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; import java.io.IOException; import java.net.URISyntaxException; @@ -32,8 +32,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import dev.architectury.loom.forge.config.ConfigValue; import dev.architectury.loom.forge.tool.ForgeToolExecutor; import dev.architectury.loom.forge.tool.ForgeToolService; +import dev.architectury.loom.mcpconfig.steplogic.StepLogic; import dev.architectury.loom.util.Stopwatch; import org.gradle.api.Action; import org.gradle.api.file.DirectoryProperty; @@ -51,8 +53,6 @@ import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.Nested; import org.jetbrains.annotations.Nullable; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.StepLogic; import net.fabricmc.loom.util.download.Download; import net.fabricmc.loom.util.download.DownloadBuilder; import net.fabricmc.loom.util.service.Service; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutorBuilder.java b/src/main/java/dev/architectury/loom/mcpconfig/McpExecutorBuilder.java similarity index 91% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutorBuilder.java rename to src/main/java/dev/architectury/loom/mcpconfig/McpExecutorBuilder.java index 512ef34f..f33f4020 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/McpExecutorBuilder.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/McpExecutorBuilder.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; import java.io.File; import java.io.IOException; @@ -42,7 +42,18 @@ import java.util.SortedSet; import com.google.common.base.Suppliers; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import dev.architectury.loom.forge.dependency.ForgeProvider; import dev.architectury.loom.forge.tool.ForgeToolService; +import dev.architectury.loom.mcpconfig.steplogic.ConstantLogic; +import dev.architectury.loom.mcpconfig.steplogic.DownloadManifestFileLogic; +import dev.architectury.loom.mcpconfig.steplogic.FunctionLogic; +import dev.architectury.loom.mcpconfig.steplogic.InjectLogic; +import dev.architectury.loom.mcpconfig.steplogic.ListLibrariesLogic; +import dev.architectury.loom.mcpconfig.steplogic.NoOpLogic; +import dev.architectury.loom.mcpconfig.steplogic.PatchLogic; +import dev.architectury.loom.mcpconfig.steplogic.StepLogic; +import dev.architectury.loom.mcpconfig.steplogic.StripLogic; +import dev.architectury.loom.util.collection.CollectionUtil; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Dependency; @@ -51,20 +62,9 @@ import org.gradle.api.provider.Provider; import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.LoomGradleExtension; -import net.fabricmc.loom.configuration.providers.forge.ForgeProvider; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.ConstantLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.DownloadManifestFileLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.FunctionLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.InjectLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.ListLibrariesLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.NoOpLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.PatchLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.StepLogic; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.StripLogic; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftProvider; import net.fabricmc.loom.util.Checksum; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.function.CollectionUtil; import net.fabricmc.loom.util.gradle.GradleUtils; import net.fabricmc.loom.util.service.Service; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/package-info.java b/src/main/java/dev/architectury/loom/mcpconfig/package-info.java similarity index 94% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/package-info.java rename to src/main/java/dev/architectury/loom/mcpconfig/package-info.java index c61e8f83..fa66e7a0 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/package-info.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/package-info.java @@ -25,4 +25,4 @@ /** * A simple implementation for executing MCPConfig steps. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig; +package dev.architectury.loom.mcpconfig; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/ConstantLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/ConstantLogic.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/ConstantLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/ConstantLogic.java index 3b2301c6..a38a70f4 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/ConstantLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/ConstantLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.IOException; import java.nio.file.Path; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/DownloadManifestFileLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/DownloadManifestFileLogic.java similarity index 97% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/DownloadManifestFileLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/DownloadManifestFileLogic.java index 09e5723f..798bb8d3 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/DownloadManifestFileLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/DownloadManifestFileLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/FunctionLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/FunctionLogic.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/FunctionLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/FunctionLogic.java index 0162728a..9fba67b0 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/FunctionLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/FunctionLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.File; import java.io.IOException; @@ -31,13 +31,13 @@ import java.util.jar.Attributes; import java.util.jar.JarFile; import com.google.common.base.Suppliers; +import dev.architectury.loom.mcpconfig.McpConfigFunction; import org.gradle.api.file.RegularFileProperty; import org.gradle.api.provider.Property; import org.gradle.api.provider.Provider; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFile; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigFunction; import net.fabricmc.loom.util.service.Service; import net.fabricmc.loom.util.service.ServiceFactory; import net.fabricmc.loom.util.service.ServiceType; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/InjectLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/InjectLogic.java similarity index 95% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/InjectLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/InjectLogic.java index 119b337f..770f5601 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/InjectLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/InjectLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.IOException; import java.nio.file.FileSystem; @@ -32,9 +32,9 @@ import java.nio.file.StandardCopyOption; import java.util.Iterator; import java.util.stream.Stream; +import dev.architectury.loom.forge.config.ConfigValue; import org.gradle.api.provider.Provider; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; import net.fabricmc.loom.util.FileSystemUtil; import net.fabricmc.loom.util.service.Service; import net.fabricmc.loom.util.service.ServiceFactory; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/ListLibrariesLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/ListLibrariesLogic.java similarity index 97% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/ListLibrariesLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/ListLibrariesLogic.java index 480cdc8e..2d4078bc 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/ListLibrariesLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/ListLibrariesLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.File; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/NoOpLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/NoOpLogic.java similarity index 96% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/NoOpLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/NoOpLogic.java index ca3eac96..c674076c 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/NoOpLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/NoOpLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/PatchLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/PatchLogic.java similarity index 95% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/PatchLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/PatchLogic.java index 9d9e0248..2dac75d7 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/PatchLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/PatchLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.IOException; import java.nio.file.Path; @@ -31,10 +31,10 @@ import codechicken.diffpatch.cli.CliOperation; import codechicken.diffpatch.cli.PatchOperation; import codechicken.diffpatch.util.LoggingOutputStream; import codechicken.diffpatch.util.PatchMode; +import dev.architectury.loom.forge.config.ConfigValue; import org.gradle.api.logging.LogLevel; import org.gradle.api.provider.Provider; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; import net.fabricmc.loom.util.service.Service; import net.fabricmc.loom.util.service.ServiceFactory; import net.fabricmc.loom.util.service.ServiceType; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/StepLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/StepLogic.java similarity index 93% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/StepLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/StepLogic.java index c068f886..e0f5b0e8 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/StepLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/StepLogic.java @@ -22,13 +22,15 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.IOException; import java.nio.file.Path; import java.util.List; +import dev.architectury.loom.forge.config.ConfigValue; import dev.architectury.loom.forge.tool.ForgeToolExecutor; +import dev.architectury.loom.util.collection.CollectionUtil; import org.gradle.api.Action; import org.gradle.api.Project; import org.gradle.api.file.FileCollection; @@ -36,9 +38,7 @@ import org.gradle.api.logging.Logger; import org.gradle.api.provider.Provider; import org.jetbrains.annotations.Nullable; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; import net.fabricmc.loom.util.download.DownloadBuilder; -import net.fabricmc.loom.util.function.CollectionUtil; import net.fabricmc.loom.util.service.Service; import net.fabricmc.loom.util.service.ServiceFactory; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/StripLogic.java b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/StripLogic.java similarity index 95% rename from src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/StripLogic.java rename to src/main/java/dev/architectury/loom/mcpconfig/steplogic/StripLogic.java index c9fb772b..19af2d5b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/mcpconfig/steplogic/StripLogic.java +++ b/src/main/java/dev/architectury/loom/mcpconfig/steplogic/StripLogic.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic; +package dev.architectury.loom.mcpconfig.steplogic; import java.io.File; import java.io.IOException; @@ -33,11 +33,11 @@ import java.nio.file.StandardCopyOption; import java.util.Set; import java.util.stream.Collectors; +import dev.architectury.loom.forge.config.ConfigValue; +import dev.architectury.loom.util.ThreadingUtils; import org.gradle.api.provider.Provider; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; import net.fabricmc.loom.util.FileSystemUtil; -import net.fabricmc.loom.util.ThreadingUtils; import net.fabricmc.loom.util.service.Service; import net.fabricmc.loom.util.service.ServiceFactory; import net.fabricmc.loom.util.service.ServiceType; diff --git a/src/main/java/dev/architectury/loom/metadata/ModMetadataFile.java b/src/main/java/dev/architectury/loom/metadata/ModMetadataFile.java index ee5444ce..f419a3c6 100644 --- a/src/main/java/dev/architectury/loom/metadata/ModMetadataFile.java +++ b/src/main/java/dev/architectury/loom/metadata/ModMetadataFile.java @@ -3,11 +3,11 @@ package dev.architectury.loom.metadata; import java.util.List; import java.util.Set; +import dev.architectury.loom.util.collection.CollectionUtil; import org.jetbrains.annotations.Nullable; import net.fabricmc.loom.configuration.ifaceinject.InterfaceInjectionProcessor; import net.fabricmc.loom.util.ModPlatform; -import net.fabricmc.loom.util.function.CollectionUtil; /** * The metadata file of a mod, such as {@link ArchitecturyCommonJson architectury.common.json} or diff --git a/src/main/java/dev/architectury/loom/metadata/QuiltModJson.java b/src/main/java/dev/architectury/loom/metadata/QuiltModJson.java index aba209cb..f8767e30 100644 --- a/src/main/java/dev/architectury/loom/metadata/QuiltModJson.java +++ b/src/main/java/dev/architectury/loom/metadata/QuiltModJson.java @@ -14,6 +14,7 @@ import java.util.Set; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import dev.architectury.loom.util.collection.CollectionUtil; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +22,6 @@ import org.slf4j.LoggerFactory; import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.configuration.ifaceinject.InterfaceInjectionProcessor; import net.fabricmc.loom.util.ModPlatform; -import net.fabricmc.loom.util.function.CollectionUtil; public final class QuiltModJson implements JsonBackedModMetadataFile, SingleIdModMetadataFile { public static final String FILE_NAME = "quilt.mod.json"; diff --git a/src/main/java/net/fabricmc/loom/util/DependencyDownloader.java b/src/main/java/dev/architectury/loom/util/DependencyDownloader.java similarity index 98% rename from src/main/java/net/fabricmc/loom/util/DependencyDownloader.java rename to src/main/java/dev/architectury/loom/util/DependencyDownloader.java index f17833e6..928fac44 100644 --- a/src/main/java/net/fabricmc/loom/util/DependencyDownloader.java +++ b/src/main/java/dev/architectury/loom/util/DependencyDownloader.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util; +package dev.architectury.loom.util; import java.io.File; import java.util.ArrayList; @@ -41,9 +41,7 @@ import org.gradle.api.attributes.Attribute; import org.gradle.api.file.FileCollection; /** - * Simplified but powerful dependency downloading. - * - * @author Juuz + * A simple API to resolve dependencies as a file collection. */ public final class DependencyDownloader { private final Project project; diff --git a/src/main/java/net/fabricmc/loom/util/LfWriter.java b/src/main/java/dev/architectury/loom/util/LfWriter.java similarity index 97% rename from src/main/java/net/fabricmc/loom/util/LfWriter.java rename to src/main/java/dev/architectury/loom/util/LfWriter.java index cbd6540f..14648e76 100644 --- a/src/main/java/net/fabricmc/loom/util/LfWriter.java +++ b/src/main/java/dev/architectury/loom/util/LfWriter.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util; +package dev.architectury.loom.util; import java.io.BufferedWriter; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/util/LoggerFilter.java b/src/main/java/dev/architectury/loom/util/LoggerFilter.java similarity index 98% rename from src/main/java/net/fabricmc/loom/util/LoggerFilter.java rename to src/main/java/dev/architectury/loom/util/LoggerFilter.java index 1f9f9b96..52b61fa6 100644 --- a/src/main/java/net/fabricmc/loom/util/LoggerFilter.java +++ b/src/main/java/dev/architectury/loom/util/LoggerFilter.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util; +package dev.architectury.loom.util; import java.io.PrintStream; diff --git a/src/main/java/net/fabricmc/loom/util/PropertyUtil.java b/src/main/java/dev/architectury/loom/util/PropertyUtil.java similarity index 97% rename from src/main/java/net/fabricmc/loom/util/PropertyUtil.java rename to src/main/java/dev/architectury/loom/util/PropertyUtil.java index 98e85b68..826ee9a3 100644 --- a/src/main/java/net/fabricmc/loom/util/PropertyUtil.java +++ b/src/main/java/dev/architectury/loom/util/PropertyUtil.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util; +package dev.architectury.loom.util; import org.gradle.api.provider.HasConfigurableValue; import org.gradle.api.provider.Provider; diff --git a/src/main/java/net/fabricmc/loom/util/ThreadingUtils.java b/src/main/java/dev/architectury/loom/util/ThreadingUtils.java similarity index 98% rename from src/main/java/net/fabricmc/loom/util/ThreadingUtils.java rename to src/main/java/dev/architectury/loom/util/ThreadingUtils.java index 5087d30d..47266f00 100644 --- a/src/main/java/net/fabricmc/loom/util/ThreadingUtils.java +++ b/src/main/java/dev/architectury/loom/util/ThreadingUtils.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util; +package dev.architectury.loom.util; import java.util.ArrayList; import java.util.Arrays; @@ -37,8 +37,6 @@ import java.util.concurrent.Future; import java.util.function.Function; import java.util.stream.Collectors; -import dev.architectury.loom.util.Stopwatch; - public class ThreadingUtils { public static void run(T[] values, UnsafeConsumer action) { run(Arrays.stream(values) diff --git a/src/main/java/net/fabricmc/loom/util/Version.java b/src/main/java/dev/architectury/loom/util/Version.java similarity index 99% rename from src/main/java/net/fabricmc/loom/util/Version.java rename to src/main/java/dev/architectury/loom/util/Version.java index dded1682..db90d8f6 100644 --- a/src/main/java/net/fabricmc/loom/util/Version.java +++ b/src/main/java/dev/architectury/loom/util/Version.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util; +package dev.architectury.loom.util; import java.util.Locale; import java.util.regex.Matcher; diff --git a/src/main/java/net/fabricmc/loom/util/function/CollectionUtil.java b/src/main/java/dev/architectury/loom/util/collection/CollectionUtil.java similarity index 99% rename from src/main/java/net/fabricmc/loom/util/function/CollectionUtil.java rename to src/main/java/dev/architectury/loom/util/collection/CollectionUtil.java index 5bd2513f..7e3a458c 100644 --- a/src/main/java/net/fabricmc/loom/util/function/CollectionUtil.java +++ b/src/main/java/dev/architectury/loom/util/collection/CollectionUtil.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.function; +package dev.architectury.loom.util.collection; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/dev/architectury/loom/util/Multimap.java b/src/main/java/dev/architectury/loom/util/collection/Multimap.java similarity index 95% rename from src/main/java/dev/architectury/loom/util/Multimap.java rename to src/main/java/dev/architectury/loom/util/collection/Multimap.java index b836c88d..fa63cba1 100644 --- a/src/main/java/dev/architectury/loom/util/Multimap.java +++ b/src/main/java/dev/architectury/loom/util/collection/Multimap.java @@ -1,4 +1,4 @@ -package dev.architectury.loom.util; +package dev.architectury.loom.util.collection; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/dev/architectury/loom/util/MultimapImpl.java b/src/main/java/dev/architectury/loom/util/collection/MultimapImpl.java similarity index 96% rename from src/main/java/dev/architectury/loom/util/MultimapImpl.java rename to src/main/java/dev/architectury/loom/util/collection/MultimapImpl.java index 2e9b1ef8..c6294d17 100644 --- a/src/main/java/dev/architectury/loom/util/MultimapImpl.java +++ b/src/main/java/dev/architectury/loom/util/collection/MultimapImpl.java @@ -1,4 +1,4 @@ -package dev.architectury.loom.util; +package dev.architectury.loom.util.collection; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/net/fabricmc/loom/util/function/FsPathConsumer.java b/src/main/java/dev/architectury/loom/util/function/FsPathConsumer.java similarity index 97% rename from src/main/java/net/fabricmc/loom/util/function/FsPathConsumer.java rename to src/main/java/dev/architectury/loom/util/function/FsPathConsumer.java index 536721c7..43abc81d 100644 --- a/src/main/java/net/fabricmc/loom/util/function/FsPathConsumer.java +++ b/src/main/java/dev/architectury/loom/util/function/FsPathConsumer.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.function; +package dev.architectury.loom.util.function; import java.io.IOException; import java.nio.file.FileSystem; diff --git a/src/main/java/net/fabricmc/loom/util/function/IoConsumer.java b/src/main/java/dev/architectury/loom/util/function/IoConsumer.java similarity index 96% rename from src/main/java/net/fabricmc/loom/util/function/IoConsumer.java rename to src/main/java/dev/architectury/loom/util/function/IoConsumer.java index 379d4293..447281bc 100644 --- a/src/main/java/net/fabricmc/loom/util/function/IoConsumer.java +++ b/src/main/java/dev/architectury/loom/util/function/IoConsumer.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package net.fabricmc.loom.util.function; +package dev.architectury.loom.util.function; import java.io.IOException; diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 49483cf2..d045201d 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -28,6 +28,14 @@ import java.nio.file.Path; import java.util.Collection; import java.util.List; +import dev.architectury.loom.forge.dependency.DependencyProviders; +import dev.architectury.loom.forge.dependency.ForgeProvider; +import dev.architectury.loom.forge.dependency.ForgeRunsProvider; +import dev.architectury.loom.forge.dependency.ForgeUniversalProvider; +import dev.architectury.loom.forge.dependency.ForgeUserdevProvider; +import dev.architectury.loom.forge.dependency.PatchProvider; +import dev.architectury.loom.forge.dependency.SrgProvider; +import dev.architectury.loom.mcpconfig.McpConfigProvider; import org.gradle.api.GradleException; import org.gradle.api.Project; import org.gradle.api.file.ConfigurableFileCollection; @@ -40,14 +48,6 @@ import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.InstallerData; import net.fabricmc.loom.configuration.LoomDependencyManager; import net.fabricmc.loom.configuration.accesswidener.AccessWidenerFile; -import net.fabricmc.loom.configuration.providers.forge.DependencyProviders; -import net.fabricmc.loom.configuration.providers.forge.ForgeProvider; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunsProvider; -import net.fabricmc.loom.configuration.providers.forge.ForgeUniversalProvider; -import net.fabricmc.loom.configuration.providers.forge.ForgeUserdevProvider; -import net.fabricmc.loom.configuration.providers.forge.PatchProvider; -import net.fabricmc.loom.configuration.providers.forge.SrgProvider; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigProvider; import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingsFactory; import net.fabricmc.loom.configuration.providers.mappings.MappingConfiguration; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftMetadataProvider; diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 2b9f13f2..8a332f40 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -39,7 +39,18 @@ import java.util.stream.Collectors; import javax.inject.Inject; +import dev.architectury.loom.accesstransformer.AccessTransformerJarProcessor; import dev.architectury.loom.forge.ForgeSourcesService; +import dev.architectury.loom.forge.dependency.DependencyProviders; +import dev.architectury.loom.forge.dependency.ForgeLibrariesProvider; +import dev.architectury.loom.forge.dependency.ForgeProvider; +import dev.architectury.loom.forge.dependency.ForgeRunsProvider; +import dev.architectury.loom.forge.dependency.ForgeUniversalProvider; +import dev.architectury.loom.forge.dependency.ForgeUserdevProvider; +import dev.architectury.loom.forge.dependency.PatchProvider; +import dev.architectury.loom.forge.dependency.SrgProvider; +import dev.architectury.loom.forge.minecraft.ForgeMinecraftProvider; +import dev.architectury.loom.mcpconfig.McpConfigProvider; import org.gradle.api.GradleException; import org.gradle.api.Project; import org.gradle.api.file.FileCollection; @@ -60,22 +71,11 @@ import net.fabricmc.loom.build.mixin.GroovyApInvoker; import net.fabricmc.loom.build.mixin.JavaApInvoker; import net.fabricmc.loom.build.mixin.KaptApInvoker; import net.fabricmc.loom.build.mixin.ScalaApInvoker; -import net.fabricmc.loom.configuration.accesstransformer.AccessTransformerJarProcessor; import net.fabricmc.loom.configuration.accesswidener.AccessWidenerJarProcessor; import net.fabricmc.loom.configuration.ifaceinject.InterfaceInjectionProcessor; import net.fabricmc.loom.configuration.mods.ModConfigurationRemapper; import net.fabricmc.loom.configuration.processors.MinecraftJarProcessorManager; import net.fabricmc.loom.configuration.processors.ModJavadocProcessor; -import net.fabricmc.loom.configuration.providers.forge.DependencyProviders; -import net.fabricmc.loom.configuration.providers.forge.ForgeLibrariesProvider; -import net.fabricmc.loom.configuration.providers.forge.ForgeProvider; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunsProvider; -import net.fabricmc.loom.configuration.providers.forge.ForgeUniversalProvider; -import net.fabricmc.loom.configuration.providers.forge.ForgeUserdevProvider; -import net.fabricmc.loom.configuration.providers.forge.PatchProvider; -import net.fabricmc.loom.configuration.providers.forge.SrgProvider; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigProvider; -import net.fabricmc.loom.configuration.providers.forge.minecraft.ForgeMinecraftProvider; import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingsFactory; import net.fabricmc.loom.configuration.providers.mappings.MappingConfiguration; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftMetadataProvider; diff --git a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java index 522c43b7..3b494a64 100644 --- a/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java +++ b/src/main/java/net/fabricmc/loom/configuration/accesswidener/AccessWidenerFile.java @@ -36,9 +36,9 @@ import com.google.gson.Gson; import com.google.gson.JsonObject; import dev.architectury.loom.metadata.ModMetadataFile; import dev.architectury.loom.metadata.ModMetadataFiles; +import dev.architectury.loom.util.collection.CollectionUtil; import net.fabricmc.loom.util.ZipUtils; -import net.fabricmc.loom.util.function.CollectionUtil; public record AccessWidenerFile( String path, diff --git a/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java index f79ab3bf..78525bb8 100644 --- a/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/decompile/SingleJarDecompileConfiguration.java @@ -26,10 +26,10 @@ package net.fabricmc.loom.configuration.decompile; import java.util.List; +import dev.architectury.loom.forge.minecraft.MinecraftPatchedProvider; import org.gradle.api.Project; import net.fabricmc.loom.LoomGradleExtension; -import net.fabricmc.loom.configuration.providers.forge.MinecraftPatchedProvider; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJar; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftJarConfiguration; import net.fabricmc.loom.configuration.providers.minecraft.mapped.MappedMinecraftProvider; diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java index 407e5925..127264aa 100644 --- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java +++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java @@ -36,6 +36,8 @@ import java.util.function.Function; import javax.inject.Inject; +import dev.architectury.loom.forge.config.ForgeRunTemplate; +import dev.architectury.loom.forge.dependency.ForgeRunsProvider; import org.gradle.api.Action; import org.gradle.api.Named; import org.gradle.api.NamedDomainObjectContainer; @@ -46,8 +48,6 @@ import org.jetbrains.annotations.ApiStatus; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.ModSettings; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunTemplate; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunsProvider; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.ModPlatform; 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 a7e163cc..d32b1e33 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -43,8 +43,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.google.gson.JsonObject; +import dev.architectury.loom.accesstransformer.AtClassRemapper; +import dev.architectury.loom.forge.CoreModClassRemapper; +import dev.architectury.loom.mappings.MappingOption; import dev.architectury.loom.neoforge.NeoForgeModDependencies; -import dev.architectury.loom.util.MappingOption; +import dev.architectury.loom.util.LoggerFilter; import dev.architectury.loom.util.Stopwatch; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; @@ -62,7 +65,6 @@ import net.fabricmc.loom.configuration.providers.mappings.MappingConfiguration; import net.fabricmc.loom.extension.RemapperExtensionHolder; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.IdentityBiMap; -import net.fabricmc.loom.util.LoggerFilter; import net.fabricmc.loom.util.ModPlatform; import net.fabricmc.loom.util.Pair; import net.fabricmc.loom.util.TinyRemapperHelper; @@ -71,8 +73,6 @@ import net.fabricmc.loom.util.ZipUtils; import net.fabricmc.loom.util.kotlin.KotlinClasspathService; import net.fabricmc.loom.util.kotlin.KotlinRemapperClassloader; import net.fabricmc.loom.util.service.ServiceFactory; -import net.fabricmc.loom.util.srg.AtClassRemapper; -import net.fabricmc.loom.util.srg.CoreModClassRemapper; import net.fabricmc.mappingio.tree.MemoryMappingTree; import net.fabricmc.tinyremapper.InputTag; import net.fabricmc.tinyremapper.NonClassCopyMode; diff --git a/src/main/java/net/fabricmc/loom/configuration/processors/ProcessorContextImpl.java b/src/main/java/net/fabricmc/loom/configuration/processors/ProcessorContextImpl.java index 205dbdd1..ad64a173 100644 --- a/src/main/java/net/fabricmc/loom/configuration/processors/ProcessorContextImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/processors/ProcessorContextImpl.java @@ -24,7 +24,7 @@ package net.fabricmc.loom.configuration.processors; -import dev.architectury.loom.util.MappingOption; +import dev.architectury.loom.mappings.MappingOption; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java index 2de0de97..e04cf004 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/LayeredMappingSpecBuilderImpl.java @@ -28,17 +28,17 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import dev.architectury.loom.mappings.crane.CraneMappingsSpec; import org.gradle.api.Action; import org.jetbrains.annotations.Nullable; +import net.fabricmc.loom.api.LoomGradleExtensionAPI; import net.fabricmc.loom.api.mappings.layered.spec.FileMappingsSpecBuilder; import net.fabricmc.loom.api.mappings.layered.spec.FileSpec; import net.fabricmc.loom.api.mappings.layered.spec.LayeredMappingSpecBuilder; import net.fabricmc.loom.api.mappings.layered.spec.MappingsSpec; import net.fabricmc.loom.api.mappings.layered.spec.MojangMappingsSpecBuilder; import net.fabricmc.loom.api.mappings.layered.spec.ParchmentMappingsSpecBuilder; -import net.fabricmc.loom.api.LoomGradleExtensionAPI; -import net.fabricmc.loom.configuration.providers.mappings.crane.CraneMappingsSpec; import net.fabricmc.loom.configuration.providers.mappings.extras.signatures.SignatureFixesSpec; import net.fabricmc.loom.configuration.providers.mappings.file.FileMappingsSpecBuilderImpl; import net.fabricmc.loom.configuration.providers.mappings.intermediary.IntermediaryMappingsSpec; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java index d7b41a6d..2179b334 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingConfiguration.java @@ -44,7 +44,11 @@ import java.util.Map; import java.util.Objects; import java.util.function.Supplier; -import dev.architectury.loom.util.MappingOption; +import dev.architectury.loom.forge.ForgeMigratedMappingConfiguration; +import dev.architectury.loom.forge.dependency.SrgProvider; +import dev.architectury.loom.mappings.ForgeMappingsMerger; +import dev.architectury.loom.mappings.MCPReader; +import dev.architectury.loom.mappings.MappingOption; import dev.architectury.loom.util.Stopwatch; import org.apache.tools.ant.util.StringUtils; import org.gradle.api.Project; @@ -58,8 +62,6 @@ import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.api.mappings.layered.MappingContext; import net.fabricmc.loom.configuration.DependencyInfo; -import net.fabricmc.loom.configuration.providers.forge.ForgeMigratedMappingConfiguration; -import net.fabricmc.loom.configuration.providers.forge.SrgProvider; import net.fabricmc.loom.configuration.providers.mappings.tiny.MappingsMerger; import net.fabricmc.loom.configuration.providers.mappings.tiny.TinyJarInfo; import net.fabricmc.loom.configuration.providers.mappings.unpick.UnpickMetadata; @@ -70,8 +72,6 @@ import net.fabricmc.loom.util.FileSystemUtil; import net.fabricmc.loom.util.ZipUtils; import net.fabricmc.loom.util.service.ScopedServiceFactory; import net.fabricmc.loom.util.service.ServiceFactory; -import net.fabricmc.loom.util.srg.ForgeMappingsMerger; -import net.fabricmc.loom.util.srg.MCPReader; import net.fabricmc.mappingio.MappingReader; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.MappingWriter; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java index 33efeba6..6ec2f656 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftJarConfiguration.java @@ -26,6 +26,7 @@ package net.fabricmc.loom.configuration.providers.minecraft; import java.util.List; +import dev.architectury.loom.forge.minecraft.ForgeMinecraftProvider; import org.gradle.api.Project; import net.fabricmc.loom.LoomGradleExtension; @@ -34,7 +35,6 @@ import net.fabricmc.loom.configuration.decompile.DecompileConfiguration; import net.fabricmc.loom.configuration.decompile.SingleJarDecompileConfiguration; import net.fabricmc.loom.configuration.decompile.SplitDecompileConfiguration; import net.fabricmc.loom.configuration.processors.MinecraftJarProcessorManager; -import net.fabricmc.loom.configuration.providers.forge.minecraft.ForgeMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.mapped.IntermediaryMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.mapped.MappedMinecraftProvider; import net.fabricmc.loom.configuration.providers.minecraft.mapped.MojangMappedMinecraftProvider; diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java index 1bcf04ee..e8cc669f 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/AbstractMappedMinecraftProvider.java @@ -37,7 +37,10 @@ import java.util.Set; import java.util.StringJoiner; import java.util.function.Function; -import dev.architectury.loom.util.MappingOption; +import dev.architectury.loom.forge.InnerClassRemapper; +import dev.architectury.loom.forge.RemapObjectHolderVisitor; +import dev.architectury.loom.forge.minecraft.ForgeMinecraftProvider; +import dev.architectury.loom.mappings.MappingOption; import org.gradle.api.Project; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +50,6 @@ import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.build.IntermediaryNamespaces; import net.fabricmc.loom.configuration.ConfigContext; import net.fabricmc.loom.configuration.mods.dependency.LocalMavenHelper; -import net.fabricmc.loom.configuration.providers.forge.minecraft.ForgeMinecraftProvider; import net.fabricmc.loom.configuration.providers.mappings.IntermediaryMappingsProvider; import net.fabricmc.loom.configuration.providers.mappings.MappingConfiguration; import net.fabricmc.loom.configuration.providers.mappings.TinyMappingsService; @@ -59,12 +61,10 @@ import net.fabricmc.loom.configuration.providers.minecraft.SignatureFixerApplyVi import net.fabricmc.loom.extension.LoomFiles; import net.fabricmc.loom.util.SidedClassVisitor; import net.fabricmc.loom.util.TinyRemapperHelper; -import net.fabricmc.loom.util.srg.InnerClassRemapper; -import net.fabricmc.loom.util.srg.RemapObjectHolderVisitor; import net.fabricmc.mappingio.tree.MemoryMappingTree; -import net.fabricmc.tinyremapper.extension.mixin.MixinExtension; import net.fabricmc.tinyremapper.OutputConsumerPath; import net.fabricmc.tinyremapper.TinyRemapper; +import net.fabricmc.tinyremapper.extension.mixin.MixinExtension; public abstract class AbstractMappedMinecraftProvider implements MappedMinecraftProvider.ProviderImpl { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractMappedMinecraftProvider.class); diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/tr/OutputRemappingHandler.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/tr/OutputRemappingHandler.java deleted file mode 100644 index d095fb6b..00000000 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/tr/OutputRemappingHandler.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of fabric-loom, licensed under the MIT License (MIT). - * - * Copyright (c) 2021 FabricMC - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package net.fabricmc.loom.configuration.providers.minecraft.tr; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import java.nio.file.StandardOpenOption; -import java.util.function.BiConsumer; - -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 { - remap(remapper, assets, output, null); - } - - public static void remap(TinyRemapper remapper, Path assets, Path output, BiConsumer then) throws IOException { - remap(remapper, assets, output, then, (InputTag[]) null); - } - - public static void remap(TinyRemapper remapper, Path assets, Path output, BiConsumer then, InputTag... inputTags) throws IOException { - Files.copy(assets, output, StandardCopyOption.REPLACE_EXISTING); - - try (FileSystemUtil.Delegate system = FileSystemUtil.getJarFileSystem(output, true)) { - ThreadingUtils.TaskCompleter taskCompleter = ThreadingUtils.taskCompleter(); - - remapper.apply((path, bytes) -> { - if (path.startsWith("/")) path = path.substring(1); - - try { - Path fsPath = system.get().getPath(path + ".class"); - - if (fsPath.getParent() != null) { - Files.createDirectories(fsPath.getParent()); - } - - taskCompleter.add(() -> { - Files.write(fsPath, bytes, StandardOpenOption.CREATE); - }); - - if (then != null) { - then.accept(path, bytes); - } - } catch (IOException e) { - throw new UncheckedIOException(e); - } - }, inputTags); - - taskCompleter.complete(); - } - } -} diff --git a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java index b0f9e2fe..9de820bb 100644 --- a/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionImpl.java @@ -36,6 +36,8 @@ import java.util.function.Supplier; import javax.inject.Inject; import com.google.common.base.Suppliers; +import dev.architectury.loom.forge.dependency.DependencyProviders; +import dev.architectury.loom.forge.dependency.ForgeRunsProvider; import org.gradle.api.Project; import org.gradle.api.configuration.BuildFeatures; import org.gradle.api.file.ConfigurableFileCollection; @@ -50,8 +52,6 @@ import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.InstallerData; import net.fabricmc.loom.configuration.LoomDependencyManager; import net.fabricmc.loom.configuration.accesswidener.AccessWidenerFile; -import net.fabricmc.loom.configuration.providers.forge.DependencyProviders; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunsProvider; import net.fabricmc.loom.configuration.providers.mappings.IntermediaryMappingsProvider; import net.fabricmc.loom.configuration.providers.mappings.LayeredMappingsFactory; import net.fabricmc.loom.configuration.providers.mappings.MappingConfiguration; diff --git a/src/main/java/net/fabricmc/loom/task/GenerateForgePatchedSourcesTask.java b/src/main/java/net/fabricmc/loom/task/GenerateForgePatchedSourcesTask.java index 5bd24195..083c095c 100644 --- a/src/main/java/net/fabricmc/loom/task/GenerateForgePatchedSourcesTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenerateForgePatchedSourcesTask.java @@ -36,10 +36,15 @@ import codechicken.diffpatch.cli.CliOperation; import codechicken.diffpatch.cli.PatchOperation; import codechicken.diffpatch.util.LoggingOutputStream; import codechicken.diffpatch.util.PatchMode; +import dev.architectury.loom.accesstransformer.AccessTransformerService; import dev.architectury.loom.forge.ForgeSourcesService; -import dev.architectury.loom.forge.tool.AccessTransformerService; +import dev.architectury.loom.forge.minecraft.MinecraftPatchedProvider; import dev.architectury.loom.forge.tool.ForgeToolService; import dev.architectury.loom.forge.tool.ForgeTools; +import dev.architectury.loom.mcpconfig.McpExecutor; +import dev.architectury.loom.mcpconfig.McpExecutorBuilder; +import dev.architectury.loom.mcpconfig.steplogic.ConstantLogic; +import dev.architectury.loom.util.DependencyDownloader; import dev.architectury.loom.util.Stopwatch; import dev.architectury.loom.util.TempFiles; import org.gradle.api.file.ConfigurableFileCollection; @@ -55,14 +60,9 @@ import org.gradle.api.tasks.Nested; import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; -import net.fabricmc.loom.configuration.providers.forge.MinecraftPatchedProvider; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpExecutor; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpExecutorBuilder; -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.steplogic.ConstantLogic; import net.fabricmc.loom.task.service.MappingsService; import net.fabricmc.loom.task.service.SourceRemapperService; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.DependencyDownloader; import net.fabricmc.loom.util.FileSystemUtil; import net.fabricmc.loom.util.service.ScopedServiceFactory; import net.fabricmc.loom.util.service.ServiceFactory; diff --git a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java index bc9bda43..332691ae 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java +++ b/src/main/java/net/fabricmc/loom/task/RemapTaskConfiguration.java @@ -29,6 +29,8 @@ import java.util.Set; import javax.inject.Inject; +import dev.architectury.loom.accesstransformer.Aw2At; +import dev.architectury.loom.util.PropertyUtil; import org.gradle.api.Action; import org.gradle.api.Project; import org.gradle.api.Task; @@ -45,8 +47,6 @@ import org.gradle.jvm.tasks.Jar; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.build.nesting.NestableJarGenerationTask; import net.fabricmc.loom.util.Constants; -import net.fabricmc.loom.util.PropertyUtil; -import net.fabricmc.loom.util.aw2at.Aw2At; import net.fabricmc.loom.util.gradle.GradleUtils; import net.fabricmc.loom.util.gradle.SourceSetHelper; import net.fabricmc.loom.util.gradle.SyncTaskBuildService; diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java index 18bd1791..d78db6ab 100644 --- a/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java +++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateDLIConfigTask.java @@ -39,6 +39,9 @@ import java.util.Set; import java.util.StringJoiner; import java.util.stream.Collectors; +import dev.architectury.loom.forge.config.ConfigValue; +import dev.architectury.loom.forge.config.ForgeRunTemplate; +import dev.architectury.loom.forge.dependency.ForgeRunsProvider; import org.apache.commons.io.FileUtils; import org.gradle.api.Project; import org.gradle.api.file.ConfigurableFileCollection; @@ -57,9 +60,6 @@ import org.jetbrains.annotations.ApiStatus; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.LoomGradlePlugin; import net.fabricmc.loom.build.IntermediaryNamespaces; -import net.fabricmc.loom.configuration.providers.forge.ConfigValue; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunTemplate; -import net.fabricmc.loom.configuration.providers.forge.ForgeRunsProvider; import net.fabricmc.loom.configuration.providers.minecraft.MinecraftVersionMeta; import net.fabricmc.loom.configuration.providers.minecraft.mapped.MappedMinecraftProvider; import net.fabricmc.loom.task.AbstractLoomTask; diff --git a/src/main/java/net/fabricmc/loom/task/launch/GenerateLog4jConfigTask.java b/src/main/java/net/fabricmc/loom/task/launch/GenerateLog4jConfigTask.java index dad61e2d..eb05ce87 100644 --- a/src/main/java/net/fabricmc/loom/task/launch/GenerateLog4jConfigTask.java +++ b/src/main/java/net/fabricmc/loom/task/launch/GenerateLog4jConfigTask.java @@ -31,7 +31,7 @@ import java.nio.file.Path; import javax.inject.Inject; -import dev.architectury.loom.util.ForgeLoggerConfig; +import dev.architectury.loom.forge.ForgeLoggerConfig; import org.gradle.api.file.RegularFile; import org.gradle.api.file.RegularFileProperty; import org.gradle.api.provider.Property; diff --git a/src/main/java/net/fabricmc/loom/task/service/LorenzMappingService.java b/src/main/java/net/fabricmc/loom/task/service/LorenzMappingService.java index 187b5457..c4748dfc 100644 --- a/src/main/java/net/fabricmc/loom/task/service/LorenzMappingService.java +++ b/src/main/java/net/fabricmc/loom/task/service/LorenzMappingService.java @@ -29,7 +29,7 @@ import java.io.UncheckedIOException; import java.util.function.Supplier; import com.google.common.base.Suppliers; -import dev.architectury.loom.util.MappingOption; +import dev.architectury.loom.mappings.MappingOption; import org.cadixdev.lorenz.MappingSet; import org.gradle.api.Project; import org.gradle.api.provider.Property; diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index 1d035ce9..71225af7 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -97,7 +97,7 @@ public class Constants { * The configuration used to create the Forge runtime classpath file list. * Users can also directly add files to this config. * - * @see net.fabricmc.loom.configuration.providers.forge.ForgeUserdevProvider + * @see dev.architectury.loom.forge.dependency.ForgeUserdevProvider */ public static final String FORGE_RUNTIME_LIBRARY = "forgeRuntimeLibrary"; public static final String MAPPING_CONSTANTS = "mappingsConstants"; diff --git a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java index a15b24ba..35c9eb5c 100644 --- a/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java +++ b/src/main/java/net/fabricmc/loom/util/TinyRemapperHelper.java @@ -31,13 +31,14 @@ import java.util.Set; import java.util.function.Consumer; import java.util.regex.Pattern; -import dev.architectury.loom.util.MappingOption; +import dev.architectury.loom.forge.InnerClassRemapper; +import dev.architectury.loom.mappings.MappingException; +import dev.architectury.loom.mappings.MappingOption; import org.gradle.api.Project; import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.util.service.ServiceFactory; -import net.fabricmc.loom.util.srg.InnerClassRemapper; import net.fabricmc.mappingio.MappingReader; import net.fabricmc.mappingio.tree.MappingTree; import net.fabricmc.mappingio.tree.MappingTreeView; diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/VersionTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/VersionTest.groovy index a182dd55..1203ad1b 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/VersionTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/VersionTest.groovy @@ -24,10 +24,9 @@ package net.fabricmc.loom.test.unit +import dev.architectury.loom.util.Version import spock.lang.Specification -import net.fabricmc.loom.util.Version - class VersionTest extends Specification { def "version comparison"() { when: diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/forge/AccessTransformerJarProcessorTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/forge/AccessTransformerJarProcessorTest.groovy index ae6b0d75..98348be4 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/forge/AccessTransformerJarProcessorTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/forge/AccessTransformerJarProcessorTest.groovy @@ -27,12 +27,12 @@ package net.fabricmc.loom.test.unit.forge import java.nio.file.Files import java.nio.file.Path +import dev.architectury.loom.accesstransformer.AccessTransformerJarProcessor import org.gradle.api.Project import spock.lang.Specification import spock.lang.TempDir import net.fabricmc.loom.api.processor.SpecContext -import net.fabricmc.loom.configuration.accesstransformer.AccessTransformerJarProcessor import net.fabricmc.loom.util.ZipUtils import net.fabricmc.loom.util.fmj.FabricModJsonFactory diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/forge/Aw2AtTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/forge/Aw2AtTest.groovy index 62827ef5..6d7dfefd 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/forge/Aw2AtTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/forge/Aw2AtTest.groovy @@ -26,10 +26,10 @@ package net.fabricmc.loom.test.unit.forge import dev.architectury.at.AccessChange import dev.architectury.at.ModifierChange +import dev.architectury.loom.accesstransformer.Aw2At import spock.lang.Specification import net.fabricmc.accesswidener.AccessWidenerReader -import net.fabricmc.loom.util.aw2at.Aw2At class Aw2AtTest extends Specification { def "test accessible"() { diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/forge/ConfigValueTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/forge/ConfigValueTest.groovy index cfcb906d..5d4accff 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/forge/ConfigValueTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/forge/ConfigValueTest.groovy @@ -24,10 +24,9 @@ package net.fabricmc.loom.test.unit.forge +import dev.architectury.loom.forge.config.ConfigValue import spock.lang.Specification -import net.fabricmc.loom.configuration.providers.forge.ConfigValue - class ConfigValueTest extends Specification { def "bare value is constant"() { when: diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/forge/DependencySetTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/forge/DependencySetTest.groovy index 67cc17db..7acb63f0 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/forge/DependencySetTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/forge/DependencySetTest.groovy @@ -24,13 +24,12 @@ package net.fabricmc.loom.test.unit.forge +import dev.architectury.loom.forge.config.ConfigValue +import dev.architectury.loom.mcpconfig.DependencySet +import dev.architectury.loom.mcpconfig.McpConfigStep import spock.lang.Shared import spock.lang.Specification -import net.fabricmc.loom.configuration.providers.forge.ConfigValue -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.DependencySet -import net.fabricmc.loom.configuration.providers.forge.mcpconfig.McpConfigStep - class DependencySetTest extends Specification { /* orphanA diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/forge/ForgeRunTemplateTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/forge/ForgeRunTemplateTest.groovy index 4ec2b3cc..7a85794a 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/forge/ForgeRunTemplateTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/forge/ForgeRunTemplateTest.groovy @@ -30,11 +30,11 @@ import java.nio.file.Path import com.google.gson.Gson import com.google.gson.JsonObject import com.mojang.serialization.JsonOps +import dev.architectury.loom.forge.config.ForgeRunTemplate import spock.lang.Specification import spock.lang.TempDir import spock.lang.Unroll -import net.fabricmc.loom.configuration.providers.forge.ForgeRunTemplate import net.fabricmc.loom.util.ZipUtils import net.fabricmc.loom.util.download.Download diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/forge/SrgMergerTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/forge/SrgMergerTest.groovy index f82ed0bd..9143ace8 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/forge/SrgMergerTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/forge/SrgMergerTest.groovy @@ -27,10 +27,10 @@ package net.fabricmc.loom.test.unit.forge import java.nio.file.Files import java.nio.file.Path +import dev.architectury.loom.mappings.ForgeMappingsMerger import spock.lang.Specification import spock.lang.TempDir -import net.fabricmc.loom.util.srg.ForgeMappingsMerger import net.fabricmc.mappingio.MappingUtil import net.fabricmc.mappingio.format.MappingFormat import net.fabricmc.mappingio.format.tiny.Tiny2FileWriter