Relocate internals to new package

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.

build.gradle

@@ -56,9 +56,8 @@ 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.0"))
+	implementation(include("com.github.thecatcore:WFVAIO:1.2.1"))
 
 	testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 }

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

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 {

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;

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;

src/main/java/fr/catcore/modremapperapi/utils/FileUtils.java

@@ -52,14 +52,14 @@ public static List<String> readTextSource(String path) {
     @Deprecated
     public static void excludeFromZipFile(File file, List<String> 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);
         }
     }
 
     @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);
     }
 }

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.*;
 

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;
 

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 {

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;

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;
 

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;

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingAPIImpl.java → src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/ModRemappingAPIImpl.java

@@ -1,19 +1,21 @@
-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;
 import java.util.List;
 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;

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModRemappingApiInit.java → 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

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/RemapperPlugin.java → src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/RemapperPlugin.java

@@ -1,12 +1,14 @@
-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;
 
 import java.util.List;
 import java.util.Set;
 
+@ApiStatus.Internal
 public class RemapperPlugin implements IMixinConfigPlugin {
 
     @Override
@@ -28,7 +30,7 @@ public void acceptTargets(Set<String> myTargets, Set<String> otherTargets){}
     @Override
     public List<String> 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);
         }

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V0ModRemapper.java → 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;

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/ModRemapperV1Context.java → 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<ModRemapper> {
     private final Set<RemappingFlags> remapFlags = new HashSet<>();
     private final List<ModRemapper> remappers = new ArrayList<>();
@@ -141,14 +139,14 @@ public List<ModRemapper> discoverMods(boolean remapClassEdits) {
         }
 
         List<ModCandidate> candidates = new ArrayList<>();
-        Map<ModDiscovererConfig, V2ModDiscoverer> config2Discoverer = new HashMap<>();
+        Map<ModDiscovererConfig, ModDiscoverer> 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());
         }

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1CacheHandler.java → 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");

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/compatibility/V1DefaultModRemapper.java → 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() {

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/v1/V1MappingBuilderImpl.java → 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;

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/context/BaseModRemapperContext.java → 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<T> implements ModRemapperContext<T> {
     private static final Map<String, ModRemapperContext> REGISTRY = new HashMap<>();
 

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/InternalCacheHandler.java → 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);

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/LibraryHandler.java → 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<RemapLibrary, Path> remapLibraries = new HashMap<>();