From 708f5402ff719400c17306cedd1fcdc83b1f1771 Mon Sep 17 00:00:00 2001 From: GaLi Date: Tue, 25 Nov 2025 10:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B2=E6=9F=93=E5=A4=9A?= =?UTF-8?q?=E4=B8=AAtoolbox=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae2/menu/InterfaceMenuUpgradesMixin.java | 41 ------------------- .../resources/extendedae_plus.mixins.json | 1 - 2 files changed, 42 deletions(-) delete mode 100644 src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java deleted file mode 100644 index 01c865d..0000000 --- a/src/main/java/com/extendedae_plus/mixin/ae2/menu/InterfaceMenuUpgradesMixin.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.extendedae_plus.mixin.ae2.menu; - -import appeng.helpers.InterfaceLogicHost; -import appeng.menu.AEBaseMenu; -import appeng.menu.ToolboxMenu; -import appeng.menu.implementations.InterfaceMenu; -import com.extendedae_plus.api.bridge.IUpgradableMenu; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.MenuType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -/** - * 为ME接口菜单添加升级槽支持，确保与AppliedFlux的兼容性 - */ -@Mixin(value = InterfaceMenu.class, priority = 900, remap = false) -public abstract class InterfaceMenuUpgradesMixin extends AEBaseMenu implements IUpgradableMenu { - - @Unique - private ToolboxMenu eap$toolbox; - - public InterfaceMenuUpgradesMixin(MenuType menuType, int id, Inventory playerInventory, Object host) { - super(menuType, id, playerInventory, host); - } - - @Inject(method = "(Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lappeng/helpers/InterfaceLogicHost;)V", - at = @At("TAIL")) - private void eap$initUpgrades(MenuType menuType, int id, Inventory playerInventory, InterfaceLogicHost host, CallbackInfo ci) { - this.eap$toolbox = new ToolboxMenu(this); - - // InterfaceMenu已经继承自UpgradeableMenu，会自动处理升级槽 - } - - @Override - public ToolboxMenu eap$getToolbox() { - return this.eap$toolbox; - } -} diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json index a24ca06..77d884c 100644 --- a/src/main/resources/extendedae_plus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -43,7 +43,6 @@ "ae2.helpers.patternprovider.PatternProviderLogicTickerMixin", "ae2.menu.AEBaseMenuUpgradesDedupMixin", "ae2.menu.ContainerPatternEncodingTermMenuMixin", - "ae2.menu.InterfaceMenuUpgradesMixin", "ae2.menu.MEStorageMenuMixin", "ae2.menu.PatternEncodingTermMenuMixin", "ae2.menu.PatternProviderMenuAdvancedMixin",