From 71396637e3707e36cd6837535d8f8ab2ed7957d7 Mon Sep 17 00:00:00 2001 From: yueh Date: Sat, 17 Sep 2016 17:05:07 +0200 Subject: [PATCH] Organise imports --- src/api/java/appeng/api/definitions/IItemDefinition.java | 4 ++-- src/api/java/appeng/api/features/IInscriberRecipe.java | 3 +-- src/api/java/appeng/api/features/IRegistryContainer.java | 3 ++- .../java/appeng/api/storage/IExternalStorageHandler.java | 1 + .../java/appeng/api/storage/IExternalStorageRegistry.java | 1 + src/main/java/appeng/block/AEBaseBlock.java | 1 + src/main/java/appeng/block/AEBaseTileBlock.java | 1 + .../java/appeng/block/crafting/BlockCraftingUnit.java | 1 + src/main/java/appeng/block/misc/BlockCharger.java | 1 + src/main/java/appeng/block/misc/BlockTinyTNT.java | 1 + .../java/appeng/block/misc/BlockVibrationChamber.java | 1 + src/main/java/appeng/block/networking/BlockCableBus.java | 1 + src/main/java/appeng/block/networking/BlockWireless.java | 1 + src/main/java/appeng/block/storage/BlockSkyChest.java | 1 + .../appeng/bootstrap/components/ItemModelComponent.java | 1 + .../appeng/client/render/FacadeDispatcherBakedModel.java | 1 + .../appeng/client/render/FacadeWithBlockBakedModel.java | 1 + .../appeng/client/render/cablebus/CableBusBakedModel.java | 1 + .../java/appeng/client/render/cablebus/CubeBuilder.java | 1 + .../java/appeng/client/render/cablebus/QuadRotator.java | 1 + .../client/render/crafting/CraftingCubeBakedModel.java | 1 + .../appeng/client/render/model/AutoRotatingModel.java | 1 + .../java/appeng/client/render/model/DriveBakedModel.java | 1 + .../appeng/client/render/model/SkyCompassBakedModel.java | 1 + .../java/appeng/client/render/model/UVLModelLoader.java | 1 + .../client/render/spatial/SpatialPylonBakedModel.java | 1 + src/main/java/appeng/core/AppEng.java | 1 + src/main/java/appeng/core/PluginLoader.java | 1 - src/main/java/appeng/core/Registration.java | 1 + src/main/java/appeng/core/features/BlockDefinition.java | 1 + .../java/appeng/core/features/DamagedItemDefinition.java | 1 + src/main/java/appeng/core/features/ItemDefinition.java | 1 + src/main/java/appeng/core/features/TileDefinition.java | 1 + .../core/features/registries/entries/InscriberRecipe.java | 3 +-- .../java/appeng/core/worlddata/IWorldPlayerMapping.java | 3 +-- src/main/java/appeng/core/worlddata/PlayerData.java | 2 +- src/main/java/appeng/core/worlddata/PlayerMapping.java | 2 +- src/main/java/appeng/entity/EntityFloatingItem.java | 1 - src/main/java/appeng/helpers/MetaRotation.java | 1 - src/main/java/appeng/items/misc/ItemCrystalSeed.java | 1 + src/main/java/appeng/items/parts/ItemMultiPart.java | 1 + .../java/appeng/items/tools/powered/ToolMassCannon.java | 1 + src/main/java/appeng/parts/CableBusContainer.java | 1 + src/main/java/appeng/parts/PartPlacement.java | 1 - .../java/appeng/parts/automation/PlaneBakedModel.java | 1 + src/main/java/appeng/recipes/AEItemResolver.java | 2 +- src/main/java/appeng/recipes/RecipeHandler.java | 2 +- src/main/java/appeng/recipes/game/DisassembleRecipe.java | 1 + src/main/java/appeng/services/CompassService.java | 1 + src/main/java/appeng/util/ClassInstantiation.java | 1 - src/main/java/appeng/util/item/AEItemStack.java | 1 + .../java/appeng/services/version/VersionParserTest.java | 8 ++++---- .../java/appeng/util/SlimReadableNumberConverterTest.java | 4 ++-- src/test/java/appeng/util/UUIDMatcherTest.java | 4 ++-- .../java/appeng/util/WideReadableNumberConverterTest.java | 4 ++-- 55 files changed, 58 insertions(+), 28 deletions(-) diff --git a/src/api/java/appeng/api/definitions/IItemDefinition.java b/src/api/java/appeng/api/definitions/IItemDefinition.java index 1f95a04d..a0c6e5ed 100644 --- a/src/api/java/appeng/api/definitions/IItemDefinition.java +++ b/src/api/java/appeng/api/definitions/IItemDefinition.java @@ -24,10 +24,10 @@ package appeng.api.definitions; -import javax.annotation.Nonnull; - import java.util.Optional; +import javax.annotation.Nonnull; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IInscriberRecipe.java b/src/api/java/appeng/api/features/IInscriberRecipe.java index b997c3e1..810c6138 100644 --- a/src/api/java/appeng/api/features/IInscriberRecipe.java +++ b/src/api/java/appeng/api/features/IInscriberRecipe.java @@ -20,11 +20,10 @@ package appeng.api.features; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; -import java.util.Optional; - import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java index 2efbcb60..8831ad13 100644 --- a/src/api/java/appeng/api/features/IRegistryContainer.java +++ b/src/api/java/appeng/api/features/IRegistryContainer.java @@ -24,13 +24,14 @@ package appeng.api.features; +import net.minecraftforge.items.IItemHandler; + import appeng.api.AEInjectable; import appeng.api.movable.IMovableRegistry; import appeng.api.networking.IGridCacheRegistry; import appeng.api.parts.IPartModels; import appeng.api.storage.ICellRegistry; import appeng.api.storage.IExternalStorageRegistry; -import net.minecraftforge.items.IItemHandler; /** diff --git a/src/api/java/appeng/api/storage/IExternalStorageHandler.java b/src/api/java/appeng/api/storage/IExternalStorageHandler.java index bcd8a2b1..ba902820 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageHandler.java +++ b/src/api/java/appeng/api/storage/IExternalStorageHandler.java @@ -27,6 +27,7 @@ package appeng.api.storage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.items.IItemHandler; + import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java index 0c7d849b..65cbbb21 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java +++ b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java @@ -27,6 +27,7 @@ package appeng.api.storage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.items.IItemHandler; + import appeng.api.IAppEngApi; import appeng.api.networking.security.BaseActionSource; diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 823bd188..0effe882 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -21,6 +21,7 @@ package appeng.block; import java.util.ArrayList; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index eb5012a3..8ac351ff 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -21,6 +21,7 @@ package appeng.block; import java.util.ArrayList; import java.util.List; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index d9bfc70f..256aa26b 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -20,6 +20,7 @@ package appeng.block.crafting; import java.util.EnumSet; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index 88c84ecd..fcacb655 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -22,6 +22,7 @@ package appeng.block.misc; import java.util.Collections; import java.util.List; import java.util.Random; + import javax.annotation.Nullable; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index ac72db58..ba271f54 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -21,6 +21,7 @@ package appeng.block.misc; import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 4f0e4148..d27b2a37 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -20,6 +20,7 @@ package appeng.block.misc; import java.util.Random; + import javax.annotation.Nullable; import net.minecraft.block.material.Material; diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 1cf70b70..80509e81 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -22,6 +22,7 @@ package appeng.block.networking; import java.util.EnumSet; import java.util.List; import java.util.Random; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index 08d46643..4286ee18 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -21,6 +21,7 @@ package appeng.block.networking; import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index 245e2b14..7cb1dd1c 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -21,6 +21,7 @@ package appeng.block.storage; import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.material.Material; diff --git a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java b/src/main/java/appeng/bootstrap/components/ItemModelComponent.java index ea1eac54..207c342d 100644 --- a/src/main/java/appeng/bootstrap/components/ItemModelComponent.java +++ b/src/main/java/appeng/bootstrap/components/ItemModelComponent.java @@ -20,6 +20,7 @@ package appeng.bootstrap.components; import java.util.Map; + import javax.annotation.Nonnull; import net.minecraft.client.Minecraft; diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java index 8aa38415..a88e5c1f 100644 --- a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java @@ -21,6 +21,7 @@ package appeng.client.render; import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java index edcfef97..0cfcafb4 100644 --- a/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java @@ -20,6 +20,7 @@ package appeng.client.render; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java index a35b5f12..e436ae83 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java @@ -26,6 +26,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; + import javax.annotation.Nullable; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java index c05cb2ab..ac0c047a 100644 --- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.EnumMap; import java.util.EnumSet; import java.util.List; + import javax.vecmath.Vector4f; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/client/render/cablebus/QuadRotator.java b/src/main/java/appeng/client/render/cablebus/QuadRotator.java index 0df44800..fe75823c 100644 --- a/src/main/java/appeng/client/render/cablebus/QuadRotator.java +++ b/src/main/java/appeng/client/render/cablebus/QuadRotator.java @@ -21,6 +21,7 @@ package appeng.client.render.cablebus; import java.util.ArrayList; import java.util.List; + import javax.vecmath.Matrix4f; import javax.vecmath.Point3f; import javax.vecmath.Vector3f; diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java index cb2b44ae..0e56a3d0 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.EnumSet; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/appeng/client/render/model/AutoRotatingModel.java b/src/main/java/appeng/client/render/model/AutoRotatingModel.java index 5994ed64..6f604995 100644 --- a/src/main/java/appeng/client/render/model/AutoRotatingModel.java +++ b/src/main/java/appeng/client/render/model/AutoRotatingModel.java @@ -21,6 +21,7 @@ package appeng.client.render.model; import java.util.ArrayList; import java.util.List; + import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java index 8088dd20..24c9d21c 100644 --- a/src/main/java/appeng/client/render/model/DriveBakedModel.java +++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java @@ -21,6 +21,7 @@ package appeng.client.render.model; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.annotation.Nullable; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java index a9c67bb7..103bb05e 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java @@ -22,6 +22,7 @@ package appeng.client.render.model; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; import javax.vecmath.AxisAngle4f; import javax.vecmath.Matrix4f; diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index 69b8fbf4..450d8bba 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -32,6 +32,7 @@ import java.lang.reflect.Type; import java.util.Collection; import java.util.HashMap; import java.util.Map; + import javax.annotation.Nullable; import com.google.common.base.Charsets; diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index b04c79fa..411d99f3 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -21,6 +21,7 @@ package appeng.client.render.spatial; import java.util.List; import java.util.Map; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 71e5e365..14b806a0 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -22,6 +22,7 @@ package appeng.core; import java.io.File; import java.util.List; import java.util.concurrent.TimeUnit; + import javax.annotation.Nonnull; import com.google.common.base.Stopwatch; diff --git a/src/main/java/appeng/core/PluginLoader.java b/src/main/java/appeng/core/PluginLoader.java index 6ff8223c..916adb71 100644 --- a/src/main/java/appeng/core/PluginLoader.java +++ b/src/main/java/appeng/core/PluginLoader.java @@ -32,7 +32,6 @@ import net.minecraftforge.fml.common.discovery.ASMDataTable; import appeng.api.AEInjectable; import appeng.api.AEPlugin; -import appeng.api.exceptions.AppEngException; /** diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 483ef682..99903305 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -22,6 +22,7 @@ package appeng.core; import java.io.File; import java.util.HashSet; import java.util.Set; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index 7f09fcf4..993deac5 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -20,6 +20,7 @@ package appeng.core.features; import java.util.Optional; + import com.google.common.base.Preconditions; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java index 9764b8b0..07c07b22 100644 --- a/src/main/java/appeng/core/features/DamagedItemDefinition.java +++ b/src/main/java/appeng/core/features/DamagedItemDefinition.java @@ -20,6 +20,7 @@ package appeng.core.features; import java.util.Optional; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/core/features/ItemDefinition.java b/src/main/java/appeng/core/features/ItemDefinition.java index 21805aa5..98285a05 100644 --- a/src/main/java/appeng/core/features/ItemDefinition.java +++ b/src/main/java/appeng/core/features/ItemDefinition.java @@ -20,6 +20,7 @@ package appeng.core.features; import java.util.Optional; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/core/features/TileDefinition.java b/src/main/java/appeng/core/features/TileDefinition.java index b2bea57c..50d80370 100644 --- a/src/main/java/appeng/core/features/TileDefinition.java +++ b/src/main/java/appeng/core/features/TileDefinition.java @@ -20,6 +20,7 @@ package appeng.core.features; import java.util.Optional; + import javax.annotation.Nonnull; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java index a4ffe695..b5202b10 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java @@ -22,12 +22,11 @@ package appeng.core.features.registries.entries; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.Optional; - import net.minecraft.item.ItemStack; import appeng.api.features.IInscriberRecipe; diff --git a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java index 30c12c59..eca35002 100644 --- a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java +++ b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java @@ -19,12 +19,11 @@ package appeng.core.worlddata; +import java.util.Optional; import java.util.UUID; import javax.annotation.Nonnull; -import java.util.Optional; - /** * @author thatsIch diff --git a/src/main/java/appeng/core/worlddata/PlayerData.java b/src/main/java/appeng/core/worlddata/PlayerData.java index 28073f0e..cb495ede 100644 --- a/src/main/java/appeng/core/worlddata/PlayerData.java +++ b/src/main/java/appeng/core/worlddata/PlayerData.java @@ -19,12 +19,12 @@ package appeng.core.worlddata; +import java.util.Optional; import java.util.UUID; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.Optional; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/appeng/core/worlddata/PlayerMapping.java b/src/main/java/appeng/core/worlddata/PlayerMapping.java index ce3a117c..f8ff3ccb 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMapping.java +++ b/src/main/java/appeng/core/worlddata/PlayerMapping.java @@ -20,11 +20,11 @@ package appeng.core.worlddata; import java.util.Map; +import java.util.Optional; import java.util.UUID; import javax.annotation.Nonnull; -import java.util.Optional; import com.google.common.base.Preconditions; import net.minecraftforge.common.config.ConfigCategory; diff --git a/src/main/java/appeng/entity/EntityFloatingItem.java b/src/main/java/appeng/entity/EntityFloatingItem.java index 37074795..70be7c6a 100644 --- a/src/main/java/appeng/entity/EntityFloatingItem.java +++ b/src/main/java/appeng/entity/EntityFloatingItem.java @@ -19,7 +19,6 @@ package appeng.entity; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java index 192b2e87..2ab301d0 100644 --- a/src/main/java/appeng/helpers/MetaRotation.java +++ b/src/main/java/appeng/helpers/MetaRotation.java @@ -28,7 +28,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import appeng.api.util.IOrientable; -import appeng.block.AEBaseBlock; import appeng.decorative.solid.BlockQuartzPillar; diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 0b052aae..f3710377 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -21,6 +21,7 @@ package appeng.items.misc; import java.util.List; import java.util.Optional; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index 110df58f..7bdac927 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index 2890a22c..ff70452b 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -20,6 +20,7 @@ package appeng.items.tools.powered; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 146cd99b..c905158c 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -25,6 +25,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Random; import java.util.Set; + import javax.annotation.Nullable; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 4660da5e..b0c01297 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -21,7 +21,6 @@ package appeng.parts; import java.util.LinkedList; import java.util.List; - import java.util.Optional; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index 80b9a818..1c399ce0 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -22,6 +22,7 @@ package appeng.parts.automation; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index d94514cf..c8f13495 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -31,8 +31,8 @@ import appeng.api.recipes.ResolverResultSet; import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; import appeng.core.AppEng; -import appeng.items.materials.MaterialType; import appeng.items.materials.ItemMultiItem; +import appeng.items.materials.MaterialType; import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.items.parts.PartType; diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 6f8de945..4417924f 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -29,12 +29,12 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import javax.annotation.Nonnull; -import java.util.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index a5a56016..4cb718f5 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -22,6 +22,7 @@ package appeng.recipes.game; import java.util.HashMap; import java.util.Map; import java.util.Optional; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 59675a37..6ebfa7a7 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -28,6 +28,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/util/ClassInstantiation.java b/src/main/java/appeng/util/ClassInstantiation.java index d1bb4ca0..0c5499a3 100644 --- a/src/main/java/appeng/util/ClassInstantiation.java +++ b/src/main/java/appeng/util/ClassInstantiation.java @@ -21,7 +21,6 @@ package appeng.util; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; - import java.util.Optional; import appeng.core.AELog; diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index c58b440e..04184180 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -26,6 +26,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.security.InvalidParameterException; import java.util.List; + import javax.annotation.Nullable; import io.netty.buffer.ByteBuf; diff --git a/src/test/java/appeng/services/version/VersionParserTest.java b/src/test/java/appeng/services/version/VersionParserTest.java index 59e9138e..ad94601f 100644 --- a/src/test/java/appeng/services/version/VersionParserTest.java +++ b/src/test/java/appeng/services/version/VersionParserTest.java @@ -2,6 +2,10 @@ package appeng.services.version; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import appeng.services.version.exceptions.InvalidBuildException; @@ -11,10 +15,6 @@ import appeng.services.version.exceptions.InvalidVersionException; import appeng.services.version.exceptions.MissingSeparatorException; import appeng.services.version.exceptions.VersionCheckerException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * Tests for {@link VersionParser} diff --git a/src/test/java/appeng/util/SlimReadableNumberConverterTest.java b/src/test/java/appeng/util/SlimReadableNumberConverterTest.java index 64345235..9ea07214 100644 --- a/src/test/java/appeng/util/SlimReadableNumberConverterTest.java +++ b/src/test/java/appeng/util/SlimReadableNumberConverterTest.java @@ -2,10 +2,10 @@ package appeng.util; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import org.junit.Test; + /** * Test for {@link ISlimReadableNumberConverter} diff --git a/src/test/java/appeng/util/UUIDMatcherTest.java b/src/test/java/appeng/util/UUIDMatcherTest.java index 54e52c18..69e3c6d1 100644 --- a/src/test/java/appeng/util/UUIDMatcherTest.java +++ b/src/test/java/appeng/util/UUIDMatcherTest.java @@ -19,11 +19,11 @@ package appeng.util; -import org.junit.Test; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Test; + /** * Tests for {@link UUIDMatcher} diff --git a/src/test/java/appeng/util/WideReadableNumberConverterTest.java b/src/test/java/appeng/util/WideReadableNumberConverterTest.java index 42110b3a..b8b709a5 100644 --- a/src/test/java/appeng/util/WideReadableNumberConverterTest.java +++ b/src/test/java/appeng/util/WideReadableNumberConverterTest.java @@ -2,10 +2,10 @@ package appeng.util; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import org.junit.Test; + /** * Test for {@link IWideReadableNumberConverter}