From 2a5d26b3493d772d05c278c53c38b6241f2bb8c4 Mon Sep 17 00:00:00 2001 From: yueh Date: Thu, 6 Aug 2015 18:31:46 +0200 Subject: [PATCH] Organize imports --- src/main/java/appeng/block/qnb/BlockQuantumRing.java | 1 + .../appeng/client/gui/implementations/GuiMEMonitorable.java | 1 - .../appeng/client/render/blocks/RenderBlockController.java | 1 + src/main/java/appeng/core/AppEng.java | 1 + .../java/appeng/core/features/AEBlockFeatureHandler.java | 1 - src/main/java/appeng/core/sync/GuiBridge.java | 1 - src/main/java/appeng/core/worlddata/CompassData.java | 1 + src/main/java/appeng/core/worlddata/DimensionData.java | 1 + .../java/appeng/core/worlddata/IWorldPlayerMapping.java | 1 + src/main/java/appeng/core/worlddata/PlayerData.java | 1 + src/main/java/appeng/core/worlddata/PlayerMapping.java | 1 + src/main/java/appeng/core/worlddata/SpawnData.java | 1 + src/main/java/appeng/core/worlddata/StorageData.java | 1 + src/main/java/appeng/core/worlddata/WorldData.java | 1 + src/main/java/appeng/decorative/solid/QuartzOreBlock.java | 2 ++ src/main/java/appeng/facade/FacadePart.java | 1 + src/main/java/appeng/integration/IntegrationRegistry.java | 1 + src/main/java/appeng/integration/modules/CraftGuide.java | 1 + .../modules/waila/part/PartStackWailaDataProvider.java | 6 ++++-- src/main/java/appeng/services/CompassService.java | 1 + src/main/java/appeng/services/compass/CompassReader.java | 1 + src/main/java/appeng/services/compass/CompassRegion.java | 1 + .../java/appeng/services/compass/CompassThreadFactory.java | 1 + src/main/java/appeng/util/item/AEFluidStack.java | 1 + 24 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/appeng/block/qnb/BlockQuantumRing.java b/src/main/java/appeng/block/qnb/BlockQuantumRing.java index 66996ca9..459aab94 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumRing.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumRing.java @@ -27,6 +27,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.world.World; + import appeng.tile.qnb.TileQuantumBridge; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index fc52a04e..3a84c0a6 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -63,7 +63,6 @@ import appeng.helpers.WirelessTerminalGuiObject; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.parts.reporting.AbstractPartTerminal; -import appeng.parts.reporting.PartTerminal; import appeng.tile.misc.TileSecurity; import appeng.util.IConfigManagerHost; import appeng.util.Platform; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockController.java b/src/main/java/appeng/client/render/blocks/RenderBlockController.java index bdf05a43..436e352a 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockController.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockController.java @@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; + import appeng.block.networking.BlockController; import appeng.block.networking.BlockController.ControllerBlockState; import appeng.client.render.BaseBlockRender; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 4cfdccd6..9dab97f0 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -21,6 +21,7 @@ package appeng.core; import java.io.File; import java.util.concurrent.TimeUnit; + import javax.annotation.Nonnull; import com.google.common.base.Stopwatch; diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index bebf4ea3..aba5772a 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -29,7 +29,6 @@ import net.minecraftforge.fml.relauncher.Side; import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseBlock; -import appeng.core.CommonHelper; import appeng.core.CreativeTab; diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 0a407f64..92773b1c 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -98,7 +98,6 @@ import appeng.parts.automation.PartLevelEmitter; import appeng.parts.misc.PartStorageBus; import appeng.parts.reporting.PartCraftingTerminal; import appeng.parts.reporting.PartInterfaceTerminal; -import appeng.parts.reporting.PartPanel; import appeng.parts.reporting.PartPatternTerminal; import appeng.tile.crafting.TileCraftingTile; import appeng.tile.crafting.TileMolecularAssembler; diff --git a/src/main/java/appeng/core/worlddata/CompassData.java b/src/main/java/appeng/core/worlddata/CompassData.java index 169921dd..33a54225 100644 --- a/src/main/java/appeng/core/worlddata/CompassData.java +++ b/src/main/java/appeng/core/worlddata/CompassData.java @@ -20,6 +20,7 @@ package appeng.core.worlddata; import java.io.File; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/core/worlddata/DimensionData.java b/src/main/java/appeng/core/worlddata/DimensionData.java index 505db7f6..27cc3edc 100644 --- a/src/main/java/appeng/core/worlddata/DimensionData.java +++ b/src/main/java/appeng/core/worlddata/DimensionData.java @@ -21,6 +21,7 @@ package appeng.core.worlddata; import java.io.File; import java.util.List; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java index 73c70583..53b35cd9 100644 --- a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java +++ b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java @@ -20,6 +20,7 @@ package appeng.core.worlddata; import java.util.UUID; + import javax.annotation.Nonnull; import com.google.common.base.Optional; diff --git a/src/main/java/appeng/core/worlddata/PlayerData.java b/src/main/java/appeng/core/worlddata/PlayerData.java index b9df392f..41f2e5d1 100644 --- a/src/main/java/appeng/core/worlddata/PlayerData.java +++ b/src/main/java/appeng/core/worlddata/PlayerData.java @@ -21,6 +21,7 @@ package appeng.core.worlddata; import java.io.File; import java.util.UUID; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/core/worlddata/PlayerMapping.java b/src/main/java/appeng/core/worlddata/PlayerMapping.java index ae67aee8..98189112 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMapping.java +++ b/src/main/java/appeng/core/worlddata/PlayerMapping.java @@ -21,6 +21,7 @@ package appeng.core.worlddata; import java.util.Map; import java.util.UUID; + import javax.annotation.Nonnull; import com.google.common.base.Optional; diff --git a/src/main/java/appeng/core/worlddata/SpawnData.java b/src/main/java/appeng/core/worlddata/SpawnData.java index 768f7105..35f01790 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -25,6 +25,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.Collection; import java.util.LinkedList; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java index 8c0cbdfe..34dfffb8 100644 --- a/src/main/java/appeng/core/worlddata/StorageData.java +++ b/src/main/java/appeng/core/worlddata/StorageData.java @@ -23,6 +23,7 @@ import java.io.File; import java.lang.ref.WeakReference; import java.util.Map; import java.util.WeakHashMap; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index 6348b320..40ece0af 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -22,6 +22,7 @@ package appeng.core.worlddata; import java.io.File; import java.util.List; import java.util.concurrent.ThreadFactory; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java index b398214a..4164ad35 100644 --- a/src/main/java/appeng/decorative/solid/QuartzOreBlock.java +++ b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java @@ -22,6 +22,8 @@ package appeng.decorative.solid; import java.util.EnumSet; import java.util.Random; +import javax.annotation.Nullable; + import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 67a7f119..4f1a3910 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -20,6 +20,7 @@ package appeng.facade; import java.util.EnumSet; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/integration/IntegrationRegistry.java b/src/main/java/appeng/integration/IntegrationRegistry.java index 4a0f3ac6..e07ed8e3 100644 --- a/src/main/java/appeng/integration/IntegrationRegistry.java +++ b/src/main/java/appeng/integration/IntegrationRegistry.java @@ -21,6 +21,7 @@ package appeng.integration; import java.util.Collection; import java.util.LinkedList; + import javax.annotation.Nonnull; import net.minecraftforge.fml.relauncher.FMLLaunchHandler; diff --git a/src/main/java/appeng/integration/modules/CraftGuide.java b/src/main/java/appeng/integration/modules/CraftGuide.java index 78519ba4..eafc2e10 100644 --- a/src/main/java/appeng/integration/modules/CraftGuide.java +++ b/src/main/java/appeng/integration/modules/CraftGuide.java @@ -21,6 +21,7 @@ package appeng.integration.modules; import java.util.Arrays; import java.util.List; + import javax.annotation.Nullable; import com.google.common.base.Optional; diff --git a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java index 05b123d1..02755910 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java @@ -18,10 +18,12 @@ package appeng.integration.modules.waila.part; +import net.minecraft.item.ItemStack; + +import mcp.mobius.waila.api.IWailaConfigHandler; + import appeng.api.parts.IPart; import appeng.api.parts.PartItemStack; -import mcp.mobius.waila.api.IWailaConfigHandler; -import net.minecraft.item.ItemStack; /** * Part ItemStack provider for WAILA diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 6a459f5c..825818c1 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -27,6 +27,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/services/compass/CompassReader.java b/src/main/java/appeng/services/compass/CompassReader.java index 7cc42b02..70b01c65 100644 --- a/src/main/java/appeng/services/compass/CompassReader.java +++ b/src/main/java/appeng/services/compass/CompassReader.java @@ -22,6 +22,7 @@ package appeng.services.compass; import java.io.File; import java.util.HashMap; import java.util.Map; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/services/compass/CompassRegion.java b/src/main/java/appeng/services/compass/CompassRegion.java index 27f86860..be51e99f 100644 --- a/src/main/java/appeng/services/compass/CompassRegion.java +++ b/src/main/java/appeng/services/compass/CompassRegion.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/services/compass/CompassThreadFactory.java b/src/main/java/appeng/services/compass/CompassThreadFactory.java index aca42c93..0c9ac26e 100644 --- a/src/main/java/appeng/services/compass/CompassThreadFactory.java +++ b/src/main/java/appeng/services/compass/CompassThreadFactory.java @@ -20,6 +20,7 @@ package appeng.services.compass; import java.util.concurrent.ThreadFactory; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java index 6566f3f8..b7c2eb8a 100644 --- a/src/main/java/appeng/util/item/AEFluidStack.java +++ b/src/main/java/appeng/util/item/AEFluidStack.java @@ -24,6 +24,7 @@ import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; + import javax.annotation.Nonnull; import io.netty.buffer.ByteBuf;