From 68c3ea5ae9ec4b0556ef1686e0f65cc661976f76 Mon Sep 17 00:00:00 2001 From: yueh Date: Fri, 1 Jan 2016 01:47:22 +0100 Subject: [PATCH] Organize imports --- .../api/definitions/IBlockDefinition.java | 4 +- .../api/definitions/IItemDefinition.java | 1 + .../api/definitions/ITileDefinition.java | 4 +- .../api/events/LocatableEventAnnounce.java | 1 + .../appeng/api/features/IInscriberRecipe.java | 4 +- .../api/features/IP2PTunnelRegistry.java | 1 + .../api/features/IWirelessTermHandler.java | 1 + .../implementations/ICraftingPatternItem.java | 1 + .../api/implementations/IUpgradeableHost.java | 1 + .../guiobjects/INetworkTool.java | 1 + .../items/IAEItemPowerStorage.java | 1 + .../implementations/items/IBiometricCard.java | 5 ++- .../items/ISpatialStorageCell.java | 1 + .../implementations/items/IStorageCell.java | 1 + .../implementations/items/IUpgradeModule.java | 1 + .../api/implementations/parts/IPartCable.java | 1 + .../implementations/tiles/IColorableTile.java | 1 + .../tiles/ICraftingMachine.java | 1 + .../tiles/ITileStorageMonitorable.java | 1 + .../appeng/api/networking/IGridBlock.java | 1 + .../java/appeng/api/networking/IGridHost.java | 1 + .../java/appeng/api/networking/IGridNode.java | 1 + .../networking/crafting/ICraftingGrid.java | 7 +-- .../crafting/ICraftingPatternDetails.java | 1 + .../crafting/ICraftingRequester.java | 4 +- .../networking/security/ISecurityGrid.java | 1 + .../appeng/api/parts/IFacadeContainer.java | 5 ++- src/api/java/appeng/api/parts/IPart.java | 5 ++- src/api/java/appeng/api/parts/IPartHost.java | 1 + .../appeng/api/parts/IPartRenderHelper.java | 1 + src/api/java/appeng/api/parts/LayerBase.java | 1 + .../java/appeng/api/recipes/IIngredient.java | 1 + .../java/appeng/api/storage/ICellHandler.java | 1 + .../appeng/api/storage/ICellInventory.java | 1 + .../appeng/api/storage/ICellRegistry.java | 1 + .../api/storage/ICellWorkbenchItem.java | 1 + .../api/storage/IExternalStorageHandler.java | 1 + .../api/storage/IExternalStorageRegistry.java | 1 + .../appeng/api/storage/IStorageHelper.java | 5 ++- .../appeng/api/storage/MEMonitorHandler.java | 4 +- .../appeng/api/storage/data/IAEStack.java | 5 ++- .../api/storage/data/IAETagCompound.java | 1 + .../java/appeng/api/util/IConfigManager.java | 1 + .../appeng/block/misc/BlockLightDetector.java | 17 ++++---- .../block/networking/BlockCableBus.java | 43 ++++++++++--------- src/main/java/appeng/client/ClientHelper.java | 2 - src/main/java/appeng/client/SmartModel.java | 11 ++--- .../client/render/SpatialSkyRender.java | 2 - .../render/blocks/RenderBlockCharger.java | 2 +- .../render/blocks/RenderBlockCrank.java | 2 +- .../render/blocks/RenderBlockEnergyCube.java | 2 +- .../render/blocks/RenderBlockInscriber.java | 2 +- .../render/blocks/RenderBlockPaint.java | 2 +- .../render/blocks/RenderBlockSkyChest.java | 2 +- .../render/blocks/RenderBlockSkyCompass.java | 2 +- .../render/blocks/RenderBlockWireless.java | 2 +- .../client/render/blocks/RenderDrive.java | 2 +- .../client/render/blocks/RenderMEChest.java | 2 +- .../client/render/blocks/RenderNull.java | 2 +- .../client/render/blocks/RenderQNB.java | 2 +- .../render/blocks/RenderQuartzGlass.java | 2 +- .../client/render/blocks/RenderQuartzOre.java | 2 +- .../render/blocks/RenderQuartzTorch.java | 2 +- .../render/blocks/RenderSpatialPylon.java | 2 +- .../client/render/blocks/RenderTinyTNT.java | 2 +- .../render/blocks/RendererCableBus.java | 2 +- .../render/blocks/RendererSecurity.java | 2 +- .../render/items/ToolBiometricCardRender.java | 3 +- .../items/ToolColorApplicatorRender.java | 3 +- .../java/appeng/debug/TileCubeGenerator.java | 1 + .../appeng/entity/RenderFloatingItem.java | 1 - .../appeng/items/tools/ToolBiometricCard.java | 2 - .../tools/powered/ToolColorApplicator.java | 2 - .../java/appeng/tile/misc/TileCharger.java | 1 + .../appeng/tile/misc/TileLightDetector.java | 3 +- .../appeng/tile/qnb/TileQuantumBridge.java | 1 + .../java/appeng/tile/storage/TileChest.java | 1 + 77 files changed, 127 insertions(+), 88 deletions(-) diff --git a/src/api/java/appeng/api/definitions/IBlockDefinition.java b/src/api/java/appeng/api/definitions/IBlockDefinition.java index d6d56bce8..3c52847bf 100644 --- a/src/api/java/appeng/api/definitions/IBlockDefinition.java +++ b/src/api/java/appeng/api/definitions/IBlockDefinition.java @@ -1,13 +1,13 @@ package appeng.api.definitions; +import com.google.common.base.Optional; + import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import com.google.common.base.Optional; - public interface IBlockDefinition extends IItemDefinition { diff --git a/src/api/java/appeng/api/definitions/IItemDefinition.java b/src/api/java/appeng/api/definitions/IItemDefinition.java index a8a03cdfc..df1183a48 100644 --- a/src/api/java/appeng/api/definitions/IItemDefinition.java +++ b/src/api/java/appeng/api/definitions/IItemDefinition.java @@ -25,6 +25,7 @@ package appeng.api.definitions; import javax.annotation.Nonnull; + import com.google.common.base.Optional; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/definitions/ITileDefinition.java b/src/api/java/appeng/api/definitions/ITileDefinition.java index 89f9641dd..829d23b7b 100644 --- a/src/api/java/appeng/api/definitions/ITileDefinition.java +++ b/src/api/java/appeng/api/definitions/ITileDefinition.java @@ -1,10 +1,10 @@ package appeng.api.definitions; -import net.minecraft.tileentity.TileEntity; - import com.google.common.base.Optional; +import net.minecraft.tileentity.TileEntity; + public interface ITileDefinition extends IBlockDefinition { diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java index 1f59052f0..dea97edf3 100644 --- a/src/api/java/appeng/api/events/LocatableEventAnnounce.java +++ b/src/api/java/appeng/api/events/LocatableEventAnnounce.java @@ -25,6 +25,7 @@ package appeng.api.events; import net.minecraftforge.fml.common.eventhandler.Event; + import appeng.api.features.ILocatable; diff --git a/src/api/java/appeng/api/features/IInscriberRecipe.java b/src/api/java/appeng/api/features/IInscriberRecipe.java index 7bf7caa88..0ad87c714 100644 --- a/src/api/java/appeng/api/features/IInscriberRecipe.java +++ b/src/api/java/appeng/api/features/IInscriberRecipe.java @@ -5,10 +5,10 @@ import java.util.List; import javax.annotation.Nonnull; -import net.minecraft.item.ItemStack; - import com.google.common.base.Optional; +import net.minecraft.item.ItemStack; + /** * Registration Records for {@link IInscriberRegistry} diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java index 775ff4808..fa627247c 100644 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java @@ -27,6 +27,7 @@ package appeng.api.features; import javax.annotation.Nullable; import net.minecraft.item.ItemStack; + import appeng.api.config.TunnelType; diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java index df43cae25..eebfceda2 100644 --- a/src/api/java/appeng/api/features/IWirelessTermHandler.java +++ b/src/api/java/appeng/api/features/IWirelessTermHandler.java @@ -26,6 +26,7 @@ package appeng.api.features; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import appeng.api.util.IConfigManager; diff --git a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java index 0d8c77922..6524f6cc5 100644 --- a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java +++ b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java @@ -27,6 +27,7 @@ package appeng.api.implementations; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import appeng.api.networking.crafting.ICraftingPatternDetails; diff --git a/src/api/java/appeng/api/implementations/IUpgradeableHost.java b/src/api/java/appeng/api/implementations/IUpgradeableHost.java index e5e62dfe9..bbc728e1f 100644 --- a/src/api/java/appeng/api/implementations/IUpgradeableHost.java +++ b/src/api/java/appeng/api/implementations/IUpgradeableHost.java @@ -25,6 +25,7 @@ package appeng.api.implementations; import net.minecraft.tileentity.TileEntity; + import appeng.api.config.Upgrades; import appeng.api.implementations.tiles.ISegmentedInventory; import appeng.api.util.IConfigurableObject; diff --git a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java index 01789b796..4e0dc9589 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java +++ b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java @@ -25,6 +25,7 @@ package appeng.api.implementations.guiobjects; import net.minecraft.inventory.IInventory; + import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java index 3f850acde..0ca4ff49c 100644 --- a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java +++ b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java @@ -25,6 +25,7 @@ package appeng.api.implementations.items; import net.minecraft.item.ItemStack; + import appeng.api.config.AccessRestriction; import appeng.api.networking.energy.IAEPowerStorage; diff --git a/src/api/java/appeng/api/implementations/items/IBiometricCard.java b/src/api/java/appeng/api/implementations/items/IBiometricCard.java index a3d7f7c4b..32b352317 100644 --- a/src/api/java/appeng/api/implementations/items/IBiometricCard.java +++ b/src/api/java/appeng/api/implementations/items/IBiometricCard.java @@ -26,13 +26,14 @@ package appeng.api.implementations.items; import java.util.EnumSet; +import com.mojang.authlib.GameProfile; + import net.minecraft.item.ItemStack; + import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; import appeng.api.networking.security.ISecurityRegistry; -import com.mojang.authlib.GameProfile; - public interface IBiometricCard { diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java index 7caa85476..1c0f89bfc 100644 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java @@ -27,6 +27,7 @@ package appeng.api.implementations.items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import appeng.api.implementations.TransitionResult; import appeng.api.util.WorldCoord; diff --git a/src/api/java/appeng/api/implementations/items/IStorageCell.java b/src/api/java/appeng/api/implementations/items/IStorageCell.java index e5eff24d1..0eb2c0527 100644 --- a/src/api/java/appeng/api/implementations/items/IStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/IStorageCell.java @@ -25,6 +25,7 @@ package appeng.api.implementations.items; import net.minecraft.item.ItemStack; + import appeng.api.storage.ICellWorkbenchItem; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java index 39526ca4b..0b06911e0 100644 --- a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java +++ b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java @@ -25,6 +25,7 @@ package appeng.api.implementations.items; import net.minecraft.item.ItemStack; + import appeng.api.config.Upgrades; diff --git a/src/api/java/appeng/api/implementations/parts/IPartCable.java b/src/api/java/appeng/api/implementations/parts/IPartCable.java index d1c1dd705..52a1ae695 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartCable.java +++ b/src/api/java/appeng/api/implementations/parts/IPartCable.java @@ -28,6 +28,7 @@ import java.util.EnumSet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; + import appeng.api.networking.IGridHost; import appeng.api.parts.BusSupport; import appeng.api.parts.IPart; diff --git a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java index a6def3026..89232749e 100644 --- a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java +++ b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java @@ -26,6 +26,7 @@ package appeng.api.implementations.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; + import appeng.api.util.AEColor; diff --git a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java index d04af6d27..fe214997a 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java +++ b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java @@ -26,6 +26,7 @@ package appeng.api.implementations.tiles; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.util.EnumFacing; + import appeng.api.networking.crafting.ICraftingPatternDetails; diff --git a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java b/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java index 54beeae25..7da3efae8 100644 --- a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java +++ b/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java @@ -25,6 +25,7 @@ package appeng.api.implementations.tiles; import net.minecraft.util.EnumFacing; + import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IStorageMonitorable; diff --git a/src/api/java/appeng/api/networking/IGridBlock.java b/src/api/java/appeng/api/networking/IGridBlock.java index e833f4e64..dbdf7af4c 100644 --- a/src/api/java/appeng/api/networking/IGridBlock.java +++ b/src/api/java/appeng/api/networking/IGridBlock.java @@ -28,6 +28,7 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; + import appeng.api.parts.IPart; import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java index e1035eb76..817bef9e3 100644 --- a/src/api/java/appeng/api/networking/IGridHost.java +++ b/src/api/java/appeng/api/networking/IGridHost.java @@ -25,6 +25,7 @@ package appeng.api.networking; import net.minecraft.tileentity.TileEntity; + import appeng.api.parts.IPart; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java index f1f566dc6..44406a8f7 100644 --- a/src/api/java/appeng/api/networking/IGridNode.java +++ b/src/api/java/appeng/api/networking/IGridNode.java @@ -28,6 +28,7 @@ import java.util.EnumSet; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; + import appeng.api.IAppEngApi; import appeng.api.util.AEPartLocation; import appeng.api.util.IReadOnlyCollection; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java index a5543c6e2..79798ba80 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java @@ -26,15 +26,16 @@ package appeng.api.networking.crafting; import java.util.concurrent.Future; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableSet; + import net.minecraft.world.World; + import appeng.api.networking.IGrid; import appeng.api.networking.IGridCache; import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.data.IAEItemStack; -import com.google.common.collect.ImmutableCollection; -import com.google.common.collect.ImmutableSet; - public interface ICraftingGrid extends IGridCache { diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java index 128a67ee4..7a4b24199 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java @@ -27,6 +27,7 @@ package appeng.api.networking.crafting; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + import appeng.api.implementations.ICraftingPatternItem; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java index 665ee2b5a..171ff348a 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java @@ -24,12 +24,12 @@ package appeng.api.networking.crafting; +import com.google.common.collect.ImmutableSet; + import appeng.api.config.Actionable; import appeng.api.networking.security.IActionHost; import appeng.api.storage.data.IAEItemStack; -import com.google.common.collect.ImmutableSet; - public interface ICraftingRequester extends IActionHost { diff --git a/src/api/java/appeng/api/networking/security/ISecurityGrid.java b/src/api/java/appeng/api/networking/security/ISecurityGrid.java index 4fdb300c7..3a54590c4 100644 --- a/src/api/java/appeng/api/networking/security/ISecurityGrid.java +++ b/src/api/java/appeng/api/networking/security/ISecurityGrid.java @@ -25,6 +25,7 @@ package appeng.api.networking.security; import net.minecraft.entity.player.EntityPlayer; + import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGridCache; diff --git a/src/api/java/appeng/api/parts/IFacadeContainer.java b/src/api/java/appeng/api/parts/IFacadeContainer.java index 5cb8603e8..16b0221c3 100644 --- a/src/api/java/appeng/api/parts/IFacadeContainer.java +++ b/src/api/java/appeng/api/parts/IFacadeContainer.java @@ -24,11 +24,12 @@ package appeng.api.parts; -import io.netty.buffer.ByteBuf; - import java.io.IOException; +import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; + import appeng.api.util.AEPartLocation; diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index 4912be04e..c14595125 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -24,12 +24,12 @@ package appeng.api.parts; -import io.netty.buffer.ByteBuf; - import java.io.IOException; import java.util.List; import java.util.Random; +import io.netty.buffer.ByteBuf; + import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -42,6 +42,7 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; import appeng.client.render.ModelGenerator; diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index 0b0bd852b..b5da172cc 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3; + import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; diff --git a/src/api/java/appeng/api/parts/IPartRenderHelper.java b/src/api/java/appeng/api/parts/IPartRenderHelper.java index f2659c01e..e855616b7 100644 --- a/src/api/java/appeng/api/parts/IPartRenderHelper.java +++ b/src/api/java/appeng/api/parts/IPartRenderHelper.java @@ -31,6 +31,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import appeng.client.render.ModelGenerator; import appeng.client.texture.IAESprite; diff --git a/src/api/java/appeng/api/parts/LayerBase.java b/src/api/java/appeng/api/parts/LayerBase.java index c1c82bfda..58ab49f58 100644 --- a/src/api/java/appeng/api/parts/LayerBase.java +++ b/src/api/java/appeng/api/parts/LayerBase.java @@ -28,6 +28,7 @@ import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; + import appeng.api.util.AEPartLocation; diff --git a/src/api/java/appeng/api/recipes/IIngredient.java b/src/api/java/appeng/api/recipes/IIngredient.java index f25d27862..2878022d3 100644 --- a/src/api/java/appeng/api/recipes/IIngredient.java +++ b/src/api/java/appeng/api/recipes/IIngredient.java @@ -25,6 +25,7 @@ package appeng.api.recipes; import net.minecraft.item.ItemStack; + import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RegistrationError; diff --git a/src/api/java/appeng/api/storage/ICellHandler.java b/src/api/java/appeng/api/storage/ICellHandler.java index 0ada36a3d..755c70c6c 100644 --- a/src/api/java/appeng/api/storage/ICellHandler.java +++ b/src/api/java/appeng/api/storage/ICellHandler.java @@ -28,6 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import appeng.api.implementations.tiles.IChestOrDrive; import appeng.client.texture.IAESprite; diff --git a/src/api/java/appeng/api/storage/ICellInventory.java b/src/api/java/appeng/api/storage/ICellInventory.java index 08264973f..13494b8d1 100644 --- a/src/api/java/appeng/api/storage/ICellInventory.java +++ b/src/api/java/appeng/api/storage/ICellInventory.java @@ -26,6 +26,7 @@ package appeng.api.storage; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; + import appeng.api.config.FuzzyMode; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java index 029b8ba30..406bfd225 100644 --- a/src/api/java/appeng/api/storage/ICellRegistry.java +++ b/src/api/java/appeng/api/storage/ICellRegistry.java @@ -25,6 +25,7 @@ package appeng.api.storage; import net.minecraft.item.ItemStack; + import appeng.api.IAppEngApi; diff --git a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java b/src/api/java/appeng/api/storage/ICellWorkbenchItem.java index d8c1efdf7..668095c6e 100644 --- a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java +++ b/src/api/java/appeng/api/storage/ICellWorkbenchItem.java @@ -26,6 +26,7 @@ package appeng.api.storage; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; + import appeng.api.config.FuzzyMode; diff --git a/src/api/java/appeng/api/storage/IExternalStorageHandler.java b/src/api/java/appeng/api/storage/IExternalStorageHandler.java index d08f56617..d7e3e6158 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageHandler.java +++ b/src/api/java/appeng/api/storage/IExternalStorageHandler.java @@ -26,6 +26,7 @@ package appeng.api.storage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; + import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java index 1b355ae08..648f7aeca 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java +++ b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java @@ -26,6 +26,7 @@ package appeng.api.storage; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; + import appeng.api.IAppEngApi; import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java index fb51473df..c75eac221 100644 --- a/src/api/java/appeng/api/storage/IStorageHelper.java +++ b/src/api/java/appeng/api/storage/IStorageHelper.java @@ -24,13 +24,14 @@ package appeng.api.storage; -import io.netty.buffer.ByteBuf; - import java.io.IOException; +import io.netty.buffer.ByteBuf; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; + import appeng.api.networking.crafting.ICraftingLink; import appeng.api.networking.crafting.ICraftingRequester; import appeng.api.networking.energy.IEnergySource; diff --git a/src/api/java/appeng/api/storage/MEMonitorHandler.java b/src/api/java/appeng/api/storage/MEMonitorHandler.java index 217978b30..7d9ee6244 100644 --- a/src/api/java/appeng/api/storage/MEMonitorHandler.java +++ b/src/api/java/appeng/api/storage/MEMonitorHandler.java @@ -28,14 +28,14 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; +import com.google.common.collect.ImmutableList; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; -import com.google.common.collect.ImmutableList; - /** * Common implementation of a simple class that monitors injection/extraction of a inventory to send events to a list of diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java index 833c099f6..e1db8a0fa 100644 --- a/src/api/java/appeng/api/storage/data/IAEStack.java +++ b/src/api/java/appeng/api/storage/data/IAEStack.java @@ -24,11 +24,12 @@ package appeng.api.storage.data; -import io.netty.buffer.ByteBuf; - import java.io.IOException; +import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; + import appeng.api.config.FuzzyMode; import appeng.api.storage.StorageChannel; diff --git a/src/api/java/appeng/api/storage/data/IAETagCompound.java b/src/api/java/appeng/api/storage/data/IAETagCompound.java index 05b9cf798..bd4b57b8b 100644 --- a/src/api/java/appeng/api/storage/data/IAETagCompound.java +++ b/src/api/java/appeng/api/storage/data/IAETagCompound.java @@ -25,6 +25,7 @@ package appeng.api.storage.data; import net.minecraft.nbt.NBTTagCompound; + import appeng.api.features.IItemComparison; diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java index d8f965953..52df69458 100644 --- a/src/api/java/appeng/api/util/IConfigManager.java +++ b/src/api/java/appeng/api/util/IConfigManager.java @@ -27,6 +27,7 @@ package appeng.api.util; import java.util.Set; import net.minecraft.nbt.NBTTagCompound; + import appeng.api.config.Settings; diff --git a/src/main/java/appeng/block/misc/BlockLightDetector.java b/src/main/java/appeng/block/misc/BlockLightDetector.java index db197b881..f41599d07 100644 --- a/src/main/java/appeng/block/misc/BlockLightDetector.java +++ b/src/main/java/appeng/block/misc/BlockLightDetector.java @@ -23,14 +23,6 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; -import appeng.api.util.IOrientable; -import appeng.api.util.IOrientableBlock; -import appeng.block.AEBaseTileBlock; -import appeng.client.render.blocks.RenderQuartzTorch; -import appeng.core.features.AEFeature; -import appeng.helpers.ICustomCollision; -import appeng.helpers.MetaRotation; -import appeng.tile.misc.TileLightDetector; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; import net.minecraft.block.material.Material; @@ -43,6 +35,15 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import appeng.api.util.IOrientable; +import appeng.api.util.IOrientableBlock; +import appeng.block.AEBaseTileBlock; +import appeng.client.render.blocks.RenderQuartzTorch; +import appeng.core.features.AEFeature; +import appeng.helpers.ICustomCollision; +import appeng.helpers.MetaRotation; +import appeng.tile.misc.TileLightDetector; + public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision { diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index c6e77ecf6..1f85fe4d8 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -22,6 +22,28 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import appeng.api.parts.IPartHost; import appeng.api.parts.PartItemStack; import appeng.api.parts.SelectedPart; @@ -45,27 +67,6 @@ import appeng.tile.AEBaseTile; import appeng.tile.networking.TileCableBus; import appeng.tile.networking.TileCableBusTESR; import appeng.util.Platform; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; // TODO: MFR INTEGRATION //@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR ) diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 05c28776a..f4f41957d 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -34,7 +34,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; @@ -64,7 +63,6 @@ import appeng.api.util.AEColor; import appeng.block.AEBaseBlock; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; -import appeng.client.render.ModelGenerator; import appeng.client.render.TESRWrapper; import appeng.client.render.blocks.RendererCableBus; import appeng.client.render.effects.AssemblerFX; diff --git a/src/main/java/appeng/client/SmartModel.java b/src/main/java/appeng/client/SmartModel.java index bfd3a4578..3c01b3e56 100644 --- a/src/main/java/appeng/client/SmartModel.java +++ b/src/main/java/appeng/client/SmartModel.java @@ -4,11 +4,6 @@ package appeng.client; import java.util.Collections; import java.util.List; -import appeng.api.util.AEPartLocation; -import appeng.block.AEBaseBlock; -import appeng.client.render.BlockRenderInfo; -import appeng.client.render.ModelGenerator; -import appeng.client.texture.MissingIcon; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -22,6 +17,12 @@ import net.minecraftforge.client.model.ISmartBlockModel; import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.common.property.IExtendedBlockState; +import appeng.api.util.AEPartLocation; +import appeng.block.AEBaseBlock; +import appeng.client.render.BlockRenderInfo; +import appeng.client.render.ModelGenerator; +import appeng.client.texture.MissingIcon; + // net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel { diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index ec09b5935..132c78b87 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -23,8 +23,6 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory.Default; - import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GLAllocation; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java index 3369f6469..313f170da 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCharger.java @@ -31,11 +31,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.util.AEPartLocation; import appeng.api.util.IOrientable; import appeng.block.misc.BlockCharger; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java b/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java index a5538f50e..fb59d0340 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCrank.java @@ -30,9 +30,9 @@ import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.block.grindstone.BlockCrank; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.tile.grindstone.TileCrank; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java b/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java index fc6ce3d20..00a0dc45b 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java @@ -22,10 +22,10 @@ package appeng.client.render.blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.block.networking.BlockEnergyCell; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.tile.networking.TileEnergyCell; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java index 53c7e4147..f59d84164 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java @@ -35,13 +35,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.features.IInscriberRecipe; import appeng.api.util.AEPartLocation; import appeng.api.util.IOrientable; import appeng.block.AEBaseBlock; import appeng.block.misc.BlockInscriber; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; 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 3173c9534..b0f7d2746 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java @@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.block.misc.BlockPaint; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java index 162a7bf36..76074f4b2 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java @@ -30,10 +30,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.block.storage.BlockSkyChest; import appeng.block.storage.BlockSkyChest.SkyChestType; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.tile.storage.TileSkyChest; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java index bc86c7baf..678681959 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java @@ -29,9 +29,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.block.misc.BlockSkyCompass; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.render.model.ModelCompass; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java index 084eaf448..474326a48 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java @@ -25,11 +25,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.block.networking.BlockWireless; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; import appeng.client.render.ModelGenerator; diff --git a/src/main/java/appeng/client/render/blocks/RenderDrive.java b/src/main/java/appeng/client/render/blocks/RenderDrive.java index f86fd18c2..68707d3da 100644 --- a/src/main/java/appeng/client/render/blocks/RenderDrive.java +++ b/src/main/java/appeng/client/render/blocks/RenderDrive.java @@ -25,10 +25,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.util.AEPartLocation; import appeng.block.storage.BlockDrive; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderMEChest.java b/src/main/java/appeng/client/render/blocks/RenderMEChest.java index ce7a6c7b2..2fd517a17 100644 --- a/src/main/java/appeng/client/render/blocks/RenderMEChest.java +++ b/src/main/java/appeng/client/render/blocks/RenderMEChest.java @@ -25,13 +25,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.AEApi; import appeng.api.storage.ICellHandler; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.block.storage.BlockChest; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderNull.java b/src/main/java/appeng/client/render/blocks/RenderNull.java index 383a78f0c..4d71c6fbd 100644 --- a/src/main/java/appeng/client/render/blocks/RenderNull.java +++ b/src/main/java/appeng/client/render/blocks/RenderNull.java @@ -22,9 +22,9 @@ package appeng.client.render.blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.block.AEBaseBlock; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/client/render/blocks/RenderQNB.java b/src/main/java/appeng/client/render/blocks/RenderQNB.java index 2df3be84f..d1d6b4b4f 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQNB.java +++ b/src/main/java/appeng/client/render/blocks/RenderQNB.java @@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.AEApi; import appeng.api.definitions.IBlocks; @@ -37,6 +36,7 @@ import appeng.api.definitions.IParts; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.block.qnb.BlockQuantumBase; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java index 9883e9d3c..b64c65f96 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java @@ -24,10 +24,10 @@ import java.util.Random; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.AEApi; import appeng.api.util.AEPartLocation; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java b/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java index d46aa98cb..511ac3a9d 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzOre.java @@ -22,8 +22,8 @@ package appeng.client.render.blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java b/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java index 1f6ae0043..c82d667b3 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java @@ -25,12 +25,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.util.AEPartLocation; import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; import appeng.block.AEBaseBlock; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java index 620a90137..07c73ff29 100644 --- a/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java +++ b/src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java @@ -23,10 +23,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.util.AEPartLocation; import appeng.block.spatial.BlockSpatialPylon; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.BlockRenderInfo; import appeng.client.render.ModelGenerator; diff --git a/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java b/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java index 3c32e24bd..05232e986 100644 --- a/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java +++ b/src/main/java/appeng/client/render/blocks/RenderTinyTNT.java @@ -24,9 +24,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.block.misc.BlockTinyTNT; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.FullIcon; diff --git a/src/main/java/appeng/client/render/blocks/RendererCableBus.java b/src/main/java/appeng/client/render/blocks/RendererCableBus.java index 8e58b92ef..9bb8f2b7e 100644 --- a/src/main/java/appeng/client/render/blocks/RendererCableBus.java +++ b/src/main/java/appeng/client/render/blocks/RendererCableBus.java @@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPart; @@ -36,6 +35,7 @@ import appeng.api.parts.IPartItem; import appeng.api.util.AEPartLocation; import appeng.block.networking.BlockCableBus; import appeng.client.ClientHelper; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.BusRenderHelper; import appeng.client.render.BusRenderer; diff --git a/src/main/java/appeng/client/render/blocks/RendererSecurity.java b/src/main/java/appeng/client/render/blocks/RendererSecurity.java index 0b7472a70..e346aaf28 100644 --- a/src/main/java/appeng/client/render/blocks/RendererSecurity.java +++ b/src/main/java/appeng/client/render/blocks/RendererSecurity.java @@ -25,11 +25,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import appeng.client.ItemRenderType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.block.misc.BlockSecurity; +import appeng.client.ItemRenderType; import appeng.client.render.BaseBlockRender; import appeng.client.render.ModelGenerator; import appeng.client.texture.ExtraBlockTextures; diff --git a/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java index f2dff7a89..76b183c33 100644 --- a/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java +++ b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java @@ -19,9 +19,10 @@ package appeng.client.render.items; -import appeng.client.ItemRenderType; import net.minecraft.item.ItemStack; +import appeng.client.ItemRenderType; + // TODO - PORT public class ToolBiometricCardRender // TileEntityItemStackRenderer diff --git a/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java b/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java index 102df494d..5e532251e 100644 --- a/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java +++ b/src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java @@ -19,9 +19,10 @@ package appeng.client.render.items; -import appeng.client.ItemRenderType; import net.minecraft.item.ItemStack; +import appeng.client.ItemRenderType; + public class ToolColorApplicatorRender { diff --git a/src/main/java/appeng/debug/TileCubeGenerator.java b/src/main/java/appeng/debug/TileCubeGenerator.java index 5bc3bca25..8faf3ca5d 100644 --- a/src/main/java/appeng/debug/TileCubeGenerator.java +++ b/src/main/java/appeng/debug/TileCubeGenerator.java @@ -26,6 +26,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; + import appeng.core.CommonHelper; import appeng.tile.AEBaseTile; import appeng.tile.TileEvent; diff --git a/src/main/java/appeng/entity/RenderFloatingItem.java b/src/main/java/appeng/entity/RenderFloatingItem.java index b86e1cf6c..0cc535876 100644 --- a/src/main/java/appeng/entity/RenderFloatingItem.java +++ b/src/main/java/appeng/entity/RenderFloatingItem.java @@ -24,7 +24,6 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 9e282b1da..0210fc6c6 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -30,13 +30,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTUtil; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; import appeng.api.implementations.items.IBiometricCard; import appeng.api.networking.security.ISecurityRegistry; -import appeng.client.render.items.ToolBiometricCardRender; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 2d2f6ddf6..38f3303ce 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -47,7 +47,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.oredict.OreDictionary; import appeng.api.AEApi; @@ -67,7 +66,6 @@ import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; import appeng.block.misc.BlockPaint; import appeng.block.networking.BlockCableBus; -import appeng.client.render.items.ToolColorApplicatorRender; import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index b8a93249b..a99d8a21b 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -31,6 +31,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; diff --git a/src/main/java/appeng/tile/misc/TileLightDetector.java b/src/main/java/appeng/tile/misc/TileLightDetector.java index 638d5389a..be92a5587 100644 --- a/src/main/java/appeng/tile/misc/TileLightDetector.java +++ b/src/main/java/appeng/tile/misc/TileLightDetector.java @@ -20,11 +20,12 @@ package appeng.tile.misc; +import net.minecraft.util.ITickable; + import appeng.tile.AEBaseTile; import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; import appeng.util.Platform; -import net.minecraft.util.ITickable; public class TileLightDetector extends AEBaseTile implements ITickable diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index a1b064aa8..f1e71a5b8 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -32,6 +32,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; + import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.networking.GridFlags; diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 5eb64df78..c033cd03f 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.List; import io.netty.buffer.ByteBuf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item;