R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
C-H716 2025-09-24 00:17:56 +08:00
parent 6004a648a0
commit 27fd0603ca
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -71,7 +71,7 @@ dependencies {
modImplementation "curse.maven:glodium-957920:${glodium_version}"
//extendedAE
modImplementation files('libs/ExtendedAE-1.20-1.4.2-forge.jar')
modRuntimeOnly fileTree(dir: 'libs', includes: ['*.jar'])
//ae2
modImplementation "appeng:appliedenergistics2-forge:${ae2_version}"
modImplementation "org.appliedenergistics:guideme:${guideme_version}"

10
src/main/java/com/extendedae_plus/compat/UpgradeSlotCompat.java
View File

@ -2,7 +2,6 @@ package com.extendedae_plus.compat;
import appeng.api.upgrades.IUpgradeInventory;
import appeng.api.upgrades.IUpgradeableObject;
import appeng.api.upgrades.UpgradeInventories;
import appeng.client.gui.style.ScreenStyle;
import appeng.client.gui.widgets.ToolboxPanel;
import appeng.client.gui.widgets.UpgradesPanel;
@ -41,13 +40,9 @@ public class UpgradeSlotCompat {
*/
public static boolean shouldEnableUpgradeSlots() {
boolean appfluxExists = isAppfluxPresent();
ExtendedAELogger.LOGGER.info("ExtendedAE-appflux模组检测: {}", appfluxExists ? "存在" : "不存在");
if (appfluxExists) {
ExtendedAELogger.LOGGER.info("检测到ExtendedAE-appflux模组，跳过我们的升级卡槽功能");
return false;
} else {
ExtendedAELogger.LOGGER.info("未检测到ExtendedAE-appflux模组，启用我们的升级卡槽功能");
return true;
}
}
@ -100,8 +95,6 @@ public class UpgradeSlotCompat {
if (menu instanceof IUpgradeableMenuCompat compatMenu) {
compatMenu.setCompatToolbox(toolbox);
}
ExtendedAELogger.LOGGER.debug("成功为PatternProviderMenu初始化升级功能");
return true;
}
} catch (Exception e) {
@ -147,8 +140,6 @@ public class UpgradeSlotCompat {
ToolboxPanel toolboxPanel = new ToolboxPanel(style, toolbox.getName());
addMethod.invoke(widgets, "toolbox", toolboxPanel);
}
ExtendedAELogger.LOGGER.debug("成功为PatternProviderScreen添加升级面板");
return true;
} catch (NoSuchMethodException e) {
// 尝试其他可能的方法签名
@ -174,7 +165,6 @@ public class UpgradeSlotCompat {
putMethod.invoke(widgets, "toolbox", toolboxPanel);
}
ExtendedAELogger.LOGGER.debug("成功为PatternProviderScreen添加升级面板（使用put方法）");
return true;
} catch (Exception e2) {
ExtendedAELogger.LOGGER.error("反射调用widgets方法失败", e2);

23
src/main/resources/extendedae_plus.mixins.json
View File

@ -20,9 +20,8 @@
"ae2.client.gui.PatternEncodingTermScreenMixin",
"ae2.client.gui.PatternProviderCloseMixin",
"ae2.client.gui.PatternProviderScreenMixin",
"ae2.compat.PatternProviderScreenCompatMixin",
"ae2.client.gui.ScreenCloseMixin",
"ae2.client.gui.SlotGridLayoutMixin",
"ae2.compat.PatternProviderScreenCompatMixin",
"ae2.menu.CraftConfirmMenuGoBackMixin",
"extendedae.accessor.GuiExPatternTerminalAccessor",
"extendedae.accessor.GuiExPatternTerminalSlotsRowAccessor",
@ -49,6 +48,7 @@
"ae2.CraftingCalculationMixin",
"ae2.CraftingCPUClusterMixin",
"ae2.EncodedPatternItemMixin",
"ae2.InterfaceLogicUpgradesMixin",
"ae2.accessor.MEStorageMenuAccessor",
"ae2.accessor.PatternEncodingTermMenuAccessor",
"ae2.accessor.PatternProviderLogicAccessor",
@ -62,34 +62,31 @@
"ae2.autopattern.PatternProviderLogicContainsRedirectMixin",
"ae2.autopattern.gtceu.GTLCoreMEPatternBufferPartMachineMixin",
"ae2.autopattern.gtceu.MEPatternBufferPartMachineMixin",
"ae2.compat.PatternProviderCompatMixin",
"ae2.compat.PatternProviderLogicCompatMixin",
"ae2.compat.PatternProviderLogicHostCompatMixin",
"ae2.helpers.InterfaceLogicChannelCardMixin",
"ae2.helpers.InterfaceLogicTickerMixin",
"ae2.helpers.PatternProviderLogicAdvancedMixin",
"ae2.helpers.PatternProviderLogicDoublingMixin",
"ae2.helpers.patternprovider.PatternProviderLogicTickerMixin",
"ae2.menu.ContainerPatternEncodingTermMenuMixin",
"ae2.menu.MEStorageMenuMixin",
"ae2.menu.PatternEncodingTermMenuMixin",
"ae2.menu.PatternProviderMenuAdvancedMixin",
"ae2.menu.PatternProviderMenuDoublingMixin",
"ae2.compat.PatternProviderLogicCompatMixin",
"ae2.compat.PatternProviderLogicHostCompatMixin",
"ae2.compat.PatternProviderCompatMixin",
"appflux.AppfluxPatternProviderLogicMixin",
"ae2.helpers.patternprovider.PatternProviderLogicTickerMixin",
"ae2.parts.AEBasePartClientSyncMixin",
"ae2.parts.automation.IOBusPartChannelCardMixin",
"ae2.parts.automation.IOBusPartTickerChannelCardMixin",
"ae2.parts.storagebus.StorageBusPartChannelCardMixin",
"ae2.parts.storagebus.StorageBusPartTickerChannelCardMixin",
"ae2WTlib.ContainerUWirelessExPatternTerminalMixin",
"appflux.AppfluxPatternProviderLogicMixin",
"extendedae.common.PartExPatternProviderMixin",
"extendedae.common.TileExPatternProviderMixin",
"extendedae.container.ContainerExPatternProviderMixin",
"extendedae.container.ContainerExPatternTerminalMixin",
"extendedae.container.ContainerWirelessExPatternTerminalMixin",
"gtceu.ModularUIContainerCloseMixin"
"extendedae.container.ContainerWirelessExPatternTerminalMixin",
"ae2.helpers.InterfaceLogicChannelCardMixin",
"ae2.helpers.InterfaceLogicTickerMixin",
"ae2.InterfaceLogicUpgradesMixin"
"extendedae.container.ContainerWirelessExPatternTerminalMixin"
],
"injectors": {
"defaultRequire": 1