调整结构

src/main/java/com/extendedae_plus/mixin/ae2/client/gui/AEBaseScreenMixin.java

@@ -14,9 +14,9 @@ import appeng.menu.slot.AppEngSlot;
 import com.extendedae_plus.api.IExPatternPage;
 import com.extendedae_plus.content.ClientPatternHighlightStore;
 import com.extendedae_plus.init.ModNetwork;
-import com.extendedae_plus.mixin.accessor.AbstractContainerScreenAccessor;
-import com.extendedae_plus.mixin.accessor.ScreenAccessor;
 import com.extendedae_plus.mixin.ae2.accessor.AEBaseScreenAccessor;
+import com.extendedae_plus.mixin.minecraft.accessor.AbstractContainerScreenAccessor;
+import com.extendedae_plus.mixin.minecraft.accessor.ScreenAccessor;
 import com.extendedae_plus.network.crafting.CraftingMonitorJumpC2SPacket;
 import com.extendedae_plus.network.crafting.CraftingMonitorOpenProviderC2SPacket;
 import com.extendedae_plus.util.GuiUtil;

src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java

@@ -4,8 +4,8 @@ import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.implementations.InterfaceScreen;
 import appeng.menu.AEBaseMenu;
 import com.extendedae_plus.init.ModNetwork;
-import com.extendedae_plus.mixin.accessor.AbstractContainerScreenAccessor;
+import com.extendedae_plus.mixin.minecraft.accessor.AbstractContainerScreenAccessor;
-import com.extendedae_plus.mixin.accessor.ScreenAccessor;
+import com.extendedae_plus.mixin.minecraft.accessor.ScreenAccessor;
 import com.extendedae_plus.network.meInterface.InterfaceAdjustConfigAmountC2SPacket;
 import com.extendedae_plus.util.ScaleButtonHelper;
 import com.glodblock.github.extendedae.client.button.ActionEPPButton;

src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternEncodingTermScreenMixin.java

@@ -6,9 +6,9 @@ import appeng.client.gui.style.ScreenStyle;
 import appeng.client.gui.style.WidgetStyle;
 import appeng.client.gui.widgets.IconButton;
 import com.extendedae_plus.init.ModNetwork;
-import com.extendedae_plus.mixin.accessor.AbstractContainerScreenAccessor;
-import com.extendedae_plus.mixin.accessor.ScreenAccessor;
 import com.extendedae_plus.mixin.ae2.accessor.AEBaseScreenAccessor;
+import com.extendedae_plus.mixin.minecraft.accessor.AbstractContainerScreenAccessor;
+import com.extendedae_plus.mixin.minecraft.accessor.ScreenAccessor;
 import com.extendedae_plus.network.provider.RequestProvidersListC2SPacket;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.GuiGraphics;

src/main/java/com/extendedae_plus/mixin/minecraft/ModelBakeryMixin.java

@@ -1,17 +1,15 @@
-package com.extendedae_plus.mixin.hooks;
+package com.extendedae_plus.mixin.minecraft;
 
+import com.extendedae_plus.hooks.BuiltInModelHooks;
+import net.minecraft.client.resources.model.ModelBakery;
+import net.minecraft.client.resources.model.UnbakedModel;
+import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.resources.model.ModelBakery;
-import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.resources.ResourceLocation;
-
-import com.extendedae_plus.hooks.BuiltInModelHooks;
-
 /**
  * 复制 MAE2/AE2 的做法：在模型加载时优先查询我们的内置模型表，
  * 若命中则缓存并阻止继续查找 JSON 模型。
@@ -28,6 +26,5 @@ public class ModelBakeryMixin {
     }
 
     @Shadow
-    protected void cacheAndQueueDependencies(ResourceLocation id, UnbakedModel unbakedModel) {
+    private void cacheAndQueueDependencies(ResourceLocation id, UnbakedModel unbakedModel) {}
-    }
 }

src/main/java/com/extendedae_plus/mixin/minecraft/PickFromWirelessMixin.java

@@ -1,4 +1,4 @@
-package com.extendedae_plus.mixin;
+package com.extendedae_plus.mixin.minecraft;
 
 import com.extendedae_plus.init.ModNetwork;
 import com.extendedae_plus.network.PickFromWirelessC2SPacket;

src/main/java/com/extendedae_plus/mixin/minecraft/accessor/AbstractContainerScreenAccessor.java

@@ -1,4 +1,4 @@
-package com.extendedae_plus.mixin.accessor;
+package com.extendedae_plus.mixin.minecraft.accessor;
 
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.world.inventory.AbstractContainerMenu;

src/main/java/com/extendedae_plus/mixin/minecraft/accessor/ScreenAccessor.java

@@ -1,4 +1,4 @@
-package com.extendedae_plus.mixin.accessor;
+package com.extendedae_plus.mixin.minecraft.accessor;
 
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.Renderable;

src/main/resources/extendedae_plus.mixins.json

@@ -4,9 +4,6 @@
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "client": [
-    "PickFromWirelessMixin",
-    "accessor.AbstractContainerScreenAccessor",
-    "accessor.ScreenAccessor",
     "advancedae.client.gui.AdvPatternProviderScreenMixin",
     "advancedae.client.gui.SmallAdvPatternProviderScreenMixin",
     "ae2.accessor.AEBaseScreenAccessor",
@@ -28,10 +25,13 @@
     "extendedae.client.HighlightButtonMixin",
     "extendedae.client.gui.GuiExPatternProviderMixin",
     "extendedae.client.gui.GuiExPatternTerminalMixin",
-    "hooks.ModelBakeryMixin",
     "jei.EncodePatternTransferHandlerMixin",
     "jei.EncodingHelperMixin",
-    "jei.accessor.BookmarkOverlayAccessor"
+    "jei.accessor.BookmarkOverlayAccessor",
+    "minecraft.ModelBakeryMixin",
+    "minecraft.PickFromWirelessMixin",
+    "minecraft.accessor.AbstractContainerScreenAccessor",
+    "minecraft.accessor.ScreenAccessor"
   ],
   "mixins": [
     "advancedae.AdvPatternProviderLogicContainsRedirectMixin",