From 6c544f2211580bc5ccba5c53fd47629dd634e16b Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sat, 15 Aug 2020 02:51:03 +0200 Subject: [PATCH] Reformatted, and ported back some enhancements from the Forge version. --- src/api/java/appeng/api/AEAddon.java | 12 +- src/api/java/appeng/api/IAEAddon.java | 7 +- .../appeng/api/client/ICellModelRegistry.java | 14 +- .../java/appeng/api/client/IClientHelper.java | 2 +- .../java/appeng/api/config/PowerUnits.java | 5 +- src/api/java/appeng/api/config/Upgrades.java | 6 +- .../api/definitions/IBlockDefinition.java | 1 - .../definitions/IComparableDefinition.java | 1 - .../ExistingConnectionException.java | 2 +- .../exceptions/FailedConnectionException.java | 4 +- .../NullNodeConnectionException.java | 2 +- .../SecurityConnectionException.java | 2 +- .../appeng/api/features/IChargerRegistry.java | 10 +- .../api/features/IItemComparisonProvider.java | 2 - .../api/features/ILocatableRegistry.java | 1 - .../features/IMatterCannonAmmoRegistry.java | 1 - .../api/features/INetworkEncodable.java | 1 - .../api/features/IP2PTunnelRegistry.java | 1 - .../appeng/api/features/IPlayerRegistry.java | 3 - .../api/features/IWirelessTermHandler.java | 4 - .../api/features/IWirelessTermRegistry.java | 1 - .../java/appeng/api/features/IWorldGen.java | 1 - .../implementations/guiobjects/IGuiItem.java | 1 - .../items/IAEItemPowerStorage.java | 1 - .../api/implementations/items/IAEWrench.java | 1 - .../implementations/items/IBiometricCard.java | 2 - .../implementations/items/IMemoryCard.java | 11 +- .../items/ISpatialStorageCell.java | 7 - .../implementations/items/IStorageCell.java | 11 +- .../items/IStorageComponent.java | 2 - .../implementations/items/IUpgradeModule.java | 1 - .../api/implementations/parts/ICablePart.java | 4 +- .../implementations/tiles/IChestOrDrive.java | 2 - .../tiles/ICraftingMachine.java | 1 - .../api/implementations/tiles/ICrankable.java | 6 +- .../tiles/ISegmentedInventory.java | 1 - .../appeng/api/movable/IMovableHandler.java | 3 +- .../appeng/api/movable/IMovableRegistry.java | 25 +- src/api/java/appeng/api/networking/IGrid.java | 6 +- .../appeng/api/networking/IGridBlock.java | 4 +- .../appeng/api/networking/IGridCache.java | 6 +- .../api/networking/IGridCacheRegistry.java | 1 - .../api/networking/IGridConnection.java | 6 +- .../appeng/api/networking/IGridHelper.java | 6 +- .../java/appeng/api/networking/IGridHost.java | 1 - .../java/appeng/api/networking/IGridNode.java | 11 +- .../appeng/api/networking/IGridVisitor.java | 3 +- .../networking/crafting/ICraftingGrid.java | 6 - .../networking/crafting/ICraftingMedium.java | 1 - .../crafting/ICraftingPatternDetails.java | 12 +- .../crafting/ICraftingProviderHelper.java | 2 +- .../crafting/ICraftingRequester.java | 3 +- .../networking/crafting/ICraftingWatcher.java | 4 +- .../networking/energy/IAEPowerStorage.java | 9 +- .../api/networking/energy/IEnergyGrid.java | 7 +- .../energy/IEnergyGridProvider.java | 35 +- .../api/networking/energy/IEnergySource.java | 1 - .../api/networking/energy/IEnergyWatcher.java | 4 +- .../events/MENetworkBootingStatusChange.java | 2 +- .../events/MENetworkCellArrayUpdate.java | 4 +- .../events/MENetworkChannelsChanged.java | 2 +- .../api/networking/events/MENetworkEvent.java | 2 +- .../events/MENetworkPowerIdleChange.java | 2 +- .../events/MENetworkPowerStatusChange.java | 2 +- .../events/MENetworkPowerStorage.java | 4 +- .../events/MENetworkStorageEvent.java | 4 +- .../networking/security/IActionSource.java | 15 +- .../networking/security/ISecurityGrid.java | 2 - .../api/networking/storage/IStackWatcher.java | 4 +- .../api/networking/storage/IStorageGrid.java | 4 +- .../api/networking/ticking/IGridTickable.java | 7 +- .../api/networking/ticking/ITickManager.java | 4 +- .../networking/ticking/TickingRequest.java | 8 +- .../java/appeng/api/parts/IAlphaPassItem.java | 1 - .../api/parts/IDynamicPartBakedModel.java | 5 - .../appeng/api/parts/IFacadeContainer.java | 5 +- .../java/appeng/api/parts/IFacadePart.java | 2 +- src/api/java/appeng/api/parts/IPart.java | 16 +- .../api/parts/IPartCollisionHelper.java | 2 +- .../java/appeng/api/parts/IPartHelper.java | 1 - src/api/java/appeng/api/parts/IPartHost.java | 10 +- src/api/java/appeng/api/parts/IPartItem.java | 11 +- src/api/java/appeng/api/parts/IPartModel.java | 2 +- .../java/appeng/api/parts/IPartModels.java | 4 +- src/api/java/appeng/api/parts/LayerBase.java | 8 +- .../java/appeng/api/parts/SelectedPart.java | 1 - .../appeng/api/storage/ICellRegistry.java | 7 +- .../java/appeng/api/storage/IMEInventory.java | 7 +- .../api/storage/IMEInventoryHandler.java | 3 - .../storage/IMEMonitorHandlerReceiver.java | 1 - .../appeng/api/storage/IStorageChannel.java | 4 +- .../appeng/api/storage/IStorageHelper.java | 15 +- .../storage/IStorageMonitorableAccessor.java | 1 - .../api/storage/cells/ICellGuiHandler.java | 1 - .../api/storage/cells/ICellHandler.java | 9 +- .../api/storage/cells/ICellProvider.java | 4 +- .../api/storage/cells/ICellWorkbenchItem.java | 7 +- .../api/storage/cells/ISaveProvider.java | 1 - .../api/storage/data/IAEFluidStack.java | 6 +- .../appeng/api/storage/data/IAEItemStack.java | 8 +- .../appeng/api/storage/data/IAEStack.java | 9 +- .../api/storage/data/IItemContainer.java | 5 +- .../appeng/api/storage/data/IItemList.java | 4 +- .../java/appeng/api/util/AEAxisAlignedBB.java | 2 +- src/api/java/appeng/api/util/AEColor.java | 2 +- .../api/util/AEColoredItemDefinition.java | 2 - .../java/appeng/api/util/IConfigManager.java | 4 +- src/api/java/appeng/api/util/IOrientable.java | 4 +- .../appeng/api/util/IOrientableBlock.java | 1 - src/api/java/appeng/api/util/WorldCoord.java | 2 +- src/datagen/java/appeng/data/Entrypoint.java | 4 - .../providers/recipes/SlabStairRecipes.java | 4 +- .../providers/tags/ConventionTagProvider.java | 1 - src/datagen/resources/fabric.mod.json | 1 - src/main/java/appeng/block/AEBaseBlock.java | 6 - .../java/appeng/block/AEBaseTileBlock.java | 5 +- .../block/crafting/CraftingStorageItem.java | 5 - .../appeng/block/misc/InscriberBlock.java | 2 +- .../appeng/block/misc/InscriberRendering.java | 1 - .../appeng/block/misc/QuartzFixtureBlock.java | 6 +- .../block/networking/WirelessBlock.java | 1 - .../block/networking/WirelessRendering.java | 1 - .../appeng/block/paint/PaintSplotches.java | 1 - .../block/paint/PaintSplotchesBakedModel.java | 1 - .../block/paint/PaintSplotchesBlock.java | 9 +- .../block/paint/PaintSplotchesModel.java | 1 - .../block/paint/PaintSplotchesRendering.java | 1 - .../appeng/block/qnb/QnbFormedBakedModel.java | 1 - .../java/appeng/block/qnb/QnbFormedModel.java | 1 - .../java/appeng/block/qnb/QnbFormedState.java | 1 - .../block/qnb/QuantumBridgeRendering.java | 1 - .../block/spatial/SpatialPylonBlock.java | 1 - .../appeng/block/storage/SkyChestBlock.java | 4 +- .../appeng/bootstrap/BlockEntityBuilder.java | 1 - .../java/appeng/bootstrap/BlockRendering.java | 1 - .../java/appeng/bootstrap/EntityBuilder.java | 1 - .../java/appeng/bootstrap/FeatureFactory.java | 8 +- .../appeng/bootstrap/IBlockRendering.java | 1 - .../IItemColorRegistrationComponent.java | 3 - .../components/ItemColorComponent.java | 2 - src/main/java/appeng/client/ActionKey.java | 1 - src/main/java/appeng/client/AppEngClient.java | 112 +---- .../java/appeng/client/gui/AEBaseScreen.java | 17 +- .../java/appeng/client/gui/Size1Slot.java | 1 - .../gui/implementations/AESubScreen.java | 30 +- .../implementations/CellWorkbenchScreen.java | 6 +- .../implementations/CraftConfirmScreen.java | 1 - .../implementations/CraftingCPUScreen.java | 1 - .../InterfaceTerminalScreen.java | 15 +- .../implementations/LevelEmitterScreen.java | 10 +- .../implementations/MEMonitorableScreen.java | 13 +- .../gui/implementations/PriorityScreen.java | 2 - .../implementations/QuartzKnifeScreen.java | 1 - .../gui/implementations/StorageBusScreen.java | 6 +- .../implementations/UpgradeableScreen.java | 7 +- .../client/gui/widgets/AETextField.java | 2 +- .../client/gui/widgets/CustomSlotWidget.java | 1 - .../appeng/client/gui/widgets/ITooltip.java | 2 +- .../appeng/client/gui/widgets/IconButton.java | 2 +- .../gui/widgets/SettingToggleButton.java | 19 +- .../client/render/StackSizeRenderer.java | 2 +- .../client/render/TesrRenderHelper.java | 1 + .../client/render/cablebus/CableBuilder.java | 9 +- .../render/cablebus/CableBusBakedModel.java | 8 +- .../render/cablebus/CableBusRenderState.java | 6 +- .../client/render/cablebus/CubeBuilder.java | 5 +- .../client/render/cablebus/FacadeBuilder.java | 14 +- .../render/cablebus/FacadeRenderState.java | 1 - .../P2PTunnelFrequencyBakedModel.java | 1 - .../client/render/effects/LightningArcFX.java | 1 - .../client/render/effects/ParticleTypes.java | 8 - .../client/render/model/SkyCompassModel.java | 6 - .../spatial/SpatialPylonBakedModel.java | 8 +- .../client/render/tesr/InscriberTESR.java | 1 - .../client/render/tesr/SkyChestTESR.java | 1 - .../client/render/tesr/SkyCompassTESR.java | 4 - .../appeng/container/AEBaseContainer.java | 9 +- .../FormationPlaneContainer.java | 6 +- .../implementations/IOPortContainer.java | 6 +- .../LevelEmitterContainer.java | 8 +- .../MEMonitorableContainer.java | 8 +- .../implementations/PatternTermContainer.java | 13 +- .../implementations/PriorityContainer.java | 1 - .../implementations/StorageBusContainer.java | 7 +- .../implementations/UpgradeableContainer.java | 14 +- .../interfaces/IInventorySlotAware.java | 3 +- .../interfaces/IProgressProvider.java | 4 +- src/main/java/appeng/core/AELog.java | 61 ++- src/main/java/appeng/core/Api.java | 10 +- src/main/java/appeng/core/AppEng.java | 6 +- src/main/java/appeng/core/AppEngBase.java | 1 - .../java/appeng/core/AppEngBootstrap.java | 10 +- .../java/appeng/core/api/ApiClientHelper.java | 2 +- .../core/api/client/ApiCellModelRegistry.java | 4 +- .../core/api/definitions/ApiBlocks.java | 98 +--- .../appeng/core/api/definitions/ApiItems.java | 38 +- .../appeng/core/api/definitions/ApiParts.java | 42 +- .../registries/MovableTileRegistry.java | 7 +- .../registries/P2PTunnelRegistry.java | 1 - .../registries/RegistryContainer.java | 9 +- .../cell/BasicItemCellGuiHandler.java | 1 - .../appeng/core/sync/packets/ClickPacket.java | 4 +- .../sync/packets/CompressedNBTPacket.java | 6 +- .../sync/packets/InventoryActionPacket.java | 3 - .../packets/ItemTransitionEffectPacket.java | 1 - .../core/sync/packets/JEIRecipePacket.java | 1 - .../core/sync/packets/SpawnEntityPacket.java | 3 +- .../core/worlddata/MeteorDataNameEncoder.java | 2 - .../appeng/core/worlddata/StorageData.java | 1 - .../java/appeng/core/worlddata/WorldData.java | 5 +- .../java/appeng/crafting/CraftingJob.java | 1 - src/main/java/appeng/debug/EraserItem.java | 2 +- .../java/appeng/debug/ItemGenBlockEntity.java | 1 - .../java/appeng/debug/ReplicatorCardItem.java | 3 - .../decorative/solid/QuartzOreBlock.java | 1 - .../client/gui/FluidFormationPlaneScreen.java | 1 - .../client/gui/FluidLevelEmitterScreen.java | 3 - .../client/gui/FluidStorageBusScreen.java | 6 +- .../gui/widgets/OptionalFluidSlotWidget.java | 1 - .../container/FluidConfigurableContainer.java | 1 - .../FluidFormationPlaneContainer.java | 1 - .../container/FluidStorageBusContainer.java | 7 +- .../container/FluidTerminalContainer.java | 11 +- .../fluids/container/IFluidSyncContainer.java | 1 - .../fluids/helper/DualityFluidInterface.java | 6 +- .../appeng/fluids/helper/FluidSyncHelper.java | 1 - .../parts/FluidAnnihilationPlanePart.java | 3 +- .../fluids/parts/FluidExportBusPart.java | 8 +- .../fluids/parts/FluidFormationPlanePart.java | 1 - .../fluids/parts/FluidLevelEmitterPart.java | 1 - .../fluids/parts/FluidStorageBusPart.java | 16 +- .../fluids/parts/SharedFluidBusPart.java | 9 +- .../appeng/fluids/util/AEFluidInventory.java | 1 - .../java/appeng/fluids/util/AEFluidStack.java | 2 - .../java/appeng/fluids/util/FluidList.java | 6 +- .../java/appeng/fluids/util/IAEFluidTank.java | 1 - .../helpers/CraftingPatternDetails.java | 12 +- .../java/appeng/helpers/DualityInterface.java | 17 +- .../helpers/IContainerCraftingPacket.java | 1 - src/main/java/appeng/helpers/Splotch.java | 8 +- .../java/appeng/hooks/ItemRendererHooks.java | 9 - src/main/java/appeng/hooks/TickHandler.java | 12 +- .../modules/jei/FacadeRecipeCategory.java | 1 - .../modules/jei/GrinderRecipeWrapper.java | 1 - .../modules/jei/InscriberRecipeCategory.java | 2 - .../modules/waila/PartWailaDataProvider.java | 8 +- .../modules/waila/WailaModule.java | 4 +- .../waila/part/ChannelWailaDataProvider.java | 1 - .../modules/waila/part/PartAccessor.java | 1 - .../part/PowerStateWailaDataProvider.java | 1 - .../modules/waila/part/Tracer.java | 3 - .../tile/PowerStorageWailaDataProvider.java | 1 - .../appeng/items/contents/CellConfig.java | 2 - .../appeng/items/contents/CellUpgrades.java | 2 - .../items/contents/PortableCellViewer.java | 7 +- .../appeng/items/misc/EncodedPatternItem.java | 6 +- .../appeng/items/parts/PartModelsHelper.java | 1 - .../items/storage/AbstractStorageCell.java | 3 - .../appeng/items/tools/MemoryCardItem.java | 2 - .../appeng/items/tools/NetworkToolItem.java | 5 +- .../tools/powered/EntropyManipulatorItem.java | 7 +- .../tools/powered/WirelessTerminalItem.java | 2 - src/main/java/appeng/me/Grid.java | 13 +- src/main/java/appeng/me/GridNode.java | 19 +- src/main/java/appeng/me/GridNodeIterator.java | 2 +- src/main/java/appeng/me/NetworkEventBus.java | 7 +- .../appeng/me/cache/CraftingGridCache.java | 31 +- .../java/appeng/me/cache/EnergyGridCache.java | 29 +- .../appeng/me/cache/GridStorageCache.java | 7 +- .../java/appeng/me/cache/NetworkMonitor.java | 6 +- src/main/java/appeng/me/cache/P2PCache.java | 7 +- .../java/appeng/me/cache/PathGridCache.java | 22 +- .../appeng/me/cache/helpers/TickTracker.java | 1 - .../java/appeng/me/cluster/MBCalculator.java | 5 +- .../implementations/CraftingCPUCluster.java | 26 +- .../implementations/QuantumCluster.java | 1 - .../java/appeng/me/energy/EnergyWatcher.java | 4 +- .../appeng/me/helpers/AENetworkProxy.java | 8 +- .../appeng/me/helpers/IGridProxyable.java | 1 - .../appeng/me/helpers/MEMonitorHandler.java | 4 +- .../appeng/me/pathfinding/PathSegment.java | 6 +- .../appeng/me/storage/BasicCellInventory.java | 1 - .../me/storage/MEMonitorIInventory.java | 6 +- .../me/storage/NetworkInventoryHandler.java | 9 +- .../java/appeng/mixins/BootstrapMixin.java | 2 +- .../appeng/mixins/ScreenHandlerListeners.java | 1 - .../mixins/spatial/DimensionTypeMixin.java | 19 + .../appeng/mixins/tags/BlockTagsAccessor.java | 18 + .../mixins/{ => tags}/FluidTagsAccessor.java | 2 +- .../appeng/mixins/tags/ItemTagsAccessor.java | 18 + src/main/java/appeng/parts/AEBasePart.java | 20 +- .../java/appeng/parts/CableBusContainer.java | 16 +- .../AbstractFormationPlanePart.java | 2 - .../automation/AnnihilationPlanePart.java | 25 +- .../parts/automation/ExportBusPart.java | 9 +- .../parts/automation/FormationPlanePart.java | 8 +- .../IdentityAnnihilationPlanePart.java | 1 - .../parts/automation/ImportBusPart.java | 6 +- .../parts/automation/LevelEmitterPart.java | 14 +- .../parts/automation/PlaneBakedModel.java | 6 +- .../parts/automation/SharedItemBusPart.java | 2 +- .../appeng/parts/misc/CableAnchorPart.java | 7 +- .../appeng/parts/misc/ItemHandlerAdapter.java | 7 +- .../appeng/parts/misc/StorageBusPart.java | 16 +- .../parts/reporting/AbstractDisplayPart.java | 2 +- .../parts/reporting/AbstractMonitorPart.java | 2 +- .../parts/reporting/AbstractPanelPart.java | 2 +- .../reporting/AbstractReportingPart.java | 4 +- .../parts/reporting/AbstractTerminalPart.java | 2 +- .../recipes/game/DisassembleRecipe.java | 6 +- .../appeng/recipes/game/FacadeRecipe.java | 1 - src/main/java/appeng/server/Commands.java | 6 +- .../subcommands/SpatialStorageCommand.java | 7 +- .../subcommands/TestMeteoritesCommand.java | 4 +- .../java/appeng/services/CompassService.java | 11 +- .../appeng/spatial/DefaultSpatialHandler.java | 1 - .../spatial/SpatialStorageChunkGenerator.java | 2 +- .../spatial/SpatialStorageDimensionIds.java | 3 +- .../appeng/spatial/SpatialStoragePlot.java | 10 +- .../spatial/SpatialStoragePlotManager.java | 1 - .../codechicken/lib/math/InterpHelper.java | 1 - .../java/appeng/tile/AEBaseBlockEntity.java | 1 - .../tile/crafting/CraftingBlockEntity.java | 6 +- .../crafting/MolecularAssemblerRenderer.java | 1 - .../tile/inventory/AppEngCellInventory.java | 1 - .../tile/misc/PaintSplotchesBlockEntity.java | 6 +- .../tile/misc/SecurityStationBlockEntity.java | 12 +- .../tile/networking/CableBusBlockEntity.java | 3 - .../networking/ControllerBlockEntity.java | 1 - .../tile/powersink/IExternalPowerSink.java | 1 - .../appeng/tile/storage/DriveBlockEntity.java | 21 +- .../tile/storage/IOPortBlockEntity.java | 8 +- src/main/java/appeng/util/FakePlayer.java | 13 - .../util/ISlimReadableNumberConverter.java | 3 +- .../util/IWideReadableNumberConverter.java | 3 +- src/main/java/appeng/util/IWorldCallable.java | 2 - src/main/java/appeng/util/Platform.java | 30 +- .../appeng/util/ReadableNumberConverter.java | 1 - src/main/java/appeng/util/UUIDMatcher.java | 1 - .../util/helpers/ItemComparisonHelper.java | 7 +- .../java/appeng/util/item/FuzzyItemList.java | 6 +- src/main/java/appeng/util/item/ItemList.java | 7 +- .../worldgen/meteorite/MeteoritePlacer.java | 13 +- .../meteorite/MeteoriteStructurePiece.java | 2 +- .../meteorite/MeteoriteStructureStart.java | 2 +- .../java/team/chisel/ctm/api/IFacade.java | 16 +- .../resources/appliedenergistics2.mixins.json | 4 +- .../appliedenergistics2/lang/ja_jp.json | 25 -- .../models/block/chest/base.json | 147 ++++-- .../models/block/drive/drive_base.json | 35 +- .../models/block/drive/drive_cell.json | 18 +- .../models/item/facade_base.json | 24 +- .../models/item/level_emitter.json | 34 +- .../models/item/sky_stone_chest.json | 52 ++- .../models/item/wireless_access_point.json | 417 ++++++++++++++---- .../dimension/spatial_storage.json | 6 - src/main/resources/fabric.mod.json | 3 - .../util/SlimReadableNumberConverterTest.java | 1 - 358 files changed, 1124 insertions(+), 1831 deletions(-) create mode 100644 src/main/java/appeng/mixins/tags/BlockTagsAccessor.java rename src/main/java/appeng/mixins/{ => tags}/FluidTagsAccessor.java (93%) create mode 100644 src/main/java/appeng/mixins/tags/ItemTagsAccessor.java delete mode 100644 src/main/resources/data/appliedenergistics2/dimension/spatial_storage.json diff --git a/src/api/java/appeng/api/AEAddon.java b/src/api/java/appeng/api/AEAddon.java index 6722e75ac..f900fcaed 100644 --- a/src/api/java/appeng/api/AEAddon.java +++ b/src/api/java/appeng/api/AEAddon.java @@ -18,20 +18,16 @@ package appeng.api; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Use this annotation on a class in your Mod to have it instantiated during the * initialization phase of Applied Energistics. - * + *

* The class also needs to implement {@link IAEAddon}. - * + *

* AE expects your class to have a single constructor without any parameters. - * + *

