Code Cleanup

src/main/java/appeng/core/AEConfig.java

@@ -18,9 +18,17 @@
 
 package appeng.core;
 
-import static net.minecraftforge.common.ForgeConfigSpec.*;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.DoubleSupplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -31,11 +39,21 @@ import org.apache.commons.lang3.tuple.Pair;
 
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
+import net.minecraftforge.common.ForgeConfigSpec.ConfigValue;
+import net.minecraftforge.common.ForgeConfigSpec.DoubleValue;
+import net.minecraftforge.common.ForgeConfigSpec.EnumValue;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 
-import appeng.api.config.*;
+import appeng.api.config.CondenserOutput;
+import appeng.api.config.PowerMultiplier;
+import appeng.api.config.PowerUnits;
+import appeng.api.config.SearchBoxMode;
+import appeng.api.config.Settings;
+import appeng.api.config.TerminalStyle;
+import appeng.api.config.YesNo;
 import appeng.api.features.AEFeature;
 import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;

src/main/java/appeng/core/AERecipeType.java

@@ -4,8 +4,6 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.util.ResourceLocation;
 
-import appeng.recipes.handlers.GrinderRecipe;
-
 public class AERecipeType<T extends IRecipe<?>> implements IRecipeType<T> {
     private final String id;
 

src/main/java/appeng/core/AppEng.java

@@ -70,14 +70,24 @@ import appeng.client.render.cablebus.CableBusModelLoader;
 import appeng.client.render.cablebus.P2PTunnelFrequencyModel;
 import appeng.client.render.crafting.CraftingCubeModelLoader;
 import appeng.client.render.crafting.EncodedPatternModelLoader;
-import appeng.client.render.model.*;
+import appeng.client.render.model.BiometricCardModel;
+import appeng.client.render.model.ColorApplicatorModel;
+import appeng.client.render.model.DriveModel;
+import appeng.client.render.model.GlassModel;
+import appeng.client.render.model.MemoryCardModel;
+import appeng.client.render.model.SkyCompassModel;
+import appeng.client.render.model.UVLModelLoader;
 import appeng.client.render.spatial.SpatialPylonModel;
 import appeng.core.crash.ModCrashEnhancement;
 import appeng.core.features.registries.PartModels;
 import appeng.core.stats.AdvancementTriggers;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.worlddata.WorldData;
-import appeng.entity.*;
+import appeng.entity.EntityChargedQuartz;
+import appeng.entity.EntityGrowingCrystal;
+import appeng.entity.EntitySingularity;
+import appeng.entity.EntityTinyTNTPrimed;
+import appeng.entity.RenderTinyTNTPrimed;
 import appeng.hooks.TickHandler;
 import appeng.integration.Integrations;
 import appeng.parts.PartPlacement;

src/main/java/appeng/core/CreativeTabFacade.java

@@ -18,15 +18,10 @@
 
 package appeng.core;
 
-import java.util.Optional;
-
 import net.minecraft.block.Blocks;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 
-import appeng.api.AEApi;
-
 public final class CreativeTabFacade {
     public static ItemGroup instance = null;
 

src/main/java/appeng/core/Registration.java

@@ -22,7 +22,6 @@ import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScreenManager;
-import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.item.Item;
@@ -39,7 +38,11 @@ import net.minecraft.world.gen.feature.IFeatureConfig;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.*;
+import net.minecraftforge.client.event.ColorHandlerEvent;
+import net.minecraftforge.client.event.ModelBakeEvent;
+import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.ModDimension;
 import net.minecraftforge.common.crafting.CraftingHelper;
@@ -70,9 +73,53 @@ import appeng.api.networking.spatial.ISpatialCache;
 import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.networking.ticking.ITickManager;
 import appeng.bootstrap.IModelRegistry;
-import appeng.bootstrap.components.*;
-import appeng.client.gui.implementations.*;
-import appeng.client.render.effects.*;
+import appeng.bootstrap.components.IBlockRegistrationComponent;
+import appeng.bootstrap.components.IEntityRegistrationComponent;
+import appeng.bootstrap.components.IItemColorRegistrationComponent;
+import appeng.bootstrap.components.IItemRegistrationComponent;
+import appeng.bootstrap.components.IModelBakeComponent;
+import appeng.bootstrap.components.IModelRegistrationComponent;
+import appeng.bootstrap.components.ITileEntityRegistrationComponent;
+import appeng.client.gui.implementations.GuiCellWorkbench;
+import appeng.client.gui.implementations.GuiChest;
+import appeng.client.gui.implementations.GuiCondenser;
+import appeng.client.gui.implementations.GuiCraftAmount;
+import appeng.client.gui.implementations.GuiCraftConfirm;
+import appeng.client.gui.implementations.GuiCraftingCPU;
+import appeng.client.gui.implementations.GuiCraftingStatus;
+import appeng.client.gui.implementations.GuiCraftingTerm;
+import appeng.client.gui.implementations.GuiDrive;
+import appeng.client.gui.implementations.GuiFormationPlane;
+import appeng.client.gui.implementations.GuiGrinder;
+import appeng.client.gui.implementations.GuiIOPort;
+import appeng.client.gui.implementations.GuiInscriber;
+import appeng.client.gui.implementations.GuiInterface;
+import appeng.client.gui.implementations.GuiInterfaceTerminal;
+import appeng.client.gui.implementations.GuiLevelEmitter;
+import appeng.client.gui.implementations.GuiMEMonitorable;
+import appeng.client.gui.implementations.GuiMEPortableCell;
+import appeng.client.gui.implementations.GuiMolecularAssembler;
+import appeng.client.gui.implementations.GuiNetworkStatus;
+import appeng.client.gui.implementations.GuiNetworkTool;
+import appeng.client.gui.implementations.GuiPatternTerm;
+import appeng.client.gui.implementations.GuiPriority;
+import appeng.client.gui.implementations.GuiQNB;
+import appeng.client.gui.implementations.GuiQuartzKnife;
+import appeng.client.gui.implementations.GuiSecurityStation;
+import appeng.client.gui.implementations.GuiSkyChest;
+import appeng.client.gui.implementations.GuiSpatialIOPort;
+import appeng.client.gui.implementations.GuiStorageBus;
+import appeng.client.gui.implementations.GuiUpgradeable;
+import appeng.client.gui.implementations.GuiVibrationChamber;
+import appeng.client.gui.implementations.GuiWireless;
+import appeng.client.gui.implementations.GuiWirelessTerm;
+import appeng.client.render.effects.ChargedOreFX;
+import appeng.client.render.effects.CraftingFx;
+import appeng.client.render.effects.EnergyFx;
+import appeng.client.render.effects.LightningArcFX;
+import appeng.client.render.effects.LightningFX;
+import appeng.client.render.effects.MatterCannonFX;
+import appeng.client.render.effects.VibrantFX;
 import appeng.client.render.model.BiometricCardModel;
 import appeng.client.render.model.DriveModel;
 import appeng.client.render.model.MemoryCardModel;
@@ -81,7 +128,39 @@ import appeng.client.render.tesr.InscriberTESR;
 import appeng.client.render.tesr.SkyChestTESR;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.*;
+import appeng.container.implementations.ContainerCellWorkbench;
+import appeng.container.implementations.ContainerChest;
+import appeng.container.implementations.ContainerCondenser;
+import appeng.container.implementations.ContainerCraftAmount;
+import appeng.container.implementations.ContainerCraftConfirm;
+import appeng.container.implementations.ContainerCraftingCPU;
+import appeng.container.implementations.ContainerCraftingStatus;
+import appeng.container.implementations.ContainerCraftingTerm;
+import appeng.container.implementations.ContainerDrive;
+import appeng.container.implementations.ContainerFormationPlane;
+import appeng.container.implementations.ContainerGrinder;
+import appeng.container.implementations.ContainerIOPort;
+import appeng.container.implementations.ContainerInscriber;
+import appeng.container.implementations.ContainerInterface;
+import appeng.container.implementations.ContainerInterfaceTerminal;
+import appeng.container.implementations.ContainerLevelEmitter;
+import appeng.container.implementations.ContainerMEMonitorable;
+import appeng.container.implementations.ContainerMEPortableCell;
+import appeng.container.implementations.ContainerMolecularAssembler;
+import appeng.container.implementations.ContainerNetworkStatus;
+import appeng.container.implementations.ContainerNetworkTool;
+import appeng.container.implementations.ContainerPatternTerm;
+import appeng.container.implementations.ContainerPriority;
+import appeng.container.implementations.ContainerQNB;
+import appeng.container.implementations.ContainerQuartzKnife;
+import appeng.container.implementations.ContainerSecurityStation;
+import appeng.container.implementations.ContainerSkyChest;
+import appeng.container.implementations.ContainerSpatialIOPort;
+import appeng.container.implementations.ContainerStorageBus;
+import appeng.container.implementations.ContainerUpgradeable;
+import appeng.container.implementations.ContainerVibrationChamber;
+import appeng.container.implementations.ContainerWireless;
+import appeng.container.implementations.ContainerWirelessTerm;
 import appeng.core.features.registries.P2PTunnelRegistry;
 import appeng.core.features.registries.PartModels;
 import appeng.core.features.registries.cell.BasicCellHandler;
@@ -90,10 +169,27 @@ import appeng.core.features.registries.cell.CreativeCellHandler;
 import appeng.core.stats.AdvancementTriggers;
 import appeng.core.stats.AeStats;
 import appeng.core.stats.PartItemPredicate;
-import appeng.fluids.client.gui.*;
-import appeng.fluids.container.*;
+import appeng.fluids.client.gui.GuiFluidFormationPlane;
+import appeng.fluids.client.gui.GuiFluidIO;
+import appeng.fluids.client.gui.GuiFluidInterface;
+import appeng.fluids.client.gui.GuiFluidLevelEmitter;
+import appeng.fluids.client.gui.GuiFluidStorageBus;
+import appeng.fluids.client.gui.GuiFluidTerminal;
+import appeng.fluids.container.ContainerFluidFormationPlane;
+import appeng.fluids.container.ContainerFluidIO;
+import appeng.fluids.container.ContainerFluidInterface;
+import appeng.fluids.container.ContainerFluidLevelEmitter;
+import appeng.fluids.container.ContainerFluidStorageBus;
+import appeng.fluids.container.ContainerFluidTerminal;
 import appeng.fluids.registries.BasicFluidCellGuiHandler;
-import appeng.me.cache.*;
+import appeng.me.cache.CraftingGridCache;
+import appeng.me.cache.EnergyGridCache;
+import appeng.me.cache.GridStorageCache;
+import appeng.me.cache.P2PCache;
+import appeng.me.cache.PathGridCache;
+import appeng.me.cache.SecurityCache;
+import appeng.me.cache.SpatialPylonCache;
+import appeng.me.cache.TickManagerCache;
 import appeng.recipes.conditions.FeaturesEnabled;
 import appeng.recipes.game.DisassembleRecipe;
 import appeng.recipes.handlers.GrinderRecipe;
@@ -151,12 +247,8 @@ final class Registration {
 
         // TODO: Do not use the internal API
         final ApiDefinitions definitions = Api.INSTANCE.definitions();
-        final IModelRegistry registry = new IModelRegistry() {
-            @Override
-            public void registerItemVariants(Item item, ResourceLocation... names) {
+        final IModelRegistry registry = (item, names) -> {
 // FIXME REMOVE OR IMPL
-            }
-
         };
         final Dist dist = FMLEnvironment.dist;
         definitions.getRegistry().getBootstrapComponents(IModelRegistrationComponent.class)

src/main/java/appeng/core/api/ApiStorage.java

@@ -18,7 +18,6 @@
 
 package appeng.core.api;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 

src/main/java/appeng/core/api/definitions/ApiBlocks.java

@@ -19,10 +19,12 @@
 package appeng.core.api.definitions;
 
 import static appeng.block.AEBaseBlock.defaultProps;
-import static appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType;
-import static appeng.decorative.solid.BlockSkyStone.SkystoneType;
 
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.DispenserBlock;
+import net.minecraft.block.SlabBlock;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.StairsBlock;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.entity.EntityClassification;
@@ -36,11 +38,40 @@ import appeng.api.definitions.IBlocks;
 import appeng.api.definitions.ITileDefinition;
 import appeng.api.features.AEFeature;
 import appeng.block.AEBaseBlockItemChargeable;
-import appeng.block.crafting.*;
+import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType;
+import appeng.block.crafting.BlockCraftingMonitor;
+import appeng.block.crafting.BlockCraftingStorage;
+import appeng.block.crafting.BlockMolecularAssembler;
+import appeng.block.crafting.CraftingUnitBlock;
+import appeng.block.crafting.ItemCraftingStorage;
 import appeng.block.grindstone.BlockCrank;
 import appeng.block.grindstone.BlockGrinder;
-import appeng.block.misc.*;
-import appeng.block.networking.*;
+import appeng.block.misc.BlockCellWorkbench;
+import appeng.block.misc.BlockCharger;
+import appeng.block.misc.BlockCondenser;
+import appeng.block.misc.BlockInscriber;
+import appeng.block.misc.BlockInterface;
+import appeng.block.misc.BlockLightDetector;
+import appeng.block.misc.BlockQuartzFixture;
+import appeng.block.misc.BlockQuartzGrowthAccelerator;
+import appeng.block.misc.BlockSecurityStation;
+import appeng.block.misc.BlockSkyCompass;
+import appeng.block.misc.BlockTinyTNT;
+import appeng.block.misc.BlockVibrationChamber;
+import appeng.block.misc.InscriberRendering;
+import appeng.block.misc.SecurityStationRendering;
+import appeng.block.misc.SkyCompassRendering;
+import appeng.block.networking.BlockCableBus;
+import appeng.block.networking.BlockController;
+import appeng.block.networking.BlockCreativeEnergyCell;
+import appeng.block.networking.BlockDenseEnergyCell;
+import appeng.block.networking.BlockEnergyAcceptor;
+import appeng.block.networking.BlockEnergyCell;
+import appeng.block.networking.BlockEnergyCellRendering;
+import appeng.block.networking.BlockWireless;
+import appeng.block.networking.CableBusRendering;
+import appeng.block.networking.ControllerRendering;
+import appeng.block.networking.WirelessRendering;
 import appeng.block.paint.BlockPaint;
 import appeng.block.paint.PaintRendering;
 import appeng.block.qnb.BlockQuantumLinkChamber;
@@ -49,8 +80,18 @@ import appeng.block.qnb.QuantumBridgeRendering;
 import appeng.block.spatial.BlockMatrixFrame;
 import appeng.block.spatial.BlockSpatialIOPort;
 import appeng.block.spatial.BlockSpatialPylon;
-import appeng.block.storage.*;
-import appeng.bootstrap.*;
+import appeng.block.storage.BlockChest;
+import appeng.block.storage.BlockDrive;
+import appeng.block.storage.BlockIOPort;
+import appeng.block.storage.BlockSkyChest;
+import appeng.block.storage.ChestRendering;
+import appeng.block.storage.DriveRendering;
+import appeng.bootstrap.BlockRenderingCustomizer;
+import appeng.bootstrap.FeatureFactory;
+import appeng.bootstrap.IBlockRendering;
+import appeng.bootstrap.IItemRendering;
+import appeng.bootstrap.TileEntityRendering;
+import appeng.bootstrap.TileEntityRenderingCustomizer;
 import appeng.bootstrap.components.IInitComponent;
 import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.client.render.crafting.CraftingCubeRendering;
@@ -62,18 +103,54 @@ import appeng.client.render.tesr.CrankTESR;
 import appeng.client.render.tesr.DriveLedTileEntityRenderer;
 import appeng.client.render.tesr.SkyChestTESR;
 import appeng.core.AppEng;
-import appeng.debug.*;
+import appeng.debug.BlockChunkloader;
+import appeng.debug.BlockCubeGenerator;
+import appeng.debug.BlockEnergyGenerator;
+import appeng.debug.BlockItemGen;
+import appeng.debug.BlockPhantomNode;
+import appeng.debug.TileChunkLoader;
+import appeng.debug.TileCubeGenerator;
+import appeng.debug.TileEnergyGenerator;
+import appeng.debug.TileItemGen;
+import appeng.debug.TilePhantomNode;
 import appeng.decorative.AEDecorativeBlock;
-import appeng.decorative.solid.*;
+import appeng.decorative.solid.BlockChargedQuartzOre;
+import appeng.decorative.solid.BlockQuartzGlass;
+import appeng.decorative.solid.BlockQuartzLamp;
+import appeng.decorative.solid.BlockQuartzOre;
+import appeng.decorative.solid.BlockQuartzPillar;
+import appeng.decorative.solid.BlockSkyStone;
+import appeng.decorative.solid.BlockSkyStone.SkystoneType;
 import appeng.entity.EntityTinyTNTPrimed;
 import appeng.fluids.block.BlockFluidInterface;
 import appeng.fluids.tile.TileFluidInterface;
 import appeng.hooks.DispenserBehaviorTinyTNT;
-import appeng.tile.crafting.*;
+import appeng.tile.crafting.MolecularAssemblerRenderer;
+import appeng.tile.crafting.TileCraftingMonitorTile;
+import appeng.tile.crafting.TileCraftingStorageTile;
+import appeng.tile.crafting.TileCraftingTile;
+import appeng.tile.crafting.TileMolecularAssembler;
 import appeng.tile.grindstone.TileCrank;
 import appeng.tile.grindstone.TileGrinder;
-import appeng.tile.misc.*;
-import appeng.tile.networking.*;
+import appeng.tile.misc.TileCellWorkbench;
+import appeng.tile.misc.TileCharger;
+import appeng.tile.misc.TileCondenser;
+import appeng.tile.misc.TileInscriber;
+import appeng.tile.misc.TileInterface;
+import appeng.tile.misc.TileLightDetector;
+import appeng.tile.misc.TilePaint;
+import appeng.tile.misc.TileQuartzGrowthAccelerator;
+import appeng.tile.misc.TileSecurityStation;
+import appeng.tile.misc.TileSkyCompass;
+import appeng.tile.misc.TileVibrationChamber;
+import appeng.tile.networking.CableBusTESR;
+import appeng.tile.networking.TileCableBus;
+import appeng.tile.networking.TileController;
+import appeng.tile.networking.TileCreativeEnergyCell;
+import appeng.tile.networking.TileDenseEnergyCell;
+import appeng.tile.networking.TileEnergyAcceptor;
+import appeng.tile.networking.TileEnergyCell;
+import appeng.tile.networking.TileWireless;
 import appeng.tile.qnb.TileQuantumBridge;
 import appeng.tile.spatial.TileSpatialIOPort;
 import appeng.tile.spatial.TileSpatialPylon;

src/main/java/appeng/core/api/definitions/ApiItems.java

@@ -35,7 +35,11 @@ import appeng.core.CreativeTabFacade;
 import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
 import appeng.core.features.ItemStackSrc;
-import appeng.debug.*;
+import appeng.debug.ToolDebugCard;
+import appeng.debug.ToolDebugPartPlacer;
+import appeng.debug.ToolEraser;
+import appeng.debug.ToolMeteoritePlacer;
+import appeng.debug.ToolReplicatorCard;
 import appeng.entity.EntityGrowingCrystal;
 import appeng.fluids.items.BasicFluidStorageCell;
 import appeng.fluids.items.FluidDummyItem;
@@ -43,16 +47,33 @@ import appeng.fluids.items.FluidDummyItemRendering;
 import appeng.hooks.DispenserBlockTool;
 import appeng.hooks.DispenserMatterCannon;
 import appeng.items.materials.MaterialType;
-import appeng.items.misc.*;
+import appeng.items.misc.ItemCrystalSeed;
+import appeng.items.misc.ItemEncodedPattern;
+import appeng.items.misc.ItemPaintBall;
+import appeng.items.misc.ItemPaintBallRendering;
 import appeng.items.parts.FacadeRendering;
 import appeng.items.parts.ItemFacade;
 import appeng.items.storage.BasicItemStorageCell;
 import appeng.items.storage.ItemCreativeStorageCell;
 import appeng.items.storage.ItemSpatialStorageCell;
 import appeng.items.storage.ItemViewCell;
-import appeng.items.tools.*;
-import appeng.items.tools.powered.*;
-import appeng.items.tools.quartz.*;
+import appeng.items.tools.ToolBiometricCard;
+import appeng.items.tools.ToolMemoryCard;
+import appeng.items.tools.ToolNetworkTool;
+import appeng.items.tools.powered.ToolChargedStaff;
+import appeng.items.tools.powered.ToolColorApplicator;
+import appeng.items.tools.powered.ToolColorApplicatorRendering;
+import appeng.items.tools.powered.ToolEntropyManipulator;
+import appeng.items.tools.powered.ToolMatterCannon;
+import appeng.items.tools.powered.ToolPortableCell;
+import appeng.items.tools.powered.ToolWirelessTerminal;
+import appeng.items.tools.quartz.ToolQuartzAxe;
+import appeng.items.tools.quartz.ToolQuartzCuttingKnife;
+import appeng.items.tools.quartz.ToolQuartzHoe;
+import appeng.items.tools.quartz.ToolQuartzPickaxe;
+import appeng.items.tools.quartz.ToolQuartzSpade;
+import appeng.items.tools.quartz.ToolQuartzSword;
+import appeng.items.tools.quartz.ToolQuartzWrench;
 
 /**
  * Internal implementation for the API items
@@ -540,6 +561,7 @@ public final class ApiItems implements IItems {
         return this.toolReplicatorCard;
     }
 
+    @Override
     public IItemDefinition dummyFluidItem() {
         return this.dummyFluidItem;
     }

src/main/java/appeng/core/api/definitions/ApiParts.java

@@ -18,10 +18,7 @@
 
 package appeng.core.api.definitions;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -32,21 +29,56 @@ import appeng.api.parts.IPart;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEColoredItemDefinition;
 import appeng.bootstrap.FeatureFactory;
-import appeng.client.render.cablebus.P2PTunnelFrequencyModel;
 import appeng.core.AppEng;
 import appeng.core.CreativeTab;
-import appeng.core.features.*;
+import appeng.core.features.ActivityState;
+import appeng.core.features.ColoredItemDefinition;
+import appeng.core.features.ItemStackSrc;
 import appeng.core.features.registries.PartModels;
-import appeng.fluids.parts.*;
+import appeng.fluids.parts.PartFluidAnnihilationPlane;
+import appeng.fluids.parts.PartFluidExportBus;
+import appeng.fluids.parts.PartFluidFormationPlane;
+import appeng.fluids.parts.PartFluidImportBus;
+import appeng.fluids.parts.PartFluidInterface;
+import appeng.fluids.parts.PartFluidLevelEmitter;
+import appeng.fluids.parts.PartFluidStorageBus;
+import appeng.fluids.parts.PartFluidTerminal;
 import appeng.items.parts.ColoredPartItem;
 import appeng.items.parts.ItemPart;
 import appeng.items.parts.ItemPartRendering;
 import appeng.items.parts.PartType;
-import appeng.parts.automation.*;
-import appeng.parts.misc.*;
-import appeng.parts.networking.*;
-import appeng.parts.p2p.*;
-import appeng.parts.reporting.*;
+import appeng.parts.automation.PartAnnihilationPlane;
+import appeng.parts.automation.PartExportBus;
+import appeng.parts.automation.PartFormationPlane;
+import appeng.parts.automation.PartIdentityAnnihilationPlane;
+import appeng.parts.automation.PartImportBus;
+import appeng.parts.automation.PartLevelEmitter;
+import appeng.parts.misc.PartCableAnchor;
+import appeng.parts.misc.PartInterface;
+import appeng.parts.misc.PartInvertedToggleBus;
+import appeng.parts.misc.PartStorageBus;
+import appeng.parts.misc.PartToggleBus;
+import appeng.parts.networking.PartCableCovered;
+import appeng.parts.networking.PartCableGlass;
+import appeng.parts.networking.PartCableSmart;
+import appeng.parts.networking.PartDenseCableCovered;
+import appeng.parts.networking.PartDenseCableSmart;
+import appeng.parts.networking.PartQuartzFiber;
+import appeng.parts.p2p.PartP2PFEPower;
+import appeng.parts.p2p.PartP2PFluids;
+import appeng.parts.p2p.PartP2PItems;
+import appeng.parts.p2p.PartP2PLight;
+import appeng.parts.p2p.PartP2PRedstone;
+import appeng.parts.p2p.PartP2PTunnelME;
+import appeng.parts.reporting.PartConversionMonitor;
+import appeng.parts.reporting.PartCraftingTerminal;
+import appeng.parts.reporting.PartDarkPanel;
+import appeng.parts.reporting.PartInterfaceTerminal;
+import appeng.parts.reporting.PartPanel;
+import appeng.parts.reporting.PartPatternTerminal;
+import appeng.parts.reporting.PartSemiDarkPanel;
+import appeng.parts.reporting.PartStorageMonitor;
+import appeng.parts.reporting.PartTerminal;
 
 /**
  * Internal implementation for the API parts

src/main/java/appeng/core/features/registries/WirelessRegistry.java

@@ -32,7 +32,6 @@ import appeng.api.features.IWirelessTermHandler;
 import appeng.api.features.IWirelessTermRegistry;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.ContainerMEPortableCell;
 import appeng.container.implementations.ContainerWirelessTerm;
 import appeng.core.localization.PlayerMessages;
 import appeng.util.Platform;

src/main/java/appeng/core/features/registries/WorldGenRegistry.java

@@ -23,8 +23,6 @@ import java.util.HashSet;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraft.world.dimension.Dimension;
-import net.minecraft.world.dimension.DimensionType;
-import net.minecraftforge.common.extensions.IForgeDimension;
 
 import appeng.api.features.IWorldGen;
 

src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java

@@ -13,12 +13,9 @@ import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEStack;
-import appeng.api.util.AEPartLocation;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.implementations.ContainerMEMonitorable;
-import appeng.container.implementations.ContainerWireless;
-import appeng.util.Platform;
 
 public class BasicItemCellGuiHandler implements ICellGuiHandler {
     @Override

src/main/java/appeng/core/localization/ButtonToolTips.java

@@ -18,7 +18,6 @@
 
 package appeng.core.localization;
 
-import net.minecraft.client.resources.I18n;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 

src/main/java/appeng/core/stats/IAdvancementTrigger.java

@@ -18,7 +18,6 @@
 
 package appeng.core.stats;
 
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 
 @FunctionalInterface

src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java

@@ -18,12 +18,10 @@
 
 package appeng.core.sync;
 
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 
-import net.jodah.typetools.TypeResolver;
 import net.minecraft.network.PacketBuffer;
 
 import appeng.core.sync.packets.PacketAssemblerAnimation;

src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java

@@ -18,8 +18,6 @@
 
 package appeng.core.sync.network;
 
-import java.lang.reflect.InvocationTargetException;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.INetHandler;

src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java

@@ -18,8 +18,6 @@
 
 package appeng.core.sync.network;
 
-import java.lang.reflect.InvocationTargetException;
-
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.PacketBuffer;

src/main/java/appeng/core/sync/packets/PacketConfigButton.java

@@ -25,11 +25,8 @@ import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.Settings;
-import appeng.api.util.IConfigManager;
-import appeng.api.util.IConfigurableObject;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.util.Platform;
 
 public final class PacketConfigButton extends AppEngPacket {
     private final Settings option;

src/main/java/appeng/core/sync/packets/PacketCraftRequest.java

@@ -24,7 +24,6 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.tileentity.TileEntity;
 
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
@@ -35,7 +34,6 @@ import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.implementations.ContainerCraftAmount;
 import appeng.container.implementations.ContainerCraftConfirm;
-import appeng.container.implementations.ContainerInscriber;
 import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;

src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java

@@ -18,8 +18,6 @@
 
 package appeng.core.sync.packets;
 
-import java.io.IOException;
-
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.PlayerEntity;
@@ -188,7 +186,7 @@ public class PacketJEIRecipe extends AppEngPacket {
     }
 
     /**
-     * 
+     *
      * @param slot
      * @param is   itemstack
      * @return is if it can be used, else EMPTY

src/main/java/appeng/core/sync/packets/PacketPatternSlot.java

@@ -18,8 +18,6 @@
 
 package appeng.core.sync.packets;
 
-import java.io.IOException;
-
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.PlayerEntity;

src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java

@@ -24,7 +24,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.container.Container;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.registries.ForgeRegistries;
 
 import appeng.container.AEBaseContainer;
@@ -32,7 +31,6 @@ import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.util.Platform;
 
 public class PacketSwitchGuis extends AppEngPacket {
 

src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java

@@ -24,10 +24,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.SoundType;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.SimpleSound;
-import net.minecraft.client.particle.Particle;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;

src/main/java/appeng/core/sync/packets/PacketValueConfig.java

@@ -18,8 +18,6 @@
 
 package appeng.core.sync.packets;
 
-import java.io.IOException;
-
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.client.Minecraft;

src/main/java/appeng/core/worlddata/CompassData.java

@@ -18,8 +18,6 @@
 
 package appeng.core.worlddata;
 
-import java.io.File;
-
 import javax.annotation.Nonnull;
 
 import com.google.common.base.Preconditions;

src/main/java/appeng/core/worlddata/IWorldGridStorageData.java

@@ -19,7 +19,6 @@
 package appeng.core.worlddata;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 import appeng.me.GridStorage;
 

src/main/java/appeng/core/worlddata/IWorldPlayerData.java

@@ -24,8 +24,6 @@ import javax.annotation.Nullable;
 
 import com.mojang.authlib.GameProfile;
 
-import net.minecraft.entity.player.PlayerEntity;
-
 /**
  * @author thatsIch
  * @version rv3 - 30.05.2015
@@ -35,7 +33,7 @@ public interface IWorldPlayerData {
     /**
      * Gets the UUID of the Minecraft profile associated with the given ME player
      * id.
-     * 
+     *
      * @param playerID An ME player id.
      * @return Null if the ME player id is unknown, otherwise the unique id of the
      *         Minecraft profile it originates from.

src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java

@@ -18,8 +18,6 @@
 
 package appeng.core.worlddata;
 
-import javax.annotation.Nonnull;
-
 import com.google.common.base.Preconditions;
 
 /**