diff --git a/src/main/java/appeng/block/AEBaseSlabBlock.java b/src/main/java/appeng/block/AEBaseSlabBlock.java index 6da93f6e..5eec676d 100644 --- a/src/main/java/appeng/block/AEBaseSlabBlock.java +++ b/src/main/java/appeng/block/AEBaseSlabBlock.java @@ -22,15 +22,14 @@ package appeng.block; import java.util.EnumSet; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; + import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index cd787fff..f4a431ba 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -26,7 +26,6 @@ import net.minecraft.block.material.Material; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; -import appeng.client.render.BaseBlockRender; import appeng.client.render.blocks.RenderQNB; import appeng.core.features.AEFeature; import appeng.helpers.ICustomCollision; diff --git a/src/main/java/appeng/block/qnb/BlockQuantumRing.java b/src/main/java/appeng/block/qnb/BlockQuantumRing.java index 412ceeff..a85a7caa 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumRing.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumRing.java @@ -20,7 +20,6 @@ package appeng.block.qnb; import java.util.Collections; -import java.util.EnumSet; import java.util.List; import net.minecraft.block.material.Material; @@ -28,7 +27,6 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import appeng.core.features.AEFeature; import appeng.tile.qnb.TileQuantumBridge; diff --git a/src/main/java/appeng/block/solids/OreQuartz.java b/src/main/java/appeng/block/solids/OreQuartz.java index cc03e34d..0b2405fd 100644 --- a/src/main/java/appeng/block/solids/OreQuartz.java +++ b/src/main/java/appeng/block/solids/OreQuartz.java @@ -21,6 +21,7 @@ package appeng.block.solids; import java.util.EnumSet; import java.util.Random; + import javax.annotation.Nullable; import net.minecraft.block.material.Material; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 17d2a3e9..a747d738 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/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index 3029f328..9ecf4485 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -20,6 +20,7 @@ package appeng.client.render; import java.util.EnumSet; + import javax.annotation.Nullable; import com.google.common.base.Function; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockController.java b/src/main/java/appeng/client/render/blocks/RenderBlockController.java index 5a3026a5..befb79e0 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockController.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockController.java @@ -24,7 +24,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import appeng.block.AEBaseBlock; import appeng.block.networking.BlockController; import appeng.client.render.BaseBlockRender; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java b/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java index b3c59a9e..67af60ec 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java @@ -29,7 +29,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer.ItemRenderType; import net.minecraftforge.common.util.ForgeDirection; -import appeng.block.AEBaseTileBlock; import appeng.block.misc.BlockPaint; import appeng.client.render.BaseBlockRender; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index b9009861..b14cc3a0 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/RecipeLoader.java b/src/main/java/appeng/core/RecipeLoader.java index 231b7fa6..1affaf6a 100644 --- a/src/main/java/appeng/core/RecipeLoader.java +++ b/src/main/java/appeng/core/RecipeLoader.java @@ -22,6 +22,7 @@ package appeng.core; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index a2de3287..711c5c6d 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -27,9 +27,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseBlock; -import appeng.core.CommonHelper; import appeng.core.CreativeTab; -import appeng.util.Platform; public final class AEBlockFeatureHandler implements IFeatureHandler diff --git a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java index e394e7d7..6cb8f56e 100644 --- a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java @@ -21,17 +21,15 @@ package appeng.core.features; import java.util.EnumSet; -import net.minecraft.block.Block; -import net.minecraft.block.BlockSlab; +import com.google.common.base.Optional; + +import cpw.mods.fml.common.registry.GameRegistry; + import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseItemBlockSlab; import appeng.block.AEBaseSlabBlock; import appeng.core.CreativeTab; -import com.google.common.base.Optional; - -import cpw.mods.fml.common.registry.GameRegistry; - public class SlabBlockFeatureHandler implements IFeatureHandler { diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 8495c3f6..d639bde1 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -21,6 +21,7 @@ package appeng.core.features.registries; import java.util.HashMap; import java.util.Map; + import javax.annotation.Nullable; import net.minecraft.init.Blocks; diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index f4048efb..26ebfdeb 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -101,7 +101,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 58d173a3..cf238760 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 8b3ebffb..102786b2 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 8756718d..ed9af693 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/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 0aee2cab..21434436 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 org.lwjgl.opengl.GL11; diff --git a/src/main/java/appeng/integration/IntegrationRegistry.java b/src/main/java/appeng/integration/IntegrationRegistry.java index a6da963e..d5e0aa46 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 cpw.mods.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/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 285c69ef..c6ae884e 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.EnumSet; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.block.Block; diff --git a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java index bf63480c..5f002e7b 100644 --- a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java +++ b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java @@ -20,6 +20,7 @@ package appeng.parts.p2p; import java.util.concurrent.Callable; + import javax.annotation.Nullable; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 3d5b4dd0..4d8ae0ca 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + import javax.annotation.Nonnull; import com.google.common.base.Optional; diff --git a/src/main/java/appeng/recipes/loader/ConfigLoader.java b/src/main/java/appeng/recipes/loader/ConfigLoader.java index ecb83fce..dfab12a9 100644 --- a/src/main/java/appeng/recipes/loader/ConfigLoader.java +++ b/src/main/java/appeng/recipes/loader/ConfigLoader.java @@ -23,6 +23,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/recipes/loader/JarLoader.java b/src/main/java/appeng/recipes/loader/JarLoader.java index 00957799..436ed468 100644 --- a/src/main/java/appeng/recipes/loader/JarLoader.java +++ b/src/main/java/appeng/recipes/loader/JarLoader.java @@ -21,6 +21,7 @@ package appeng.recipes.loader; import java.io.BufferedReader; import java.io.InputStreamReader; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java index 00686f85..ffdbea6c 100644 --- a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java +++ b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java @@ -31,6 +31,7 @@ import java.util.HashSet; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.regex.Pattern; + import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 8212b0bc..255049ee 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/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java index 79d6d42d..3a708168 100644 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ b/src/main/java/appeng/tile/powersink/RotaryCraft.java @@ -19,7 +19,8 @@ package appeng.tile.powersink; -import appeng.transformer.annotations.Integration; +import java.util.ArrayList; + import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -32,9 +33,6 @@ import appeng.tile.events.TileEventType; import appeng.transformer.annotations.Integration.Interface; import appeng.transformer.annotations.Integration.InterfaceList; import appeng.transformer.annotations.Integration.Method; -import appeng.util.Platform; - -import java.util.ArrayList; @InterfaceList( value = { @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver" ), @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Interfaces.Transducerable") } ) public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerReceiver, Transducerable diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 17db0917..44f7cbb7 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.Random; import java.util.Set; import java.util.WeakHashMap; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java index f5655eb5..0093d342 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;