From 2d9f409c7d2aaff599d962a124148e0b2da5a36e Mon Sep 17 00:00:00 2001 From: Chicken-Bomes Date: Wed, 9 Apr 2014 13:38:05 +1000 Subject: [PATCH] Organised imports --- codechicken/lib/asm/ASMHelper.java | 25 ++++--------- codechicken/lib/asm/ASMReader.java | 18 ++------- codechicken/lib/asm/ClassHeirachyManager.java | 15 +++----- codechicken/lib/asm/InsnListPrinter.java | 27 +++----------- .../lib/asm/InstructionComparator.java | 19 +--------- codechicken/lib/asm/ObfMapping.java | 37 +++++++------------ codechicken/lib/colour/Colour.java | 6 +-- codechicken/lib/colour/CustomGradient.java | 7 ++-- codechicken/lib/config/ConfigFile.java | 7 +--- codechicken/lib/config/ConfigTag.java | 6 +-- codechicken/lib/config/ConfigTagParent.java | 6 +-- codechicken/lib/config/SimpleProperties.java | 6 +-- codechicken/lib/data/MCDataInput.java | 2 +- codechicken/lib/data/MCDataOutput.java | 2 +- .../lib/data/MCOutputStreamWrapper.java | 8 ++-- codechicken/lib/gui/GuiDraw.java | 21 +++++------ codechicken/lib/inventory/InventoryUtils.java | 3 +- codechicken/lib/inventory/ItemKey.java | 5 +-- codechicken/lib/lighting/LightMatrix.java | 1 - codechicken/lib/lighting/LightModel.java | 3 -- codechicken/lib/packet/PacketCustom.java | 4 -- codechicken/lib/raytracer/RayTracer.java | 6 +-- codechicken/lib/render/CCModel.java | 26 ++++--------- codechicken/lib/render/CCModelLibrary.java | 6 +-- codechicken/lib/render/CCRenderPipeline.java | 4 +- codechicken/lib/render/FontUtils.java | 3 +- codechicken/lib/render/RenderUtils.java | 23 +++++------- codechicken/lib/render/ShaderProgram.java | 10 ++--- .../lib/render/SpriteSheetManager.java | 7 ++-- codechicken/lib/render/TextureSpecial.java | 6 +-- codechicken/lib/render/TextureUtils.java | 23 +++++------- codechicken/lib/render/Vertex5.java | 8 ++-- codechicken/lib/tool/LibDownloader.java | 4 +- codechicken/lib/vec/BlockCoord.java | 2 +- codechicken/lib/vec/Cuboid6.java | 8 ++-- codechicken/lib/vec/Matrix4.java | 11 +++--- codechicken/lib/vec/Quat.java | 5 ++- codechicken/lib/vec/Rotation.java | 17 ++++----- codechicken/lib/vec/Scale.java | 9 ++--- codechicken/lib/vec/TransformationList.java | 6 +-- codechicken/lib/vec/Translation.java | 9 ++--- codechicken/lib/vec/Vector3.java | 21 +++++------ codechicken/lib/world/ChunkExtension.java | 10 ++--- codechicken/lib/world/WorldExtension.java | 6 +-- .../lib/world/WorldExtensionInstantiator.java | 2 +- .../lib/world/WorldExtensionManager.java | 14 +++---- 46 files changed, 174 insertions(+), 300 deletions(-) diff --git a/codechicken/lib/asm/ASMHelper.java b/codechicken/lib/asm/ASMHelper.java index d8f4e73..d4b03c1 100644 --- a/codechicken/lib/asm/ASMHelper.java +++ b/codechicken/lib/asm/ASMHelper.java @@ -1,27 +1,18 @@ package codechicken.lib.asm; +import codechicken.lib.asm.InstructionComparator.InsnListSection; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.tree.*; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Label; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.LabelNode; -import org.objectweb.asm.tree.LocalVariableNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.TryCatchBlockNode; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import codechicken.lib.asm.InstructionComparator.InsnListSection; - public class ASMHelper { public static class CodeBlock diff --git a/codechicken/lib/asm/ASMReader.java b/codechicken/lib/asm/ASMReader.java index fd15f1e..ce1aa5b 100644 --- a/codechicken/lib/asm/ASMReader.java +++ b/codechicken/lib/asm/ASMReader.java @@ -1,5 +1,8 @@ package codechicken.lib.asm; +import com.google.common.collect.ImmutableMap; +import org.objectweb.asm.tree.*; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -7,21 +10,6 @@ import java.io.InputStreamReader; import java.util.HashMap; import java.util.Map; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.IincInsnNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.InsnNode; -import org.objectweb.asm.tree.IntInsnNode; -import org.objectweb.asm.tree.JumpInsnNode; -import org.objectweb.asm.tree.LabelNode; -import org.objectweb.asm.tree.LdcInsnNode; -import org.objectweb.asm.tree.LineNumberNode; -import org.objectweb.asm.tree.MultiANewArrayInsnNode; -import org.objectweb.asm.tree.VarInsnNode; - - -import com.google.common.collect.ImmutableMap; - import static org.objectweb.asm.Opcodes.*; import static org.objectweb.asm.tree.AbstractInsnNode.*; diff --git a/codechicken/lib/asm/ClassHeirachyManager.java b/codechicken/lib/asm/ClassHeirachyManager.java index d04cb52..7fd93e1 100644 --- a/codechicken/lib/asm/ClassHeirachyManager.java +++ b/codechicken/lib/asm/ClassHeirachyManager.java @@ -1,14 +1,13 @@ package codechicken.lib.asm; +import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.LaunchClassLoader; +import org.objectweb.asm.tree.ClassNode; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import org.objectweb.asm.tree.ClassNode; - -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; - -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.LaunchClassLoader; /** * This is added as a class transformer if CodeChickenCore is installed. Adding it as a class transformer will speed evaluation up slightly by automatically caching superclasses when they are first loaded. @@ -67,11 +66,9 @@ public class ClassHeirachyManager implements IClassTransformer } /** - * Returns true if clazz extends, either directly or indirectly, superclass. * @param name The class in question * @param superclass The class being extended - * @param bytes The bytes for the class. Only needed if not already defined. - * @return + * @return true if clazz extends, either directly or indirectly, superclass. */ public static boolean classExtends(String name, String superclass) { diff --git a/codechicken/lib/asm/InsnListPrinter.java b/codechicken/lib/asm/InsnListPrinter.java index 5c72282..5c3c078 100644 --- a/codechicken/lib/asm/InsnListPrinter.java +++ b/codechicken/lib/asm/InsnListPrinter.java @@ -1,31 +1,14 @@ package codechicken.lib.asm; +import codechicken.lib.asm.InstructionComparator.InsnListSection; +import org.objectweb.asm.Label; +import org.objectweb.asm.tree.*; +import org.objectweb.asm.util.Textifier; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.HashMap; -import org.objectweb.asm.Label; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.FrameNode; -import org.objectweb.asm.tree.IincInsnNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.IntInsnNode; -import org.objectweb.asm.tree.InvokeDynamicInsnNode; -import org.objectweb.asm.tree.JumpInsnNode; -import org.objectweb.asm.tree.LabelNode; -import org.objectweb.asm.tree.LdcInsnNode; -import org.objectweb.asm.tree.LineNumberNode; -import org.objectweb.asm.tree.LookupSwitchInsnNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MultiANewArrayInsnNode; -import org.objectweb.asm.tree.TableSwitchInsnNode; -import org.objectweb.asm.tree.TypeInsnNode; -import org.objectweb.asm.tree.VarInsnNode; -import org.objectweb.asm.util.Textifier; - -import codechicken.lib.asm.InstructionComparator.InsnListSection; - public class InsnListPrinter extends Textifier { private boolean buildingLabelMap = false; diff --git a/codechicken/lib/asm/InstructionComparator.java b/codechicken/lib/asm/InstructionComparator.java index 3d4b07c..9e516b1 100644 --- a/codechicken/lib/asm/InstructionComparator.java +++ b/codechicken/lib/asm/InstructionComparator.java @@ -1,29 +1,14 @@ package codechicken.lib.asm; +import org.objectweb.asm.tree.*; + import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.IincInsnNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.IntInsnNode; -import org.objectweb.asm.tree.JumpInsnNode; -import org.objectweb.asm.tree.LabelNode; -import org.objectweb.asm.tree.LdcInsnNode; -import org.objectweb.asm.tree.LineNumberNode; -import org.objectweb.asm.tree.LookupSwitchInsnNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.TableSwitchInsnNode; -import org.objectweb.asm.tree.TypeInsnNode; -import org.objectweb.asm.tree.VarInsnNode; - import static org.objectweb.asm.tree.AbstractInsnNode.*; -import codechicken.lib.asm.ObfMapping; - public class InstructionComparator { public static class InsnListSection diff --git a/codechicken/lib/asm/ObfMapping.java b/codechicken/lib/asm/ObfMapping.java index 5945248..3f8d85d 100644 --- a/codechicken/lib/asm/ObfMapping.java +++ b/codechicken/lib/asm/ObfMapping.java @@ -1,5 +1,19 @@ package codechicken.lib.asm; +import codechicken.lib.config.ConfigFile; +import codechicken.lib.config.ConfigTag; +import com.google.common.base.Charsets; +import com.google.common.base.Objects; +import com.google.common.io.LineProcessor; +import com.google.common.io.Resources; +import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; +import cpw.mods.fml.relauncher.FMLInjectionData; +import net.minecraft.launchwrapper.Launch; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.commons.Remapper; +import org.objectweb.asm.tree.*; + +import javax.swing.*; import java.io.File; import java.io.IOException; import java.lang.reflect.Field; @@ -7,29 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import codechicken.lib.config.ConfigFile; -import codechicken.lib.config.ConfigTag; -import com.google.common.base.Charsets; -import com.google.common.io.LineProcessor; -import com.google.common.io.Resources; -import cpw.mods.fml.relauncher.FMLInjectionData; -import net.minecraft.launchwrapper.Launch; - -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.commons.Remapper; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.FieldNode; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.TypeInsnNode; - -import com.google.common.base.Objects; - -import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper; - -import javax.swing.*; - public class ObfMapping { public static class ObfRemapper extends Remapper diff --git a/codechicken/lib/colour/Colour.java b/codechicken/lib/colour/Colour.java index 3fa78c2..ea8a636 100644 --- a/codechicken/lib/colour/Colour.java +++ b/codechicken/lib/colour/Colour.java @@ -1,12 +1,10 @@ package codechicken.lib.colour; -import codechicken.lib.util.Copyable; -import org.lwjgl.opengl.GL11; - import codechicken.lib.math.MathHelper; - +import codechicken.lib.util.Copyable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; public abstract class Colour implements Copyable { diff --git a/codechicken/lib/colour/CustomGradient.java b/codechicken/lib/colour/CustomGradient.java index b4a5a0b..ba3270f 100644 --- a/codechicken/lib/colour/CustomGradient.java +++ b/codechicken/lib/colour/CustomGradient.java @@ -1,11 +1,10 @@ package codechicken.lib.colour; -import java.awt.image.BufferedImage; - -import net.minecraft.util.ResourceLocation; - import codechicken.lib.math.MathHelper; import codechicken.lib.render.TextureUtils; +import net.minecraft.util.ResourceLocation; + +import java.awt.image.BufferedImage; public class CustomGradient { diff --git a/codechicken/lib/config/ConfigFile.java b/codechicken/lib/config/ConfigFile.java index 3e6e5e1..bddec27 100644 --- a/codechicken/lib/config/ConfigFile.java +++ b/codechicken/lib/config/ConfigFile.java @@ -1,11 +1,6 @@ package codechicken.lib.config; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintWriter; +import java.io.*; public class ConfigFile extends ConfigTagParent { diff --git a/codechicken/lib/config/ConfigTag.java b/codechicken/lib/config/ConfigTag.java index 98472a4..cd3b8ad 100644 --- a/codechicken/lib/config/ConfigTag.java +++ b/codechicken/lib/config/ConfigTag.java @@ -1,12 +1,12 @@ package codechicken.lib.config; +import codechicken.lib.colour.Colour; +import codechicken.lib.colour.ColourRGBA; + import java.io.PrintWriter; import java.util.regex.Matcher; import java.util.regex.Pattern; -import codechicken.lib.colour.Colour; -import codechicken.lib.colour.ColourRGBA; - public class ConfigTag extends ConfigTagParent { public ConfigTag(ConfigTagParent parent, String name) diff --git a/codechicken/lib/config/ConfigTagParent.java b/codechicken/lib/config/ConfigTagParent.java index 0db27f9..d293ad9 100644 --- a/codechicken/lib/config/ConfigTagParent.java +++ b/codechicken/lib/config/ConfigTagParent.java @@ -3,11 +3,7 @@ package codechicken.lib.config; import java.io.BufferedReader; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import java.util.Map.Entry; public abstract class ConfigTagParent diff --git a/codechicken/lib/config/SimpleProperties.java b/codechicken/lib/config/SimpleProperties.java index aa2c34f..4a33669 100644 --- a/codechicken/lib/config/SimpleProperties.java +++ b/codechicken/lib/config/SimpleProperties.java @@ -1,10 +1,6 @@ package codechicken.lib.config; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStreamReader; -import java.io.PrintStream; +import java.io.*; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map.Entry; diff --git a/codechicken/lib/data/MCDataInput.java b/codechicken/lib/data/MCDataInput.java index fda1d45..496c4a3 100644 --- a/codechicken/lib/data/MCDataInput.java +++ b/codechicken/lib/data/MCDataInput.java @@ -1,9 +1,9 @@ package codechicken.lib.data; +import codechicken.lib.vec.BlockCoord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; -import codechicken.lib.vec.BlockCoord; public interface MCDataInput { diff --git a/codechicken/lib/data/MCDataOutput.java b/codechicken/lib/data/MCDataOutput.java index fbe6710..cf7cf89 100644 --- a/codechicken/lib/data/MCDataOutput.java +++ b/codechicken/lib/data/MCDataOutput.java @@ -1,9 +1,9 @@ package codechicken.lib.data; +import codechicken.lib.vec.BlockCoord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; -import codechicken.lib.vec.BlockCoord; public interface MCDataOutput { diff --git a/codechicken/lib/data/MCOutputStreamWrapper.java b/codechicken/lib/data/MCOutputStreamWrapper.java index f8d94c5..49d4328 100644 --- a/codechicken/lib/data/MCOutputStreamWrapper.java +++ b/codechicken/lib/data/MCOutputStreamWrapper.java @@ -1,14 +1,14 @@ package codechicken.lib.data; -import java.io.DataOutputStream; -import java.io.IOException; - +import codechicken.lib.vec.BlockCoord; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; -import codechicken.lib.vec.BlockCoord; + +import java.io.DataOutputStream; +import java.io.IOException; public class MCOutputStreamWrapper implements MCDataOutput { diff --git a/codechicken/lib/gui/GuiDraw.java b/codechicken/lib/gui/GuiDraw.java index b930d26..59875ca 100644 --- a/codechicken/lib/gui/GuiDraw.java +++ b/codechicken/lib/gui/GuiDraw.java @@ -1,26 +1,23 @@ package codechicken.lib.gui; -import java.awt.Dimension; -import java.awt.Point; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import codechicken.lib.math.MathHelper; import codechicken.lib.render.CCRenderState; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class GuiDraw { diff --git a/codechicken/lib/inventory/InventoryUtils.java b/codechicken/lib/inventory/InventoryUtils.java index 7f063e1..3f922e3 100644 --- a/codechicken/lib/inventory/InventoryUtils.java +++ b/codechicken/lib/inventory/InventoryUtils.java @@ -1,8 +1,7 @@ package codechicken.lib.inventory; -import com.google.common.base.Objects; - import codechicken.lib.vec.Vector3; +import com.google.common.base.Objects; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; diff --git a/codechicken/lib/inventory/ItemKey.java b/codechicken/lib/inventory/ItemKey.java index 0adb687..71d3c50 100644 --- a/codechicken/lib/inventory/ItemKey.java +++ b/codechicken/lib/inventory/ItemKey.java @@ -1,13 +1,12 @@ package codechicken.lib.inventory; +import com.google.common.base.Objects; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import com.google.common.base.Objects; import net.minecraftforge.oredict.OreDictionary; -import static codechicken.lib.inventory.InventoryUtils.*; +import static codechicken.lib.inventory.InventoryUtils.actualDamage; /** * Comparable ItemStack with a hashCode implementation. diff --git a/codechicken/lib/lighting/LightMatrix.java b/codechicken/lib/lighting/LightMatrix.java index 54cf902..d35e420 100644 --- a/codechicken/lib/lighting/LightMatrix.java +++ b/codechicken/lib/lighting/LightMatrix.java @@ -3,7 +3,6 @@ package codechicken.lib.lighting; import codechicken.lib.colour.ColourRGBA; import codechicken.lib.render.CCRenderState; import codechicken.lib.vec.BlockCoord; -import codechicken.lib.vec.Vector3; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.world.IBlockAccess; diff --git a/codechicken/lib/lighting/LightModel.java b/codechicken/lib/lighting/LightModel.java index 88bf784..aa33a80 100644 --- a/codechicken/lib/lighting/LightModel.java +++ b/codechicken/lib/lighting/LightModel.java @@ -1,9 +1,6 @@ package codechicken.lib.lighting; -import net.minecraft.client.renderer.Tessellator; -import codechicken.lib.render.CCModel; import codechicken.lib.render.CCRenderState; -import codechicken.lib.render.uv.UV; import codechicken.lib.vec.Rotation; import codechicken.lib.vec.Vector3; diff --git a/codechicken/lib/packet/PacketCustom.java b/codechicken/lib/packet/PacketCustom.java index 463454d..cc9c651 100644 --- a/codechicken/lib/packet/PacketCustom.java +++ b/codechicken/lib/packet/PacketCustom.java @@ -4,7 +4,6 @@ package codechicken.lib.packet; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.BlockCoord; - import com.google.common.collect.Maps; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ModContainer; @@ -13,14 +12,12 @@ import cpw.mods.fml.common.network.handshake.NetworkDispatcher; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.codec.compression.Snappy; import io.netty.util.AttributeKey; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +32,6 @@ import net.minecraft.network.play.INetHandlerPlayClient; import net.minecraft.network.play.INetHandlerPlayServer; import net.minecraft.server.MinecraftServer; import net.minecraft.server.management.PlayerManager; -import net.minecraft.server.management.PlayerManager.PlayerInstance; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.fluids.FluidStack; diff --git a/codechicken/lib/raytracer/RayTracer.java b/codechicken/lib/raytracer/RayTracer.java index 3fdb45c..12d9d49 100644 --- a/codechicken/lib/raytracer/RayTracer.java +++ b/codechicken/lib/raytracer/RayTracer.java @@ -1,7 +1,5 @@ package codechicken.lib.raytracer; -import java.util.List; - import codechicken.lib.math.MathHelper; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Cuboid6; @@ -13,11 +11,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import java.util.List; + public class RayTracer { private Vector3 vec = new Vector3(); diff --git a/codechicken/lib/render/CCModel.java b/codechicken/lib/render/CCModel.java index 9d37b26..526119e 100644 --- a/codechicken/lib/render/CCModel.java +++ b/codechicken/lib/render/CCModel.java @@ -1,31 +1,21 @@ package codechicken.lib.render; -import java.io.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import codechicken.lib.lighting.LC; +import codechicken.lib.lighting.LightModel; import codechicken.lib.render.uv.UV; import codechicken.lib.render.uv.UVTransformation; import codechicken.lib.render.uv.UVTranslation; import codechicken.lib.util.Copyable; +import codechicken.lib.vec.*; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; -import codechicken.lib.lighting.LightModel; -import codechicken.lib.vec.Cuboid6; -import codechicken.lib.vec.RedundantTransformation; -import codechicken.lib.vec.Transformation; -import codechicken.lib.vec.TransformationList; -import codechicken.lib.vec.Vector3; -import static codechicken.lib.vec.Rotation.*; +import java.io.*; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static codechicken.lib.vec.Rotation.sideRotations; public class CCModel implements CCRenderState.IVertexSource, Copyable { diff --git a/codechicken/lib/render/CCModelLibrary.java b/codechicken/lib/render/CCModelLibrary.java index bb246c1..0987aab 100644 --- a/codechicken/lib/render/CCModelLibrary.java +++ b/codechicken/lib/render/CCModelLibrary.java @@ -1,10 +1,6 @@ package codechicken.lib.render; -import codechicken.lib.vec.Matrix4; -import codechicken.lib.vec.Quat; -import codechicken.lib.vec.Rotation; -import codechicken.lib.vec.Scale; -import codechicken.lib.vec.Vector3; +import codechicken.lib.vec.*; import static codechicken.lib.math.MathHelper.phi; diff --git a/codechicken/lib/render/CCRenderPipeline.java b/codechicken/lib/render/CCRenderPipeline.java index d2dcaff..b25141e 100644 --- a/codechicken/lib/render/CCRenderPipeline.java +++ b/codechicken/lib/render/CCRenderPipeline.java @@ -1,10 +1,10 @@ package codechicken.lib.render; -import java.util.ArrayList; - import codechicken.lib.render.CCRenderState.IVertexOperation; import codechicken.lib.render.CCRenderState.VertexAttribute; +import java.util.ArrayList; + public class CCRenderPipeline { public class PipelineBuilder diff --git a/codechicken/lib/render/FontUtils.java b/codechicken/lib/render/FontUtils.java index 97ac4a5..b927046 100644 --- a/codechicken/lib/render/FontUtils.java +++ b/codechicken/lib/render/FontUtils.java @@ -1,10 +1,9 @@ package codechicken.lib.render; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; public class FontUtils { diff --git a/codechicken/lib/render/RenderUtils.java b/codechicken/lib/render/RenderUtils.java index 2ee90dd..d878113 100644 --- a/codechicken/lib/render/RenderUtils.java +++ b/codechicken/lib/render/RenderUtils.java @@ -1,31 +1,26 @@ package codechicken.lib.render; -import static net.minecraftforge.client.IItemRenderer.ItemRenderType.ENTITY; -import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; - -import codechicken.lib.render.uv.UV; -import codechicken.lib.render.uv.UVTransformation; -import org.lwjgl.opengl.GL11; - import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Rectangle4i; -import codechicken.lib.vec.Transformation; -import codechicken.lib.vec.Rotation; import codechicken.lib.vec.Vector3; -import net.minecraft.util.IIcon; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; + +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.ENTITY; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; public class RenderUtils { diff --git a/codechicken/lib/render/ShaderProgram.java b/codechicken/lib/render/ShaderProgram.java index df8dd16..d813ffa 100644 --- a/codechicken/lib/render/ShaderProgram.java +++ b/codechicken/lib/render/ShaderProgram.java @@ -1,16 +1,16 @@ package codechicken.lib.render; -import static org.lwjgl.opengl.ARBShaderObjects.*; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.ARBVertexShader; +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.vector.Matrix4f; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.ARBVertexShader; -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.vector.Matrix4f; +import static org.lwjgl.opengl.ARBShaderObjects.*; public class ShaderProgram { diff --git a/codechicken/lib/render/SpriteSheetManager.java b/codechicken/lib/render/SpriteSheetManager.java index f8a1157..b64436a 100644 --- a/codechicken/lib/render/SpriteSheetManager.java +++ b/codechicken/lib/render/SpriteSheetManager.java @@ -1,17 +1,16 @@ package codechicken.lib.render; -import java.util.ArrayList; -import java.util.HashMap; - import codechicken.lib.render.TextureUtils.IIconSelfRegister; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import java.util.ArrayList; +import java.util.HashMap; + public class SpriteSheetManager { @SideOnly(Side.CLIENT) diff --git a/codechicken/lib/render/TextureSpecial.java b/codechicken/lib/render/TextureSpecial.java index 777749a..03eb55c 100644 --- a/codechicken/lib/render/TextureSpecial.java +++ b/codechicken/lib/render/TextureSpecial.java @@ -1,8 +1,5 @@ package codechicken.lib.render; -import java.awt.image.BufferedImage; -import java.util.ArrayList; - import codechicken.lib.render.SpriteSheetManager.SpriteSheet; import codechicken.lib.render.TextureUtils.IIconSelfRegister; import cpw.mods.fml.relauncher.Side; @@ -16,6 +13,9 @@ import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.settings.GameSettings; import net.minecraft.util.ResourceLocation; +import java.awt.image.BufferedImage; +import java.util.ArrayList; + @SideOnly(Side.CLIENT) public class TextureSpecial extends TextureAtlasSprite implements IIconSelfRegister { //sprite sheet fields diff --git a/codechicken/lib/render/TextureUtils.java b/codechicken/lib/render/TextureUtils.java index 8556332..0c04353 100644 --- a/codechicken/lib/render/TextureUtils.java +++ b/codechicken/lib/render/TextureUtils.java @@ -1,27 +1,24 @@ package codechicken.lib.render; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; - -import javax.imageio.ImageIO; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourARGB; - +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; public class TextureUtils { diff --git a/codechicken/lib/render/Vertex5.java b/codechicken/lib/render/Vertex5.java index 41683af..358b1f8 100644 --- a/codechicken/lib/render/Vertex5.java +++ b/codechicken/lib/render/Vertex5.java @@ -1,15 +1,15 @@ package codechicken.lib.render; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; - import codechicken.lib.render.uv.UV; import codechicken.lib.render.uv.UVTransformation; import codechicken.lib.util.Copyable; import codechicken.lib.vec.Transformation; import codechicken.lib.vec.Vector3; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; + public class Vertex5 implements Copyable { public Vector3 vec; diff --git a/codechicken/lib/tool/LibDownloader.java b/codechicken/lib/tool/LibDownloader.java index 0785b43..a36f026 100644 --- a/codechicken/lib/tool/LibDownloader.java +++ b/codechicken/lib/tool/LibDownloader.java @@ -1,6 +1,8 @@ package codechicken.lib.tool; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; diff --git a/codechicken/lib/vec/BlockCoord.java b/codechicken/lib/vec/BlockCoord.java index 061a4cd..318677f 100644 --- a/codechicken/lib/vec/BlockCoord.java +++ b/codechicken/lib/vec/BlockCoord.java @@ -1,8 +1,8 @@ package codechicken.lib.vec; +import codechicken.lib.math.MathHelper; import codechicken.lib.util.Copyable; import net.minecraft.tileentity.TileEntity; -import codechicken.lib.math.MathHelper; public class BlockCoord implements Comparable, Copyable { diff --git a/codechicken/lib/vec/Cuboid6.java b/codechicken/lib/vec/Cuboid6.java index 8101cf1..4b4fa14 100644 --- a/codechicken/lib/vec/Cuboid6.java +++ b/codechicken/lib/vec/Cuboid6.java @@ -1,13 +1,13 @@ package codechicken.lib.vec; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; - import codechicken.lib.util.Copyable; import net.minecraft.block.Block; import net.minecraft.util.AxisAlignedBB; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; + public class Cuboid6 implements Copyable { public static Cuboid6 full = new Cuboid6(0, 0, 0, 1, 1, 1); diff --git a/codechicken/lib/vec/Matrix4.java b/codechicken/lib/vec/Matrix4.java index 1ac8a13..5d85a13 100644 --- a/codechicken/lib/vec/Matrix4.java +++ b/codechicken/lib/vec/Matrix4.java @@ -1,5 +1,10 @@ package codechicken.lib.vec; +import codechicken.lib.util.Copyable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; @@ -7,12 +12,6 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.DoubleBuffer; -import codechicken.lib.util.Copyable; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class Matrix4 extends Transformation implements Copyable { private static DoubleBuffer glBuf = ByteBuffer.allocateDirect(16*8).order(ByteOrder.nativeOrder()).asDoubleBuffer(); diff --git a/codechicken/lib/vec/Quat.java b/codechicken/lib/vec/Quat.java index 404daa6..b938c2e 100644 --- a/codechicken/lib/vec/Quat.java +++ b/codechicken/lib/vec/Quat.java @@ -1,10 +1,11 @@ package codechicken.lib.vec; +import codechicken.lib.math.MathHelper; +import codechicken.lib.util.Copyable; + import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; -import codechicken.lib.math.MathHelper; -import codechicken.lib.util.Copyable; public class Quat implements Copyable { diff --git a/codechicken/lib/vec/Rotation.java b/codechicken/lib/vec/Rotation.java index af253f2..0dd0b9f 100644 --- a/codechicken/lib/vec/Rotation.java +++ b/codechicken/lib/vec/Rotation.java @@ -1,19 +1,16 @@ package codechicken.lib.vec; +import codechicken.lib.math.MathHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import org.lwjgl.opengl.GL11; + import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - -import codechicken.lib.math.MathHelper; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class Rotation extends Transformation { /** diff --git a/codechicken/lib/vec/Scale.java b/codechicken/lib/vec/Scale.java index a6e38b1..922755c 100644 --- a/codechicken/lib/vec/Scale.java +++ b/codechicken/lib/vec/Scale.java @@ -1,14 +1,13 @@ package codechicken.lib.vec; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class Scale extends Transformation { public Vector3 factor; diff --git a/codechicken/lib/vec/TransformationList.java b/codechicken/lib/vec/TransformationList.java index 4b383ea..b9cee64 100644 --- a/codechicken/lib/vec/TransformationList.java +++ b/codechicken/lib/vec/TransformationList.java @@ -1,11 +1,11 @@ package codechicken.lib.vec; -import java.util.ArrayList; -import java.util.Iterator; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.Iterator; + public class TransformationList extends Transformation { private ArrayList transformations = new ArrayList(); diff --git a/codechicken/lib/vec/Translation.java b/codechicken/lib/vec/Translation.java index 63c18e5..9ef8286 100644 --- a/codechicken/lib/vec/Translation.java +++ b/codechicken/lib/vec/Translation.java @@ -1,14 +1,13 @@ package codechicken.lib.vec; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class Translation extends Transformation { public Vector3 vec; diff --git a/codechicken/lib/vec/Vector3.java b/codechicken/lib/vec/Vector3.java index 944029b..8a690df 100644 --- a/codechicken/lib/vec/Vector3.java +++ b/codechicken/lib/vec/Vector3.java @@ -1,22 +1,19 @@ package codechicken.lib.vec; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; - +import codechicken.lib.math.MathHelper; import codechicken.lib.util.Copyable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; import org.lwjgl.util.vector.Vector4f; -import codechicken.lib.math.MathHelper; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Vec3; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; public class Vector3 implements Copyable { diff --git a/codechicken/lib/world/ChunkExtension.java b/codechicken/lib/world/ChunkExtension.java index 0dc3c90..c3f17b7 100644 --- a/codechicken/lib/world/ChunkExtension.java +++ b/codechicken/lib/world/ChunkExtension.java @@ -1,12 +1,12 @@ package codechicken.lib.world; -import java.util.HashSet; - -import net.minecraft.network.Packet; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.chunk.Chunk; + +import java.util.HashSet; public abstract class ChunkExtension { diff --git a/codechicken/lib/world/WorldExtension.java b/codechicken/lib/world/WorldExtension.java index 3df2593..3015f93 100644 --- a/codechicken/lib/world/WorldExtension.java +++ b/codechicken/lib/world/WorldExtension.java @@ -1,11 +1,11 @@ package codechicken.lib.world; -import java.util.HashMap; - -import net.minecraft.world.chunk.Chunk; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import java.util.HashMap; public abstract class WorldExtension { diff --git a/codechicken/lib/world/WorldExtensionInstantiator.java b/codechicken/lib/world/WorldExtensionInstantiator.java index 754b441..23431b0 100644 --- a/codechicken/lib/world/WorldExtensionInstantiator.java +++ b/codechicken/lib/world/WorldExtensionInstantiator.java @@ -1,7 +1,7 @@ package codechicken.lib.world; -import net.minecraft.world.chunk.Chunk; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; public abstract class WorldExtensionInstantiator { diff --git a/codechicken/lib/world/WorldExtensionManager.java b/codechicken/lib/world/WorldExtensionManager.java index 97c3d02..dd7f192 100644 --- a/codechicken/lib/world/WorldExtensionManager.java +++ b/codechicken/lib/world/WorldExtensionManager.java @@ -1,25 +1,23 @@ package codechicken.lib.world; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; - import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; - import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; +import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.EmptyChunk; -import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; -import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.event.world.ChunkWatchEvent.UnWatch; import net.minecraftforge.event.world.ChunkWatchEvent.Watch; +import net.minecraftforge.event.world.WorldEvent; + +import java.util.ArrayList; +import java.util.HashMap; public class WorldExtensionManager {