diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index 966dd3c..63737cd 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -21,7 +21,6 @@ import emt.proxy.CommonProxy; import emt.util.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/emt/block/BlockBaseContainer.java b/src/main/java/emt/block/BlockBaseContainer.java index 29cfad4..05a5401 100644 --- a/src/main/java/emt/block/BlockBaseContainer.java +++ b/src/main/java/emt/block/BlockBaseContainer.java @@ -7,7 +7,6 @@ import emt.EMT; import emt.tile.TileEntityEMT; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/emt/block/BlockElectricCloud.java b/src/main/java/emt/block/BlockElectricCloud.java index 2f93480..1ebbb2c 100644 --- a/src/main/java/emt/block/BlockElectricCloud.java +++ b/src/main/java/emt/block/BlockElectricCloud.java @@ -1,6 +1,5 @@ package emt.block; -import java.util.List; import java.util.Random; import cpw.mods.fml.relauncher.Side; @@ -8,12 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.tile.TileElectricCloud; import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; @@ -21,10 +15,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXSparkle; -import thaumcraft.client.fx.particles.FXWisp; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; -import thaumcraft.common.tiles.TileNitor; public class BlockElectricCloud extends BlockBase { public IIcon icon; diff --git a/src/main/java/emt/block/BlockEssentiaGenerators.java b/src/main/java/emt/block/BlockEssentiaGenerators.java index 05ceafa..f4d610a 100644 --- a/src/main/java/emt/block/BlockEssentiaGenerators.java +++ b/src/main/java/emt/block/BlockEssentiaGenerators.java @@ -17,8 +17,6 @@ import net.minecraft.world.World; import java.util.List; import java.util.Random; -import org.lwjgl.opengl.GL11; - public class BlockEssentiaGenerators extends BlockBaseContainer { public BlockEssentiaGenerators(String name) { diff --git a/src/main/java/emt/block/BlockPortableNode.java b/src/main/java/emt/block/BlockPortableNode.java index 9004a44..a9d4794 100644 --- a/src/main/java/emt/block/BlockPortableNode.java +++ b/src/main/java/emt/block/BlockPortableNode.java @@ -5,18 +5,14 @@ import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.tile.TileEntityPortableNode; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; import thaumcraft.common.blocks.BlockAiry; -import java.util.List; import java.util.Random; public class BlockPortableNode extends BlockAiry { diff --git a/src/main/java/emt/block/BlockSolars.java b/src/main/java/emt/block/BlockSolars.java index 671be04..835e4b6 100644 --- a/src/main/java/emt/block/BlockSolars.java +++ b/src/main/java/emt/block/BlockSolars.java @@ -3,8 +3,6 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.block.BlockBaseContainer.IconSet; -import emt.tile.TileEntityEMT; import emt.tile.solar.air.TileEntityAirSolar; import emt.tile.solar.air.TileEntityDoubleAirSolar; import emt.tile.solar.air.TileEntityTripleAirSolar; @@ -34,7 +32,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; diff --git a/src/main/java/emt/client/EMTKeys.java b/src/main/java/emt/client/EMTKeys.java index 762745a..b58fb58 100644 --- a/src/main/java/emt/client/EMTKeys.java +++ b/src/main/java/emt/client/EMTKeys.java @@ -1,11 +1,5 @@ package emt.client; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import org.lwjgl.input.Keyboard; import cpw.mods.fml.client.registry.ClientRegistry; diff --git a/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java index cb7d8db..6aa26b3 100644 --- a/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java @@ -6,7 +6,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; public class ContainerIndustrialWandRecharge extends Container { diff --git a/src/main/java/emt/client/model/ModelSpecialArmor.java b/src/main/java/emt/client/model/ModelSpecialArmor.java index 6a380f3..f475018 100644 --- a/src/main/java/emt/client/model/ModelSpecialArmor.java +++ b/src/main/java/emt/client/model/ModelSpecialArmor.java @@ -2,17 +2,11 @@ package emt.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBow; -import net.minecraft.util.MathHelper; - -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelSpecialArmor extends ModelBiped { diff --git a/src/main/java/emt/client/model/ModelWings.java b/src/main/java/emt/client/model/ModelWings.java index 913d637..b2d215c 100644 --- a/src/main/java/emt/client/model/ModelWings.java +++ b/src/main/java/emt/client/model/ModelWings.java @@ -1,10 +1,8 @@ package emt.client.model; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; public class ModelWings extends ModelBiped { diff --git a/src/main/java/emt/client/renderer/RenderShield.java b/src/main/java/emt/client/renderer/RenderShield.java index 94437c7..271127e 100644 --- a/src/main/java/emt/client/renderer/RenderShield.java +++ b/src/main/java/emt/client/renderer/RenderShield.java @@ -6,11 +6,9 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import emt.EMT; -import emt.entity.EntityLaser; import emt.entity.EntityShield; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/src/main/java/emt/entity/EntityArcher.java b/src/main/java/emt/entity/EntityArcher.java index 79f8fff..af8fb8e 100644 --- a/src/main/java/emt/entity/EntityArcher.java +++ b/src/main/java/emt/entity/EntityArcher.java @@ -14,7 +14,6 @@ import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/entity/EntityEnergyBall.java b/src/main/java/emt/entity/EntityEnergyBall.java index 49bfec4..7d194b3 100644 --- a/src/main/java/emt/entity/EntityEnergyBall.java +++ b/src/main/java/emt/entity/EntityEnergyBall.java @@ -1,23 +1,16 @@ package emt.entity; import java.util.ArrayList; -import java.util.List; -import java.util.Random; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import emt.util.EMTRandomHelper.Bolt; -import emt.util.EMTRandomHelper.Point; import io.netty.buffer.ByteBuf; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; -import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; diff --git a/src/main/java/emt/entity/EntityLaser.java b/src/main/java/emt/entity/EntityLaser.java index d93625f..d254ca1 100644 --- a/src/main/java/emt/entity/EntityLaser.java +++ b/src/main/java/emt/entity/EntityLaser.java @@ -1,17 +1,14 @@ package emt.entity; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.common.registry.IThrowableEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; diff --git a/src/main/java/emt/entity/EntityShield.java b/src/main/java/emt/entity/EntityShield.java index ac8d6b0..1124e24 100644 --- a/src/main/java/emt/entity/EntityShield.java +++ b/src/main/java/emt/entity/EntityShield.java @@ -1,19 +1,11 @@ package emt.entity; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ic2.core.IC2; -import net.minecraft.client.Minecraft; -import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class EntityShield extends Entity { diff --git a/src/main/java/emt/init/EMTBlocks.java b/src/main/java/emt/init/EMTBlocks.java index 9d58c40..41a183f 100644 --- a/src/main/java/emt/init/EMTBlocks.java +++ b/src/main/java/emt/init/EMTBlocks.java @@ -8,16 +8,12 @@ import emt.block.BlockPortableNode; import emt.block.BlockShield; import emt.block.BlockSolars; import emt.item.block.ItemBlockElectricCloud; -import emt.item.block.ItemBlockEssentiaGenerator; import emt.item.block.ItemBlockEssentiaGenerators; import emt.item.block.ItemBlockMachines; import emt.item.block.ItemBlockSolars; import ic2.api.item.IC2Items; import net.minecraft.block.Block; -import net.minecraft.block.Block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; + import static thaumcraft.api.ThaumcraftApi.*; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/emt/init/EMTEntities.java b/src/main/java/emt/init/EMTEntities.java index 8c6eb7c..48c8914 100644 --- a/src/main/java/emt/init/EMTEntities.java +++ b/src/main/java/emt/init/EMTEntities.java @@ -9,7 +9,6 @@ import emt.entity.EntityShield; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList.EntityEggInfo; -import net.minecraft.entity.EntityLiving; public class EMTEntities { diff --git a/src/main/java/emt/init/EMTItems.java b/src/main/java/emt/init/EMTItems.java index f938840..f3394ac 100644 --- a/src/main/java/emt/init/EMTItems.java +++ b/src/main/java/emt/init/EMTItems.java @@ -37,8 +37,6 @@ import emt.item.tool.drill.ItemThaumiumDrill; import emt.item.tool.omnitool.ItemOmnitoolDiamond; import emt.item.tool.omnitool.ItemOmnitoolIron; import emt.item.tool.omnitool.ItemOmnitoolThaumium; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/init/EMTRecipes.java b/src/main/java/emt/init/EMTRecipes.java index e52f53b..13249d6 100644 --- a/src/main/java/emt/init/EMTRecipes.java +++ b/src/main/java/emt/init/EMTRecipes.java @@ -1,6 +1,5 @@ package emt.init; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import emt.EMT; import emt.util.EMTConfigHandler; @@ -8,32 +7,27 @@ import emt.util.EMTCraftingAspects; import emt.util.EMTResearchAspects; import static emt.util.EMTRandomHelper.*; -import ic2.api.item.ElectricItem; + import ic2.api.item.IC2Items; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.Recipes; import ic2.core.BasicMachineRecipeManager; import ic2.core.Ic2Items; -import ic2.core.item.ItemFluidCell; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; + import static thaumcraft.api.ThaumcraftApi.*; -import thaumcraft.api.aspects.Aspect; + import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.CrucibleRecipe; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.crafting.ShapedArcaneRecipe; import thaumcraft.api.crafting.ShapelessArcaneRecipe; -import thaumcraft.common.blocks.ItemJarFilled; import thaumcraft.common.blocks.ItemJarNode; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java index a2f5e6e..00c31d4 100644 --- a/src/main/java/emt/init/EMTResearches.java +++ b/src/main/java/emt/init/EMTResearches.java @@ -1,16 +1,13 @@ package emt.init; import emt.EMT; -import emt.client.EMTKeys; import emt.util.EMTConfigHandler; import emt.util.EMTResearchAspects; import emt.util.EMTResearchItem; import ic2.api.item.IC2Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; public class EMTResearches { diff --git a/src/main/java/emt/item/ItemBase.java b/src/main/java/emt/item/ItemBase.java index 75ebaff..f55e430 100644 --- a/src/main/java/emt/item/ItemBase.java +++ b/src/main/java/emt/item/ItemBase.java @@ -1,6 +1,5 @@ package emt.item; -import emt.EMT; import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.item.Item; diff --git a/src/main/java/emt/item/ItemMaterials.java b/src/main/java/emt/item/ItemMaterials.java index 1c57a3e..276abf5 100644 --- a/src/main/java/emt/item/ItemMaterials.java +++ b/src/main/java/emt/item/ItemMaterials.java @@ -3,14 +3,12 @@ package emt.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,7 +21,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowNockEvent; -import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.Config; import thaumcraft.common.lib.utils.InventoryUtils; diff --git a/src/main/java/emt/item/ItemOneRing.java b/src/main/java/emt/item/ItemOneRing.java index 22c7d1f..09f104a 100644 --- a/src/main/java/emt/item/ItemOneRing.java +++ b/src/main/java/emt/item/ItemOneRing.java @@ -16,7 +16,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import java.util.List; diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index bc04a9a..2618400 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -4,13 +4,11 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; -import ic2.api.util.Keys; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 7976050..8cd7ae2 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -1,68 +1,39 @@ package emt.item.armor.chestplate; -import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; import emt.client.model.ModelSpecialArmor; -import emt.client.model.ModelWings; import emt.init.EMTItems; -import emt.item.armor.wings.ItemNanoWing; -import emt.item.armor.wings.ItemQuantumWing; import emt.util.EMTConfigHandler; -import emt.util.EMTRandomHelper; -import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; -import ic2.api.item.IElectricItemManager; import ic2.core.IC2; -import ic2.core.IC2Achievements; -import ic2.core.IC2Potion; -import ic2.core.Ic2Items; -import ic2.core.Platform; -import ic2.core.audio.AudioManager; import ic2.core.audio.AudioSource; import ic2.core.audio.PositionSpec; import ic2.core.init.InternalName; -import ic2.core.init.MainConfig; -import ic2.core.item.ItemTinCan; import ic2.core.item.armor.ItemArmorElectric; -import ic2.core.util.ConfigUtil; -import ic2.core.util.Keyboard; import ic2.core.util.StackUtil; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; import java.util.List; -import java.util.Map; -import java.util.Random; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.FoodStats; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.common.ISpecialArmor.ArmorProperties; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingFallEvent; diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index 31aa842..c2be109 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -3,7 +3,6 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; diff --git a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index 6411b59..8566db8 100644 --- a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -3,18 +3,11 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; -import emt.util.EMTConfigHandler; -import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; -import ic2.api.util.Keys; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class ItemNanoGoggles extends ItemElectricGoggles { diff --git a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java index eaecfb4..590c18e 100644 --- a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java @@ -3,26 +3,18 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; -import emt.util.EMTConfigHandler; -import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; import ic2.core.IC2; import ic2.core.util.Keyboard; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; import java.lang.reflect.Field; import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; import java.util.Map; import java.util.Set; diff --git a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java index 61a0a37..e53814c 100644 --- a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -3,23 +3,16 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; -import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; import java.util.Map; public class ItemSolarHelmetRevealing extends ItemQuantumGoggles { diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index 1840308..540f353 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -1,17 +1,13 @@ package emt.item.armor.wings; -import java.util.Random; - import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.util.StackUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; import emt.client.model.ModelWings; import emt.util.EMTConfigHandler; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -20,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class ItemFeatherWing extends ItemArmor { diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 2ccbdee..6df2ec2 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -3,13 +3,11 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; import emt.item.armor.wings.ItemThaumiumReinforcedWing; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index d6b730d..c0b22fe 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -3,15 +3,10 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.util.EMTConfigHandler; -import ic2.api.item.ElectricItem; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class ItemQuantumWing extends ItemNanoWing { diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index dbffd6a..99f25f4 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -3,21 +3,15 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; -import emt.EMT; -import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import thaumcraft.api.IRepairable; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; -import ic2.core.IC2; -import ic2.core.util.StackUtil; import java.util.List; diff --git a/src/main/java/emt/item/block/ItemBlockElectricCloud.java b/src/main/java/emt/item/block/ItemBlockElectricCloud.java index 767c6ef..cbf462d 100644 --- a/src/main/java/emt/item/block/ItemBlockElectricCloud.java +++ b/src/main/java/emt/item/block/ItemBlockElectricCloud.java @@ -4,7 +4,6 @@ import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; diff --git a/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java index 3f33021..5b4c621 100644 --- a/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java @@ -1,11 +1,7 @@ package emt.item.block; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; - -import java.util.List; public class ItemBlockEssentiaGenerator extends ItemBlock { diff --git a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java index c1fb5fd..63b6eda 100644 --- a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java @@ -1,19 +1,9 @@ package emt.item.block; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import java.util.List; - -import emt.tile.generator.TileEntityAerGenerator; -import emt.tile.generator.TileEntityArborGenerator; -import emt.tile.generator.TileEntityAuramGenerator; -import emt.tile.generator.TileEntityIgnisGenerator; -import emt.tile.generator.TileEntityPotentiaGenerator; -import emt.util.EMTConfigHandler; - public class ItemBlockEssentiaGenerators extends ItemBlock { public ItemBlockEssentiaGenerators(Block id) { diff --git a/src/main/java/emt/item/block/ItemBlockSolars.java b/src/main/java/emt/item/block/ItemBlockSolars.java index 296d7e2..ac7c521 100644 --- a/src/main/java/emt/item/block/ItemBlockSolars.java +++ b/src/main/java/emt/item/block/ItemBlockSolars.java @@ -10,7 +10,6 @@ import static emt.util.EMTTextHelper.localize; import java.util.List; import emt.block.BlockBaseContainer; -import emt.block.BlockSolars; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; diff --git a/src/main/java/emt/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java index f0d314e..b398acb 100644 --- a/src/main/java/emt/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -3,7 +3,6 @@ package emt.item.focus; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; @@ -11,7 +10,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.IWandFocus; import thaumcraft.api.wands.ItemFocusBasic; import java.util.List; diff --git a/src/main/java/emt/item/focus/ItemChristmasFocus.java b/src/main/java/emt/item/focus/ItemChristmasFocus.java index 0ef86f6..04ca8bf 100644 --- a/src/main/java/emt/item/focus/ItemChristmasFocus.java +++ b/src/main/java/emt/item/focus/ItemChristmasFocus.java @@ -1,18 +1,12 @@ package emt.item.focus; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import emt.EMT; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; public class ItemChristmasFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/focus/ItemEnergyBallFocus.java b/src/main/java/emt/item/focus/ItemEnergyBallFocus.java index cbc5a9e..07d4f0a 100644 --- a/src/main/java/emt/item/focus/ItemEnergyBallFocus.java +++ b/src/main/java/emt/item/focus/ItemEnergyBallFocus.java @@ -2,18 +2,11 @@ package emt.item.focus; import emt.entity.EntityEnergyBall; import ic2.api.item.ElectricItem; -import ic2.core.item.armor.ItemArmorElectric; -import ic2.core.item.armor.ItemArmorIC2; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityLargeFireball; -import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.ItemFocusBasic; public class ItemEnergyBallFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/focus/ItemExplosionFocus.java b/src/main/java/emt/item/focus/ItemExplosionFocus.java index a32baa6..8b58a5d 100644 --- a/src/main/java/emt/item/focus/ItemExplosionFocus.java +++ b/src/main/java/emt/item/focus/ItemExplosionFocus.java @@ -3,8 +3,6 @@ package emt.item.focus; import emt.entity.EntityLaser; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java index 4964680..3fb211b 100644 --- a/src/main/java/emt/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -1,22 +1,12 @@ package emt.item.focus; -import java.util.ArrayList; import java.util.LinkedList; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import emt.EMT; import emt.entity.EntityShield; -import emt.init.EMTBlocks; import ic2.core.IC2; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java index 7faad0d..7094324 100644 --- a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java +++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java @@ -8,7 +8,6 @@ import ic2.api.item.IElectricItem; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; @@ -18,7 +17,6 @@ import net.minecraft.world.World; import thaumcraft.common.Thaumcraft; import thaumcraft.common.blocks.BlockCustomPlant; import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.items.equipment.ItemElementalHoe; import thaumcraft.common.lib.utils.Utils; import java.util.List; diff --git a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java index 8754a3c..329c293 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java @@ -7,12 +7,9 @@ import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.core.IC2; -import ic2.core.audio.AudioSource; -import ic2.core.audio.PositionSpec; import ic2.core.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; @@ -35,7 +32,6 @@ import net.minecraftforge.event.ForgeEventFactory; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import java.util.Random; public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { diff --git a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java index e643ae6..81b12e1 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java @@ -5,13 +5,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import ic2.api.item.ElectricItem; -import ic2.core.IC2; -import ic2.core.audio.AudioSource; -import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java index a7e56a2..7e1d361 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java @@ -4,12 +4,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import ic2.api.item.ElectricItem; -import ic2.core.IC2; -import ic2.core.audio.AudioSource; -import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java index f276c9f..c91a894 100644 --- a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java @@ -4,14 +4,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTConfigHandler; -import emt.util.EMTRandomHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; diff --git a/src/main/java/emt/network/PacketEMTKeys.java b/src/main/java/emt/network/PacketEMTKeys.java index be3b05a..520576b 100644 --- a/src/main/java/emt/network/PacketEMTKeys.java +++ b/src/main/java/emt/network/PacketEMTKeys.java @@ -1,11 +1,9 @@ package emt.network; import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import emt.init.EMTItems; public class PacketEMTKeys implements IMessage, IMessageHandler { diff --git a/src/main/java/emt/proxy/ClientProxy.java b/src/main/java/emt/proxy/ClientProxy.java index b5265b8..4c26be3 100644 --- a/src/main/java/emt/proxy/ClientProxy.java +++ b/src/main/java/emt/proxy/ClientProxy.java @@ -1,15 +1,9 @@ package emt.proxy; -import org.lwjgl.input.Keyboard; - import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderFireball; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSnowMan; -import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import emt.client.EMTKeys; import emt.client.renderer.RenderLaser; diff --git a/src/main/java/emt/tile/generator/TileEntityAerGenerator.java b/src/main/java/emt/tile/generator/TileEntityAerGenerator.java index d23dd7a..c9310a2 100644 --- a/src/main/java/emt/tile/generator/TileEntityAerGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityAerGenerator.java @@ -1,6 +1,5 @@ package emt.tile.generator; -import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityArborGenerator.java b/src/main/java/emt/tile/generator/TileEntityArborGenerator.java index 8a37c53..efca805 100644 --- a/src/main/java/emt/tile/generator/TileEntityArborGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityArborGenerator.java @@ -1,6 +1,5 @@ package emt.tile.generator; -import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java b/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java index 5fff2d8..19d4c5c 100644 --- a/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java @@ -1,6 +1,5 @@ package emt.tile.generator; -import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index 0610d06..3bc608c 100644 --- a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -3,15 +3,11 @@ package emt.tile.generator; import java.util.Random; import emt.tile.TileEntityEMT; -import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; -import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IAspectSource; -import thaumcraft.common.lib.events.EssentiaHandler; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource; diff --git a/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java b/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java index 471e465..18b7972 100644 --- a/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java @@ -1,6 +1,5 @@ package emt.tile.generator; -import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java b/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java index 18acbba..0f93187 100644 --- a/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java @@ -1,8 +1,6 @@ package emt.tile.generator; -import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; -import ic2.api.energy.prefab.BasicSource; import thaumcraft.api.aspects.Aspect; public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/emt/util/EMTClientEventHandler.java b/src/main/java/emt/util/EMTClientEventHandler.java index c6bc747..e815af4 100644 --- a/src/main/java/emt/util/EMTClientEventHandler.java +++ b/src/main/java/emt/util/EMTClientEventHandler.java @@ -8,12 +8,9 @@ import emt.EMT; import emt.client.EMTKeys; import emt.init.EMTItems; import emt.network.PacketEMTKeys; -import ic2.api.item.IC2Items; import ic2.core.IC2; -import ic2.core.Ic2Items; import ic2.core.audio.AudioSource; import ic2.core.audio.PositionSpec; -import ic2.core.item.tool.ItemElectricToolChainsaw; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/emt/util/EMTCreativeTab.java b/src/main/java/emt/util/EMTCreativeTab.java index 42f58c9..f4adcd6 100644 --- a/src/main/java/emt/util/EMTCreativeTab.java +++ b/src/main/java/emt/util/EMTCreativeTab.java @@ -1,10 +1,8 @@ package emt.util; -import emt.init.EMTBlocks; import emt.init.EMTItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class EMTCreativeTab extends CreativeTabs { diff --git a/src/main/java/emt/util/EMTEventHandler.java b/src/main/java/emt/util/EMTEventHandler.java index 831dab3..a657ba9 100644 --- a/src/main/java/emt/util/EMTEventHandler.java +++ b/src/main/java/emt/util/EMTEventHandler.java @@ -1,41 +1,27 @@ package emt.util; -import java.util.Random; - import baubles.api.BaublesApi; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import emt.EMT; -import emt.client.EMTKeys; import emt.init.EMTBlocks; import emt.init.EMTItems; import emt.item.armor.wings.ItemFeatherWing; -import emt.network.PacketEMTKeys; -import emt.proxy.ClientProxy; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; import thaumcraft.common.entities.monster.EntityTaintChicken; public class EMTEventHandler { diff --git a/src/main/java/emt/util/EMTRandomHelper.java b/src/main/java/emt/util/EMTRandomHelper.java index aee862a..865527d 100644 --- a/src/main/java/emt/util/EMTRandomHelper.java +++ b/src/main/java/emt/util/EMTRandomHelper.java @@ -1,19 +1,10 @@ package emt.util; import ic2.api.item.ElectricItem; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.event.ForgeEventFactory; import java.util.ArrayList; -import java.util.Locale; import java.util.Random; public class EMTRandomHelper {