From 8d5d86705c5be26c5bfbc88437033b2ae008de01 Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Wed, 17 Dec 2014 18:59:33 +0100 Subject: [PATCH] Import cleanup --- .../addons/carpenters/CarpentersModule.java | 5 --- .../addons/enderio/HUDHandlerCapacitor.java | 1 - .../waila/addons/etb/HUDHandlerSocket.java | 1 - .../mobius/waila/addons/ic2/IC2Module.java | 2 -- .../projectred/HUDDecoratorRsGateLogic.java | 5 --- .../addons/railcraft/HUDHandlerTank.java | 1 - .../addons/secretrooms/HUDTileEntityCamo.java | 2 -- .../addons/secretrooms/SecretRoomsModule.java | 5 --- .../addons/stevescarts/HUDCargoManager.java | 1 - .../addons/stevescarts/HUDCartAssembler.java | 8 ----- .../stevescarts/HUDMinecartModular.java | 1 - .../addons/stevescarts/StevesCartsModule.java | 4 --- .../HUDHandlerIAspectContainer.java | 2 -- .../HUDHandlerEnergyCell.java | 1 - .../HUDHandlerIEnergyHandler.java | 1 - .../thermalexpansion/HUDHandlerTank.java | 1 - .../addons/vanillamc/HUDDecoratorVanilla.java | 6 ---- .../addons/vanillamc/HUDHandlerVanilla.java | 3 -- .../mcp/mobius/waila/client/ProxyClient.java | 33 ------------------- .../waila/commands/CommandDumpHandlers.java | 4 --- .../waila/handlers/HUDHandlerBlocks.java | 1 - .../waila/handlers/HUDHandlerEntities.java | 4 --- .../waila/handlers/nei/HandlerEnchants.java | 4 +-- .../waila/network/Message0x00ServerPing.java | 1 - .../waila/network/Message0x01TERequest.java | 1 - .../waila/network/Message0x03EntRequest.java | 4 --- .../waila/network/Message0x04EntNBTData.java | 1 - .../java/mcp/mobius/waila/overlay/IconUI.java | 2 -- .../mcp/mobius/waila/overlay/RayTracing.java | 2 -- .../waila/overlay/WailaTickHandler.java | 3 -- .../mcp/mobius/waila/server/ProxyServer.java | 5 --- .../mobius/waila/utils/ModIdentification.java | 6 ---- .../java/mcp/mobius/waila/utils/NBTUtil.java | 3 -- 33 files changed, 2 insertions(+), 122 deletions(-) diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java index a56abf5..e5a1666 100644 --- a/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java @@ -1,10 +1,5 @@ package mcp.mobius.waila.addons.carpenters; -import java.util.logging.Level; - -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ModuleRegistrar; - public class CarpentersModule { public static Class TEBase = null; diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java index f33c4b8..cbc9f1b 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java @@ -11,7 +11,6 @@ import net.minecraft.world.World; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; import mcp.mobius.waila.utils.WailaExceptionHandler; import static mcp.mobius.waila.api.SpecialChars.*; diff --git a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java index 48ad8b5..bb940fe 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java @@ -1,6 +1,5 @@ package mcp.mobius.waila.addons.etb; -import java.util.Arrays; import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java index 1586b0e..53d357c 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java @@ -1,8 +1,6 @@ package mcp.mobius.waila.addons.ic2; import java.lang.reflect.Field; -import java.lang.reflect.Method; - import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java index ae93233..c21fa2a 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java @@ -1,13 +1,8 @@ package mcp.mobius.waila.addons.projectred; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; -import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaFMPAccessor; import mcp.mobius.waila.api.IWailaFMPDecorator; import mcp.mobius.waila.gui.helpers.UIHelper; diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java index 45bcaf7..6356489 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java @@ -1,6 +1,5 @@ package mcp.mobius.waila.addons.railcraft; -import java.lang.reflect.InvocationTargetException; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java index 0558b5d..5e9bac4 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java @@ -2,9 +2,7 @@ package mcp.mobius.waila.addons.secretrooms; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java index f0ba904..566f07e 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java @@ -1,10 +1,5 @@ package mcp.mobius.waila.addons.secretrooms; -import java.util.logging.Level; - -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ModuleRegistrar; - public class SecretRoomsModule { public static Class TileEntityCamo = null; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java index 257f055..09fdda4 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java @@ -3,7 +3,6 @@ package mcp.mobius.waila.addons.stevescarts; import java.util.ArrayList; import java.util.List; -import codechicken.lib.math.MathHelper; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java index ed3a1e4..36e003b 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java @@ -2,22 +2,14 @@ package mcp.mobius.waila.addons.stevescarts; import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; -import static mcp.mobius.waila.api.SpecialChars.*; public class HUDCartAssembler implements IWailaDataProvider { diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java index df55f41..dfe9124 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaEntityAccessor; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java index a3b0d62..fbf18fd 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java @@ -2,10 +2,6 @@ package mcp.mobius.waila.addons.stevescarts; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.logging.Level; - -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ModuleRegistrar; public class StevesCartsModule { diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java index 05f7f00..a9d4335 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -3,8 +3,6 @@ package mcp.mobius.waila.addons.thaumcraft; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java index a63ebf4..6f34338 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java @@ -11,7 +11,6 @@ import net.minecraft.world.World; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; public class HUDHandlerEnergyCell implements IWailaDataProvider { diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java index 719509a..b48b663 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java @@ -1,6 +1,5 @@ package mcp.mobius.waila.addons.thermalexpansion; -import java.lang.reflect.InvocationTargetException; import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java index 2db6ba0..dd2944a 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java @@ -1,6 +1,5 @@ package mcp.mobius.waila.addons.thermalexpansion; -import java.lang.reflect.InvocationTargetException; import java.util.List; import mcp.mobius.waila.cbcore.LangUtil; diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java index 1577e0d..a560cea 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java @@ -1,12 +1,6 @@ package mcp.mobius.waila.addons.vanillamc; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaConfigHandler; diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index 319e815..883e073 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -4,12 +4,9 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneOre; -import net.minecraft.block.BlockSilverfish; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java index 1412ebb..de909d0 100644 --- a/src/main/java/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -1,49 +1,18 @@ package mcp.mobius.waila.client; -import java.lang.reflect.Method; - -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.addons.agriculture.AgricultureModule; -import mcp.mobius.waila.addons.buildcraft.BCModule; -import mcp.mobius.waila.addons.carpenters.CarpentersModule; -import mcp.mobius.waila.addons.enderio.EnderIOModule; -import mcp.mobius.waila.addons.enderstorage.EnderStorageModule; -import mcp.mobius.waila.addons.etb.ETBModule; -import mcp.mobius.waila.addons.exu.ExtraUtilitiesModule; -import mcp.mobius.waila.addons.gravestone.GravestoneModule; -import mcp.mobius.waila.addons.harvestcraft.HarvestcraftModule; -import mcp.mobius.waila.addons.ic2.IC2Module; -import mcp.mobius.waila.addons.magicalcrops.MagicalCropsModule; -import mcp.mobius.waila.addons.openblocks.OpenBlocksModule; -import mcp.mobius.waila.addons.projectred.ProjectRedModule; -import mcp.mobius.waila.addons.railcraft.RailcraftModule; -import mcp.mobius.waila.addons.secretrooms.SecretRoomsModule; -import mcp.mobius.waila.addons.statues.StatuesModule; -import mcp.mobius.waila.addons.stevescarts.StevesCartsModule; -import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule; -import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule; -import mcp.mobius.waila.addons.twilightforest.TwilightForestModule; -import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.gui.truetyper.FontLoader; import mcp.mobius.waila.gui.truetyper.TrueTypeFont; -import mcp.mobius.waila.handlers.DecoratorFMP; import mcp.mobius.waila.handlers.HUDHandlerBlocks; import mcp.mobius.waila.handlers.HUDHandlerEntities; -import mcp.mobius.waila.handlers.HUDHandlerFMP; import mcp.mobius.waila.handlers.nei.ModNameFilter; //import mcp.mobius.waila.handlers.SummaryProviderDefault; import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila; -import mcp.mobius.waila.overlay.WailaTickHandler; import mcp.mobius.waila.server.ProxyServer; import mcp.mobius.waila.utils.Constants; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.config.Configuration; @@ -53,8 +22,6 @@ import codechicken.nei.NEIClientConfig; import codechicken.nei.api.API; import codechicken.nei.guihook.GuiContainerManager; import mcp.mobius.waila.cbcore.LangUtil; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.Side; public class ProxyClient extends ProxyServer { diff --git a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java index d07da70..aaa40d4 100644 --- a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java +++ b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java @@ -1,9 +1,5 @@ package mcp.mobius.waila.commands; -import java.util.ArrayList; -import java.util.LinkedHashMap; - -import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index 99c49d1..936f672 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -12,7 +12,6 @@ import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.ModIdentification; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java index 98a22a3..386ea2f 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java @@ -9,15 +9,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.common.config.Configuration; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaEntityAccessor; import mcp.mobius.waila.api.IWailaEntityProvider; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.utils.Constants; import static mcp.mobius.waila.api.SpecialChars.*; public class HUDHandlerEntities implements IWailaEntityProvider { diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java index 98fab24..06fa5f0 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java @@ -10,7 +10,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import codechicken.nei.NEIClientConfig; import codechicken.nei.guihook.GuiContainerManager; @@ -26,7 +25,8 @@ public class HandlerEnchants implements IContainerInputHandler { @Override public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { - ItemStack stackover = GuiContainerManager.getManager().getStackMouseOver(gui); + GuiContainerManager.getManager(); + ItemStack stackover = GuiContainerManager.getStackMouseOver(gui); if(stackover == null) return false; diff --git a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java index ef24a7a..47a03a1 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java @@ -2,7 +2,6 @@ package mcp.mobius.waila.network; import java.util.HashMap; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.config.ConfigCategory; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ConfigHandler; diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java index ab3825e..c07274e 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -1,7 +1,6 @@ package mcp.mobius.waila.network; import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java index 99e2112..951d2c2 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java @@ -1,12 +1,9 @@ package mcp.mobius.waila.network; -import java.lang.reflect.Method; -import java.util.HashMap; import java.util.HashSet; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.utils.AccessHelper; @@ -17,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.server.MinecraftServer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java index c916e6a..337d428 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java @@ -1,6 +1,5 @@ package mcp.mobius.waila.network; -import mcp.mobius.waila.api.impl.DataAccessorBlock; import mcp.mobius.waila.api.impl.DataAccessorEntity; import mcp.mobius.waila.utils.WailaExceptionHandler; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mcp/mobius/waila/overlay/IconUI.java b/src/main/java/mcp/mobius/waila/overlay/IconUI.java index af13905..a795a9e 100644 --- a/src/main/java/mcp/mobius/waila/overlay/IconUI.java +++ b/src/main/java/mcp/mobius/waila/overlay/IconUI.java @@ -3,8 +3,6 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.HashMap; -import mcp.mobius.waila.Waila; - public enum IconUI { HEART (52, 0, 9, 9, 52, 9, 9, 9, "a"), HHEART(61, 0, 9, 9, 52, 9, 9, 9, "b"), diff --git a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java index 8c1ab5c..16f3831 100644 --- a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java +++ b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java @@ -15,8 +15,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java index f68c6ff..7905650 100644 --- a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java +++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -1,7 +1,5 @@ package mcp.mobius.waila.overlay; -import java.util.ArrayList; -import java.util.EnumSet; import java.util.List; import org.lwjgl.input.Keyboard; @@ -13,7 +11,6 @@ import mcp.mobius.waila.api.impl.MetaDataProvider; import mcp.mobius.waila.api.impl.TipList; import mcp.mobius.waila.client.KeyEvent; import mcp.mobius.waila.utils.Constants; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java index 0686891..16d5746 100644 --- a/src/main/java/mcp/mobius/waila/server/ProxyServer.java +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -1,15 +1,11 @@ package mcp.mobius.waila.server; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.LinkedHashMap; - import cpw.mods.fml.common.Loader; import mcp.mobius.waila.Waila; import mcp.mobius.waila.addons.agriculture.AgricultureModule; import mcp.mobius.waila.addons.buildcraft.BCModule; import mcp.mobius.waila.addons.carpenters.CarpentersModule; -import mcp.mobius.waila.addons.enderio.EnderIOModule; import mcp.mobius.waila.addons.enderstorage.EnderStorageModule; import mcp.mobius.waila.addons.etb.ETBModule; import mcp.mobius.waila.addons.exu.ExtraUtilitiesModule; @@ -26,7 +22,6 @@ import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule; import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule; import mcp.mobius.waila.addons.twilightforest.TwilightForestModule; import mcp.mobius.waila.addons.vanillamc.HUDHandlerVanilla; -import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.handlers.DecoratorFMP; diff --git a/src/main/java/mcp/mobius/waila/utils/ModIdentification.java b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java index 29f307d..b7686c8 100644 --- a/src/main/java/mcp/mobius/waila/utils/ModIdentification.java +++ b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java @@ -1,15 +1,9 @@ package mcp.mobius.waila.utils; import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; import java.net.URLDecoder; import java.util.HashMap; -import java.util.Set; - import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import codechicken.core.CommonUtils; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; diff --git a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java index d875388..297c9c1 100644 --- a/src/main/java/mcp/mobius/waila/utils/NBTUtil.java +++ b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java @@ -5,9 +5,6 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.HashSet; -import org.apache.logging.log4j.Level; - -import mcp.mobius.waila.Waila; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTSizeTracker;