repackage all mixins in preparation to merge mixin configs and refmaps

Nolij · Apr 26, 2024 · 16c6a46 · 16c6a46
1 parent f03bd11
commit 16c6a46
Show file tree

Hide file tree

Showing 33 changed files with 55 additions and 55 deletions.
diff --git a/api/src/main/java/dev/nolij/zume/impl/ZumeMixinPlugin.java b/api/src/main/java/dev/nolij/zume/impl/ZumeMixinPlugin.java
@@ -58,7 +58,7 @@ else if (major > 25)
 		}
 
 		if (ZUME_VARIANT != null)
-			implementationMixinPackage = "dev.nolij.zume." + ZUME_VARIANT + ".mixin.";
+			implementationMixinPackage = "dev.nolij.zume.mixin." + ZUME_VARIANT + ".";
 		else
 			implementationMixinPackage = null;
 	}

diff --git a/archaic/src/main/java/dev/nolij/zume/archaic/ArchaicZume.java b/archaic/src/main/java/dev/nolij/zume/archaic/ArchaicZume.java
@@ -7,7 +7,7 @@
 import dev.nolij.zume.api.platform.v0.IZumeImplementation;
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import dev.nolij.zume.api.config.v0.ZumeConfigAPI;
-import dev.nolij.zume.archaic.mixin.EntityRendererAccessor;
+import dev.nolij.zume.mixin.archaic.EntityRendererAccessor;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;

diff --git a/...archaic/mixin/EntityRendererAccessor.java → ...mixin/archaic/EntityRendererAccessor.java b/...archaic/mixin/EntityRendererAccessor.java → ...mixin/archaic/EntityRendererAccessor.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.archaic.mixin;
+package dev.nolij.zume.mixin.archaic;
 
 import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.util.MouseFilter;

diff --git a/...me/archaic/mixin/EntityRendererMixin.java → ...me/mixin/archaic/EntityRendererMixin.java b/...me/archaic/mixin/EntityRendererMixin.java → ...me/mixin/archaic/EntityRendererMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.archaic.mixin;
+package dev.nolij.zume.mixin.archaic;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;

diff --git a/archaic/src/main/resources/zume-archaic.mixins.json b/archaic/src/main/resources/zume-archaic.mixins.json
@@ -1,14 +1,14 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.archaic.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"EntityRendererAccessor",
-		"EntityRendererMixin"
+		"archaic.EntityRendererAccessor",
+		"archaic.EntityRendererMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/legacy/src/main/java/dev/nolij/zume/legacy/LegacyZume.java b/legacy/src/main/java/dev/nolij/zume/legacy/LegacyZume.java
@@ -4,7 +4,7 @@
 import dev.nolij.zume.api.platform.v0.IZumeImplementation;
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import dev.nolij.zume.api.config.v0.ZumeConfigAPI;
-import dev.nolij.zume.legacy.mixin.GameRendererAccessor;
+import dev.nolij.zume.mixin.legacy.GameRendererAccessor;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;

diff --git a/...j/zume/legacy/mixin/GameOptionsMixin.java → ...j/zume/mixin/legacy/GameOptionsMixin.java b/...j/zume/legacy/mixin/GameOptionsMixin.java → ...j/zume/mixin/legacy/GameOptionsMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.legacy.mixin;
+package dev.nolij.zume.mixin.legacy;
 
 import dev.nolij.zume.api.config.v0.ZumeConfigAPI;
 import dev.nolij.zume.legacy.ZumeKeyBind;

diff --git a/...me/legacy/mixin/GameRendererAccessor.java → ...me/mixin/legacy/GameRendererAccessor.java b/...me/legacy/mixin/GameRendererAccessor.java → ...me/mixin/legacy/GameRendererAccessor.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.legacy.mixin;
+package dev.nolij.zume.mixin.legacy;
 
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.SmoothUtil;

diff --git a/.../zume/legacy/mixin/GameRendererMixin.java → .../zume/mixin/legacy/GameRendererMixin.java b/.../zume/legacy/mixin/GameRendererMixin.java → .../zume/mixin/legacy/GameRendererMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.legacy.mixin;
+package dev.nolij.zume.mixin.legacy;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;

diff --git a/...ij/zume/legacy/mixin/KeyBindingMixin.java → ...ij/zume/mixin/legacy/KeyBindingMixin.java b/...ij/zume/legacy/mixin/KeyBindingMixin.java → ...ij/zume/mixin/legacy/KeyBindingMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.legacy.mixin;
+package dev.nolij.zume.mixin.legacy;
 
 import dev.nolij.zume.api.config.v0.ZumeConfigAPI;
 import net.minecraft.client.option.KeyBinding;

