move mixins

brachy84 · brachy84 · commit 85f9ee3c0aea · 2025-09-28T15:23:42.000+02:00
diff --git a/src/main/java/com/cleanroommc/modularui/api/IMuiScreen.java b/src/main/java/com/cleanroommc/modularui/api/IMuiScreen.java
@@ -1,7 +1,7 @@
 package com.cleanroommc.modularui.api;
 
 import com.cleanroommc.modularui.ModularUI;
-import com.cleanroommc.modularui.core.mixin.GuiContainerAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiContainerAccessor;
 import com.cleanroommc.modularui.screen.ClientScreenHandler;
 import com.cleanroommc.modularui.screen.ModularScreen;
 import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixin/ContainerAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixin/ContainerAccessor.java
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/ContainerAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/ContainerAccessor.java
@@ -0,0 +1,13 @@
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
+
+import net.minecraft.inventory.Container;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Container.class)
+public interface ContainerAccessor {
+
+    @Accessor
+    int getDragEvent();
+}
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/FontRendererAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/FontRendererAccessor.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import net.minecraft.client.gui.FontRenderer;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiAccessor.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import net.minecraft.client.gui.Gui;
 
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiButtonMixin.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiButtonMixin.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import com.cleanroommc.modularui.overlay.OverlayStack;
 
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiContainerAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiContainerAccessor.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiContainerMixin.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiContainerMixin.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import com.cleanroommc.modularui.api.IMuiScreen;
 import com.cleanroommc.modularui.screen.IClickableGuiContainer;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiScreenAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiScreenAccessor.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiUtilsMixin.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/GuiUtilsMixin.java
@@ -1,8 +1,7 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import com.cleanroommc.modularui.ModularUIConfig;
 import com.cleanroommc.modularui.screen.RichTooltip;
-import com.cleanroommc.modularui.screen.viewport.GuiContext;
 
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/InventoryCraftingAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/InventoryCraftingAccessor.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.InventoryCrafting;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/KeyBindAccess.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/KeyBindAccess.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.client.settings.KeyBindingMap;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/MinecraftMixin.java b/src/main/java/com/cleanroommc/modularui/core/mixins/early/minecraft/MinecraftMixin.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin;
+package com.cleanroommc.modularui.core.mixins.early.minecraft;
 
 import com.cleanroommc.modularui.ModularUI;
 import com.cleanroommc.modularui.screen.ClientScreenHandler;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/GhostIngredientDragManagerAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/GhostIngredientDragManagerAccessor.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin.jei;
+package com.cleanroommc.modularui.core.mixins.late.jei;
 
 import mezz.jei.gui.ghost.GhostIngredientDrag;
 import mezz.jei.gui.ghost.GhostIngredientDragManager;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/IngredientGridMixin.java b/src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/IngredientGridMixin.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin.jei;
+package com.cleanroommc.modularui.core.mixins.late.jei;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/IngredientListOverlayAccessor.java b/src/main/java/com/cleanroommc/modularui/core/mixins/late/jei/IngredientListOverlayAccessor.java
@@ -1,4 +1,4 @@
-package com.cleanroommc.modularui.core.mixin.jei;
+package com.cleanroommc.modularui.core.mixins.late.jei;
 
 import mezz.jei.gui.ghost.GhostIngredientDragManager;
 import mezz.jei.gui.overlay.IngredientListOverlay;
diff --git a/src/main/java/com/cleanroommc/modularui/drawable/text/RichTextCompiler.java b/src/main/java/com/cleanroommc/modularui/drawable/text/RichTextCompiler.java
@@ -5,18 +5,16 @@
 import com.cleanroommc.modularui.api.drawable.IIcon;
 import com.cleanroommc.modularui.api.drawable.IKey;
 import com.cleanroommc.modularui.api.drawable.ITextLine;
-import com.cleanroommc.modularui.core.mixin.FontRendererAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.FontRendererAccessor;
 import com.cleanroommc.modularui.drawable.DelegateIcon;
 import com.cleanroommc.modularui.drawable.Icon;
 
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.util.text.TextFormatting;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/cleanroommc/modularui/integration/jei/ModularUIJeiPlugin.java b/src/main/java/com/cleanroommc/modularui/integration/jei/ModularUIJeiPlugin.java
@@ -1,7 +1,7 @@
 package com.cleanroommc.modularui.integration.jei;
 
-import com.cleanroommc.modularui.core.mixin.jei.GhostIngredientDragManagerAccessor;
-import com.cleanroommc.modularui.core.mixin.jei.IngredientListOverlayAccessor;
+import com.cleanroommc.modularui.core.mixins.late.jei.GhostIngredientDragManagerAccessor;
+import com.cleanroommc.modularui.core.mixins.late.jei.IngredientListOverlayAccessor;
 import com.cleanroommc.modularui.screen.GuiContainerWrapper;
 import com.cleanroommc.modularui.screen.GuiScreenWrapper;
 import com.cleanroommc.modularui.screen.ModularContainer;
diff --git a/src/main/java/com/cleanroommc/modularui/keybind/KeyBindHandler.java b/src/main/java/com/cleanroommc/modularui/keybind/KeyBindHandler.java
@@ -1,8 +1,7 @@
 package com.cleanroommc.modularui.keybind;
 
