From ba7c9af62969f69af6cfe6b471354b7c7e1c4df7 Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Mon, 27 Oct 2025 01:30:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/extendedae_plus/ae/items/ChannelCardItem.java | 8 ++++---- .../extendedae_plus/ae/parts/EntitySpeedTickerPart.java | 2 +- .../ae/wireless/WirelessMasterRegistry.java | 2 +- .../integration/jade/WirelessTransceiverProvider.java | 2 +- .../extendedae_plus/network/ChannelCardBindPacket.java | 2 +- .../network/PickFromWirelessC2SPacket.java | 4 ++-- .../network/PullFromJeiOrCraftC2SPacket.java | 4 ++-- .../network/crafting/OpenCraftFromJeiC2SPacket.java | 2 +- .../network/provider/RequestProvidersListC2SPacket.java | 2 +- src/main/java/com/extendedae_plus/util/AEMenUtil.java | 4 ---- .../com/extendedae_plus/util/PatternProviderDataUtil.java | 1 - .../util/{uploadPattern => }/PatternTerminalUtil.java | 2 +- .../util/{ => entitySpeed}/FluxEnergyHelper.java | 2 +- .../util/uploadPattern/ProviderUploadUtil.java | 1 + .../util/{ => wireless}/WirelessTeamUtil.java | 2 +- .../util/{ => wireless}/WirelessTerminalLocator.java | 2 +- 16 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 src/main/java/com/extendedae_plus/util/AEMenUtil.java rename src/main/java/com/extendedae_plus/util/{uploadPattern => }/PatternTerminalUtil.java (99%) rename src/main/java/com/extendedae_plus/util/{ => entitySpeed}/FluxEnergyHelper.java (96%) rename src/main/java/com/extendedae_plus/util/{ => wireless}/WirelessTeamUtil.java (99%) rename src/main/java/com/extendedae_plus/util/{ => wireless}/WirelessTerminalLocator.java (99%) diff --git a/src/main/java/com/extendedae_plus/ae/items/ChannelCardItem.java b/src/main/java/com/extendedae_plus/ae/items/ChannelCardItem.java index ef186cd..069d082 100644 --- a/src/main/java/com/extendedae_plus/ae/items/ChannelCardItem.java +++ b/src/main/java/com/extendedae_plus/ae/items/ChannelCardItem.java @@ -1,16 +1,16 @@ package com.extendedae_plus.ae.items; import appeng.items.materials.UpgradeCardItem; -import com.extendedae_plus.util.WirelessTeamUtil; +import com.extendedae_plus.util.wireless.WirelessTeamUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java index 9e5d5d9..cb8e15e 100644 --- a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java +++ b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java @@ -71,7 +71,7 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka static { if (ModCheckUtils.isLoaded(ModCheckUtils.MODID_APPFLUX)) { try { - Class helperClass = Class.forName("com.extendedae_plus.util.FluxEnergyHelper"); + Class helperClass = Class.forName("com.extendedae_plus.util.entitySpeed.FluxEnergyHelper"); Method method = helperClass.getMethod("extractFE", IEnergyService.class, MEStorage.class, long.class, IActionSource.class); cachedFEExtractHandle = MethodHandles.lookup().unreflect(method); FE_UNAVAILABLE = false; diff --git a/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterRegistry.java b/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterRegistry.java index d856d98..580645c 100644 --- a/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterRegistry.java +++ b/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterRegistry.java @@ -1,7 +1,7 @@ package com.extendedae_plus.ae.wireless; import com.extendedae_plus.config.ModConfig; -import com.extendedae_plus.util.WirelessTeamUtil; +import com.extendedae_plus.util.wireless.WirelessTeamUtil; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java b/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java index d5ea951..f790abb 100644 --- a/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java +++ b/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java @@ -5,7 +5,7 @@ import appeng.api.networking.IGridNode; import com.extendedae_plus.ae.wireless.IWirelessEndpoint; import com.extendedae_plus.ae.wireless.WirelessMasterRegistry; import com.extendedae_plus.content.wireless.WirelessTransceiverBlockEntity; -import com.extendedae_plus.util.WirelessTeamUtil; +import com.extendedae_plus.util.wireless.WirelessTeamUtil; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java b/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java index 6ead989..b7ef66f 100644 --- a/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java +++ b/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java @@ -2,7 +2,7 @@ package com.extendedae_plus.network; import com.extendedae_plus.ae.items.ChannelCardItem; import com.extendedae_plus.init.ModItems; -import com.extendedae_plus.util.WirelessTeamUtil; +import com.extendedae_plus.util.wireless.WirelessTeamUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java b/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java index e55878a..54798f8 100644 --- a/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java +++ b/src/main/java/com/extendedae_plus/network/PickFromWirelessC2SPacket.java @@ -8,8 +8,8 @@ import appeng.api.storage.StorageHelper; import appeng.items.tools.powered.WirelessCraftingTerminalItem; import appeng.items.tools.powered.WirelessTerminalItem; import appeng.me.helpers.PlayerSource; -import com.extendedae_plus.util.WirelessTerminalLocator; -import com.extendedae_plus.util.WirelessTerminalLocator.LocatedTerminal; +import com.extendedae_plus.util.wireless.WirelessTerminalLocator; +import com.extendedae_plus.util.wireless.WirelessTerminalLocator.LocatedTerminal; import de.mari_023.ae2wtlib.terminal.WTMenuHost; import de.mari_023.ae2wtlib.wut.WTDefinition; import de.mari_023.ae2wtlib.wut.WUTHandler; diff --git a/src/main/java/com/extendedae_plus/network/PullFromJeiOrCraftC2SPacket.java b/src/main/java/com/extendedae_plus/network/PullFromJeiOrCraftC2SPacket.java index ee05ae0..7aa1c24 100644 --- a/src/main/java/com/extendedae_plus/network/PullFromJeiOrCraftC2SPacket.java +++ b/src/main/java/com/extendedae_plus/network/PullFromJeiOrCraftC2SPacket.java @@ -13,8 +13,8 @@ import appeng.me.helpers.PlayerSource; import appeng.menu.locator.MenuLocators; import appeng.menu.me.crafting.CraftAmountMenu; import com.extendedae_plus.menu.locator.CuriosItemLocator; -import com.extendedae_plus.util.WirelessTerminalLocator; -import com.extendedae_plus.util.WirelessTerminalLocator.LocatedTerminal; +import com.extendedae_plus.util.wireless.WirelessTerminalLocator; +import com.extendedae_plus.util.wireless.WirelessTerminalLocator.LocatedTerminal; import de.mari_023.ae2wtlib.terminal.WTMenuHost; import de.mari_023.ae2wtlib.wut.WTDefinition; import de.mari_023.ae2wtlib.wut.WUTHandler; diff --git a/src/main/java/com/extendedae_plus/network/crafting/OpenCraftFromJeiC2SPacket.java b/src/main/java/com/extendedae_plus/network/crafting/OpenCraftFromJeiC2SPacket.java index ac4f48e..9a4af7c 100644 --- a/src/main/java/com/extendedae_plus/network/crafting/OpenCraftFromJeiC2SPacket.java +++ b/src/main/java/com/extendedae_plus/network/crafting/OpenCraftFromJeiC2SPacket.java @@ -7,7 +7,7 @@ import appeng.items.tools.powered.WirelessTerminalItem; import appeng.menu.locator.MenuLocators; import appeng.menu.me.crafting.CraftAmountMenu; import com.extendedae_plus.menu.locator.CuriosItemLocator; -import com.extendedae_plus.util.WirelessTerminalLocator; +import com.extendedae_plus.util.wireless.WirelessTerminalLocator; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/com/extendedae_plus/network/provider/RequestProvidersListC2SPacket.java b/src/main/java/com/extendedae_plus/network/provider/RequestProvidersListC2SPacket.java index 6fa880c..8a813c5 100644 --- a/src/main/java/com/extendedae_plus/network/provider/RequestProvidersListC2SPacket.java +++ b/src/main/java/com/extendedae_plus/network/provider/RequestProvidersListC2SPacket.java @@ -5,7 +5,7 @@ import appeng.menu.implementations.PatternAccessTermMenu; import appeng.menu.me.items.PatternEncodingTermMenu; import com.extendedae_plus.init.ModNetwork; import com.extendedae_plus.util.PatternProviderDataUtil; -import com.extendedae_plus.util.uploadPattern.PatternTerminalUtil; +import com.extendedae_plus.util.PatternTerminalUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; diff --git a/src/main/java/com/extendedae_plus/util/AEMenUtil.java b/src/main/java/com/extendedae_plus/util/AEMenUtil.java deleted file mode 100644 index 63402f2..0000000 --- a/src/main/java/com/extendedae_plus/util/AEMenUtil.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.extendedae_plus.util; - -public class AEMenUtil { -} diff --git a/src/main/java/com/extendedae_plus/util/PatternProviderDataUtil.java b/src/main/java/com/extendedae_plus/util/PatternProviderDataUtil.java index 559707b..68c3a6f 100644 --- a/src/main/java/com/extendedae_plus/util/PatternProviderDataUtil.java +++ b/src/main/java/com/extendedae_plus/util/PatternProviderDataUtil.java @@ -8,7 +8,6 @@ import appeng.helpers.patternprovider.PatternContainer; import appeng.helpers.patternprovider.PatternProviderLogic; import appeng.menu.implementations.PatternAccessTermMenu; import com.extendedae_plus.mixin.ae2.accessor.PatternProviderLogicAccessor; -import com.extendedae_plus.util.uploadPattern.PatternTerminalUtil; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/extendedae_plus/util/uploadPattern/PatternTerminalUtil.java b/src/main/java/com/extendedae_plus/util/PatternTerminalUtil.java similarity index 99% rename from src/main/java/com/extendedae_plus/util/uploadPattern/PatternTerminalUtil.java rename to src/main/java/com/extendedae_plus/util/PatternTerminalUtil.java index de00cf7..188bf0d 100644 --- a/src/main/java/com/extendedae_plus/util/uploadPattern/PatternTerminalUtil.java +++ b/src/main/java/com/extendedae_plus/util/PatternTerminalUtil.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.util.uploadPattern; +package com.extendedae_plus.util; import appeng.api.inventories.InternalInventory; import appeng.api.networking.IGrid; diff --git a/src/main/java/com/extendedae_plus/util/FluxEnergyHelper.java b/src/main/java/com/extendedae_plus/util/entitySpeed/FluxEnergyHelper.java similarity index 96% rename from src/main/java/com/extendedae_plus/util/FluxEnergyHelper.java rename to src/main/java/com/extendedae_plus/util/entitySpeed/FluxEnergyHelper.java index 6e5a57a..c4d9bea 100644 --- a/src/main/java/com/extendedae_plus/util/FluxEnergyHelper.java +++ b/src/main/java/com/extendedae_plus/util/entitySpeed/FluxEnergyHelper.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.util; +package com.extendedae_plus.util.entitySpeed; import appeng.api.config.Actionable; import appeng.api.networking.energy.IEnergyService; diff --git a/src/main/java/com/extendedae_plus/util/uploadPattern/ProviderUploadUtil.java b/src/main/java/com/extendedae_plus/util/uploadPattern/ProviderUploadUtil.java index 6fcd766..eb3157e 100644 --- a/src/main/java/com/extendedae_plus/util/uploadPattern/ProviderUploadUtil.java +++ b/src/main/java/com/extendedae_plus/util/uploadPattern/ProviderUploadUtil.java @@ -9,6 +9,7 @@ import appeng.util.inv.FilteredInternalInventory; import appeng.util.inv.filter.IAEItemFilter; import com.extendedae_plus.mixin.ae2.accessor.PatternEncodingTermMenuAccessor; import com.extendedae_plus.util.PatternProviderDataUtil; +import com.extendedae_plus.util.PatternTerminalUtil; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/extendedae_plus/util/WirelessTeamUtil.java b/src/main/java/com/extendedae_plus/util/wireless/WirelessTeamUtil.java similarity index 99% rename from src/main/java/com/extendedae_plus/util/WirelessTeamUtil.java rename to src/main/java/com/extendedae_plus/util/wireless/WirelessTeamUtil.java index 51401ef..b902e1f 100644 --- a/src/main/java/com/extendedae_plus/util/WirelessTeamUtil.java +++ b/src/main/java/com/extendedae_plus/util/wireless/WirelessTeamUtil.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.util; +package com.extendedae_plus.util.wireless; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java b/src/main/java/com/extendedae_plus/util/wireless/WirelessTerminalLocator.java similarity index 99% rename from src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java rename to src/main/java/com/extendedae_plus/util/wireless/WirelessTerminalLocator.java index 73ee90e..ab08c9f 100644 --- a/src/main/java/com/extendedae_plus/util/WirelessTerminalLocator.java +++ b/src/main/java/com/extendedae_plus/util/wireless/WirelessTerminalLocator.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.util; +package com.extendedae_plus.util.wireless; import appeng.items.tools.powered.WirelessCraftingTerminalItem; import appeng.items.tools.powered.WirelessTerminalItem;