diff --git a/...me/legacy/mixin/MinecraftClientMixin.java → ...me/mixin/legacy/MinecraftClientMixin.java b/...me/legacy/mixin/MinecraftClientMixin.java → ...me/mixin/legacy/MinecraftClientMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.legacy.mixin;
+package dev.nolij.zume.mixin.legacy;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import dev.nolij.zume.api.platform.v0.ZumeAPI;

diff --git a/legacy/src/main/resources/zume-legacy.mixins.json b/legacy/src/main/resources/zume-legacy.mixins.json
@@ -1,17 +1,17 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.legacy.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"MinecraftClientMixin",
-		"GameOptionsMixin",
-		"GameRendererAccessor",
-		"GameRendererMixin",
-		"KeyBindingMixin"
+		"legacy.MinecraftClientMixin",
+		"legacy.GameOptionsMixin",
+		"legacy.GameRendererAccessor",
+		"legacy.GameRendererMixin",
+		"legacy.KeyBindingMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/...olij/zume/lexforge/mixin/CameraMixin.java → ...olij/zume/mixin/lexforge/CameraMixin.java b/...olij/zume/lexforge/mixin/CameraMixin.java → ...olij/zume/mixin/lexforge/CameraMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.lexforge.mixin;
+package dev.nolij.zume.mixin.lexforge;
 
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import net.minecraft.client.Camera;

diff --git a/...ume/lexforge/mixin/MouseHandlerMixin.java → ...ume/mixin/lexforge/MouseHandlerMixin.java b/...ume/lexforge/mixin/MouseHandlerMixin.java → ...ume/mixin/lexforge/MouseHandlerMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.lexforge.mixin;
+package dev.nolij.zume.mixin.lexforge;
 
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import net.minecraft.client.MouseHandler;

diff --git a/lexforge/src/main/resources/zume-lexforge.mixins.json b/lexforge/src/main/resources/zume-lexforge.mixins.json
@@ -1,14 +1,14 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.lexforge.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"CameraMixin",
-		"MouseHandlerMixin"
+		"lexforge.CameraMixin",
+		"lexforge.MouseHandlerMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/...ij/zume/lexforge18/mixin/CameraMixin.java → ...ij/zume/mixin/lexforge16/CameraMixin.java b/...ij/zume/lexforge18/mixin/CameraMixin.java → ...ij/zume/mixin/lexforge16/CameraMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.lexforge18.mixin;
+package dev.nolij.zume.mixin.lexforge16;
 
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import net.minecraft.client.Camera;

diff --git a/...e/lexforge16/mixin/MouseHandlerMixin.java → ...e/mixin/lexforge16/MouseHandlerMixin.java b/...e/lexforge16/mixin/MouseHandlerMixin.java → ...e/mixin/lexforge16/MouseHandlerMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.lexforge16.mixin;
+package dev.nolij.zume.mixin.lexforge16;
 
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import net.minecraft.client.MouseHandler;

diff --git a/lexforge16/src/main/resources/zume-lexforge16.mixins.json b/lexforge16/src/main/resources/zume-lexforge16.mixins.json
@@ -1,14 +1,14 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.lexforge16.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"CameraMixin",
-		"MouseHandlerMixin"
+		"lexforge16.CameraMixin",
+		"lexforge16.MouseHandlerMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/...ij/zume/lexforge16/mixin/CameraMixin.java → ...ij/zume/mixin/lexforge18/CameraMixin.java b/...ij/zume/lexforge16/mixin/CameraMixin.java → ...ij/zume/mixin/lexforge18/CameraMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.lexforge16.mixin;
+package dev.nolij.zume.mixin.lexforge18;
 
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import net.minecraft.client.Camera;

diff --git a/...e/lexforge18/mixin/MouseHandlerMixin.java → ...e/mixin/lexforge18/MouseHandlerMixin.java b/...e/lexforge18/mixin/MouseHandlerMixin.java → ...e/mixin/lexforge18/MouseHandlerMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.lexforge18.mixin;
+package dev.nolij.zume.mixin.lexforge18;
 
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import net.minecraft.client.MouseHandler;

diff --git a/lexforge18/src/main/resources/zume-lexforge18.mixins.json b/lexforge18/src/main/resources/zume-lexforge18.mixins.json
@@ -1,14 +1,14 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.lexforge18.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"CameraMixin",
-		"MouseHandlerMixin"
+		"lexforge18.CameraMixin",
+		"lexforge18.MouseHandlerMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/.../nolij/zume/modern/mixin/CameraMixin.java → .../nolij/zume/mixin/modern/CameraMixin.java b/.../nolij/zume/modern/mixin/CameraMixin.java → .../nolij/zume/mixin/modern/CameraMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.modern.mixin;
+package dev.nolij.zume.mixin.modern;
 
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import net.minecraft.client.render.Camera;

