Reformatted, and ported back some enhancements from the Forge version.

src/main/java/appeng/tile/AEBaseBlockEntity.java

@@ -361,7 +361,6 @@ public class AEBaseBlockEntity extends BlockEntity implements IOrientable, IComm
      * null means nothing to store...
      *
      * @param from source of settings
-     *
      * @return compound of source
      */
     public CompoundTag downloadSettings(final SettingsFrom from) {

src/main/java/appeng/tile/crafting/CraftingBlockEntity.java

@@ -18,11 +18,7 @@
 
 package appeng.tile.crafting;
 
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Optional;
+import java.util.*;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntityType;

src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java

@@ -36,7 +36,6 @@ import net.minecraft.client.util.ModelIdentifier;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Identifier;
 
 import appeng.client.render.effects.ParticleTypes;
 import appeng.core.AppEng;

src/main/java/appeng/tile/inventory/AppEngCellInventory.java

@@ -1,4 +1,3 @@
-
 package appeng.tile.inventory;
 
 import net.minecraft.item.ItemStack;

src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java

@@ -19,11 +19,7 @@
 package appeng.tile.misc;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 import io.netty.buffer.Unpooled;
 

src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java

@@ -37,11 +37,7 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
-import appeng.api.config.SortDir;
-import appeng.api.config.SortOrder;
-import appeng.api.config.ViewItems;
+import appeng.api.config.*;
 import appeng.api.events.LocatableEventAnnounce;
 import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
 import appeng.api.features.ILocatable;
@@ -61,11 +57,7 @@ import appeng.api.storage.ITerminalHost;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
-import appeng.api.util.AECableType;
-import appeng.api.util.AEColor;
-import appeng.api.util.AEPartLocation;
-import appeng.api.util.DimensionalCoord;
-import appeng.api.util.IConfigManager;
+import appeng.api.util.*;
 import appeng.core.Api;
 import appeng.helpers.PlayerSecurityWrapper;
 import appeng.me.GridAccessException;

src/main/java/appeng/tile/networking/CableBusBlockEntity.java

@@ -22,9 +22,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.player.PlayerEntity;

src/main/java/appeng/tile/networking/ControllerBlockEntity.java

@@ -23,7 +23,6 @@ import java.util.EnumSet;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.Direction;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;

src/main/java/appeng/tile/powersink/IExternalPowerSink.java

@@ -35,7 +35,6 @@ public interface IExternalPowerSink extends IAEPowerStorage {
     double injectExternalPower(PowerUnits externalUnit, double amount, Actionable mode);
 
     /**
-     *
      * @param externalUnit     The {@link PowerUnits} used by the input
      * @param maxPowerRequired Limit the demand to this upper bound.
      * @return The amount of power demanded by the sink.

src/main/java/appeng/tile/storage/DriveBlockEntity.java

@@ -19,13 +19,7 @@
 package appeng.tile.storage;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.annotation.Nullable;
 
@@ -93,19 +87,16 @@ public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestO
 
     /**
      * The state of all cells inside a drive as bitset, using the following format.
-     *
+     * <p>
      * - Bit 31: power state. 0 = off, 1 = on.
-     * 
+     * <p>
      * - Bit 30: reserved
-     * 
+     * <p>
      * - Bit 29-0: 3 bits for the state of each cell
-     *
+     * <p>
      * Cell states:
-     * 
+     * <p>
      * - Bit 2-0: {@link CellState} ordinal
-     *
-     *
-     * 
      */
     private int state = 0;
 

src/main/java/appeng/tile/storage/IOPortBlockEntity.java

@@ -34,13 +34,7 @@ import net.minecraft.world.World;
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.Actionable;
-import appeng.api.config.FullnessMode;
-import appeng.api.config.OperationMode;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
-import appeng.api.config.YesNo;
+import appeng.api.config.*;
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridNode;