From b6b76d145b51139b45dbfe0702d5e05d3e34701e Mon Sep 17 00:00:00 2001 From: yueh Date: Sat, 9 May 2015 13:06:09 +0200 Subject: [PATCH] Organize imports --- src/main/java/appeng/block/AEBaseBlock.java | 7 ++++--- src/main/java/appeng/block/AEBaseStairBlock.java | 4 ++-- src/main/java/appeng/block/solids/OreQuartz.java | 1 + src/main/java/appeng/block/solids/OreQuartzCharged.java | 1 + src/main/java/appeng/client/ClientHelper.java | 6 +++--- .../client/gui/implementations/GuiInterfaceTerminal.java | 4 ++-- src/main/java/appeng/client/render/BaseBlockRender.java | 1 + src/main/java/appeng/client/render/BusRenderHelper.java | 1 + .../client/render/items/ToolBiometricCardRender.java | 4 ++-- .../implementations/ContainerCraftingStatus.java | 4 ++-- src/main/java/appeng/core/AppEng.java | 4 ++-- src/main/java/appeng/core/CreativeTabFacade.java | 4 ++-- src/main/java/appeng/core/PlayerMappings.java | 4 ++-- src/main/java/appeng/core/WorldSettings.java | 6 +++--- .../java/appeng/core/features/AEBlockFeatureHandler.java | 4 ++-- src/main/java/appeng/core/features/BlockDefinition.java | 8 ++++---- .../java/appeng/core/features/DamagedItemDefinition.java | 6 +++--- src/main/java/appeng/core/features/ItemDefinition.java | 6 +++--- .../java/appeng/core/features/ItemFeatureHandler.java | 4 ++-- .../appeng/core/features/StairBlockFeatureHandler.java | 4 ++-- src/main/java/appeng/core/features/TileDefinition.java | 4 ++-- .../appeng/core/features/WrappedDamageItemDefinition.java | 8 ++++---- .../core/features/registries/InscriberRegistry.java | 1 + .../appeng/core/features/registries/PlayerRegistry.java | 4 ++-- .../registries/entries/InscriberInscribeRecipe.java | 1 + .../core/features/registries/entries/InscriberRecipe.java | 5 +++-- src/main/java/appeng/core/sync/GuiBridge.java | 8 ++++---- .../appeng/core/sync/packets/PacketMEInventoryUpdate.java | 1 + src/main/java/appeng/crafting/CraftingJob.java | 4 ++-- src/main/java/appeng/crafting/CraftingWatcher.java | 1 + src/main/java/appeng/helpers/MultiCraftingTracker.java | 4 ++-- src/main/java/appeng/hooks/AETrading.java | 4 ++-- src/main/java/appeng/hooks/TickHandler.java | 8 ++++---- src/main/java/appeng/integration/modules/FMP.java | 3 ++- .../integration/modules/waila/PartWailaDataProvider.java | 5 +++-- .../integration/modules/waila/TileWailaDataProvider.java | 3 ++- .../integration/modules/waila/part/PartAccessor.java | 4 ++-- src/main/java/appeng/items/AEBaseItem.java | 4 ++-- src/main/java/appeng/items/misc/ItemCrystalSeed.java | 1 + src/main/java/appeng/items/parts/ItemMultiPart.java | 5 +++-- .../java/appeng/items/storage/ItemBasicStorageCell.java | 4 ++-- .../java/appeng/items/storage/ItemSpatialStorageCell.java | 4 ++-- src/main/java/appeng/items/tools/ToolBiometricCard.java | 4 ++-- src/main/java/appeng/items/tools/ToolNetworkTool.java | 3 ++- .../java/appeng/items/tools/powered/ToolChargedStaff.java | 4 ++-- .../appeng/items/tools/powered/ToolColorApplicator.java | 4 ++-- .../items/tools/powered/ToolEntropyManipulator.java | 4 ++-- .../java/appeng/items/tools/powered/ToolPortableCell.java | 4 ++-- .../appeng/items/tools/powered/ToolWirelessTerminal.java | 4 ++-- .../items/tools/powered/powersink/AERootPoweredItem.java | 4 ++-- .../java/appeng/items/tools/powered/powersink/IC2.java | 3 ++- .../items/tools/powered/powersink/RedstoneFlux.java | 3 ++- .../appeng/items/tools/quartz/ToolQuartzCuttingKnife.java | 4 ++-- .../java/appeng/items/tools/quartz/ToolQuartzHoe.java | 4 ++-- .../java/appeng/items/tools/quartz/ToolQuartzWrench.java | 3 ++- src/main/java/appeng/me/cache/CraftingGridCache.java | 4 ++-- src/main/java/appeng/parts/PartPlacement.java | 4 ++-- .../appeng/parts/automation/PartAnnihilationPlane.java | 4 ++-- src/main/java/appeng/recipes/RecipeHandler.java | 1 + src/main/java/appeng/recipes/game/DisassembleRecipe.java | 5 +++-- src/main/java/appeng/recipes/game/FacadeRecipe.java | 4 ++-- .../java/appeng/recipes/handlers/InscriberProcess.java | 1 + src/main/java/appeng/server/AECommand.java | 4 ++-- src/main/java/appeng/server/subcommands/Supporters.java | 4 ++-- src/main/java/appeng/services/CompassService.java | 1 + .../appeng/services/version/github/ReleaseFetcher.java | 4 ++-- src/main/java/appeng/tile/AEBaseTile.java | 1 + src/main/java/appeng/tile/misc/TileInscriber.java | 1 + src/main/java/appeng/tile/misc/TilePaint.java | 4 ++-- src/main/java/appeng/tile/qnb/TileQuantumBridge.java | 4 ++-- src/main/java/appeng/transformer/AppEngCore.java | 1 + src/main/java/appeng/transformer/asm/ASMIntegration.java | 1 + src/main/java/appeng/transformer/asm/ASMTweaker.java | 7 ++++--- src/main/java/appeng/util/Platform.java | 1 + .../java/appeng/util/inv/WrapperChainedInventory.java | 4 ++-- src/main/java/appeng/util/item/AEFluidStack.java | 1 + src/main/java/appeng/util/item/AEItemStack.java | 1 + src/main/java/appeng/util/item/ItemList.java | 4 ++-- 78 files changed, 157 insertions(+), 126 deletions(-) diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index af655ed3..8e72344f 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -22,8 +22,12 @@ package appeng.block; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; + import javax.annotation.Nullable; +import com.google.common.base.Optional; +import com.google.common.collect.Lists; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -53,9 +57,6 @@ import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import com.google.common.base.Optional; -import com.google.common.collect.Lists; - import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.implementations.tiles.IColorableTile; diff --git a/src/main/java/appeng/block/AEBaseStairBlock.java b/src/main/java/appeng/block/AEBaseStairBlock.java index 36b6de71..9d02c890 100644 --- a/src/main/java/appeng/block/AEBaseStairBlock.java +++ b/src/main/java/appeng/block/AEBaseStairBlock.java @@ -21,11 +21,11 @@ package appeng.block; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; -import com.google.common.base.Optional; - import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; diff --git a/src/main/java/appeng/block/solids/OreQuartz.java b/src/main/java/appeng/block/solids/OreQuartz.java index 5bf26609..861ddc48 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/block/solids/OreQuartzCharged.java b/src/main/java/appeng/block/solids/OreQuartzCharged.java index 4b06bc4d..6f357bc0 100644 --- a/src/main/java/appeng/block/solids/OreQuartzCharged.java +++ b/src/main/java/appeng/block/solids/OreQuartzCharged.java @@ -20,6 +20,7 @@ package appeng.block.solids; import java.util.Random; + import javax.annotation.Nullable; import net.minecraft.client.Minecraft; diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 1afa6651..a7f82e4d 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -19,6 +19,9 @@ package appeng.client; +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.ENTITY; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -84,9 +87,6 @@ import appeng.server.ServerHelper; import appeng.transformer.MissingCoreMod; import appeng.util.Platform; -import static net.minecraftforge.client.IItemRenderer.ItemRenderType.ENTITY; -import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; - public class ClientHelper extends ServerHelper { diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index e50c6ca1..9ebe406c 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -28,6 +28,8 @@ import java.util.Map; import java.util.Set; import java.util.WeakHashMap; +import com.google.common.collect.HashMultimap; + import org.lwjgl.opengl.GL11; import net.minecraft.entity.player.InventoryPlayer; @@ -35,8 +37,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import com.google.common.collect.HashMultimap; - import appeng.api.AEApi; import appeng.client.gui.AEBaseGui; import appeng.client.gui.widgets.GuiScrollbar; diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 67ad1b11..e172f7b3 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -21,6 +21,7 @@ package appeng.client.render; import java.nio.FloatBuffer; import java.util.EnumSet; + import javax.annotation.Nullable; import org.lwjgl.BufferUtils; diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index c598af3b..98036f56 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/items/ToolBiometricCardRender.java b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java index 5c2cedaf..d2203ae8 100644 --- a/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java +++ b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java @@ -19,6 +19,8 @@ package appeng.client.render.items; +import com.mojang.authlib.GameProfile; + import org.lwjgl.opengl.GL11; import net.minecraft.client.renderer.ItemRenderer; @@ -27,8 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; -import com.mojang.authlib.GameProfile; - import appeng.api.implementations.items.IBiometricCard; import appeng.api.util.AEColor; import appeng.client.texture.ExtraItemTextures; diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java index c000e53f..4f382ee7 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingStatus.java @@ -22,10 +22,10 @@ package appeng.container.implementations; import java.util.ArrayList; import java.util.Collections; -import net.minecraft.entity.player.InventoryPlayer; - import com.google.common.collect.ImmutableSet; +import net.minecraft.entity.player.InventoryPlayer; + import appeng.api.networking.crafting.ICraftingCPU; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.storage.ITerminalHost; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 903096f1..57c56a59 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -22,6 +22,8 @@ package appeng.core; import java.io.File; import java.util.concurrent.TimeUnit; +import com.google.common.base.Stopwatch; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -35,8 +37,6 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.network.NetworkRegistry; -import com.google.common.base.Stopwatch; - import appeng.core.crash.CrashInfo; import appeng.core.crash.IntegrationCrashEnhancement; import appeng.core.crash.ModCrashEnhancement; diff --git a/src/main/java/appeng/core/CreativeTabFacade.java b/src/main/java/appeng/core/CreativeTabFacade.java index 8546e16c..9ecb28b5 100644 --- a/src/main/java/appeng/core/CreativeTabFacade.java +++ b/src/main/java/appeng/core/CreativeTabFacade.java @@ -19,13 +19,13 @@ package appeng.core; +import com.google.common.base.Optional; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.items.parts.ItemFacade; diff --git a/src/main/java/appeng/core/PlayerMappings.java b/src/main/java/appeng/core/PlayerMappings.java index b1f3c1e3..9dc96bd0 100644 --- a/src/main/java/appeng/core/PlayerMappings.java +++ b/src/main/java/appeng/core/PlayerMappings.java @@ -22,12 +22,12 @@ package appeng.core; import java.util.Map; import java.util.UUID; +import com.google.common.base.Optional; + import net.minecraftforge.common.config.ConfigCategory; import cpw.mods.fml.relauncher.FMLRelaunchLog; -import com.google.common.base.Optional; - /** * Wrapper class for the player mappings. diff --git a/src/main/java/appeng/core/WorldSettings.java b/src/main/java/appeng/core/WorldSettings.java index d2ebf3b4..71079de4 100644 --- a/src/main/java/appeng/core/WorldSettings.java +++ b/src/main/java/appeng/core/WorldSettings.java @@ -32,6 +32,9 @@ import java.util.Map; import java.util.UUID; import java.util.WeakHashMap; +import com.google.common.base.Optional; +import com.mojang.authlib.GameProfile; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -41,9 +44,6 @@ import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import com.google.common.base.Optional; -import com.mojang.authlib.GameProfile; - import appeng.api.util.WorldCoord; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketNewStorageDimension; diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index 94ccbc97..51809c60 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -21,10 +21,10 @@ package appeng.core.features; import java.util.EnumSet; -import cpw.mods.fml.common.registry.GameRegistry; - import com.google.common.base.Optional; +import cpw.mods.fml.common.registry.GameRegistry; + import appeng.api.definitions.ITileDefinition; import appeng.block.AEBaseBlock; import appeng.core.CommonHelper; diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index d8ffa0be..8993d57f 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -21,16 +21,16 @@ package appeng.core.features; import java.lang.reflect.Constructor; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.ObjectArrays; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.ObjectArrays; - import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseBlock; diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java index 5bad9423..86c97c3d 100644 --- a/src/main/java/appeng/core/features/DamagedItemDefinition.java +++ b/src/main/java/appeng/core/features/DamagedItemDefinition.java @@ -21,13 +21,13 @@ package appeng.core.features; import javax.annotation.Nonnull; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - import appeng.api.definitions.IItemDefinition; diff --git a/src/main/java/appeng/core/features/ItemDefinition.java b/src/main/java/appeng/core/features/ItemDefinition.java index f31557c0..8c0d55e4 100644 --- a/src/main/java/appeng/core/features/ItemDefinition.java +++ b/src/main/java/appeng/core/features/ItemDefinition.java @@ -19,13 +19,13 @@ package appeng.core.features; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - import appeng.api.definitions.IItemDefinition; import appeng.util.Platform; diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java index 2c1daed6..324d8ceb 100644 --- a/src/main/java/appeng/core/features/ItemFeatureHandler.java +++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java @@ -21,12 +21,12 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.item.Item; import cpw.mods.fml.common.registry.GameRegistry; -import com.google.common.base.Optional; - import appeng.api.definitions.IItemDefinition; import appeng.core.CreativeTab; import appeng.core.CreativeTabFacade; diff --git a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java index 7abb6122..06073fbf 100644 --- a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java @@ -21,12 +21,12 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.block.BlockStairs; import cpw.mods.fml.common.registry.GameRegistry; -import com.google.common.base.Optional; - import appeng.api.definitions.IBlockDefinition; import appeng.core.CreativeTab; diff --git a/src/main/java/appeng/core/features/TileDefinition.java b/src/main/java/appeng/core/features/TileDefinition.java index f9772825..64cfd1d5 100644 --- a/src/main/java/appeng/core/features/TileDefinition.java +++ b/src/main/java/appeng/core/features/TileDefinition.java @@ -19,11 +19,11 @@ package appeng.core.features; -import net.minecraft.tileentity.TileEntity; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import net.minecraft.tileentity.TileEntity; + import appeng.api.definitions.ITileDefinition; import appeng.block.AEBaseBlock; diff --git a/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java b/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java index 5196d814..ff7973c8 100644 --- a/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java +++ b/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java @@ -19,6 +19,10 @@ package appeng.core.features; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -26,10 +30,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - import appeng.api.definitions.ITileDefinition; diff --git a/src/main/java/appeng/core/features/registries/InscriberRegistry.java b/src/main/java/appeng/core/features/registries/InscriberRegistry.java index 9625a7ba..6915cc7b 100644 --- a/src/main/java/appeng/core/features/registries/InscriberRegistry.java +++ b/src/main/java/appeng/core/features/registries/InscriberRegistry.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; + import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/core/features/registries/PlayerRegistry.java b/src/main/java/appeng/core/features/registries/PlayerRegistry.java index 2708698c..eda915f3 100644 --- a/src/main/java/appeng/core/features/registries/PlayerRegistry.java +++ b/src/main/java/appeng/core/features/registries/PlayerRegistry.java @@ -19,10 +19,10 @@ package appeng.core.features.registries; -import net.minecraft.entity.player.EntityPlayer; - import com.mojang.authlib.GameProfile; +import net.minecraft.entity.player.EntityPlayer; + import appeng.api.features.IPlayerRegistry; import appeng.core.WorldSettings; diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java index 412f8a3c..775209f4 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java @@ -2,6 +2,7 @@ package appeng.core.features.registries.entries; import java.util.Collection; + import javax.annotation.Nonnull; import javax.annotation.Nullable; 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 8f58f376..2467b8c8 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java @@ -4,13 +4,14 @@ package appeng.core.features.registries.entries; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraft.item.ItemStack; - import com.google.common.base.Optional; +import net.minecraft.item.ItemStack; + import appeng.api.features.IInscriberRecipe; import appeng.api.features.InscriberProcessType; diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index b758c45d..3590abef 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -19,6 +19,10 @@ package appeng.core.sync; +import static appeng.core.sync.GuiHostType.ITEM; +import static appeng.core.sync.GuiHostType.ITEM_OR_WORLD; +import static appeng.core.sync.GuiHostType.WORLD; + import java.lang.reflect.Constructor; import java.util.List; @@ -119,10 +123,6 @@ import appeng.tile.storage.TileIOPort; import appeng.tile.storage.TileSkyChest; import appeng.util.Platform; -import static appeng.core.sync.GuiHostType.ITEM; -import static appeng.core.sync.GuiHostType.ITEM_OR_WORLD; -import static appeng.core.sync.GuiHostType.WORLD; - public enum GuiBridge implements IGuiHandler { diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java index 9dd97d56..075d6b09 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java @@ -27,6 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; + import javax.annotation.Nullable; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 751f978d..da8300fd 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -23,11 +23,11 @@ import java.util.HashMap; import java.util.HashSet; import java.util.concurrent.TimeUnit; +import com.google.common.base.Stopwatch; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import com.google.common.base.Stopwatch; - import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.IGrid; diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/main/java/appeng/crafting/CraftingWatcher.java index 861c32c6..5b8bae57 100644 --- a/src/main/java/appeng/crafting/CraftingWatcher.java +++ b/src/main/java/appeng/crafting/CraftingWatcher.java @@ -22,6 +22,7 @@ package appeng.crafting; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; + import javax.annotation.Nonnull; import appeng.api.networking.crafting.ICraftingWatcher; diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index 1a00abea..7483246a 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -22,11 +22,11 @@ package appeng.helpers; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import com.google.common.collect.ImmutableSet; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import com.google.common.collect.ImmutableSet; - import appeng.api.AEApi; import appeng.api.networking.IGrid; import appeng.api.networking.crafting.ICraftingGrid; diff --git a/src/main/java/appeng/hooks/AETrading.java b/src/main/java/appeng/hooks/AETrading.java index 0e7e7368..6886c707 100644 --- a/src/main/java/appeng/hooks/AETrading.java +++ b/src/main/java/appeng/hooks/AETrading.java @@ -21,6 +21,8 @@ package appeng.hooks; import java.util.Random; +import com.google.common.base.Optional; + import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -29,8 +31,6 @@ import net.minecraft.village.MerchantRecipeList; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 3c7969d3..6e7cb874 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -28,6 +28,10 @@ import java.util.WeakHashMap; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import com.google.common.base.Stopwatch; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; + import net.minecraft.world.World; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; @@ -38,10 +42,6 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.Type; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; -import com.google.common.base.Stopwatch; -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.Multimap; - import appeng.api.AEApi; import appeng.api.networking.IGridNode; import appeng.api.parts.CableRenderMode; diff --git a/src/main/java/appeng/integration/modules/FMP.java b/src/main/java/appeng/integration/modules/FMP.java index 8fae4cfb..d06a6058 100644 --- a/src/main/java/appeng/integration/modules/FMP.java +++ b/src/main/java/appeng/integration/modules/FMP.java @@ -22,6 +22,8 @@ package appeng.integration.modules; import java.util.Collection; import java.util.List; +import com.google.common.collect.Lists; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; @@ -38,7 +40,6 @@ import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; -import com.google.common.collect.Lists; import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; diff --git a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java index 73e35e7d..07d75853 100644 --- a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java @@ -21,6 +21,9 @@ package appeng.integration.modules.waila; import java.util.List; +import com.google.common.base.Optional; +import com.google.common.collect.Lists; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,8 +31,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.google.common.base.Optional; -import com.google.common.collect.Lists; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; diff --git a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java index 80ccfed9..92944d0e 100644 --- a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java @@ -21,13 +21,14 @@ package appeng.integration.modules.waila; import java.util.List; +import com.google.common.collect.Lists; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.google.common.collect.Lists; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; diff --git a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java index 2fbc6147..c87effa8 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java @@ -19,12 +19,12 @@ package appeng.integration.modules.waila.part; +import com.google.common.base.Optional; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; -import com.google.common.base.Optional; - import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; import appeng.api.parts.SelectedPart; diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 84176941..12de72ba 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -22,12 +22,12 @@ package appeng.items; import java.util.EnumSet; import java.util.List; +import com.google.common.base.Optional; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.google.common.base.Optional; - import appeng.core.features.AEFeature; import appeng.core.features.FeatureNameExtractor; import appeng.core.features.IAEFeature; diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index d8171053..63bec312 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/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index 23b3e354..c6b76f8c 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -29,9 +29,12 @@ 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; +import com.google.common.base.Preconditions; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -43,8 +46,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import com.google.common.base.Preconditions; - import appeng.api.AEApi; import appeng.api.implementations.items.IItemGroup; import appeng.api.parts.IPart; diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index 8b0c8756..acfeef61 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -23,6 +23,8 @@ import java.util.EnumSet; import java.util.List; import java.util.Set; +import com.google.common.base.Optional; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -30,8 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.config.FuzzyMode; import appeng.api.config.IncludeExclude; diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index bfb2f0f9..2fb53457 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -22,14 +22,14 @@ package appeng.items.storage; import java.util.EnumSet; import java.util.List; +import com.google.common.base.Optional; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import com.google.common.base.Optional; - import appeng.api.implementations.TransitionResult; import appeng.api.implementations.items.ISpatialStorageCell; import appeng.api.util.WorldCoord; diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 5daf939f..09051405 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -22,6 +22,8 @@ package appeng.items.tools; import java.util.EnumSet; import java.util.List; +import com.mojang.authlib.GameProfile; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,8 +32,6 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; -import com.mojang.authlib.GameProfile; - import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; import appeng.api.implementations.items.IBiometricCard; diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index dab2f4ac..416af02c 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -21,6 +21,8 @@ package appeng.items.tools; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -31,7 +33,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; -import com.google.common.base.Optional; import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; diff --git a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java index d4b5d4c0..eb1a20b4 100644 --- a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java +++ b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java @@ -21,12 +21,12 @@ package appeng.items.tools.powered; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import com.google.common.base.Optional; - import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.core.sync.packets.PacketLightning; diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 0d5546a2..f6414c1e 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -28,6 +28,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.entity.player.EntityPlayer; @@ -42,8 +44,6 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 30f70d90..42340dd8 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -25,6 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockTNT; @@ -42,8 +44,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import com.google.common.base.Optional; - import appeng.api.util.DimensionalCoord; import appeng.block.misc.BlockTinyTNT; import appeng.core.AEConfig; diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 21f1d137..de2d3a3b 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -23,6 +23,8 @@ import java.util.EnumSet; import java.util.List; import java.util.Set; +import com.google.common.base.Optional; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -32,8 +34,6 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.config.FuzzyMode; import appeng.api.implementations.guiobjects.IGuiItem; diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index aaff413b..1203a8a1 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -22,6 +22,8 @@ package appeng.items.tools.powered; import java.util.EnumSet; import java.util.List; +import com.google.common.base.Optional; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -31,8 +33,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.config.Settings; import appeng.api.config.SortDir; diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index 9dcef9f3..3d0f782b 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java @@ -22,14 +22,14 @@ package appeng.items.tools.powered.powersink; import java.text.MessageFormat; import java.util.List; +import com.google.common.base.Optional; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import com.google.common.base.Optional; - import appeng.api.config.AccessRestriction; import appeng.api.config.PowerUnits; import appeng.api.implementations.items.IAEItemPowerStorage; diff --git a/src/main/java/appeng/items/tools/powered/powersink/IC2.java b/src/main/java/appeng/items/tools/powered/powersink/IC2.java index fb55afe2..0883d08d 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/IC2.java +++ b/src/main/java/appeng/items/tools/powered/powersink/IC2.java @@ -19,11 +19,12 @@ package appeng.items.tools.powered.powersink; +import com.google.common.base.Optional; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.google.common.base.Optional; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; diff --git a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java index a48c2c6a..1c0dbccd 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java @@ -19,10 +19,11 @@ package appeng.items.tools.powered.powersink; +import com.google.common.base.Optional; + import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; -import com.google.common.base.Optional; import appeng.api.config.PowerUnits; import appeng.transformer.annotations.Integration.Interface; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index 43bfc3c9..8a6aa5a8 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -21,13 +21,13 @@ package appeng.items.tools.quartz; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.base.Optional; - import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.core.features.AEFeature; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java index b2be21c9..23edeb89 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java @@ -21,11 +21,11 @@ package appeng.items.tools.quartz; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; -import com.google.common.base.Optional; - import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index 832a0e81..c1f41cc1 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -21,6 +21,8 @@ package appeng.items.tools.quartz; import java.util.EnumSet; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,7 +30,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; -import com.google.common.base.Optional; import appeng.api.implementations.items.IAEWrench; import appeng.api.util.DimensionalCoord; diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 15455ee6..8d009b4f 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -36,14 +36,14 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; -import net.minecraft.world.World; - import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; +import net.minecraft.world.World; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.IGrid; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 0f55d5fb..51dfb808 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -22,6 +22,8 @@ package appeng.parts; import java.util.LinkedList; import java.util.List; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.block.Block.SoundType; import net.minecraft.client.Minecraft; @@ -41,8 +43,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IItems; diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 8805ea7b..a509a9a7 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -21,6 +21,8 @@ package appeng.parts.automation; import java.util.concurrent.Callable; +import com.google.common.collect.Lists; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderBlocks; @@ -36,8 +38,6 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import com.google.common.collect.Lists; - import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.networking.IGridNode; diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 26db0413..2f112dd7 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -29,6 +29,7 @@ import java.util.List; 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/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 9bb4b740..7478bd3c 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -21,17 +21,18 @@ package appeng.recipes.game; import java.util.HashMap; import java.util.Map; + import javax.annotation.Nonnull; import javax.annotation.Nullable; +import com.google.common.base.Optional; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IDefinitions; diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index b0bdbf52..186d8855 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -21,6 +21,8 @@ package appeng.recipes.game; import javax.annotation.Nullable; +import com.google.common.base.Optional; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -28,8 +30,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.definitions.IDefinitions; diff --git a/src/main/java/appeng/recipes/handlers/InscriberProcess.java b/src/main/java/appeng/recipes/handlers/InscriberProcess.java index 84c1216a..15068bb1 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberProcess.java +++ b/src/main/java/appeng/recipes/handlers/InscriberProcess.java @@ -2,6 +2,7 @@ package appeng.recipes.handlers; import java.util.List; + import javax.annotation.Nullable; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index 99e3c047..5140e9d4 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -19,13 +19,13 @@ package appeng.server; +import com.google.common.base.Joiner; + import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import net.minecraft.server.MinecraftServer; -import com.google.common.base.Joiner; - public final class AECommand extends CommandBase { diff --git a/src/main/java/appeng/server/subcommands/Supporters.java b/src/main/java/appeng/server/subcommands/Supporters.java index a7d4125b..637f7842 100644 --- a/src/main/java/appeng/server/subcommands/Supporters.java +++ b/src/main/java/appeng/server/subcommands/Supporters.java @@ -19,12 +19,12 @@ package appeng.server.subcommands; +import com.google.common.base.Joiner; + import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; -import com.google.common.base.Joiner; - import appeng.server.ISubCommand; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 0f86704d..1bf8c24a 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 net.minecraft.block.Block; diff --git a/src/main/java/appeng/services/version/github/ReleaseFetcher.java b/src/main/java/appeng/services/version/github/ReleaseFetcher.java index d02db488..8efee900 100644 --- a/src/main/java/appeng/services/version/github/ReleaseFetcher.java +++ b/src/main/java/appeng/services/version/github/ReleaseFetcher.java @@ -6,11 +6,11 @@ import java.lang.reflect.Type; import java.net.URL; import java.util.List; -import org.apache.commons.io.IOUtils; - import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import org.apache.commons.io.IOUtils; + import appeng.core.AELog; import appeng.services.version.Channel; import appeng.services.version.Version; diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 71f817fd..c839013a 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; + import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index e6e629a4..c890707b 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; + import javax.annotation.Nullable; import com.google.common.collect.Lists; diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index 935aee52..b317a276 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -23,6 +23,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; +import com.google.common.collect.ImmutableList; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -34,8 +36,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.collect.ImmutableList; - import appeng.api.util.AEColor; import appeng.helpers.Splotch; import appeng.items.misc.ItemPaintBall; diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index a6a997bd..d2fde562 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -21,6 +21,8 @@ package appeng.tile.qnb; import java.util.EnumSet; +import com.google.common.base.Optional; + import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; @@ -30,8 +32,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import com.google.common.base.Optional; - import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.networking.GridFlags; diff --git a/src/main/java/appeng/transformer/AppEngCore.java b/src/main/java/appeng/transformer/AppEngCore.java index 1a21f35f..191231db 100644 --- a/src/main/java/appeng/transformer/AppEngCore.java +++ b/src/main/java/appeng/transformer/AppEngCore.java @@ -20,6 +20,7 @@ package appeng.transformer; import java.util.Map; + import javax.annotation.Nullable; import com.google.common.eventbus.EventBus; diff --git a/src/main/java/appeng/transformer/asm/ASMIntegration.java b/src/main/java/appeng/transformer/asm/ASMIntegration.java index fa2a4194..96b57a11 100644 --- a/src/main/java/appeng/transformer/asm/ASMIntegration.java +++ b/src/main/java/appeng/transformer/asm/ASMIntegration.java @@ -20,6 +20,7 @@ package appeng.transformer.asm; import java.util.Iterator; + import javax.annotation.Nullable; import org.apache.logging.log4j.Level; diff --git a/src/main/java/appeng/transformer/asm/ASMTweaker.java b/src/main/java/appeng/transformer/asm/ASMTweaker.java index c37d8e4c..44b8a271 100644 --- a/src/main/java/appeng/transformer/asm/ASMTweaker.java +++ b/src/main/java/appeng/transformer/asm/ASMTweaker.java @@ -20,8 +20,12 @@ package appeng.transformer.asm; import java.util.Iterator; + import javax.annotation.Nullable; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; @@ -37,9 +41,6 @@ import net.minecraft.launchwrapper.IClassTransformer; import cpw.mods.fml.relauncher.FMLRelaunchLog; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - import appeng.helpers.Reflected; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index cebbc60a..924ce2a2 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/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index c1a833c4..cae40582 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -23,12 +23,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import com.google.common.collect.ImmutableList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import com.google.common.collect.ImmutableList; - public class WrapperChainedInventory implements IInventory { diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java index 61d31ff7..b97951f2 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; diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 68078495..62e059f9 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/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index 170fe4ba..c275e97f 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -27,10 +27,10 @@ import java.util.List; import java.util.NavigableMap; import java.util.concurrent.ConcurrentSkipListMap; -import net.minecraftforge.oredict.OreDictionary; - import com.google.common.collect.Lists; +import net.minecraftforge.oredict.OreDictionary; + import appeng.api.config.FuzzyMode; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack;