Merge pull request #24 from FabricCompatibilityLayers/feature/refactoring

Relocate internals to new package

Author: thecatcore

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 {