Organize and clean imports

src/api/java/appeng/api/features/IWorldGen.java

@@ -24,8 +24,6 @@
 package appeng.api.features;
 
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.Dimension;
-import net.minecraft.world.IWorld;
 import net.minecraft.world.server.ServerWorld;
 
 public interface IWorldGen {

src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java

@@ -26,12 +26,11 @@ package appeng.api.implementations.items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.RegistryKey;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
+import net.minecraft.world.server.ServerWorld;
 
 import appeng.api.implementations.TransitionResult;
 import appeng.api.util.WorldCoord;
-import net.minecraft.world.server.ServerWorld;
 
 /**
  * Implemented on a {@link Item}

src/api/java/appeng/api/storage/ISpatialDimension.java

@@ -25,7 +25,6 @@ import javax.annotation.Nullable;
 import net.minecraft.util.RegistryKey;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 

src/api/java/appeng/api/util/DimensionalCoord.java

@@ -25,7 +25,6 @@ package appeng.api.util;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.Dimension;
 import net.minecraft.world.DimensionType;
 import net.minecraft.world.IWorld;
 

src/main/java/appeng/block/AEBaseTileBlock.java

@@ -31,26 +31,21 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.DyeColor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.IBlockReader;
-import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraftforge.items.ItemHandlerHelper;
 
 import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.implementations.items.MemoryCardMessages;
-import appeng.api.implementations.tiles.IColorableTile;
-import appeng.api.util.AEColor;
 import appeng.api.util.IOrientable;
 import appeng.block.networking.CableBusBlock;
 import appeng.tile.AEBaseInvTileEntity;

src/main/java/appeng/block/networking/CableBusBlock.java

@@ -53,7 +53,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.IBlockReader;
-import net.minecraft.world.IWorld;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;

src/main/java/appeng/client/gui/AEBaseMEScreen.java

@@ -28,7 +28,6 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 
 import appeng.api.storage.data.IAEItemStack;

src/main/java/appeng/client/gui/AEBaseScreen.java

@@ -28,11 +28,9 @@ import java.util.stream.Collectors;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
-import com.google.common.collect.Lists;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import net.minecraft.util.text.Style;
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.opengl.GL11;
 
@@ -58,6 +56,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fml.client.gui.GuiUtils;

src/main/java/appeng/client/gui/widgets/ActionButton.java

@@ -21,11 +21,12 @@ package appeng.client.gui.widgets;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
 
-import appeng.api.config.ActionItems;
-import appeng.core.localization.ButtonToolTips;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 
+import appeng.api.config.ActionItems;
+import appeng.core.localization.ButtonToolTips;
+
 public class ActionButton extends IconButton implements ITooltip {
     private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL);
     private final int iconIndex;

src/main/java/appeng/client/gui/widgets/SettingToggleButton.java

@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.CondenserOutput;
@@ -48,7 +49,6 @@ import appeng.api.config.ViewItems;
 import appeng.api.config.YesNo;
 import appeng.core.localization.ButtonToolTips;
 import appeng.util.EnumCycler;
-import net.minecraft.util.text.StringTextComponent;
 
 public class SettingToggleButton<T extends Enum<T>> extends IconButton {
     private static final Pattern COMPILE = Pattern.compile("%s");

src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java

@@ -25,7 +25,6 @@ import net.minecraft.client.renderer.model.ItemOverrideList;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;

src/main/java/appeng/client/render/SpatialSkyRender.java

@@ -25,15 +25,11 @@ import com.mojang.blaze3d.systems.RenderSystem;
 
 import org.lwjgl.opengl.GL11;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.vector.Quaternion;
-import net.minecraftforge.client.IRenderHandler;
-import net.minecraftforge.client.SkyRenderHandler;
 
 public class SpatialSkyRender {
 

src/main/java/appeng/client/render/cablebus/CableBuilder.java

@@ -25,7 +25,6 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.function.Function;
 
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.client.renderer.texture.AtlasTexture;

src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java

@@ -14,7 +14,6 @@ import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.vector.TransformationMatrix;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.PerspectiveMapWrapper;
 
 import appeng.client.render.DelegateBakedModel;

src/main/java/appeng/client/render/effects/ChargedOreFX.java

@@ -25,7 +25,6 @@ import net.minecraft.client.particle.RedstoneParticle;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.particles.BasicParticleType;
 import net.minecraft.particles.RedstoneParticleData;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 

src/main/java/appeng/client/render/effects/CraftingFx.java

@@ -31,7 +31,6 @@ import net.minecraft.particles.BasicParticleType;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.util.math.vector.Vector3f;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 

src/main/java/appeng/client/render/effects/LightningArcFX.java

@@ -25,7 +25,6 @@ import net.minecraft.client.particle.IParticleFactory;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.SpriteTexturedParticle;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 

src/main/java/appeng/client/render/effects/ParticleTypes.java

@@ -1,6 +1,7 @@
 package appeng.client.render.effects;
 
 import com.mojang.serialization.Codec;
+
 import net.minecraft.particles.BasicParticleType;
 import net.minecraft.particles.ParticleType;
 

src/main/java/appeng/client/render/model/BiometricCardBakedModel.java

@@ -23,7 +23,6 @@ import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.data.EmptyModelData;
 
 import appeng.api.implementations.items.IBiometricCard;

src/main/java/appeng/client/render/model/MemoryCardBakedModel.java

@@ -23,7 +23,6 @@ import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.data.EmptyModelData;
 
 import appeng.api.implementations.items.IMemoryCard;

src/main/java/appeng/client/render/model/MemoryCardModel.java

@@ -9,7 +9,6 @@ import javax.annotation.Nullable;
 
 import com.mojang.datafixers.util.Pair;
 
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.IModelTransform;
 import net.minecraft.client.renderer.model.IUnbakedModel;

src/main/java/appeng/client/render/model/SkyCompassBakedModel.java

@@ -39,7 +39,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.vector.Matrix4f;
 import net.minecraft.util.math.vector.Quaternion;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.data.IDynamicBakedModel;
 import net.minecraftforge.client.model.data.IModelData;
 import net.minecraftforge.client.model.data.ModelProperty;

src/main/java/appeng/container/ContainerLocator.java

@@ -31,12 +31,12 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 import appeng.api.parts.IPartHost;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.parts.AEBasePart;
-import net.minecraft.world.World;
 
 /**
  * Describes how a container the player has opened was originally located. This

src/main/java/appeng/container/implementations/WirelessTermContainer.java

@@ -22,13 +22,13 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.Util;
 
 import appeng.container.ContainerLocator;
 import appeng.core.AEConfig;
 import appeng.core.localization.PlayerMessages;
 import appeng.helpers.WirelessTerminalGuiObject;
 import appeng.util.Platform;
-import net.minecraft.util.Util;
 
 public class WirelessTermContainer extends MEPortableCellContainer {
 

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

@@ -35,7 +35,6 @@ import com.google.common.base.Strings;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;

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

@@ -18,6 +18,48 @@
 
 package appeng.core;
 
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScreenManager;
+import net.minecraft.client.particle.ParticleManager;
+import net.minecraft.entity.EntityType;
+import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.item.Item;
+import net.minecraft.item.crafting.IRecipeSerializer;
+import net.minecraft.particles.ParticleType;
+import net.minecraft.tileentity.TileEntityType;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.gen.GenerationStage;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.IFeatureConfig;
+import net.minecraft.world.gen.feature.OreFeatureConfig;
+import net.minecraft.world.gen.feature.structure.Structure;
+import net.minecraft.world.gen.placement.CountRangeConfig;
+import net.minecraft.world.gen.placement.IPlacementConfig;
+import net.minecraft.world.gen.placement.Placement;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.event.ColorHandlerEvent;
+import net.minecraftforge.client.event.ModelBakeEvent;
+import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.common.extensions.IForgeContainerType;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.fml.network.IContainerFactory;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.IForgeRegistry;
+
 import appeng.api.config.Upgrades;
 import appeng.api.definitions.IBlocks;
 import appeng.api.definitions.IItems;
@@ -167,47 +209,6 @@ import appeng.tile.crafting.MolecularAssemblerRenderer;
 import appeng.worldgen.ChargedQuartzOreConfig;
 import appeng.worldgen.ChargedQuartzOreFeature;
 import appeng.worldgen.meteorite.MeteoriteStructure;
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.ScreenManager;
-import net.minecraft.client.particle.ParticleManager;
-import net.minecraft.entity.EntityType;
-import net.minecraft.inventory.container.ContainerType;
-import net.minecraft.item.Item;
-import net.minecraft.item.crafting.IRecipeSerializer;
-import net.minecraft.particles.ParticleType;
-import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.IFeatureConfig;
-import net.minecraft.world.gen.feature.OreFeatureConfig;
-import net.minecraft.world.gen.feature.structure.Structure;
-import net.minecraft.world.gen.placement.CountRangeConfig;
-import net.minecraft.world.gen.placement.IPlacementConfig;
-import net.minecraft.world.gen.placement.Placement;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.event.ParticleFactoryRegisterEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.common.extensions.IForgeContainerType;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.network.IContainerFactory;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.IForgeRegistry;
 
 final class Registration {
 

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

@@ -21,11 +21,9 @@ package appeng.core.features.registries;
 import java.util.HashSet;
 
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.Dimension;
+import net.minecraft.world.server.ServerWorld;
-import net.minecraft.world.IWorld;
 
 import appeng.api.features.IWorldGen;
-import net.minecraft.world.server.ServerWorld;
 
 public final class WorldGenRegistry implements IWorldGen {
 

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

@@ -25,13 +25,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 
 import net.minecraft.advancements.ICriterionInstance;
 import net.minecraft.advancements.ICriterionTrigger;
 import net.minecraft.advancements.PlayerAdvancements;
-import net.minecraft.advancements.criterion.CriterionInstance;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.loot.ConditionArrayParser;

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

@@ -25,10 +25,7 @@ import net.minecraft.network.IPacket;
 import net.minecraft.network.ThreadQuickExitException;
 import net.minecraft.network.play.ServerPlayNetHandler;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.RegistryKey;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.DimensionType;
-import net.minecraft.world.World;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.LogicalSide;

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

@@ -1,7 +1,6 @@
 package appeng.core.sync.network;
 
 import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 
 /**

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

@@ -26,7 +26,6 @@ import javax.annotation.Nullable;
 import com.google.common.base.Preconditions;
 
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.server.ServerWorld;
 
 import appeng.services.CompassService;

src/main/java/appeng/debug/ReplicatorCardItem.java

@@ -37,7 +37,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 
 import appeng.api.networking.IGrid;

src/main/java/appeng/decorative/solid/SkyStoneBlock.java

@@ -23,7 +23,6 @@ import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;

src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java

@@ -26,7 +26,6 @@ import java.util.Locale;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
-import net.minecraft.util.text.StringTextComponent;
 import org.lwjgl.glfw.GLFW;
 
 import net.minecraft.client.util.InputMappings;
@@ -34,6 +33,7 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ClickType;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.api.config.Settings;

src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java

@@ -8,12 +8,11 @@ import javax.annotation.Nonnull;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.IBucketPickupHandler;
 import net.minecraft.fluid.Fluid;
-import net.minecraft.fluid.Fluids;
 import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.tags.ITag;
-import net.minecraft.tags.Tag;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;

src/main/java/appeng/integration/modules/jei/CondenserCategory.java

@@ -24,11 +24,9 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import com.mojang.blaze3d.matrix.MatrixStack;
 
-import jdk.nashorn.internal.objects.annotations.Function;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;

src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java

@@ -19,6 +19,7 @@
 package appeng.integration.modules.jei;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
+
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ResourceLocation;
 

src/main/java/appeng/items/storage/SpatialStorageCellItem.java

@@ -30,7 +30,6 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.api.distmarker.Dist;

src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java

@@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -23,7 +23,6 @@ import java.util.Iterator;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.WorldEvent;

src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java

@@ -1,10 +1,7 @@
 package appeng.mixins;
 
-import appeng.worldgen.meteorite.MeteoriteStructure;
 import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.gen.feature.structure.Structure;
+
-import net.minecraft.world.gen.settings.DimensionStructuresSettings;
-import net.minecraft.world.gen.settings.StructureSeparationSettings;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
@@ -12,6 +9,12 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.world.gen.feature.structure.Structure;
+import net.minecraft.world.gen.settings.DimensionStructuresSettings;
+import net.minecraft.world.gen.settings.StructureSeparationSettings;
+
+import appeng.worldgen.meteorite.MeteoriteStructure;
+
 /**
  * This Mixin will add the structure placement configuration for the meteorite structure
  * to the static final immutable map that contains them. There is currently no

src/main/java/appeng/mixins/DimensionTypeMixin.java

@@ -1,15 +1,17 @@
 package appeng.mixins;
 
-import appeng.spatial.SpatialDimensionManager;
+import java.util.OptionalLong;
-import net.minecraft.server.IDynamicRegistries;
+
-import net.minecraft.tags.BlockTags;
-import net.minecraft.world.DimensionType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.OptionalLong;
+import net.minecraft.server.IDynamicRegistries;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.DimensionType;
+
+import appeng.spatial.SpatialDimensionManager;
 
 @Mixin(value = DimensionType.class)
 public class DimensionTypeMixin {

src/main/java/appeng/mixins/MinecraftServerMixin.java

@@ -1,8 +1,14 @@
 package appeng.mixins;
 
-import appeng.hooks.DynamicDimensions;
+import java.util.Map;
+import java.util.concurrent.Executor;
+
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
 import net.minecraft.server.IDynamicRegistries;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.RegistryKey;
@@ -20,12 +26,8 @@ import net.minecraft.world.storage.DerivedWorldInfo;
 import net.minecraft.world.storage.IServerConfiguration;
 import net.minecraft.world.storage.IServerWorldInfo;
 import net.minecraft.world.storage.SaveFormat;
-import net.minecraft.world.storage.ServerWorldInfo;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
-import java.util.Map;
+import appeng.hooks.DynamicDimensions;
-import java.util.concurrent.Executor;
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerMixin implements DynamicDimensions {

src/main/java/appeng/mixins/SkyPropertiesMixin.java

@@ -1,15 +1,17 @@
 package appeng.mixins;
 
-import appeng.spatial.SpatialDimensionManager;
+import java.util.Optional;
-import net.minecraft.client.world.DimensionRenderInfo;
+
-import net.minecraft.util.RegistryKey;
-import net.minecraft.world.DimensionType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.Optional;
+import net.minecraft.client.world.DimensionRenderInfo;
+import net.minecraft.util.RegistryKey;
+import net.minecraft.world.DimensionType;
+
+import appeng.spatial.SpatialDimensionManager;
 
 @Mixin(DimensionRenderInfo.class)
 public class SkyPropertiesMixin {

src/main/java/appeng/mixins/SkyRenderMixin.java

@@ -1,16 +1,19 @@
 package appeng.mixins;
 
-import appeng.client.render.SpatialSkyRender;
-import appeng.spatial.SpatialDimensionManager;
 import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.Minecraft;
+
-import net.minecraft.client.renderer.WorldRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.WorldRenderer;
+
+import appeng.client.render.SpatialSkyRender;
+import appeng.spatial.SpatialDimensionManager;
+
 @Mixin(value = WorldRenderer.class)
 public class SkyRenderMixin {
 

src/main/java/appeng/mixins/StructureAccessor.java

@@ -1,9 +1,10 @@
 package appeng.mixins;
 
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.Structure;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(Structure.class)
 public interface StructureAccessor {

src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java

@@ -1,9 +1,10 @@
 package appeng.mixins;
 
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
 import net.minecraft.world.chunk.listener.IChunkStatusListener;
 import net.minecraft.world.server.ChunkManager;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(ChunkManager.class)
 public interface ThreadedAnvilChunkStorageAccessor {

src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java

@@ -41,7 +41,6 @@ import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.chunk.IChunk;

src/main/java/appeng/server/subcommands/TestOreGenCommand.java

@@ -35,7 +35,6 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.chunk.IChunk;

src/main/java/appeng/services/CompassService.java

@@ -18,10 +18,15 @@
 
 package appeng.services;
 
-import appeng.api.util.DimensionalCoord;
+import java.util.WeakHashMap;
-import appeng.core.Api;
+import java.util.concurrent.ExecutorService;
-import appeng.services.compass.CompassReader;
+import java.util.concurrent.Executors;
-import appeng.services.compass.ICompassCallback;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Nonnull;
+
 import net.minecraft.block.Block;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
@@ -33,13 +38,10 @@ import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
-import javax.annotation.Nonnull;
+import appeng.api.util.DimensionalCoord;
-import java.util.WeakHashMap;
+import appeng.core.Api;
-import java.util.concurrent.ExecutorService;
+import appeng.services.compass.CompassReader;
-import java.util.concurrent.Executors;
+import appeng.services.compass.ICompassCallback;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
 
 public final class CompassService {
     private static final int CHUNK_SIZE = 16;

src/main/java/appeng/spatial/CachedPlane.java

@@ -32,11 +32,11 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.EmptyBlockReader;
 import net.minecraft.world.ITickList;
 import net.minecraft.world.NextTickListEntry;
-import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;
 import net.minecraft.world.server.ServerChunkProvider;
 import net.minecraft.world.server.ServerTickList;
+import net.minecraft.world.server.ServerWorld;
 
 import appeng.api.movable.IMovableHandler;
 import appeng.api.movable.IMovableRegistry;
@@ -45,7 +45,6 @@ import appeng.api.util.WorldCoord;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.worlddata.WorldData;
-import net.minecraft.world.server.ServerWorld;
 
 public class CachedPlane {
     private final int x_size;

src/main/java/appeng/spatial/SpatialDimensionManager.java

@@ -23,9 +23,7 @@ import java.util.Locale;
 
 import javax.annotation.Nullable;
 
-import appeng.hooks.DynamicDimensions;
 import net.minecraft.client.world.DimensionRenderInfo;
-import net.minecraft.network.PacketBuffer;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.RegistryKey;
 import net.minecraft.util.ResourceLocation;
@@ -42,6 +40,7 @@ import appeng.api.storage.ISpatialDimension;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
+import appeng.hooks.DynamicDimensions;
 
 public final class SpatialDimensionManager implements ISpatialDimension {
 

src/main/java/appeng/spatial/StorageChunkGenerator.java

@@ -18,8 +18,13 @@
 
 package appeng.spatial;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Optional;
+
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.Blockreader;
@@ -33,14 +38,10 @@ import net.minecraft.world.gen.ChunkGenerator;
 import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.Heightmap;
 import net.minecraft.world.gen.WorldGenRegion;
-
-import appeng.core.Api;
 import net.minecraft.world.gen.feature.structure.StructureManager;
 import net.minecraft.world.gen.settings.DimensionStructuresSettings;
 
-import java.util.Arrays;
+import appeng.core.Api;
-import java.util.Collections;
-import java.util.Optional;
 
 public class StorageChunkGenerator extends ChunkGenerator {
 

src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java

@@ -1,18 +1,12 @@
 package appeng.worldgen;
 
-import com.google.common.collect.ImmutableMap;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.Dynamic;
-import com.mojang.serialization.DynamicOps;
-
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
 import net.minecraft.world.gen.feature.IFeatureConfig;
 import net.minecraft.world.gen.feature.ReplaceBlockConfig;
 
-import appeng.core.AEConfig;
-
 /**
  * Extends a {@link ReplaceBlockConfig} with a chance.
  */

src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java

@@ -1,6 +1,9 @@
 package appeng.worldgen;
 
+import java.util.Random;
+
 import com.mojang.serialization.Codec;
+
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.ISeedReader;
@@ -10,8 +13,6 @@ import net.minecraft.world.gen.Heightmap;
 import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.structure.StructureManager;
 
-import java.util.Random;
-
 /**
  * Extends {@link net.minecraft.world.gen.feature.OreFeature} by also allowing
  * for a replacement chance. In addition, the feature will check every block in

src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java

@@ -1,7 +1,7 @@
 package appeng.worldgen.meteorite;
 
-import appeng.core.AppEng;
 import com.mojang.serialization.Codec;
+
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SharedSeedRandom;
 import net.minecraft.util.math.ChunkPos;
@@ -11,6 +11,8 @@ import net.minecraft.world.gen.ChunkGenerator;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
 import net.minecraft.world.gen.feature.structure.Structure;
 
+import appeng.core.AppEng;
+
 public class MeteoriteStructure extends Structure<NoFeatureConfig> {
 
     public static final ResourceLocation ID = AppEng.makeId("meteorite");

src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java

@@ -24,7 +24,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.MutableBoundingBox;
 import net.minecraft.world.ISeedReader;
-import net.minecraft.world.IWorld;
 import net.minecraft.world.gen.ChunkGenerator;
 import net.minecraft.world.gen.feature.structure.IStructurePieceType;
 import net.minecraft.world.gen.feature.structure.StructureManager;