diff --git a/.../zume/modern/mixin/GameRendererMixin.java → .../zume/mixin/modern/GameRendererMixin.java b/.../zume/modern/mixin/GameRendererMixin.java → .../zume/mixin/modern/GameRendererMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.modern.mixin;
+package dev.nolij.zume.mixin.modern;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import dev.nolij.zume.api.platform.v0.ZumeAPI;

diff --git a/...v/nolij/zume/modern/mixin/MouseMixin.java → ...v/nolij/zume/mixin/modern/MouseMixin.java b/...v/nolij/zume/modern/mixin/MouseMixin.java → ...v/nolij/zume/mixin/modern/MouseMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.modern.mixin;
+package dev.nolij.zume.mixin.modern;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;

diff --git a/modern/src/main/resources/zume-modern.mixins.json b/modern/src/main/resources/zume-modern.mixins.json
@@ -1,15 +1,15 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.modern.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"CameraMixin",
-		"GameRendererMixin",
-		"MouseMixin"
+		"modern.CameraMixin",
+		"modern.GameRendererMixin",
+		"modern.MouseMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/...primitive/mixin/GameRendererAccessor.java → ...mixin/primitive/GameRendererAccessor.java b/...primitive/mixin/GameRendererAccessor.java → ...mixin/primitive/GameRendererAccessor.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.primitive.mixin;
+package dev.nolij.zume.mixin.primitive;
 
 import net.minecraft.class_555;
 import net.minecraft.client.util.SmoothUtil;

diff --git a/...me/primitive/mixin/GameRendererMixin.java → ...me/mixin/primitive/GameRendererMixin.java b/...me/primitive/mixin/GameRendererMixin.java → ...me/mixin/primitive/GameRendererMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.primitive.mixin;
+package dev.nolij.zume.mixin.primitive;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;

diff --git a/...me/primitive/mixin/MinecraftAccessor.java → ...me/mixin/primitive/MinecraftAccessor.java b/...me/primitive/mixin/MinecraftAccessor.java → ...me/mixin/primitive/MinecraftAccessor.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.primitive.mixin;
+package dev.nolij.zume.mixin.primitive;
 
 import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/.../zume/primitive/mixin/MinecraftMixin.java → .../zume/mixin/primitive/MinecraftMixin.java b/.../zume/primitive/mixin/MinecraftMixin.java → .../zume/mixin/primitive/MinecraftMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.primitive.mixin;
+package dev.nolij.zume.mixin.primitive;
 
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import dev.nolij.zume.api.platform.v0.ZumeAPI;

diff --git a/primitive/src/main/java/dev/nolij/zume/primitive/PrimitiveZume.java b/primitive/src/main/java/dev/nolij/zume/primitive/PrimitiveZume.java
@@ -4,8 +4,8 @@
 import dev.nolij.zume.api.platform.v0.IZumeImplementation;
 import dev.nolij.zume.api.platform.v0.ZumeAPI;
 import dev.nolij.zume.api.config.v0.ZumeConfigAPI;
-import dev.nolij.zume.primitive.mixin.GameRendererAccessor;
-import dev.nolij.zume.primitive.mixin.MinecraftAccessor;
+import dev.nolij.zume.mixin.primitive.GameRendererAccessor;
+import dev.nolij.zume.mixin.primitive.MinecraftAccessor;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;

diff --git a/primitive/src/main/resources/zume-primitive.mixins.json b/primitive/src/main/resources/zume-primitive.mixins.json
@@ -1,16 +1,16 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.primitive.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"GameRendererAccessor",
-		"GameRendererMixin",
-		"MinecraftAccessor",
-		"MinecraftMixin"
+		"primitive.GameRendererAccessor",
+		"primitive.GameRendererMixin",
+		"primitive.MinecraftAccessor",
+		"primitive.MinecraftMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1

diff --git a/...me/vintage/mixin/EntityRendererMixin.java → ...me/mixin/vintage/EntityRendererMixin.java b/...me/vintage/mixin/EntityRendererMixin.java → ...me/mixin/vintage/EntityRendererMixin.java
@@ -1,4 +1,4 @@
-package dev.nolij.zume.vintage.mixin;
+package dev.nolij.zume.mixin.vintage;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import dev.nolij.zume.api.platform.v0.ZumeAPI;

diff --git a/vintage/src/main/resources/zume-vintage.mixins.json b/vintage/src/main/resources/zume-vintage.mixins.json
@@ -1,13 +1,13 @@
 {
 	"required": true,
 	"minVersion": "0.8",
-	"package": "dev.nolij.zume.vintage.mixin",
+	"package": "dev.nolij.zume.mixin",
 	"plugin": "dev.nolij.zume.impl.ZumeMixinPlugin",
 	"compatibilityLevel": "JAVA_8",
 	"mixins": [
 	],
 	"client": [
-		"EntityRendererMixin"
+		"vintage.EntityRendererMixin"
 	],
 	"injectors": {
 		"defaultRequire": 1