From b39f53e29f6cd07d3ab7a700cbe83e2bc456a0c1 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 3 Aug 2013 09:50:48 -0400 Subject: [PATCH] Clean up imports! --- .../cpw/mods/ironchest/BlockIronChest.java | 12 +++++------- .../cpw/mods/ironchest/ChestChangerType.java | 10 ++++------ .../common/cpw/mods/ironchest/IronChest.java | 1 - .../common/cpw/mods/ironchest/IronChestType.java | 9 ++++----- .../cpw/mods/ironchest/TileEntityIronChest.java | 2 -- .../cpw/mods/ironchest/client/ClientProxy.java | 3 --- .../client/TileEntityIronChestRenderer.java | 16 ---------------- 7 files changed, 13 insertions(+), 40 deletions(-) diff --git a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java index 24f49fb..4a8225c 100644 --- a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java @@ -10,19 +10,17 @@ ******************************************************************************/ package cpw.mods.ironchest; +import static net.minecraftforge.common.ForgeDirection.DOWN; +import static net.minecraftforge.common.ForgeDirection.UP; + import java.util.List; - import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -33,10 +31,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import static net.minecraftforge.common.ForgeDirection.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockIronChest extends BlockContainer { diff --git a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java b/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java index aee03fd..4550e58 100644 --- a/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java +++ b/IronChests2/common/cpw/mods/ironchest/ChestChangerType.java @@ -7,19 +7,17 @@ package cpw.mods.ironchest; import static cpw.mods.ironchest.IronChestType.COPPER; +import static cpw.mods.ironchest.IronChestType.CRYSTAL; import static cpw.mods.ironchest.IronChestType.DIAMOND; import static cpw.mods.ironchest.IronChestType.GOLD; import static cpw.mods.ironchest.IronChestType.IRON; -import static cpw.mods.ironchest.IronChestType.SILVER; -import static cpw.mods.ironchest.IronChestType.CRYSTAL; -import static cpw.mods.ironchest.IronChestType.WOOD; import static cpw.mods.ironchest.IronChestType.OBSIDIAN; -import cpw.mods.fml.common.registry.GameRegistry; - +import static cpw.mods.ironchest.IronChestType.SILVER; +import static cpw.mods.ironchest.IronChestType.WOOD; import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; +import cpw.mods.fml.common.registry.GameRegistry; public enum ChestChangerType { IRONGOLD(IRON, GOLD, "ironGoldUpgrade", "Iron to Gold Chest Upgrade", "mmm", "msm", "mmm"), diff --git a/IronChests2/common/cpw/mods/ironchest/IronChest.java b/IronChests2/common/cpw/mods/ironchest/IronChest.java index 098e37e..36cf72b 100644 --- a/IronChests2/common/cpw/mods/ironchest/IronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/IronChest.java @@ -25,7 +25,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; @Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[7.0,);required-after:FML@[5.0.5,)") @NetworkMod(channels = { "IronChest" }, versionBounds = "[5.2,)", clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) diff --git a/IronChests2/common/cpw/mods/ironchest/IronChestType.java b/IronChests2/common/cpw/mods/ironchest/IronChestType.java index 2802405..ceac5e4 100644 --- a/IronChests2/common/cpw/mods/ironchest/IronChestType.java +++ b/IronChests2/common/cpw/mods/ironchest/IronChestType.java @@ -10,20 +10,19 @@ ******************************************************************************/ package cpw.mods.ironchest; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public enum IronChestType { IRON(54, 9, true, "Iron Chest", "ironchest.png", 0, Arrays.asList("ingotIron", "ingotRefinedIron"), TileEntityIronChest.class, "mmmmPmmmm", "mGmG3GmGm"), diff --git a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java index 87e0bbe..2421bf0 100644 --- a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java @@ -16,9 +16,7 @@ import java.util.Iterator; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ContainerChest; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryLargeChest; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java b/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java index 683d516..4571019 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java +++ b/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java @@ -10,13 +10,10 @@ ******************************************************************************/ package cpw.mods.ironchest.client; -import java.util.Map; - import net.minecraft.client.renderer.ChestItemRenderHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.ironchest.CommonProxy; diff --git a/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java index 23428d2..eacb25f 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java +++ b/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java @@ -10,14 +10,9 @@ ******************************************************************************/ package cpw.mods.ironchest.client; -import static org.lwjgl.opengl.GL11.GL_COMPILE_AND_EXECUTE; -import static org.lwjgl.opengl.GL11.glCallList; import static org.lwjgl.opengl.GL11.glColor4f; import static org.lwjgl.opengl.GL11.glDisable; import static org.lwjgl.opengl.GL11.glEnable; -import static org.lwjgl.opengl.GL11.glEndList; -import static org.lwjgl.opengl.GL11.glGenLists; -import static org.lwjgl.opengl.GL11.glNewList; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; import static org.lwjgl.opengl.GL11.glRotatef; @@ -28,31 +23,20 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.client.model.ModelChest; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; - -import org.lwjgl.opengl.GL11; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.primitives.SignedBytes; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.ironchest.IronChest; import cpw.mods.ironchest.IronChestType; import cpw.mods.ironchest.MappableItemStackWrapper; import cpw.mods.ironchest.TileEntityIronChest;