From d929697c3eee4f12d1b30dbb7633609e816b6fc5 Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Mon, 17 Nov 2025 02:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/extendedae_plus/ExtendedAEPlus.java | 2 +- .../ae/parts/EntitySpeedTickerPart.java | 6 +++--- .../extendedae_plus/{ae => }/api/config/Settings.java | 2 +- .../{ae => }/api/crafting/ScaledProcessingPattern.java | 2 +- .../api/crafting/ScaledProcessingPatternAdv.java | 2 +- .../api/storage/InfinityBigIntegerCellHandler.java | 4 ++-- .../api/storage/InfinityBigIntegerCellInventory.java | 4 ++-- .../com/extendedae_plus/client/ClientRegistrar.java | 2 +- .../content/wireless/WirelessTransceiverBlock.java | 2 +- .../com/extendedae_plus/datagen/CraftingRecipes.java | 4 ++-- .../extendedae_plus/{ae/client => }/gui/NewIcon.java | 2 +- src/main/java/com/extendedae_plus/init/ModItems.java | 10 +++++----- .../integration/jei/ExtendedAEJeiPlugin.java | 4 ++-- .../extendedae_plus/{item => items}/BasicCoreItem.java | 2 +- .../{ae => }/items/EntitySpeedTickerPartItem.java | 7 ++++--- .../{ae => }/items/InfinityBigIntegerCellItem.java | 4 ++-- .../{ae/items => items/materials}/ChannelCardItem.java | 2 +- .../materials}/EntitySpeedCardItem.java | 2 +- .../AdvPatternProviderLogicContainsRedirectMixin.java | 2 +- .../autopattern/CraftingServiceGetProvidersMixin.java | 2 +- .../ae2/autopattern/CraftingSimulationStateMixin.java | 2 +- .../PatternProviderLogicContainsRedirectMixin.java | 2 +- .../ae2/compat/PatternProviderLogicCompatMixin.java | 2 +- .../ae2/helpers/InterfaceLogicChannelCardMixin.java | 2 +- .../parts/automation/IOBusPartChannelCardMixin.java | 2 +- .../storagebus/StorageBusPartChannelCardMixin.java | 2 +- .../extendedae_plus/network/ChannelCardBindPacket.java | 2 +- .../com/extendedae_plus/util/ScaleButtonHelper.java | 2 +- .../util/command/InfinityDiskGiveCommand.java | 2 +- .../extendedae_plus/util/entitySpeed/PowerUtils.java | 2 +- .../util/smartDoubling/PatternScaler.java | 4 ++-- 31 files changed, 46 insertions(+), 45 deletions(-) rename src/main/java/com/extendedae_plus/{ae => }/api/config/Settings.java (96%) rename src/main/java/com/extendedae_plus/{ae => }/api/crafting/ScaledProcessingPattern.java (99%) rename src/main/java/com/extendedae_plus/{ae => }/api/crafting/ScaledProcessingPatternAdv.java (96%) rename src/main/java/com/extendedae_plus/{ae => }/api/storage/InfinityBigIntegerCellHandler.java (85%) rename src/main/java/com/extendedae_plus/{ae => }/api/storage/InfinityBigIntegerCellInventory.java (99%) rename src/main/java/com/extendedae_plus/{ae/client => }/gui/NewIcon.java (95%) rename src/main/java/com/extendedae_plus/{item => items}/BasicCoreItem.java (99%) rename src/main/java/com/extendedae_plus/{ae => }/items/EntitySpeedTickerPartItem.java (97%) rename src/main/java/com/extendedae_plus/{ae => }/items/InfinityBigIntegerCellItem.java (97%) rename src/main/java/com/extendedae_plus/{ae/items => items/materials}/ChannelCardItem.java (99%) rename src/main/java/com/extendedae_plus/{ae/definitions/upgrades => items/materials}/EntitySpeedCardItem.java (98%) diff --git a/src/main/java/com/extendedae_plus/ExtendedAEPlus.java b/src/main/java/com/extendedae_plus/ExtendedAEPlus.java index 011f78a..9261160 100644 --- a/src/main/java/com/extendedae_plus/ExtendedAEPlus.java +++ b/src/main/java/com/extendedae_plus/ExtendedAEPlus.java @@ -2,7 +2,7 @@ package com.extendedae_plus; import appeng.api.storage.StorageCells; import appeng.menu.locator.MenuLocators; -import com.extendedae_plus.ae.api.storage.InfinityBigIntegerCellHandler; +import com.extendedae_plus.api.storage.InfinityBigIntegerCellHandler; import com.extendedae_plus.client.ClientRegistrar; import com.extendedae_plus.config.ModConfig; import com.extendedae_plus.init.*; 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 1de5943..a55a685 100644 --- a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java +++ b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java @@ -103,13 +103,13 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka // 注册可记忆的配置（YES/NO） this.getConfigManager().registerSetting( - com.extendedae_plus.ae.api.config.Settings.ACCELERATE, + com.extendedae_plus.api.config.Settings.ACCELERATE, YesNo.YES ); } public boolean getAccelerateEnabled() { - return this.getConfigManager().getSetting(com.extendedae_plus.ae.api.config.Settings.ACCELERATE) == YesNo.YES; + return this.getConfigManager().getSetting(com.extendedae_plus.api.config.Settings.ACCELERATE) == YesNo.YES; } /** @@ -118,7 +118,7 @@ public class EntitySpeedTickerPart extends UpgradeablePart implements IGridTicka * @param enabled 是否启用加速 */ public void setAccelerateEnabled(boolean enabled) { - this.getConfigManager().putSetting(com.extendedae_plus.ae.api.config.Settings.ACCELERATE, enabled ? YesNo.YES : YesNo.NO); + this.getConfigManager().putSetting(com.extendedae_plus.api.config.Settings.ACCELERATE, enabled ? YesNo.YES : YesNo.NO); if (menu != null) { menu.setAccelerateEnabled(enabled); } diff --git a/src/main/java/com/extendedae_plus/ae/api/config/Settings.java b/src/main/java/com/extendedae_plus/api/config/Settings.java similarity index 96% rename from src/main/java/com/extendedae_plus/ae/api/config/Settings.java rename to src/main/java/com/extendedae_plus/api/config/Settings.java index 6ed3fc5..66c347b 100644 --- a/src/main/java/com/extendedae_plus/ae/api/config/Settings.java +++ b/src/main/java/com/extendedae_plus/api/config/Settings.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.ae.api.config; +package com.extendedae_plus.api.config; import appeng.api.config.Setting; import appeng.api.config.YesNo; diff --git a/src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPattern.java b/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPattern.java similarity index 99% rename from src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPattern.java rename to src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPattern.java index 5cb96bc..f914a2f 100644 --- a/src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPattern.java +++ b/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPattern.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.ae.api.crafting; +package com.extendedae_plus.api.crafting; import appeng.api.crafting.IPatternDetails; import appeng.api.stacks.AEItemKey; diff --git a/src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPatternAdv.java b/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPatternAdv.java similarity index 96% rename from src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPatternAdv.java rename to src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPatternAdv.java index 5c072d0..8a7872e 100644 --- a/src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPatternAdv.java +++ b/src/main/java/com/extendedae_plus/api/crafting/ScaledProcessingPatternAdv.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.ae.api.crafting; +package com.extendedae_plus.api.crafting; import appeng.api.crafting.IPatternDetails; import appeng.api.stacks.AEKey; diff --git a/src/main/java/com/extendedae_plus/ae/api/storage/InfinityBigIntegerCellHandler.java b/src/main/java/com/extendedae_plus/api/storage/InfinityBigIntegerCellHandler.java similarity index 85% rename from src/main/java/com/extendedae_plus/ae/api/storage/InfinityBigIntegerCellHandler.java rename to src/main/java/com/extendedae_plus/api/storage/InfinityBigIntegerCellHandler.java index 0609b6c..e0e7b4a 100644 --- a/src/main/java/com/extendedae_plus/ae/api/storage/InfinityBigIntegerCellHandler.java +++ b/src/main/java/com/extendedae_plus/api/storage/InfinityBigIntegerCellHandler.java @@ -1,8 +1,8 @@ -package com.extendedae_plus.ae.api.storage; +package com.extendedae_plus.api.storage; import appeng.api.storage.cells.ICellHandler; import appeng.api.storage.cells.ISaveProvider; -import com.extendedae_plus.ae.items.InfinityBigIntegerCellItem; +import com.extendedae_plus.items.InfinityBigIntegerCellItem; import net.minecraft.world.item.ItemStack; public class InfinityBigIntegerCellHandler implements ICellHandler { diff --git a/src/main/java/com/extendedae_plus/ae/api/storage/InfinityBigIntegerCellInventory.java b/src/main/java/com/extendedae_plus/api/storage/InfinityBigIntegerCellInventory.java similarity index 99% rename from src/main/java/com/extendedae_plus/ae/api/storage/InfinityBigIntegerCellInventory.java rename to src/main/java/com/extendedae_plus/api/storage/InfinityBigIntegerCellInventory.java index 9c69845..8c1eac8 100644 --- a/src/main/java/com/extendedae_plus/ae/api/storage/InfinityBigIntegerCellInventory.java +++ b/src/main/java/com/extendedae_plus/api/storage/InfinityBigIntegerCellInventory.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.ae.api.storage; +package com.extendedae_plus.api.storage; import appeng.api.config.Actionable; import appeng.api.networking.security.IActionSource; @@ -10,7 +10,7 @@ import appeng.api.storage.cells.ISaveProvider; import appeng.api.storage.cells.StorageCell; import appeng.core.AELog; import com.extendedae_plus.ExtendedAEPlus; -import com.extendedae_plus.ae.items.InfinityBigIntegerCellItem; +import com.extendedae_plus.items.InfinityBigIntegerCellItem; import com.extendedae_plus.util.storage.InfinityConstants; import com.extendedae_plus.util.storage.InfinityDataStorage; import com.extendedae_plus.util.storage.InfinityStorageManager; diff --git a/src/main/java/com/extendedae_plus/client/ClientRegistrar.java b/src/main/java/com/extendedae_plus/client/ClientRegistrar.java index 0fa4b24..6f252c6 100644 --- a/src/main/java/com/extendedae_plus/client/ClientRegistrar.java +++ b/src/main/java/com/extendedae_plus/client/ClientRegistrar.java @@ -3,7 +3,6 @@ package com.extendedae_plus.client; import appeng.client.render.crafting.CraftingCubeModel; import appeng.init.client.InitScreens; import com.extendedae_plus.ExtendedAEPlus; -import com.extendedae_plus.ae.definitions.upgrades.EntitySpeedCardItem; import com.extendedae_plus.ae.menu.EntitySpeedTickerMenu; import com.extendedae_plus.ae.screen.EntitySpeedTickerScreen; import com.extendedae_plus.client.render.crafting.EPlusCraftingCubeModelProvider; @@ -12,6 +11,7 @@ import com.extendedae_plus.content.crafting.EPlusCraftingUnitType; import com.extendedae_plus.hooks.BuiltInModelHooks; import com.extendedae_plus.init.ModItems; import com.extendedae_plus.init.ModMenuTypes; +import com.extendedae_plus.items.materials.EntitySpeedCardItem; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.renderer.item.ItemProperties; diff --git a/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlock.java b/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlock.java index 0428722..e900fe5 100644 --- a/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlock.java +++ b/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlock.java @@ -1,8 +1,8 @@ package com.extendedae_plus.content.wireless; -import com.extendedae_plus.ae.items.ChannelCardItem; import com.extendedae_plus.init.ModBlockEntities; import com.extendedae_plus.init.ModItems; +import com.extendedae_plus.items.materials.ChannelCardItem; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java b/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java index 4c9fd2a..8ad5c58 100644 --- a/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java +++ b/src/main/java/com/extendedae_plus/datagen/CraftingRecipes.java @@ -6,9 +6,9 @@ import appeng.datagen.providers.tags.ConventionTags; import appeng.recipes.transform.TransformCircumstance; import appeng.recipes.transform.TransformRecipeBuilder; import com.extendedae_plus.ExtendedAEPlus; -import com.extendedae_plus.ae.definitions.upgrades.EntitySpeedCardItem; import com.extendedae_plus.init.ModItems; -import com.extendedae_plus.item.BasicCoreItem; +import com.extendedae_plus.items.BasicCoreItem; +import com.extendedae_plus.items.materials.EntitySpeedCardItem; import com.extendedae_plus.util.ModCheckUtils; import com.glodblock.github.appflux.common.AFItemAndBlock; import com.glodblock.github.appflux.util.AFTags; diff --git a/src/main/java/com/extendedae_plus/ae/client/gui/NewIcon.java b/src/main/java/com/extendedae_plus/gui/NewIcon.java similarity index 95% rename from src/main/java/com/extendedae_plus/ae/client/gui/NewIcon.java rename to src/main/java/com/extendedae_plus/gui/NewIcon.java index db82062..5b4cbe8 100644 --- a/src/main/java/com/extendedae_plus/ae/client/gui/NewIcon.java +++ b/src/main/java/com/extendedae_plus/gui/NewIcon.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.ae.client.gui; +package com.extendedae_plus.gui; import appeng.client.gui.style.Blitter; import com.extendedae_plus.ExtendedAEPlus; diff --git a/src/main/java/com/extendedae_plus/init/ModItems.java b/src/main/java/com/extendedae_plus/init/ModItems.java index 7b2d9c9..ba08c8c 100644 --- a/src/main/java/com/extendedae_plus/init/ModItems.java +++ b/src/main/java/com/extendedae_plus/init/ModItems.java @@ -4,11 +4,11 @@ import appeng.api.parts.IPart; import appeng.api.parts.PartModels; import appeng.items.parts.PartModelsHelper; import com.extendedae_plus.ExtendedAEPlus; -import com.extendedae_plus.ae.definitions.upgrades.EntitySpeedCardItem; -import com.extendedae_plus.ae.items.ChannelCardItem; -import com.extendedae_plus.ae.items.EntitySpeedTickerPartItem; -import com.extendedae_plus.ae.items.InfinityBigIntegerCellItem; -import com.extendedae_plus.item.BasicCoreItem; +import com.extendedae_plus.items.BasicCoreItem; +import com.extendedae_plus.items.EntitySpeedTickerPartItem; +import com.extendedae_plus.items.InfinityBigIntegerCellItem; +import com.extendedae_plus.items.materials.ChannelCardItem; +import com.extendedae_plus.items.materials.EntitySpeedCardItem; import com.extendedae_plus.util.ModCheckUtils; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/extendedae_plus/integration/jei/ExtendedAEJeiPlugin.java b/src/main/java/com/extendedae_plus/integration/jei/ExtendedAEJeiPlugin.java index c27c19a..5acba00 100644 --- a/src/main/java/com/extendedae_plus/integration/jei/ExtendedAEJeiPlugin.java +++ b/src/main/java/com/extendedae_plus/integration/jei/ExtendedAEJeiPlugin.java @@ -1,9 +1,9 @@ package com.extendedae_plus.integration.jei; import com.extendedae_plus.ExtendedAEPlus; -import com.extendedae_plus.ae.definitions.upgrades.EntitySpeedCardItem; import com.extendedae_plus.init.ModItems; -import com.extendedae_plus.item.BasicCoreItem; +import com.extendedae_plus.items.BasicCoreItem; +import com.extendedae_plus.items.materials.EntitySpeedCardItem; import com.extendedae_plus.util.ModCheckUtils; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; diff --git a/src/main/java/com/extendedae_plus/item/BasicCoreItem.java b/src/main/java/com/extendedae_plus/items/BasicCoreItem.java similarity index 99% rename from src/main/java/com/extendedae_plus/item/BasicCoreItem.java rename to src/main/java/com/extendedae_plus/items/BasicCoreItem.java index ca68044..6bd9de6 100644 --- a/src/main/java/com/extendedae_plus/item/BasicCoreItem.java +++ b/src/main/java/com/extendedae_plus/items/BasicCoreItem.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.item; +package com.extendedae_plus.items; import com.extendedae_plus.ExtendedAEPlus; import com.extendedae_plus.init.ModItems; diff --git a/src/main/java/com/extendedae_plus/ae/items/EntitySpeedTickerPartItem.java b/src/main/java/com/extendedae_plus/items/EntitySpeedTickerPartItem.java similarity index 97% rename from src/main/java/com/extendedae_plus/ae/items/EntitySpeedTickerPartItem.java rename to src/main/java/com/extendedae_plus/items/EntitySpeedTickerPartItem.java index d69893e..1900bfd 100644 --- a/src/main/java/com/extendedae_plus/ae/items/EntitySpeedTickerPartItem.java +++ b/src/main/java/com/extendedae_plus/items/EntitySpeedTickerPartItem.java @@ -1,13 +1,14 @@ -package com.extendedae_plus.ae.items; +package com.extendedae_plus.items; import appeng.items.parts.PartItem; +import com.extendedae_plus.ae.parts.EntitySpeedTickerPart; import net.minecraft.network.chat.Component; -import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import org.jetbrains.annotations.Nullable; + import java.util.List; -import com.extendedae_plus.ae.parts.EntitySpeedTickerPart; public class EntitySpeedTickerPartItem extends PartItem { diff --git a/src/main/java/com/extendedae_plus/ae/items/InfinityBigIntegerCellItem.java b/src/main/java/com/extendedae_plus/items/InfinityBigIntegerCellItem.java similarity index 97% rename from src/main/java/com/extendedae_plus/ae/items/InfinityBigIntegerCellItem.java rename to src/main/java/com/extendedae_plus/items/InfinityBigIntegerCellItem.java index 655cc0c..d96b295 100644 --- a/src/main/java/com/extendedae_plus/ae/items/InfinityBigIntegerCellItem.java +++ b/src/main/java/com/extendedae_plus/items/InfinityBigIntegerCellItem.java @@ -1,8 +1,8 @@ -package com.extendedae_plus.ae.items; +package com.extendedae_plus.items; import appeng.api.config.FuzzyMode; import appeng.api.storage.cells.ICellWorkbenchItem; -import com.extendedae_plus.ae.api.storage.InfinityBigIntegerCellInventory; +import com.extendedae_plus.api.storage.InfinityBigIntegerCellInventory; import com.extendedae_plus.util.storage.InfinityConstants; import com.google.common.base.Preconditions; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/extendedae_plus/ae/items/ChannelCardItem.java b/src/main/java/com/extendedae_plus/items/materials/ChannelCardItem.java similarity index 99% rename from src/main/java/com/extendedae_plus/ae/items/ChannelCardItem.java rename to src/main/java/com/extendedae_plus/items/materials/ChannelCardItem.java index 069d082..57add76 100644 --- a/src/main/java/com/extendedae_plus/ae/items/ChannelCardItem.java +++ b/src/main/java/com/extendedae_plus/items/materials/ChannelCardItem.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.ae.items; +package com.extendedae_plus.items.materials; import appeng.items.materials.UpgradeCardItem; import com.extendedae_plus.util.wireless.WirelessTeamUtil; diff --git a/src/main/java/com/extendedae_plus/ae/definitions/upgrades/EntitySpeedCardItem.java b/src/main/java/com/extendedae_plus/items/materials/EntitySpeedCardItem.java similarity index 98% rename from src/main/java/com/extendedae_plus/ae/definitions/upgrades/EntitySpeedCardItem.java rename to src/main/java/com/extendedae_plus/items/materials/EntitySpeedCardItem.java index f896d7e..3d4de25 100644 --- a/src/main/java/com/extendedae_plus/ae/definitions/upgrades/EntitySpeedCardItem.java +++ b/src/main/java/com/extendedae_plus/items/materials/EntitySpeedCardItem.java @@ -1,4 +1,4 @@ -package com.extendedae_plus.ae.definitions.upgrades; +package com.extendedae_plus.items.materials; import appeng.items.materials.UpgradeCardItem; import com.extendedae_plus.init.ModItems; diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java index fb482b9..9f7add1 100644 --- a/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java @@ -1,7 +1,7 @@ package com.extendedae_plus.mixin.advancedae; import appeng.api.crafting.IPatternDetails; -import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern; +import com.extendedae_plus.api.crafting.ScaledProcessingPattern; import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java index 1a508c2..5f6d439 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java @@ -2,7 +2,7 @@ package com.extendedae_plus.mixin.ae2.autopattern; import appeng.api.crafting.IPatternDetails; import appeng.me.service.CraftingService; -import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern; +import com.extendedae_plus.api.crafting.ScaledProcessingPattern; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingSimulationStateMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingSimulationStateMixin.java index f6e8a7a..645f665 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingSimulationStateMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingSimulationStateMixin.java @@ -6,7 +6,7 @@ import appeng.crafting.CraftingPlan; import appeng.crafting.inv.CraftingSimulationState; import appeng.crafting.pattern.AEProcessingPattern; import appeng.me.service.CraftingService; -import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern; +import com.extendedae_plus.api.crafting.ScaledProcessingPattern; import com.extendedae_plus.api.smartDoubling.ICraftingCalculationExt; import com.extendedae_plus.api.smartDoubling.ISmartDoublingAwarePattern; import com.extendedae_plus.config.ModConfig; diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java index a1b6bf7..bb18db1 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java @@ -2,7 +2,7 @@ package com.extendedae_plus.mixin.ae2.autopattern; import appeng.api.crafting.IPatternDetails; import appeng.helpers.patternprovider.PatternProviderLogic; -import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern; +import com.extendedae_plus.api.crafting.ScaledProcessingPattern; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java index 0c22e53..d5f4425 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java @@ -7,12 +7,12 @@ import appeng.api.upgrades.IUpgradeableObject; import appeng.api.upgrades.UpgradeInventories; import appeng.helpers.patternprovider.PatternProviderLogic; import appeng.helpers.patternprovider.PatternProviderLogicHost; -import com.extendedae_plus.ae.items.ChannelCardItem; import com.extendedae_plus.ae.wireless.WirelessSlaveLink; import com.extendedae_plus.ae.wireless.endpoint.GenericNodeEndpointImpl; import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge; import com.extendedae_plus.compat.UpgradeSlotCompat; import com.extendedae_plus.init.ModItems; +import com.extendedae_plus.items.materials.ChannelCardItem; import com.extendedae_plus.util.Logger; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java index a54735a..a960dd2 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java @@ -3,11 +3,11 @@ package com.extendedae_plus.mixin.ae2.helpers; import appeng.api.upgrades.IUpgradeInventory; import appeng.helpers.InterfaceLogic; import appeng.helpers.InterfaceLogicHost; -import com.extendedae_plus.ae.items.ChannelCardItem; import com.extendedae_plus.ae.wireless.WirelessSlaveLink; import com.extendedae_plus.ae.wireless.endpoint.InterfaceNodeEndpointImpl; import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge; import com.extendedae_plus.init.ModItems; +import com.extendedae_plus.items.materials.ChannelCardItem; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java index a4048e0..657ca0c 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java @@ -4,11 +4,11 @@ import appeng.api.networking.security.IActionHost; import appeng.api.upgrades.IUpgradeInventory; import appeng.api.upgrades.IUpgradeableObject; import appeng.parts.automation.IOBusPart; -import com.extendedae_plus.ae.items.ChannelCardItem; import com.extendedae_plus.ae.wireless.WirelessSlaveLink; import com.extendedae_plus.ae.wireless.endpoint.GenericNodeEndpointImpl; import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge; import com.extendedae_plus.init.ModItems; +import com.extendedae_plus.items.materials.ChannelCardItem; import com.extendedae_plus.util.Logger; import net.minecraft.nbt.CompoundTag; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java index 63509b2..ee6d970 100644 --- a/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java @@ -5,11 +5,11 @@ import appeng.api.networking.security.IActionHost; import appeng.api.upgrades.IUpgradeInventory; import appeng.api.upgrades.IUpgradeableObject; import appeng.parts.storagebus.StorageBusPart; -import com.extendedae_plus.ae.items.ChannelCardItem; import com.extendedae_plus.ae.wireless.WirelessSlaveLink; import com.extendedae_plus.ae.wireless.endpoint.GenericNodeEndpointImpl; import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge; import com.extendedae_plus.init.ModItems; +import com.extendedae_plus.items.materials.ChannelCardItem; import com.extendedae_plus.util.Logger; import net.minecraft.nbt.CompoundTag; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java b/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java index b7ef66f..b399bb9 100644 --- a/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java +++ b/src/main/java/com/extendedae_plus/network/ChannelCardBindPacket.java @@ -1,7 +1,7 @@ package com.extendedae_plus.network; -import com.extendedae_plus.ae.items.ChannelCardItem; import com.extendedae_plus.init.ModItems; +import com.extendedae_plus.items.materials.ChannelCardItem; import com.extendedae_plus.util.wireless.WirelessTeamUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/extendedae_plus/util/ScaleButtonHelper.java b/src/main/java/com/extendedae_plus/util/ScaleButtonHelper.java index 6dbc9c1..4bb4104 100644 --- a/src/main/java/com/extendedae_plus/util/ScaleButtonHelper.java +++ b/src/main/java/com/extendedae_plus/util/ScaleButtonHelper.java @@ -1,6 +1,6 @@ package com.extendedae_plus.util; -import com.extendedae_plus.ae.client.gui.NewIcon; +import com.extendedae_plus.gui.NewIcon; import com.glodblock.github.extendedae.client.button.ActionEPPButton; import java.util.ArrayList; diff --git a/src/main/java/com/extendedae_plus/util/command/InfinityDiskGiveCommand.java b/src/main/java/com/extendedae_plus/util/command/InfinityDiskGiveCommand.java index 61e4832..cb6c483 100644 --- a/src/main/java/com/extendedae_plus/util/command/InfinityDiskGiveCommand.java +++ b/src/main/java/com/extendedae_plus/util/command/InfinityDiskGiveCommand.java @@ -1,7 +1,7 @@ package com.extendedae_plus.util.command; import com.extendedae_plus.ExtendedAEPlus; -import com.extendedae_plus.ae.items.InfinityBigIntegerCellItem; +import com.extendedae_plus.items.InfinityBigIntegerCellItem; import com.extendedae_plus.util.storage.InfinityStorageManager; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.context.CommandContext; diff --git a/src/main/java/com/extendedae_plus/util/entitySpeed/PowerUtils.java b/src/main/java/com/extendedae_plus/util/entitySpeed/PowerUtils.java index 5115be4..730ec20 100644 --- a/src/main/java/com/extendedae_plus/util/entitySpeed/PowerUtils.java +++ b/src/main/java/com/extendedae_plus/util/entitySpeed/PowerUtils.java @@ -1,8 +1,8 @@ package com.extendedae_plus.util.entitySpeed; import appeng.api.upgrades.IUpgradeInventory; -import com.extendedae_plus.ae.definitions.upgrades.EntitySpeedCardItem; import com.extendedae_plus.config.ModConfig; +import com.extendedae_plus.items.materials.EntitySpeedCardItem; import net.minecraft.world.item.ItemStack; import java.util.ArrayList; diff --git a/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java b/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java index 20f6bf6..a3564b6 100644 --- a/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java +++ b/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java @@ -5,7 +5,7 @@ import appeng.api.stacks.AEFluidKey; import appeng.api.stacks.AEItemKey; import appeng.api.stacks.AEKey; import appeng.crafting.pattern.AEProcessingPattern; -import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern; +import com.extendedae_plus.api.crafting.ScaledProcessingPattern; import net.minecraftforge.fml.loading.LoadingModList; import java.lang.reflect.Constructor; @@ -23,7 +23,7 @@ public final class PatternScaler { try { // 尝试加载扩展类 - Class clazz = Class.forName("com.extendedae_plus.ae.api.crafting.ScaledProcessingPatternAdv"); + Class clazz = Class.forName("com.extendedae_plus.api.crafting.ScaledProcessingPatternAdv"); ctor = clazz.getConstructor(AEProcessingPattern.class, long.class); // 加载接口