* This is the only way to get access to the public {@link IAppEngApi} instance. */ @Target(ElementType.TYPE) diff --git a/src/api/java/appeng/api/IAEAddon.java b/src/api/java/appeng/api/IAEAddon.java index 15299e48e..d4cd5549b 100644 --- a/src/api/java/appeng/api/IAEAddon.java +++ b/src/api/java/appeng/api/IAEAddon.java @@ -26,19 +26,18 @@ package appeng.api; /** * Every AE2 addon requiring access to {@link IAppEngApi}, needs to provide at * least one class implementing this interface. - * + *

* Further it requires the class to be annotated with {@link AEAddon}. - * */ public interface IAEAddon { /** * This gets called once the API is successfully constructed and ready to be * used. - * + *

* Each addon is responsible to maintain a reference to {@link IAppEngApi} for * future use. Otherwise there is no alternative to access it later. - * + * * @param api The API instance when ready. */ void onAPIAvailable(IAppEngApi api); diff --git a/src/api/java/appeng/api/client/ICellModelRegistry.java b/src/api/java/appeng/api/client/ICellModelRegistry.java index bcd5f35d9..32e52016f 100644 --- a/src/api/java/appeng/api/client/ICellModelRegistry.java +++ b/src/api/java/appeng/api/client/ICellModelRegistry.java @@ -39,21 +39,21 @@ public interface ICellModelRegistry { /** * Register a new model for a storage cell item. - * + * *

* You are responsible for ensuring that the given model is actually loaded by * the game. See * {@see net.minecraftforge.client.model.ModelLoader#addSpecialModel}. - * + *

* This method only maps an {@link Item} to a {@link Identifier} which can be * looked up from the * {@link net.minecraft.client.render.model.BakedModelManager}. No validation * about missing models will be done. - * + *

* Will throw an exception in case a model is already registered for an item. - * + *

* For examples look at our cell part models within the drive model directory. - * + * * @param item The cell item * @param model The {@link net.minecraft.util.Identifier} representing the * model. @@ -64,7 +64,7 @@ public interface ICellModelRegistry { /** * The {@link Identifier} of the model used to render the given storage cell * {@link Item} when inserted into a drive or similar. - * + * * @param item * @return null, if no model is registered. */ @@ -73,7 +73,7 @@ public interface ICellModelRegistry { /** * An unmodifiable map of all registered mappings. - * + * * @return */ @Nonnull diff --git a/src/api/java/appeng/api/client/IClientHelper.java b/src/api/java/appeng/api/client/IClientHelper.java index 63f4c5205..cc705bac1 100644 --- a/src/api/java/appeng/api/client/IClientHelper.java +++ b/src/api/java/appeng/api/client/IClientHelper.java @@ -41,7 +41,7 @@ public interface IClientHelper { /** * A helper to work with clientside related tasks for cells. - * + * * @return */ ICellModelRegistry cells(); diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java index de515e4af..de760b110 100644 --- a/src/api/java/appeng/api/config/PowerUnits.java +++ b/src/api/java/appeng/api/config/PowerUnits.java @@ -46,15 +46,14 @@ public enum PowerUnits { /** * do power conversion using AE's conversion rates. - * + *

* Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 ); - * + *

* will normally returns 64, as it will convert the EU, to AE with AE's power * settings. * * @param target target power unit * @param value value - * * @return value converted to target units, from this units. */ public double convertTo(final PowerUnits target, final double value) { diff --git a/src/api/java/appeng/api/config/Upgrades.java b/src/api/java/appeng/api/config/Upgrades.java index 458d89bfc..a373836c0 100644 --- a/src/api/java/appeng/api/config/Upgrades.java +++ b/src/api/java/appeng/api/config/Upgrades.java @@ -23,11 +23,7 @@ package appeng.api.config; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import javax.annotation.Nullable; diff --git a/src/api/java/appeng/api/definitions/IBlockDefinition.java b/src/api/java/appeng/api/definitions/IBlockDefinition.java index cf225cef3..74f480369 100644 --- a/src/api/java/appeng/api/definitions/IBlockDefinition.java +++ b/src/api/java/appeng/api/definitions/IBlockDefinition.java @@ -49,7 +49,6 @@ public interface IBlockDefinition extends IItemDefinition { * * @param world world of block * @param pos location - * * @return if the block is placed in the world at the specific location. */ boolean isSameAs(BlockView world, BlockPos pos); diff --git a/src/api/java/appeng/api/definitions/IComparableDefinition.java b/src/api/java/appeng/api/definitions/IComparableDefinition.java index cceb460a9..1e197b742 100644 --- a/src/api/java/appeng/api/definitions/IComparableDefinition.java +++ b/src/api/java/appeng/api/definitions/IComparableDefinition.java @@ -32,7 +32,6 @@ public interface IComparableDefinition { * Compare {@link ItemStack} with this * * @param comparableStack compared item - * * @return true if the item stack is a matching item. */ boolean isSameAs(ItemStack comparableStack); diff --git a/src/api/java/appeng/api/exceptions/ExistingConnectionException.java b/src/api/java/appeng/api/exceptions/ExistingConnectionException.java index 6115832de..a18b15f2e 100644 --- a/src/api/java/appeng/api/exceptions/ExistingConnectionException.java +++ b/src/api/java/appeng/api/exceptions/ExistingConnectionException.java @@ -28,7 +28,7 @@ import appeng.api.networking.IGridNode; /** * Exception occurred because of an already existing connection between the two * {@link IGridNode}s - * + *

* Intended to signal an internal exception and not intended to be thrown by any * 3rd party module. * diff --git a/src/api/java/appeng/api/exceptions/FailedConnectionException.java b/src/api/java/appeng/api/exceptions/FailedConnectionException.java index 8370c6229..861e18114 100644 --- a/src/api/java/appeng/api/exceptions/FailedConnectionException.java +++ b/src/api/java/appeng/api/exceptions/FailedConnectionException.java @@ -27,10 +27,10 @@ import appeng.api.networking.IGridNode; /** * Exception indicating a failed connection between two {@link IGridNode}s. - * + *

* Intended to signal an internal exception and not intended to be thrown by any * 3rd party module. - * + *

* See any subclass for a more specific reason. * * @author AlgorithmX2 diff --git a/src/api/java/appeng/api/exceptions/NullNodeConnectionException.java b/src/api/java/appeng/api/exceptions/NullNodeConnectionException.java index b768c459c..7df1fb3fc 100644 --- a/src/api/java/appeng/api/exceptions/NullNodeConnectionException.java +++ b/src/api/java/appeng/api/exceptions/NullNodeConnectionException.java @@ -25,7 +25,7 @@ package appeng.api.exceptions; /** * Exception due to trying to connect one or more null values. - * + *

* Intended to signal an internal exception and not intended to be thrown by any * 3rd party module. * diff --git a/src/api/java/appeng/api/exceptions/SecurityConnectionException.java b/src/api/java/appeng/api/exceptions/SecurityConnectionException.java index ec079e24e..10cbba7fc 100644 --- a/src/api/java/appeng/api/exceptions/SecurityConnectionException.java +++ b/src/api/java/appeng/api/exceptions/SecurityConnectionException.java @@ -25,7 +25,7 @@ package appeng.api.exceptions; /** * Exception due to trying to connect different security realms. - * + *

* Intended to signal an internal exception and not intended to be thrown by any * 3rd party module. * diff --git a/src/api/java/appeng/api/features/IChargerRegistry.java b/src/api/java/appeng/api/features/IChargerRegistry.java index 286eea5df..754f5d8eb 100644 --- a/src/api/java/appeng/api/features/IChargerRegistry.java +++ b/src/api/java/appeng/api/features/IChargerRegistry.java @@ -33,12 +33,12 @@ import appeng.api.implementations.items.IAEItemPowerStorage; /** * A registry to allow mapping {@link Item}s to a specific charge rate when * being placed inside a charger. - * + *

* The registry is used in favor of an additional method for * {@link IAEItemPowerStorage} with a fixed value per item. This allows more * flexibility for other charger like machines to choose their own values when * needed. - * + *

* There is no guarantee that this is charged per tick, it only represents the * value per operation. By default this is one charging operation every 10 ticks * in case of an AE2 charger. @@ -51,7 +51,7 @@ public interface IChargerRegistry { /** * Fetch a charge rate for a specific item. - * + *

* The specific item does not need to have a mapping registered at all. In this * case it will use a default value of 160 AE. * @@ -63,7 +63,7 @@ public interface IChargerRegistry { /** * Register a custom charge rate for a specific item. - * + *

* Capped at 16000 to avoid extracting too much energy from a network for each * operation. This is done silently without any feedback or exception. Further * the cap is not fixed, it can change at any time in the future should power @@ -76,7 +76,7 @@ public interface IChargerRegistry { /** * Remove the custom rate for a specific item. - * + *

* It will revert to the default value afterwards. * * @param item A {@link Item} implementing {@link IAEItemPowerStorage}. diff --git a/src/api/java/appeng/api/features/IItemComparisonProvider.java b/src/api/java/appeng/api/features/IItemComparisonProvider.java index f7ab3b0de..d8a315880 100644 --- a/src/api/java/appeng/api/features/IItemComparisonProvider.java +++ b/src/api/java/appeng/api/features/IItemComparisonProvider.java @@ -37,7 +37,6 @@ public interface IItemComparisonProvider { * supplied item. * * @param is item - * * @return IItemComparison, or null */ IItemComparison getComparison(ItemStack is); @@ -47,7 +46,6 @@ public interface IItemComparisonProvider { * function. ) * * @param stack item - * * @return true, if getComparison will return a valid IItemComparison Object */ boolean canHandle(ItemStack stack); diff --git a/src/api/java/appeng/api/features/ILocatableRegistry.java b/src/api/java/appeng/api/features/ILocatableRegistry.java index f87f891d4..cd51c4e58 100644 --- a/src/api/java/appeng/api/features/ILocatableRegistry.java +++ b/src/api/java/appeng/api/features/ILocatableRegistry.java @@ -32,7 +32,6 @@ public interface ILocatableRegistry { * Gets the {@link ILocatable} with the registered serial, if available * * @param serial serial - * * @return requestedObject, or null, if the object does not exist anymore */ ILocatable getLocatableBy(long serial); diff --git a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java index cd0406367..1e023c935 100644 --- a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java +++ b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java @@ -51,7 +51,6 @@ public interface IMatterCannonAmmoRegistry { * get the penetration value for a particular ammo, 0 indicates a non-ammo. * * @param is ammo - * * @return 0 or a valid penetration value. */ float getPenetration(ItemStack is); diff --git a/src/api/java/appeng/api/features/INetworkEncodable.java b/src/api/java/appeng/api/features/INetworkEncodable.java index 53e9c6463..62d675113 100644 --- a/src/api/java/appeng/api/features/INetworkEncodable.java +++ b/src/api/java/appeng/api/features/INetworkEncodable.java @@ -31,7 +31,6 @@ public interface INetworkEncodable { * Used to get the current key from the item. * * @param item item - * * @return string key of item */ String getEncryptionKey(ItemStack item); diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java index 061e36a86..baca77902 100644 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java @@ -55,7 +55,6 @@ public interface IP2PTunnelRegistry { * returns null if no attunement can be found. * * @param trigger attunement trigger - * * @return null if no attunement can be found or attunement */ @Nonnull diff --git a/src/api/java/appeng/api/features/IPlayerRegistry.java b/src/api/java/appeng/api/features/IPlayerRegistry.java index 7bac6ef2b..653828170 100644 --- a/src/api/java/appeng/api/features/IPlayerRegistry.java +++ b/src/api/java/appeng/api/features/IPlayerRegistry.java @@ -38,21 +38,18 @@ public interface IPlayerRegistry { /** * @param gameProfile user game profile - * * @return user id of a username. */ int getID(GameProfile gameProfile); /** * @param player player - * * @return user id of a player entity. */ int getID(PlayerEntity player); /** * @param playerID to be found player id - * * @return PlayerEntity, or null if the player could not be found. */ @Nullable diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java index 033f239d5..b4083fba8 100644 --- a/src/api/java/appeng/api/features/IWirelessTermHandler.java +++ b/src/api/java/appeng/api/features/IWirelessTermHandler.java @@ -35,7 +35,6 @@ public interface IWirelessTermHandler extends INetworkEncodable { /** * @param is wireless terminal - * * @return true, if usePower, hasPower, etc... can be called for the provided * item */ @@ -47,7 +46,6 @@ public interface IWirelessTermHandler extends INetworkEncodable { * @param amount is in AE units ( 5 per MJ ), if you return false, the item * should be dead and return false for hasPower * @param is wireless terminal - * * @return true if wireless terminal uses power */ boolean usePower(PlayerEntity player, double amount, ItemStack is); @@ -56,7 +54,6 @@ public interface IWirelessTermHandler extends INetworkEncodable { * gets the power status of the item. * * @param is wireless terminal - * * @return returns true if there is any power left. */ boolean hasPower(PlayerEntity player, double amount, ItemStack is); @@ -65,7 +62,6 @@ public interface IWirelessTermHandler extends INetworkEncodable { * Return the config manager for the wireless terminal. * * @param is wireless terminal - * * @return config manager of wireless terminal */ IConfigManager getConfigManager(ItemStack is); diff --git a/src/api/java/appeng/api/features/IWirelessTermRegistry.java b/src/api/java/appeng/api/features/IWirelessTermRegistry.java index 10f3fba1d..a69cae322 100644 --- a/src/api/java/appeng/api/features/IWirelessTermRegistry.java +++ b/src/api/java/appeng/api/features/IWirelessTermRegistry.java @@ -42,7 +42,6 @@ public interface IWirelessTermRegistry { /** * @param is item which might have a handler - * * @return true if there is a handler for this item */ boolean isWirelessTerminal(ItemStack is); diff --git a/src/api/java/appeng/api/features/IWorldGen.java b/src/api/java/appeng/api/features/IWorldGen.java index 512b64a0b..ced2d43ea 100644 --- a/src/api/java/appeng/api/features/IWorldGen.java +++ b/src/api/java/appeng/api/features/IWorldGen.java @@ -25,7 +25,6 @@ package appeng.api.features; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; -import net.minecraft.world.ServerWorldAccess; public interface IWorldGen { diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java index 711285f58..cb411601e 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java @@ -35,7 +35,6 @@ import net.minecraft.world.World; */ public interface IGuiItem { /** - * * @param is The item used to open the container. * @param playerInventorySlot The slot in the player's inventory the item is in. * @param world The world the player is in. diff --git a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java index cfc3f62f4..fd8239819 100644 --- a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java +++ b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java @@ -46,7 +46,6 @@ public interface IAEItemPowerStorage { * return it. * * @param amount to be extracted power from device - * * @return what it could extract */ double extractAEPower(ItemStack stack, double amount, Actionable mode); diff --git a/src/api/java/appeng/api/implementations/items/IAEWrench.java b/src/api/java/appeng/api/implementations/items/IAEWrench.java index dc49c7654..fa4049336 100644 --- a/src/api/java/appeng/api/implementations/items/IAEWrench.java +++ b/src/api/java/appeng/api/implementations/items/IAEWrench.java @@ -38,7 +38,6 @@ public interface IAEWrench { * * @param player wrenching player * @param pos of block. - * * @return true if wrench can be used */ boolean canWrench(ItemStack wrench, PlayerEntity player, BlockPos pos); diff --git a/src/api/java/appeng/api/implementations/items/IBiometricCard.java b/src/api/java/appeng/api/implementations/items/IBiometricCard.java index 481f798a7..567a34ad6 100644 --- a/src/api/java/appeng/api/implementations/items/IBiometricCard.java +++ b/src/api/java/appeng/api/implementations/items/IBiometricCard.java @@ -48,7 +48,6 @@ public interface IBiometricCard { /** * @param itemStack card - * * @return the full list of permissions encoded on the card. */ EnumSet getPermissions(ItemStack itemStack); @@ -57,7 +56,6 @@ public interface IBiometricCard { * Check if a permission is encoded on the card. * * @param permission card - * * @return true if this permission is set on the card. */ boolean hasPermission(ItemStack is, SecurityPermissions permission); diff --git a/src/api/java/appeng/api/implementations/items/IMemoryCard.java b/src/api/java/appeng/api/implementations/items/IMemoryCard.java index ed1529716..1e5d50f22 100644 --- a/src/api/java/appeng/api/implementations/items/IMemoryCard.java +++ b/src/api/java/appeng/api/implementations/items/IMemoryCard.java @@ -31,7 +31,7 @@ import appeng.api.util.AEColor; /** * Memory Card API - * + *

* AE's Memory Card Item Class implements this interface. */ public interface IMemoryCard { @@ -39,10 +39,10 @@ public interface IMemoryCard { /** * Configures the data stored on the memory card, the SettingsName, will be * localized when displayed. - * + *

* The data can contain an optional string with the key "tooltip", which will be * used as unlocalized string to display it after the settings name. - * + *

* The data can contain an optional intArray using "colorCode" to be displayed * on the model itself. It needs to have exactly 8 elements representing the * ordinal of the matching {@link AEColor}. The first 4 values represent the top @@ -61,14 +61,12 @@ public interface IMemoryCard { * call to setMemoryCardContents. * * @param is item - * * @return setting name */ String getSettingsName(ItemStack is); /** * @param is item - * * @return the NBT Data previously saved by setMemoryCardContents, or an empty * NBTCompound */ @@ -77,11 +75,10 @@ public interface IMemoryCard { /** * This represent as 4x2 grid of {@link AEColor} without transparent/fluix * color. - * + *

* First 4 colors are used for the top row, second for the bottom one. * * @param is item - * * @return a hash representation of the memory card content */ AEColor[] getColorCode(ItemStack is); diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java index f2bf77893..26d774339 100644 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java @@ -26,9 +26,6 @@ package appeng.api.implementations.items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; import appeng.api.util.WorldCoord; @@ -39,14 +36,12 @@ public interface ISpatialStorageCell { /** * @param is spatial storage cell - * * @return true if this item is a spatial storage cell */ boolean isSpatialStorage(ItemStack is); /** * @param is spatial storage cell - * * @return the maximum size of the spatial storage cell along any given axis */ int getMaxStoredDim(ItemStack is); @@ -55,7 +50,6 @@ public interface ISpatialStorageCell { * get the currently stored spatial storage plot id. * * @param is spatial storage cell - * * @return plot id or -1 */ int getAllocatedPlotId(ItemStack is); @@ -68,7 +62,6 @@ public interface ISpatialStorageCell { * @param min min coord * @param max max coord * @param playerId owner of current grid or -1 - * * @return success of transition */ boolean doSpatialTransition(ItemStack is, ServerWorld w, WorldCoord min, WorldCoord max, int playerId); diff --git a/src/api/java/appeng/api/implementations/items/IStorageCell.java b/src/api/java/appeng/api/implementations/items/IStorageCell.java index 560d032fa..5a70e467f 100644 --- a/src/api/java/appeng/api/implementations/items/IStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/IStorageCell.java @@ -38,14 +38,14 @@ import appeng.api.storage.data.IAEStack; * {@link ICellHandler#getCellInventory(ItemStack, appeng.api.storage.cells.ISaveProvider, IStorageChannel)} * or {@link ICellHandler#isCell(ItemStack)}. It automatically handles the * internals and NBT data, which is both nice, and bad for you! - * + *

* Good cause it means you don't have to do anything, bad because you have * little to no control over it. - * + *

* Limited to {@link Integer} internally for most calculations. E.g. if the used * or remaining bytes would overflow {@link Integer#MAX_VALUE} the behaviour is * no longer specified. Even if {@link ICellInventory} is using {@link Long}. - * + *

* The standard AE implementation also only provides 1-63 Types. */ public interface IStorageCell> extends ICellWorkbenchItem { @@ -55,7 +55,6 @@ public interface IStorageCell> extends ICellWorkbenchItem * ({@link Integer#MAX_VALUE} + 1) / 8. * * @param cellItem item - * * @return number of bytes */ int getBytes(@Nonnull ItemStack cellItem); @@ -64,7 +63,6 @@ public interface IStorageCell> extends ICellWorkbenchItem * Determines the number of bytes used for any type included on the cell. * * @param cellItem item - * * @return number of bytes */ int getBytesPerType(@Nonnull ItemStack cellItem); @@ -74,7 +72,6 @@ public interface IStorageCell> extends ICellWorkbenchItem * item. * * @param cellItem item - * * @return number of types */ int getTotalTypes(@Nonnull ItemStack cellItem); @@ -86,7 +83,6 @@ public interface IStorageCell> extends ICellWorkbenchItem * * @param cellItem item * @param requestedAddition requested addition - * * @return true to preventAdditionOfItem */ boolean isBlackListed(@Nonnull ItemStack cellItem, @Nonnull T requestedAddition); @@ -106,7 +102,6 @@ public interface IStorageCell> extends ICellWorkbenchItem * Allows an item to selectively enable or disable its status as a storage cell. * * @param i item - * * @return if the ItemStack should behavior as a storage cell. */ boolean isStorageCell(@Nonnull ItemStack i); diff --git a/src/api/java/appeng/api/implementations/items/IStorageComponent.java b/src/api/java/appeng/api/implementations/items/IStorageComponent.java index a790e86d6..b09bee4e9 100644 --- a/src/api/java/appeng/api/implementations/items/IStorageComponent.java +++ b/src/api/java/appeng/api/implementations/items/IStorageComponent.java @@ -37,7 +37,6 @@ public interface IStorageComponent { * condenser. * * @param is item - * * @return number of bytes */ int getBytes(ItemStack is); @@ -46,7 +45,6 @@ public interface IStorageComponent { * Just true or false for the item stack. * * @param is item - * * @return true if item is a storage component */ boolean isStorageComponent(ItemStack is); diff --git a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java index afc90572e..51e95e6e5 100644 --- a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java +++ b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java @@ -31,7 +31,6 @@ public interface IUpgradeModule { /** * @param itemstack item with potential upgrades - * * @return null, or a valid upgrade type. */ Upgrades getType(ItemStack itemstack); diff --git a/src/api/java/appeng/api/implementations/parts/ICablePart.java b/src/api/java/appeng/api/implementations/parts/ICablePart.java index ec5c70d8d..98fe74ded 100644 --- a/src/api/java/appeng/api/implementations/parts/ICablePart.java +++ b/src/api/java/appeng/api/implementations/parts/ICablePart.java @@ -62,14 +62,13 @@ public interface ICablePart extends IPart, IGridHost { * something. * * @param newColor new color - * * @return if the color change was successful. */ boolean changeColor(AEColor newColor, PlayerEntity who); /** * Change sides on the cables node. - * + *

* Called by AE, do not invoke. * * @param sides sides of cable @@ -80,7 +79,6 @@ public interface ICablePart extends IPart, IGridHost { * used to tests if a cable connects to neighbors visually. * * @param side neighbor side - * * @return true if this side is currently connects to an external block. */ boolean isConnected(Direction side); diff --git a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java index d9555c1c4..f0868935f 100644 --- a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java +++ b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java @@ -41,7 +41,6 @@ public interface IChestOrDrive extends ICellContainer, IGridHost, IOrientable { /** * @param slot slot index - * * @return status of the slot, one of the above indices. */ CellState getCellStatus(int slot); @@ -54,7 +53,6 @@ public interface IChestOrDrive extends ICellContainer, IGridHost, IOrientable { /** * @param slot slot index - * * @return is the cell currently blinking to show activity. */ boolean isCellBlinking(int slot); diff --git a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java index 881b9db02..fdbd972c7 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java +++ b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java @@ -36,7 +36,6 @@ public interface ICraftingMachine { * @param patternDetails details of pattern * @param table crafting table * @param ejectionDirection ejection direction - * * @return if it was accepted, all or nothing. */ boolean pushPattern(ICraftingPatternDetails patternDetails, CraftingInventory table, Direction ejectionDirection); diff --git a/src/api/java/appeng/api/implementations/tiles/ICrankable.java b/src/api/java/appeng/api/implementations/tiles/ICrankable.java index f3390f1b4..30336fac1 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICrankable.java +++ b/src/api/java/appeng/api/implementations/tiles/ICrankable.java @@ -27,12 +27,12 @@ import net.minecraft.util.math.Direction; /** * Crank/Crankable API, - * + *

* Tiles that Implement this can receive power, from the crank, and have the * crank placed on them. - * + *

* Tiles that access other tiles that implement this method can act as Cranks. - * + *

* This interface must be implemented by a block entity. */ public interface ICrankable { diff --git a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java index 2acafd03f..d9355c5cc 100644 --- a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java +++ b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java @@ -33,7 +33,6 @@ public interface ISegmentedInventory { * duplication. * * @param name inventory name - * * @return inventory with inventory name */ FixedItemInv getInventoryByName(String name); diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java index 95876184b..c21d8b7ee 100644 --- a/src/api/java/appeng/api/movable/IMovableHandler.java +++ b/src/api/java/appeng/api/movable/IMovableHandler.java @@ -35,7 +35,6 @@ public interface IMovableHandler { * * @param myClass block entity class * @param tile block entity - * * @return true if it can handle moving */ boolean canHandle(Class myClass, BlockEntity tile); @@ -44,7 +43,7 @@ public interface IMovableHandler { * request that the handler move the the tile from its current location to the * new one. the tile has already been invalidated, and the blocks have already * been fully moved. - * + *

* Potential Example: * * 

diff --git a/src/api/java/appeng/api/movable/IMovableRegistry.java b/src/api/java/appeng/api/movable/IMovableRegistry.java
index f6acdb70a..c08f84054 100644
--- a/src/api/java/appeng/api/movable/IMovableRegistry.java
+++ b/src/api/java/appeng/api/movable/IMovableRegistry.java
@@ -29,32 +29,32 @@ import net.minecraft.block.entity.BlockEntity;
 /**
  * Used to determine if a tile is marked as movable, a block will be considered
  * movable, if...
- *
+ * 

  * 1. The Tile or its super classes have been white listed with
  * whiteListTileEntity.
- *
+ * 

  * 2. The Tile implements IMovableTile
- *
+ * 

  * 3. A IMovableHandler is register that returns canHandle = true for the
  * {@link BlockEntity} subclass
- *
- *
+ * 

+ * 

  * The movement process is as follows,
- *
+ * 

  * 1. IMovableTile.prepareToMove() or TileEntity.invalidate() depending on your
  * opt-in method. 2. The tile will be removed from the world. 3. Its world,
  * coordinates will be changed. *** this can be overridden with a
  * IMovableHandler *** 4. It will then be re-added to the world, or a new world.
  * 5. TileEntity.cancelRemoval() 6. IMovableTile.doneMoving ( if you implemented
  * IMovableTile )
- *
+ * 

  * Please note, this is a 100% white list only feature, I will never opt in any
  * non-vanilla, non-AE blocks. If you do not want to support your tiles being
  * moved, you don't have to do anything.
- *
+ * 

  * I appreciate anyone that takes the effort to get their tiles to work with
  * this system to create a better use experience.
- *
+ * 

  * If you need a build of deobf build of AE for testing, do not hesitate to ask.
  */
 public interface IMovableRegistry {
@@ -68,7 +68,7 @@ public interface IMovableRegistry {
 
     /**
      * White list your block entity with the registry.
-     *
+     * 

      * If you tile is handled with IMovableHandler or IMovableTile you do not need
      * to white list it.
      */
@@ -76,7 +76,6 @@ public interface IMovableRegistry {
 
     /**
      * @param te to be moved block entity
-     *
      * @return true if the tile has accepted your request to move it
      */
     boolean askToMove(BlockEntity te);
@@ -98,11 +97,10 @@ public interface IMovableRegistry {
     /**
      * handlers are used to perform movement, this allows you to override AE's
      * internal version.
-     *
+     * 

      * only valid after askToMove(...) = true
      *
      * @param te block entity
-     *
      * @return moving handler of block entity
      */
     IMovableHandler getHandler(BlockEntity te);
@@ -114,7 +112,6 @@ public interface IMovableRegistry {
 
     /**
      * @param blk block
-     *
      * @return true if this block is blacklisted
      */
     boolean isBlacklisted(Block blk);
diff --git a/src/api/java/appeng/api/networking/IGrid.java b/src/api/java/appeng/api/networking/IGrid.java
index 744bdca20..b3af57a82 100644
--- a/src/api/java/appeng/api/networking/IGrid.java
+++ b/src/api/java/appeng/api/networking/IGrid.java
@@ -30,7 +30,7 @@ import appeng.api.util.IReadOnlyCollection;
 
 /**
  * Gives you access to Grid based information.
- *
+ * 

  * Don't Implement.
  */
 public interface IGrid {
@@ -39,7 +39,6 @@ public interface IGrid {
      * Get Access to various grid modules
      *
      * @param iface face
-     *
      * @return the IGridCache you requested.
      */
     @Nonnull
@@ -49,7 +48,6 @@ public interface IGrid {
      * Post an event into the network event bus.
      *
      * @param ev - event to post
-     *
      * @return returns ev back to original poster
      */
     @Nonnull
@@ -59,7 +57,6 @@ public interface IGrid {
      * Post an event into the network event bus, but direct it at a single node.
      *
      * @param ev event to post
-     *
      * @return returns ev back to original poster
      */
     @Nonnull
@@ -79,7 +76,6 @@ public interface IGrid {
      * Get machines on the network.
      *
      * @param gridHostClass class of the grid host
-     *
      * @return IMachineSet of all nodes belonging to hosts of specified class.
      */
     @Nonnull
diff --git a/src/api/java/appeng/api/networking/IGridBlock.java b/src/api/java/appeng/api/networking/IGridBlock.java
index 2a500847b..ab352a290 100644
--- a/src/api/java/appeng/api/networking/IGridBlock.java
+++ b/src/api/java/appeng/api/networking/IGridBlock.java
@@ -37,14 +37,14 @@ import appeng.api.util.DimensionalCoord;
 
 /**
  * An Implementation is required to create your node for IGridHost
- *
+ * 

  * Implement for use with IGridHost
  */
 public interface IGridBlock {
 
     /**
      * how much power to drain per tick as part of idle network usage.
-     *
+     * 

      * if the value of this changes, you must post a MENetworkPowerIdleChange
      *
      * @return ae/t to use.
diff --git a/src/api/java/appeng/api/networking/IGridCache.java b/src/api/java/appeng/api/networking/IGridCache.java
index 4020fa726..ac786289b 100644
--- a/src/api/java/appeng/api/networking/IGridCache.java
+++ b/src/api/java/appeng/api/networking/IGridCache.java
@@ -28,7 +28,7 @@ import javax.annotation.Nonnull;
 /**
  * Allows you to create a network wide service, AE2 uses these for providing
  * item, spatial, and tunnel services.
- *
+ * 

  * Any Class that implements this, should have a public default constructor that
  * takes a single argument of type IGrid.
  */
@@ -42,7 +42,7 @@ public interface IGridCache {
 
     /**
      * inform your cache, that a machine was removed from the grid.
-     *
+     * 

      * Important: Do not trust the grids state in this method, interact only with
      * the node you are passed, if you need to manage other grid information, do it
      * on the next updateTick.
@@ -54,7 +54,7 @@ public interface IGridCache {
 
     /**
      * informs you cache that a machine was added to the grid.
-     *
+     * 

      * Important: Do not trust the grids state in this method, interact only with
      * the node you are passed, if you need to manage other grid information, do it
      * on the next updateTick.
diff --git a/src/api/java/appeng/api/networking/IGridCacheRegistry.java b/src/api/java/appeng/api/networking/IGridCacheRegistry.java
index 6c6cadb8a..fd5ea311d 100644
--- a/src/api/java/appeng/api/networking/IGridCacheRegistry.java
+++ b/src/api/java/appeng/api/networking/IGridCacheRegistry.java
@@ -45,7 +45,6 @@ public interface IGridCacheRegistry {
      * requests a new INSTANCE of a grid cache for use, used internally
      *
      * @param grid grid
-     *
      * @return a new Map of IGridCaches from the registry, called from IGrid when
      *         constructing a new grid.
      */
diff --git a/src/api/java/appeng/api/networking/IGridConnection.java b/src/api/java/appeng/api/networking/IGridConnection.java
index 892412e4c..f75fc7ed9 100644
--- a/src/api/java/appeng/api/networking/IGridConnection.java
+++ b/src/api/java/appeng/api/networking/IGridConnection.java
@@ -29,10 +29,10 @@ import appeng.api.util.AEPartLocation;
 
 /**
  * Access to AE's internal grid connections.
- *
+ * 

  * Messing with connection is generally completely unnecessary, you should be
  * able to just use IGridNode.updateState() to have AE manage them for you.
- *
+ * 

  * Don't Implement.
  */
 public interface IGridConnection {
@@ -41,7 +41,6 @@ public interface IGridConnection {
      * lets you get the opposing node of the connection by passing your own node.
      *
      * @param gridNode current grid node
-     *
      * @return the IGridNode which represents the opposite side of the connection.
      */
     @Nonnull
@@ -51,7 +50,6 @@ public interface IGridConnection {
      * determine the direction of the connection based on your node.
      *
      * @param gridNode current grid node
-     *
      * @return the direction of the connection, only valid for in world connections.
      */
     @Nonnull
diff --git a/src/api/java/appeng/api/networking/IGridHelper.java b/src/api/java/appeng/api/networking/IGridHelper.java
index 31e9aacd0..50bd00ba8 100644
--- a/src/api/java/appeng/api/networking/IGridHelper.java
+++ b/src/api/java/appeng/api/networking/IGridHelper.java
@@ -39,12 +39,11 @@ public interface IGridHelper {
 
     /**
      * Create a grid node for your {@link IGridHost}
-     *
+     * 

      * The passed {@link IGridBlock} represents the definition for properties like
      * connectable sides. Refer to its documentation for further details.
      *
      * @param block grid block
-     *
      * @return grid node of block
      */
     @Nonnull
@@ -52,13 +51,12 @@ public interface IGridHelper {
 
     /**
      * Create a direct connection between two {@link IGridNode}.
-     *
+     * 

      * This will be considered as having a distance of 1, regardless of the location
      * of both nodes.
      *
      * @param a to be connected gridnode
      * @param b to be connected gridnode
-     *
      * @throws appeng.api.exceptions.FailedConnectionException
      */
     @Nonnull
diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java
index 441f50882..615ad3e9f 100644
--- a/src/api/java/appeng/api/networking/IGridHost.java
+++ b/src/api/java/appeng/api/networking/IGridHost.java
@@ -45,7 +45,6 @@ public interface IGridHost {
      *
      * @param dir feel free to ignore this, most blocks will use the same node for
      *            every side.
-     *
      * @return a new IGridNode, create these with AEApi.INSTANCE().createGridNode(
      *         MyIGridBlock )
      */
diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java
index 986384a9a..28caeda7e 100644
--- a/src/api/java/appeng/api/networking/IGridNode.java
+++ b/src/api/java/appeng/api/networking/IGridNode.java
@@ -36,9 +36,9 @@ import appeng.api.util.IReadOnlyCollection;
 
 /**
  * Gives you a view into your Nodes connections and information.
- *
+ * 

  * updateState, getGrid, destroy are required to implement a proper IGridHost.
- *
+ * 

  * Don't Implement; Acquire from {@link IAppEngApi}.createGridNode
  */
 public interface IGridNode {
@@ -54,10 +54,10 @@ public interface IGridNode {
     /**
      * inform the node that your IGridBlock has changed its internal state, and
      * force the node to update.
-     *
+     * 

      * ALWAYS make sure that your block entity is in the world, and has its node
      * properly saved to be returned from the host before updating state,
-     *
+     * 

      * If your entity is not in the world, or if you IGridHost returns a different
      * node for the same side you will likely crash the game.
      */
@@ -124,7 +124,7 @@ public interface IGridNode {
      * this should be called for each node you create, if you have a nodeData
      * compound to load from, you can store all your nods on a single compound using
      * name.
-     *
+     * 

      * Important: You must call this before updateState.
      *
      * @param name     nbt name
@@ -152,7 +152,6 @@ public interface IGridNode {
      * see if this node has a certain flag
      *
      * @param flag flags
-     *
      * @return true if has flag
      */
     boolean hasFlag(@Nonnull GridFlags flag);
diff --git a/src/api/java/appeng/api/networking/IGridVisitor.java b/src/api/java/appeng/api/networking/IGridVisitor.java
index 37d887ced..1f058fc9e 100644
--- a/src/api/java/appeng/api/networking/IGridVisitor.java
+++ b/src/api/java/appeng/api/networking/IGridVisitor.java
@@ -32,12 +32,11 @@ public interface IGridVisitor {
 
     /**
      * Called for each node on the network.
-     *
+     * 

      * By returning false your informing the host to stop visiting nodes beyond the
      * current node.
      *
      * @param n the current node.
-     *
      * @return true to continue visiting nodes beyond this node.
      */
     boolean visitNode(@Nonnull IGridNode n);
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java
index 16198f1ce..36c1467ce 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java
@@ -42,7 +42,6 @@ public interface ICraftingGrid extends IGridCache {
      * @param world       crafting world
      * @param slot        slot index
      * @param details     pattern details
-     *
      * @return a collection of crafting patterns for the item in question.
      */
     ImmutableCollection getCraftingFor(IAEItemStack whatToCraft,
@@ -56,7 +55,6 @@ public interface ICraftingGrid extends IGridCache {
      * @param actionSrc source
      * @param craftWhat result
      * @param callback  callback -- optional
-     *
      * @return a future which will at an undetermined point in the future get you
      *         the {@link ICraftingJob} do not wait on this, your be waiting
      *         forever.
@@ -79,7 +77,6 @@ public interface ICraftingGrid extends IGridCache {
      *                          this will be used for extracting items, should
      *                          usually be the same as the one provided to
      *                          beginCraftingJob.
-     *
      * @return null ( if failed ) or an {@link ICraftingLink} other wise, if you
      *         send requestingMachine you need to properly keep track of this and
      *         handle the nbt saving and loading of the object as well as the
@@ -96,7 +93,6 @@ public interface ICraftingGrid extends IGridCache {
 
     /**
      * @param what to be requested item
-     *
      * @return true if the item can be requested via a crafting emitter.
      */
     boolean canEmitFor(IAEItemStack what);
@@ -105,7 +101,6 @@ public interface ICraftingGrid extends IGridCache {
      * is this item being crafted?
      *
      * @param what item being crafted
-     *
      * @return true if it is being crafting
      */
     boolean isRequesting(IAEItemStack what);
@@ -114,7 +109,6 @@ public interface ICraftingGrid extends IGridCache {
      * The total amount being requested across all crafting cpus of a grid.
      *
      * @param what item being requested, ignores stacksize
-     *
      * @return The total amount being requested.
      */
     long requesting(IAEItemStack what);
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java
index d6bd9ecec..6c6cc5056 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java
@@ -37,7 +37,6 @@ public interface ICraftingMedium {
      *
      * @param patternDetails details
      * @param table          crafting table
-     *
      * @return if the pattern was successfully pushed.
      */
     boolean pushPattern(ICraftingPatternDetails patternDetails, CraftingInventory table);
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
index 8a82fa609..c63bb8d0d 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java
@@ -49,7 +49,6 @@ public interface ICraftingPatternDetails {
      * @param slotIndex specific slot index
      * @param itemStack item in slot
      * @param world     crafting world
-     *
      * @return if an item can be used in the specific slot for this pattern.
      */
     boolean isValidItemForSlot(int slotIndex, ItemStack itemStack, World world);
@@ -70,7 +69,7 @@ public interface ICraftingPatternDetails {
      * The list will be sorted in descending order by stack size. However there is
      * no guarantee about maintaining the placement order of the inputs in case of
      * equal values.
-     * 
+     *
      * @return an immutable list of inputs without nulls
      */
     List getInputs();
@@ -81,11 +80,11 @@ public interface ICraftingPatternDetails {
      * 

      * This should be the preferred way to deal with the list of outputs.
      * 

-     * 
+     * 

      * The list will be sorted in descending order by stack size. However there is
      * no guarantee about maintaining the placement order of the outputs in case of
      * equal values.
-     * 
+     *
      * @return an immutable list of outputs without nulls
      */
     List getOutputs();
@@ -101,7 +100,7 @@ public interface ICraftingPatternDetails {
      * 

      * This can return a copy from the internal structure, so there are no
      * guarantees about modifications.
-     * 
+     *
      * @return a list of the inputs, will include nulls.
      */
     IAEItemStack[] getSparseInputs();
@@ -117,7 +116,7 @@ public interface ICraftingPatternDetails {
      * 

      * This can return a copy from the internal structure, so there are no
      * guarantees about modifications.
-     * 
+     *
      * @return a list of the outputs, will include nulls.
      */
     IAEItemStack[] getSparseOutputs();
@@ -133,7 +132,6 @@ public interface ICraftingPatternDetails {
      *
      * @param craftingInv inventory
      * @param world       crafting world
-     *
      * @return the crafted ( work bench ) item.
      */
     ItemStack getOutput(CraftingInventory craftingInv, World world);
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java
index 1c7e6c4cc..ea73a9d53 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java
@@ -34,7 +34,7 @@ public interface ICraftingProviderHelper {
 
     /**
      * Add new Pattern to AE's crafting cache.
-     * 
+     * 

      * This will only accept instances created by
      * {@link ICraftingHelper#decodePattern(net.minecraft.item.ItemStack, net.minecraft.world.World)}
      */
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java
index f970161ad..ffb3542bc 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java
@@ -45,7 +45,6 @@ public interface ICraftingRequester extends IActionHost {
      *
      * @param items item
      * @param mode  action mode
-     *
      * @return unwanted item
      */
     IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode);
@@ -53,7 +52,7 @@ public interface ICraftingRequester extends IActionHost {
     /**
      * called when the job changes from in progress, to either complete, or
      * canceled.
-     *
+     * 

      * after this call the crafting link is "dead" and should be discarded.
      */
     void jobStateChange(ICraftingLink link);
diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java
index b4c6c680d..2837d3e41 100644
--- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java
+++ b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java
@@ -27,13 +27,13 @@ import appeng.api.storage.data.IAEStack;
 
 /**
  * DO NOT IMPLEMENT.
- *
+ * 

  * Will be injected when adding an {@link ICraftingWatcherHost} to a grid.
  */
 public interface ICraftingWatcher {
     /**
      * Add a specific {@link IAEStack} to watch.
-     *
+     * 

      * Supports multiple values, duplicate ones will not be added.
      *
      * @param stack
diff --git a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java
index 8917516bf..3a5c6b0f3 100644
--- a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java
+++ b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java
@@ -41,7 +41,6 @@ public interface IAEPowerStorage extends IEnergySource {
      *
      * @param amt  to be injected amount
      * @param mode action mode
-     *
      * @return amount of power which was unable to be stored
      */
     double injectAEPower(double amt, @Nonnull Actionable mode);
@@ -75,16 +74,16 @@ public interface IAEPowerStorage extends IEnergySource {
 
     /**
      * The priority to use this energy storage.
-     * 
+     * 

      * A higher value means it is more likely to be extracted from first, and less
      * likely to be inserted into first.
-     * 
+     * 

      * The value needs to be constant once added to a {@link IGrid}. Should it ever
      * need to be changed, it has to be removed from the grid, then update the
      * value, and finally added back to the grid.
-     * 
+     * 

      * This should never use {@link Integer#MIN_VALUE} or {@link Integer#MAX_VALUE}.
-     * 
+     *
      * @return the priority for this storage
      */
     default int getPriority() {
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java
index 0e2eca969..074207931 100644
--- a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java
+++ b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java
@@ -61,7 +61,7 @@ public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvi
      * condenses this into a single operation that determines the networks "powered
      * state" if the network is considered off-line, your machines should not
      * function.
-     *
+     * 

      * {@link MENetworkPowerStatusChange} events are posted when this value changes
      * if you need to be notified of the change, most machines can simply test the
      * value when they operate.
@@ -73,21 +73,20 @@ public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvi
     /**
      * AE will accept any power, and store it, to maintain sanity please don't send
      * more then 10,000 at a time.
-     *
+     * 

      * IMPORTANT: Network power knows no bounds, for less spamy power flow, networks
      * can store more then their allotted storage, however, it should be kept to a
      * minimum, to help with this, this method returns the networks current
      * OVERFLOW, this is not energy you can store some where else, its already
      * stored in the network, you can extract it if you want, however it it owned by
      * the network, this is different then IAEEnergyStore
-     *
+     * 

      * Another important note, is that if a network that had overflow is deleted,
      * its power is gone, this is one of the reasons why keeping overflow to a
      * minimum is important.
      *
      * @param amt  power to inject into the network
      * @param mode should the action be simulated or performed?
-     *
      * @return the amount of power that the network has OVER the limit.
      */
     @Nonnegative
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java
index ada5c4e42..bd6a49781 100644
--- a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java
+++ b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java
@@ -36,15 +36,15 @@ import appeng.api.config.Actionable;
 public interface IEnergyGridProvider {
     /**
      * internal use only
-     *
+     * 

      * Can return a list of providers behind the current.
-     *
+     * 

      * An example would be something acting as proxy between different
      * {@link IEnergyGrid}s.
-     *
+     * 

      * This can contain duplicate entries, AE will ensure that each provider is only
      * visited once.
-     *
+     * 

      * internal use only
      */
     @Nonnull
@@ -52,9 +52,9 @@ public interface IEnergyGridProvider {
 
     /**
      * internal use only
-     *
+     * 

      * Extracts the requested amount from the provider.
-     *
+     * 

      * This should never forward a call to another {@link IEnergyGridProvider},
      * instead return them via {@link IEnergyGridProvider#providers()}
      *
@@ -65,10 +65,10 @@ public interface IEnergyGridProvider {
 
     /**
      * Injects the offered amount into the provider.
-     *
+     * 

      * This should never forward a call to another {@link IEnergyGridProvider},
      * instead return them via {@link IEnergyGridProvider#providers()}
-     *
+     * 

      * internal use only
      *
      * @return the leftover amount
@@ -78,13 +78,12 @@ public interface IEnergyGridProvider {
 
     /**
      * internal use only
-     *
+     * 

      * Returns the current demand of an provider.
-     *
+     * 

      * This should never forward a call to another {@link IEnergyGridProvider},
      * instead return them via {@link IEnergyGridProvider#providers()}
      *
-     *
      * @param d the max amount offered, the demand should never exceed it.
      * @return the total amount demanded
      */
@@ -93,31 +92,29 @@ public interface IEnergyGridProvider {
 
     /**
      * internal use only
-     *
+     * 

      * AE currently uses this to enqueue the next visited provider.
-     *
+     * 

      * There is no guarantee that this works on in a perfect way. It can be limited
      * to the returns of the past {@link IEnergyGridProvider#providers()}, but not
      * any future one discovered by visiting further providers.
-     *
+     * 

      * E.g. inject into the the lowest one first or extract from the highest one.
      *
      * @return the current stored amount.
-     *
-     *
      */
     @Nonnegative
     double getProviderStoredEnergy();
 
     /**
      * internal use only
-     *
+     * 

      * AE currently uses this to enqueue the next visited provider.
-     *
+     * 

      * There is no guarantee that this works on in a perfect way. It can be limited
      * to the returns of the past {@link IEnergyGridProvider#providers()}, but not
      * any future one discovered by visiting further providers.
-     *
+     * 

      * E.g. inject into the the lowest one first or extract from the highest one.
      *
      * @return the maximum amount stored.
diff --git a/src/api/java/appeng/api/networking/energy/IEnergySource.java b/src/api/java/appeng/api/networking/energy/IEnergySource.java
index 16c219a19..4651b7a02 100644
--- a/src/api/java/appeng/api/networking/energy/IEnergySource.java
+++ b/src/api/java/appeng/api/networking/energy/IEnergySource.java
@@ -36,7 +36,6 @@ public interface IEnergySource {
      *
      * @param amt  extracted power
      * @param mode should the action be simulated or performed?
-     *
      * @return returns extracted power.
      */
     @Nonnegative
diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java
index c196f4981..bd652db90 100644
--- a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java
+++ b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java
@@ -27,13 +27,13 @@ import javax.annotation.Nonnegative;
 
 /**
  * DO NOT IMPLEMENT.
- *
+ * 

  * Will be injected when adding an {@link IEnergyWatcherHost} to a grid.
  */
 public interface IEnergyWatcher {
     /**
      * Add a specific threshold to watch.
-     *
+     * 

      * Supports multiple values, duplicate ones will not be added.
      *
      * @param amount
diff --git a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java
index 1ef9ef16c..5785e0519 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java
@@ -28,7 +28,7 @@ import appeng.api.networking.IGridNode;
 /**
  * Posted by the network when the booting status of the network goes up or down,
  * the change is reflected via {@link IGridNode}.isActive()
- *
+ * 

  * Note: Most machines just need to check {@link IGridNode}.isActive()
  */
 public class MENetworkBootingStatusChange extends MENetworkEvent {
diff --git a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java
index 434106c1c..aaf399233 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java
@@ -25,10 +25,10 @@ package appeng.api.networking.events;
 
 /**
  * Posted by storage devices to inform AE to refresh its storage structure.
- *
+ * 

  * This is done in cases such as a storage cell being removed or added to a
  * drive.
- *
+ * 

  * you do not need to send this event when your node is added / removed from the
  * grid.
  */
diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java
index 1a9232c1f..b87a0f611 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java
@@ -28,7 +28,7 @@ import appeng.api.networking.IGridHost;
 /**
  * Posted to the {@link IGridHost} when the channels on the node connections are
  * altered.
- *
+ * 

  * Never posted IGridCaches.
  */
 public class MENetworkChannelsChanged extends MENetworkEvent {
diff --git a/src/api/java/appeng/api/networking/events/MENetworkEvent.java b/src/api/java/appeng/api/networking/events/MENetworkEvent.java
index 5b11f1229..f37224e24 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkEvent.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkEvent.java
@@ -27,7 +27,7 @@ import appeng.api.networking.IGrid;
 
 /**
  * Part of AE's Event Bus.
- *
+ * 

  * Posted via {@link IGrid}.postEvent or {@link IGrid}.postEventTo
  */
 public class MENetworkEvent {
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java
index 3ca050b3d..5ee7b8992 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java
@@ -29,7 +29,7 @@ import appeng.api.networking.IGridNode;
  * Implementers of a IGridBlock must post this event when your getIdlePowerUsage
  * starts returning a new value, if you do not post this event the network will
  * not change the idle draw.
- *
+ * 

  * you do not need to send this event when your node is added / removed from the
  * grid.
  */
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
index f36813903..efaaedf27 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java
@@ -30,7 +30,7 @@ import appeng.api.networking.energy.IEnergyGrid;
  * Posted by the network when the power status of the network goes up or down,
  * the change is reflected via the {@link IEnergyGrid}.isNetworkPowered() or via
  * {@link IGridNode}.isActive()
- *
+ * 

  * Note: Most machines just need to check {@link IGridNode}.isActive()
  */
 public class MENetworkPowerStatusChange extends MENetworkEvent {
diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java
index efb580e6c..0661e5c3b 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java
@@ -28,10 +28,10 @@ import appeng.api.networking.energy.IAEPowerStorage;
 /**
  * informs the network, that a {@link IAEPowerStorage} block that had either
  * run, out of power, or was full, is no longer in that state.
- *
+ * 

  * failure to post this event when your {@link IAEPowerStorage} changes state
  * will result in your block not charging, or not-discharging.
- *
+ * 

  * you do not need to send this event when your node is added / removed from the
  * grid.
  */
diff --git a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java
index 3e491279e..500e3c672 100644
--- a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java
+++ b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java
@@ -29,9 +29,9 @@ import appeng.api.storage.IStorageChannel;
 /**
  * posted by the network when the networks Storage Changes, you can use the
  * currentItems list to check levels, and update status.
- *
+ * 

  * this is the least useful method of getting info about changes in the network.
- *
+ * 

  * Do not modify the list or its contents in anyway.
  */
 public class MENetworkStorageEvent extends MENetworkEvent {
diff --git a/src/api/java/appeng/api/networking/security/IActionSource.java b/src/api/java/appeng/api/networking/security/IActionSource.java
index c9b68be98..2c20445f6 100644
--- a/src/api/java/appeng/api/networking/security/IActionSource.java
+++ b/src/api/java/appeng/api/networking/security/IActionSource.java
@@ -31,18 +31,17 @@ import net.minecraft.entity.player.PlayerEntity;
 
 /**
  * The source of any action.
- *
+ * 

  * This can either be a {@link PlayerEntity} or an {@link IActionHost}.
- *
+ * 

  * In most cases this is used for security checks, but can be used to validate
  * the source itself.
- *
  */
 public interface IActionSource {
 
     /**
      * If present, AE will consider the player being the source for the action.
-     *
+     * 

      * This will take precedence over {@link IActionSource#machine()} in any case.
      *
      * @return An optional player issuing the action.
@@ -52,10 +51,10 @@ public interface IActionSource {
 
     /**
      * If present, it indicates the {@link IActionHost} of the source.
-     *
+     * 

      * Should {@link IActionSource#player()} be absent, it will consider a machine
      * as source.
-     *
+     * 

      * It is recommended to include the machine even when a player is present.
      *
      * @return An optional machine issuing the action or acting as proxy for a
@@ -66,9 +65,9 @@ public interface IActionSource {
 
     /**
      * An {@link IActionSource} can have multiple optional contexts.
-     *
+     * 

      * It is strongly recommended to limit the uses for absolutely necessary cases.
-     *
+     * 

      * Currently there are no public contexts made available by AE. An example would
      * be the context interfaces use internally to avoid looping items between each
      * other.
diff --git a/src/api/java/appeng/api/networking/security/ISecurityGrid.java b/src/api/java/appeng/api/networking/security/ISecurityGrid.java
index 4e59cf657..fb49ce831 100644
--- a/src/api/java/appeng/api/networking/security/ISecurityGrid.java
+++ b/src/api/java/appeng/api/networking/security/ISecurityGrid.java
@@ -43,7 +43,6 @@ public interface ISecurityGrid extends IGridCache {
      *
      * @param player to be checked player
      * @param perm   checked permissions
-     *
      * @return true if the player has permissions.
      */
     boolean hasPermission(@Nonnull PlayerEntity player, @Nonnull SecurityPermissions perm);
@@ -53,7 +52,6 @@ public interface ISecurityGrid extends IGridCache {
      *
      * @param playerID id of player
      * @param perm     checked permissions
-     *
      * @return true if the player has permissions.
      */
     boolean hasPermission(@Nonnegative int playerID, @Nonnull SecurityPermissions perm);
diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcher.java b/src/api/java/appeng/api/networking/storage/IStackWatcher.java
index 086149af9..3a9fa2fd8 100644
--- a/src/api/java/appeng/api/networking/storage/IStackWatcher.java
+++ b/src/api/java/appeng/api/networking/storage/IStackWatcher.java
@@ -27,13 +27,13 @@ import appeng.api.storage.data.IAEStack;
 
 /**
  * DO NOT IMPLEMENT.
- *
+ * 

  * Will be injected when adding an {@link IStackWatcherHost} to a grid.
  */
 public interface IStackWatcher {
     /**
      * Add a specific {@link IAEStack} to watch.
-     *
+     * 

      * Supports multiple values, duplicate ones will not be added.
      *
      * @param stack
diff --git a/src/api/java/appeng/api/networking/storage/IStorageGrid.java b/src/api/java/appeng/api/networking/storage/IStorageGrid.java
index 7392982ed..124f97aad 100644
--- a/src/api/java/appeng/api/networking/storage/IStorageGrid.java
+++ b/src/api/java/appeng/api/networking/storage/IStorageGrid.java
@@ -42,7 +42,7 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable {
      * outside of the standard Network operations, Examples, ME Chest inputs from
      * the world, or a Storage Bus detecting modifications made to the chest by an
      * outside force.
-     *
+     * 

      * Expects the input to have either a negative or a positive stack size to
      * correspond to the injection, or extraction operation.
      *
@@ -52,7 +52,7 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable {
 
     /**
      * Used to add a cell provider to the storage system
-     *
+     * 

      * THIS IT NOT FOR USE {@link IGridHost} THAT PROVIDE {@link ICellContainer} -
      * those are automatically handled by the storage system.
      *
diff --git a/src/api/java/appeng/api/networking/ticking/IGridTickable.java b/src/api/java/appeng/api/networking/ticking/IGridTickable.java
index 973fcf996..aa11c5f7b 100644
--- a/src/api/java/appeng/api/networking/ticking/IGridTickable.java
+++ b/src/api/java/appeng/api/networking/ticking/IGridTickable.java
@@ -46,7 +46,7 @@ public interface IGridTickable {
     /**
      * Return a valid TickingRequest to tell AE a guide for which type of
      * responsiveness your device wants.
-     *
+     * 

      * This will be called for your tile any time your tile changes grids, this can
      * happen at any time, so if your using the sleep feature you may wish to
      * preserve your sleep, in the result of this method. or you can simply reset
@@ -61,15 +61,14 @@ public interface IGridTickable {
      * AE lets you adjust your tick rate based on the results of your tick, if your
      * block as accomplished work you may wish to increase the ticking speed, if
      * your block is idle you may wish to slow it down.
-     *
+     * 

      * Its up to you.
-     *
+     * 

      * Note: this is never called if you return null from getTickingRequest.
      *
      * @param ticksSinceLastCall the number of world ticks that were skipped since
      *                           your last tick, you can use this to adjust speed of
      *                           processing or adjust your tick rate.
-     *
      * @return tick rate adjustment.
      */
     @Nonnull
diff --git a/src/api/java/appeng/api/networking/ticking/ITickManager.java b/src/api/java/appeng/api/networking/ticking/ITickManager.java
index 8684a6dab..0b6b44180 100644
--- a/src/api/java/appeng/api/networking/ticking/ITickManager.java
+++ b/src/api/java/appeng/api/networking/ticking/ITickManager.java
@@ -36,7 +36,7 @@ public interface ITickManager extends IGridCache {
     /**
      * immediately sets the node to tick, only valid if your node is marked as
      * "Alertable" in its TickingRequest
-     *
+     * 

      * Sleeping Devices Still Alertable, when your tile is alerted its new status is
      * determined by the result of its tick.
      *
@@ -48,7 +48,6 @@ public interface ITickManager extends IGridCache {
      * disables ticking for your device.
      *
      * @param node gridnode
-     *
      * @return if the call was successful.
      */
     boolean sleepDevice(@Nonnull IGridNode node);
@@ -57,7 +56,6 @@ public interface ITickManager extends IGridCache {
      * enables ticking for your device, undoes a sleepDevice call.
      *
      * @param node gridnode
-     *
      * @return if the call was successful.
      */
     boolean wakeDevice(@Nonnull IGridNode node);
diff --git a/src/api/java/appeng/api/networking/ticking/TickingRequest.java b/src/api/java/appeng/api/networking/ticking/TickingRequest.java
index 68429e8a7..2992aabf0 100644
--- a/src/api/java/appeng/api/networking/ticking/TickingRequest.java
+++ b/src/api/java/appeng/api/networking/ticking/TickingRequest.java
@@ -30,9 +30,9 @@ public class TickingRequest {
 
     /**
      * the minimum number of ticks that must pass between ticks.
-     *
+     * 

      * Valid Values are : 1+
-     *
+     * 

      * Suggested is 5-20
      */
     public final int minTickRate;
@@ -40,9 +40,9 @@ public class TickingRequest {
     /**
      * the maximum number of ticks that can pass between ticks, if this value is
      * exceeded the tile must tick.
-     *
+     * 

      * Valid Values are 1+
-     *
+     * 

      * Suggested is 20-40
      */
     public final int maxTickRate;
diff --git a/src/api/java/appeng/api/parts/IAlphaPassItem.java b/src/api/java/appeng/api/parts/IAlphaPassItem.java
index e3b1daa78..6a7bfddb0 100644
--- a/src/api/java/appeng/api/parts/IAlphaPassItem.java
+++ b/src/api/java/appeng/api/parts/IAlphaPassItem.java
@@ -32,7 +32,6 @@ public interface IAlphaPassItem {
      * rendering pipe line.
      *
      * @param is item
-     *
      * @return true to enable a second pass for your parts in the bus rendering pipe
      *         line.
      */
diff --git a/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java b/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java
index d388bfc5b..c1a4315ab 100644
--- a/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java
+++ b/src/api/java/appeng/api/parts/IDynamicPartBakedModel.java
@@ -11,15 +11,10 @@ import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedQuad;
-import net.minecraft.client.render.model.json.ModelOverrideList;
-import net.minecraft.client.render.model.json.ModelTransformation;
-import net.minecraft.client.texture.Sprite;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockRenderView;
 
-import appeng.api.util.AEPartLocation;
-
 /**
  * This interface can be implemented by baked models returned by
  * {@link IPart#getStaticModels()} to indicate that they would like to use the
diff --git a/src/api/java/appeng/api/parts/IFacadeContainer.java b/src/api/java/appeng/api/parts/IFacadeContainer.java
index 67ae95a1a..f26272c2d 100644
--- a/src/api/java/appeng/api/parts/IFacadeContainer.java
+++ b/src/api/java/appeng/api/parts/IFacadeContainer.java
@@ -32,7 +32,7 @@ import appeng.api.util.AEPartLocation;
 
 /**
  * Used Internally.
- *
+ * 

  * not intended for implementation.
  */
 public interface IFacadeContainer {
@@ -70,9 +70,7 @@ public interface IFacadeContainer {
      * read from stream
      *
      * @param data to be read data
-     *
      * @return true if it was readable
-     *
      * @throws IOException
      */
     boolean readFromStream(PacketByteBuf data) throws IOException;
@@ -88,7 +86,6 @@ public interface IFacadeContainer {
      * write to stream
      *
      * @param data to be written data
-     *
      * @throws IOException
      */
     void writeToStream(PacketByteBuf data) throws IOException;
diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java
index a3c60c113..1ed6cf493 100644
--- a/src/api/java/appeng/api/parts/IFacadePart.java
+++ b/src/api/java/appeng/api/parts/IFacadePart.java
@@ -31,7 +31,7 @@ import appeng.api.util.AEPartLocation;
 
 /**
  * Used Internally.
- *
+ * 

  * not intended for implementation.
  */
 public interface IFacadePart {
diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java
index 68f40168f..ebe06ff3f 100644
--- a/src/api/java/appeng/api/parts/IPart.java
+++ b/src/api/java/appeng/api/parts/IPart.java
@@ -61,7 +61,7 @@ public interface IPart extends ICustomCableConnection {
      * get an ItemStack that represents the bus, should contain the settings for
      * whatever, can also be used in conjunction with removePart to take a part off
      * and drop it or something.
-     *
+     * 

      * This is used to drop the bus, and to save the bus, when saving the bus,
      * wrenched is false, and writeToNBT will be called to save important details
      * about the part, if the part is wrenched include in your NBT Data any settings
@@ -69,7 +69,6 @@ public interface IPart extends ICustomCableConnection {
      * constructing your part.
      *
      * @param type , what kind of ItemStack to return?
-     *
      * @return item of part
      */
     ItemStack getItemStack(PartItemStack type);
@@ -127,7 +126,6 @@ public interface IPart extends ICustomCableConnection {
      * does this part act like a ladder?
      *
      * @param entity climbing entity
-     *
      * @return true if entity can climb
      */
     boolean isLadder(LivingEntity entity);
@@ -151,7 +149,6 @@ public interface IPart extends ICustomCableConnection {
      * write data to bus packet.
      *
      * @param data to be written data
-     *
      * @throws IOException
      */
     void writeToStream(PacketByteBuf data) throws IOException;
@@ -160,9 +157,7 @@ public interface IPart extends ICustomCableConnection {
      * read data from bus packet.
      *
      * @param data to be read data
-     *
      * @return true will re-draw the part.
-     *
      * @throws IOException
      */
     boolean readFromStream(PacketByteBuf data) throws IOException;
@@ -170,7 +165,7 @@ public interface IPart extends ICustomCableConnection {
     /**
      * get the Grid Node for the Bus, be sure your IGridBlock is NOT
      * isWorldAccessible, if it is your going to cause crashes.
-     *
+     * 

      * or null if you don't have a grid node.
      *
      * @return grid node
@@ -216,7 +211,6 @@ public interface IPart extends ICustomCableConnection {
      * @param player right clicking player
      * @param hand   hand used
      * @param pos    position of block
-     *
      * @return if your activate method performed something.
      */
     boolean onActivate(PlayerEntity player, Hand hand, Vec3d pos);
@@ -227,7 +221,6 @@ public interface IPart extends ICustomCableConnection {
      * @param player shift right clicking player
      * @param hand   hand used
      * @param pos    position of block
-     *
      * @return if your activate method performed something, you should use false
      *         unless you really need it.
      */
@@ -239,7 +232,6 @@ public interface IPart extends ICustomCableConnection {
      * @param player left clicking player
      * @param hand   hand used
      * @param pos    position of block
-     *
      * @return if your activate method performed something, you should use false
      *         unless you really need it.
      */
@@ -254,7 +246,6 @@ public interface IPart extends ICustomCableConnection {
      * @param player shift-left clicking player
      * @param hand   hand used
      * @param pos    position of block
-     *
      * @return if your activate method performed something, you should use false
      *         unless you really need it.
      */
@@ -299,12 +290,11 @@ public interface IPart extends ICustomCableConnection {
 
     /**
      * Used to determine which parts can be placed on what cables.
-     *
+     * 

      * Dense cables are not allowed for functional (getGridNode returns a node)
      * parts. Doing so will result in crashes.
      *
      * @param what placed part
-     *
      * @return true if the part can be placed on this support.
      */
     boolean canBePlacedOn(BusSupport what);
diff --git a/src/api/java/appeng/api/parts/IPartCollisionHelper.java b/src/api/java/appeng/api/parts/IPartCollisionHelper.java
index 477000866..a957abb42 100644
--- a/src/api/java/appeng/api/parts/IPartCollisionHelper.java
+++ b/src/api/java/appeng/api/parts/IPartCollisionHelper.java
@@ -29,7 +29,7 @@ public interface IPartCollisionHelper {
 
     /**
      * add a collision box, expects 0.0 - 16.0 block coords.
-     *
+     * 

      * No complaints about the size, I like using pixels :P
      *
      * @param minX minimal x collision
diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java
index 534f94bb2..62ec25a52 100644
--- a/src/api/java/appeng/api/parts/IPartHelper.java
+++ b/src/api/java/appeng/api/parts/IPartHelper.java
@@ -40,7 +40,6 @@ public interface IPartHelper {
      * @param side   side which the part should be on
      * @param player player placing part
      * @param world  part in world
-     *
      * @return true if placing was successful
      */
     // TODO, this should probably take ItemStack + ItemUseContext
diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java
index 725d4e451..ac132f4c2 100644
--- a/src/api/java/appeng/api/parts/IPartHost.java
+++ b/src/api/java/appeng/api/parts/IPartHost.java
@@ -38,7 +38,7 @@ import appeng.api.util.DimensionalCoord;
 
 /**
  * Implemented on AE's TileEntity.
- *
+ * 

  * Do Not Implement
  */
 public interface IPartHost extends ICustomCableConnection {
@@ -54,7 +54,6 @@ public interface IPartHost extends ICustomCableConnection {
      *
      * @param part to be added part
      * @param side part placed onto side
-     *
      * @return returns false if the part cannot be added.
      */
     boolean canAddPart(ItemStack part, AEPartLocation side);
@@ -66,7 +65,6 @@ public interface IPartHost extends ICustomCableConnection {
      * @param is    new part
      * @param side  onto side
      * @param owner with owning player
-     *
      * @return null if the item failed to add, the side it was placed on other wise
      *         ( may different for cables, {@link AEPartLocation}.UNKNOWN )
      */
@@ -76,7 +74,6 @@ public interface IPartHost extends ICustomCableConnection {
      * Get part by side ( center is {@link AEPartLocation}.UNKNOWN )
      *
      * @param side side of part
-     *
      * @return the part located on the specified side, or null if there is no part.
      */
     IPart getPart(AEPartLocation side);
@@ -86,7 +83,6 @@ public interface IPartHost extends ICustomCableConnection {
      * other varient of getPart.
      *
      * @param side side of part
-     *
      * @return the part located on the specified side, or null if there is no part.
      */
     IPart getPart(Direction side);
@@ -95,7 +91,7 @@ public interface IPartHost extends ICustomCableConnection {
      * removes the part on the side, this doesn't drop it or anything, if you don't
      * do something with it, its just "gone" and its never coming back; think about
      * it.
-     *
+     * 

      * if you want to drop the part you must request it prior to removing it.
      *
      * @param side           side of part
@@ -143,7 +139,6 @@ public interface IPartHost extends ICustomCableConnection {
      * finds the part located at the position ( pos must be relative, not global )
      *
      * @param pos part position
-     *
      * @return a new SelectedPart, this is never null.
      */
     SelectedPart selectPart(Vec3d pos);
@@ -162,7 +157,6 @@ public interface IPartHost extends ICustomCableConnection {
      * get the redstone state of host on this side, this value is cached internally.
      *
      * @param side side of part
-     *
      * @return true of the part host is receiving redstone from an external source.
      */
     boolean hasRedstone(AEPartLocation side);
diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java
index 773ba9f19..fde91d882 100644
--- a/src/api/java/appeng/api/parts/IPartItem.java
+++ b/src/api/java/appeng/api/parts/IPartItem.java
@@ -30,10 +30,10 @@ import net.minecraft.item.ItemStack;
 /**
  * This is a pretty basic requirement, once you implement the interface, and
  * createPartFromItemStack
- *
+ * 

  * you must register your bus with the Bus renderer, using
  * AEApi.INSTANCE().partHelper().setItemBusRenderer( this );
- *
+ * 

  * then simply add this, and call AE's Bus Placement Code.
  *
  * 
@@ -41,9 +41,9 @@ import net.minecraft.item.ItemStack;
  *
  * {@literal @}Override
  * public default ActionResult onItemUse(ItemStack is, PlayerEntity player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
- *	{
- *		return Api.INSTANCE.partHelper().placeBus( is, pos, side, player, hand, world );
- *	}
+ *    {
+ * 		return Api.INSTANCE.partHelper().placeBus( is, pos, side, player, hand, world );
+ *    }
  * 
  * 

  */
@@ -53,7 +53,6 @@ public interface IPartItem
 {
      * create a new part INSTANCE
      *
      * @param is ItemStack of this item, may have additional properties.
-     *
      * @return part from item
      */
     P createPart(ItemStack is);
diff --git a/src/api/java/appeng/api/parts/IPartModel.java b/src/api/java/appeng/api/parts/IPartModel.java
index cb80a3940..1d19ceff4 100644
--- a/src/api/java/appeng/api/parts/IPartModel.java
+++ b/src/api/java/appeng/api/parts/IPartModel.java
@@ -39,7 +39,7 @@ public interface IPartModel {
     /**
      * A solid {@link IPartModel} indicates that the rendering requires a cable
      * connection, which will also result in creating an intersection for the cable.
-     *
+     * 

      * This should be true for pretty much all parts.
      *
      * @return true for a solid part.
diff --git a/src/api/java/appeng/api/parts/IPartModels.java b/src/api/java/appeng/api/parts/IPartModels.java
index 5e4cf2200..9e199b8c9 100644
--- a/src/api/java/appeng/api/parts/IPartModels.java
+++ b/src/api/java/appeng/api/parts/IPartModels.java
@@ -32,9 +32,9 @@ public interface IPartModels {
     /**
      * Allows registration of part models that can then be used in
      * {@link IPart#getStaticModels()}.
-     *
+     * 

      * Models can be registered multiple times without causing issues.
-     *
+     * 

      * This method must be called during the pre-init phase (as part of your
      * plugin's constructor).
      */
diff --git a/src/api/java/appeng/api/parts/LayerBase.java b/src/api/java/appeng/api/parts/LayerBase.java
index 22499f3cb..a47b8dd7e 100644
--- a/src/api/java/appeng/api/parts/LayerBase.java
+++ b/src/api/java/appeng/api/parts/LayerBase.java
@@ -35,7 +35,7 @@ import appeng.api.util.AEPartLocation;
  * All Layers must extends this, this get part implementation is provided to
  * interface with the parts, however a real implementation will be used at
  * runtime.
- *
+ * 

  * TODO: Consider removing and replacing with capabilities.
  */
 public abstract class LayerBase extends BlockEntity // implements IPartHost
@@ -48,12 +48,11 @@ public abstract class LayerBase extends BlockEntity // implements IPartHost
 
     /**
      * Grants access for the layer to the parts of the host.
-     *
+     * 

      * This Method looks silly, that is because its not used at runtime, a real
      * implementation will be used instead.
      *
      * @param side side of part
-     *
      * @return the part for the requested side.
      */
     public IPart getPart(final AEPartLocation side) {
@@ -62,12 +61,11 @@ public abstract class LayerBase extends BlockEntity // implements IPartHost
 
     /**
      * Grants access for the layer to the parts of the host.
-     *
+     * 

      * This Method looks silly, that is because its not used at runtime, a real
      * implementation will be used instead.
      *
      * @param side side of part
-     *
      * @return the part for the requested side.
      */
     public IPart getPart(final Direction side) {
diff --git a/src/api/java/appeng/api/parts/SelectedPart.java b/src/api/java/appeng/api/parts/SelectedPart.java
index 372f73c95..f03f93817 100644
--- a/src/api/java/appeng/api/parts/SelectedPart.java
+++ b/src/api/java/appeng/api/parts/SelectedPart.java
@@ -27,7 +27,6 @@ import appeng.api.util.AEPartLocation;
 
 /**
  * Reports a selected part from the IPartHost
- *
  */
 public class SelectedPart {
 
diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java
index c7a16ca9e..061db7b63 100644
--- a/src/api/java/appeng/api/storage/ICellRegistry.java
+++ b/src/api/java/appeng/api/storage/ICellRegistry.java
@@ -39,14 +39,14 @@ import appeng.api.storage.data.IAEStack;
  * Storage Cell Registry, used for specially implemented cells, if you just want
  * to make a item act like a cell, or new cell with different bytes, then you
  * should probably consider IStorageCell instead its considerably simpler.
- *
+ * 

  * Do not Implement, obtained via {@link IAppEngApi}.getCellRegistry()
  */
 public interface ICellRegistry {
 
     /**
      * Register a new handler.
-     *
+     * 

      * Never be call before
      * {@link net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent} was
      * handled by AE2. Will throw an exception otherwise.
@@ -66,7 +66,6 @@ public interface ICellRegistry {
      * return true, if you can get a InventoryHandler for the item passed.
      *
      * @param is to be checked item
-     *
      * @return true if the provided item, can be handled by a handler in AE, ( AE
      *         May choose to skip this and just get the handler instead. )
      */
@@ -76,7 +75,6 @@ public interface ICellRegistry {
      * get the handler, for the requested item.
      *
      * @param is to be checked item
-     *
      * @return the handler registered for this item type.
      */
     @Nullable
@@ -100,7 +98,6 @@ public interface ICellRegistry {
      * @param host can be null. If provided, the host is responsible for persisting
      *             the cell content.
      * @param chan the storage channel to request the handler for.
-     *
      * @return new ICellInventoryHandler, or null if there isn't one.
      */
     @Nullable
diff --git a/src/api/java/appeng/api/storage/IMEInventory.java b/src/api/java/appeng/api/storage/IMEInventory.java
index ea945dd90..b573b839c 100644
--- a/src/api/java/appeng/api/storage/IMEInventory.java
+++ b/src/api/java/appeng/api/storage/IMEInventory.java
@@ -31,12 +31,12 @@ import appeng.api.storage.data.IItemList;
 /**
  * AE's Equivalent to IInventory, used to reading contents, and manipulating
  * contents of ME Inventories.
- *
+ * 

  * Implementations should COMPLETELY ignore stack size limits from an external
  * view point, Meaning that you can inject Integer.MAX_VALUE items and it should
  * work as defined, or be able to extract Integer.MAX_VALUE and have it work as
  * defined, Translations to MC's max stack size are external to the AE API.
- *
+ * 

  * If you want to request a stack of an item, you should should determine that
  * prior to requesting the stack from the inventory.
  */
@@ -48,7 +48,6 @@ public interface IMEInventory> {
      * @param input item to add.
      * @param type  action type
      * @param src   action source
-     *
      * @return returns the number of items not added.
      */
     T injectItems(T input, Actionable type, IActionSource src);
@@ -58,7 +57,6 @@ public interface IMEInventory> {
      *
      * @param request item to request ( with stack size. )
      * @param mode    simulate, or perform action?
-     *
      * @return returns the number of items extracted, null
      */
     T extractItems(T request, Actionable mode, IActionSource src);
@@ -67,7 +65,6 @@ public interface IMEInventory> {
      * request a full report of all available items, storage.
      *
      * @param out the IItemList the results will be written too
-     *
      * @return returns same list that was passed in, is passed out
      */
     IItemList getAvailableItems(IItemList out);
diff --git a/src/api/java/appeng/api/storage/IMEInventoryHandler.java b/src/api/java/appeng/api/storage/IMEInventoryHandler.java
index 5b2c08f33..65e4f8dc3 100644
--- a/src/api/java/appeng/api/storage/IMEInventoryHandler.java
+++ b/src/api/java/appeng/api/storage/IMEInventoryHandler.java
@@ -49,7 +49,6 @@ public interface IMEInventoryHandler> extends IMEInventory
      * inventories.
      *
      * @param input - item that might be added
-     *
      * @return if its prioritized
      */
     boolean isPrioritized(T input);
@@ -58,7 +57,6 @@ public interface IMEInventoryHandler> extends IMEInventory
      * determine if an item can be accepted and stored.
      *
      * @param input - item that might be added
-     *
      * @return if the item can be added
      */
     boolean canAccept(T input);
@@ -87,7 +85,6 @@ public interface IMEInventoryHandler> extends IMEInventory
      * this allows you to do that.
      *
      * @param i - pass number ( 1 or 2 )
-     *
      * @return true, if this inventory is valid for this pass.
      */
     boolean validForPass(int i);
diff --git a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java
index 63ca8d241..77ee15ed8 100644
--- a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java
+++ b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java
@@ -33,7 +33,6 @@ public interface IMEMonitorHandlerReceiver> {
      * return true if this object should remain as a listener.
      *
      * @param verificationToken to be checked object
-     *
      * @return true if object should remain as a listener
      */
     boolean isValid(Object verificationToken);
diff --git a/src/api/java/appeng/api/storage/IStorageChannel.java b/src/api/java/appeng/api/storage/IStorageChannel.java
index f693bf5ba..4e8e0dda6 100644
--- a/src/api/java/appeng/api/storage/IStorageChannel.java
+++ b/src/api/java/appeng/api/storage/IStorageChannel.java
@@ -39,7 +39,7 @@ public interface IStorageChannel> {
 
     /**
      * Can be used as factor for transferring stacks of a channel.
-     *
+     * 

      * E.g. used by IO Ports to transfer 1000 mB, not 1 mB to match the item channel
      * transferring a full bucket per operation.
      *
@@ -70,7 +70,7 @@ public interface IStorageChannel> {
 
     /**
      * Create a new {@link IAEStack} subtype of the specific object.
-     *
+     * 

      * The parameter is unbound to allow a slightly more flexible approach. But the
      * general intention is about converting an {@link ItemStack} or
      * {@link FluidStack} into the corresponding {@link IAEStack}. Another valid
diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java
index 05f3b5f96..43f3d4886 100644
--- a/src/api/java/appeng/api/storage/IStorageHelper.java
+++ b/src/api/java/appeng/api/storage/IStorageHelper.java
@@ -44,19 +44,19 @@ public interface IStorageHelper {
 
     /**
      * Register a new storage channel.
-     *
+     * 

      * AE2 already provides native channels for {@link IAEItemStack} and
      * {@link IAEFluidStack}.
-     *
+     * 

      * Each {@link IAEStack} subtype can only have a single factory instance.
      * Overwriting is not intended. Each subtype should be a direct one, this might
      * be enforced at any time.
-     *
+     * 

      * Channel class and factory instance can be used interchangeable as identifier.
      * In most cases the factory instance is used as key as having direct access the
      * methods is more beneficial compared to being forced to query the registry
      * each time.
-     *
+     * 

      * Caching the factory instance in a field or local variable is perfectly for
      * performance reasons. But do not use any AE2 internal field as they can change
      * randomly between releases.
@@ -71,19 +71,19 @@ public interface IStorageHelper {
 
     /**
      * Fetch the factory instance for a specific storage channel.
-     *
+     * 

      * Channel must be a direct subtype of {@link IStorageChannel}.
      *
-     * @throws NullPointerException when fetching an unregistered channel.
      * @param channel The channel type
      * @return the factory instance
+     * @throws NullPointerException when fetching an unregistered channel.
      */
     @Nonnull
     , C extends IStorageChannel> C getStorageChannel(@Nonnull Class channel);
 
     /**
      * An unmodifiable collection of all registered factory instance.
-     *
+     * 

      * This is mainly used as helper to let storage grids construct their internal
      * storage for each type.
      */
@@ -94,7 +94,6 @@ public interface IStorageHelper {
      * load a crafting link from nbt data.
      *
      * @param data to be loaded data
-     *
      * @return crafting link
      */
     ICraftingLink loadCraftingLink(CompoundTag data, ICraftingRequester req);
diff --git a/src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java b/src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java
index 414fd8882..ce3859db8 100644
--- a/src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java
+++ b/src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java
@@ -1,4 +1,3 @@
-
 package appeng.api.storage;
 
 import javax.annotation.Nullable;
diff --git a/src/api/java/appeng/api/storage/cells/ICellGuiHandler.java b/src/api/java/appeng/api/storage/cells/ICellGuiHandler.java
index aac512571..57b9fa4a8 100644
--- a/src/api/java/appeng/api/storage/cells/ICellGuiHandler.java
+++ b/src/api/java/appeng/api/storage/cells/ICellGuiHandler.java
@@ -1,4 +1,3 @@
-
 package appeng.api.storage.cells;
 
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/api/java/appeng/api/storage/cells/ICellHandler.java b/src/api/java/appeng/api/storage/cells/ICellHandler.java
index e123ed77b..3d9540340 100644
--- a/src/api/java/appeng/api/storage/cells/ICellHandler.java
+++ b/src/api/java/appeng/api/storage/cells/ICellHandler.java
@@ -39,7 +39,6 @@ public interface ICellHandler {
      * choose to skip this method, and just request a handler )
      *
      * @param is to be checked item
-     *
      * @return return true, if getCellHandler will not return null.
      */
     boolean isCell(ItemStack is);
@@ -53,7 +52,6 @@ public interface ICellHandler {
      *                null. If provided, the host is responsible for persisting the
      *                cell content.
      * @param channel the storage channel requested.
-     *
      * @return a new IMEHandler for the provided item
      */
     > ICellInventoryHandler getCellInventory(ItemStack is, ISaveProvider host,
@@ -61,17 +59,16 @@ public interface ICellHandler {
 
     /**
      * 0 - cell is missing.
-     *
+     * 

      * 1 - green, ( usually means available room for types or items. )
-     *
+     * 

      * 2 - orange, ( usually means available room for items, but not types. )
-     *
+     * 

      * 3 - red, ( usually means the cell is 100% full )
      *
      * @param is      the cell item. ( use the handler for any details you can )
      * @param handler the handler for the cell is provides for reference, you can
      *                cast this to your handler.
-     *
      * @return get the status of the cell based on its contents.
      */
     default > CellState getStatusForCell(ItemStack is, ICellInventoryHandler handler) {
diff --git a/src/api/java/appeng/api/storage/cells/ICellProvider.java b/src/api/java/appeng/api/storage/cells/ICellProvider.java
index cd7fb83bc..b0e336f12 100644
--- a/src/api/java/appeng/api/storage/cells/ICellProvider.java
+++ b/src/api/java/appeng/api/storage/cells/ICellProvider.java
@@ -38,7 +38,7 @@ public interface ICellProvider {
     /**
      * Inventory of the tile for use with ME, should always return an valid list,
      * never NULL.
-     *
+     * 

      * You must return the correct Handler for the correct channel, if your handler
      * returns a IAEItemStack handler, for a Fluid Channel stuffs going to explode,
      * same with the reverse.
@@ -49,7 +49,7 @@ public interface ICellProvider {
 
     /**
      * the storage's priority.
-     *
+     * 

      * Positive and negative are supported
      */
     int getPriority();
diff --git a/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java b/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java
index 90871f866..07911ad21 100644
--- a/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java
+++ b/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java
@@ -36,7 +36,6 @@ public interface ICellWorkbenchItem {
      * inserted into the work bench.
      *
      * @param is item
-     *
      * @return true if the item should be editable in the cell workbench.
      */
     boolean isEditable(ItemStack is);
@@ -45,16 +44,16 @@ public interface ICellWorkbenchItem {
      * used to edit the upgrade slots on your cell, should have a capacity of 0-24,
      * you are also responsible for implementing the valid checks, and any
      * storage/usage of them.
-     *
+     * 

      * onInventoryChange will be called when saving is needed.
      */
     FixedItemInv getUpgradesInventory(ItemStack is);
 
     /**
      * Used to extract, or mirror the contents of the work bench onto the cell.
-     *
+     * 

      * - This should have exactly 63 slots, any more, or less might cause issues.
-     *
+     * 

      * onInventoryChange will be called when saving is needed.
      */
     FixedItemInv getConfigInventory(ItemStack is);
diff --git a/src/api/java/appeng/api/storage/cells/ISaveProvider.java b/src/api/java/appeng/api/storage/cells/ISaveProvider.java
index 52d7b4366..6d75ad26b 100644
--- a/src/api/java/appeng/api/storage/cells/ISaveProvider.java
+++ b/src/api/java/appeng/api/storage/cells/ISaveProvider.java
@@ -28,7 +28,6 @@ import javax.annotation.Nullable;
 /**
  * Tells the cell provider that changes have been made an the cell must be
  * persisted
- *
  */
 public interface ISaveProvider {
     /**
diff --git a/src/api/java/appeng/api/storage/data/IAEFluidStack.java b/src/api/java/appeng/api/storage/data/IAEFluidStack.java
index 8515c7443..0c541a069 100644
--- a/src/api/java/appeng/api/storage/data/IAEFluidStack.java
+++ b/src/api/java/appeng/api/storage/data/IAEFluidStack.java
@@ -30,12 +30,12 @@ import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 /**
  * An alternate version of FluidStack for AE to keep tabs on things easier, and
  * to support larger storage. stackSizes of getFluidStack will be capped.
- *
+ * 

  * You may hold on to these if you want, just make sure you let go of them when
  * your not using them.
- *
+ * 

  * Don't Implement.
- *
+ * 

  * Construct with Api.INSTANCE.storage().getStorageChannel(
  * IFluidStorageChannel.class).createStack( FluidStack )
  */
diff --git a/src/api/java/appeng/api/storage/data/IAEItemStack.java b/src/api/java/appeng/api/storage/data/IAEItemStack.java
index eb676e413..c8527b350 100644
--- a/src/api/java/appeng/api/storage/data/IAEItemStack.java
+++ b/src/api/java/appeng/api/storage/data/IAEItemStack.java
@@ -29,12 +29,12 @@ import net.minecraft.item.ItemStack;
 /**
  * An alternate version of ItemStack for AE to keep tabs on things easier, and
  * to support larger storage. stackSizes of getItemStack will be capped.
- *
+ * 

  * You may hold on to these if you want, just make sure you let go of them when
  * your not using them.
- *
+ * 

  * Don't Implement.
- *
+ * 

  * Construct with Api.INSTANCE.storage().getStorageChannel(
  * IItemStorageChannel.class).createStack( ItemStack )
  */
@@ -86,7 +86,6 @@ public interface IAEItemStack extends IAEStack {
      * compare the item/damage/nbt of the stack.
      *
      * @param otherStack to be compared item
-     *
      * @return true if it is the same type (same item, damage, nbt)
      */
     boolean isSameType(IAEItemStack otherStack);
@@ -95,7 +94,6 @@ public interface IAEItemStack extends IAEStack {
      * compare the item/damage/nbt of the stack.
      *
      * @param stored to be compared item
-     *
      * @return true if it is the same type (same item, damage, nbt)
      */
     boolean isSameType(ItemStack stored);
diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java
index e589b99f6..3ca9acde5 100644
--- a/src/api/java/appeng/api/storage/data/IAEStack.java
+++ b/src/api/java/appeng/api/storage/data/IAEStack.java
@@ -130,15 +130,14 @@ public interface IAEStack> {
 
     /**
      * Compare stacks using precise logic.
-     *
+     * 

      * a IAEItemStack to another AEItemStack or a ItemStack.
-     *
+     * 

      * or
-     *
+     * 

      * IAEFluidStack, FluidStack
      *
      * @param obj compared object
-     *
      * @return true if they are the same.
      */
     @Override
@@ -150,7 +149,6 @@ public interface IAEStack> {
      *
      * @param other The stack to compare.
      * @param mode  Which {@link FuzzyMode} should be used.
-     *
      * @return true if two stacks are equal based on AE Fuzzy Comparison.
      */
     boolean fuzzyComparison(T other, FuzzyMode mode);
@@ -159,7 +157,6 @@ public interface IAEStack> {
      * Slower for disk saving, but smaller/more efficient for packets.
      *
      * @param data to be written data
-     *
      * @throws IOException
      */
     void writeToPacket(PacketByteBuf data);
diff --git a/src/api/java/appeng/api/storage/data/IItemContainer.java b/src/api/java/appeng/api/storage/data/IItemContainer.java
index 8821379a2..5fb5e9428 100644
--- a/src/api/java/appeng/api/storage/data/IItemContainer.java
+++ b/src/api/java/appeng/api/storage/data/IItemContainer.java
@@ -29,9 +29,8 @@ import appeng.api.config.FuzzyMode;
 
 /**
  * Represents a list of items in AE.
- *
+ * 

  * Don't Implement.
- *
  */
 public interface IItemContainer> {
 
@@ -45,7 +44,6 @@ public interface IItemContainer> {
 
     /**
      * @param i compared item
-     *
      * @return a stack equivalent to the stack passed in, but with the correct stack
      *         size information, or null if its not present
      */
@@ -53,7 +51,6 @@ public interface IItemContainer> {
 
     /**
      * @param input compared item
-     *
      * @return a list of relevant fuzzy matched stacks
      */
     Collection findFuzzy(T input, FuzzyMode fuzzy);
diff --git a/src/api/java/appeng/api/storage/data/IItemList.java b/src/api/java/appeng/api/storage/data/IItemList.java
index e52ecd7ca..5de5a6fe8 100644
--- a/src/api/java/appeng/api/storage/data/IItemList.java
+++ b/src/api/java/appeng/api/storage/data/IItemList.java
@@ -29,9 +29,9 @@ import appeng.api.storage.IStorageChannel;
 
 /**
  * Represents a list of items in AE.
- *
+ * 

  * Don't Implement.
- *
+ * 

  * Construct with - For items: Api.INSTANCE.storage().getStorageChannel(
  * IItemStorageChannel.class).createList() - For fluids:
  * Api.INSTANCE.storage().getStorageChannel(
diff --git a/src/api/java/appeng/api/util/AEAxisAlignedBB.java b/src/api/java/appeng/api/util/AEAxisAlignedBB.java
index 50d971314..fdf405dc1 100644
--- a/src/api/java/appeng/api/util/AEAxisAlignedBB.java
+++ b/src/api/java/appeng/api/util/AEAxisAlignedBB.java
@@ -23,7 +23,7 @@ import net.minecraft.util.math.Box;
 /**
  * Mutable stand in for Axis Aligned BB, this was used to prevent GC Thrashing..
  * Related code could also be re-written.
- *
+ * 

  * TODO: Replace with interface and maybe factory should it ever be needed for
  * addons.
  */
diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java
index 7d8564d63..06043638d 100644
--- a/src/api/java/appeng/api/util/AEColor.java
+++ b/src/api/java/appeng/api/util/AEColor.java
@@ -32,7 +32,7 @@ import net.minecraft.util.DyeColor;
 /**
  * List of all colors supported by AE, their names, and various colors for
  * display.
- *
+ * 

  * Should be the same order as Dyes, excluding Transparent.
  */
 public enum AEColor {
diff --git a/src/api/java/appeng/api/util/AEColoredItemDefinition.java b/src/api/java/appeng/api/util/AEColoredItemDefinition.java
index 2b19f1eb4..96b9094cb 100644
--- a/src/api/java/appeng/api/util/AEColoredItemDefinition.java
+++ b/src/api/java/appeng/api/util/AEColoredItemDefinition.java
@@ -52,7 +52,6 @@ public interface AEColoredItemDefinition {
 
     /**
      * @param stackSize - stack size of the result.
-     *
      * @return an array of all colors.
      */
     ItemStack[] allStacks(int stackSize);
@@ -62,7 +61,6 @@ public interface AEColoredItemDefinition {
      *
      * @param color          compared color of item
      * @param comparableItem compared item
-     *
      * @return true if the item stack is a matching item.
      */
     boolean sameAs(AEColor color, ItemStack comparableItem);
diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java
index 7754b53ba..5dbab7e7d 100644
--- a/src/api/java/appeng/api/util/IConfigManager.java
+++ b/src/api/java/appeng/api/util/IConfigManager.java
@@ -31,7 +31,7 @@ import appeng.api.config.Settings;
 
 /**
  * Used to adjust settings on an object,
- *
+ * 

  * Obtained via {@link IConfigurableObject}
  */
 public interface IConfigManager {
@@ -56,7 +56,6 @@ public interface IConfigManager {
      * Get Value of a particular setting
      *
      * @param settingName name of setting
-     *
      * @return value of setting
      */
     Enum getSetting(Settings settingName);
@@ -66,7 +65,6 @@ public interface IConfigManager {
      *
      * @param settingName to be changed setting
      * @param newValue    new value for setting
-     *
      * @return changed setting
      */
     Enum putSetting(Settings settingName, Enum newValue);
diff --git a/src/api/java/appeng/api/util/IOrientable.java b/src/api/java/appeng/api/util/IOrientable.java
index a49c5d522..4dae69f91 100644
--- a/src/api/java/appeng/api/util/IOrientable.java
+++ b/src/api/java/appeng/api/util/IOrientable.java
@@ -27,10 +27,10 @@ import net.minecraft.util.math.Direction;
 
 /**
  * Nearly all of AE's Tile Entities implement IOrientable.
- *
+ * 

  * and it can be used to manipulate the direction of some machines, most of
  * these orientations are purely visual.
- *
+ * 

  * AE also responds to Block.rotateBlock
  */
 public interface IOrientable {
diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java
index 365b93cf9..ae1e935d5 100644
--- a/src/api/java/appeng/api/util/IOrientableBlock.java
+++ b/src/api/java/appeng/api/util/IOrientableBlock.java
@@ -35,7 +35,6 @@ public interface IOrientableBlock {
     /**
      * @param world world of block
      * @param pos   The position of the block.
-     *
      * @return a IOrientable if applicable
      */
     IOrientable getOrientable(BlockView world, BlockPos pos);
diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java
index c53c0441c..0eee1035d 100644
--- a/src/api/java/appeng/api/util/WorldCoord.java
+++ b/src/api/java/appeng/api/util/WorldCoord.java
@@ -29,7 +29,7 @@ import net.minecraft.util.math.BlockPos;
 /**
  * Represents a relative coordinate, either relative to another object, or
  * relative to the origin of a dimension.
- *
+ * 

  * TODO: Consider replacing with {@link BlockPos}
  */
 public class WorldCoord {
diff --git a/src/datagen/java/appeng/data/Entrypoint.java b/src/datagen/java/appeng/data/Entrypoint.java
index c9e27224e..ae8209c69 100644
--- a/src/datagen/java/appeng/data/Entrypoint.java
+++ b/src/datagen/java/appeng/data/Entrypoint.java
@@ -1,6 +1,5 @@
 package appeng.data;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
@@ -9,9 +8,6 @@ import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 import net.minecraft.Bootstrap;
 import net.minecraft.data.DataGenerator;
 
-import appeng.core.AEConfig;
-import appeng.core.Api;
-import appeng.core.CreativeTab;
 import appeng.data.providers.loot.BlockDropProvider;
 import appeng.data.providers.recipes.SlabStairRecipes;
 import appeng.data.providers.tags.ConventionTagProvider;
diff --git a/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java b/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java
index 38330c9ba..d55dbc216 100644
--- a/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java
+++ b/src/datagen/java/appeng/data/providers/recipes/SlabStairRecipes.java
@@ -1,8 +1,6 @@
 package appeng.data.providers.recipes;
 
-import static net.minecraft.data.server.RecipesProvider.conditionsFromItem;
-import static net.minecraft.data.server.RecipesProvider.saveRecipe;
-import static net.minecraft.data.server.RecipesProvider.saveRecipeAdvancement;
+import static net.minecraft.data.server.RecipesProvider.*;
 
 import java.nio.file.Path;
 import java.util.function.Consumer;
diff --git a/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java b/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java
index fd2b6eb95..56e755dca 100644
--- a/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java
+++ b/src/datagen/java/appeng/data/providers/tags/ConventionTagProvider.java
@@ -6,7 +6,6 @@ import java.nio.file.Path;
 import net.minecraft.block.Blocks;
 import net.minecraft.item.Items;
 
-import appeng.core.Api;
 import appeng.core.AppEng;
 
 public class ConventionTagProvider extends TagProvider {
diff --git a/src/datagen/resources/fabric.mod.json b/src/datagen/resources/fabric.mod.json
index ba3c7ec47..770468155 100644
--- a/src/datagen/resources/fabric.mod.json
+++ b/src/datagen/resources/fabric.mod.json
@@ -9,7 +9,6 @@
     "homepage": "https://ae-mod.info/",
     "sources": "https://github.com/AppliedEnergistics/Applied-Energistics-2/"
   },
-
   "license": "LGPL",
   "icon": "assets/appliedenergistics2/icon.png",
   "environment": "client",
diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java
index 561408295..9eadf755b 100644
--- a/src/main/java/appeng/block/AEBaseBlock.java
+++ b/src/main/java/appeng/block/AEBaseBlock.java
@@ -18,21 +18,15 @@
 
 package appeng.block;
 
-import javax.annotation.Nullable;
-
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
 import net.minecraft.block.MaterialColor;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.BlockSoundGroup;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.registry.Registry;
diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java
index d61080cf0..58322393a 100644
--- a/src/main/java/appeng/block/AEBaseTileBlock.java
+++ b/src/main/java/appeng/block/AEBaseTileBlock.java
@@ -27,7 +27,6 @@ import javax.annotation.Nullable;
 
 import com.google.common.collect.Lists;
 
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockEntityProvider;
 import net.minecraft.block.BlockState;
@@ -284,7 +283,7 @@ public abstract class AEBaseTileBlock extends AEBas
     /**
      * Returns the BlockState based on the given BlockState while considering the
      * state of the given TileEntity.
-     *
+     * 

      * If the given TileEntity is not of the right type for this block, the state is
      * returned unchanged, this is also the case if the given block state does not
      * belong to this block.
@@ -300,7 +299,7 @@ public abstract class AEBaseTileBlock extends AEBas
     /**
      * Reimplement this in subclasses to allow tile-entities to update the state of
      * their block when their own state changes.
-     *
+     * 

      * It is guaranteed that te is not-null and the block of the given block state
      * is this exact block instance.
      */
diff --git a/src/main/java/appeng/block/crafting/CraftingStorageItem.java b/src/main/java/appeng/block/crafting/CraftingStorageItem.java
index 51df53f32..3e43d8b8c 100644
--- a/src/main/java/appeng/block/crafting/CraftingStorageItem.java
+++ b/src/main/java/appeng/block/crafting/CraftingStorageItem.java
@@ -19,13 +19,8 @@
 package appeng.block.crafting;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 
-import appeng.api.features.AEFeature;
 import appeng.block.AEBaseBlockItem;
-import appeng.core.AEConfig;
-import appeng.core.Api;
 
 public class CraftingStorageItem extends AEBaseBlockItem {
 
diff --git a/src/main/java/appeng/block/misc/InscriberBlock.java b/src/main/java/appeng/block/misc/InscriberBlock.java
index 175c955b2..2992a803f 100644
--- a/src/main/java/appeng/block/misc/InscriberBlock.java
+++ b/src/main/java/appeng/block/misc/InscriberBlock.java
@@ -45,7 +45,7 @@ public class InscriberBlock extends AEBaseTileBlock {
     @Override
     public int getOpacity(BlockState state, BlockView worldIn, BlockPos pos) {
         return 2; // FIXME validate this. a) possibly not required because of getShape b) value
-                  // range. was 2 in 1.10
+        // range. was 2 in 1.10
     }
 
     @Override
diff --git a/src/main/java/appeng/block/misc/InscriberRendering.java b/src/main/java/appeng/block/misc/InscriberRendering.java
index 1e3b6cd6c..92103be20 100644
--- a/src/main/java/appeng/block/misc/InscriberRendering.java
+++ b/src/main/java/appeng/block/misc/InscriberRendering.java
@@ -1,4 +1,3 @@
-
 package appeng.block.misc;
 
 import net.fabricmc.api.EnvType;
diff --git a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java
index f0ff311b8..e6a33cfbe 100644
--- a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java
+++ b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java
@@ -26,11 +26,7 @@ import javax.annotation.Nullable;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.Material;
-import net.minecraft.block.ShapeContext;
+import net.minecraft.block.*;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
diff --git a/src/main/java/appeng/block/networking/WirelessBlock.java b/src/main/java/appeng/block/networking/WirelessBlock.java
index 919ee3b0b..c484d1690 100644
--- a/src/main/java/appeng/block/networking/WirelessBlock.java
+++ b/src/main/java/appeng/block/networking/WirelessBlock.java
@@ -39,7 +39,6 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
 import appeng.block.AEBaseTileBlock;
-import appeng.block.networking.WirelessBlock.State;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.implementations.WirelessContainer;
diff --git a/src/main/java/appeng/block/networking/WirelessRendering.java b/src/main/java/appeng/block/networking/WirelessRendering.java
index f492f9a80..377e3ac78 100644
--- a/src/main/java/appeng/block/networking/WirelessRendering.java
+++ b/src/main/java/appeng/block/networking/WirelessRendering.java
@@ -1,4 +1,3 @@
-
 package appeng.block.networking;
 
 import net.fabricmc.api.EnvType;
diff --git a/src/main/java/appeng/block/paint/PaintSplotches.java b/src/main/java/appeng/block/paint/PaintSplotches.java
index 12186459b..217d3116e 100644
--- a/src/main/java/appeng/block/paint/PaintSplotches.java
+++ b/src/main/java/appeng/block/paint/PaintSplotches.java
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;
 
 import java.util.Collection;
diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
index e9d673189..7a2712d7c 100644
--- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
+++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;
 
 import java.util.Collections;
diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java
index 1139b2b10..988ec09b1 100644
--- a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java
+++ b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java
@@ -18,14 +18,7 @@
 
 package appeng.block.paint;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Material;
-import net.minecraft.block.MaterialColor;
-import net.minecraft.block.ShapeContext;
-import net.minecraft.fluid.Fluid;
+import net.minecraft.block.*;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/appeng/block/paint/PaintSplotchesModel.java b/src/main/java/appeng/block/paint/PaintSplotchesModel.java
index 35e0d9175..7d447c3e2 100644
--- a/src/main/java/appeng/block/paint/PaintSplotchesModel.java
+++ b/src/main/java/appeng/block/paint/PaintSplotchesModel.java
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;
 
 import java.util.Collection;
diff --git a/src/main/java/appeng/block/paint/PaintSplotchesRendering.java b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java
index a9efd807b..e834f0236 100644
--- a/src/main/java/appeng/block/paint/PaintSplotchesRendering.java
+++ b/src/main/java/appeng/block/paint/PaintSplotchesRendering.java
@@ -1,4 +1,3 @@
-
 package appeng.block.paint;
 
 import net.fabricmc.api.EnvType;
diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
index eb6804731..9ded11ef1 100644
--- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
+++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;
 
 import java.util.EnumSet;
diff --git a/src/main/java/appeng/block/qnb/QnbFormedModel.java b/src/main/java/appeng/block/qnb/QnbFormedModel.java
index 988158649..5ad135da7 100644
--- a/src/main/java/appeng/block/qnb/QnbFormedModel.java
+++ b/src/main/java/appeng/block/qnb/QnbFormedModel.java
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;
 
 import java.util.Collection;
diff --git a/src/main/java/appeng/block/qnb/QnbFormedState.java b/src/main/java/appeng/block/qnb/QnbFormedState.java
index 90a33ba73..b8bdcd66a 100644
--- a/src/main/java/appeng/block/qnb/QnbFormedState.java
+++ b/src/main/java/appeng/block/qnb/QnbFormedState.java
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;
 
 import java.util.Set;
diff --git a/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java b/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java
index 63149decf..1cb33bfb7 100644
--- a/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java
+++ b/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java
@@ -1,4 +1,3 @@
-
 package appeng.block.qnb;
 
 import net.fabricmc.api.EnvType;
diff --git a/src/main/java/appeng/block/spatial/SpatialPylonBlock.java b/src/main/java/appeng/block/spatial/SpatialPylonBlock.java
index 50742ae27..3897f0d2c 100644
--- a/src/main/java/appeng/block/spatial/SpatialPylonBlock.java
+++ b/src/main/java/appeng/block/spatial/SpatialPylonBlock.java
@@ -21,7 +21,6 @@ package appeng.block.spatial;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
 import appeng.block.AEBaseTileBlock;
diff --git a/src/main/java/appeng/block/storage/SkyChestBlock.java b/src/main/java/appeng/block/storage/SkyChestBlock.java
index b4cd8060c..1c21c9c81 100644
--- a/src/main/java/appeng/block/storage/SkyChestBlock.java
+++ b/src/main/java/appeng/block/storage/SkyChestBlock.java
@@ -65,7 +65,9 @@ public class SkyChestBlock extends AEBaseTileBlock {
 
     public enum SkyChestType {
         STONE, BLOCK
-    };
+    }
+
+    ;
 
     public final SkyChestType type;
 
diff --git a/src/main/java/appeng/bootstrap/BlockEntityBuilder.java b/src/main/java/appeng/bootstrap/BlockEntityBuilder.java
index 680ec8644..66c07d53c 100644
--- a/src/main/java/appeng/bootstrap/BlockEntityBuilder.java
+++ b/src/main/java/appeng/bootstrap/BlockEntityBuilder.java
@@ -19,7 +19,6 @@ import net.minecraft.util.registry.Registry;
 
 import appeng.api.features.AEFeature;
 import appeng.block.AEBaseTileBlock;
-import appeng.bootstrap.components.IClientSetupComponent;
 import appeng.bootstrap.components.ITileEntityRegistrationComponent;
 import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.core.AppEng;
diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java
index c75a801be..87ef5f2a3 100644
--- a/src/main/java/appeng/bootstrap/BlockRendering.java
+++ b/src/main/java/appeng/bootstrap/BlockRendering.java
@@ -30,7 +30,6 @@ import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.util.Identifier;
 
 import appeng.block.AEBaseTileBlock;
-import appeng.bootstrap.components.BlockColorComponent;
 import appeng.bootstrap.components.RenderTypeComponent;
 import appeng.client.render.model.AutoRotatingBakedModel;
 
diff --git a/src/main/java/appeng/bootstrap/EntityBuilder.java b/src/main/java/appeng/bootstrap/EntityBuilder.java
index 5fe60461f..e82a30819 100644
--- a/src/main/java/appeng/bootstrap/EntityBuilder.java
+++ b/src/main/java/appeng/bootstrap/EntityBuilder.java
@@ -5,7 +5,6 @@ import java.util.EnumSet;
 import java.util.function.Consumer;
 
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
-import net.fabricmc.fabric.impl.object.builder.FabricEntityType;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java
index 1c4fa90e5..fe9fed15f 100644
--- a/src/main/java/appeng/bootstrap/FeatureFactory.java
+++ b/src/main/java/appeng/bootstrap/FeatureFactory.java
@@ -18,13 +18,7 @@
 
 package appeng.bootstrap;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
diff --git a/src/main/java/appeng/bootstrap/IBlockRendering.java b/src/main/java/appeng/bootstrap/IBlockRendering.java
index 5f1a77124..8b76beeaa 100644
--- a/src/main/java/appeng/bootstrap/IBlockRendering.java
+++ b/src/main/java/appeng/bootstrap/IBlockRendering.java
@@ -19,7 +19,6 @@
 package appeng.bootstrap;
 
 import java.util.function.BiFunction;
-import java.util.function.Predicate;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java
index 41b2b27ae..aad967002 100644
--- a/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java
+++ b/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java
@@ -1,8 +1,5 @@
 package appeng.bootstrap.components;
 
-import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.client.color.item.ItemColors;
-
 import appeng.bootstrap.IBootstrapComponent;
 
 public interface IItemColorRegistrationComponent extends IBootstrapComponent {
diff --git a/src/main/java/appeng/bootstrap/components/ItemColorComponent.java b/src/main/java/appeng/bootstrap/components/ItemColorComponent.java
index 05c3cf433..cb549c050 100644
--- a/src/main/java/appeng/bootstrap/components/ItemColorComponent.java
+++ b/src/main/java/appeng/bootstrap/components/ItemColorComponent.java
@@ -19,9 +19,7 @@
 package appeng.bootstrap.components;
 
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
-import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.item.ItemColorProvider;
-import net.minecraft.client.color.item.ItemColors;
 import net.minecraft.item.Item;
 
 public class ItemColorComponent implements IItemColorRegistrationComponent {
diff --git a/src/main/java/appeng/client/ActionKey.java b/src/main/java/appeng/client/ActionKey.java
index 49d43288c..948b01916 100644
--- a/src/main/java/appeng/client/ActionKey.java
+++ b/src/main/java/appeng/client/ActionKey.java
@@ -1,4 +1,3 @@
-
 package appeng.client;
 
 import java.util.Locale;
diff --git a/src/main/java/appeng/client/AppEngClient.java b/src/main/java/appeng/client/AppEngClient.java
index 51e7cdbe8..1e42c4556 100644
--- a/src/main/java/appeng/client/AppEngClient.java
+++ b/src/main/java/appeng/client/AppEngClient.java
@@ -1,10 +1,6 @@
 package appeng.client;
 
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -41,94 +37,18 @@ import appeng.bootstrap.ModelsReloadCallback;
 import appeng.bootstrap.components.IClientSetupComponent;
 import appeng.bootstrap.components.IItemColorRegistrationComponent;
 import appeng.bootstrap.components.IModelBakeComponent;
-import appeng.client.gui.implementations.CellWorkbenchScreen;
-import appeng.client.gui.implementations.ChestScreen;
-import appeng.client.gui.implementations.CondenserScreen;
-import appeng.client.gui.implementations.CraftAmountScreen;
-import appeng.client.gui.implementations.CraftConfirmScreen;
-import appeng.client.gui.implementations.CraftingCPUScreen;
-import appeng.client.gui.implementations.CraftingStatusScreen;
-import appeng.client.gui.implementations.CraftingTermScreen;
-import appeng.client.gui.implementations.DriveScreen;
-import appeng.client.gui.implementations.FormationPlaneScreen;
-import appeng.client.gui.implementations.GrinderScreen;
-import appeng.client.gui.implementations.IOPortScreen;
-import appeng.client.gui.implementations.InscriberScreen;
-import appeng.client.gui.implementations.InterfaceScreen;
-import appeng.client.gui.implementations.InterfaceTerminalScreen;
-import appeng.client.gui.implementations.LevelEmitterScreen;
-import appeng.client.gui.implementations.MEMonitorableScreen;
-import appeng.client.gui.implementations.MEPortableCellScreen;
-import appeng.client.gui.implementations.MolecularAssemblerScreen;
-import appeng.client.gui.implementations.NetworkStatusScreen;
-import appeng.client.gui.implementations.NetworkToolScreen;
-import appeng.client.gui.implementations.PatternTermScreen;
-import appeng.client.gui.implementations.PriorityScreen;
-import appeng.client.gui.implementations.QNBScreen;
-import appeng.client.gui.implementations.QuartzKnifeScreen;
-import appeng.client.gui.implementations.SecurityStationScreen;
-import appeng.client.gui.implementations.SkyChestScreen;
-import appeng.client.gui.implementations.SpatialIOPortScreen;
-import appeng.client.gui.implementations.StorageBusScreen;
-import appeng.client.gui.implementations.UpgradeableScreen;
-import appeng.client.gui.implementations.VibrationChamberScreen;
-import appeng.client.gui.implementations.WirelessScreen;
-import appeng.client.gui.implementations.WirelessTermScreen;
+import appeng.client.gui.implementations.*;
 import appeng.client.render.FacadeItemModel;
 import appeng.client.render.SimpleModelLoader;
 import appeng.client.render.cablebus.CableBusModelLoader;
 import appeng.client.render.cablebus.P2PTunnelFrequencyModel;
 import appeng.client.render.crafting.CraftingCubeModel;
-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.ParticleTypes;
-import appeng.client.render.effects.VibrantFX;
-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.effects.*;
+import appeng.client.render.model.*;
 import appeng.client.render.spatial.SpatialPylonModel;
 import appeng.client.render.tesr.InscriberTESR;
 import appeng.client.render.tesr.SkyChestTESR;
-import appeng.container.implementations.CellWorkbenchContainer;
-import appeng.container.implementations.ChestContainer;
-import appeng.container.implementations.CondenserContainer;
-import appeng.container.implementations.CraftAmountContainer;
-import appeng.container.implementations.CraftConfirmContainer;
-import appeng.container.implementations.CraftingCPUContainer;
-import appeng.container.implementations.CraftingStatusContainer;
-import appeng.container.implementations.CraftingTermContainer;
-import appeng.container.implementations.DriveContainer;
-import appeng.container.implementations.FormationPlaneContainer;
-import appeng.container.implementations.GrinderContainer;
-import appeng.container.implementations.IOPortContainer;
-import appeng.container.implementations.InscriberContainer;
-import appeng.container.implementations.InterfaceContainer;
-import appeng.container.implementations.InterfaceTerminalContainer;
-import appeng.container.implementations.LevelEmitterContainer;
-import appeng.container.implementations.MEMonitorableContainer;
-import appeng.container.implementations.MEPortableCellContainer;
-import appeng.container.implementations.MolecularAssemblerContainer;
-import appeng.container.implementations.NetworkStatusContainer;
-import appeng.container.implementations.NetworkToolContainer;
-import appeng.container.implementations.PatternTermContainer;
-import appeng.container.implementations.PriorityContainer;
-import appeng.container.implementations.QNBContainer;
-import appeng.container.implementations.QuartzKnifeContainer;
-import appeng.container.implementations.SecurityStationContainer;
-import appeng.container.implementations.SkyChestContainer;
-import appeng.container.implementations.SpatialIOPortContainer;
-import appeng.container.implementations.StorageBusContainer;
-import appeng.container.implementations.UpgradeableContainer;
-import appeng.container.implementations.VibrationChamberContainer;
-import appeng.container.implementations.WirelessContainer;
-import appeng.container.implementations.WirelessTermContainer;
+import appeng.container.implementations.*;
 import appeng.core.Api;
 import appeng.core.ApiDefinitions;
 import appeng.core.AppEng;
@@ -136,23 +56,9 @@ import appeng.core.AppEngBase;
 import appeng.core.features.registries.PartModels;
 import appeng.core.sync.network.ClientNetworkHandler;
 import appeng.core.worlddata.WorldData;
-import appeng.entity.ChargedQuartzEntity;
-import appeng.entity.GrowingCrystalEntity;
-import appeng.entity.SingularityEntity;
-import appeng.entity.TinyTNTPrimedEntity;
-import appeng.entity.TinyTNTPrimedRenderer;
-import appeng.fluids.client.gui.FluidFormationPlaneScreen;
-import appeng.fluids.client.gui.FluidIOScreen;
-import appeng.fluids.client.gui.FluidInterfaceScreen;
-import appeng.fluids.client.gui.FluidLevelEmitterScreen;
-import appeng.fluids.client.gui.FluidStorageBusScreen;
-import appeng.fluids.client.gui.FluidTerminalScreen;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.container.FluidLevelEmitterContainer;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.container.FluidTerminalContainer;
+import appeng.entity.*;
+import appeng.fluids.client.gui.*;
+import appeng.fluids.container.*;
 import appeng.hooks.ClientTickHandler;
 import appeng.parts.automation.PlaneModel;
 import appeng.tile.crafting.MolecularAssemblerRenderer;
@@ -374,7 +280,7 @@ public final class AppEngClient extends AppEngBase {
         addBuiltInModel("item/biometric_card", BiometricCardModel::new);
         addBuiltInModel("block/drive", DriveModel::new);
         addBuiltInModel("color_applicator", ColorApplicatorModel::new); // FIXME need to wire this up (this might just
-                                                                        // not be needed)
+        // not be needed)
         addBuiltInModel("block/spatial_pylon", SpatialPylonModel::new);
         addBuiltInModel("block/paint", PaintSplotchesModel::new);
         addBuiltInModel("block/qnb/qnb_formed", QnbFormedModel::new);
diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java
index c5e0fa11e..7bd1b2bf1 100644
--- a/src/main/java/appeng/client/gui/AEBaseScreen.java
+++ b/src/main/java/appeng/client/gui/AEBaseScreen.java
@@ -18,11 +18,7 @@
 
 package appeng.client.gui;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -70,17 +66,8 @@ import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
 import appeng.client.render.StackSizeRenderer;
 import appeng.container.AEBaseContainer;
-import appeng.container.slot.AppEngCraftingSlot;
-import appeng.container.slot.AppEngSlot;
+import appeng.container.slot.*;
 import appeng.container.slot.AppEngSlot.CalculatedValidity;
-import appeng.container.slot.CraftingTermSlot;
-import appeng.container.slot.DisabledSlot;
-import appeng.container.slot.FakeSlot;
-import appeng.container.slot.IOptionalSlot;
-import appeng.container.slot.InaccessibleSlot;
-import appeng.container.slot.OutputSlot;
-import appeng.container.slot.PatternTermSlot;
-import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/main/java/appeng/client/gui/Size1Slot.java
index ddc40c86a..880223340 100644
--- a/src/main/java/appeng/client/gui/Size1Slot.java
+++ b/src/main/java/appeng/client/gui/Size1Slot.java
@@ -1,4 +1,3 @@
-
 package appeng.client.gui;
 
 import javax.annotation.Nonnull;
diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java
index ea7f99e3e..9fd98d7cb 100644
--- a/src/main/java/appeng/client/gui/implementations/AESubScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/AESubScreen.java
@@ -13,11 +13,7 @@ import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.IParts;
 import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.widgets.TabButton;
-import appeng.container.implementations.ChestContainer;
-import appeng.container.implementations.CraftingTermContainer;
-import appeng.container.implementations.MEMonitorableContainer;
-import appeng.container.implementations.PatternTermContainer;
-import appeng.container.implementations.WirelessTermContainer;
+import appeng.container.implementations.*;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
@@ -55,35 +51,23 @@ final class AESubScreen {
             IPriorityHost priorityHost = (IPriorityHost) containerTarget;
             this.previousContainerIcon = priorityHost.getItemStackRepresentation();
             this.previousContainerType = ChestContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof IPriorityHost) {
+        } else if (containerTarget instanceof IPriorityHost) {
             IPriorityHost priorityHost = (IPriorityHost) containerTarget;
             this.previousContainerIcon = priorityHost.getItemStackRepresentation();
             this.previousContainerType = priorityHost.getContainerType();
-        }
-
-        else if (containerTarget instanceof WirelessTerminalGuiObject) {
+        } else if (containerTarget instanceof WirelessTerminalGuiObject) {
             this.previousContainerIcon = definitions.items().wirelessTerminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = WirelessTermContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof TerminalPart) {
+        } else if (containerTarget instanceof TerminalPart) {
             this.previousContainerIcon = parts.terminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = MEMonitorableContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof CraftingTerminalPart) {
+        } else if (containerTarget instanceof CraftingTerminalPart) {
             this.previousContainerIcon = parts.craftingTerminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = CraftingTermContainer.TYPE;
-        }
-
-        else if (containerTarget instanceof PatternTerminalPart) {
+        } else if (containerTarget instanceof PatternTerminalPart) {
             this.previousContainerIcon = parts.patternTerminal().maybeStack(1).orElse(ItemStack.EMPTY);
             this.previousContainerType = PatternTermContainer.TYPE;
-        }
-
-        else {
+        } else {
             this.previousContainerIcon = null;
             this.previousContainerType = null;
         }
diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java
index 05560e642..71f1f74ec 100644
--- a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java
@@ -25,11 +25,7 @@ import net.minecraft.text.Text;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.ActionItems;
-import appeng.api.config.CopyMode;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
+import appeng.api.config.*;
 import appeng.api.implementations.items.IUpgradeModule;
 import appeng.client.gui.widgets.ActionButton;
 import appeng.client.gui.widgets.SettingToggleButton;
diff --git a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
index f48493142..de15cdac2 100644
--- a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.google.common.base.Joiner;
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.gui.widget.ButtonWidget;
diff --git a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java
index 60680d7f7..294d11478 100644
--- a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Joiner;
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import org.apache.commons.lang3.time.DurationFormatUtils;
diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
index dd93d23c0..1de6738b1 100644
--- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java
@@ -18,21 +18,13 @@
 
 package appeng.client.gui.implementations;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
+import java.util.*;
 
 import com.google.common.collect.HashMultimap;
 import com.mojang.blaze3d.systems.RenderSystem;
 
 import org.lwjgl.glfw.GLFW;
 
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
@@ -242,7 +234,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen
      * Respects a search term if present (ignores case) and adding only matching
      * patterns.
      */
@@ -335,12 +327,11 @@ public class InterfaceTerminalScreen extends AEBaseScreen
      * If this cache should be empty, it will populate it with an earlier cache if
      * available or at least the cache for the empty string.
      *
      * @param searchTerm the corresponding search
-     *
      * @return a Set matching a superset of the search term
      */
     private Set getCacheForSearchTerm(final String searchTerm) {
diff --git a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
index 3c201f509..79b09b62e 100644
--- a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java
@@ -18,19 +18,11 @@
 
 package appeng.client.gui.implementations;
 
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.LevelType;
-import appeng.api.config.PowerUnits;
-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.client.gui.NumberEntryType;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
index 0711565f3..1fcc659fe 100644
--- a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java
@@ -28,12 +28,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
 
-import appeng.api.config.SearchBoxMode;
-import appeng.api.config.Settings;
-import appeng.api.config.SortDir;
-import appeng.api.config.SortOrder;
-import appeng.api.config.TerminalStyle;
-import appeng.api.config.ViewItems;
+import appeng.api.config.*;
 import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.api.implementations.tiles.IMEChest;
 import appeng.api.implementations.tiles.IViewCellStorage;
@@ -42,11 +37,7 @@ import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;
 import appeng.client.ActionKey;
 import appeng.client.gui.AEBaseMEScreen;
-import appeng.client.gui.widgets.AETextField;
-import appeng.client.gui.widgets.ISortSource;
-import appeng.client.gui.widgets.Scrollbar;
-import appeng.client.gui.widgets.SettingToggleButton;
-import appeng.client.gui.widgets.TabButton;
+import appeng.client.gui.widgets.*;
 import appeng.client.me.InternalSlotME;
 import appeng.client.me.ItemRepo;
 import appeng.container.implementations.CraftingStatusContainer;
diff --git a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java
index 98a94772c..a28220cc4 100644
--- a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java
@@ -18,10 +18,8 @@
 
 package appeng.client.gui.implementations;
 
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 
 import appeng.client.gui.AEBaseScreen;
diff --git a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java
index 5e059fd42..2240ed975 100644
--- a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java
@@ -21,7 +21,6 @@ package appeng.client.gui.implementations;
 import org.lwjgl.glfw.GLFW;
 
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.LiteralText;
diff --git a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java
index 2f5ae3615..a96d54878 100644
--- a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java
@@ -22,11 +22,7 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.ActionItems;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
+import appeng.api.config.*;
 import appeng.client.gui.widgets.ActionButton;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
diff --git a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java
index eb87574fd..4fe5fa495 100644
--- a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java
+++ b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java
@@ -22,12 +22,7 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SchedulingMode;
-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.client.gui.AEBaseScreen;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
diff --git a/src/main/java/appeng/client/gui/widgets/AETextField.java b/src/main/java/appeng/client/gui/widgets/AETextField.java
index 62df6e1aa..eee3a632a 100644
--- a/src/main/java/appeng/client/gui/widgets/AETextField.java
+++ b/src/main/java/appeng/client/gui/widgets/AETextField.java
@@ -33,7 +33,7 @@ import net.minecraft.text.LiteralText;
  * A modified version of the Minecraft text field. You can initialize it over
  * the full element span. The mouse click area is increased to the full element
  * subtracted with the defined padding.
- *
+ * 

  * The rendering does pay attention to the size of the '_' caret.
  */
 public class AETextField extends TextFieldWidget {
diff --git a/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java
index 26ca1ec8a..f63f9ced5 100644
--- a/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java
+++ b/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java
@@ -1,4 +1,3 @@
-
 package appeng.client.gui.widgets;
 
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/appeng/client/gui/widgets/ITooltip.java b/src/main/java/appeng/client/gui/widgets/ITooltip.java
index e2cbd7018..d583c7446 100644
--- a/src/main/java/appeng/client/gui/widgets/ITooltip.java
+++ b/src/main/java/appeng/client/gui/widgets/ITooltip.java
@@ -29,7 +29,7 @@ public interface ITooltip {
 
     /**
      * Returns the tooltip message.
-     *
+     * 

      * Should use {@link net.minecraft.text.LiteralText#EMPTY} for no tooltip
      *
      * @return tooltip message
diff --git a/src/main/java/appeng/client/gui/widgets/IconButton.java b/src/main/java/appeng/client/gui/widgets/IconButton.java
index 9d9fa02bd..f3e620dd6 100644
--- a/src/main/java/appeng/client/gui/widgets/IconButton.java
+++ b/src/main/java/appeng/client/gui/widgets/IconButton.java
@@ -54,7 +54,7 @@ public abstract class IconButton extends ButtonWidget implements ITooltip {
             textureManager.bindTexture(TEXTURE_STATES);
             RenderSystem.disableDepthTest();
             RenderSystem.enableBlend(); // FIXME: This should be the _default_ state, but some vanilla widget disables
-                                        // it :|
+            // it :|
             if (this.halfSize) {
                 this.width = 8;
                 this.height = 8;
diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
index bc788d22a..88d59c508 100644
--- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
+++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java
@@ -29,24 +29,7 @@ import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.CondenserOutput;
-import appeng.api.config.FullnessMode;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.LevelType;
-import appeng.api.config.OperationMode;
-import appeng.api.config.PowerUnits;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.RelativeDirection;
-import appeng.api.config.SchedulingMode;
-import appeng.api.config.SearchBoxMode;
-import appeng.api.config.Settings;
-import appeng.api.config.SortDir;
-import appeng.api.config.SortOrder;
-import appeng.api.config.StorageFilter;
-import appeng.api.config.TerminalStyle;
-import appeng.api.config.ViewItems;
-import appeng.api.config.YesNo;
+import appeng.api.config.*;
 import appeng.core.localization.ButtonToolTips;
 import appeng.util.EnumCycler;
 
diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java
index 430ddf2a6..d2695c2ca 100644
--- a/src/main/java/appeng/client/render/StackSizeRenderer.java
+++ b/src/main/java/appeng/client/render/StackSizeRenderer.java
@@ -70,7 +70,7 @@ public class StackSizeRenderer {
         final int offset = AEConfig.instance().isUseLargeFonts() ? 0 : -1;
 
         AffineTransformation tm = new AffineTransformation(new Vector3f(0, 0, 300), // Taken from
-                                                                                    // ItemRenderer.renderItemOverlayIntoGUI
+                // ItemRenderer.renderItemOverlayIntoGUI
                 null, new Vector3f(scaleFactor, scaleFactor, scaleFactor), null);
 
         RenderSystem.disableBlend();
diff --git a/src/main/java/appeng/client/render/TesrRenderHelper.java b/src/main/java/appeng/client/render/TesrRenderHelper.java
index 7d5b18ca1..2e3c54780 100644
--- a/src/main/java/appeng/client/render/TesrRenderHelper.java
+++ b/src/main/java/appeng/client/render/TesrRenderHelper.java
@@ -77,6 +77,7 @@ public class TesrRenderHelper {
 
     // TODO, A different approach will have to be used for this from TESRs, -covers,
     // i have ideas.
+
     /**
      * Render an item in 2D.
      */
diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java
index 386031651..fbd005742 100644
--- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java
+++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java
@@ -18,12 +18,7 @@
 
 package appeng.client.render.cablebus;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 import java.util.function.Function;
 
 import net.fabricmc.api.EnvType;
@@ -110,7 +105,7 @@ class CableBuilder {
 
     /**
      * Adds the core of a cable to the given list of quads.
-     *
+     * 

      * The type of cable core is automatically deduced from the given cable type.
      */
     public void addCableCore(AECableType cableType, AEColor color, QuadEmitter emitter) {
diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
index 4f2c1937d..409d24cc5 100644
--- a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
+++ b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
@@ -18,14 +18,8 @@
 
 package appeng.client.render.cablebus;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Random;
 import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
diff --git a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
index 9076b2446..014b18745 100644
--- a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
+++ b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
@@ -19,11 +19,7 @@
 package appeng.client.render.cablebus;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java
index fa15814fd..93ebd4af7 100644
--- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java
+++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java
@@ -18,14 +18,15 @@
 
 package appeng.client.render.cablebus;
 
-import java.util.*;
+import java.util.EnumMap;
+import java.util.EnumSet;
 
 import com.google.common.base.Preconditions;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
-import net.minecraft.client.render.*;
+import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.math.Vector4f;
 import net.minecraft.util.math.Direction;
diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
index 7e37d9a63..2707139ba 100644
--- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
+++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
@@ -18,14 +18,8 @@
 
 package appeng.client.render.cablebus;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -59,11 +53,7 @@ import appeng.api.util.AEAxisAlignedBB;
 import appeng.core.Api;
 import appeng.mixins.MinecraftClientAccessor;
 import appeng.parts.misc.CableAnchorPart;
-import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadClamper;
-import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadCornerKicker;
-import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadFaceStripper;
-import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadReInterpolator;
-import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadTinter;
+import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.*;
 
 /**
  * The FacadeBuilder builds for facades..
diff --git a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java
index 32b978bc3..e572d38c7 100644
--- a/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java
+++ b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java
@@ -1,4 +1,3 @@
-
 package appeng.client.render.cablebus;
 
 import net.minecraft.block.BlockState;
diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
index 7d983d902..d9f217c96 100644
--- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
+++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
@@ -1,4 +1,3 @@
-
 package appeng.client.render.cablebus;
 
 import java.util.Random;
diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java
index 7d4beba67..3b6edc14d 100644
--- a/src/main/java/appeng/client/render/effects/LightningArcFX.java
+++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java
@@ -27,7 +27,6 @@ import net.minecraft.client.particle.ParticleFactory;
 import net.minecraft.client.particle.SpriteBillboardParticle;
 import net.minecraft.client.particle.SpriteProvider;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.world.World;
 
 @Environment(EnvType.CLIENT)
 public class LightningArcFX extends LightningFX {
diff --git a/src/main/java/appeng/client/render/effects/ParticleTypes.java b/src/main/java/appeng/client/render/effects/ParticleTypes.java
index 449d029a3..acba1f6f2 100644
--- a/src/main/java/appeng/client/render/effects/ParticleTypes.java
+++ b/src/main/java/appeng/client/render/effects/ParticleTypes.java
@@ -1,16 +1,8 @@
 package appeng.client.render.effects;
 
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
 import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.particle.DefaultParticleType;
 import net.minecraft.particle.ParticleType;
-import net.minecraft.util.registry.Registry;
-
-import appeng.core.AppEng;
 
 public final class ParticleTypes {
 
diff --git a/src/main/java/appeng/client/render/model/SkyCompassModel.java b/src/main/java/appeng/client/render/model/SkyCompassModel.java
index 5441c6785..e6f53b8fb 100644
--- a/src/main/java/appeng/client/render/model/SkyCompassModel.java
+++ b/src/main/java/appeng/client/render/model/SkyCompassModel.java
@@ -19,21 +19,15 @@
 package appeng.client.render.model;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
 import java.util.function.Function;
 
 import javax.annotation.Nullable;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.mojang.datafixers.util.Pair;
 
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.ModelBakeSettings;
 import net.minecraft.client.render.model.ModelLoader;
-import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
index 778363b63..f75b3aa01 100644
--- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
+++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
@@ -92,9 +92,7 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel {
                     builder.setUvRotation(Direction.UP, 1);
                     builder.setUvRotation(Direction.DOWN, 1);
                 }
-            }
-
-            else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Y) {
+            } else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Y) {
                 ori = Direction.UP;
                 if ((flags & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MAX) {
                     builder.setUvRotation(Direction.NORTH, 3);
@@ -102,9 +100,7 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel {
                     builder.setUvRotation(Direction.EAST, 3);
                     builder.setUvRotation(Direction.WEST, 3);
                 }
-            }
-
-            else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Z) {
+            } else if (displayAxis == SpatialPylonBlockEntity.DISPLAY_Z) {
                 ori = Direction.NORTH;
                 if ((flags & SpatialPylonBlockEntity.DISPLAY_MIDDLE) == SpatialPylonBlockEntity.DISPLAY_END_MAX) {
                     builder.setUvRotation(Direction.EAST, 2);
diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/main/java/appeng/client/render/tesr/InscriberTESR.java
index 6254bb655..64fc25254 100644
--- a/src/main/java/appeng/client/render/tesr/InscriberTESR.java
+++ b/src/main/java/appeng/client/render/tesr/InscriberTESR.java
@@ -1,4 +1,3 @@
-
 package appeng.client.render.tesr;
 
 import com.google.common.collect.ImmutableList;
diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java
index 64855a6df..d4830e837 100644
--- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java
+++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java
@@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableList;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
 import net.minecraft.block.Block;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.render.RenderLayer;
diff --git a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java
index 03a5d2739..786c87e34 100644
--- a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java
+++ b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java
@@ -18,12 +18,8 @@
 
 package appeng.client.render.tesr;
 
-import java.util.Random;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
-import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.RenderLayer;
diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java
index 8eff993a1..6b2d95085 100644
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@@ -55,14 +55,7 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.client.me.SlotME;
 import appeng.container.guisync.GuiSync;
 import appeng.container.guisync.SyncData;
-import appeng.container.slot.AppEngSlot;
-import appeng.container.slot.CraftingMatrixSlot;
-import appeng.container.slot.CraftingTermSlot;
-import appeng.container.slot.DisabledSlot;
-import appeng.container.slot.FakeSlot;
-import appeng.container.slot.InaccessibleSlot;
-import appeng.container.slot.PlayerHotBarSlot;
-import appeng.container.slot.PlayerInvSlot;
+import appeng.container.slot.*;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
diff --git a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java
index cad591712..23c1d6917 100644
--- a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java
+++ b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java
@@ -25,11 +25,7 @@ import net.minecraft.screen.ScreenHandlerType;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
-import appeng.api.config.YesNo;
+import appeng.api.config.*;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 import appeng.container.slot.FakeTypeOnlySlot;
diff --git a/src/main/java/appeng/container/implementations/IOPortContainer.java b/src/main/java/appeng/container/implementations/IOPortContainer.java
index ab1e9d185..a28e578ee 100644
--- a/src/main/java/appeng/container/implementations/IOPortContainer.java
+++ b/src/main/java/appeng/container/implementations/IOPortContainer.java
@@ -25,11 +25,7 @@ import net.minecraft.screen.ScreenHandlerType;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.FullnessMode;
-import appeng.api.config.OperationMode;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
+import appeng.api.config.*;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
 import appeng.container.slot.OutputSlot;
diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java
index 971345ff5..f8f03a7b6 100644
--- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java
+++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java
@@ -20,7 +20,6 @@ package appeng.container.implementations;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.network.PacketByteBuf;
@@ -28,12 +27,7 @@ import net.minecraft.screen.ScreenHandlerType;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.LevelType;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
-import appeng.api.config.YesNo;
+import appeng.api.config.*;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java
index e8d0b45df..0162d34d0 100644
--- a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java
+++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java
@@ -32,13 +32,7 @@ import net.minecraft.screen.ScreenHandlerListener;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
 
-import appeng.api.config.Actionable;
-import appeng.api.config.PowerMultiplier;
-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.implementations.guiobjects.IGuiItemObject;
 import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.api.implementations.tiles.IMEChest;
diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java
index 5f4825bf9..a820e84cd 100644
--- a/src/main/java/appeng/container/implementations/PatternTermContainer.java
+++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java
@@ -18,17 +18,11 @@
 
 package appeng.container.implementations;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.inventory.CraftingResultInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.recipe.CraftingRecipe;
 import net.minecraft.recipe.Recipe;
@@ -55,12 +49,7 @@ import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerNull;
 import appeng.container.guisync.GuiSync;
-import appeng.container.slot.FakeCraftingMatrixSlot;
-import appeng.container.slot.IOptionalSlotHost;
-import appeng.container.slot.OptionalFakeSlot;
-import appeng.container.slot.PatternOutputsSlot;
-import appeng.container.slot.PatternTermSlot;
-import appeng.container.slot.RestrictedInputSlot;
+import appeng.container.slot.*;
 import appeng.core.Api;
 import appeng.core.sync.packets.PatternSlotPacket;
 import appeng.helpers.IContainerCraftingPacket;
diff --git a/src/main/java/appeng/container/implementations/PriorityContainer.java b/src/main/java/appeng/container/implementations/PriorityContainer.java
index eed9a9a89..4f35a2af8 100644
--- a/src/main/java/appeng/container/implementations/PriorityContainer.java
+++ b/src/main/java/appeng/container/implementations/PriorityContainer.java
@@ -21,7 +21,6 @@ package appeng.container.implementations;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.network.PacketByteBuf;
diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java
index 194cf63fc..95b31ba80 100644
--- a/src/main/java/appeng/container/implementations/StorageBusContainer.java
+++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java
@@ -28,12 +28,7 @@ import net.minecraft.screen.ScreenHandlerType;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.config.Upgrades;
+import appeng.api.config.*;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
diff --git a/src/main/java/appeng/container/implementations/UpgradeableContainer.java b/src/main/java/appeng/container/implementations/UpgradeableContainer.java
index cd754bb91..e23c59808 100644
--- a/src/main/java/appeng/container/implementations/UpgradeableContainer.java
+++ b/src/main/java/appeng/container/implementations/UpgradeableContainer.java
@@ -30,13 +30,7 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SchedulingMode;
-import appeng.api.config.SecurityPermissions;
-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.implementations.guiobjects.IGuiItem;
 import appeng.api.parts.IPart;
@@ -44,11 +38,7 @@ import appeng.api.util.IConfigManager;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.slot.FakeTypeOnlySlot;
-import appeng.container.slot.IOptionalSlotHost;
-import appeng.container.slot.OptionalFakeSlot;
-import appeng.container.slot.OptionalTypeOnlyFakeSlot;
-import appeng.container.slot.RestrictedInputSlot;
+import appeng.container.slot.*;
 import appeng.items.contents.NetworkToolViewer;
 import appeng.items.tools.NetworkToolItem;
 import appeng.parts.automation.ExportBusPart;
diff --git a/src/main/java/appeng/container/interfaces/IInventorySlotAware.java b/src/main/java/appeng/container/interfaces/IInventorySlotAware.java
index 767638b52..3bbb765d8 100644
--- a/src/main/java/appeng/container/interfaces/IInventorySlotAware.java
+++ b/src/main/java/appeng/container/interfaces/IInventorySlotAware.java
@@ -20,10 +20,9 @@ package appeng.container.interfaces;
 
 /**
  * Any item providing a GUI and depending on an exact inventory slot.
- *
+ * 

  * This interface is likely a volatile one until a general GUI refactoring
  * occurred. Use it with care and expect changes.
- *
  */
 public interface IInventorySlotAware {
     /**
diff --git a/src/main/java/appeng/container/interfaces/IProgressProvider.java b/src/main/java/appeng/container/interfaces/IProgressProvider.java
index 59d7ad281..cc43bdbe5 100644
--- a/src/main/java/appeng/container/interfaces/IProgressProvider.java
+++ b/src/main/java/appeng/container/interfaces/IProgressProvider.java
@@ -22,7 +22,7 @@ import appeng.client.gui.widgets.ProgressBar;
 
 /**
  * This interface provides the data for anything simulating a progress.
- *
+ * 

  * Its main use is in combination with the {@link ProgressBar}, which ensures to
  * scale it to a percentage of 0 to 100.
  */
@@ -38,7 +38,7 @@ public interface IProgressProvider {
 
     /**
      * The max value the progress.
-     *
+     * 

      * It is not limited to a value of 100 and can be scaled to fit the current
      * needs. For example scaled down to decrease or scaled up to increase the
      * precision.
diff --git a/src/main/java/appeng/core/AELog.java b/src/main/java/appeng/core/AELog.java
index 02cf67b90..68f99d108 100644
--- a/src/main/java/appeng/core/AELog.java
+++ b/src/main/java/appeng/core/AELog.java
@@ -59,7 +59,7 @@ public final class AELog {
 
     /**
      * Indicates of the global log is enabled or disabled.
-     *
+     * 

      * By default it is enabled.
      *
      * @return true when the log is enabled.
@@ -70,10 +70,10 @@ public final class AELog {
 
     /**
      * Logs a formatted message with a specific log level.
-     *
+     * 

      * This uses {@link String#format(String, Object...)} as opposed to the
      * {@link ParameterizedMessage} to allow a more flexible formatting.
-     *
+     * 

      * The output can be globally disabled via the configuration file.
      *
      * @param level   the intended level.
@@ -93,16 +93,15 @@ public final class AELog {
     /**
      * Log an exception with a custom message formated via
      * {@link String#format(String, Object...)}
-     *
+     * 

      * Similar to {@link AELog#log(Level, String, Object...)}.
      *
-     * @see AELog#log(Level, String, Object...)
-     *
      * @param level     the intended level.
      * @param exception
      * @param message   the message to be formatted.
      * @param params    the parameters used for
      *                  {@link String#format(String, Object...)}.
+     * @see AELog#log(Level, String, Object...)
      */
     public static void log(@Nonnull final Level level, @Nonnull final Throwable exception, @Nonnull String message,
             final Object... params) {
@@ -115,9 +114,9 @@ public final class AELog {
     }
 
     /**
-     * @see AELog#log(Level, String, Object...)
      * @param format
      * @param params
+     * @see AELog#log(Level, String, Object...)
      */
     public static void info(@Nonnull final String format, final Object... params) {
         log(Level.INFO, format, params);
@@ -126,9 +125,8 @@ public final class AELog {
     /**
      * Log exception as {@link Level#INFO}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void info(@Nonnull final Throwable exception) {
         log(Level.INFO, exception, DEFAULT_EXCEPTION_MESSAGE);
@@ -137,19 +135,18 @@ public final class AELog {
     /**
      * Log exception as {@link Level#INFO}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
      * @param message
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void info(@Nonnull final Throwable exception, @Nonnull final String message) {
         log(Level.INFO, exception, message);
     }
 
     /**
-     * @see AELog#log(Level, String, Object...)
      * @param format
      * @param params
+     * @see AELog#log(Level, String, Object...)
      */
     public static void warn(@Nonnull final String format, final Object... params) {
         log(Level.WARN, format, params);
@@ -158,9 +155,8 @@ public final class AELog {
     /**
      * Log exception as {@link Level#WARN}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void warn(@Nonnull final Throwable exception) {
         log(Level.WARN, exception, DEFAULT_EXCEPTION_MESSAGE);
@@ -169,19 +165,18 @@ public final class AELog {
     /**
      * Log exception as {@link Level#WARN}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
      * @param message
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void warn(@Nonnull final Throwable exception, @Nonnull final String message) {
         log(Level.WARN, exception, message);
     }
 
     /**
-     * @see AELog#log(Level, String, Object...)
      * @param format
      * @param params
+     * @see AELog#log(Level, String, Object...)
      */
     public static void error(@Nonnull final String format, final Object... params) {
         log(Level.ERROR, format, params);
@@ -190,9 +185,8 @@ public final class AELog {
     /**
      * Log exception as {@link Level#ERROR}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void error(@Nonnull final Throwable exception) {
         log(Level.ERROR, exception, DEFAULT_EXCEPTION_MESSAGE);
@@ -201,10 +195,9 @@ public final class AELog {
     /**
      * Log exception as {@link Level#ERROR}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
      * @param message
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void error(@Nonnull final Throwable exception, @Nonnull final String message) {
         log(Level.ERROR, exception, message);
@@ -213,9 +206,9 @@ public final class AELog {
     /**
      * Log message as {@link Level#DEBUG}
      *
-     * @see AELog#log(Level, String, Object...)
      * @param format
      * @param data
+     * @see AELog#log(Level, String, Object...)
      */
     public static void debug(@Nonnull final String format, final Object... data) {
         if (AELog.isDebugLogEnabled()) {
@@ -226,9 +219,8 @@ public final class AELog {
     /**
      * Log exception as {@link Level#DEBUG}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void debug(@Nonnull final Throwable exception) {
         if (AELog.isDebugLogEnabled()) {
@@ -239,10 +231,9 @@ public final class AELog {
     /**
      * Log exception as {@link Level#DEBUG}
      *
-     * @see AELog#log(Level, Throwable, String, Object...)
-     *
      * @param exception
      * @param message
+     * @see AELog#log(Level, Throwable, String, Object...)
      */
     public static void debug(@Nonnull final Throwable exception, @Nonnull final String message) {
         if (AELog.isDebugLogEnabled()) {
@@ -252,7 +243,7 @@ public final class AELog {
 
     /**
      * Use to check for an enabled debug log.
-     *
+     * 

      * Can be used to prevent the execution of debug logic.
      *
      * @return true when the debug log is enabled.
@@ -291,14 +282,14 @@ public final class AELog {
 
     /**
      * Logging of block updates.
-     *
+     * 

      * Off by default, can be enabled inside the configuration file.
      *
-     * @see AELog#log(Level, String, Object...)
      * @param pos
      * @param currentState
      * @param newState
      * @param aeBaseTile
+     * @see AELog#log(Level, String, Object...)
      */
     public static void blockUpdate(@Nonnull final BlockPos pos, @Nonnull BlockState currentState,
             @Nonnull BlockState newState, @Nonnull final AEBaseBlockEntity aeBaseTile) {
@@ -309,7 +300,7 @@ public final class AELog {
 
     /**
      * Use to check for an enabled crafting log.
-     *
+     * 

      * Can be used to prevent the execution of unneeded logic.
      *
      * @return true when the crafting log is enabled.
@@ -320,12 +311,12 @@ public final class AELog {
 
     /**
      * Logging for autocrafting.
-     *
+     * 

      * Off by default, can be enabled inside the configuration file.
      *
-     * @see AELog#log(Level, String, Object...)
      * @param message
      * @param params
+     * @see AELog#log(Level, String, Object...)
      */
     public static void crafting(@Nonnull final String message, final Object... params) {
         if (AELog.isCraftingLogEnabled()) {
@@ -335,7 +326,7 @@ public final class AELog {
 
     /**
      * Use to check for an enabled crafting debug log.
-     *
+     * 

      * Can be used to prevent the execution of unneeded logic.
      *
      * @return true when the crafting debug log is enabled.
@@ -347,12 +338,12 @@ public final class AELog {
 
     /**
      * Debug logging for autocrafting.
-     *
+     * 

      * Off by default, can be enabled inside the configuration file.
      *
-     * @see AELog#log(Level, String, Object...)
      * @param message
      * @param params
+     * @see AELog#log(Level, String, Object...)
      */
     public static void craftingDebug(@Nonnull final String message, final Object... params) {
         if (AELog.isCraftingDebugLogEnabled()) {
diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java
index 030dd0041..a71633a3c 100644
--- a/src/main/java/appeng/core/Api.java
+++ b/src/main/java/appeng/core/Api.java
@@ -25,11 +25,7 @@ import appeng.api.crafting.ICraftingHelper;
 import appeng.api.features.IRegistryContainer;
 import appeng.api.networking.IGridHelper;
 import appeng.api.storage.IStorageHelper;
-import appeng.core.api.ApiClientHelper;
-import appeng.core.api.ApiCrafting;
-import appeng.core.api.ApiGrid;
-import appeng.core.api.ApiPart;
-import appeng.core.api.ApiStorage;
+import appeng.core.api.*;
 import appeng.core.features.registries.PartModels;
 import appeng.core.features.registries.RegistryContainer;
 
@@ -43,10 +39,10 @@ public final class Api implements IAppEngApi {
 
     /**
      * Use primarily to access the API.
-     *
+     * 

      * Using {@link IAppEngApi} intentionally to avoid using functionality not
      * exposed by accident.
-     *
+     * 

      * In some cases we might have to access the API before it is announced via
      * {@link AEAddon}, otherwise we could just inject it into AE2 itself.
      */
diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java
index 8072c8d4a..deea42959 100644
--- a/src/main/java/appeng/core/AppEng.java
+++ b/src/main/java/appeng/core/AppEng.java
@@ -18,14 +18,11 @@
 
 package appeng.core;
 
-import java.util.List;
 import java.util.Random;
 import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
 
-import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.Identifier;
@@ -33,7 +30,6 @@ import net.minecraft.util.hit.HitResult;
 import net.minecraft.world.World;
 
 import appeng.api.parts.CableRenderMode;
-import appeng.block.AEBaseBlock;
 import appeng.client.ActionKey;
 import appeng.client.EffectType;
 import appeng.core.stats.AdvancementTriggers;
@@ -73,7 +69,7 @@ public interface AppEng {
      * Sets the player that is currently interacting with a cable or part attached
      * to a cable. This will return that player's cable render mode from calls to
      * {@link #getCableRenderMode()}, until another player or null is set.
-     * 
+     *
      * @param player Null to revert to the default cable render mode.
      */
     void setPartInteractionPlayer(PlayerEntity player);
diff --git a/src/main/java/appeng/core/AppEngBase.java b/src/main/java/appeng/core/AppEngBase.java
index b998a87f6..4fb30be10 100644
--- a/src/main/java/appeng/core/AppEngBase.java
+++ b/src/main/java/appeng/core/AppEngBase.java
@@ -6,7 +6,6 @@ import javax.annotation.Nullable;
 
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.entity.*;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
diff --git a/src/main/java/appeng/core/AppEngBootstrap.java b/src/main/java/appeng/core/AppEngBootstrap.java
index 26a410d8a..1e94f2862 100644
--- a/src/main/java/appeng/core/AppEngBootstrap.java
+++ b/src/main/java/appeng/core/AppEngBootstrap.java
@@ -1,7 +1,5 @@
 package appeng.core;
 
-import com.google.common.base.Preconditions;
-
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.registry.BuiltinRegistries;
@@ -25,6 +23,7 @@ import appeng.worldgen.BiomeModifier;
 import appeng.worldgen.ChargedQuartzOreConfig;
 import appeng.worldgen.ChargedQuartzOreFeature;
 import appeng.worldgen.meteorite.MeteoriteStructure;
+import appeng.worldgen.meteorite.MeteoriteStructurePiece;
 
 /**
  * Hooks into the very early bootstrapping phase to register things before the
@@ -38,7 +37,9 @@ public final class AppEngBootstrap {
     }
 
     public synchronized static void initialize() {
-        Preconditions.checkState(!initialized, "Already initialized!");
+        if (initialized) {
+            return;
+        }
         initialized = true;
 
         AEConfig.load(FabricLoader.getInstance().getConfigDirectory());
@@ -64,6 +65,9 @@ public final class AppEngBootstrap {
     }
 
     private static void registerStructures() {
+
+        MeteoriteStructurePiece.register();
+
         // Registering into the registry alone is INSUFFICIENT!
         // There's a bidirectional map in the Structure class itself primarily for the
         // purposes of NBT serialization
diff --git a/src/main/java/appeng/core/api/ApiClientHelper.java b/src/main/java/appeng/core/api/ApiClientHelper.java
index d1132a81c..0b5915ac9 100644
--- a/src/main/java/appeng/core/api/ApiClientHelper.java
+++ b/src/main/java/appeng/core/api/ApiClientHelper.java
@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * 
+ *
  * Copyright (c) 2013 - 2020, AlgorithmX2, All rights reserved.
  *
  * Applied Energistics 2 is free software: you can redistribute it and/or modify
diff --git a/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java b/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java
index 93434077e..58f378f10 100644
--- a/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java
+++ b/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java
@@ -1,6 +1,6 @@
 /*
  * This file is part of Applied Energistics 2.
- * 
+ *
  * Copyright (c) 2020, TeamAppliedEnergistics, All rights reserved.
  *
  * Applied Energistics 2 is free software: you can redistribute it and/or modify
@@ -19,9 +19,7 @@
 
 package appeng.core.api.client;
 
-import java.lang.reflect.Array;
 import java.util.*;
-import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index 9635b62d4..fb04d2bd3 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -38,40 +38,12 @@ 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.CraftingMonitorBlock;
-import appeng.block.crafting.CraftingMonitorBlockRendering;
-import appeng.block.crafting.CraftingStorageBlock;
-import appeng.block.crafting.CraftingStorageItem;
-import appeng.block.crafting.CraftingUnitBlock;
-import appeng.block.crafting.MolecularAssemblerBlock;
 import appeng.block.grindstone.CrankBlock;
 import appeng.block.grindstone.GrinderBlock;
-import appeng.block.misc.CellWorkbenchBlock;
-import appeng.block.misc.ChargerBlock;
-import appeng.block.misc.CondenserBlock;
-import appeng.block.misc.InscriberBlock;
-import appeng.block.misc.InscriberRendering;
-import appeng.block.misc.InterfaceBlock;
-import appeng.block.misc.LightDetectorBlock;
-import appeng.block.misc.QuartzFixtureBlock;
-import appeng.block.misc.QuartzGrowthAcceleratorBlock;
-import appeng.block.misc.SecurityStationBlock;
-import appeng.block.misc.SecurityStationRendering;
-import appeng.block.misc.SkyCompassBlock;
-import appeng.block.misc.SkyCompassRendering;
-import appeng.block.misc.TinyTNTBlock;
-import appeng.block.misc.VibrationChamberBlock;
-import appeng.block.networking.CableBusBlock;
-import appeng.block.networking.CableBusRendering;
-import appeng.block.networking.ControllerBlock;
-import appeng.block.networking.ControllerRendering;
-import appeng.block.networking.CreativeEnergyCellBlock;
-import appeng.block.networking.DenseEnergyCellBlock;
-import appeng.block.networking.EnergyAcceptorBlock;
-import appeng.block.networking.EnergyCellBlock;
-import appeng.block.networking.WirelessBlock;
-import appeng.block.networking.WirelessRendering;
+import appeng.block.misc.*;
+import appeng.block.networking.*;
 import appeng.block.paint.PaintSplotchesBlock;
 import appeng.block.paint.PaintSplotchesRendering;
 import appeng.block.qnb.QuantumBridgeRendering;
@@ -80,75 +52,27 @@ import appeng.block.qnb.QuantumRingBlock;
 import appeng.block.spatial.MatrixFrameBlock;
 import appeng.block.spatial.SpatialIOPortBlock;
 import appeng.block.spatial.SpatialPylonBlock;
-import appeng.block.storage.ChestBlock;
-import appeng.block.storage.ChestRendering;
-import appeng.block.storage.DriveBlock;
-import appeng.block.storage.DriveRendering;
-import appeng.block.storage.IOPortBlock;
-import appeng.block.storage.SkyChestBlock;
-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.block.storage.*;
+import appeng.bootstrap.*;
 import appeng.bootstrap.components.IInitComponent;
 import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.client.render.crafting.CraftingCubeRendering;
 import appeng.client.render.crafting.CraftingMonitorTESR;
 import appeng.client.render.spatial.SpatialPylonRendering;
-import appeng.client.render.tesr.ChargerTESR;
-import appeng.client.render.tesr.ChestTileEntityRenderer;
-import appeng.client.render.tesr.CrankTESR;
-import appeng.client.render.tesr.DriveLedTileEntityRenderer;
-import appeng.client.render.tesr.SkyChestTESR;
-import appeng.debug.ChunkLoaderBlock;
-import appeng.debug.ChunkLoaderBlockEntity;
-import appeng.debug.CubeGeneratorBlock;
-import appeng.debug.CubeGeneratorBlockEntity;
-import appeng.debug.ItemGenBlock;
-import appeng.debug.ItemGenBlockEntity;
-import appeng.debug.PhantomNodeBlock;
-import appeng.debug.PhantomNodeBlockEntity;
+import appeng.client.render.tesr.*;
+import appeng.debug.*;
 import appeng.decorative.AEDecorativeBlock;
-import appeng.decorative.solid.AEStairsBlock;
-import appeng.decorative.solid.ChargedQuartzOreBlock;
-import appeng.decorative.solid.QuartzGlassBlock;
-import appeng.decorative.solid.QuartzLampBlock;
-import appeng.decorative.solid.QuartzOreBlock;
-import appeng.decorative.solid.QuartzPillarBlock;
-import appeng.decorative.solid.SkyStoneBlock;
+import appeng.decorative.solid.*;
 import appeng.decorative.solid.SkyStoneBlock.SkystoneType;
 import appeng.entity.TinyTNTPrimedEntity;
 import appeng.fluids.block.FluidInterfaceBlock;
 import appeng.fluids.tile.FluidInterfaceBlockEntity;
 import appeng.hooks.TinyTNTDispenseItemBehavior;
-import appeng.tile.crafting.CraftingBlockEntity;
-import appeng.tile.crafting.CraftingMonitorBlockEntity;
-import appeng.tile.crafting.CraftingStorageBlockEntity;
-import appeng.tile.crafting.MolecularAssemblerBlockEntity;
-import appeng.tile.crafting.MolecularAssemblerRenderer;
+import appeng.tile.crafting.*;
 import appeng.tile.grindstone.CrankBlockEntity;
 import appeng.tile.grindstone.GrinderBlockEntity;
-import appeng.tile.misc.CellWorkbenchBlockEntity;
-import appeng.tile.misc.ChargerBlockEntity;
-import appeng.tile.misc.CondenserBlockEntity;
-import appeng.tile.misc.InscriberBlockEntity;
-import appeng.tile.misc.InterfaceBlockEntity;
-import appeng.tile.misc.LightDetectorBlockEntity;
-import appeng.tile.misc.PaintSplotchesBlockEntity;
-import appeng.tile.misc.QuartzGrowthAcceleratorBlockEntity;
-import appeng.tile.misc.SecurityStationBlockEntity;
-import appeng.tile.misc.SkyCompassBlockEntity;
-import appeng.tile.misc.VibrationChamberBlockEntity;
-import appeng.tile.networking.CableBusBlockEntity;
-import appeng.tile.networking.CableBusTESR;
-import appeng.tile.networking.ControllerBlockEntity;
-import appeng.tile.networking.CreativeEnergyCellBlockEntity;
-import appeng.tile.networking.DenseEnergyCellBlockEntity;
-import appeng.tile.networking.EnergyAcceptorBlockEntity;
-import appeng.tile.networking.EnergyCellBlockEntity;
-import appeng.tile.networking.WirelessBlockEntity;
+import appeng.tile.misc.*;
+import appeng.tile.networking.*;
 import appeng.tile.qnb.QuantumBridgeBlockEntity;
 import appeng.tile.spatial.SpatialIOPortBlockEntity;
 import appeng.tile.spatial.SpatialPylonBlockEntity;
diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java
index a7617dd3f..59ec54365 100644
--- a/src/main/java/appeng/core/api/definitions/ApiItems.java
+++ b/src/main/java/appeng/core/api/definitions/ApiItems.java
@@ -42,11 +42,7 @@ import appeng.core.AppEng;
 import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
 import appeng.core.features.ItemStackSrc;
-import appeng.debug.DebugCardItem;
-import appeng.debug.DebugPartPlacerItem;
-import appeng.debug.EraserItem;
-import appeng.debug.MeteoritePlacerItem;
-import appeng.debug.ReplicatorCardItem;
+import appeng.debug.*;
 import appeng.entity.GrowingCrystalEntity;
 import appeng.fluids.items.BasicFluidStorageCell;
 import appeng.fluids.items.FluidDummyItem;
@@ -66,20 +62,8 @@ import appeng.items.storage.ViewCellItem;
 import appeng.items.tools.BiometricCardItem;
 import appeng.items.tools.MemoryCardItem;
 import appeng.items.tools.NetworkToolItem;
-import appeng.items.tools.powered.ChargedStaffItem;
-import appeng.items.tools.powered.ColorApplicatorItem;
-import appeng.items.tools.powered.ColorApplicatorItemRendering;
-import appeng.items.tools.powered.EntropyManipulatorItem;
-import appeng.items.tools.powered.MatterCannonItem;
-import appeng.items.tools.powered.PortableCellItem;
-import appeng.items.tools.powered.WirelessTerminalItem;
-import appeng.items.tools.quartz.QuartzAxeItem;
-import appeng.items.tools.quartz.QuartzCuttingKnifeItem;
-import appeng.items.tools.quartz.QuartzHoeItem;
-import appeng.items.tools.quartz.QuartzPickaxeItem;
-import appeng.items.tools.quartz.QuartzSpadeItem;
-import appeng.items.tools.quartz.QuartzSwordItem;
-import appeng.items.tools.quartz.QuartzWrenchItem;
+import appeng.items.tools.powered.*;
+import appeng.items.tools.quartz.*;
 
 /**
  * Internal implementation for the API items
@@ -236,14 +220,14 @@ public final class ApiItems implements IItems {
         this.memoryCard = registry.item("memory_card", MemoryCardItem::new).props(props -> props.maxCount(1))
                 .features(AEFeature.MEMORY_CARD).build();
         this.networkTool = registry.item("network_tool", NetworkToolItem::new).props(props -> props.maxCount(1)) // FIXME
-                                                                                                                 // FABRIC
-                                                                                                                 // .addToolType(FabricToolTags.get("wrench"),
-                                                                                                                 // 0)
-                                                                                                                 // (how???,
-                                                                                                                 // just
-                                                                                                                 // add
-                                                                                                                 // a
-                                                                                                                 // tag???)
+                // FABRIC
+                // .addToolType(FabricToolTags.get("wrench"),
+                // 0)
+                // (how???,
+                // just
+                // add
+                // a
+                // tag???)
                 .features(AEFeature.NETWORK_TOOL).build();
 
         this.cellCreative = registry.item("creative_storage_cell", CreativeStorageCellItem::new)
diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java
index ef715e1d3..689c3e229 100644
--- a/src/main/java/appeng/core/api/definitions/ApiParts.java
+++ b/src/main/java/appeng/core/api/definitions/ApiParts.java
@@ -34,51 +34,15 @@ import appeng.core.features.ColoredItemDefinition;
 import appeng.core.features.ItemStackSrc;
 import appeng.core.features.registries.PartModels;
 import appeng.fluids.parts.*;
-import appeng.fluids.parts.FluidAnnihilationPlanePart;
-import appeng.fluids.parts.FluidExportBusPart;
-import appeng.fluids.parts.FluidFormationPlanePart;
-import appeng.fluids.parts.FluidImportBusPart;
-import appeng.fluids.parts.FluidInterfacePart;
-import appeng.fluids.parts.FluidLevelEmitterPart;
-import appeng.fluids.parts.FluidStorageBusPart;
-import appeng.fluids.parts.FluidTerminalPart;
 import appeng.items.parts.ColoredPartItem;
 import appeng.items.parts.PartItem;
 import appeng.items.parts.PartItemRendering;
 import appeng.items.parts.PartModelsHelper;
 import appeng.parts.automation.*;
-import appeng.parts.automation.AnnihilationPlanePart;
-import appeng.parts.automation.ExportBusPart;
-import appeng.parts.automation.FormationPlanePart;
-import appeng.parts.automation.IdentityAnnihilationPlanePart;
-import appeng.parts.automation.ImportBusPart;
-import appeng.parts.automation.LevelEmitterPart;
-import appeng.parts.misc.CableAnchorPart;
-import appeng.parts.misc.InterfacePart;
-import appeng.parts.misc.InvertedToggleBusPart;
-import appeng.parts.misc.StorageBusPart;
-import appeng.parts.misc.ToggleBusPart;
-import appeng.parts.networking.CoveredCablePart;
-import appeng.parts.networking.CoveredDenseCablePart;
-import appeng.parts.networking.GlassCablePart;
-import appeng.parts.networking.QuartzFiberPart;
-import appeng.parts.networking.SmartCablePart;
-import appeng.parts.networking.SmartDenseCablePart;
+import appeng.parts.misc.*;
+import appeng.parts.networking.*;
 import appeng.parts.p2p.*;
-import appeng.parts.p2p.FluidP2PTunnelPart;
-import appeng.parts.p2p.ItemP2PTunnelPart;
-import appeng.parts.p2p.LightP2PTunnelPart;
-import appeng.parts.p2p.MEP2PTunnelPart;
-import appeng.parts.p2p.RedstoneP2PTunnelPart;
-import appeng.parts.reporting.ConversionMonitorPart;
-import appeng.parts.reporting.CraftingTerminalPart;
-import appeng.parts.reporting.DarkPanelPart;
-import appeng.parts.reporting.InterfaceTerminalPart;
-import appeng.parts.reporting.PanelPart;
-import appeng.parts.reporting.PatternTerminalPart;
-import appeng.parts.reporting.SemiDarkPanelPart;
-import appeng.parts.reporting.StorageMonitorPart;
-import appeng.parts.reporting.TerminalPart;
+import appeng.parts.reporting.*;
 
 /**
  * Internal implementation for the API parts
diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java
index 5e6f2f705..a96c784b5 100644
--- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java
+++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java
@@ -18,12 +18,7 @@
 
 package appeng.core.features.registries;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.entity.BlockEntity;
diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
index 83c24c591..a1d84e60d 100644
--- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
+++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
@@ -30,7 +30,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.Direction;
 import net.minecraft.util.registry.Registry;
 
 import alexiil.mc.lib.attributes.Attribute;
diff --git a/src/main/java/appeng/core/features/registries/RegistryContainer.java b/src/main/java/appeng/core/features/registries/RegistryContainer.java
index 93646e311..6aaab0457 100644
--- a/src/main/java/appeng/core/features/registries/RegistryContainer.java
+++ b/src/main/java/appeng/core/features/registries/RegistryContainer.java
@@ -18,14 +18,7 @@
 
 package appeng.core.features.registries;
 
-import appeng.api.features.IChargerRegistry;
-import appeng.api.features.ILocatableRegistry;
-import appeng.api.features.IMatterCannonAmmoRegistry;
-import appeng.api.features.IP2PTunnelRegistry;
-import appeng.api.features.IPlayerRegistry;
-import appeng.api.features.IRegistryContainer;
-import appeng.api.features.IWirelessTermRegistry;
-import appeng.api.features.IWorldGen;
+import appeng.api.features.*;
 import appeng.api.movable.IMovableRegistry;
 import appeng.api.networking.IGridCacheRegistry;
 import appeng.api.parts.IPartModels;
diff --git a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java
index f4598fcaf..9ccedba16 100644
--- a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java
+++ b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java
@@ -1,4 +1,3 @@
-
 package appeng.core.features.registries.cell;
 
 import net.minecraft.block.entity.BlockEntity;
diff --git a/src/main/java/appeng/core/sync/packets/ClickPacket.java b/src/main/java/appeng/core/sync/packets/ClickPacket.java
index 6b1f4eb1d..023b77e9b 100644
--- a/src/main/java/appeng/core/sync/packets/ClickPacket.java
+++ b/src/main/java/appeng/core/sync/packets/ClickPacket.java
@@ -153,9 +153,7 @@ public class ClickPacket extends BasePacket {
                     final IMemoryCard mem = (IMemoryCard) is.getItem();
                     mem.notifyUser(player, MemoryCardMessages.SETTINGS_CLEARED);
                     is.setTag(null);
-                }
-
-                else if (maybeColorApplicator.isSameAs(is)) {
+                } else if (maybeColorApplicator.isSameAs(is)) {
                     final ColorApplicatorItem mem = (ColorApplicatorItem) is.getItem();
                     mem.cycleColors(is, mem.getColor(is), 1);
                 }
diff --git a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java
index 27efc84e8..b7656e8d9 100644
--- a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java
+++ b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java
@@ -18,11 +18,7 @@
 
 package appeng.core.sync.packets;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
diff --git a/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java
index 3e2c24a36..0d41bac9c 100644
--- a/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java
+++ b/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java
@@ -18,8 +18,6 @@
 
 package appeng.core.sync.packets;
 
-import java.util.Optional;
-
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.PlayerEntity;
@@ -32,7 +30,6 @@ import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
 import appeng.container.implementations.CraftAmountContainer;
-import appeng.core.AppEng;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.helpers.InventoryAction;
diff --git a/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java
index 5180910fb..af3807206 100644
--- a/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java
+++ b/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java
@@ -25,7 +25,6 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.world.World;
 
 import appeng.api.util.AEPartLocation;
 import appeng.client.render.effects.EnergyParticleData;
diff --git a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
index 7bb05e079..5e67b207f 100644
--- a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
+++ b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java
@@ -187,7 +187,6 @@ public class JEIRecipePacket extends BasePacket {
     }
 
     /**
-     *
      * @param slot
      * @param is   itemstack
      * @return is if it can be used, else EMPTY
diff --git a/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java b/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java
index 4033e0840..1dd674503 100644
--- a/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java
+++ b/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java
@@ -8,7 +8,8 @@ import io.netty.buffer.Unpooled;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.*;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.NetworkSide;
 import net.minecraft.network.Packet;
diff --git a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java
index 9f42ad71a..2f8daa71c 100644
--- a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java
+++ b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java
@@ -42,11 +42,9 @@ public class MeteorDataNameEncoder {
     /**
      * @param chunkX X coordinate of the chunk. Can be any integer
      * @param chunkZ Z coordinate of the chunk. Can be any integer
-     *
      * @return encoded file name suggestion in form of dim_x_y.dat where
      *         x and y will be shifted to stay conform with the
      *         vanilla chunk system
-     *
      * @since rv3 05.06.2015
      */
     public String encode(final int chunkX, final int chunkZ) {
diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java
index 17ff9ece6..df675a53f 100644
--- a/src/main/java/appeng/core/worlddata/StorageData.java
+++ b/src/main/java/appeng/core/worlddata/StorageData.java
@@ -62,7 +62,6 @@ final class StorageData extends PersistentState implements IWorldGridStorageData
      * lazy loading, can load any id, even ones that don't exist anymore.
      *
      * @param storageID ID of grid storage
-     *
      * @return corresponding grid storage
      */
     @Override
diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java
index 47dac2c0a..800311fa2 100644
--- a/src/main/java/appeng/core/worlddata/WorldData.java
+++ b/src/main/java/appeng/core/worlddata/WorldData.java
@@ -34,7 +34,7 @@ import appeng.services.compass.CompassThreadFactory;
 
 /**
  * Singleton access to anything related to world-based data.
- *
+ * 

  * Data will change depending which world is loaded. Will probably not affect
  * SMP at all since only one world is loaded, but SSP more, cause they play on
  * different worlds.
@@ -84,7 +84,6 @@ public final class WorldData implements IWorldData {
 
     /**
      * @return ae2 data related to a specific world
-     *
      * @deprecated do not use singletons which are dependent on specific world state
      */
     @Deprecated
@@ -106,7 +105,7 @@ public final class WorldData implements IWorldData {
 
     /**
      * Requires to start up from external from here
-     *
+     * 

      * drawback of the singleton build style
      */
     public static void onServerStarting(MinecraftServer server) {
diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java
index 8c701ac01..1f4c1e497 100644
--- a/src/main/java/appeng/crafting/CraftingJob.java
+++ b/src/main/java/appeng/crafting/CraftingJob.java
@@ -269,7 +269,6 @@ public class CraftingJob implements Runnable, ICraftingJob {
      * returns true if this needs more simulation.
      *
      * @param milli milliseconds of simulation
-     *
      * @return true if this needs more simulation
      */
     public boolean simulateFor(final int milli) {
diff --git a/src/main/java/appeng/debug/EraserItem.java b/src/main/java/appeng/debug/EraserItem.java
index 26e64bbde..c01049993 100644
--- a/src/main/java/appeng/debug/EraserItem.java
+++ b/src/main/java/appeng/debug/EraserItem.java
@@ -124,7 +124,7 @@ public class EraserItem extends AEBaseItem implements AEToolItem {
     /**
      * Filling needs to be deferred as the tags might not be populated at
      * construction time.
-     * 
+     *
      * @return
      */
     private Set getCommonBlocks() {
diff --git a/src/main/java/appeng/debug/ItemGenBlockEntity.java b/src/main/java/appeng/debug/ItemGenBlockEntity.java
index 53b3f3642..691a9d558 100644
--- a/src/main/java/appeng/debug/ItemGenBlockEntity.java
+++ b/src/main/java/appeng/debug/ItemGenBlockEntity.java
@@ -37,7 +37,6 @@ import alexiil.mc.lib.attributes.item.ItemExtractable;
 import alexiil.mc.lib.attributes.item.filter.ExactItemStackFilter;
 import alexiil.mc.lib.attributes.item.filter.ItemFilter;
 
-import appeng.debug.ItemGenBlockEntity.QueuedItemHandler;
 import appeng.tile.AEBaseBlockEntity;
 
 public class ItemGenBlockEntity extends AEBaseBlockEntity {
diff --git a/src/main/java/appeng/debug/ReplicatorCardItem.java b/src/main/java/appeng/debug/ReplicatorCardItem.java
index 47d7ff170..7d226f71a 100644
--- a/src/main/java/appeng/debug/ReplicatorCardItem.java
+++ b/src/main/java/appeng/debug/ReplicatorCardItem.java
@@ -27,8 +27,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
@@ -37,7 +35,6 @@ import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.World;
-import net.minecraft.world.dimension.DimensionType;
 
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java
index d81fb0d7f..c17ae9d0a 100644
--- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java
+++ b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java
@@ -25,7 +25,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
 
 import appeng.block.AEBaseBlock;
 
diff --git a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java
index 292298e8a..85cdd0fc8 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java
+++ b/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.client.gui;
 
 import net.minecraft.entity.player.PlayerInventory;
diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
index 7f04e3f1a..64b84fa5e 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
+++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java
@@ -1,10 +1,7 @@
-
 package appeng.fluids.client.gui;
 
-import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 
 import appeng.api.config.RedstoneMode;
diff --git a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java b/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java
index d1418a12b..18721be2d 100644
--- a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java
+++ b/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java
@@ -22,11 +22,7 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.ActionItems;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
+import appeng.api.config.*;
 import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.widgets.ActionButton;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
diff --git a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
index fcd6616c9..874d3c627 100644
--- a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
+++ b/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.client.gui.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
diff --git a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
index 5437e58ad..5e2a6f775 100644
--- a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.container;
 
 import java.math.RoundingMode;
diff --git a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java
index c22234a03..54b7f4543 100644
--- a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.container;
 
 import net.minecraft.entity.player.PlayerEntity;
diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
index 4f16f3d69..d52a34f2d 100644
--- a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java
@@ -27,12 +27,7 @@ import net.minecraft.screen.ScreenHandlerType;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.config.Upgrades;
+import appeng.api.config.*;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java
index 0444abc08..f183b793c 100644
--- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java
+++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java
@@ -33,24 +33,15 @@ import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 import alexiil.mc.lib.attributes.Simulation;
-import alexiil.mc.lib.attributes.fluid.FixedFluidInv;
 import alexiil.mc.lib.attributes.fluid.FluidAttributes;
 import alexiil.mc.lib.attributes.fluid.FluidExtractable;
 import alexiil.mc.lib.attributes.fluid.FluidInsertable;
-import alexiil.mc.lib.attributes.fluid.GroupedFluidInv;
-import alexiil.mc.lib.attributes.fluid.SingleFluidTank;
 import alexiil.mc.lib.attributes.fluid.amount.FluidAmount;
 import alexiil.mc.lib.attributes.fluid.filter.ExactFluidFilter;
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 import alexiil.mc.lib.attributes.misc.Ref;
 
-import appeng.api.config.Actionable;
-import appeng.api.config.PowerMultiplier;
-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.networking.IGrid;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
diff --git a/src/main/java/appeng/fluids/container/IFluidSyncContainer.java b/src/main/java/appeng/fluids/container/IFluidSyncContainer.java
index c07a0fe8c..2f10536f7 100644
--- a/src/main/java/appeng/fluids/container/IFluidSyncContainer.java
+++ b/src/main/java/appeng/fluids/container/IFluidSyncContainer.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.container;
 
 import java.util.Map;
diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java
index 67176100a..f00c0fa05 100644
--- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java
+++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java
@@ -39,11 +39,7 @@ import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.IStorageMonitorable;
-import appeng.api.storage.IStorageMonitorableAccessor;
+import appeng.api.storage.*;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
diff --git a/src/main/java/appeng/fluids/helper/FluidSyncHelper.java b/src/main/java/appeng/fluids/helper/FluidSyncHelper.java
index 285df742e..aba3d4a4d 100644
--- a/src/main/java/appeng/fluids/helper/FluidSyncHelper.java
+++ b/src/main/java/appeng/fluids/helper/FluidSyncHelper.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.helper;
 
 import java.util.HashMap;
diff --git a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
index 435eeb0c6..6af335d58 100644
--- a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
+++ b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.parts;
 
 import java.math.RoundingMode;
@@ -47,7 +46,7 @@ import appeng.fluids.util.AEFluidStack;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
-import appeng.mixins.FluidTagsAccessor;
+import appeng.mixins.tags.FluidTagsAccessor;
 import appeng.parts.BasicStatePart;
 import appeng.parts.automation.PlaneConnectionHelper;
 import appeng.parts.automation.PlaneConnections;
diff --git a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java
index c6c4c67d6..f0a61bf35 100644
--- a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java
+++ b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java
@@ -22,7 +22,6 @@ import java.math.RoundingMode;
 
 import javax.annotation.Nonnull;
 
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 
@@ -31,12 +30,7 @@ import alexiil.mc.lib.attributes.fluid.FluidAttributes;
 import alexiil.mc.lib.attributes.fluid.FluidInsertable;
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 
-import appeng.api.config.Actionable;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SchedulingMode;
-import appeng.api.config.Settings;
-import appeng.api.config.YesNo;
+import appeng.api.config.*;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.ticking.TickRateModulation;
diff --git a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
index fd698cee6..8802f3374 100644
--- a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
+++ b/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.parts;
 
 import java.math.RoundingMode;
diff --git a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java
index e1dafc478..a801cf77c 100644
--- a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java
+++ b/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.parts;
 
 import java.util.Random;
diff --git a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java
index 1ed44aca1..d8589320c 100644
--- a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java
+++ b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java
@@ -31,19 +31,12 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 
 import alexiil.mc.lib.attributes.fluid.FluidAttributes;
 import alexiil.mc.lib.attributes.fluid.GroupedFluidInv;
-import alexiil.mc.lib.attributes.fluid.GroupedFluidInvView;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.IncludeExclude;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.config.Upgrades;
+import appeng.api.config.*;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.events.MENetworkCellArrayUpdate;
 import appeng.api.networking.security.IActionSource;
@@ -53,12 +46,7 @@ import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.IPartModel;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.IMEInventoryHandler;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.IStorageMonitorable;
-import appeng.api.storage.IStorageMonitorableAccessor;
+import appeng.api.storage.*;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
diff --git a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java
index 7a7b028e3..c8e6a1e5a 100644
--- a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java
+++ b/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java
@@ -18,17 +18,14 @@
 
 package appeng.fluids.parts;
 
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Hand;
-import net.minecraft.util.math.*;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.BlockView;
-import net.minecraft.world.World;
-
-import alexiil.mc.lib.attributes.Attribute;
-import alexiil.mc.lib.attributes.SearchOptions;
 
 import appeng.api.config.RedstoneMode;
 import appeng.api.config.Upgrades;
diff --git a/src/main/java/appeng/fluids/util/AEFluidInventory.java b/src/main/java/appeng/fluids/util/AEFluidInventory.java
index 9b3ff5d7e..9e6b15457 100644
--- a/src/main/java/appeng/fluids/util/AEFluidInventory.java
+++ b/src/main/java/appeng/fluids/util/AEFluidInventory.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.util;
 
 import java.math.RoundingMode;
diff --git a/src/main/java/appeng/fluids/util/AEFluidStack.java b/src/main/java/appeng/fluids/util/AEFluidStack.java
index 08941420d..5a7cde4ca 100644
--- a/src/main/java/appeng/fluids/util/AEFluidStack.java
+++ b/src/main/java/appeng/fluids/util/AEFluidStack.java
@@ -24,7 +24,6 @@ import javax.annotation.Nonnull;
 
 import com.google.common.base.Preconditions;
 
-import net.fabricmc.fabric.api.util.NbtType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.PacketByteBuf;
@@ -40,7 +39,6 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.Api;
 import appeng.fluids.items.FluidDummyItem;
-import appeng.util.Platform;
 import appeng.util.item.AEStack;
 
 public final class AEFluidStack extends AEStack implements IAEFluidStack, Comparable {
diff --git a/src/main/java/appeng/fluids/util/FluidList.java b/src/main/java/appeng/fluids/util/FluidList.java
index 9a459717d..9084c4d59 100644
--- a/src/main/java/appeng/fluids/util/FluidList.java
+++ b/src/main/java/appeng/fluids/util/FluidList.java
@@ -18,11 +18,7 @@
 
 package appeng.fluids.util;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEFluidStack;
diff --git a/src/main/java/appeng/fluids/util/IAEFluidTank.java b/src/main/java/appeng/fluids/util/IAEFluidTank.java
index ddb12ecc6..864e733c5 100644
--- a/src/main/java/appeng/fluids/util/IAEFluidTank.java
+++ b/src/main/java/appeng/fluids/util/IAEFluidTank.java
@@ -1,4 +1,3 @@
-
 package appeng.fluids.util;
 
 import alexiil.mc.lib.attributes.fluid.FixedFluidInv;
diff --git a/src/main/java/appeng/helpers/CraftingPatternDetails.java b/src/main/java/appeng/helpers/CraftingPatternDetails.java
index c87857132..7fd38d871 100644
--- a/src/main/java/appeng/helpers/CraftingPatternDetails.java
+++ b/src/main/java/appeng/helpers/CraftingPatternDetails.java
@@ -18,13 +18,7 @@
 
 package appeng.helpers;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -308,11 +302,9 @@ public class CraftingPatternDetails implements ICraftingPatternDetails, Comparab
      * Merges all equal entries into a single one while adding their total stack
      * sizes.
      *
-     * @throws IllegalStateException if the result would be empty.
-     *
      * @param collection the collection to condense
-     *
      * @return a non empty list of condensed stacks.
+     * @throws IllegalStateException if the result would be empty.
      */
     private List condenseStacks(Collection collection) {
         final List merged = collection.stream().filter(Objects::nonNull)
diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java
index b4e616f54..3bacd6706 100644
--- a/src/main/java/appeng/helpers/DualityInterface.java
+++ b/src/main/java/appeng/helpers/DualityInterface.java
@@ -18,13 +18,7 @@
 
 package appeng.helpers;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 import javax.annotation.Nullable;
 
@@ -49,7 +43,6 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.AttributeList;
-import alexiil.mc.lib.attributes.AttributeProvider;
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
@@ -74,11 +67,7 @@ import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPart;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.IMEMonitor;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.IStorageMonitorable;
-import appeng.api.storage.IStorageMonitorableAccessor;
+import appeng.api.storage.*;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
@@ -971,7 +960,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
                             direction.getOffsetZ() * 0.501);
                     final Vec3d to = from.add(direction.getOffsetX(), direction.getOffsetY(), direction.getOffsetZ());
                     final BlockHitResult hit = null;// hostWorld.rayTraceBlocks( from, to ); //FIXME:
-                                                    // https://github.com/MinecraftForge/MinecraftForge/pull/6708
+                    // https://github.com/MinecraftForge/MinecraftForge/pull/6708
                     if (hit != null && !BAD_BLOCKS.contains(directedBlock)) {
                         if (hit.getBlockPos().equals(directedTile.getPos())) {
                             // FIXME FABRIC: Either add "getName" to the interface adaptor, or special-case
diff --git a/src/main/java/appeng/helpers/IContainerCraftingPacket.java b/src/main/java/appeng/helpers/IContainerCraftingPacket.java
index 5ca795369..ab833bf63 100644
--- a/src/main/java/appeng/helpers/IContainerCraftingPacket.java
+++ b/src/main/java/appeng/helpers/IContainerCraftingPacket.java
@@ -34,7 +34,6 @@ public interface IContainerCraftingPacket {
 
     /**
      * @param string name of inventory
-     *
      * @return the inventory of the part/tile by name.
      */
     FixedItemInv getInventoryByName(String string);
diff --git a/src/main/java/appeng/helpers/Splotch.java b/src/main/java/appeng/helpers/Splotch.java
index 2e9c9a7ef..d622bf378 100644
--- a/src/main/java/appeng/helpers/Splotch.java
+++ b/src/main/java/appeng/helpers/Splotch.java
@@ -41,14 +41,10 @@ public class Splotch {
         if (side == Direction.SOUTH || side == Direction.NORTH) {
             x = position.x;
             y = position.y;
-        }
-
-        else if (side == Direction.UP || side == Direction.DOWN) {
+        } else if (side == Direction.UP || side == Direction.DOWN) {
             x = position.x;
             y = position.z;
-        }
-
-        else {
+        } else {
             x = position.y;
             y = position.z;
         }
diff --git a/src/main/java/appeng/hooks/ItemRendererHooks.java b/src/main/java/appeng/hooks/ItemRendererHooks.java
index 75f93c276..67b4d316f 100644
--- a/src/main/java/appeng/hooks/ItemRendererHooks.java
+++ b/src/main/java/appeng/hooks/ItemRendererHooks.java
@@ -1,21 +1,12 @@
 package appeng.hooks;
 
-import com.google.common.collect.ImmutableList;
-
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.render.model.BakedModel;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
-import net.minecraft.client.util.SpriteIdentifier;
-import net.minecraft.client.util.math.AffineTransformation;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Identifier;
 
-import alexiil.mc.lib.attributes.fluid.FluidAttributes;
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 
 import appeng.client.render.DummyFluidBakedModel;
diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java
index 9d9ca3885..de7eaf918 100644
--- a/src/main/java/appeng/hooks/TickHandler.java
+++ b/src/main/java/appeng/hooks/TickHandler.java
@@ -18,17 +18,7 @@
 
 package appeng.hooks;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-import java.util.WeakHashMap;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.base.Stopwatch;
diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java
index f3e552448..3b005d3da 100644
--- a/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java
+++ b/src/main/java/appeng/integration/modules/jei/FacadeRecipeCategory.java
@@ -1,6 +1,5 @@
 package appeng.integration.modules.jei;
 
-import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Identifier;
 
 import me.shedaniel.rei.api.EntryStack;
diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java
index 0a5ff7136..4cec02619 100644
--- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java
+++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java
@@ -18,7 +18,6 @@
 
 package appeng.integration.modules.jei;
 
-import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java
index 5e1b951d8..138ad0456 100644
--- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java
+++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java
@@ -21,8 +21,6 @@ package appeng.integration.modules.jei;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.google.common.collect.ImmutableList;
-
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Language;
 
diff --git a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java
index 08f83356a..90ad93c4b 100644
--- a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java
+++ b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java
@@ -27,14 +27,14 @@ import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.world.World;
 
-import mcp.mobius.waila.Waila;
-import mcp.mobius.waila.api.*;
-import mcp.mobius.waila.api.impl.config.WailaConfig;
+import mcp.mobius.waila.api.IComponentProvider;
+import mcp.mobius.waila.api.IDataAccessor;
+import mcp.mobius.waila.api.IPluginConfig;
+import mcp.mobius.waila.api.IServerDataProvider;
 
 import appeng.api.parts.IPart;
 import appeng.api.parts.PartItemStack;
diff --git a/src/main/java/appeng/integration/modules/waila/WailaModule.java b/src/main/java/appeng/integration/modules/waila/WailaModule.java
index e2644ee80..e6a66f1be 100644
--- a/src/main/java/appeng/integration/modules/waila/WailaModule.java
+++ b/src/main/java/appeng/integration/modules/waila/WailaModule.java
@@ -18,7 +18,9 @@
 
 package appeng.integration.modules.waila;
 
-import mcp.mobius.waila.api.*;
+import mcp.mobius.waila.api.IRegistrar;
+import mcp.mobius.waila.api.IWailaPlugin;
+import mcp.mobius.waila.api.TooltipPosition;
 
 import appeng.tile.AEBaseBlockEntity;
 
diff --git a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java
index ee61d6ba8..f02e19fd8 100644
--- a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java
+++ b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java
@@ -96,7 +96,6 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider {
      * @param part  part to be looked at
      * @param tag   tag maybe containing the channel information
      * @param cache cache with previous knowledge
-     *
      * @return used channels on the cable
      */
     private byte getUsedChannels(final IPart part, final CompoundTag tag, final Object2ByteMap cache) {
diff --git a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java
index f266f5def..972a178b4 100644
--- a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java
+++ b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java
@@ -46,7 +46,6 @@ public final class PartAccessor {
      *
      * @param te  being looked at {@link BlockEntity}
      * @param rtr type of ray-trace
-     *
      * @return maybe the looked at {@link IPart}
      */
     public Optional getMaybePart(final BlockEntity te, final HitResult rtr) {
diff --git a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java
index f2cbd0940..fb83f232e 100644
--- a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java
+++ b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java
@@ -61,7 +61,6 @@ public final class PowerStateWailaDataProvider extends BasePartWailaDataProvider
      *
      * @param isActive  if part is active
      * @param isPowered if part is powered
-     *
      * @return tooltip of the state
      */
     private Text getToolTip(final boolean isActive, final boolean isPowered) {
diff --git a/src/main/java/appeng/integration/modules/waila/part/Tracer.java b/src/main/java/appeng/integration/modules/waila/part/Tracer.java
index f4f3fa0bb..6222287af 100644
--- a/src/main/java/appeng/integration/modules/waila/part/Tracer.java
+++ b/src/main/java/appeng/integration/modules/waila/part/Tracer.java
@@ -20,10 +20,8 @@ package appeng.integration.modules.waila.part;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 import appeng.util.LookDirection;
@@ -43,7 +41,6 @@ public final class Tracer {
      * @param world  word of block
      * @param player player viewing block
      * @param pos    pos of block
-     *
      * @return trace movement. Can be null
      */
     public HitResult retraceBlock(final World world, final PlayerEntity player, BlockPos pos) {
diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java
index 4f0dd87be..5523f08d1 100644
--- a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java
+++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java
@@ -122,7 +122,6 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider {
      *
      * @param te  te to be looked at
      * @param tag tag maybe containing the channel information
-     *
      * @return used channels on the cable
      */
     private long getInternalCurrentPower(final CompoundTag tag, final BlockEntity te) {
diff --git a/src/main/java/appeng/items/contents/CellConfig.java b/src/main/java/appeng/items/contents/CellConfig.java
index 0f793222e..4e91e5c35 100644
--- a/src/main/java/appeng/items/contents/CellConfig.java
+++ b/src/main/java/appeng/items/contents/CellConfig.java
@@ -20,8 +20,6 @@ package appeng.items.contents;
 
 import net.minecraft.item.ItemStack;
 
-import alexiil.mc.lib.attributes.item.FixedItemInvView;
-
 import appeng.tile.inventory.AppEngInternalInventory;
 
 public class CellConfig extends AppEngInternalInventory {
diff --git a/src/main/java/appeng/items/contents/CellUpgrades.java b/src/main/java/appeng/items/contents/CellUpgrades.java
index d989ca3d9..e8470f0e2 100644
--- a/src/main/java/appeng/items/contents/CellUpgrades.java
+++ b/src/main/java/appeng/items/contents/CellUpgrades.java
@@ -20,8 +20,6 @@ package appeng.items.contents;
 
 import net.minecraft.item.ItemStack;
 
-import alexiil.mc.lib.attributes.item.FixedItemInvView;
-
 import appeng.parts.automation.StackUpgradeInventory;
 
 public final class CellUpgrades extends StackUpgradeInventory {
diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java
index bbcfd28fe..f1af8e710 100644
--- a/src/main/java/appeng/items/contents/PortableCellViewer.java
+++ b/src/main/java/appeng/items/contents/PortableCellViewer.java
@@ -21,12 +21,7 @@ package appeng.items.contents;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 
-import appeng.api.config.Actionable;
-import appeng.api.config.PowerMultiplier;
-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.implementations.guiobjects.IPortableCell;
 import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.api.storage.IMEMonitor;
diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java
index efa8c6057..121bf27f9 100644
--- a/src/main/java/appeng/items/misc/EncodedPatternItem.java
+++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java
@@ -18,11 +18,7 @@
 
 package appeng.items.misc;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
+import java.util.*;
 
 import com.google.common.base.Preconditions;
 
diff --git a/src/main/java/appeng/items/parts/PartModelsHelper.java b/src/main/java/appeng/items/parts/PartModelsHelper.java
index 3621467dc..00db1fc96 100644
--- a/src/main/java/appeng/items/parts/PartModelsHelper.java
+++ b/src/main/java/appeng/items/parts/PartModelsHelper.java
@@ -1,4 +1,3 @@
-
 package appeng.items.parts;
 
 import java.lang.reflect.Field;
diff --git a/src/main/java/appeng/items/storage/AbstractStorageCell.java b/src/main/java/appeng/items/storage/AbstractStorageCell.java
index 34c7afaea..ad8baaf67 100644
--- a/src/main/java/appeng/items/storage/AbstractStorageCell.java
+++ b/src/main/java/appeng/items/storage/AbstractStorageCell.java
@@ -36,15 +36,12 @@ import net.minecraft.world.World;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
 import appeng.api.config.FuzzyMode;
-import appeng.api.exceptions.MissingDefinitionException;
-import appeng.api.features.AEFeature;
 import appeng.api.implementations.items.IStorageCell;
 import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.storage.IMEInventoryHandler;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
-import appeng.core.AEConfig;
 import appeng.core.Api;
 import appeng.hooks.AEToolItem;
 import appeng.items.AEBaseItem;
diff --git a/src/main/java/appeng/items/tools/MemoryCardItem.java b/src/main/java/appeng/items/tools/MemoryCardItem.java
index 4d0c54542..89cc1a87d 100644
--- a/src/main/java/appeng/items/tools/MemoryCardItem.java
+++ b/src/main/java/appeng/items/tools/MemoryCardItem.java
@@ -37,7 +37,6 @@ import net.minecraft.world.World;
 import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.implementations.items.MemoryCardMessages;
 import appeng.api.util.AEColor;
-import appeng.block.AEBaseTileBlock;
 import appeng.core.localization.GuiText;
 import appeng.core.localization.PlayerMessages;
 import appeng.hooks.AEToolItem;
@@ -81,7 +80,6 @@ public class MemoryCardItem extends AEBaseItem implements AEToolItem, IMemoryCar
      * Find the localized string...
      *
      * @param name possible names for the localized string
-     *
      * @return localized name
      */
     private String getFirstValidTranslationKey(final String... name) {
diff --git a/src/main/java/appeng/items/tools/NetworkToolItem.java b/src/main/java/appeng/items/tools/NetworkToolItem.java
index ffd273625..5bfa2dae8 100644
--- a/src/main/java/appeng/items/tools/NetworkToolItem.java
+++ b/src/main/java/appeng/items/tools/NetworkToolItem.java
@@ -24,7 +24,10 @@ import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
-import net.minecraft.util.*;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.Hand;
+import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
index 2de1585ae..0610b2de6 100644
--- a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
+++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
@@ -18,12 +18,7 @@
 
 package appeng.items.tools.powered;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 import net.minecraft.block.*;
 import net.minecraft.entity.LivingEntity;
diff --git a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
index e091c40b0..1465e507a 100644
--- a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
+++ b/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java
@@ -34,9 +34,7 @@ import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
 
-import appeng.api.config.*;
 import appeng.api.config.Actionable;
-import appeng.api.config.Settings;
 import appeng.api.config.SortDir;
 import appeng.api.config.SortOrder;
 import appeng.api.config.ViewItems;
diff --git a/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java
index 98b22ccf7..d3a878983 100644
--- a/src/main/java/appeng/me/Grid.java
+++ b/src/main/java/appeng/me/Grid.java
@@ -18,19 +18,10 @@
 
 package appeng.me;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridCache;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.IGridStorage;
-import appeng.api.networking.IMachineSet;
+import appeng.api.networking.*;
 import appeng.api.networking.events.MENetworkEvent;
 import appeng.api.networking.events.MENetworkPostCacheConstruction;
 import appeng.api.util.IReadOnlyCollection;
diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java
index 49d6f6b85..059264db7 100644
--- a/src/main/java/appeng/me/GridNode.java
+++ b/src/main/java/appeng/me/GridNode.java
@@ -18,13 +18,7 @@
 
 package appeng.me;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Deque;
-import java.util.EnumSet;
-import java.util.List;
+import java.util.*;
 
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.nbt.CompoundTag;
@@ -35,16 +29,7 @@ import net.minecraft.world.WorldAccess;
 
 import appeng.api.exceptions.FailedConnectionException;
 import appeng.api.exceptions.SecurityConnectionException;
-import appeng.api.networking.GridFlags;
-import appeng.api.networking.GridNotification;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridBlock;
-import appeng.api.networking.IGridCache;
-import appeng.api.networking.IGridConnection;
-import appeng.api.networking.IGridConnectionVisitor;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.IGridVisitor;
+import appeng.api.networking.*;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.pathing.IPathingGrid;
diff --git a/src/main/java/appeng/me/GridNodeIterator.java b/src/main/java/appeng/me/GridNodeIterator.java
index 066a85dde..21ffeec69 100644
--- a/src/main/java/appeng/me/GridNodeIterator.java
+++ b/src/main/java/appeng/me/GridNodeIterator.java
@@ -26,7 +26,7 @@ import appeng.api.networking.IGridNode;
 
 /**
  * Nested iterator for {@link appeng.me.MachineSet}
- *
+ * 

  * Traverses first over the {@link appeng.me.MachineSet} and then over every
  * containing {@link appeng.api.networking.IGridNode}
  */
diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java
index 3d22cb7ed..cc4b260b0 100644
--- a/src/main/java/appeng/me/NetworkEventBus.java
+++ b/src/main/java/appeng/me/NetworkEventBus.java
@@ -19,12 +19,7 @@
 package appeng.me;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 import appeng.api.networking.IGridNode;
diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java
index 2807dc4b7..8ed5eeb0b 100644
--- a/src/main/java/appeng/me/cache/CraftingGridCache.java
+++ b/src/main/java/appeng/me/cache/CraftingGridCache.java
@@ -18,29 +18,15 @@
 
 package appeng.me.cache;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Multimap;
+import com.google.common.collect.*;
 
 import net.minecraft.world.World;
 
@@ -50,18 +36,7 @@ import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.IGridStorage;
-import appeng.api.networking.crafting.ICraftingCPU;
-import appeng.api.networking.crafting.ICraftingCallback;
-import appeng.api.networking.crafting.ICraftingGrid;
-import appeng.api.networking.crafting.ICraftingJob;
-import appeng.api.networking.crafting.ICraftingLink;
-import appeng.api.networking.crafting.ICraftingMedium;
-import appeng.api.networking.crafting.ICraftingPatternDetails;
-import appeng.api.networking.crafting.ICraftingProvider;
-import appeng.api.networking.crafting.ICraftingProviderHelper;
-import appeng.api.networking.crafting.ICraftingRequester;
-import appeng.api.networking.crafting.ICraftingWatcher;
-import appeng.api.networking.crafting.ICraftingWatcherHost;
+import appeng.api.networking.crafting.*;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.events.MENetworkCraftingCpuChange;
 import appeng.api.networking.events.MENetworkCraftingPatternChange;
diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java
index 9a2ce7e64..b225e9ffa 100644
--- a/src/main/java/appeng/me/cache/EnergyGridCache.java
+++ b/src/main/java/appeng/me/cache/EnergyGridCache.java
@@ -18,16 +18,7 @@
 
 package appeng.me.cache;
 
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.NavigableSet;
-import java.util.PriorityQueue;
-import java.util.Queue;
-import java.util.Set;
-import java.util.SortedSet;
+import java.util.*;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultiset;
@@ -39,21 +30,9 @@ import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridBlock;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.IGridStorage;
-import appeng.api.networking.energy.IAEPowerStorage;
-import appeng.api.networking.energy.IEnergyGrid;
-import appeng.api.networking.energy.IEnergyGridProvider;
-import appeng.api.networking.energy.IEnergyWatcher;
-import appeng.api.networking.energy.IEnergyWatcherHost;
-import appeng.api.networking.events.MENetworkEventSubscribe;
-import appeng.api.networking.events.MENetworkPostCacheConstruction;
-import appeng.api.networking.events.MENetworkPowerIdleChange;
-import appeng.api.networking.events.MENetworkPowerStatusChange;
-import appeng.api.networking.events.MENetworkPowerStorage;
+import appeng.api.networking.*;
+import appeng.api.networking.energy.*;
+import appeng.api.networking.events.*;
 import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
 import appeng.api.networking.pathing.IPathingGrid;
 import appeng.me.Grid;
diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java
index c1996d738..efb31a072 100644
--- a/src/main/java/appeng/me/cache/GridStorageCache.java
+++ b/src/main/java/appeng/me/cache/GridStorageCache.java
@@ -18,12 +18,7 @@
 
 package appeng.me.cache;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java
index 596a8357f..27b09b091 100644
--- a/src/main/java/appeng/me/cache/NetworkMonitor.java
+++ b/src/main/java/appeng/me/cache/NetworkMonitor.java
@@ -18,11 +18,7 @@
 
 package appeng.me.cache;
 
-import java.util.Collection;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 import javax.annotation.Nonnegative;
diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java
index 100270340..519456d78 100644
--- a/src/main/java/appeng/me/cache/P2PCache.java
+++ b/src/main/java/appeng/me/cache/P2PCache.java
@@ -24,12 +24,7 @@ import java.util.Random;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 
-import appeng.api.networking.GridFlags;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridCache;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.IGridStorage;
+import appeng.api.networking.*;
 import appeng.api.networking.events.MENetworkBootingStatusChange;
 import appeng.api.networking.events.MENetworkEventSubscribe;
 import appeng.api.networking.events.MENetworkPowerStatusChange;
diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java
index bf174d154..9bc5ca4c5 100644
--- a/src/main/java/appeng/me/cache/PathGridCache.java
+++ b/src/main/java/appeng/me/cache/PathGridCache.java
@@ -18,25 +18,13 @@
 
 package appeng.me.cache;
 
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 import appeng.api.features.AEFeature;
-import appeng.api.networking.GridFlags;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridBlock;
-import appeng.api.networking.IGridConnection;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridMultiblock;
-import appeng.api.networking.IGridNode;
-import appeng.api.networking.IGridStorage;
+import appeng.api.networking.*;
 import appeng.api.networking.events.MENetworkBootingStatusChange;
 import appeng.api.networking.events.MENetworkChannelChanged;
 import appeng.api.networking.events.MENetworkControllerChange;
@@ -51,11 +39,7 @@ import appeng.core.AppEng;
 import appeng.core.stats.IAdvancementTrigger;
 import appeng.me.GridConnection;
 import appeng.me.GridNode;
-import appeng.me.pathfinding.AdHocChannelUpdater;
-import appeng.me.pathfinding.ControllerChannelUpdater;
-import appeng.me.pathfinding.ControllerValidator;
-import appeng.me.pathfinding.IPathItem;
-import appeng.me.pathfinding.PathSegment;
+import appeng.me.pathfinding.*;
 import appeng.tile.networking.ControllerBlockEntity;
 
 public class PathGridCache implements IPathingGrid {
diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java
index 69bf7b1e4..9a59f1e8e 100644
--- a/src/main/java/appeng/me/cache/helpers/TickTracker.java
+++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java
@@ -27,7 +27,6 @@ import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPart;
 import appeng.api.util.DimensionalCoord;
-import appeng.me.cache.TickManagerCache;
 
 public class TickTracker implements Comparable {
 
diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java
index 22ad9b3d1..76dbf68af 100644
--- a/src/main/java/appeng/me/cluster/MBCalculator.java
+++ b/src/main/java/appeng/me/cluster/MBCalculator.java
@@ -91,7 +91,7 @@ public abstract class MBCalculator, TClust
         IAECluster currentCluster = target.getCluster();
         if (currentCluster != null && currentCluster.isDestroyed()) {
             return; // If we're still part of a cluster that is in the process of being destroyed,
-                    // don't recalc.
+            // don't recalc.
         }
 
         try {
@@ -173,7 +173,6 @@ public abstract class MBCalculator, TClust
      *
      * @param min min world coord
      * @param max max world coord
-     *
      * @return true if structure has correct dimensions or size
      */
     public abstract boolean checkMultiblockScale(BlockPos min, BlockPos max);
@@ -195,7 +194,6 @@ public abstract class MBCalculator, TClust
      * @param w   world
      * @param min min world coord
      * @param max max world coord
-     *
      * @return created cluster
      */
     public abstract TCluster createCluster(World w, BlockPos min, BlockPos max);
@@ -223,7 +221,6 @@ public abstract class MBCalculator, TClust
      * check if the block entities are correct for the structure.
      *
      * @param te to be checked block entity
-     *
      * @return true if block entity is valid for structure
      */
     public abstract boolean isValidTile(BlockEntity te);
diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
index 06b7ca1eb..1ae7ee84d 100644
--- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
+++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java
@@ -18,12 +18,7 @@
 
 package appeng.me.cluster.implementations;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 import com.google.common.collect.ImmutableList;
@@ -42,14 +37,7 @@ import appeng.api.config.PowerMultiplier;
 import appeng.api.crafting.ICraftingHelper;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
-import appeng.api.networking.crafting.CraftingItemList;
-import appeng.api.networking.crafting.ICraftingCPU;
-import appeng.api.networking.crafting.ICraftingGrid;
-import appeng.api.networking.crafting.ICraftingJob;
-import appeng.api.networking.crafting.ICraftingLink;
-import appeng.api.networking.crafting.ICraftingMedium;
-import appeng.api.networking.crafting.ICraftingPatternDetails;
-import appeng.api.networking.crafting.ICraftingRequester;
+import appeng.api.networking.crafting.*;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.events.MENetworkCraftingCpuChange;
 import appeng.api.networking.security.IActionSource;
@@ -62,11 +50,7 @@ import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerNull;
 import appeng.core.AELog;
 import appeng.core.Api;
-import appeng.crafting.CraftBranchFailure;
-import appeng.crafting.CraftingJob;
-import appeng.crafting.CraftingLink;
-import appeng.crafting.CraftingWatcher;
-import appeng.crafting.MECraftingInventory;
+import appeng.crafting.*;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cluster.IAECluster;
 import appeng.me.cluster.MBCalculator;
@@ -378,9 +362,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU {
             final Collection list = sg.getInterestManager().get(diff);
 
             if (!list.isEmpty()) {
-                for (final CraftingWatcher iw : list)
-
-                {
+                for (final CraftingWatcher iw : list) {
                     iw.getHost().onRequestChange(sg, diff);
                 }
             }
diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
index da927a67a..e88a35351 100644
--- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
+++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java
@@ -20,7 +20,6 @@ package appeng.me.cluster.implementations;
 
 import java.util.Iterator;
 
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java
index bc14b6076..201725b6d 100644
--- a/src/main/java/appeng/me/energy/EnergyWatcher.java
+++ b/src/main/java/appeng/me/energy/EnergyWatcher.java
@@ -53,9 +53,7 @@ public class EnergyWatcher implements IEnergyWatcher {
     public boolean add(final double amount) {
         final EnergyThreshold eh = new EnergyThreshold(amount, this);
 
-        if (this.myInterests.contains(eh))
-
-        {
+        if (this.myInterests.contains(eh)) {
             return false;
         }
 
diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java
index fd571fc39..cf25acc10 100644
--- a/src/main/java/appeng/me/helpers/AENetworkProxy.java
+++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java
@@ -28,12 +28,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.Direction;
 
-import appeng.api.networking.GridFlags;
-import appeng.api.networking.GridNotification;
-import appeng.api.networking.IGrid;
-import appeng.api.networking.IGridBlock;
-import appeng.api.networking.IGridHost;
-import appeng.api.networking.IGridNode;
+import appeng.api.networking.*;
 import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.events.MENetworkPowerIdleChange;
@@ -167,7 +162,6 @@ public class AENetworkProxy implements IGridBlock {
      * short cut!
      *
      * @return grid of node
-     *
      * @throws GridAccessException of node or grid is null
      */
     public IGrid getGrid() throws GridAccessException {
diff --git a/src/main/java/appeng/me/helpers/IGridProxyable.java b/src/main/java/appeng/me/helpers/IGridProxyable.java
index da9f00f2a..4f47bdb91 100644
--- a/src/main/java/appeng/me/helpers/IGridProxyable.java
+++ b/src/main/java/appeng/me/helpers/IGridProxyable.java
@@ -18,7 +18,6 @@
 
 package appeng.me.helpers;
 
-import appeng.api.networking.IGridBlock;
 import appeng.api.networking.IGridHost;
 import appeng.api.util.DimensionalCoord;
 
diff --git a/src/main/java/appeng/me/helpers/MEMonitorHandler.java b/src/main/java/appeng/me/helpers/MEMonitorHandler.java
index 832f5734e..81fd9be19 100644
--- a/src/main/java/appeng/me/helpers/MEMonitorHandler.java
+++ b/src/main/java/appeng/me/helpers/MEMonitorHandler.java
@@ -43,9 +43,7 @@ import appeng.api.storage.data.IItemList;
  * Common implementation of a simple class that monitors injection/extraction of
  * a inventory to send events to a list of listeners.
  *
- * @param 
- *
- *            TODO: Needs to be redesigned to solve performance issues.
+ * @param  TODO: Needs to be redesigned to solve performance issues.
  */
 public class MEMonitorHandler> implements IMEMonitor {
 
diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java
index 55bc55c21..dfbaf481f 100644
--- a/src/main/java/appeng/me/pathfinding/PathSegment.java
+++ b/src/main/java/appeng/me/pathfinding/PathSegment.java
@@ -18,11 +18,7 @@
 
 package appeng.me.pathfinding;
 
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGridMultiblock;
diff --git a/src/main/java/appeng/me/storage/BasicCellInventory.java b/src/main/java/appeng/me/storage/BasicCellInventory.java
index d11c052b1..7aa7175ce 100644
--- a/src/main/java/appeng/me/storage/BasicCellInventory.java
+++ b/src/main/java/appeng/me/storage/BasicCellInventory.java
@@ -1,4 +1,3 @@
-
 package appeng.me.storage;
 
 import net.minecraft.item.Item;
diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java
index ed72ad647..050b0374b 100644
--- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java
+++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java
@@ -18,12 +18,8 @@
 
 package appeng.me.storage;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.NavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java
index 4a19902b5..2042a2f43 100644
--- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java
+++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java
@@ -18,14 +18,7 @@
 
 package appeng.me.storage;
 
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NavigableMap;
-import java.util.TreeMap;
+import java.util.*;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
diff --git a/src/main/java/appeng/mixins/BootstrapMixin.java b/src/main/java/appeng/mixins/BootstrapMixin.java
index 0277fd035..7fca9b1b6 100644
--- a/src/main/java/appeng/mixins/BootstrapMixin.java
+++ b/src/main/java/appeng/mixins/BootstrapMixin.java
@@ -12,7 +12,7 @@ import appeng.core.AppEngBootstrap;
 @Mixin(Bootstrap.class)
 public class BootstrapMixin {
 
-    @Inject(method = "initialize", at = @At(value = "INVOKE", target = "Lnet/minecraft/Bootstrap;setOutputStreams()V", shift = At.Shift.AFTER), require = 1, allow = 1)
+    @Inject(method = "initialize", at = @At(value = "TAIL"), require = 1, allow = 1)
     private static void afterInitialize(CallbackInfo ci) {
         AppEngBootstrap.initialize();
     }
diff --git a/src/main/java/appeng/mixins/ScreenHandlerListeners.java b/src/main/java/appeng/mixins/ScreenHandlerListeners.java
index a741021a3..518f462af 100644
--- a/src/main/java/appeng/mixins/ScreenHandlerListeners.java
+++ b/src/main/java/appeng/mixins/ScreenHandlerListeners.java
@@ -3,7 +3,6 @@ package appeng.mixins;
 import java.util.List;
 
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 import net.minecraft.screen.ScreenHandler;
diff --git a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java
index 797163268..d2d6ca03f 100644
--- a/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java
+++ b/src/main/java/appeng/mixins/spatial/DimensionTypeMixin.java
@@ -2,6 +2,8 @@ package appeng.mixins.spatial;
 
 import java.util.OptionalLong;
 
+import com.mojang.serialization.Lifecycle;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
@@ -12,8 +14,13 @@ import net.minecraft.tag.BlockTags;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.DynamicRegistryManager;
 import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.SimpleRegistry;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 
+import appeng.spatial.SpatialStorageChunkGenerator;
 import appeng.spatial.SpatialStorageDimensionIds;
 
 /**
@@ -42,4 +49,16 @@ public class DimensionTypeMixin {
                 dimensionType);
     }
 
+    @Inject(method = "method_28517", at = @At("RETURN"))
+    private static void buildDimensionRegistry(Registry dimensionTypes, Registry biomes,
+            Registry chunkGeneratorSettings, long seed,
+            CallbackInfoReturnable> cir) {
+        SimpleRegistry simpleregistry = cir.getReturnValue();
+
+        simpleregistry.add(SpatialStorageDimensionIds.DIMENSION_ID, new DimensionOptions(() -> {
+            return dimensionTypes.get(SpatialStorageDimensionIds.DIMENSION_TYPE_ID);
+        }, new SpatialStorageChunkGenerator(biomes)), Lifecycle.stable());
+
+    }
+
 }
diff --git a/src/main/java/appeng/mixins/tags/BlockTagsAccessor.java b/src/main/java/appeng/mixins/tags/BlockTagsAccessor.java
new file mode 100644
index 000000000..267ee99f0
--- /dev/null
+++ b/src/main/java/appeng/mixins/tags/BlockTagsAccessor.java
@@ -0,0 +1,18 @@
+package appeng.mixins.tags;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import net.minecraft.block.Block;
+import net.minecraft.tag.BlockTags;
+import net.minecraft.tag.Tag;
+
+@Mixin(BlockTags.class)
+public interface BlockTagsAccessor {
+
+    @Invoker("register")
+    static Tag.Identified register(String id) {
+        throw new AssertionError();
+    }
+
+}
diff --git a/src/main/java/appeng/mixins/FluidTagsAccessor.java b/src/main/java/appeng/mixins/tags/FluidTagsAccessor.java
similarity index 93%
rename from src/main/java/appeng/mixins/FluidTagsAccessor.java
rename to src/main/java/appeng/mixins/tags/FluidTagsAccessor.java
index 34060e7a6..dfe3098c0 100644
--- a/src/main/java/appeng/mixins/FluidTagsAccessor.java
+++ b/src/main/java/appeng/mixins/tags/FluidTagsAccessor.java
@@ -1,4 +1,4 @@
-package appeng.mixins;
+package appeng.mixins.tags;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
diff --git a/src/main/java/appeng/mixins/tags/ItemTagsAccessor.java b/src/main/java/appeng/mixins/tags/ItemTagsAccessor.java
new file mode 100644
index 000000000..54d31d502
--- /dev/null
+++ b/src/main/java/appeng/mixins/tags/ItemTagsAccessor.java
@@ -0,0 +1,18 @@
+package appeng.mixins.tags;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import net.minecraft.item.Item;
+import net.minecraft.tag.ItemTags;
+import net.minecraft.tag.Tag;
+
+@Mixin(ItemTags.class)
+public interface ItemTagsAccessor {
+
+    @Invoker("register")
+    static Tag.Identified register(String id) {
+        throw new AssertionError();
+    }
+
+}
diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java
index a716552e3..007f4906a 100644
--- a/src/main/java/appeng/parts/AEBasePart.java
+++ b/src/main/java/appeng/parts/AEBasePart.java
@@ -19,11 +19,7 @@
 package appeng.parts;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Random;
+import java.util.*;
 
 import com.google.common.base.Preconditions;
 
@@ -45,7 +41,6 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
-import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
 import appeng.api.config.Upgrades;
@@ -55,16 +50,8 @@ import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.implementations.items.MemoryCardMessages;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.security.IActionHost;
-import appeng.api.parts.BusSupport;
-import appeng.api.parts.IPart;
-import appeng.api.parts.IPartCollisionHelper;
-import appeng.api.parts.IPartHost;
-import appeng.api.parts.PartItemStack;
-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.parts.*;
+import appeng.api.util.*;
 import appeng.core.Api;
 import appeng.helpers.ICustomNameObject;
 import appeng.helpers.IPriorityHost;
@@ -335,7 +322,6 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
      * null means nothing to store...
      *
      * @param from source of settings
-     *
      * @return compound of source
      */
     private CompoundTag downloadSettings(final SettingsFrom from) {
diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java
index cac28ae44..1c976cdf6 100644
--- a/src/main/java/appeng/parts/CableBusContainer.java
+++ b/src/main/java/appeng/parts/CableBusContainer.java
@@ -19,11 +19,7 @@
 package appeng.parts;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 
 import javax.annotation.Nullable;
 
@@ -52,15 +48,7 @@ import appeng.api.exceptions.FailedConnectionException;
 import appeng.api.implementations.parts.ICablePart;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
-import appeng.api.parts.IFacadeContainer;
-import appeng.api.parts.IFacadePart;
-import appeng.api.parts.IPart;
-import appeng.api.parts.IPartCollisionHelper;
-import appeng.api.parts.IPartHost;
-import appeng.api.parts.IPartItem;
-import appeng.api.parts.LayerFlags;
-import appeng.api.parts.PartItemStack;
-import appeng.api.parts.SelectedPart;
+import appeng.api.parts.*;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
diff --git a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
index 3c58b5e5e..a78b03492 100644
--- a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
+++ b/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
@@ -1,11 +1,9 @@
-
 package appeng.parts.automation;
 
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockView;
 
 import appeng.api.config.Actionable;
diff --git a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
index a711d67d8..efd5b5970 100644
--- a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
+++ b/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
@@ -21,30 +21,22 @@ package appeng.parts.automation;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Material;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.item.ToolMaterials;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.tag.BlockTags;
-import net.minecraft.tag.ItemTags;
 import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
-import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
@@ -75,6 +67,8 @@ import appeng.hooks.TickHandler;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
+import appeng.mixins.tags.BlockTagsAccessor;
+import appeng.mixins.tags.ItemTagsAccessor;
 import appeng.parts.BasicStatePart;
 import appeng.util.FakePlayer;
 import appeng.util.IWorldCallable;
@@ -85,6 +79,10 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
 
     public static final Identifier TAG_BLACKLIST = new Identifier(AppEng.MOD_ID, "blacklisted/annihilation_plane");
 
+    private static final Tag.Identified BLOCK_BLACKLIST = BlockTagsAccessor.register(TAG_BLACKLIST.toString());
+
+    private static final Tag.Identified ITEM_BLACKLIST = ItemTagsAccessor.register(TAG_BLACKLIST.toString());
+
     private static final PlaneModels MODELS = new PlaneModels("part/annihilation_plane", "part/annihilation_plane_on");
 
     @PartModels
@@ -234,7 +232,6 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
      * Stores an {@link ItemStack} inside the network.
      *
      * @param item {@link ItemStack} to store
-     *
      * @return the leftover items, which could not be stored inside the network
      */
     private IAEItemStack storeItemStack(final ItemStack item) {
@@ -263,7 +260,6 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
      *
      * @param entityItem the entity to update or destroy
      * @param overflow   the leftover {@link IAEItemStack}
-     *
      * @return true, if the entity was changed otherwise false.
      */
     private boolean handleOverflow(final ItemEntity entityItem, final IAEItemStack overflow) {
@@ -434,11 +430,10 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
 
     /**
      * Checks if the network can store the possible drops.
-     *
+     * 

      * It also sets isAccepting to false, if the item can not be stored.
      *
      * @param itemStacks an array of {@link ItemStack} to test
-     *
      * @return true, if the network can store at least a single item of all drops or
      *         no drops are reported
      */
@@ -526,13 +521,11 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
     }
 
     public static boolean isBlockBlacklisted(Block b) {
-        Tag tag = BlockTags.getTagGroup().getTagOrEmpty(TAG_BLACKLIST);
-        return b.isIn(tag);
+        return BLOCK_BLACKLIST.contains(b);
     }
 
     public static boolean isItemBlacklisted(Item i) {
-        Tag tag = ItemTags.getTagGroup().getTagOrEmpty(TAG_BLACKLIST);
-        return i.isIn(tag);
+        return ITEM_BLACKLIST.contains(i);
     }
 
 }
diff --git a/src/main/java/appeng/parts/automation/ExportBusPart.java b/src/main/java/appeng/parts/automation/ExportBusPart.java
index 699b939d5..2e6e1b088 100644
--- a/src/main/java/appeng/parts/automation/ExportBusPart.java
+++ b/src/main/java/appeng/parts/automation/ExportBusPart.java
@@ -28,14 +28,7 @@ import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Vec3d;
 
-import appeng.api.config.Actionable;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.PowerMultiplier;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.SchedulingMode;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
-import appeng.api.config.YesNo;
+import appeng.api.config.*;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.crafting.ICraftingGrid;
 import appeng.api.networking.crafting.ICraftingLink;
diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java
index 19424bad0..c1ac9602d 100644
--- a/src/main/java/appeng/parts/automation/FormationPlanePart.java
+++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java
@@ -45,13 +45,7 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.Actionable;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.IncludeExclude;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
-import appeng.api.config.YesNo;
+import appeng.api.config.*;
 import appeng.api.networking.events.MENetworkCellArrayUpdate;
 import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.events.MENetworkEventSubscribe;
diff --git a/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
index 5049c0454..e92cc463c 100644
--- a/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
+++ b/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
@@ -25,7 +25,6 @@ import javax.annotation.Nonnull;
 import com.google.common.collect.ImmutableMap;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/appeng/parts/automation/ImportBusPart.java b/src/main/java/appeng/parts/automation/ImportBusPart.java
index d2cfa5625..fb31ccabb 100644
--- a/src/main/java/appeng/parts/automation/ImportBusPart.java
+++ b/src/main/java/appeng/parts/automation/ImportBusPart.java
@@ -25,11 +25,7 @@ import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Vec3d;
 
-import appeng.api.config.Actionable;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
+import appeng.api.config.*;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.energy.IEnergySource;
diff --git a/src/main/java/appeng/parts/automation/LevelEmitterPart.java b/src/main/java/appeng/parts/automation/LevelEmitterPart.java
index c596628d5..0def25aec 100644
--- a/src/main/java/appeng/parts/automation/LevelEmitterPart.java
+++ b/src/main/java/appeng/parts/automation/LevelEmitterPart.java
@@ -35,18 +35,8 @@ import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.LevelType;
-import appeng.api.config.RedstoneMode;
-import appeng.api.config.Settings;
-import appeng.api.config.Upgrades;
-import appeng.api.config.YesNo;
-import appeng.api.networking.crafting.ICraftingGrid;
-import appeng.api.networking.crafting.ICraftingPatternDetails;
-import appeng.api.networking.crafting.ICraftingProvider;
-import appeng.api.networking.crafting.ICraftingProviderHelper;
-import appeng.api.networking.crafting.ICraftingWatcher;
-import appeng.api.networking.crafting.ICraftingWatcherHost;
+import appeng.api.config.*;
+import appeng.api.networking.crafting.*;
 import appeng.api.networking.energy.IEnergyGrid;
 import appeng.api.networking.energy.IEnergyWatcher;
 import appeng.api.networking.energy.IEnergyWatcherHost;
diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java
index a6341d243..8ca9770ba 100644
--- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java
+++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java
@@ -18,11 +18,7 @@
 
 package appeng.parts.automation;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
diff --git a/src/main/java/appeng/parts/automation/SharedItemBusPart.java b/src/main/java/appeng/parts/automation/SharedItemBusPart.java
index 033b53f88..43034491f 100644
--- a/src/main/java/appeng/parts/automation/SharedItemBusPart.java
+++ b/src/main/java/appeng/parts/automation/SharedItemBusPart.java
@@ -121,7 +121,7 @@ public abstract class SharedItemBusPart extends UpgradeablePart implements IGrid
 
     /**
      * Checks if the bus can actually do something.
-     *
+     * 

      * Currently this tests if the chunk for the target is actually loaded.
      *
      * @return true, if the the bus should do its work.
diff --git a/src/main/java/appeng/parts/misc/CableAnchorPart.java b/src/main/java/appeng/parts/misc/CableAnchorPart.java
index bea66b70b..83f20344b 100644
--- a/src/main/java/appeng/parts/misc/CableAnchorPart.java
+++ b/src/main/java/appeng/parts/misc/CableAnchorPart.java
@@ -37,12 +37,7 @@ import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
 import appeng.api.networking.IGridNode;
-import appeng.api.parts.BusSupport;
-import appeng.api.parts.IPart;
-import appeng.api.parts.IPartCollisionHelper;
-import appeng.api.parts.IPartHost;
-import appeng.api.parts.IPartModel;
-import appeng.api.parts.PartItemStack;
+import appeng.api.parts.*;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.core.AppEng;
diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
index 262541319..b7b426d2c 100644
--- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
+++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
@@ -18,12 +18,7 @@
 
 package appeng.parts.misc;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/appeng/parts/misc/StorageBusPart.java b/src/main/java/appeng/parts/misc/StorageBusPart.java
index a2d98cb16..4eee5e2d3 100644
--- a/src/main/java/appeng/parts/misc/StorageBusPart.java
+++ b/src/main/java/appeng/parts/misc/StorageBusPart.java
@@ -27,7 +27,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.screen.ScreenHandlerType;
-import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
@@ -35,16 +34,10 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.BlockView;
 
-import alexiil.mc.lib.attributes.Attributes;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 import alexiil.mc.lib.attributes.item.ItemAttributes;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.FuzzyMode;
-import appeng.api.config.IncludeExclude;
-import appeng.api.config.Settings;
-import appeng.api.config.StorageFilter;
-import appeng.api.config.Upgrades;
+import appeng.api.config.*;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.events.MENetworkCellArrayUpdate;
 import appeng.api.networking.events.MENetworkChannelsChanged;
@@ -59,12 +52,7 @@ import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPartCollisionHelper;
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.IPartModel;
-import appeng.api.storage.IMEInventory;
-import appeng.api.storage.IMEInventoryHandler;
-import appeng.api.storage.IMEMonitorHandlerReceiver;
-import appeng.api.storage.IStorageChannel;
-import appeng.api.storage.IStorageMonitorable;
-import appeng.api.storage.IStorageMonitorableAccessor;
+import appeng.api.storage.*;
 import appeng.api.storage.cells.ICellContainer;
 import appeng.api.storage.cells.ICellInventory;
 import appeng.api.storage.channels.IItemStorageChannel;
diff --git a/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java
index 89b530585..c86d6f751 100644
--- a/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java
+++ b/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java
@@ -26,7 +26,7 @@ import appeng.items.parts.PartModels;
 
 /**
  * A more sophisticated part overlapping all 3 textures.
- *
+ * 

  * Subclass this if you need want a new part and need all 3 textures. For more
  * concrete implementations, the direct abstract subclasses might be a better
  * alternative.
diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java
index 01ecb30cd..e98468920 100644
--- a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java
+++ b/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java
@@ -57,7 +57,7 @@ import appeng.util.item.AEItemStack;
 /**
  * A basic subclass for any item monitor like display with an item icon and an
  * amount.
- *
+ * 

  * It can also be used to extract items from somewhere and spawned into the
  * world.
  *
diff --git a/src/main/java/appeng/parts/reporting/AbstractPanelPart.java b/src/main/java/appeng/parts/reporting/AbstractPanelPart.java
index 4b322dd2e..9a553d6c5 100644
--- a/src/main/java/appeng/parts/reporting/AbstractPanelPart.java
+++ b/src/main/java/appeng/parts/reporting/AbstractPanelPart.java
@@ -27,7 +27,7 @@ import appeng.items.parts.PartModels;
 
 /**
  * A very simple part for emitting light.
- *
+ * 

  * Opposed to the other subclass of {@link AbstractReportingPart}, it will only
  * use the bright front texture.
  *
diff --git a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java
index 94c3bfbef..40a5cf611 100644
--- a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java
+++ b/src/main/java/appeng/parts/reporting/AbstractReportingPart.java
@@ -48,10 +48,10 @@ import appeng.util.Platform;
 /**
  * The most basic class for any part reporting information, like terminals or
  * monitors. This can also include basic panels which just provide light.
- *
+ * 

  * It deals with the most basic functionalities like network data, grid
  * registration or the rotation of the actual part.
- *
+ * 

  * The direct abstract subclasses are usually a better entry point for adding
  * new concrete ones. But this might be an ideal starting point to completely
  * new type, which does not resemble any existing one.
diff --git a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java
index 109ba384d..18ce17634 100644
--- a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java
+++ b/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java
@@ -51,7 +51,7 @@ import appeng.util.inv.InvOperation;
 
 /**
  * Anything resembling an network terminal with view cells can reuse this.
- *
+ * 

  * Note this applies only to terminals like the ME Terminal. It does not apply
  * for more specialized terminals like the Interface Terminal.
  *
diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java
index e354f3bd7..a0fc0139d 100644
--- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java
+++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java
@@ -33,11 +33,7 @@ import net.minecraft.recipe.SpecialRecipeSerializer;
 import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 
-import appeng.api.definitions.IBlocks;
-import appeng.api.definitions.IDefinitions;
-import appeng.api.definitions.IItemDefinition;
-import appeng.api.definitions.IItems;
-import appeng.api.definitions.IMaterials;
+import appeng.api.definitions.*;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java
index 9552fff46..96074fb5e 100644
--- a/src/main/java/appeng/recipes/game/FacadeRecipe.java
+++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java
@@ -32,7 +32,6 @@ import net.minecraft.world.World;
 import appeng.api.definitions.IComparableDefinition;
 import appeng.api.definitions.IDefinitions;
 import appeng.core.Api;
-import appeng.core.AppEng;
 import appeng.items.parts.FacadeItem;
 
 public final class FacadeRecipe extends SpecialCraftingRecipe {
diff --git a/src/main/java/appeng/server/Commands.java b/src/main/java/appeng/server/Commands.java
index a2bd40714..77f2e57a6 100644
--- a/src/main/java/appeng/server/Commands.java
+++ b/src/main/java/appeng/server/Commands.java
@@ -18,11 +18,7 @@
 
 package appeng.server;
 
-import appeng.server.subcommands.ChunkLogger;
-import appeng.server.subcommands.SpatialStorageCommand;
-import appeng.server.subcommands.Supporters;
-import appeng.server.subcommands.TestMeteoritesCommand;
-import appeng.server.subcommands.TestOreGenCommand;
+import appeng.server.subcommands.*;
 
 public enum Commands {
     Chunklogger(4, new ChunkLogger(), false), Supporters(0, new Supporters(), false),
diff --git a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
index d374c088f..fb3263917 100644
--- a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
+++ b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java
@@ -20,12 +20,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.ClickEvent;
-import net.minecraft.text.HoverEvent;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
+import net.minecraft.text.*;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
index 334e296fd..adbad5b72 100644
--- a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
+++ b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java
@@ -169,8 +169,8 @@ public class TestMeteoritesCommand implements ISubCommand {
             msg.append(getClickablePosition(world, settings, pos)).append(restOfLine);
 
             // Add a tooltip
-            MutableText tooltip = new LiteralText(settings.toString() + "\nBiome: ")
-                    .append(world.getBiome(pos).toString());
+            String biomeId = world.method_31081(pos).map(bk -> bk.getValue().toString()).orElse("unknown");
+            MutableText tooltip = new LiteralText(settings.toString() + "\nBiome: ").append(biomeId);
             msg.styled(style -> style.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip)));
 
             sender.sendFeedback(msg, true);
diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java
index 0a7824483..83539b02b 100644
--- a/src/main/java/appeng/services/CompassService.java
+++ b/src/main/java/appeng/services/CompassService.java
@@ -19,11 +19,7 @@
 package appeng.services;
 
 import java.util.WeakHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 import javax.annotation.Nonnull;
 
@@ -32,12 +28,8 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.BlockView;
 import net.minecraft.world.ServerWorldAccess;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldAccess;
 import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.dimension.DimensionType;
 
 import appeng.api.util.DimensionalCoord;
 import appeng.core.Api;
@@ -79,7 +71,6 @@ public final class CompassService {
     // FIXME compassReader.close();
     // FIXME }
     // FIXME }
-
     private int jobSize() {
         return this.jobSize;
     }
diff --git a/src/main/java/appeng/spatial/DefaultSpatialHandler.java b/src/main/java/appeng/spatial/DefaultSpatialHandler.java
index 72a490ff5..10077c333 100644
--- a/src/main/java/appeng/spatial/DefaultSpatialHandler.java
+++ b/src/main/java/appeng/spatial/DefaultSpatialHandler.java
@@ -33,7 +33,6 @@ public class DefaultSpatialHandler implements IMovableHandler {
      * never called for the default.
      *
      * @param tile block entity
-     *
      * @return true
      */
     @Override
diff --git a/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java b/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
index acf4f86ad..4840d1ad8 100644
--- a/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
+++ b/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
@@ -66,7 +66,7 @@ public class SpatialStorageChunkGenerator extends ChunkGenerator {
 
     private final BlockState defaultBlockState;
 
-    private SpatialStorageChunkGenerator(Registry biomeRegistry) {
+    public SpatialStorageChunkGenerator(Registry biomeRegistry) {
         super(createBiomeSource(biomeRegistry), createSettings());
         this.defaultBlockState = Api.instance().definitions().blocks().matrixFrame().block().getDefaultState();
         this.biomeRegistry = biomeRegistry;
diff --git a/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java b/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java
index ca070746c..f12a03ac4 100644
--- a/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java
+++ b/src/main/java/appeng/spatial/SpatialStorageDimensionIds.java
@@ -39,8 +39,7 @@ public final class SpatialStorageDimensionIds {
     /**
      * ID of the {@link DimensionOptions} used for the spatial storage dimension.
      * 

-     * This is defined in
-     * data/minecraft/dimension/appliedenergistics2/spatial_storage.json
+     * This is defined in {@link appeng.mixins.spatial.DimensionTypeMixin}.
      */
     public static final RegistryKey DIMENSION_ID = RegistryKey.of(Registry.DIMENSION_OPTIONS,
             AppEng.makeId("spatial_storage"));
diff --git a/src/main/java/appeng/spatial/SpatialStoragePlot.java b/src/main/java/appeng/spatial/SpatialStoragePlot.java
index b95a76dd7..364333e4a 100644
--- a/src/main/java/appeng/spatial/SpatialStoragePlot.java
+++ b/src/main/java/appeng/spatial/SpatialStoragePlot.java
@@ -79,7 +79,7 @@ public class SpatialStoragePlot {
 
     /**
      * Returns the AE player id of the owner of this plot, or -1 if unknown.
-     * 
+     *
      * @see appeng.core.worlddata.IWorldPlayerData
      */
     public int getOwner() {
@@ -102,17 +102,17 @@ public class SpatialStoragePlot {
      * The origin of this plot within the spatial storage dimension.
      * 

      * To map an integer to a specific position, it uses the following algorithm.
-     * 
+     * 

      * The 2 least significant bits determine the sign for the x and z axis. Every
      * other pack of 2 bits locate the plot within a quadrant of a increasing area
      * by the bit position.
-     * 
+     * 

      * The first 2 bits after the sign address a quadrant within 1024x1024 blocks
      * (or 4 region files)
-     * 
+     * 

      * Every further will continue to double both x and z values. E.g. 2048x2048 for
      * the 3rd pack and 4096x4096 for the 4th.
-     * 
+     *
      * @see #getSize()
      */
     public BlockPos getOrigin() {
diff --git a/src/main/java/appeng/spatial/SpatialStoragePlotManager.java b/src/main/java/appeng/spatial/SpatialStoragePlotManager.java
index e542a4bfe..a639a9fca 100644
--- a/src/main/java/appeng/spatial/SpatialStoragePlotManager.java
+++ b/src/main/java/appeng/spatial/SpatialStoragePlotManager.java
@@ -26,7 +26,6 @@ import net.minecraft.block.BlockState;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.TeleportTarget;
 
 import appeng.core.AELog;
 import appeng.core.Api;
diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java b/src/main/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java
index c7d4de369..107a83cbb 100644
--- a/src/main/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java
+++ b/src/main/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java
@@ -102,7 +102,6 @@ public class InterpHelper {
      * @param q1 Value at dx1 dy1
      * @param q2 Value at dx2 dy2
      * @param q3 Value at dx3 dy3
-     *
      * @return The result.
      */
     public float interpolate(float q0, float q1, float q2, float q3) {
diff --git a/src/main/java/appeng/tile/AEBaseBlockEntity.java b/src/main/java/appeng/tile/AEBaseBlockEntity.java
index b512f5850..3639d3f22 100644
--- a/src/main/java/appeng/tile/AEBaseBlockEntity.java
+++ b/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) {
diff --git a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java b/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
index 6d41ddbd6..b2128e61c 100644
--- a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java
+++ b/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;
diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java
index af3823dbc..7ed85c63e 100644
--- a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java
+++ b/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;
diff --git a/src/main/java/appeng/tile/inventory/AppEngCellInventory.java b/src/main/java/appeng/tile/inventory/AppEngCellInventory.java
index 66fb7e3cf..420c0d359 100644
--- a/src/main/java/appeng/tile/inventory/AppEngCellInventory.java
+++ b/src/main/java/appeng/tile/inventory/AppEngCellInventory.java
@@ -1,4 +1,3 @@
-
 package appeng.tile.inventory;
 
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java b/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java
index 7b5fdb1b4..309eb6330 100644
--- a/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java
+++ b/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;
 
diff --git a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java b/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java
index ef6455e76..3943ac918 100644
--- a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java
+++ b/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;
diff --git a/src/main/java/appeng/tile/networking/CableBusBlockEntity.java b/src/main/java/appeng/tile/networking/CableBusBlockEntity.java
index fd7c4bb9c..96f47cdb4 100644
--- a/src/main/java/appeng/tile/networking/CableBusBlockEntity.java
+++ b/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;
diff --git a/src/main/java/appeng/tile/networking/ControllerBlockEntity.java b/src/main/java/appeng/tile/networking/ControllerBlockEntity.java
index cbbe486fa..c2ba7b06e 100644
--- a/src/main/java/appeng/tile/networking/ControllerBlockEntity.java
+++ b/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;
diff --git a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java b/src/main/java/appeng/tile/powersink/IExternalPowerSink.java
index e36f29fe8..68cd1f565 100644
--- a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java
+++ b/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.
diff --git a/src/main/java/appeng/tile/storage/DriveBlockEntity.java b/src/main/java/appeng/tile/storage/DriveBlockEntity.java
index 875d86963..635ab0384 100644
--- a/src/main/java/appeng/tile/storage/DriveBlockEntity.java
+++ b/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.
-     *
+     * 

      * - Bit 31: power state. 0 = off, 1 = on.
-     * 
+     * 

      * - Bit 30: reserved
-     * 
+     * 

      * - Bit 29-0: 3 bits for the state of each cell
-     *
+     * 

      * Cell states:
-     * 
+     * 

      * - Bit 2-0: {@link CellState} ordinal
-     *
-     *
-     * 
      */
     private int state = 0;
 
diff --git a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java b/src/main/java/appeng/tile/storage/IOPortBlockEntity.java
index 08fd31dcf..644298455 100644
--- a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java
+++ b/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;
diff --git a/src/main/java/appeng/util/FakePlayer.java b/src/main/java/appeng/util/FakePlayer.java
index 0ed1b5d73..d75c6a6a7 100644
--- a/src/main/java/appeng/util/FakePlayer.java
+++ b/src/main/java/appeng/util/FakePlayer.java
@@ -4,25 +4,12 @@ import java.util.Objects;
 import java.util.UUID;
 import java.util.WeakHashMap;
 
-import javax.annotation.Nullable;
-
 import com.mojang.authlib.GameProfile;
 
-import io.netty.util.concurrent.CompleteFuture;
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import io.netty.util.concurrent.SucceededFuture;
-
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.ClientConnection;
-import net.minecraft.network.NetworkSide;
-import net.minecraft.network.Packet;
-import net.minecraft.network.packet.c2s.play.ClientSettingsC2SPacket;
-import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.network.ServerPlayerInteractionManager;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 public class FakePlayer extends ServerPlayerEntity {
diff --git a/src/main/java/appeng/util/ISlimReadableNumberConverter.java b/src/main/java/appeng/util/ISlimReadableNumberConverter.java
index 22207c669..254f5e307 100644
--- a/src/main/java/appeng/util/ISlimReadableNumberConverter.java
+++ b/src/main/java/appeng/util/ISlimReadableNumberConverter.java
@@ -33,11 +33,10 @@ public interface ISlimReadableNumberConverter {
      * Converts a number into a human readable form. It will not round the number,
      * but down it. Will try to cut the number down 1 decimal later, but rarely
      * because of the 3 width limitation. Can only handle non negative numbers
-     *
+     * 

      * Example: 10000L -> 10K 9999L -> 9K, not 9.9K cause 4 width
      *
      * @param number to be converted number
-     *
      * @return String in SI format cut down as far as possible
      */
     String toSlimReadableForm(@Nonnegative long number);
diff --git a/src/main/java/appeng/util/IWideReadableNumberConverter.java b/src/main/java/appeng/util/IWideReadableNumberConverter.java
index 5b7b6e884..b7222bec7 100644
--- a/src/main/java/appeng/util/IWideReadableNumberConverter.java
+++ b/src/main/java/appeng/util/IWideReadableNumberConverter.java
@@ -32,11 +32,10 @@ public interface IWideReadableNumberConverter {
      * Converts a number into a human readable form. It will not round the number,
      * but down it. Will try to cut the number down 1 decimal later if width can be
      * below 4. Can only handle non negative numbers
-     *
+     * 

      * Example: 10000L -> 10K 9999L -> 9999
      *
      * @param number to be converted number
-     *
      * @return String in SI format cut down as far as possible
      */
     String toWideReadableForm(@Nonnegative long number);
diff --git a/src/main/java/appeng/util/IWorldCallable.java b/src/main/java/appeng/util/IWorldCallable.java
index 86ce06f55..c959ecc04 100644
--- a/src/main/java/appeng/util/IWorldCallable.java
+++ b/src/main/java/appeng/util/IWorldCallable.java
@@ -40,9 +40,7 @@ public interface IWorldCallable {
      * @param world this param is given to not hold a reference to the world but let
      *              the caller handle it. Do not expect a world here thus can be
      *              null.
-     *
      * @return result of call on the world. Can be null.
-     *
      * @throws Exception if the call fails
      * @see Callable#call()
      */
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index 4c0b0ed1e..533c5ebab 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -19,11 +19,7 @@
 package appeng.util;
 
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 import javax.annotation.Nullable;
 
@@ -46,7 +42,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.recipe.Recipe;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
@@ -56,24 +51,14 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Box;
-import net.minecraft.util.math.Direction;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.*;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.RayTraceContext;
 import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 
-import appeng.api.config.AccessRestriction;
-import appeng.api.config.Actionable;
-import appeng.api.config.PowerMultiplier;
-import appeng.api.config.PowerUnits;
-import appeng.api.config.SearchBoxMode;
-import appeng.api.config.SecurityPermissions;
-import appeng.api.config.SortOrder;
+import appeng.api.config.*;
 import appeng.api.definitions.IItemDefinition;
 import appeng.api.definitions.IMaterials;
 import appeng.api.features.AEFeature;
@@ -157,7 +142,6 @@ public class Platform {
      *
      * @param n      to be formatted long value
      * @param isRate if true it adds a /t to the formatted string
-     *
      * @return formatted long value
      */
     public static String formatPowerLong(final long n, final boolean isRate) {
@@ -1060,10 +1044,10 @@ public class Platform {
                 for (final IAEItemStack x : items) {
                     final ItemStack sh = x.getDefinition();
                     if ((Platform.itemComparisons().isEqualItemType(providedTemplate,
-                            sh) /* FIXME || ae_req.sameOre( x ) */ ) && !ItemStack.areItemsEqual(sh, output)) { // Platform.isSameItemType(
-                                                                                                                // sh,
-                                                                                                                // providedTemplate
-                                                                                                                // )
+                            sh) /* FIXME || ae_req.sameOre( x ) */) && !ItemStack.areItemsEqual(sh, output)) { // Platform.isSameItemType(
+                        // sh,
+                        // providedTemplate
+                        // )
                         final ItemStack cp = sh.copy();
                         cp.setCount(1);
                         ci.setStack(slot, cp);
diff --git a/src/main/java/appeng/util/ReadableNumberConverter.java b/src/main/java/appeng/util/ReadableNumberConverter.java
index bf3cdd0ad..49dd740d9 100644
--- a/src/main/java/appeng/util/ReadableNumberConverter.java
+++ b/src/main/java/appeng/util/ReadableNumberConverter.java
@@ -69,7 +69,6 @@ public enum ReadableNumberConverter implements ISlimReadableNumberConverter, IWi
      *
      * @param number to be formatted number
      * @param width  width limitation of the resulting number
-     *
      * @return formatted number restricted by the width limitation
      */
     private String toReadableFormRestrictedByWidth(final long number, final int width) {
diff --git a/src/main/java/appeng/util/UUIDMatcher.java b/src/main/java/appeng/util/UUIDMatcher.java
index ebf654efe..d627ea348 100644
--- a/src/main/java/appeng/util/UUIDMatcher.java
+++ b/src/main/java/appeng/util/UUIDMatcher.java
@@ -39,7 +39,6 @@ public final class UUIDMatcher {
      * applying a regular expression on it.
      *
      * @param potential to be checked potential {@link java.util.UUID}
-     *
      * @return true, if the potential {@link java.util.UUID} is indeed an
      *         {@link java.util.UUID}
      */
diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java
index f85d0857f..6e77bdb5d 100644
--- a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java
+++ b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java
@@ -28,17 +28,16 @@ import appeng.api.config.FuzzyMode;
 
 /**
  * A helper class for comparing {@link Item}, {@link ItemStack} or NBT
- *
  */
 public class ItemComparisonHelper {
 
     /**
      * Compare the two {@link ItemStack}s based on the same {@link Item} and damage
      * value.
-     *
+     * 

      * In case of the item being damageable, only the {@link Item} will be
      * considered. If not it will also compare both damage values.
-     *
+     * 

      * Ignores NBT.
      *
      * @return true, if both are equal.
@@ -49,7 +48,7 @@ public class ItemComparisonHelper {
 
     /**
      * Compares two {@link ItemStack} and their NBT tag for equality.
-     *
+     * 

      * Use this when a precise check is required and the same item is required. Not
      * just something with different NBT tags.
      *
diff --git a/src/main/java/appeng/util/item/FuzzyItemList.java b/src/main/java/appeng/util/item/FuzzyItemList.java
index ca9e6dc4e..a66d4d31c 100644
--- a/src/main/java/appeng/util/item/FuzzyItemList.java
+++ b/src/main/java/appeng/util/item/FuzzyItemList.java
@@ -18,11 +18,7 @@
 
 package appeng.util.item;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.TreeMap;
+import java.util.*;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEItemStack;
diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java
index d5c4f8aa7..abb3e91cf 100644
--- a/src/main/java/appeng/util/item/ItemList.java
+++ b/src/main/java/appeng/util/item/ItemList.java
@@ -18,12 +18,7 @@
 
 package appeng.util.item;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.util.*;
 
 import net.minecraft.item.Item;
 
diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java
index 75c06b5d7..5ec321589 100644
--- a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java
+++ b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java
@@ -24,7 +24,6 @@ import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.item.Item;
@@ -32,14 +31,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
-import net.minecraft.util.math.Direction;
 import net.minecraft.world.WorldAccess;
 
-import alexiil.mc.lib.attributes.AttributeList;
-import alexiil.mc.lib.attributes.AttributeProvider;
-import alexiil.mc.lib.attributes.AttributeUtil;
-import alexiil.mc.lib.attributes.item.ItemAttributes;
-
 import appeng.api.definitions.IBlockDefinition;
 import appeng.api.definitions.IBlocks;
 import appeng.api.definitions.IMaterials;
@@ -51,11 +44,7 @@ import appeng.tile.storage.SkyChestBlockEntity;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
 import appeng.util.inv.AdaptorFixedInv;
-import appeng.worldgen.meteorite.fallout.Fallout;
-import appeng.worldgen.meteorite.fallout.FalloutCopy;
-import appeng.worldgen.meteorite.fallout.FalloutMode;
-import appeng.worldgen.meteorite.fallout.FalloutSand;
-import appeng.worldgen.meteorite.fallout.FalloutSnow;
+import appeng.worldgen.meteorite.fallout.*;
 
 public final class MeteoritePlacer {
     private static final double PRESSES_SPAWN_CHANCE = 0.7;
diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java
index 8a91338a4..33af624b7 100644
--- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java
+++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java
@@ -97,7 +97,7 @@ public class MeteoriteStructurePiece extends StructurePiece {
         placer.place();
 
         WorldData.instance().compassData().service().tryUpdateArea(world, chunkPos); // FIXME: We know the y-range
-                                                                                     // here...
+        // here...
         return true;
     }
 
diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
index 56358365d..1ec4418ea 100644
--- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
+++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java
@@ -88,7 +88,7 @@ public class MeteoriteStructureStart extends StructureStart