-import com.cleanroommc.modularui.core.mixin.KeyBindAccess;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.KeyBindAccess;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.client.settings.KeyBindingMap;
diff --git a/src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java b/src/main/java/com/cleanroommc/modularui/screen/ClientScreenHandler.java
@@ -7,9 +7,9 @@
 import com.cleanroommc.modularui.api.MCHelper;
 import com.cleanroommc.modularui.api.widget.IGuiElement;
 import com.cleanroommc.modularui.api.widget.IVanillaSlot;
-import com.cleanroommc.modularui.core.mixin.GuiAccessor;
-import com.cleanroommc.modularui.core.mixin.GuiContainerAccessor;
-import com.cleanroommc.modularui.core.mixin.GuiScreenAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiContainerAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiScreenAccessor;
 import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.drawable.Stencil;
 import com.cleanroommc.modularui.integration.jei.ModularUIJeiPlugin;
diff --git a/src/main/java/com/cleanroommc/modularui/screen/ModularContainer.java b/src/main/java/com/cleanroommc/modularui/screen/ModularContainer.java
@@ -1,7 +1,7 @@
 package com.cleanroommc.modularui.screen;
 
 import com.cleanroommc.modularui.ModularUI;
-import com.cleanroommc.modularui.core.mixin.ContainerAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.ContainerAccessor;
 import com.cleanroommc.modularui.factory.GuiData;
 import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.utils.Platform;
diff --git a/src/main/java/com/cleanroommc/modularui/screen/NEAAnimationHandler.java b/src/main/java/com/cleanroommc/modularui/screen/NEAAnimationHandler.java
@@ -1,8 +1,8 @@
 package com.cleanroommc.modularui.screen;
 
 import com.cleanroommc.modularui.ModularUI;
-import com.cleanroommc.modularui.core.mixin.GuiAccessor;
-import com.cleanroommc.modularui.core.mixin.GuiScreenAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiScreenAccessor;
 import com.cleanroommc.modularui.network.NetworkUtils;
 import com.cleanroommc.modularui.widgets.slot.ModularSlot;
 import com.cleanroommc.neverenoughanimations.NEA;
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/slot/InventoryCraftingWrapper.java b/src/main/java/com/cleanroommc/modularui/widgets/slot/InventoryCraftingWrapper.java
@@ -1,6 +1,6 @@
 package com.cleanroommc.modularui.widgets.slot;
 
-import com.cleanroommc.modularui.core.mixin.InventoryCraftingAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.InventoryCraftingAccessor;
 import com.cleanroommc.modularui.utils.Platform;
 
 import net.minecraft.client.util.RecipeItemHelper;
diff --git a/src/main/java/com/cleanroommc/modularui/widgets/slot/ItemSlot.java b/src/main/java/com/cleanroommc/modularui/widgets/slot/ItemSlot.java
@@ -4,9 +4,9 @@
 import com.cleanroommc.modularui.api.ITheme;
 import com.cleanroommc.modularui.api.widget.IVanillaSlot;
 import com.cleanroommc.modularui.api.widget.Interactable;
-import com.cleanroommc.modularui.core.mixin.GuiAccessor;
-import com.cleanroommc.modularui.core.mixin.GuiContainerAccessor;
-import com.cleanroommc.modularui.core.mixin.GuiScreenAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiContainerAccessor;
+import com.cleanroommc.modularui.core.mixins.early.minecraft.GuiScreenAccessor;
 import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
 import com.cleanroommc.modularui.screen.ClientScreenHandler;
diff --git a/src/main/resources/mixin.modularui.jei.json b/src/main/resources/mixin.modularui.jei.json
@@ -1,11 +1,10 @@
 {
-  "package": "com.cleanroommc.modularui.core.mixin.jei",
+  "package": "com.cleanroommc.modularui.core.mixins.late.jei",
   "refmap": "mixins.modularui.refmap.json",
   "target": "@env(DEFAULT)",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
-  "client": [
-  ],
+  "client": [],
   "mixins": [
     "GhostIngredientDragManagerAccessor",
     "IngredientGridMixin",
diff --git a/src/main/resources/mixin.modularui.json b/src/main/resources/mixin.modularui.json
@@ -1,22 +1,22 @@
 {
-  "package": "com.cleanroommc.modularui.core.mixin",
+  "package": "com.cleanroommc.modularui.core.mixins.early",
   "refmap": "mixins.modularui.refmap.json",
   "target": "@env(DEFAULT)",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
   "client": [
-    "GuiAccessor",
-    "GuiButtonMixin",
-    "GuiContainerAccessor",
-    "GuiContainerMixin",
-    "GuiScreenAccessor",
-    "GuiUtilsMixin",
-    "KeyBindAccess",
-    "MinecraftMixin"
+    "minecraft.GuiAccessor",
+    "minecraft.GuiButtonMixin",
+    "minecraft.GuiContainerAccessor",
+    "minecraft.GuiContainerMixin",
+    "minecraft.GuiScreenAccessor",
+    "minecraft.GuiUtilsMixin",
+    "minecraft.KeyBindAccess",
+    "minecraft.MinecraftMixin"
   ],
   "mixins": [
-    "ContainerAccessor",
-    "FontRendererAccessor",
-    "InventoryCraftingAccessor"
+    "minecraft.ContainerAccessor",
+    "minecraft.FontRendererAccessor",
+    "minecraft.InventoryCraftingAccessor"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.cleanroommc.modularui.core.mixin;`
	`1`	`+package com.cleanroommc.modularui.core.mixins.early.minecraft;`
`2`	`2`
`3`	`3`	`import net.minecraft.client.gui.FontRenderer;`
`4`	`4`	`import org.spongepowered.asm.mixin.Mixin;`