From 3b4e3ab0076107f2c6e14c51ad799f85144778d5 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Thu, 10 Apr 2025 19:24:50 +0200 Subject: [PATCH 1/4] Update WFVAIO to 1.2.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a491a6e..97b5718 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation(include("io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}")) implementation(include("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0")) - implementation(include("com.github.thecatcore:WFVAIO:1.2.0")) + implementation(include("com.github.thecatcore:WFVAIO:1.2.1")) testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}" } From 6dac523f4151839f940e462995b87cf38c06ce26 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Thu, 10 Apr 2025 19:26:59 +0200 Subject: [PATCH 2/4] Relocate internals to the new package --- .../modremapperapi/ModRemappingAPI.java | 2 +- .../modremapperapi/remapping/RemapUtil.java | 4 +-- .../modremapperapi/utils/Constants.java | 2 +- .../modremapperapi/utils/FileUtils.java | 4 +-- .../modremapperapi/utils/MappingsUtils.java | 6 ++-- .../modremappingapi/api/v2/CacheHandler.java | 2 +- .../modremappingapi/api/v2/MappingUtils.java | 2 +- .../api/v2/MappingsConfig.java | 2 +- .../api/v2/ModDiscovererConfig.java | 3 +- .../modremappingapi/api/v2/RemapLibrary.java | 2 +- .../impl/ModRemappingAPIImpl.java | 10 ++++--- .../impl/ModRemappingApiInit.java | 5 +++- .../modremappingapi/impl/RemapperPlugin.java | 6 ++-- .../impl/compatibility/v0}/V0ModRemapper.java | 4 +-- .../v1/ModRemapperV1Context.java | 30 +++++++++---------- .../compatibility}/v1/V1CacheHandler.java | 8 +++-- .../v1}/V1DefaultModRemapper.java | 4 ++- .../v1/V1MappingBuilderImpl.java | 2 +- .../impl/context/BaseModRemapperContext.java | 5 +++- .../{ => context}/InternalCacheHandler.java | 4 ++- .../impl/context}/LibraryHandler.java | 6 ++-- .../context/MappingsRegistryInstance.java | 15 +++++----- .../impl/context/MixinData.java | 4 ++- .../impl/context/ModDiscoverer.java} | 13 ++++---- .../impl/context/ModRemapperContext.java | 7 +++-- .../impl/context}/ModRemmaperV2Context.java | 25 +++++++--------- .../impl/context}/V2CacheHandler.java | 5 ++-- .../impl/context}/V2MappingBuilderImpl.java | 2 +- .../{ => defaults}/DefaultMappingsConfig.java | 4 ++- .../{ => defaults}/DefaultModCandidate.java | 4 ++- .../{ => defaults}/DefaultRemapLibrary.java | 5 ++-- .../ModDiscovererConfigImpl.java | 3 +- .../impl/mappings/MappingTreeHelper.java | 4 +-- .../impl/mappings/MappingsRegistry.java | 2 +- .../impl/mappings}/MappingsUtilsImpl.java | 8 ++--- .../impl/remapper/ModTrRemapper.java | 20 ++++++------- .../impl/remapper/SoftLockFixer.java | 26 ++++++++-------- .../impl/remapper/TrRemapperHelper.java | 6 ++-- .../impl/remapper}/VisitorInfosImpl.java | 2 +- .../impl/remapper/asm/MRAClassVisitor.java | 6 ++-- .../impl/remapper/asm/MRAMethodVisitor.java | 6 ++-- .../asm/mixin/RefmapBaseMixinExtension.java | 4 ++- .../remapper/minecraft/ClasspathUtils.java} | 6 ++-- .../remapper/minecraft/MinecraftRemapper.java | 15 +++++----- .../impl/remapper/resource/RefmapJson.java | 6 ++-- .../remapper/resource/RefmapRemapper.java | 4 ++- .../remapper/visitor/MRAApplyVisitor.java | 8 +++-- .../MixinPostApplyVisitorProvider.java | 6 ++-- .../impl/utils/CacheUtils.java | 2 +- .../modremappingapi/impl/utils/FileUtils.java | 2 +- .../impl/utils}/TransformerRegistry.java | 2 +- .../impl/utils/VersionHelper.java | 2 +- .../modremappingapi/api/MappingUtils.java | 2 +- .../api/v1/ClassTransformer.java | 2 +- .../modremappingapi/api/v1/MappingUtils.java | 2 +- .../hard/ImprovedMixinAnnotationVisitor.java | 2 +- src/main/resources/fabric.mod.json | 4 +-- .../resources/mixins.mod-remapping-api.json | 2 +- 58 files changed, 195 insertions(+), 156 deletions(-) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/ModRemappingAPIImpl.java (86%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/ModRemappingApiInit.java (57%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/RemapperPlugin.java (85%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/compatibility => fabriccompatibilitylayers/modremappingapi/impl/compatibility/v0}/V0ModRemapper.java (96%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/context => fabriccompatibilitylayers/modremappingapi/impl/compatibility}/v1/ModRemapperV1Context.java (88%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/context => fabriccompatibilitylayers/modremappingapi/impl/compatibility}/v1/V1CacheHandler.java (84%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/compatibility => fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1}/V1DefaultModRemapper.java (86%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/context => fabriccompatibilitylayers/modremappingapi/impl/compatibility}/v1/V1MappingBuilderImpl.java (96%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/context/BaseModRemapperContext.java (79%) rename src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/{ => context}/InternalCacheHandler.java (82%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl => fabriccompatibilitylayers/modremappingapi/impl/context}/LibraryHandler.java (93%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/context/MappingsRegistryInstance.java (93%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/context/MixinData.java (83%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2ModDiscoverer.java => fabriccompatibilitylayers/modremappingapi/impl/context/ModDiscoverer.java} (93%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/context/ModRemapperContext.java (78%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/context/v2 => fabriccompatibilitylayers/modremappingapi/impl/context}/ModRemmaperV2Context.java (85%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/context/v2 => fabriccompatibilitylayers/modremappingapi/impl/context}/V2CacheHandler.java (91%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/context/v2 => fabriccompatibilitylayers/modremappingapi/impl/context}/V2MappingBuilderImpl.java (97%) rename src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/{ => defaults}/DefaultMappingsConfig.java (90%) rename src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/{ => defaults}/DefaultModCandidate.java (96%) rename src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/{ => defaults}/DefaultRemapLibrary.java (94%) rename src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/{ => defaults}/ModDiscovererConfigImpl.java (99%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/mappings/MappingTreeHelper.java (97%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/mappings/MappingsRegistry.java (99%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl => fabriccompatibilitylayers/modremappingapi/impl/mappings}/MappingsUtilsImpl.java (96%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/ModTrRemapper.java (89%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/SoftLockFixer.java (92%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/TrRemapperHelper.java (94%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl => fabriccompatibilitylayers/modremappingapi/impl/remapper}/VisitorInfosImpl.java (98%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/asm/MRAClassVisitor.java (86%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/asm/MRAMethodVisitor.java (95%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/asm/mixin/RefmapBaseMixinExtension.java (95%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl/RemapUtils.java => fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/ClasspathUtils.java} (92%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java (83%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/resource/RefmapJson.java (97%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/resource/RefmapRemapper.java (90%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java (62%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java (91%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/utils/CacheUtils.java (91%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/utils/FileUtils.java (99%) rename src/main/java/io/github/{fabriccompatibiltylayers/modremappingapi/impl => fabriccompatibilitylayers/modremappingapi/impl/utils}/TransformerRegistry.java (97%) rename src/main/java/io/github/{fabriccompatibiltylayers => fabriccompatibilitylayers}/modremappingapi/impl/utils/VersionHelper.java (92%) diff --git a/src/main/java/fr/catcore/modremapperapi/ModRemappingAPI.java b/src/main/java/fr/catcore/modremapperapi/ModRemappingAPI.java index 6f36cff..9c03546 100644 --- a/src/main/java/fr/catcore/modremapperapi/ModRemappingAPI.java +++ b/src/main/java/fr/catcore/modremapperapi/ModRemappingAPI.java @@ -1,6 +1,6 @@ package fr.catcore.modremapperapi; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingAPIImpl; @Deprecated public class ModRemappingAPI { diff --git a/src/main/java/fr/catcore/modremapperapi/remapping/RemapUtil.java b/src/main/java/fr/catcore/modremapperapi/remapping/RemapUtil.java index 051f9fd..363f5ab 100644 --- a/src/main/java/fr/catcore/modremapperapi/remapping/RemapUtil.java +++ b/src/main/java/fr/catcore/modremapperapi/remapping/RemapUtil.java @@ -1,8 +1,8 @@ package fr.catcore.modremapperapi.remapping; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingUtils; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1.ModRemapperV1Context; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsUtilsImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1.ModRemapperV1Context; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.mappingio.MappingVisitor; diff --git a/src/main/java/fr/catcore/modremapperapi/utils/Constants.java b/src/main/java/fr/catcore/modremapperapi/utils/Constants.java index 26f2225..f63749b 100644 --- a/src/main/java/fr/catcore/modremapperapi/utils/Constants.java +++ b/src/main/java/fr/catcore/modremapperapi/utils/Constants.java @@ -1,6 +1,6 @@ package fr.catcore.modremapperapi.utils; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.CacheUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.CacheUtils; import net.legacyfabric.fabric.api.logger.v1.Logger; import java.io.File; diff --git a/src/main/java/fr/catcore/modremapperapi/utils/FileUtils.java b/src/main/java/fr/catcore/modremapperapi/utils/FileUtils.java index 23d958e..6e16324 100644 --- a/src/main/java/fr/catcore/modremapperapi/utils/FileUtils.java +++ b/src/main/java/fr/catcore/modremapperapi/utils/FileUtils.java @@ -52,7 +52,7 @@ public static List readTextSource(String path) { @Deprecated public static void excludeFromZipFile(File file, List excluded) throws IOException { try { - io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils.removeEntriesFromZip(file.toPath(), excluded); + io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils.removeEntriesFromZip(file.toPath(), excluded); } catch (URISyntaxException e) { throw new RuntimeException(e); } @@ -60,6 +60,6 @@ public static void excludeFromZipFile(File file, List excluded) throws I @Deprecated public static void copyFile(Path original, Path copy) throws IOException { - io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils.copyZipFile(original, copy); + io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils.copyZipFile(original, copy); } } diff --git a/src/main/java/fr/catcore/modremapperapi/utils/MappingsUtils.java b/src/main/java/fr/catcore/modremapperapi/utils/MappingsUtils.java index d30feb8..2ae8fe6 100644 --- a/src/main/java/fr/catcore/modremapperapi/utils/MappingsUtils.java +++ b/src/main/java/fr/catcore/modremapperapi/utils/MappingsUtils.java @@ -1,8 +1,8 @@ package fr.catcore.modremapperapi.utils; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsUtilsImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingTreeHelper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; import net.fabricmc.mappingio.tree.MappingTree; import net.fabricmc.tinyremapper.*; diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/CacheHandler.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/CacheHandler.java index 52c2b6c..74802be 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/CacheHandler.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/CacheHandler.java @@ -1,6 +1,6 @@ package io.github.fabriccompatibilitylayers.modremappingapi.api.v2; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.BaseModRemapperContext; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.context.BaseModRemapperContext; import java.nio.file.Path; diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingUtils.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingUtils.java index 1cb791c..6818a38 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingUtils.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingUtils.java @@ -1,6 +1,6 @@ package io.github.fabriccompatibilitylayers.modremappingapi.api.v2; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsUtilsImpl; import org.jetbrains.annotations.Nullable; public interface MappingUtils { diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingsConfig.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingsConfig.java index 08c3f5e..686e2e0 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingsConfig.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/MappingsConfig.java @@ -1,6 +1,6 @@ package io.github.fabriccompatibilitylayers.modremappingapi.api.v2; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.DefaultMappingsConfig; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults.DefaultMappingsConfig; import org.jetbrains.annotations.Nullable; import java.util.Map; diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/ModDiscovererConfig.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/ModDiscovererConfig.java index 57da7b9..c01da1b 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/ModDiscovererConfig.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/ModDiscovererConfig.java @@ -1,10 +1,9 @@ package io.github.fabriccompatibilitylayers.modremappingapi.api.v2; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModDiscovererConfigImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults.ModDiscovererConfigImpl; import java.nio.file.Path; import java.util.List; -import java.util.function.BiFunction; import java.util.function.Predicate; import java.util.regex.Pattern; diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/RemapLibrary.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/RemapLibrary.java index 48187d6..582a111 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/RemapLibrary.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/api/v2/RemapLibrary.java @@ -1,6 +1,6 @@ package io.github.fabriccompatibilitylayers.modremappingapi.api.v2; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.DefaultRemapLibrary; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults.DefaultRemapLibrary; import org.jetbrains.annotations.Nullable; import java.nio.file.Path; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingAPIImpl.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingAPIImpl.java similarity index 86% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingAPIImpl.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingAPIImpl.java index 7fda287..512b442 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingAPIImpl.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingAPIImpl.java @@ -1,12 +1,13 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl; import fr.catcore.wfvaio.FabricVariants; import fr.catcore.wfvaio.WhichFabricVariantAmIOn; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModRemapper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperContext; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1.ModRemapperV1Context; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2.ModRemmaperV2Context; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.context.ModRemapperContext; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1.ModRemapperV1Context; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.context.ModRemmaperV2Context; import net.fabricmc.loader.api.FabricLoader; +import org.jetbrains.annotations.ApiStatus; import java.io.File; import java.util.ArrayList; @@ -14,6 +15,7 @@ import java.util.Map; import java.util.stream.Collectors; +@ApiStatus.Internal public class ModRemappingAPIImpl { private static ModRemapperContext CURRENT_CONTEXT = null; public static final boolean BABRIC = WhichFabricVariantAmIOn.getVariant() == FabricVariants.BABRIC || WhichFabricVariantAmIOn.getVariant() == FabricVariants.BABRIC_NEW_FORMAT; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingApiInit.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingApiInit.java similarity index 57% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingApiInit.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingApiInit.java index 08e1c00..d8c005b 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingApiInit.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingApiInit.java @@ -1,5 +1,8 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl; +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Internal public class ModRemappingApiInit implements Runnable { public ModRemappingApiInit() {} @Override diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/RemapperPlugin.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/RemapperPlugin.java similarity index 85% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/RemapperPlugin.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/RemapperPlugin.java index 5dc0bb5..2289d7e 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/RemapperPlugin.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/RemapperPlugin.java @@ -1,5 +1,6 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl; +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -7,6 +8,7 @@ import java.util.List; import java.util.Set; +@ApiStatus.Internal public class RemapperPlugin implements IMixinConfigPlugin { @Override @@ -28,7 +30,7 @@ public void acceptTargets(Set myTargets, Set otherTargets){} @Override public List getMixins(){ try { - ((Runnable)Class.forName("io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingApiInit").newInstance()).run(); + ((Runnable)Class.forName("io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingApiInit").newInstance()).run(); } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { throw new RuntimeException(e); } diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V0ModRemapper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v0/V0ModRemapper.java similarity index 96% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V0ModRemapper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v0/V0ModRemapper.java index f980d5d..32c4b47 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V0ModRemapper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v0/V0ModRemapper.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v0; import fr.catcore.modremapperapi.remapping.RemapUtil; import fr.catcore.wfvaio.FabricVariants; @@ -7,7 +7,7 @@ import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.RemapLibrary; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.VisitorInfos; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingTreeHelper; import net.fabricmc.api.EnvType; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/ModRemapperV1Context.java similarity index 88% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/ModRemapperV1Context.java index f9c9f77..4b482d2 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/ModRemapperV1Context.java @@ -1,29 +1,26 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1; import fr.catcore.modremapperapi.utils.Constants; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.CacheHandler; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModDiscovererConfig; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.DefaultModCandidate; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.InternalCacheHandler; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.context.*; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults.DefaultModCandidate; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.VisitorInfosImpl; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingBuilder; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.RemapLibrary; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.*; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility.V0ModRemapper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.BaseModRemapperContext; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.MappingsRegistryInstance; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.MixinData; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2.V2ModDiscoverer; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.ModTrRemapper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v0.V0ModRemapper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.ModTrRemapper; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.RemappingFlags; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.SoftLockFixer; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.SoftLockFixer; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.impl.launch.FabricLauncherBase; import net.fabricmc.tinyremapper.TinyRemapper; +import org.jetbrains.annotations.ApiStatus; import java.io.IOException; import java.io.InputStream; @@ -34,6 +31,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; +@ApiStatus.Internal public class ModRemapperV1Context extends BaseModRemapperContext { private final Set remapFlags = new HashSet<>(); private final List remappers = new ArrayList<>(); @@ -141,14 +139,14 @@ public List discoverMods(boolean remapClassEdits) { } List candidates = new ArrayList<>(); - Map config2Discoverer = new HashMap<>(); + Map config2Discoverer = new HashMap<>(); for (String modFolder : modFolders) { ModDiscovererConfig config = ModDiscovererConfig.builder(modFolder) .fileNameMatcher("(.+).(jar|zip)$") .candidateCollector(this::collectCandidates) .build(); - V2ModDiscoverer discoverer = new V2ModDiscoverer(config); + ModDiscoverer discoverer = new ModDiscoverer(config); config2Discoverer.put(config, discoverer); candidates.addAll(discoverer.collect()); } diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1CacheHandler.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1CacheHandler.java similarity index 84% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1CacheHandler.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1CacheHandler.java index 87dcc44..4279ca5 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1CacheHandler.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1CacheHandler.java @@ -1,12 +1,14 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.InternalCacheHandler; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.CacheUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.context.InternalCacheHandler; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.CacheUtils; +import org.jetbrains.annotations.ApiStatus; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +@ApiStatus.Internal public class V1CacheHandler implements InternalCacheHandler { private final Path contextDirectory = CacheUtils.MAIN_FOLDER; private final Path tempDirectory = contextDirectory.resolve("temp"); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V1DefaultModRemapper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1DefaultModRemapper.java similarity index 86% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V1DefaultModRemapper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1DefaultModRemapper.java index a6e239a..7b55a96 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V1DefaultModRemapper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1DefaultModRemapper.java @@ -1,13 +1,15 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingBuilder; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.RemapLibrary; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.VisitorInfos; import net.fabricmc.api.EnvType; +import org.jetbrains.annotations.ApiStatus; import java.util.List; +@ApiStatus.Internal public class V1DefaultModRemapper implements ModRemapper { @Override public String[] getJarFolders() { diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1MappingBuilderImpl.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1MappingBuilderImpl.java similarity index 96% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1MappingBuilderImpl.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1MappingBuilderImpl.java index d22c996..87ab8dc 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1MappingBuilderImpl.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/compatibility/v1/V1MappingBuilderImpl.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingBuilder; import net.fabricmc.mappingio.MappedElementKind; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/BaseModRemapperContext.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/BaseModRemapperContext.java similarity index 79% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/BaseModRemapperContext.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/BaseModRemapperContext.java index dbb5854..b6d7150 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/BaseModRemapperContext.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/BaseModRemapperContext.java @@ -1,8 +1,11 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; + +import org.jetbrains.annotations.ApiStatus; import java.util.HashMap; import java.util.Map; +@ApiStatus.Internal public abstract class BaseModRemapperContext implements ModRemapperContext { private static final Map REGISTRY = new HashMap<>(); diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/InternalCacheHandler.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/InternalCacheHandler.java similarity index 82% rename from src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/InternalCacheHandler.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/InternalCacheHandler.java index 7fe0e5a..107569d 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/InternalCacheHandler.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/InternalCacheHandler.java @@ -1,9 +1,11 @@ -package io.github.fabriccompatibilitylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.CacheHandler; +import org.jetbrains.annotations.ApiStatus; import java.nio.file.Path; +@ApiStatus.Internal public interface InternalCacheHandler extends CacheHandler { Path resolveMappings(String name); Path resolveRoot(String name); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/LibraryHandler.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/LibraryHandler.java similarity index 93% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/LibraryHandler.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/LibraryHandler.java index 0644188..97643ae 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/LibraryHandler.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/LibraryHandler.java @@ -1,10 +1,11 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import fr.catcore.modremapperapi.utils.Constants; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.CacheHandler; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.RemapLibrary; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils; import net.fabricmc.tinyremapper.TinyRemapper; +import org.jetbrains.annotations.ApiStatus; import java.io.IOException; import java.net.URISyntaxException; @@ -13,6 +14,7 @@ import java.util.*; import java.util.stream.Collectors; +@ApiStatus.Internal public class LibraryHandler { private Map remapLibraries = new HashMap<>(); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MappingsRegistryInstance.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/MappingsRegistryInstance.java similarity index 93% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MappingsRegistryInstance.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/MappingsRegistryInstance.java index b56dcb7..21d63ee 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MappingsRegistryInstance.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/MappingsRegistryInstance.java @@ -1,25 +1,26 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import fr.catcore.wfvaio.WhichFabricVariantAmIOn; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.InternalCacheHandler; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingBuilder; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1.V1MappingBuilderImpl; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.VersionHelper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1.V1MappingBuilderImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingTreeHelper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.VersionHelper; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.mappingio.MappingVisitor; import net.fabricmc.mappingio.adapter.MappingNsRenamer; import net.fabricmc.mappingio.adapter.MappingSourceNsSwitch; import net.fabricmc.mappingio.tree.MappingTree; import net.fabricmc.mappingio.tree.MemoryMappingTree; +import org.jetbrains.annotations.ApiStatus; import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; import java.util.*; +@ApiStatus.Internal public class MappingsRegistryInstance extends MappingsRegistry { public List vanillaClassNames = new ArrayList<>(); private MemoryMappingTree formatted = new MemoryMappingTree(); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MixinData.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/MixinData.java similarity index 83% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MixinData.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/MixinData.java index a95e460..4d836c7 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/MixinData.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/MixinData.java @@ -1,12 +1,14 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import net.fabricmc.tinyremapper.InputTag; +import org.jetbrains.annotations.ApiStatus; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +@ApiStatus.Internal public class MixinData { private final Map> mixin2TargetMap = new HashMap<>(); private final Map> mixinRefmapData = new HashMap<>(); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2ModDiscoverer.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModDiscoverer.java similarity index 93% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2ModDiscoverer.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModDiscoverer.java index 4850de5..ad9c161 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2ModDiscoverer.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModDiscoverer.java @@ -1,11 +1,11 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModDiscovererConfig; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.InternalCacheHandler; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils; import net.fabricmc.loader.api.FabricLoader; +import org.jetbrains.annotations.ApiStatus; import java.io.IOException; import java.net.URISyntaxException; @@ -18,11 +18,12 @@ import java.util.regex.Matcher; import java.util.stream.Collectors; -public class V2ModDiscoverer { +@ApiStatus.Internal +public class ModDiscoverer { private final ModDiscovererConfig config; private Path originalDirectory; - public V2ModDiscoverer(ModDiscovererConfig config) { + public ModDiscoverer(ModDiscovererConfig config) { this.config = config; } diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperContext.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModRemapperContext.java similarity index 78% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperContext.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModRemapperContext.java index 6608a9b..dfd7032 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/ModRemapperContext.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModRemapperContext.java @@ -1,17 +1,18 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.CacheHandler; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.LibraryHandler; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.RemappingFlags; import net.fabricmc.tinyremapper.TinyRemapper; +import org.jetbrains.annotations.ApiStatus; import java.nio.file.Path; import java.util.List; import java.util.Map; import java.util.Set; +@ApiStatus.Internal public interface ModRemapperContext { void init(); void remapMods(Map pathMap); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/ModRemmaperV2Context.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModRemmaperV2Context.java similarity index 85% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/ModRemmaperV2Context.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModRemmaperV2Context.java index 08e38d1..1cdc6c5 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/ModRemmaperV2Context.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/ModRemmaperV2Context.java @@ -1,20 +1,16 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import fr.catcore.modremapperapi.utils.Constants; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.*; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.InternalCacheHandler; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.LibraryHandler; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.VisitorInfosImpl; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.BaseModRemapperContext; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.MappingsRegistryInstance; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.MixinData; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.ModTrRemapper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.SoftLockFixer; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.CacheUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.VisitorInfosImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.ModTrRemapper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.SoftLockFixer; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.CacheUtils; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.tinyremapper.TinyRemapper; +import org.jetbrains.annotations.ApiStatus; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -23,6 +19,7 @@ import java.util.*; import java.util.stream.Collectors; +@ApiStatus.Internal public class ModRemmaperV2Context extends BaseModRemapperContext { private final List remappers; private final Set remapFlags = new HashSet<>(); @@ -99,11 +96,11 @@ public void afterRemap() { public List discoverMods(boolean remapClassEdits) { List collected = new ArrayList<>(); List candidates = new ArrayList<>(); - Map config2Discoverer = new HashMap<>(); + Map config2Discoverer = new HashMap<>(); for (ModRemapper remapper : remappers) { for (ModDiscovererConfig config : remapper.getModDiscoverers()) { - V2ModDiscoverer discoverer = new V2ModDiscoverer(config); + ModDiscoverer discoverer = new ModDiscoverer(config); config2Discoverer.put(config, discoverer); candidates.addAll(discoverer.collect()); } diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2CacheHandler.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/V2CacheHandler.java similarity index 91% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2CacheHandler.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/V2CacheHandler.java index d3278f9..181963f 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2CacheHandler.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/V2CacheHandler.java @@ -1,11 +1,12 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; -import io.github.fabriccompatibilitylayers.modremappingapi.impl.InternalCacheHandler; +import org.jetbrains.annotations.ApiStatus; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +@ApiStatus.Internal public class V2CacheHandler implements InternalCacheHandler { private final Path contextDirectory; private final Path tempDirectory, cacheDirectory, mappingsDirectory, librariesDirectory; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2MappingBuilderImpl.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/V2MappingBuilderImpl.java similarity index 97% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2MappingBuilderImpl.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/V2MappingBuilderImpl.java index 171a886..a79b397 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v2/V2MappingBuilderImpl.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/V2MappingBuilderImpl.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v2; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.context; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.MappingBuilder; import net.fabricmc.mappingio.MappedElementKind; diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultMappingsConfig.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultMappingsConfig.java similarity index 90% rename from src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultMappingsConfig.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultMappingsConfig.java index 97f59ce..3bca0ff 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultMappingsConfig.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultMappingsConfig.java @@ -1,12 +1,14 @@ -package io.github.fabriccompatibilitylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.MappingsConfig; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; +@ApiStatus.Internal public class DefaultMappingsConfig implements MappingsConfig { @Override public String getSourceNamespace() { diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultModCandidate.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultModCandidate.java similarity index 96% rename from src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultModCandidate.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultModCandidate.java index 3256828..e7dfab5 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultModCandidate.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultModCandidate.java @@ -1,11 +1,13 @@ -package io.github.fabriccompatibilitylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModDiscovererConfig; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.nio.file.Path; +@ApiStatus.Internal public class DefaultModCandidate implements ModCandidate { private String sanitizedFileName, id; private Path path; diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultRemapLibrary.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultRemapLibrary.java similarity index 94% rename from src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultRemapLibrary.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultRemapLibrary.java index 55a2e4c..0e3dff8 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/DefaultRemapLibrary.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/DefaultRemapLibrary.java @@ -1,13 +1,14 @@ -package io.github.fabriccompatibilitylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.RemapLibrary; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.nio.file.Path; -import java.util.ArrayList; import java.util.Collections; import java.util.List; +@ApiStatus.Internal public class DefaultRemapLibrary implements RemapLibrary { private final @Nullable String url; private final @Nullable Path path; diff --git a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModDiscovererConfigImpl.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/ModDiscovererConfigImpl.java similarity index 99% rename from src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModDiscovererConfigImpl.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/ModDiscovererConfigImpl.java index c111fe1..488f935 100644 --- a/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModDiscovererConfigImpl.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/defaults/ModDiscovererConfigImpl.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibilitylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.defaults; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModDiscovererConfig; @@ -8,7 +8,6 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import java.util.function.BiFunction; import java.util.function.Predicate; import java.util.regex.Pattern; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingTreeHelper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingTreeHelper.java similarity index 97% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingTreeHelper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingTreeHelper.java index b28caac..b9b8164 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingTreeHelper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingTreeHelper.java @@ -1,6 +1,6 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingAPIImpl; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.impl.util.log.Log; import net.fabricmc.loader.impl.util.log.LogCategory; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingsRegistry.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingsRegistry.java similarity index 99% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingsRegistry.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingsRegistry.java index 3c83517..05acf34 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/mappings/MappingsRegistry.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingsRegistry.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings; import fr.catcore.modremapperapi.utils.Constants; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingUtils; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/MappingsUtilsImpl.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingsUtilsImpl.java similarity index 96% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/MappingsUtilsImpl.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingsUtilsImpl.java index 0b51bc8..2534403 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/MappingsUtilsImpl.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/mappings/MappingsUtilsImpl.java @@ -1,9 +1,9 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings; import io.github.fabriccompatibiltylayers.modremappingapi.api.MappingUtils; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.BaseModRemapperContext; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.v1.ModRemapperV1Context; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.context.BaseModRemapperContext; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1.ModRemapperV1Context; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingAPIImpl; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.mappingio.tree.*; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/ModTrRemapper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/ModTrRemapper.java similarity index 89% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/ModTrRemapper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/ModTrRemapper.java index c5d2687..15eb83e 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/ModTrRemapper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/ModTrRemapper.java @@ -1,17 +1,17 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper; import com.google.gson.Gson; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.ModCandidate; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.RemappingFlags; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.context.ModRemapperContext; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm.mixin.RefmapBaseMixinExtension; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.minecraft.MinecraftRemapper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource.RefmapJson; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource.RefmapRemapper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor.MixinPostApplyVisitorProvider; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.context.ModRemapperContext; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingTreeHelper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm.mixin.RefmapBaseMixinExtension; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.minecraft.MinecraftRemapper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.resource.RefmapJson; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.resource.RefmapRemapper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor.MixinPostApplyVisitorProvider; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils; import net.fabricmc.accesswidener.AccessWidenerReader; import net.fabricmc.accesswidener.AccessWidenerRemapper; import net.fabricmc.accesswidener.AccessWidenerWriter; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/SoftLockFixer.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/SoftLockFixer.java similarity index 92% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/SoftLockFixer.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/SoftLockFixer.java index 30d7093..6c02d55 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/SoftLockFixer.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/SoftLockFixer.java @@ -1,8 +1,10 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper; import fr.catcore.modremapperapi.utils.Constants; import net.fabricmc.loader.api.FabricLoader; +import org.jetbrains.annotations.ApiStatus; +@ApiStatus.Internal public class SoftLockFixer { public static void preloadClasses() { for (String clazz : new String[]{ @@ -68,17 +70,17 @@ public static void preloadClasses() { "fr.catcore.modremapperapi.remapping.VisitorInfos$MethodNamed", "fr.catcore.modremapperapi.remapping.VisitorInfos$MethodValue", "fr.catcore.modremapperapi.remapping.VisitorInfos$Type", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource.RefmapJson", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor.MixinPostApplyVisitorProvider", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm.MRAClassVisitor", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm.MRAMethodVisitor", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm.mixin.RefmapBaseMixinExtension", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource.RefmapRemapper", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.ModTrRemapper", - "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.TrRemapperHelper", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.resource.RefmapJson", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor.MixinPostApplyVisitorProvider", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm.MRAClassVisitor", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm.MRAMethodVisitor", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm.mixin.RefmapBaseMixinExtension", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor.MRAApplyVisitor", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.resource.RefmapRemapper", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingTreeHelper", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.ModTrRemapper", + "io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.TrRemapperHelper", "net.fabricmc.loader.impl.launch.FabricLauncher", "net.fabricmc.loader.impl.launch.FabricLauncherBase", diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/TrRemapperHelper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/TrRemapperHelper.java similarity index 94% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/TrRemapperHelper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/TrRemapperHelper.java index a60acf8..4148cfd 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/TrRemapperHelper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/TrRemapperHelper.java @@ -1,9 +1,9 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper; import fr.catcore.modremapperapi.utils.Constants; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.RemappingFlags; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingAPIImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils; import net.fabricmc.tinyremapper.InputTag; import net.fabricmc.tinyremapper.OutputConsumerPath; import net.fabricmc.tinyremapper.TinyRemapper; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/VisitorInfosImpl.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/VisitorInfosImpl.java similarity index 98% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/VisitorInfosImpl.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/VisitorInfosImpl.java index 48253bd..ed24453 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/VisitorInfosImpl.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/VisitorInfosImpl.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.VisitorInfos; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/MRAClassVisitor.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/MRAClassVisitor.java similarity index 86% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/MRAClassVisitor.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/MRAClassVisitor.java index d955387..88809d7 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/MRAClassVisitor.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/MRAClassVisitor.java @@ -1,8 +1,10 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.VisitorInfosImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.VisitorInfosImpl; +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.*; +@ApiStatus.Internal public class MRAClassVisitor extends ClassVisitor { private final VisitorInfosImpl infos; private final String className; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/MRAMethodVisitor.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/MRAMethodVisitor.java similarity index 95% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/MRAMethodVisitor.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/MRAMethodVisitor.java index f2fcde9..861a9c2 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/MRAMethodVisitor.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/MRAMethodVisitor.java @@ -1,12 +1,14 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.VisitorInfos; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.VisitorInfosImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.VisitorInfosImpl; +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import java.util.Map; +@ApiStatus.Internal public class MRAMethodVisitor extends MethodVisitor implements Opcodes { private final VisitorInfosImpl infos; private final String className; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/mixin/RefmapBaseMixinExtension.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/mixin/RefmapBaseMixinExtension.java similarity index 95% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/mixin/RefmapBaseMixinExtension.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/mixin/RefmapBaseMixinExtension.java index ddcffe4..d03292c 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/asm/mixin/RefmapBaseMixinExtension.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/asm/mixin/RefmapBaseMixinExtension.java @@ -1,10 +1,11 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm.mixin; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm.mixin; import net.fabricmc.tinyremapper.InputTag; import net.fabricmc.tinyremapper.TinyRemapper; import net.fabricmc.tinyremapper.api.TrEnvironment; import net.fabricmc.tinyremapper.extension.mixin.common.data.CommonData; import net.fabricmc.tinyremapper.extension.mixin.hard.ImprovedHardTargetMixinClassVisitor; +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.ClassVisitor; import java.util.Collection; @@ -15,6 +16,7 @@ import java.util.function.Consumer; import java.util.function.Predicate; +@ApiStatus.Internal public class RefmapBaseMixinExtension implements TinyRemapper.Extension { private final Map>> tasks; private final Predicate inputTagFilter; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/RemapUtils.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/ClasspathUtils.java similarity index 92% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/RemapUtils.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/ClasspathUtils.java index cbf652f..b28de33 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/RemapUtils.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/ClasspathUtils.java @@ -1,8 +1,9 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.minecraft; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ObjectShare; import net.fabricmc.loader.impl.launch.FabricLauncherBase; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -16,7 +17,8 @@ import java.util.List; import java.util.stream.Collectors; -public class RemapUtils { +@ApiStatus.Internal +public class ClasspathUtils { public static List getRemapClasspath() throws IOException { String remapClasspathFile = System.getProperty("fabric.remapClasspathFile"); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java similarity index 83% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java index f51dbab..ffd6f89 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/MinecraftRemapper.java @@ -1,12 +1,11 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.minecraft; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.minecraft; import fr.catcore.modremapperapi.utils.Constants; import io.github.fabriccompatibilitylayers.modremappingapi.api.v2.CacheHandler; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.RemapUtils; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingTreeHelper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.mappings.MappingsRegistry; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.TrRemapperHelper; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.utils.FileUtils; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingTreeHelper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.TrRemapperHelper; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.FileUtils; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.tinyremapper.NonClassCopyMode; import net.fabricmc.tinyremapper.OutputConsumerPath; @@ -74,7 +73,7 @@ public static void addMinecraftJar(TinyRemapper remapper, MappingsRegistry mappi if (FabricLoader.getInstance().isDevelopmentEnvironment()) { try { classPath = getMinecraftJar( - getMinecraftJar(RemapUtils.getRemapClasspath(), mappingsRegistry.getTargetNamespace(), "intermediary", mappingsRegistry, cacheHandler), + getMinecraftJar(ClasspathUtils.getRemapClasspath(), mappingsRegistry.getTargetNamespace(), "intermediary", mappingsRegistry, cacheHandler), "intermediary", "official", mappingsRegistry, @@ -88,7 +87,7 @@ public static void addMinecraftJar(TinyRemapper remapper, MappingsRegistry mappi throw new RuntimeException("Failed to populate default remap classpath", e); } } else { - classPath = RemapUtils.getClassPathFromObjectShare(); + classPath = ClasspathUtils.getClassPathFromObjectShare(); if (!mappingsRegistry.isSourceNamespaceObf()) { classPath = getMinecraftJar(classPath, "official", mappingsRegistry.getSourceNamespace(), mappingsRegistry, cacheHandler); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapJson.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/resource/RefmapJson.java similarity index 97% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapJson.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/resource/RefmapJson.java index c004b4b..5d8d4dd 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapJson.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/resource/RefmapJson.java @@ -1,15 +1,17 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.resource; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingAPIImpl; import net.fabricmc.mappingio.tree.MappingTree; import net.fabricmc.tinyremapper.TinyRemapper; import net.fabricmc.tinyremapper.api.TrRemapper; +import org.jetbrains.annotations.ApiStatus; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +@ApiStatus.Internal public class RefmapJson { public final Map> mappings = new HashMap<>(); public final Map>> data = new HashMap<>(); diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java similarity index 90% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java index e227f02..a59aa85 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/resource/RefmapRemapper.java @@ -1,14 +1,16 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.resource; import com.google.gson.Gson; import net.fabricmc.tinyremapper.OutputConsumerPath; import net.fabricmc.tinyremapper.TinyRemapper; +import org.jetbrains.annotations.ApiStatus; import java.io.*; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +@ApiStatus.Internal public class RefmapRemapper implements OutputConsumerPath.ResourceRemapper { private Gson GSON; @Override diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java similarity index 62% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java index 9acc000..c73953a 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/visitor/MRAApplyVisitor.java @@ -1,11 +1,13 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.VisitorInfosImpl; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.asm.MRAClassVisitor; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.VisitorInfosImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.asm.MRAClassVisitor; import net.fabricmc.tinyremapper.TinyRemapper; import net.fabricmc.tinyremapper.api.TrClass; +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.ClassVisitor; +@ApiStatus.Internal public class MRAApplyVisitor implements TinyRemapper.ApplyVisitorProvider { private final VisitorInfosImpl infos; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java similarity index 91% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java index 47461bc..29ef0f7 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/visitor/MixinPostApplyVisitorProvider.java @@ -1,9 +1,10 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.visitor; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.visitor; import fr.catcore.modremapperapi.utils.Constants; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingAPIImpl; import net.fabricmc.tinyremapper.TinyRemapper; import net.fabricmc.tinyremapper.api.TrClass; +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Type; @@ -14,6 +15,7 @@ import java.util.HashMap; import java.util.List; +@ApiStatus.Internal public class MixinPostApplyVisitorProvider implements TinyRemapper.ApplyVisitorProvider { public MixinPostApplyVisitorProvider() {} diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/CacheUtils.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/CacheUtils.java similarity index 91% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/CacheUtils.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/CacheUtils.java index 082a9eb..8edce72 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/CacheUtils.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/CacheUtils.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.utils; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.utils; import net.fabricmc.loader.api.FabricLoader; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/FileUtils.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/FileUtils.java similarity index 99% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/FileUtils.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/FileUtils.java index 57aea2c..7b5847a 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/FileUtils.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/FileUtils.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.utils; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.utils; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/TransformerRegistry.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/TransformerRegistry.java similarity index 97% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/TransformerRegistry.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/TransformerRegistry.java index cd4b458..0c267b2 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/TransformerRegistry.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/TransformerRegistry.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.utils; import com.google.common.collect.ImmutableSet; import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ClassTransformer; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/VersionHelper.java b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/VersionHelper.java similarity index 92% rename from src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/VersionHelper.java rename to src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/VersionHelper.java index 9017f89..7817f51 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/VersionHelper.java +++ b/src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/VersionHelper.java @@ -1,4 +1,4 @@ -package io.github.fabriccompatibiltylayers.modremappingapi.impl.utils; +package io.github.fabriccompatibilitylayers.modremappingapi.impl.utils; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.Version; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/MappingUtils.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/MappingUtils.java index 3423cd3..70bd31d 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/MappingUtils.java +++ b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/MappingUtils.java @@ -1,6 +1,6 @@ package io.github.fabriccompatibiltylayers.modremappingapi.api; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsUtilsImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/ClassTransformer.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/ClassTransformer.java index c1bc5af..f25a551 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/ClassTransformer.java +++ b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/ClassTransformer.java @@ -1,6 +1,6 @@ package io.github.fabriccompatibiltylayers.modremappingapi.api.v1; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.TransformerRegistry; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.TransformerRegistry; // Original author is gudenau. public interface ClassTransformer { diff --git a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/MappingUtils.java b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/MappingUtils.java index c7a3774..ee03e09 100644 --- a/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/MappingUtils.java +++ b/src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/api/v1/MappingUtils.java @@ -1,6 +1,6 @@ package io.github.fabriccompatibiltylayers.modremappingapi.api.v1; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.MappingsUtilsImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.mappings.MappingsUtilsImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/ImprovedMixinAnnotationVisitor.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/ImprovedMixinAnnotationVisitor.java index 2ea4306..cce8303 100644 --- a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/ImprovedMixinAnnotationVisitor.java +++ b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/ImprovedMixinAnnotationVisitor.java @@ -1,6 +1,6 @@ package net.fabricmc.tinyremapper.extension.mixin.hard; -import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl; +import io.github.fabriccompatibilitylayers.modremappingapi.impl.ModRemappingAPIImpl; import net.fabricmc.tinyremapper.extension.mixin.common.data.AnnotationElement; import net.fabricmc.tinyremapper.extension.mixin.common.data.Constant; import net.fabricmc.tinyremapper.extension.mixin.common.data.MxClass; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cbc799b..3f821ff 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,10 +23,10 @@ "environment": "*", "entrypoints": { "mod-remapper-api:modremapper_v1": [ - "io.github.fabriccompatibiltylayers.modremappingapi.impl.compatibility.V1DefaultModRemapper" + "io.github.fabriccompatibilitylayers.modremappingapi.impl.compatibility.v1.V1DefaultModRemapper" ], "spasm:raw_transformer": [ - "io.github.fabriccompatibiltylayers.modremappingapi.impl.TransformerRegistry" + "io.github.fabriccompatibilitylayers.modremappingapi.impl.utils.TransformerRegistry" ] }, "depends": { diff --git a/src/main/resources/mixins.mod-remapping-api.json b/src/main/resources/mixins.mod-remapping-api.json index e989ef2..75e38cd 100644 --- a/src/main/resources/mixins.mod-remapping-api.json +++ b/src/main/resources/mixins.mod-remapping-api.json @@ -1,4 +1,4 @@ { "minVersion": "0.8", - "plugin": "io.github.fabriccompatibiltylayers.modremappingapi.impl.RemapperPlugin" + "plugin": "io.github.fabriccompatibilitylayers.modremappingapi.impl.RemapperPlugin" } \ No newline at end of file From 42e7ebda00b9ef9122aeef3fc5dae2ee1f53126b Mon Sep 17 00:00:00 2001 From: Cat Core Date: Thu, 10 Apr 2025 19:49:31 +0200 Subject: [PATCH 3/4] Drop loader 0.14.x support --- build.gradle | 1 - gradle.properties | 3 +-- src/main/resources/fabric.mod.json | 5 ++--- src/test/resources/fabric.mod.json | 5 ++--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 97b5718..7d90b95 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,6 @@ dependencies { transitive = false } - implementation(include("io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}")) implementation(include("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0")) implementation(include("com.github.thecatcore:WFVAIO:1.2.1")) diff --git a/gradle.properties b/gradle.properties index d2005f4..5637582 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties minecraft_version = 1.6.4 yarn_build = 458 - loader_version = 0.16.11 + loader_version = 0.15.11 fabric_version = 1.9.1+1.12.2 - mixin_extras_version=0.2.1 spasm_version=0.2 # Mod Properties diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3f821ff..4d8d4aa 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,9 +30,8 @@ ] }, "depends": { - "fabricloader": ">0.14.23", - "spasm": ">=0.2.0", - "com_github_llamalad7_mixinextras": ">=0.2.0" + "fabricloader": ">0.15.5", + "spasm": ">=0.2.0" }, "mixins": [ "mixins.mod-remapping-api.json" diff --git a/src/test/resources/fabric.mod.json b/src/test/resources/fabric.mod.json index bd8e7f1..40fbc12 100644 --- a/src/test/resources/fabric.mod.json +++ b/src/test/resources/fabric.mod.json @@ -27,9 +27,8 @@ ] }, "depends": { - "fabricloader": ">0.14.23", - "spasm": ">=0.2.0", - "com_github_llamalad7_mixinextras": ">=0.2.0" + "fabricloader": ">0.15.5", + "spasm": ">=0.2.0" }, "mixins": [ ] From 8a4b902435dea89fd34236903c9b9ecfc0db28d7 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Thu, 10 Apr 2025 19:49:41 +0200 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 40188c5..d6cb799 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,14 @@ Provides hooks to expand the remapping process from other mods such as: This mod jar-in-jars: - [CursedMixinExtensions](https://github.com/FabricCompatibilityLayers/CursedMixinExtensions) 1.0.0 -- [WFVAIO (What Fabric Variant Am I On)](https://github.com/thecatcore/WFVAIO) 1.1.0 +- [WFVAIO (What Fabric Variant Am I On)](https://github.com/thecatcore/WFVAIO) 1.2.1 - [Legacy Fabric Logger API](https://github.com/Legacy-Fabric/fabric/tree/main/legacy-fabric-logger-api-v1) 1.0.4 - [SpASM](https://github.com/mineLdiver/SpASM) 0.2 -- [MixinExtras](https://github.com/LlamaLad7/MixinExtras) 0.2.1 for Fabric Loader 0.14 compatibility purpose only. This mod shadows and relocates for internal usage: - [mapping-io](https://github.com/FabricMC/mapping-io) 0.7.1 - [tiny-remapper](https://github.com/FabricMC/tiny-remapper) 0.11.0 +- [access-widener](https://github.com/FabricMC/access-widener) 2.1.0 - [gson](https://github.com/google/gson) 2.2.4 This mod doesn't depend on a specific Minecraft version and should work on any version that Fabric Loader can launch.