调整包结构

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.*;

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);
         }

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;

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;

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;

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 {

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;

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;
 

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;

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;

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;

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.items.BasicCoreItem;
-import com.extendedae_plus.ae.items.ChannelCardItem;
+import com.extendedae_plus.items.EntitySpeedTickerPartItem;
-import com.extendedae_plus.ae.items.EntitySpeedTickerPartItem;
+import com.extendedae_plus.items.InfinityBigIntegerCellItem;
-import com.extendedae_plus.ae.items.InfinityBigIntegerCellItem;
+import com.extendedae_plus.items.materials.ChannelCardItem;
-import com.extendedae_plus.item.BasicCoreItem;
+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;

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;

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;

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<EntitySpeedTickerPart> {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);
 
             // 加载接口