diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index 4a6d301733..908ad06ec5 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -12,103 +12,44 @@ */ package cpw.mods.fml.client; -import static org.lwjgl.opengl.GL11.*; - -import java.awt.image.BufferedImage; -import java.awt.Dimension; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.IdentityHashMap; import java.util.List; -import java.util.ListIterator; import java.util.Map; -import java.util.Properties; -import java.util.Random; import java.util.logging.Level; import java.util.logging.Logger; -import javax.imageio.ImageIO; - -import org.lwjgl.opengl.GL11; +import net.minecraft.client.Minecraft; +import net.minecraft.server.MinecraftServer; +import net.minecraft.src.CrashReport; +import net.minecraft.src.Entity; +import net.minecraft.src.EntityLiving; +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.GuiScreen; +import net.minecraft.src.Packet; +import net.minecraft.src.Render; +import net.minecraft.src.RenderManager; +import net.minecraft.src.World; +import net.minecraft.src.WorldClient; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import net.minecraft.client.Minecraft; -import net.minecraft.server.MinecraftServer; -import net.minecraft.src.BaseMod; -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.Block; -import net.minecraft.src.CrashReport; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.GameSettings; -import net.minecraft.src.GuiScreen; -import net.minecraft.src.IBlockAccess; -import net.minecraft.src.IChunkProvider; -import net.minecraft.src.IInventory; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.KeyBinding; -import net.minecraft.src.MLProp; -import net.minecraft.src.ModTextureStatic; -import net.minecraft.src.NetClientHandler; -import net.minecraft.src.NetworkManager; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet1Login; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.Packet3Chat; -import net.minecraft.src.Profiler; -import net.minecraft.src.Render; -import net.minecraft.src.RenderBlocks; -import net.minecraft.src.RenderEngine; -import net.minecraft.src.RenderManager; -import net.minecraft.src.RenderPlayer; -import net.minecraft.src.StringTranslate; -import net.minecraft.src.TextureFX; -import net.minecraft.src.TexturePackBase; -import net.minecraft.src.World; -import net.minecraft.src.WorldClient; -import net.minecraft.src.WorldType; -import argo.jdom.JdomParser; -import argo.jdom.JsonNode; import cpw.mods.fml.client.modloader.ModLoaderClientHelper; -import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLDummyContainer; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.IFMLSidedHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.MetadataCollection; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.ProxyInjector; import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.Side; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.TickType; -import cpw.mods.fml.common.modloader.ModLoaderHelper; -import cpw.mods.fml.common.modloader.ModLoaderModContainer; -import cpw.mods.fml.common.modloader.ModProperty; import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket; import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; diff --git a/fml/client/cpw/mods/fml/client/FMLTextureFX.java b/fml/client/cpw/mods/fml/client/FMLTextureFX.java index 2dbf232237..7f088181e7 100644 --- a/fml/client/cpw/mods/fml/client/FMLTextureFX.java +++ b/fml/client/cpw/mods/fml/client/FMLTextureFX.java @@ -18,11 +18,10 @@ import java.awt.Dimension; import java.util.List; import java.util.logging.Logger; -import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraft.src.RenderEngine; import net.minecraft.src.TextureFX; import net.minecraft.src.TexturePackBase; +import cpw.mods.fml.common.FMLCommonHandler; public class FMLTextureFX extends TextureFX implements ITextureFX { diff --git a/fml/client/cpw/mods/fml/client/GuiModList.java b/fml/client/cpw/mods/fml/client/GuiModList.java index 2085f15e47..324bf0aee3 100644 --- a/fml/client/cpw/mods/fml/client/GuiModList.java +++ b/fml/client/cpw/mods/fml/client/GuiModList.java @@ -16,15 +16,7 @@ package cpw.mods.fml.client; import java.awt.Dimension; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.common.FMLModContainer; -import cpw.mods.fml.common.FMLDummyContainer; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; import net.minecraft.client.Minecraft; import net.minecraft.src.FontRenderer; import net.minecraft.src.GuiButton; @@ -33,6 +25,11 @@ import net.minecraft.src.GuiSmallButton; import net.minecraft.src.StringTranslate; import net.minecraft.src.Tessellator; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; + /** * @author cpw * diff --git a/fml/client/cpw/mods/fml/client/GuiScrollingList.java b/fml/client/cpw/mods/fml/client/GuiScrollingList.java index f602b0ce78..998139d3fa 100644 --- a/fml/client/cpw/mods/fml/client/GuiScrollingList.java +++ b/fml/client/cpw/mods/fml/client/GuiScrollingList.java @@ -1,6 +1,7 @@ package cpw.mods.fml.client; import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.src.GuiButton; import net.minecraft.src.Tessellator; diff --git a/fml/client/cpw/mods/fml/client/GuiSlotModList.java b/fml/client/cpw/mods/fml/client/GuiSlotModList.java index 62f24a4f52..f45eafeaef 100644 --- a/fml/client/cpw/mods/fml/client/GuiSlotModList.java +++ b/fml/client/cpw/mods/fml/client/GuiSlotModList.java @@ -16,15 +16,10 @@ package cpw.mods.fml.client; import java.util.ArrayList; +import net.minecraft.src.Tessellator; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModMetadata; -import net.minecraft.client.Minecraft; -import net.minecraft.src.GuiLanguage; -import net.minecraft.src.GuiSlot; -import net.minecraft.src.StringTranslate; -import net.minecraft.src.Tessellator; /** * @author cpw diff --git a/fml/client/cpw/mods/fml/client/ITextureFX.java b/fml/client/cpw/mods/fml/client/ITextureFX.java index ad8f897699..86d44ba916 100644 --- a/fml/client/cpw/mods/fml/client/ITextureFX.java +++ b/fml/client/cpw/mods/fml/client/ITextureFX.java @@ -16,7 +16,8 @@ package cpw.mods.fml.client; import java.awt.Dimension; -import net.minecraft.src.*; +import net.minecraft.src.RenderEngine; +import net.minecraft.src.TexturePackBase; public interface ITextureFX { diff --git a/fml/client/cpw/mods/fml/client/SpriteHelper.java b/fml/client/cpw/mods/fml/client/SpriteHelper.java index 0860a815f2..cd273d9e5c 100644 --- a/fml/client/cpw/mods/fml/client/SpriteHelper.java +++ b/fml/client/cpw/mods/fml/client/SpriteHelper.java @@ -18,10 +18,8 @@ import java.util.BitSet; import java.util.HashMap; import java.util.logging.Level; -import net.minecraft.src.ModLoader; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.LoaderException; /** * @author cpw diff --git a/fml/client/cpw/mods/fml/client/TextureFXManager.java b/fml/client/cpw/mods/fml/client/TextureFXManager.java index e379d8833f..cde15caedb 100644 --- a/fml/client/cpw/mods/fml/client/TextureFXManager.java +++ b/fml/client/cpw/mods/fml/client/TextureFXManager.java @@ -18,22 +18,20 @@ import java.util.Map; import javax.imageio.ImageIO; +import net.minecraft.client.Minecraft; +import net.minecraft.src.ModTextureStatic; +import net.minecraft.src.RenderEngine; +import net.minecraft.src.TextureFX; +import net.minecraft.src.TexturePackBase; + import org.lwjgl.opengl.GL11; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import net.minecraft.client.Minecraft; -import net.minecraft.src.KeyBinding; -import net.minecraft.src.ModTextureStatic; -import net.minecraft.src.Profiler; -import net.minecraft.src.RenderEngine; -import net.minecraft.src.TextureFX; -import net.minecraft.src.TexturePackBase; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; public class TextureFXManager diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java index 6da433b1a3..a67c40a6e9 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java @@ -19,8 +19,6 @@ import net.minecraft.src.Block; import net.minecraft.src.IBlockAccess; import net.minecraft.src.RenderBlocks; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.modloader.ModLoaderModContainer; /** * @author cpw diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java index fcc272c88a..0393e78795 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java @@ -3,12 +3,13 @@ package cpw.mods.fml.client.modloader; import java.util.Map; import java.util.Map.Entry; -import com.google.common.collect.Maps; - import net.minecraft.client.Minecraft; import net.minecraft.src.BaseMod; import net.minecraft.src.Entity; import net.minecraft.src.Render; + +import com.google.common.collect.Maps; + import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.modloader.IModLoaderSidedHelper; import cpw.mods.fml.common.modloader.ModLoaderHelper; diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java index b78b9e1392..cf4fef0bb1 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java @@ -17,14 +17,9 @@ package cpw.mods.fml.client.modloader; import java.util.EnumSet; import net.minecraft.src.KeyBinding; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.modloader.ModLoaderModContainer; -import cpw.mods.fml.common.registry.TickRegistry; /** * @author cpw diff --git a/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java b/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java index 66228ab9c4..d7f3a2a205 100644 --- a/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java +++ b/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java @@ -1,14 +1,8 @@ package cpw.mods.fml.client.registry; -import java.util.Collections; - -import net.minecraft.src.BiomeGenBase; import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntityRenderer; import net.minecraft.src.TileEntitySpecialRenderer; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.registry.GameRegistry; public class ClientRegistry diff --git a/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java b/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java index 6438f0cafe..7019de56ba 100644 --- a/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java +++ b/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java @@ -4,14 +4,14 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import net.minecraft.src.GameSettings; +import net.minecraft.src.KeyBinding; + import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import com.google.common.collect.Lists; -import net.minecraft.src.GameSettings; -import net.minecraft.src.KeyBinding; - import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.TickType; diff --git a/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java b/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java index c84f26f28f..850577c555 100644 --- a/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java +++ b/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java @@ -1,13 +1,8 @@ package cpw.mods.fml.client.registry; -import java.util.Arrays; import java.util.List; import java.util.Map; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.ObjectArrays; - import net.minecraft.src.Block; import net.minecraft.src.Entity; import net.minecraft.src.IBlockAccess; @@ -15,11 +10,13 @@ import net.minecraft.src.Render; import net.minecraft.src.RenderBlocks; import net.minecraft.src.RenderManager; import net.minecraft.src.RenderPlayer; -import cpw.mods.fml.client.FMLClientHandler; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.ObjectArrays; + import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.TextureFXManager; -import cpw.mods.fml.client.modloader.ModLoaderBlockRendererHandler; -import cpw.mods.fml.common.ObfuscationReflectionHelper; /** * @author cpw diff --git a/fml/client/net/minecraft/src/BaseMod.java b/fml/client/net/minecraft/src/BaseMod.java index ac811556a6..923bdecdc6 100644 --- a/fml/client/net/minecraft/src/BaseMod.java +++ b/fml/client/net/minecraft/src/BaseMod.java @@ -12,21 +12,14 @@ */ package net.minecraft.src; +import static cpw.mods.fml.common.Side.CLIENT; + import java.util.Map; import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.IConsoleHandler; -import cpw.mods.fml.common.ICraftingHandler; -import cpw.mods.fml.common.IDispenseHandler; -import cpw.mods.fml.common.INetworkHandler; -import cpw.mods.fml.common.IPickupNotifier; -import cpw.mods.fml.common.IPlayerTracker; -import cpw.mods.fml.common.IWorldGenerator; -import cpw.mods.fml.common.Side; -import static cpw.mods.fml.common.Side.*; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.asm.SideOnly; diff --git a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java index ca6374065e..e3e4daa3d0 100644 --- a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java +++ b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java @@ -19,10 +19,8 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.TextureFXManager; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; /** diff --git a/fml/client/net/minecraft/src/MLProp.java b/fml/client/net/minecraft/src/MLProp.java index cc7f095ebf..c406124279 100644 --- a/fml/client/net/minecraft/src/MLProp.java +++ b/fml/client/net/minecraft/src/MLProp.java @@ -12,10 +12,11 @@ */ package net.minecraft.src; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.RetentionPolicy.*; -import static java.lang.annotation.ElementType.*; /** * @author cpw diff --git a/fml/client/net/minecraft/src/ModLoader.java b/fml/client/net/minecraft/src/ModLoader.java index 5a9ea3e057..859047e4b3 100644 --- a/fml/client/net/minecraft/src/ModLoader.java +++ b/fml/client/net/minecraft/src/ModLoader.java @@ -12,17 +12,16 @@ */ package net.minecraft.src; +import static cpw.mods.fml.common.Side.CLIENT; + import java.awt.image.BufferedImage; import java.util.Collections; -import java.util.EnumSet; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.logging.Logger; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.TextureFXManager; @@ -34,8 +33,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Side; -import static cpw.mods.fml.common.Side.*; +import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.modloader.ModLoaderHelper; import cpw.mods.fml.common.modloader.ModLoaderModContainer; @@ -45,7 +43,7 @@ import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -import cpw.mods.fml.common.ObfuscationReflectionHelper; +import cpw.mods.fml.server.FMLServerHandler; public class ModLoader { diff --git a/fml/client/net/minecraft/src/ModTextureAnimation.java b/fml/client/net/minecraft/src/ModTextureAnimation.java index 97aaaa6a95..22d8b3d930 100644 --- a/fml/client/net/minecraft/src/ModTextureAnimation.java +++ b/fml/client/net/minecraft/src/ModTextureAnimation.java @@ -18,12 +18,8 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLTextureFX; -import cpw.mods.fml.common.FMLCommonHandler; -import static org.lwjgl.opengl.GL11.*; /** * A texture override for animations, it takes a vertical image of diff --git a/fml/client/net/minecraft/src/ModTextureStatic.java b/fml/client/net/minecraft/src/ModTextureStatic.java index acf0255c95..e111127811 100644 --- a/fml/client/net/minecraft/src/ModTextureStatic.java +++ b/fml/client/net/minecraft/src/ModTextureStatic.java @@ -14,6 +14,8 @@ package net.minecraft.src; +import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D; + import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; @@ -22,8 +24,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLTextureFX; -import cpw.mods.fml.common.FMLCommonHandler; -import static org.lwjgl.opengl.GL11.*; public class ModTextureStatic extends FMLTextureFX { diff --git a/fml/common/cpw/mods/fml/common/DummyModContainer.java b/fml/common/cpw/mods/fml/common/DummyModContainer.java index 051de3f57a..ee6bc3e090 100644 --- a/fml/common/cpw/mods/fml/common/DummyModContainer.java +++ b/fml/common/cpw/mods/fml/common/DummyModContainer.java @@ -3,12 +3,9 @@ package cpw.mods.fml.common; import java.io.File; import java.util.Collections; import java.util.List; -import java.util.Map; import com.google.common.eventbus.EventBus; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.discovery.ContainerType; import cpw.mods.fml.common.versioning.ArtifactVersion; public class DummyModContainer implements ModContainer diff --git a/fml/common/cpw/mods/fml/common/FMLModContainer.java b/fml/common/cpw/mods/fml/common/FMLModContainer.java index be1533cf53..fd698f183f 100644 --- a/fml/common/cpw/mods/fml/common/FMLModContainer.java +++ b/fml/common/cpw/mods/fml/common/FMLModContainer.java @@ -16,7 +16,6 @@ import java.io.File; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -26,23 +25,14 @@ import com.google.common.base.Throwables; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterators; -import com.google.common.collect.ImmutableBiMap.Builder; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import com.google.common.collect.Table; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.Mod.Block; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.Metadata; import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.common.discovery.ContainerType; import cpw.mods.fml.common.event.FMLConstructionEvent; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -52,7 +42,6 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.event.FMLStateEvent; import cpw.mods.fml.common.network.FMLNetworkHandler; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; diff --git a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java index ead9fd51d3..fe73694ce0 100644 --- a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java +++ b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java @@ -1,19 +1,10 @@ package cpw.mods.fml.common; -import java.io.File; -import java.io.InputStream; -import java.lang.reflect.Field; import java.util.List; -import java.util.Properties; -import java.util.logging.Logger; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.DedicatedServer; import net.minecraft.src.Entity; import net.minecraft.src.Packet; -import net.minecraft.src.World; - -import cpw.mods.fml.common.modloader.ModProperty; import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket; import cpw.mods.fml.common.network.EntitySpawnPacket; diff --git a/fml/common/cpw/mods/fml/common/LoadController.java b/fml/common/cpw/mods/fml/common/LoadController.java index 051db96244..ffd795d7bd 100644 --- a/fml/common/cpw/mods/fml/common/LoadController.java +++ b/fml/common/cpw/mods/fml/common/LoadController.java @@ -8,23 +8,19 @@ import java.util.logging.Level; import com.google.common.base.Joiner; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.ImmutableMap.Builder; -import com.google.common.collect.Iterators; import com.google.common.collect.Multimap; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.event.FMLConstructionEvent; import cpw.mods.fml.common.event.FMLLoadEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLStateEvent; -import cpw.mods.fml.common.network.FMLNetworkHandler; public class LoadController { diff --git a/fml/common/cpw/mods/fml/common/Loader.java b/fml/common/cpw/mods/fml/common/Loader.java index cbf3ee158c..ccb4d082cc 100644 --- a/fml/common/cpw/mods/fml/common/Loader.java +++ b/fml/common/cpw/mods/fml/common/Loader.java @@ -14,33 +14,21 @@ package cpw.mods.fml.common; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; -import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.Callable; import java.util.logging.Level; -import java.util.regex.Matcher; -import net.minecraft.server.MinecraftServer; import net.minecraft.src.CallableMinecraftVersion; import com.google.common.base.CharMatcher; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Splitter; -import com.google.common.base.Splitter.MapSplitter; -import com.google.common.base.Throwables; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -53,10 +41,10 @@ import com.google.common.collect.Ordering; import com.google.common.collect.TreeMultimap; import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.discovery.ContainerType; import cpw.mods.fml.common.discovery.ModDiscoverer; import cpw.mods.fml.common.event.FMLLoadEvent; import cpw.mods.fml.common.functions.ModIdFunction; +import cpw.mods.fml.common.modloader.BaseModProxy; import cpw.mods.fml.common.toposort.ModSorter; import cpw.mods.fml.common.toposort.ModSortingException; import cpw.mods.fml.common.toposort.TopologicalSort; diff --git a/fml/common/cpw/mods/fml/common/MetadataCollection.java b/fml/common/cpw/mods/fml/common/MetadataCollection.java index 34652c7319..bcb624365c 100644 --- a/fml/common/cpw/mods/fml/common/MetadataCollection.java +++ b/fml/common/cpw/mods/fml/common/MetadataCollection.java @@ -1,20 +1,14 @@ package cpw.mods.fml.common; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import argo.jdom.JdomParser; import argo.jdom.JsonNode; import argo.jdom.JsonRootNode; -import argo.saj.InvalidSyntaxException; import com.google.common.base.Throwables; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; public class MetadataCollection diff --git a/fml/common/cpw/mods/fml/common/Mod.java b/fml/common/cpw/mods/fml/common/Mod.java index 0b62e062a9..028fc63502 100644 --- a/fml/common/cpw/mods/fml/common/Mod.java +++ b/fml/common/cpw/mods/fml/common/Mod.java @@ -18,13 +18,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartedEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.common.event.FMLServerStoppingEvent; - import net.minecraft.src.ItemBlock; /** diff --git a/fml/common/cpw/mods/fml/common/ModClassLoader.java b/fml/common/cpw/mods/fml/common/ModClassLoader.java index c93dba3a19..6e3e5331da 100644 --- a/fml/common/cpw/mods/fml/common/ModClassLoader.java +++ b/fml/common/cpw/mods/fml/common/ModClassLoader.java @@ -14,7 +14,6 @@ package cpw.mods.fml.common; import java.io.File; -import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; @@ -24,8 +23,6 @@ import java.util.logging.Level; import com.google.common.collect.ImmutableList; -import cpw.mods.fml.common.discovery.ModCandidate; -import cpw.mods.fml.relauncher.FMLRelauncher; import cpw.mods.fml.relauncher.RelaunchClassLoader; /** diff --git a/fml/common/cpw/mods/fml/common/ModContainer.java b/fml/common/cpw/mods/fml/common/ModContainer.java index 01fe8c172c..84fb6fad4f 100644 --- a/fml/common/cpw/mods/fml/common/ModContainer.java +++ b/fml/common/cpw/mods/fml/common/ModContainer.java @@ -18,7 +18,6 @@ import java.util.List; import com.google.common.eventbus.EventBus; -import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.versioning.ArtifactVersion; /** diff --git a/fml/common/cpw/mods/fml/common/ProxyInjector.java b/fml/common/cpw/mods/fml/common/ProxyInjector.java index b3c4055e08..e64b481d73 100644 --- a/fml/common/cpw/mods/fml/common/ProxyInjector.java +++ b/fml/common/cpw/mods/fml/common/ProxyInjector.java @@ -19,8 +19,6 @@ import java.lang.reflect.Modifier; import java.util.Set; import java.util.logging.Level; -import org.objectweb.asm.Type; - import cpw.mods.fml.common.discovery.ASMDataTable; import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; diff --git a/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java b/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java index c8d3c4a83b..4c59358836 100644 --- a/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java +++ b/fml/common/cpw/mods/fml/common/asm/FMLSanityChecker.java @@ -9,7 +9,6 @@ import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Opcodes; -import cpw.mods.fml.relauncher.FMLRelauncher; import cpw.mods.fml.relauncher.IFMLCallHook; import cpw.mods.fml.relauncher.RelaunchClassLoader; diff --git a/fml/common/cpw/mods/fml/common/asm/SideOnly.java b/fml/common/cpw/mods/fml/common/asm/SideOnly.java index b339389b4e..19f7d3f652 100644 --- a/fml/common/cpw/mods/fml/common/asm/SideOnly.java +++ b/fml/common/cpw/mods/fml/common/asm/SideOnly.java @@ -4,6 +4,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import cpw.mods.fml.common.Side; @Retention(RetentionPolicy.RUNTIME) diff --git a/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index 008c958a09..78b51354c2 100644 --- a/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -1,27 +1,20 @@ package cpw.mods.fml.common.asm.transformers; +import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_PROTECTED; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_FINAL; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Collection; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -29,15 +22,12 @@ import java.util.zip.ZipOutputStream; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Type; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.MethodNode; -import com.google.common.base.CharMatcher; import com.google.common.base.Charsets; import com.google.common.base.Splitter; -import com.google.common.base.Strings; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; diff --git a/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java b/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java index cc8fb20809..195bea0bc5 100644 --- a/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java +++ b/fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java @@ -1,17 +1,37 @@ package cpw.mods.fml.common.asm.transformers; -import java.io.*; -import java.net.URL; -import java.util.*; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.LinkedHashSet; +import java.util.List; import java.util.Map.Entry; -import java.util.zip.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipOutputStream; -import org.objectweb.asm.*; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AnnotationNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldNode; +import org.objectweb.asm.tree.MethodNode; import com.google.common.base.Objects; -import com.google.common.base.Optional; -import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/fml/common/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java b/fml/common/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java index 4fd282f006..6551b03b80 100644 --- a/fml/common/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java +++ b/fml/common/cpw/mods/fml/common/asm/transformers/MarkerTransformer.java @@ -1,27 +1,14 @@ package cpw.mods.fml.common.asm.transformers; -import static org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static org.objectweb.asm.Opcodes.ACC_PROTECTED; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ACC_FINAL; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.net.URL; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -29,20 +16,14 @@ import java.util.zip.ZipOutputStream; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Type; import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldNode; -import org.objectweb.asm.tree.MethodNode; -import com.google.common.base.CharMatcher; import com.google.common.base.Charsets; import com.google.common.base.Splitter; -import com.google.common.base.Strings; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; import com.google.common.io.LineProcessor; import com.google.common.io.Resources; diff --git a/fml/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java b/fml/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java index 0a8a2d8a61..cb90572b4d 100644 --- a/fml/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java +++ b/fml/common/cpw/mods/fml/common/asm/transformers/SideTransformer.java @@ -11,7 +11,6 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.MethodNode; -import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.relauncher.FMLRelauncher; import cpw.mods.fml.relauncher.IClassTransformer; diff --git a/fml/common/cpw/mods/fml/common/discovery/ASMDataTable.java b/fml/common/cpw/mods/fml/common/discovery/ASMDataTable.java index 27b90475ed..9812a804d1 100644 --- a/fml/common/cpw/mods/fml/common/discovery/ASMDataTable.java +++ b/fml/common/cpw/mods/fml/common/discovery/ASMDataTable.java @@ -1,7 +1,5 @@ package cpw.mods.fml.common.discovery; -import java.io.File; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -10,12 +8,10 @@ import com.google.common.base.Predicate; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSetMultimap; -import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; -import com.google.common.collect.ImmutableBiMap.Builder; import cpw.mods.fml.common.ModContainer; diff --git a/fml/common/cpw/mods/fml/common/discovery/ModDiscoverer.java b/fml/common/cpw/mods/fml/common/discovery/ModDiscoverer.java index aaee56138a..d6a3bcebf5 100644 --- a/fml/common/cpw/mods/fml/common/discovery/ModDiscoverer.java +++ b/fml/common/cpw/mods/fml/common/discovery/ModDiscoverer.java @@ -1,44 +1,15 @@ package cpw.mods.fml.common.discovery; import java.io.File; -import java.io.FileFilter; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.nio.channels.FileChannel; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.logging.Level; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.Attribute; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.FieldVisitor; -import org.objectweb.asm.Opcodes; - -import com.google.common.base.Supplier; import com.google.common.base.Throwables; -import com.google.common.collect.HashBasedTable; -import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableTable; -import com.google.common.collect.Tables; -import com.google.common.collect.ImmutableTable.Builder; import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import com.google.common.collect.Table; -import com.google.common.collect.Table.Cell; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.LoaderException; diff --git a/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java b/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java index db9c114f2a..02058276ad 100644 --- a/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java +++ b/fml/common/cpw/mods/fml/common/discovery/asm/ASMModParser.java @@ -3,7 +3,6 @@ package cpw.mods.fml.common.discovery.asm; import java.io.IOException; import java.io.InputStream; import java.util.LinkedList; -import java.util.List; import net.minecraft.src.BaseMod; @@ -13,10 +12,8 @@ import org.objectweb.asm.Type; import com.google.common.base.Objects; import com.google.common.collect.Lists; -import cpw.mods.fml.common.LoaderException; import cpw.mods.fml.common.discovery.ASMDataTable; import cpw.mods.fml.common.discovery.ModCandidate; -import cpw.mods.fml.common.discovery.ModDiscoverer; public class ASMModParser { diff --git a/fml/common/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java b/fml/common/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java index a204091cd2..692b7d48a1 100644 --- a/fml/common/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java +++ b/fml/common/cpw/mods/fml/common/discovery/asm/ModMethodVisitor.java @@ -5,7 +5,6 @@ import java.util.LinkedList; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; import com.google.common.collect.Lists; diff --git a/fml/common/cpw/mods/fml/common/event/FMLConstructionEvent.java b/fml/common/cpw/mods/fml/common/event/FMLConstructionEvent.java index 7782433784..ba3beff61d 100644 --- a/fml/common/cpw/mods/fml/common/event/FMLConstructionEvent.java +++ b/fml/common/cpw/mods/fml/common/event/FMLConstructionEvent.java @@ -1,16 +1,8 @@ package cpw.mods.fml.common.event; -import java.util.List; -import java.util.Map; - -import com.google.common.collect.Table; - import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.ModClassLoader; -import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.discovery.ASMDataTable; -import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; -import cpw.mods.fml.common.discovery.ModDiscoverer; public class FMLConstructionEvent extends FMLStateEvent { diff --git a/fml/common/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java b/fml/common/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java index c615bfaefe..28f9a1c87f 100644 --- a/fml/common/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java +++ b/fml/common/cpw/mods/fml/common/event/FMLLoadCompleteEvent.java @@ -1,6 +1,5 @@ package cpw.mods.fml.common.event; -import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.LoaderState.ModState; public class FMLLoadCompleteEvent extends FMLStateEvent diff --git a/fml/common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java b/fml/common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java index 369b53e1e0..ed356b04ea 100644 --- a/fml/common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java +++ b/fml/common/cpw/mods/fml/common/event/FMLPreInitializationEvent.java @@ -2,12 +2,10 @@ package cpw.mods.fml.common.event; import java.io.File; -import com.google.common.eventbus.EventBus; - import cpw.mods.fml.common.LoaderState.ModState; -import cpw.mods.fml.common.discovery.ASMDataTable; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModMetadata; +import cpw.mods.fml.common.discovery.ASMDataTable; public class FMLPreInitializationEvent extends FMLStateEvent { diff --git a/fml/common/cpw/mods/fml/common/event/FMLServerStartedEvent.java b/fml/common/cpw/mods/fml/common/event/FMLServerStartedEvent.java index 36bab33635..f496ae9bd0 100644 --- a/fml/common/cpw/mods/fml/common/event/FMLServerStartedEvent.java +++ b/fml/common/cpw/mods/fml/common/event/FMLServerStartedEvent.java @@ -1,6 +1,5 @@ package cpw.mods.fml.common.event; -import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.LoaderState.ModState; public class FMLServerStartedEvent extends FMLStateEvent diff --git a/fml/common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java b/fml/common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java index e60730d3d6..d1665e437c 100644 --- a/fml/common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java +++ b/fml/common/cpw/mods/fml/common/event/FMLServerStoppingEvent.java @@ -1,6 +1,5 @@ package cpw.mods.fml.common.event; -import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.LoaderState.ModState; public class FMLServerStoppingEvent extends FMLStateEvent diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java index 5adab4b8b1..f22f926faa 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java @@ -17,20 +17,16 @@ package cpw.mods.fml.common.modloader; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; -import java.util.Random; import net.minecraft.src.BaseMod; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ICraftingHandler; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.network.IConnectionHandler; import cpw.mods.fml.common.network.IPacketHandler; -import cpw.mods.fml.relauncher.ReflectionHelper; /** * @author cpw diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java index 6a2964c0c1..57ee1a71e9 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java @@ -19,20 +19,13 @@ import java.io.FileWriter; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.AbstractCollection; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.logging.Level; -import net.minecraft.src.MLProp; - import com.google.common.base.Strings; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; @@ -43,22 +36,16 @@ import com.google.common.eventbus.Subscribe; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.IConsoleHandler; -import cpw.mods.fml.common.ICraftingHandler; -import cpw.mods.fml.common.IDispenseHandler; -import cpw.mods.fml.common.IFMLSidedHandler; -import cpw.mods.fml.common.INetworkHandler; -import cpw.mods.fml.common.IPickupNotifier; -import cpw.mods.fml.common.IPlayerTracker; -import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderException; -import cpw.mods.fml.common.LoaderState; -import cpw.mods.fml.common.ModClassLoader; -import cpw.mods.fml.common.Side; -import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.MetadataCollection; +import cpw.mods.fml.common.ModClassLoader; +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.ModMetadata; +import cpw.mods.fml.common.ProxyInjector; +import cpw.mods.fml.common.Side; +import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.discovery.ASMDataTable; import cpw.mods.fml.common.discovery.ASMDataTable.ASMData; import cpw.mods.fml.common.discovery.ContainerType; @@ -67,16 +54,11 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.FMLNetworkHandler; -import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.ProxyInjector; -import cpw.mods.fml.common.TickType; public class ModLoaderModContainer implements ModContainer { diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java index 6b6de2dd6c..fcf23621f2 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java @@ -6,7 +6,6 @@ import net.minecraft.src.ChunkProviderGenerate; import net.minecraft.src.ChunkProviderHell; import net.minecraft.src.IChunkProvider; import net.minecraft.src.World; - import cpw.mods.fml.common.IWorldGenerator; public class ModLoaderWorldGenerator implements IWorldGenerator diff --git a/fml/common/cpw/mods/fml/common/modloader/ModProperty.java b/fml/common/cpw/mods/fml/common/modloader/ModProperty.java index d5f5b91ff1..8577fef85c 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModProperty.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModProperty.java @@ -14,7 +14,6 @@ package cpw.mods.fml.common.modloader; -import java.io.File; import java.lang.reflect.Field; import java.util.Map; diff --git a/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java b/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java index fbdbf6509d..c936a37532 100644 --- a/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java +++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java @@ -1,14 +1,14 @@ package cpw.mods.fml.common.network; +import net.minecraft.src.NetHandler; +import net.minecraft.src.NetworkManager; + import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import cpw.mods.fml.common.FMLCommonHandler; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; - public class EntitySpawnAdjustmentPacket extends FMLPacket { diff --git a/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java b/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java index 5ed0349fc1..d5a788f6d6 100644 --- a/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java +++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java @@ -8,10 +8,16 @@ import java.io.IOException; import java.util.List; import java.util.logging.Level; +import net.minecraft.src.DataWatcher; +import net.minecraft.src.Entity; +import net.minecraft.src.EntityLiving; +import net.minecraft.src.MathHelper; +import net.minecraft.src.NetHandler; +import net.minecraft.src.NetworkManager; + import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import com.google.common.primitives.Bytes; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; @@ -20,13 +26,6 @@ import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.common.registry.IThrowableEntity; -import net.minecraft.src.DataWatcher; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.MathHelper; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; -import net.minecraft.src.World; public class EntitySpawnPacket extends FMLPacket { diff --git a/fml/common/cpw/mods/fml/common/network/FMLPacket.java b/fml/common/cpw/mods/fml/common/network/FMLPacket.java index 37f9e46003..e67eae83b3 100644 --- a/fml/common/cpw/mods/fml/common/network/FMLPacket.java +++ b/fml/common/cpw/mods/fml/common/network/FMLPacket.java @@ -1,17 +1,13 @@ package cpw.mods.fml.common.network; import java.util.Arrays; -import java.util.List; -import java.util.Map; import java.util.logging.Level; import net.minecraft.src.NetHandler; import net.minecraft.src.NetworkManager; import com.google.common.base.Throwables; -import com.google.common.io.ByteStreams; import com.google.common.primitives.Bytes; -import com.google.common.primitives.Primitives; import com.google.common.primitives.UnsignedBytes; import cpw.mods.fml.common.FMLLog; diff --git a/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java b/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java index 64185d5be0..cbd8491e18 100644 --- a/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java +++ b/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java @@ -1,11 +1,8 @@ package cpw.mods.fml.common.network; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EntityPlayerMP; import net.minecraft.src.NetHandler; import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetServerHandler; import net.minecraft.src.NetworkManager; import net.minecraft.src.Packet1Login; diff --git a/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java b/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java index fe11a04401..6cabf83478 100644 --- a/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java @@ -1,23 +1,19 @@ package cpw.mods.fml.common.network; -import static cpw.mods.fml.common.network.FMLPacket.Type.*; +import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDENTIFIERS; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; + +import net.minecraft.src.NetHandler; +import net.minecraft.src.NetworkManager; import com.google.common.collect.Maps; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import cpw.mods.fml.common.FMLLog; - -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetworkManager; - public class ModIdentifiersPacket extends FMLPacket { diff --git a/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java b/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java index 626c832a2e..01fdfeb506 100644 --- a/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java @@ -1,11 +1,11 @@ package cpw.mods.fml.common.network; -import static cpw.mods.fml.common.network.FMLPacket.Type.*; +import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_LIST_REQUEST; +import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_LIST_RESPONSE; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Level; import net.minecraft.src.NetHandler; import net.minecraft.src.NetworkManager; @@ -17,7 +17,6 @@ import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; diff --git a/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java b/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java index 64e45baddd..3925631b74 100644 --- a/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java @@ -1,11 +1,18 @@ package cpw.mods.fml.common.network; -import static cpw.mods.fml.common.network.FMLPacket.Type.*; +import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDENTIFIERS; +import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_LIST_RESPONSE; +import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_MISSING; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.src.NetHandler; +import net.minecraft.src.NetLoginHandler; +import net.minecraft.src.NetworkManager; +import net.minecraft.src.Packet250CustomPayload; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.ByteArrayDataInput; @@ -16,11 +23,6 @@ import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetworkManager; -import net.minecraft.src.Packet250CustomPayload; - public class ModListResponsePacket extends FMLPacket { private Map modVersions; diff --git a/fml/common/cpw/mods/fml/common/network/NetworkMod.java b/fml/common/cpw/mods/fml/common/network/NetworkMod.java index c4b9bbdefb..5d3106a634 100644 --- a/fml/common/cpw/mods/fml/common/network/NetworkMod.java +++ b/fml/common/cpw/mods/fml/common/network/NetworkMod.java @@ -4,9 +4,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import java.util.EnumSet; - -import cpw.mods.fml.common.Side; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/fml/common/cpw/mods/fml/common/network/NetworkModHandler.java b/fml/common/cpw/mods/fml/common/network/NetworkModHandler.java index 87792cbbf3..305b191509 100644 --- a/fml/common/cpw/mods/fml/common/network/NetworkModHandler.java +++ b/fml/common/cpw/mods/fml/common/network/NetworkModHandler.java @@ -1,17 +1,9 @@ package cpw.mods.fml.common.network; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Collection; import java.util.Set; import java.util.logging.Level; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.NetServerHandler; -import net.minecraft.src.NetworkManager; - -import org.objectweb.asm.Type; - import com.google.common.base.Strings; import cpw.mods.fml.common.FMLLog; diff --git a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java index 9a7c43ead8..48286fcb5e 100644 --- a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java @@ -1,9 +1,6 @@ package cpw.mods.fml.common.network; -import java.io.UnsupportedEncodingException; import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -19,7 +16,6 @@ import net.minecraft.src.NetServerHandler; import net.minecraft.src.NetworkManager; import net.minecraft.src.Packet1Login; import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.TcpConnection; import net.minecraft.src.World; import com.google.common.base.Charsets; @@ -28,12 +24,9 @@ import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Iterables; -import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import com.google.common.collect.Multimaps; -import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java b/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java index e7511a7c9a..cbc8be5436 100644 --- a/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java +++ b/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java @@ -1,15 +1,13 @@ package cpw.mods.fml.common.network; -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; - -import cpw.mods.fml.common.FMLCommonHandler; - import net.minecraft.src.EntityPlayer; import net.minecraft.src.NetHandler; import net.minecraft.src.NetworkManager; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; + public class OpenGuiPacket extends FMLPacket { private int windowId; diff --git a/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java b/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java index 5c25cec2a9..b61df8d5fb 100644 --- a/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java +++ b/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java @@ -1,10 +1,9 @@ package cpw.mods.fml.common.network; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.src.EntityPlayerMP; import net.minecraft.src.Packet; import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.World; +import cpw.mods.fml.common.FMLCommonHandler; /** * A simple utility class to send packet 250 packets around the place diff --git a/fml/common/cpw/mods/fml/common/registry/EntityRegistry.java b/fml/common/cpw/mods/fml/common/registry/EntityRegistry.java index af810f834e..4d6f1a9474 100644 --- a/fml/common/cpw/mods/fml/common/registry/EntityRegistry.java +++ b/fml/common/cpw/mods/fml/common/registry/EntityRegistry.java @@ -6,6 +6,14 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; +import net.minecraft.src.BiomeGenBase; +import net.minecraft.src.Entity; +import net.minecraft.src.EntityList; +import net.minecraft.src.EntityLiving; +import net.minecraft.src.EntityTracker; +import net.minecraft.src.EnumCreatureType; +import net.minecraft.src.SpawnListEntry; + import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; @@ -16,14 +24,6 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.ModContainer; -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityList; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityTracker; -import net.minecraft.src.EnumCreatureType; -import net.minecraft.src.SpawnListEntry; - public class EntityRegistry { diff --git a/fml/common/cpw/mods/fml/common/registry/GameRegistry.java b/fml/common/cpw/mods/fml/common/registry/GameRegistry.java index d9e2eadffa..4d4c871388 100644 --- a/fml/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/fml/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -1,6 +1,5 @@ package cpw.mods.fml.common.registry; -import java.util.HashSet; import java.util.List; import java.util.Random; import java.util.Set; @@ -24,7 +23,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.ICraftingHandler; import cpw.mods.fml.common.IDispenseHandler; diff --git a/fml/common/cpw/mods/fml/common/toposort/ModSorter.java b/fml/common/cpw/mods/fml/common/toposort/ModSorter.java index 1b946f0099..dd363e0213 100644 --- a/fml/common/cpw/mods/fml/common/toposort/ModSorter.java +++ b/fml/common/cpw/mods/fml/common/toposort/ModSorter.java @@ -19,7 +19,6 @@ import java.util.Map; import com.google.common.collect.Lists; import cpw.mods.fml.common.DummyModContainer; -import cpw.mods.fml.common.FMLModContainer; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.toposort.TopologicalSort.DirectedGraph; import cpw.mods.fml.common.versioning.ArtifactVersion; diff --git a/fml/common/cpw/mods/fml/common/toposort/ModSortingException.java b/fml/common/cpw/mods/fml/common/toposort/ModSortingException.java index 967f7af4c6..27a5cd5eec 100644 --- a/fml/common/cpw/mods/fml/common/toposort/ModSortingException.java +++ b/fml/common/cpw/mods/fml/common/toposort/ModSortingException.java @@ -2,8 +2,6 @@ package cpw.mods.fml.common.toposort; import java.util.Set; -import cpw.mods.fml.common.ModContainer; - public class ModSortingException extends RuntimeException { public class SortingExceptionData diff --git a/fml/common/cpw/mods/fml/common/versioning/VersionParser.java b/fml/common/cpw/mods/fml/common/versioning/VersionParser.java index 85e2d1dab8..0ed57cddc4 100644 --- a/fml/common/cpw/mods/fml/common/versioning/VersionParser.java +++ b/fml/common/cpw/mods/fml/common/versioning/VersionParser.java @@ -5,7 +5,6 @@ import java.util.logging.Level; import com.google.common.base.Splitter; import com.google.common.base.Strings; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import cpw.mods.fml.common.FMLLog; diff --git a/fml/common/cpw/mods/fml/relauncher/Downloader.java b/fml/common/cpw/mods/fml/relauncher/Downloader.java index c68e72b198..711760cf9f 100644 --- a/fml/common/cpw/mods/fml/relauncher/Downloader.java +++ b/fml/common/cpw/mods/fml/relauncher/Downloader.java @@ -1,37 +1,18 @@ package cpw.mods.fml.relauncher; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Container; import java.awt.Dialog.ModalityType; import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.ByteBuffer; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import javax.swing.AbstractButton; -import javax.swing.BorderFactory; import javax.swing.Box; -import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JProgressBar; -import javax.swing.JRootPane; -import javax.swing.JWindow; import cpw.mods.fml.common.FMLLog; diff --git a/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java b/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java index a9f0711b46..1100c1cacb 100644 --- a/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java +++ b/fml/common/cpw/mods/fml/relauncher/FMLRelaunchLog.java @@ -10,8 +10,6 @@ import java.util.logging.Level; import java.util.logging.LogManager; import java.util.logging.Logger; -import cpw.mods.fml.relauncher.FMLLogFormatter; - public class FMLRelaunchLog { diff --git a/fml/common/cpw/mods/fml/relauncher/ReflectionHelper.java b/fml/common/cpw/mods/fml/relauncher/ReflectionHelper.java index f441197feb..80717761ac 100644 --- a/fml/common/cpw/mods/fml/relauncher/ReflectionHelper.java +++ b/fml/common/cpw/mods/fml/relauncher/ReflectionHelper.java @@ -14,8 +14,6 @@ package cpw.mods.fml.relauncher; import java.lang.reflect.Field; import java.lang.reflect.Method; - -import cpw.mods.fml.common.FMLCommonHandler; /** * Some reflection helper code. * diff --git a/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java b/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java index 22af78428c..42ae525b7f 100644 --- a/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java +++ b/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java @@ -1,43 +1,29 @@ package cpw.mods.fml.relauncher; -import java.awt.HeadlessException; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; import java.lang.reflect.Method; -import java.math.BigInteger; import java.net.MalformedURLException; -import java.net.URI; import java.net.URL; import java.net.URLConnection; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; -import java.nio.channels.Channels; import java.nio.channels.FileChannel; -import java.nio.channels.ReadableByteChannel; import java.nio.channels.FileChannel.MapMode; import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.jar.Attributes; -import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.swing.JOptionPane; -import javax.swing.ProgressMonitorInputStream; - -import cpw.mods.fml.common.discovery.ModCandidate; public class RelaunchLibraryManager { diff --git a/fml/common/cpw/mods/fml/server/FMLServerHandler.java b/fml/common/cpw/mods/fml/server/FMLServerHandler.java index 8d36855b84..56633c9d80 100644 --- a/fml/common/cpw/mods/fml/server/FMLServerHandler.java +++ b/fml/common/cpw/mods/fml/server/FMLServerHandler.java @@ -12,50 +12,17 @@ */ package cpw.mods.fml.server; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; -import java.util.ArrayList; import java.util.List; -import java.util.Properties; -import java.util.Random; -import java.util.logging.Logger; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.BaseMod; -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.Block; import net.minecraft.src.Entity; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.IChunkProvider; -import net.minecraft.src.ICommandManager; -import net.minecraft.src.IInventory; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MLProp; -import net.minecraft.src.NetworkManager; import net.minecraft.src.Packet; -import net.minecraft.src.Packet1Login; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.Packet3Chat; -import net.minecraft.src.Profiler; -import net.minecraft.src.StringTranslate; import net.minecraft.src.World; -import net.minecraft.src.WorldType; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFMLSidedHandler; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.ProxyInjector; import cpw.mods.fml.common.Side; -import cpw.mods.fml.common.modloader.ModLoaderModContainer; -import cpw.mods.fml.common.modloader.ModProperty; import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket; import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.registry.LanguageRegistry;