diff --git a/assets/hbm/textures/gui/dfc/gui_receiver.png b/assets/hbm/textures/gui/dfc/gui_receiver.png index 058d5d664..c1185247f 100644 Binary files a/assets/hbm/textures/gui/dfc/gui_receiver.png and b/assets/hbm/textures/gui/dfc/gui_receiver.png differ diff --git a/com/hbm/blocks/bomb/Balefire.java b/com/hbm/blocks/bomb/Balefire.java index 99234e04e..c5553ae2d 100644 --- a/com/hbm/blocks/bomb/Balefire.java +++ b/com/hbm/blocks/bomb/Balefire.java @@ -13,15 +13,12 @@ import com.hbm.potion.HbmPotion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.block.BlockFire; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/com/hbm/blocks/bomb/BlockTaint.java b/com/hbm/blocks/bomb/BlockTaint.java index 9e32edc7e..71144873b 100644 --- a/com/hbm/blocks/bomb/BlockTaint.java +++ b/com/hbm/blocks/bomb/BlockTaint.java @@ -6,15 +6,11 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.mob.EntityTaintedCreeper; -import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; import com.hbm.potion.HbmPotion; -import com.hbm.tileentity.deco.TileEntityTaint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,12 +18,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; diff --git a/com/hbm/blocks/bomb/CelPrime.java b/com/hbm/blocks/bomb/CelPrime.java index a9d2c5d5d..5c076bd16 100644 --- a/com/hbm/blocks/bomb/CelPrime.java +++ b/com/hbm/blocks/bomb/CelPrime.java @@ -3,7 +3,6 @@ package com.hbm.blocks.bomb; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntityCelPrime; -import com.hbm.tileentity.bomb.TileEntityNukeN2; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/bomb/CelPrimePart.java b/com/hbm/blocks/bomb/CelPrimePart.java index a78fdd945..7631719f1 100644 --- a/com/hbm/blocks/bomb/CelPrimePart.java +++ b/com/hbm/blocks/bomb/CelPrimePart.java @@ -1,18 +1,14 @@ package com.hbm.blocks.bomb; import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.bomb.TileEntityCelPrime; import com.hbm.tileentity.bomb.TileEntityCelPrimeBattery; import com.hbm.tileentity.bomb.TileEntityCelPrimePort; import com.hbm.tileentity.bomb.TileEntityCelPrimeTanks; import com.hbm.tileentity.bomb.TileEntityCelPrimeTerminal; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; 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.MathHelper; diff --git a/com/hbm/blocks/bomb/CompactLauncher.java b/com/hbm/blocks/bomb/CompactLauncher.java index 0280677bd..d0417a039 100644 --- a/com/hbm/blocks/bomb/CompactLauncher.java +++ b/com/hbm/blocks/bomb/CompactLauncher.java @@ -8,7 +8,6 @@ import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityVaultDoor; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; @@ -78,8 +77,6 @@ public class CompactLauncher extends BlockContainer implements IMultiblock, IBom @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { - TileEntityCompactLauncher te = (TileEntityCompactLauncher) world.getTileEntity(x, y, z); - if(!(world.getBlock(x + 1, y, z + 1).getMaterial().isReplaceable() && world.getBlock(x + 1, y, z).getMaterial().isReplaceable() && world.getBlock(x + 1, y, z - 1).getMaterial().isReplaceable() && diff --git a/com/hbm/blocks/bomb/Landmine.java b/com/hbm/blocks/bomb/Landmine.java index 1ca8b71bf..b64c739ff 100644 --- a/com/hbm/blocks/bomb/Landmine.java +++ b/com/hbm/blocks/bomb/Landmine.java @@ -4,7 +4,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; @@ -21,9 +20,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityDispenser; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/com/hbm/blocks/bomb/LaunchPad.java b/com/hbm/blocks/bomb/LaunchPad.java index 77067b302..17b5c4f85 100644 --- a/com/hbm/blocks/bomb/LaunchPad.java +++ b/com/hbm/blocks/bomb/LaunchPad.java @@ -42,16 +42,13 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; public class LaunchPad extends BlockContainer implements IBomb { diff --git a/com/hbm/blocks/bomb/LaunchTable.java b/com/hbm/blocks/bomb/LaunchTable.java index 9d2d0330f..2413b77f5 100644 --- a/com/hbm/blocks/bomb/LaunchTable.java +++ b/com/hbm/blocks/bomb/LaunchTable.java @@ -6,11 +6,8 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/bomb/NukeN45.java b/com/hbm/blocks/bomb/NukeN45.java index 989750ebb..810367655 100644 --- a/com/hbm/blocks/bomb/NukeN45.java +++ b/com/hbm/blocks/bomb/NukeN45.java @@ -18,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class NukeN45 extends BlockContainer implements IBomb { diff --git a/com/hbm/blocks/bomb/TurretBase.java b/com/hbm/blocks/bomb/TurretBase.java index b08ee6c9d..2d2c49654 100644 --- a/com/hbm/blocks/bomb/TurretBase.java +++ b/com/hbm/blocks/bomb/TurretBase.java @@ -2,12 +2,8 @@ package com.hbm.blocks.bomb; import java.util.Random; -import com.hbm.tileentity.bomb.TileEntityTurretBase; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public abstract class TurretBase extends BlockContainer { diff --git a/com/hbm/blocks/bomb/TurretCheapo.java b/com/hbm/blocks/bomb/TurretCheapo.java index 2c0223415..ec3f29643 100644 --- a/com/hbm/blocks/bomb/TurretCheapo.java +++ b/com/hbm/blocks/bomb/TurretCheapo.java @@ -1,7 +1,6 @@ package com.hbm.blocks.bomb; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.tileentity.bomb.TileEntityTurretCIWS; import com.hbm.tileentity.bomb.TileEntityTurretCheapo; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/bomb/TurretHeavy.java b/com/hbm/blocks/bomb/TurretHeavy.java index ea68719be..9fc5b11ef 100644 --- a/com/hbm/blocks/bomb/TurretHeavy.java +++ b/com/hbm/blocks/bomb/TurretHeavy.java @@ -1,14 +1,11 @@ package com.hbm.blocks.bomb; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityLaserBeam; import com.hbm.tileentity.bomb.TileEntityTurretHeavy; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/com/hbm/blocks/bomb/TurretLight.java b/com/hbm/blocks/bomb/TurretLight.java index 9bd657bf9..966bc76bb 100644 --- a/com/hbm/blocks/bomb/TurretLight.java +++ b/com/hbm/blocks/bomb/TurretLight.java @@ -1,8 +1,6 @@ package com.hbm.blocks.bomb; -import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.tileentity.bomb.TileEntityTurretHeavy; import com.hbm.tileentity.bomb.TileEntityTurretLight; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/bomb/TurretRocket.java b/com/hbm/blocks/bomb/TurretRocket.java index 9796edad4..f8b4cbf90 100644 --- a/com/hbm/blocks/bomb/TurretRocket.java +++ b/com/hbm/blocks/bomb/TurretRocket.java @@ -1,9 +1,7 @@ package com.hbm.blocks.bomb; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityRocket; -import com.hbm.tileentity.bomb.TileEntityTurretHeavy; import com.hbm.tileentity.bomb.TileEntityTurretRocket; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/bomb/TurretTau.java b/com/hbm/blocks/bomb/TurretTau.java index f654d6adb..8c4ddd3af 100644 --- a/com/hbm/blocks/bomb/TurretTau.java +++ b/com/hbm/blocks/bomb/TurretTau.java @@ -1,8 +1,6 @@ package com.hbm.blocks.bomb; -import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.tileentity.bomb.TileEntityTurretHeavy; import com.hbm.tileentity.bomb.TileEntityTurretTau; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/generic/BlockClorineSeal.java b/com/hbm/blocks/generic/BlockClorineSeal.java index 041ca97fb..6e3c31bef 100644 --- a/com/hbm/blocks/generic/BlockClorineSeal.java +++ b/com/hbm/blocks/generic/BlockClorineSeal.java @@ -8,7 +8,6 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; diff --git a/com/hbm/blocks/generic/BlockMarker.java b/com/hbm/blocks/generic/BlockMarker.java index 2c8d92731..86b90ff83 100644 --- a/com/hbm/blocks/generic/BlockMarker.java +++ b/com/hbm/blocks/generic/BlockMarker.java @@ -115,7 +115,6 @@ public class BlockMarker extends BlockContainer { { if (this.func_150109_e(p_150108_1_, p_150108_2_, p_150108_3_, p_150108_4_)) { - int l = p_150108_1_.getBlockMetadata(p_150108_2_, p_150108_3_, p_150108_4_); boolean flag = false; if (!this.func_150107_m(p_150108_1_, p_150108_2_, p_150108_3_ - 1, p_150108_4_)) @@ -161,7 +160,6 @@ public class BlockMarker extends BlockContainer { @Override public MovingObjectPosition collisionRayTrace(World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_, Vec3 p_149731_5_, Vec3 p_149731_6_) { - int l = p_149731_1_.getBlockMetadata(p_149731_2_, p_149731_3_, p_149731_4_) & 7; float f = 0.15F; f = 0.1F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f); diff --git a/com/hbm/blocks/generic/BlockMetalFence.java b/com/hbm/blocks/generic/BlockMetalFence.java index 6874b03cd..213b434d8 100644 --- a/com/hbm/blocks/generic/BlockMetalFence.java +++ b/com/hbm/blocks/generic/BlockMetalFence.java @@ -4,7 +4,6 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/com/hbm/blocks/generic/BlockModDoor.java b/com/hbm/blocks/generic/BlockModDoor.java index 3abb34c9c..b478ed1e0 100644 --- a/com/hbm/blocks/generic/BlockModDoor.java +++ b/com/hbm/blocks/generic/BlockModDoor.java @@ -12,7 +12,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.IconFlipped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; diff --git a/com/hbm/blocks/generic/BlockMush.java b/com/hbm/blocks/generic/BlockMush.java index 74622868f..4092accaf 100644 --- a/com/hbm/blocks/generic/BlockMush.java +++ b/com/hbm/blocks/generic/BlockMush.java @@ -3,7 +3,6 @@ package com.hbm.blocks.generic; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; import com.hbm.world.HugeMush; import net.minecraft.block.Block; @@ -48,7 +47,7 @@ public class BlockMush extends Block implements IGrowable { public boolean func_149884_c(World p_149884_1_, int p_149884_2_, int p_149884_3_, int p_149884_4_, Random p_149884_5_) { - int l = p_149884_1_.getBlockMetadata(p_149884_2_, p_149884_3_, p_149884_4_); + p_149884_1_.getBlockMetadata(p_149884_2_, p_149884_3_, p_149884_4_); p_149884_1_.setBlockToAir(p_149884_2_, p_149884_3_, p_149884_4_); HugeMush worldgenbigmushroom = null; diff --git a/com/hbm/blocks/generic/BlockNTMDirt.java b/com/hbm/blocks/generic/BlockNTMDirt.java index 494aba22f..8225fce40 100644 --- a/com/hbm/blocks/generic/BlockNTMDirt.java +++ b/com/hbm/blocks/generic/BlockNTMDirt.java @@ -3,8 +3,6 @@ package com.hbm.blocks.generic; import java.util.List; import java.util.Random; -import com.hbm.main.MainRegistry; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockDirt; diff --git a/com/hbm/blocks/generic/BlockPinkSlab.java b/com/hbm/blocks/generic/BlockPinkSlab.java index 0a40ad9c1..972a71df7 100644 --- a/com/hbm/blocks/generic/BlockPinkSlab.java +++ b/com/hbm/blocks/generic/BlockPinkSlab.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/com/hbm/blocks/generic/BlockStorageCrate.java b/com/hbm/blocks/generic/BlockStorageCrate.java index 5e9f4a895..c897052a3 100644 --- a/com/hbm/blocks/generic/BlockStorageCrate.java +++ b/com/hbm/blocks/generic/BlockStorageCrate.java @@ -10,8 +10,6 @@ import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityCrateIron; import com.hbm.tileentity.machine.TileEntityCrateSteel; import com.hbm.tileentity.machine.TileEntityLockableBase; -import com.hbm.tileentity.machine.TileEntityMachineCoal; -import com.hbm.tileentity.machine.TileEntityMachineOilWell; import com.hbm.tileentity.machine.TileEntitySafe; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/generic/DecoBlock.java b/com/hbm/blocks/generic/DecoBlock.java index a9843b353..b2bbebd54 100644 --- a/com/hbm/blocks/generic/DecoBlock.java +++ b/com/hbm/blocks/generic/DecoBlock.java @@ -6,7 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; -import com.hbm.tileentity.bomb.TileEntityNukeGadget; import com.hbm.tileentity.deco.TileEntityBomber; import com.hbm.tileentity.deco.TileEntityDecoBlock; diff --git a/com/hbm/blocks/generic/DecoSteelPoles.java b/com/hbm/blocks/generic/DecoSteelPoles.java index 1a913e540..ab66a4b8b 100644 --- a/com/hbm/blocks/generic/DecoSteelPoles.java +++ b/com/hbm/blocks/generic/DecoSteelPoles.java @@ -1,13 +1,9 @@ package com.hbm.blocks.generic; -import com.hbm.tileentity.deco.TileEntityDecoSteelPoles; - import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/com/hbm/blocks/generic/Guide.java b/com/hbm/blocks/generic/Guide.java index 49ac1e604..06fc1a99b 100644 --- a/com/hbm/blocks/generic/Guide.java +++ b/com/hbm/blocks/generic/Guide.java @@ -1,6 +1,5 @@ package com.hbm.blocks.generic; -import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -9,11 +8,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/com/hbm/blocks/generic/RedBarrel.java b/com/hbm/blocks/generic/RedBarrel.java index e2f60c7c6..0f6f456fd 100644 --- a/com/hbm/blocks/generic/RedBarrel.java +++ b/com/hbm/blocks/generic/RedBarrel.java @@ -5,18 +5,10 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.BlockTaint; import com.hbm.explosion.ExplosionThermo; -import com.hbm.lib.RefStrings; -import com.hbm.tileentity.bomb.TileEntityRedBarrel; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; diff --git a/com/hbm/blocks/generic/YellowBarrel.java b/com/hbm/blocks/generic/YellowBarrel.java index aaf037265..1e8cfef15 100644 --- a/com/hbm/blocks/generic/YellowBarrel.java +++ b/com/hbm/blocks/generic/YellowBarrel.java @@ -4,17 +4,11 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.lib.RefStrings; import com.hbm.saveddata.RadiationSavedData; -import com.hbm.tileentity.deco.TileEntityYellowBarrel; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; diff --git a/com/hbm/blocks/machine/MachineKeyForge.java b/com/hbm/blocks/machine/MachineKeyForge.java index 10b6b35a2..8fbc752a0 100644 --- a/com/hbm/blocks/machine/MachineKeyForge.java +++ b/com/hbm/blocks/machine/MachineKeyForge.java @@ -6,8 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineKeyForge; -import com.hbm.tileentity.machine.TileEntityMachineTeleLinker; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/MachineMissileAssembly.java b/com/hbm/blocks/machine/MachineMissileAssembly.java index 1d317fb0e..90c89801b 100644 --- a/com/hbm/blocks/machine/MachineMissileAssembly.java +++ b/com/hbm/blocks/machine/MachineMissileAssembly.java @@ -4,7 +4,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.bomb.TileEntityLaunchPad; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineNukeFurnace.java b/com/hbm/blocks/machine/MachineNukeFurnace.java index c820e3bb4..84312e7f0 100644 --- a/com/hbm/blocks/machine/MachineNukeFurnace.java +++ b/com/hbm/blocks/machine/MachineNukeFurnace.java @@ -235,8 +235,8 @@ public class MachineNukeFurnace extends BlockContainer { float f2 = z + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - float f5 = rand.nextFloat(); - float f6 = rand.nextFloat(); + rand.nextFloat(); + rand.nextFloat(); if (l == 4) { diff --git a/com/hbm/blocks/machine/MachinePress.java b/com/hbm/blocks/machine/MachinePress.java index fada7df4c..f1eea2680 100644 --- a/com/hbm/blocks/machine/MachinePress.java +++ b/com/hbm/blocks/machine/MachinePress.java @@ -5,8 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachinePress; -import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachinePumpjack.java b/com/hbm/blocks/machine/MachinePumpjack.java index 5f881af1e..4bc5adb28 100644 --- a/com/hbm/blocks/machine/MachinePumpjack.java +++ b/com/hbm/blocks/machine/MachinePumpjack.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineOilWell; import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/machine/MachineRadar.java b/com/hbm/blocks/machine/MachineRadar.java index 44efa35ac..fcd97f07b 100644 --- a/com/hbm/blocks/machine/MachineRadar.java +++ b/com/hbm/blocks/machine/MachineRadar.java @@ -1,10 +1,7 @@ package com.hbm.blocks.machine; -import java.util.Random; - import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityConverterRfHe; import com.hbm.tileentity.machine.TileEntityMachineRadar; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineReiXMainframe.java b/com/hbm/blocks/machine/MachineReiXMainframe.java index 395fbfaa3..d5a662ee2 100644 --- a/com/hbm/blocks/machine/MachineReiXMainframe.java +++ b/com/hbm/blocks/machine/MachineReiXMainframe.java @@ -60,7 +60,7 @@ public class MachineReiXMainframe extends BlockContainer { @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { - int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D); if(itemStack.hasDisplayName()) { diff --git a/com/hbm/blocks/machine/MachineRtgFurnace.java b/com/hbm/blocks/machine/MachineRtgFurnace.java index c73d57b9f..45239eba1 100644 --- a/com/hbm/blocks/machine/MachineRtgFurnace.java +++ b/com/hbm/blocks/machine/MachineRtgFurnace.java @@ -237,8 +237,8 @@ public class MachineRtgFurnace extends BlockContainer { float f2 = z + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - float f5 = rand.nextFloat(); - float f6 = rand.nextFloat(); + rand.nextFloat(); + rand.nextFloat(); if (l == 4) { diff --git a/com/hbm/blocks/machine/MachineSatDock.java b/com/hbm/blocks/machine/MachineSatDock.java index 2e6435ec6..684b915e3 100644 --- a/com/hbm/blocks/machine/MachineSatDock.java +++ b/com/hbm/blocks/machine/MachineSatDock.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineBattery; import com.hbm.tileentity.machine.TileEntityMachineSatDock; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineSatLinker.java b/com/hbm/blocks/machine/MachineSatLinker.java index 9f45cb9dc..602608748 100644 --- a/com/hbm/blocks/machine/MachineSatLinker.java +++ b/com/hbm/blocks/machine/MachineSatLinker.java @@ -5,7 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineShredder; import com.hbm.tileentity.machine.TileEntityMachineSatLinker; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/ReactorCore.java b/com/hbm/blocks/machine/ReactorCore.java index 404096c84..2475ec52f 100644 --- a/com/hbm/blocks/machine/ReactorCore.java +++ b/com/hbm/blocks/machine/ReactorCore.java @@ -3,8 +3,6 @@ package com.hbm.blocks.machine; import java.util.Random; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge; -import com.hbm.tileentity.machine.TileEntityReactorMultiblock; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -12,7 +10,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.Explosion; import net.minecraft.world.World; public class ReactorCore extends BlockContainer { diff --git a/com/hbm/blocks/machine/ReactorHatch.java b/com/hbm/blocks/machine/ReactorHatch.java index dbad47703..521508439 100644 --- a/com/hbm/blocks/machine/ReactorHatch.java +++ b/com/hbm/blocks/machine/ReactorHatch.java @@ -6,8 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge; -import com.hbm.tileentity.machine.TileEntityReactorMultiblock; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/TileEntityGeiger.java b/com/hbm/blocks/machine/TileEntityGeiger.java index b23d3de71..336cf25f3 100644 --- a/com/hbm/blocks/machine/TileEntityGeiger.java +++ b/com/hbm/blocks/machine/TileEntityGeiger.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.saveddata.RadiationSavedData; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; public class TileEntityGeiger extends TileEntity { diff --git a/com/hbm/blocks/machine/WasteDrum.java b/com/hbm/blocks/machine/WasteDrum.java index eaab86b21..cf12ff2c5 100644 --- a/com/hbm/blocks/machine/WasteDrum.java +++ b/com/hbm/blocks/machine/WasteDrum.java @@ -5,7 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineCoal; import com.hbm.tileentity.machine.TileEntityWasteDrum; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/calc/UnionOfTileEntitiesAndBooleansForFluids.java b/com/hbm/calc/UnionOfTileEntitiesAndBooleansForFluids.java index c92951a97..f0546b9e2 100644 --- a/com/hbm/calc/UnionOfTileEntitiesAndBooleansForFluids.java +++ b/com/hbm/calc/UnionOfTileEntitiesAndBooleansForFluids.java @@ -1,7 +1,6 @@ package com.hbm.calc; import com.hbm.interfaces.IFluidSource; -import com.hbm.interfaces.IOilSource; public class UnionOfTileEntitiesAndBooleansForFluids { diff --git a/com/hbm/creativetabs/MachineTab.java b/com/hbm/creativetabs/MachineTab.java index c97c8c3f6..98debdc4e 100644 --- a/com/hbm/creativetabs/MachineTab.java +++ b/com/hbm/creativetabs/MachineTab.java @@ -1,8 +1,6 @@ package com.hbm.creativetabs; import com.hbm.blocks.ModBlocks; -import com.hbm.items.ModItems; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/com/hbm/entity/effect/EntityFalloutRain.java b/com/hbm/entity/effect/EntityFalloutRain.java index 042fe0946..1648e29f3 100644 --- a/com/hbm/entity/effect/EntityFalloutRain.java +++ b/com/hbm/entity/effect/EntityFalloutRain.java @@ -1,22 +1,14 @@ package com.hbm.entity.effect; -import java.util.List; - import com.hbm.blocks.ModBlocks; -import com.hbm.explosion.NukeEnvironmentalEffect; -import com.hbm.lib.Library; import com.hbm.main.MainRegistry; -import com.hbm.potion.HbmPotion; import com.hbm.saveddata.AuxSavedData; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/com/hbm/entity/effect/EntityRagingVortex.java b/com/hbm/entity/effect/EntityRagingVortex.java index a9d8c2328..11687dda3 100644 --- a/com/hbm/entity/effect/EntityRagingVortex.java +++ b/com/hbm/entity/effect/EntityRagingVortex.java @@ -1,9 +1,5 @@ package com.hbm.entity.effect; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.explosion.ExplosionChaos; - -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/com/hbm/entity/grenade/EntityGrenadeBreach.java b/com/hbm/entity/grenade/EntityGrenadeBreach.java index 710012a90..8c1ca9b4f 100644 --- a/com/hbm/entity/grenade/EntityGrenadeBreach.java +++ b/com/hbm/entity/grenade/EntityGrenadeBreach.java @@ -2,9 +2,7 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionLarge; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class EntityGrenadeBreach extends EntityGrenadeBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeBurst.java b/com/hbm/entity/grenade/EntityGrenadeBurst.java index 61e305678..624f4d0a2 100644 --- a/com/hbm/entity/grenade/EntityGrenadeBurst.java +++ b/com/hbm/entity/grenade/EntityGrenadeBurst.java @@ -3,11 +3,7 @@ package com.hbm.entity.grenade; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGrenade; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class EntityGrenadeBurst extends EntityGrenadeBouncyBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeCloud.java b/com/hbm/entity/grenade/EntityGrenadeCloud.java index 4886e84ab..d58cfe18c 100644 --- a/com/hbm/entity/grenade/EntityGrenadeCloud.java +++ b/com/hbm/entity/grenade/EntityGrenadeCloud.java @@ -1,12 +1,8 @@ package com.hbm.entity.grenade; -import java.util.Random; - import com.hbm.explosion.ExplosionChaos; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class EntityGrenadeCloud extends EntityGrenadeBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeGas.java b/com/hbm/entity/grenade/EntityGrenadeGas.java index ab24f5459..fadaf343e 100644 --- a/com/hbm/entity/grenade/EntityGrenadeGas.java +++ b/com/hbm/entity/grenade/EntityGrenadeGas.java @@ -6,7 +6,6 @@ import net.minecraft.world.World; import java.util.Random; import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGrenade; diff --git a/com/hbm/entity/grenade/EntityGrenadeGascan.java b/com/hbm/entity/grenade/EntityGrenadeGascan.java index 414347d80..76d59892c 100644 --- a/com/hbm/entity/grenade/EntityGrenadeGascan.java +++ b/com/hbm/entity/grenade/EntityGrenadeGascan.java @@ -2,7 +2,6 @@ package com.hbm.entity.grenade; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class EntityGrenadeGascan extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java b/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java index 22d83ce26..d632d7650 100644 --- a/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java +++ b/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java @@ -1,6 +1,5 @@ package com.hbm.entity.grenade; -import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGrenade; diff --git a/com/hbm/entity/grenade/EntityGrenadeIFImpact.java b/com/hbm/entity/grenade/EntityGrenadeIFImpact.java index 5a3428a55..e13b524c2 100644 --- a/com/hbm/entity/grenade/EntityGrenadeIFImpact.java +++ b/com/hbm/entity/grenade/EntityGrenadeIFImpact.java @@ -1,9 +1,6 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/com/hbm/entity/grenade/EntityGrenadePC.java b/com/hbm/entity/grenade/EntityGrenadePC.java index 5d318f09e..34b2068a3 100644 --- a/com/hbm/entity/grenade/EntityGrenadePC.java +++ b/com/hbm/entity/grenade/EntityGrenadePC.java @@ -2,9 +2,7 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionChaos; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class EntityGrenadePC extends EntityGrenadeBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeSmart.java b/com/hbm/entity/grenade/EntityGrenadeSmart.java index 159522055..4f967993c 100644 --- a/com/hbm/entity/grenade/EntityGrenadeSmart.java +++ b/com/hbm/entity/grenade/EntityGrenadeSmart.java @@ -3,11 +3,9 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class EntityGrenadeSmart extends EntityGrenadeBase { diff --git a/com/hbm/entity/item/EntityMinecartModBase.java b/com/hbm/entity/item/EntityMinecartModBase.java index e7db12f59..edc020f52 100644 --- a/com/hbm/entity/item/EntityMinecartModBase.java +++ b/com/hbm/entity/item/EntityMinecartModBase.java @@ -403,7 +403,6 @@ public abstract class EntityMinecartModBase extends EntityMinecart } double d0 = 0.4D; - double d2 = 0.0078125D; Block block = this.worldObj.getBlock(l, i, i1); if (canUseRail() && BlockRailBase.func_150051_a(block)) diff --git a/com/hbm/entity/logic/EntityBalefire.java b/com/hbm/entity/logic/EntityBalefire.java index e969d4cbd..be64dc969 100644 --- a/com/hbm/entity/logic/EntityBalefire.java +++ b/com/hbm/entity/logic/EntityBalefire.java @@ -66,9 +66,6 @@ public class EntityBalefire extends Entity { speed += 1; //increase speed to keep up with expansion boolean flag = false; - boolean flag2 = false; - boolean flag3 = false; - for(int i = 0; i < this.speed; i++) { flag = exp.update(); diff --git a/com/hbm/entity/logic/EntityNukeExplosionMK3.java b/com/hbm/entity/logic/EntityNukeExplosionMK3.java index 8f41de441..024e8db3e 100644 --- a/com/hbm/entity/logic/EntityNukeExplosionMK3.java +++ b/com/hbm/entity/logic/EntityNukeExplosionMK3.java @@ -130,14 +130,13 @@ public class EntityNukeExplosionMK3 extends Entity { speed += 1; //increase speed to keep up with expansion boolean flag = false; - boolean flag2 = false; boolean flag3 = false; for(int i = 0; i < this.speed; i++) { if(waste) { flag = exp.update(); - flag2 = wst.update(); + wst.update(); flag3 = vap.update(); if(flag3) { diff --git a/com/hbm/entity/logic/EntityNukeExplosionMK4.java b/com/hbm/entity/logic/EntityNukeExplosionMK4.java index 9345fa42f..3b3441884 100644 --- a/com/hbm/entity/logic/EntityNukeExplosionMK4.java +++ b/com/hbm/entity/logic/EntityNukeExplosionMK4.java @@ -3,14 +3,12 @@ package com.hbm.entity.logic; import org.apache.logging.log4j.Level; import com.hbm.entity.effect.EntityFalloutRain; -import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.explosion.ExplosionNukeRay; import com.hbm.main.MainRegistry; import com.hbm.saveddata.RadiationSavedData; import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/com/hbm/entity/logic/EntityNukeExplosionPlus.java b/com/hbm/entity/logic/EntityNukeExplosionPlus.java index 7c0089cf2..3c9d1a8e6 100644 --- a/com/hbm/entity/logic/EntityNukeExplosionPlus.java +++ b/com/hbm/entity/logic/EntityNukeExplosionPlus.java @@ -50,14 +50,13 @@ public class EntityNukeExplosionPlus extends Entity { speed = 160; boolean flag = false; - boolean flag2 = false; boolean flag3 = false; for(int i = 0; i < this.speed; i++) { if(waste) { flag = exp.update(); - flag2 = wst.update(); + wst.update(); flag3 = vap.update(); if(flag3) { diff --git a/com/hbm/entity/logic/EntityTomBlast.java b/com/hbm/entity/logic/EntityTomBlast.java index c9474d019..990b84d42 100644 --- a/com/hbm/entity/logic/EntityTomBlast.java +++ b/com/hbm/entity/logic/EntityTomBlast.java @@ -65,9 +65,6 @@ public class EntityTomBlast extends Entity { speed += 1; //increase speed to keep up with expansion boolean flag = false; - boolean flag2 = false; - boolean flag3 = false; - for(int i = 0; i < this.speed; i++) { flag = exp.update(); diff --git a/com/hbm/entity/missile/EntityMinerRocket.java b/com/hbm/entity/missile/EntityMinerRocket.java index 530bdf03b..98d91f883 100644 --- a/com/hbm/entity/missile/EntityMinerRocket.java +++ b/com/hbm/entity/missile/EntityMinerRocket.java @@ -6,7 +6,6 @@ import com.hbm.explosion.ExplosionLarge; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileBHole.java b/com/hbm/entity/missile/EntityMissileBHole.java index 5a7427e8c..8641d9fc6 100644 --- a/com/hbm/entity/missile/EntityMissileBHole.java +++ b/com/hbm/entity/missile/EntityMissileBHole.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.entity.effect.EntityBlackHole; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileBaseAdvanced.java b/com/hbm/entity/missile/EntityMissileBaseAdvanced.java index 1343f5c7b..b42d21165 100644 --- a/com/hbm/entity/missile/EntityMissileBaseAdvanced.java +++ b/com/hbm/entity/missile/EntityMissileBaseAdvanced.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.entity.logic.IChunkLoader; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacket; @@ -15,7 +14,6 @@ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/entity/missile/EntityMissileBunkerBuster.java b/com/hbm/entity/missile/EntityMissileBunkerBuster.java index 005f0073c..c635945a1 100644 --- a/com/hbm/entity/missile/EntityMissileBunkerBuster.java +++ b/com/hbm/entity/missile/EntityMissileBunkerBuster.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileBurst.java b/com/hbm/entity/missile/EntityMissileBurst.java index 278fc52cd..6de31361f 100644 --- a/com/hbm/entity/missile/EntityMissileBurst.java +++ b/com/hbm/entity/missile/EntityMissileBurst.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileBusterStrong.java b/com/hbm/entity/missile/EntityMissileBusterStrong.java index ba07675f7..cb92736e6 100644 --- a/com/hbm/entity/missile/EntityMissileBusterStrong.java +++ b/com/hbm/entity/missile/EntityMissileBusterStrong.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileCluster.java b/com/hbm/entity/missile/EntityMissileCluster.java index 1b8603472..88b9e9e0a 100644 --- a/com/hbm/entity/missile/EntityMissileCluster.java +++ b/com/hbm/entity/missile/EntityMissileCluster.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileClusterStrong.java b/com/hbm/entity/missile/EntityMissileClusterStrong.java index 41cef143c..21243f9b8 100644 --- a/com/hbm/entity/missile/EntityMissileClusterStrong.java +++ b/com/hbm/entity/missile/EntityMissileClusterStrong.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileCustom.java b/com/hbm/entity/missile/EntityMissileCustom.java index 74214f910..f2c409912 100644 --- a/com/hbm/entity/missile/EntityMissileCustom.java +++ b/com/hbm/entity/missile/EntityMissileCustom.java @@ -9,7 +9,6 @@ import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityBalefire; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.entity.logic.IChunkLoader; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.MissileStruct; @@ -17,18 +16,11 @@ import com.hbm.items.weapon.ItemMissile; import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.WarheadType; import com.hbm.main.MainRegistry; -import com.hbm.packet.AuxParticlePacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.machine.TileEntityMachineRadar; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; diff --git a/com/hbm/entity/missile/EntityMissileDoomsday.java b/com/hbm/entity/missile/EntityMissileDoomsday.java index 9b405ec6b..fece03e6d 100644 --- a/com/hbm/entity/missile/EntityMissileDoomsday.java +++ b/com/hbm/entity/missile/EntityMissileDoomsday.java @@ -1,13 +1,8 @@ package com.hbm.entity.missile; -import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; - -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileTaint.java b/com/hbm/entity/missile/EntityMissileTaint.java index 7c1ea595e..9525ed749 100644 --- a/com/hbm/entity/missile/EntityMissileTaint.java +++ b/com/hbm/entity/missile/EntityMissileTaint.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.BlockTaint; -import com.hbm.explosion.ExplosionThermo; import com.hbm.items.ModItems; import net.minecraft.item.ItemStack; diff --git a/com/hbm/entity/mob/EntityHunterChopper.java b/com/hbm/entity/mob/EntityHunterChopper.java index 508ce43cb..780ce3c7d 100644 --- a/com/hbm/entity/mob/EntityHunterChopper.java +++ b/com/hbm/entity/mob/EntityHunterChopper.java @@ -286,14 +286,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f3) * 180.0D / Math.PI); - double d8 = 2.0D; - Vec3 vec3 = this.getLook(1.0F); - double xStart = this.posX + vec3.xCoord * d8; - double yStart = this.posY - 0.5; - double zStart = this.posZ + vec3.zCoord * d8; - double d5 = this.targetedEntity.posX - xStart; - double d6 = this.targetedEntity.boundingBox.minY + this.targetedEntity.height / 2.0F - yStart; - double d7 = this.targetedEntity.posZ - zStart; + this.getLook(1.0F); } if(rotationPitch <= 330 && rotationPitch >= 30) diff --git a/com/hbm/entity/mob/EntityTaintedCreeper.java b/com/hbm/entity/mob/EntityTaintedCreeper.java index 632df0b09..41f7c742d 100644 --- a/com/hbm/entity/mob/EntityTaintedCreeper.java +++ b/com/hbm/entity/mob/EntityTaintedCreeper.java @@ -1,19 +1,12 @@ package com.hbm.entity.mob; -import java.util.HashSet; -import java.util.List; - import com.hbm.blocks.ModBlocks; -import com.hbm.items.ModItems; -import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAIAttackOnCollide; import net.minecraft.entity.ai.EntityAIHurtByTarget; @@ -24,19 +17,14 @@ import net.minecraft.entity.ai.EntityAIWander; import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.passive.EntityOcelot; 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; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class EntityTaintedCreeper extends EntityMob { @@ -313,7 +301,7 @@ public class EntityTaintedCreeper extends EntityMob { { if (!this.worldObj.isRemote) { - boolean flag = this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"); + this.worldObj.getGameRules().getGameRuleBooleanValue("mobGriefing"); if (this.getPowered()) { diff --git a/com/hbm/entity/particle/EntityFogFX.java b/com/hbm/entity/particle/EntityFogFX.java index b51d86a85..5c05f23c0 100644 --- a/com/hbm/entity/particle/EntityFogFX.java +++ b/com/hbm/entity/particle/EntityFogFX.java @@ -1,7 +1,5 @@ package com.hbm.entity.particle; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.world.World; public class EntityFogFX extends EntityModFX { diff --git a/com/hbm/entity/projectile/EntityBullet.java b/com/hbm/entity/projectile/EntityBullet.java index 452917081..4023e66c7 100644 --- a/com/hbm/entity/projectile/EntityBullet.java +++ b/com/hbm/entity/projectile/EntityBullet.java @@ -338,7 +338,7 @@ public class EntityBullet extends Entity implements IProjectile { super.onUpdate(); if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); // this.prevRotationPitch = this.rotationPitch = diff --git a/com/hbm/entity/projectile/EntityCombineBall.java b/com/hbm/entity/projectile/EntityCombineBall.java index 43a9835d8..7c5fa0031 100644 --- a/com/hbm/entity/projectile/EntityCombineBall.java +++ b/com/hbm/entity/projectile/EntityCombineBall.java @@ -210,7 +210,7 @@ public class EntityCombineBall extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } diff --git a/com/hbm/entity/projectile/EntityDischarge.java b/com/hbm/entity/projectile/EntityDischarge.java index d6ff7f784..09e0e9cf3 100644 --- a/com/hbm/entity/projectile/EntityDischarge.java +++ b/com/hbm/entity/projectile/EntityDischarge.java @@ -212,7 +212,7 @@ public class EntityDischarge extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } diff --git a/com/hbm/entity/projectile/EntityExplosiveBeam.java b/com/hbm/entity/projectile/EntityExplosiveBeam.java index 233adecf9..b451e0b73 100644 --- a/com/hbm/entity/projectile/EntityExplosiveBeam.java +++ b/com/hbm/entity/projectile/EntityExplosiveBeam.java @@ -223,7 +223,7 @@ public class EntityExplosiveBeam extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -300,8 +300,6 @@ public class EntityExplosiveBeam extends Entity implements IProjectile } float f2; - float f4; - if (movingobjectposition != null) { if (movingobjectposition.entityHit != null) @@ -332,7 +330,6 @@ public class EntityExplosiveBeam extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) diff --git a/com/hbm/entity/projectile/EntityFire.java b/com/hbm/entity/projectile/EntityFire.java index 0d226047c..cee78465b 100644 --- a/com/hbm/entity/projectile/EntityFire.java +++ b/com/hbm/entity/projectile/EntityFire.java @@ -212,7 +212,7 @@ public class EntityFire extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } diff --git a/com/hbm/entity/projectile/EntityLN2.java b/com/hbm/entity/projectile/EntityLN2.java index 3701a33a0..0c0e3ab6d 100644 --- a/com/hbm/entity/projectile/EntityLN2.java +++ b/com/hbm/entity/projectile/EntityLN2.java @@ -211,7 +211,7 @@ public class EntityLN2 extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } diff --git a/com/hbm/entity/projectile/EntityLaserBeam.java b/com/hbm/entity/projectile/EntityLaserBeam.java index d02bd3171..a3f3f9323 100644 --- a/com/hbm/entity/projectile/EntityLaserBeam.java +++ b/com/hbm/entity/projectile/EntityLaserBeam.java @@ -228,7 +228,7 @@ public class EntityLaserBeam extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -238,7 +238,7 @@ public class EntityLaserBeam extends Entity implements IProjectile if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if(!worldObj.isRemote) { ExplosionChaos.burn(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 2); ExplosionChaos.flameDeath(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); @@ -397,7 +397,6 @@ public class EntityLaserBeam extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) diff --git a/com/hbm/entity/projectile/EntityMinerBeam.java b/com/hbm/entity/projectile/EntityMinerBeam.java index b932f348c..332c435ba 100644 --- a/com/hbm/entity/projectile/EntityMinerBeam.java +++ b/com/hbm/entity/projectile/EntityMinerBeam.java @@ -232,7 +232,7 @@ public class EntityMinerBeam extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -242,7 +242,7 @@ public class EntityMinerBeam extends Entity implements IProjectile if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if(!worldObj.isRemote) { this.dropMinedItem(this.worldObj, field_145791_d, field_145792_e, field_145789_f); } @@ -400,7 +400,6 @@ public class EntityMinerBeam extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) diff --git a/com/hbm/entity/projectile/EntityModBeam.java b/com/hbm/entity/projectile/EntityModBeam.java index d4097e352..31ec77dcc 100644 --- a/com/hbm/entity/projectile/EntityModBeam.java +++ b/com/hbm/entity/projectile/EntityModBeam.java @@ -18,19 +18,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; -import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; @@ -239,7 +233,7 @@ public class EntityModBeam extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -316,8 +310,6 @@ public class EntityModBeam extends Entity implements IProjectile } float f2; - float f4; - if (movingobjectposition != null) { if (movingobjectposition.entityHit != null) @@ -354,7 +346,6 @@ public class EntityModBeam extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) diff --git a/com/hbm/entity/projectile/EntityNightmareBlast.java b/com/hbm/entity/projectile/EntityNightmareBlast.java index ec977eca2..8767962e1 100644 --- a/com/hbm/entity/projectile/EntityNightmareBlast.java +++ b/com/hbm/entity/projectile/EntityNightmareBlast.java @@ -3,8 +3,6 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.grenade.EntityGrenadeZOMG; -import com.hbm.lib.ModDamageSource; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -228,7 +226,7 @@ public class EntityNightmareBlast extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -238,7 +236,7 @@ public class EntityNightmareBlast extends Entity implements IProjectile if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if(!worldObj.isRemote) { this.worldObj.setBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f, Blocks.air); this.setDead(); @@ -394,7 +392,6 @@ public class EntityNightmareBlast extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) @@ -404,8 +401,6 @@ public class EntityNightmareBlast extends Entity implements IProjectile f4 = 0.25F; this.worldObj.spawnParticle("bubble", this.posX - this.motionX * f4, this.posY - this.motionY * f4, this.posZ - this.motionZ * f4, this.motionX, this.motionY, this.motionZ); } - - f3 = 0.8F; } if (this.isWet()) diff --git a/com/hbm/entity/projectile/EntityPlasmaBeam.java b/com/hbm/entity/projectile/EntityPlasmaBeam.java index f6a6dba5b..2a5ffca3e 100644 --- a/com/hbm/entity/projectile/EntityPlasmaBeam.java +++ b/com/hbm/entity/projectile/EntityPlasmaBeam.java @@ -233,7 +233,7 @@ public class EntityPlasmaBeam extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -243,7 +243,7 @@ public class EntityPlasmaBeam extends Entity implements IProjectile if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if(!worldObj.isRemote) { ExplosionChaos.burn(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 2); ExplosionChaos.flameDeath(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); @@ -407,7 +407,6 @@ public class EntityPlasmaBeam extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) diff --git a/com/hbm/entity/projectile/EntityRainbow.java b/com/hbm/entity/projectile/EntityRainbow.java index 267dd367d..5bcf2e5e1 100644 --- a/com/hbm/entity/projectile/EntityRainbow.java +++ b/com/hbm/entity/projectile/EntityRainbow.java @@ -232,7 +232,7 @@ public class EntityRainbow extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -242,7 +242,7 @@ public class EntityRainbow extends Entity implements IProjectile if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if(!worldObj.isRemote) ExplosionChaos.explodeZOMG(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); } @@ -406,7 +406,6 @@ public class EntityRainbow extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) @@ -416,8 +415,6 @@ public class EntityRainbow extends Entity implements IProjectile f4 = 0.25F; this.worldObj.spawnParticle("bubble", this.posX - this.motionX * f4, this.posY - this.motionY * f4, this.posZ - this.motionZ * f4, this.motionX, this.motionY, this.motionZ); } - - f3 = 0.8F; } if (this.isWet()) diff --git a/com/hbm/entity/projectile/EntityRocket.java b/com/hbm/entity/projectile/EntityRocket.java index b9a5cbf75..2d2ae1eb1 100644 --- a/com/hbm/entity/projectile/EntityRocket.java +++ b/com/hbm/entity/projectile/EntityRocket.java @@ -5,9 +5,6 @@ import cpw.mods.fml.relauncher.SideOnly; import java.util.List; -import com.hbm.entity.particle.EntityGasFX; -import com.hbm.entity.particle.EntityOilSpillFX; -import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; @@ -213,7 +210,6 @@ public class EntityRocket extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } diff --git a/com/hbm/entity/projectile/EntityRocketHoming.java b/com/hbm/entity/projectile/EntityRocketHoming.java index d49c9f8e0..ad8e81171 100644 --- a/com/hbm/entity/projectile/EntityRocketHoming.java +++ b/com/hbm/entity/projectile/EntityRocketHoming.java @@ -210,7 +210,7 @@ public class EntityRocketHoming extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -470,9 +470,6 @@ public class EntityRocketHoming extends Entity implements IProjectile this.prevRotationYaw += 360.0F; }*/ - //this.rotationPitch = this.prevRotationPitch + (this.rotationPitch - this.prevRotationPitch) * 0.2F; - //this.rotationYaw = this.prevRotationYaw + (this.rotationYaw - this.prevRotationYaw) * 0.2F; - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) @@ -482,8 +479,6 @@ public class EntityRocketHoming extends Entity implements IProjectile f4 = 0.25F; this.worldObj.spawnParticle("bubble", this.posX - this.motionX * f4, this.posY - this.motionY * f4, this.posZ - this.motionZ * f4, this.motionX, this.motionY, this.motionZ); } - - f3 = 0.8F; } if (this.isWet()) diff --git a/com/hbm/entity/projectile/EntityRubble.java b/com/hbm/entity/projectile/EntityRubble.java index e987a1665..7d9d32342 100644 --- a/com/hbm/entity/projectile/EntityRubble.java +++ b/com/hbm/entity/projectile/EntityRubble.java @@ -5,8 +5,6 @@ import com.hbm.packet.PacketDispatcher; import com.hbm.packet.ParticleBurstPacket; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; diff --git a/com/hbm/entity/projectile/EntitySchrab.java b/com/hbm/entity/projectile/EntitySchrab.java index 5c7017fd3..7cbec714a 100644 --- a/com/hbm/entity/projectile/EntitySchrab.java +++ b/com/hbm/entity/projectile/EntitySchrab.java @@ -212,7 +212,7 @@ public class EntitySchrab extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } diff --git a/com/hbm/entity/projectile/EntitySparkBeam.java b/com/hbm/entity/projectile/EntitySparkBeam.java index 820ce58fb..cd116b935 100644 --- a/com/hbm/entity/projectile/EntitySparkBeam.java +++ b/com/hbm/entity/projectile/EntitySparkBeam.java @@ -226,7 +226,7 @@ public class EntitySparkBeam extends Entity implements IProjectile if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); + MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); //this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); } @@ -236,7 +236,7 @@ public class EntitySparkBeam extends Entity implements IProjectile if (block.getMaterial() != Material.air) { block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); - AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); + block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if(!worldObj.isRemote) { ExplosionLarge.explode(worldObj, posX, posY, posZ, 50, true, true, true); } @@ -393,7 +393,6 @@ public class EntitySparkBeam extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - float f3 = 0.99F; f1 = 0.05F; if (this.isInWater()) diff --git a/com/hbm/entity/projectile/EntityTom.java b/com/hbm/entity/projectile/EntityTom.java index 82f03b36f..a863f1cc5 100644 --- a/com/hbm/entity/projectile/EntityTom.java +++ b/com/hbm/entity/projectile/EntityTom.java @@ -1,14 +1,10 @@ package com.hbm.entity.projectile; import com.hbm.entity.logic.EntityTomBlast; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionNukeGeneric; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; diff --git a/com/hbm/explosion/ExplosionBalefire.java b/com/hbm/explosion/ExplosionBalefire.java index ec758800e..c0f422121 100644 --- a/com/hbm/explosion/ExplosionBalefire.java +++ b/com/hbm/explosion/ExplosionBalefire.java @@ -2,7 +2,6 @@ package com.hbm.explosion; import com.hbm.blocks.ModBlocks; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/com/hbm/explosion/ExplosionLarge.java b/com/hbm/explosion/ExplosionLarge.java index adbf0dfe2..213fe3dbc 100644 --- a/com/hbm/explosion/ExplosionLarge.java +++ b/com/hbm/explosion/ExplosionLarge.java @@ -10,7 +10,6 @@ import com.hbm.entity.projectile.EntityRubble; import com.hbm.entity.projectile.EntityShrapnel; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/com/hbm/explosion/ExplosionNukeRay.java b/com/hbm/explosion/ExplosionNukeRay.java index 0501fc211..9e5084792 100644 --- a/com/hbm/explosion/ExplosionNukeRay.java +++ b/com/hbm/explosion/ExplosionNukeRay.java @@ -4,12 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.main.MainRegistry; - -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.util.Vec3; -import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; public class ExplosionNukeRay { diff --git a/com/hbm/explosion/ExplosionThermo.java b/com/hbm/explosion/ExplosionThermo.java index a0359d7d8..42b5f96ef 100644 --- a/com/hbm/explosion/ExplosionThermo.java +++ b/com/hbm/explosion/ExplosionThermo.java @@ -408,7 +408,7 @@ public class ExplosionThermo { public static void freezer(World world, int x, int y, int z, int bombStartStrength) { float f = bombStartStrength; - HashSet hashset = new HashSet(); + new HashSet(); int i; int j; int k; @@ -416,9 +416,6 @@ public class ExplosionThermo { double d6; double d7; double wat = bombStartStrength; - boolean isOccupied = false; - - bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); j = MathHelper.floor_double(x + wat + 1.0D); @@ -427,7 +424,7 @@ public class ExplosionThermo { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); + Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { @@ -465,7 +462,7 @@ public class ExplosionThermo { public static void setEntitiesOnFire(World world, int x, int y, int z, int bombStartStrength) { float f = bombStartStrength; - HashSet hashset = new HashSet(); + new HashSet(); int i; int j; int k; @@ -473,9 +470,6 @@ public class ExplosionThermo { double d6; double d7; double wat = bombStartStrength; - boolean isOccupied = false; - - bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); j = MathHelper.floor_double(x + wat + 1.0D); @@ -484,7 +478,7 @@ public class ExplosionThermo { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); + Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { diff --git a/com/hbm/handler/BulletConfigSyncingUtil.java b/com/hbm/handler/BulletConfigSyncingUtil.java index b63c51efd..88998dbd6 100644 --- a/com/hbm/handler/BulletConfigSyncingUtil.java +++ b/com/hbm/handler/BulletConfigSyncingUtil.java @@ -1,10 +1,7 @@ package com.hbm.handler; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; - import com.hbm.handler.guncfg.*; public class BulletConfigSyncingUtil { diff --git a/com/hbm/handler/guncfg/BulletConfigFactory.java b/com/hbm/handler/guncfg/BulletConfigFactory.java index dada1c63b..e1e102763 100644 --- a/com/hbm/handler/guncfg/BulletConfigFactory.java +++ b/com/hbm/handler/guncfg/BulletConfigFactory.java @@ -1,12 +1,7 @@ package com.hbm.handler.guncfg; -import java.util.ArrayList; - import com.hbm.handler.BulletConfiguration; import com.hbm.items.ModItems; -import com.hbm.potion.HbmPotion; - -import net.minecraft.potion.PotionEffect; public class BulletConfigFactory { diff --git a/com/hbm/handler/guncfg/Gun20GaugeFactory.java b/com/hbm/handler/guncfg/Gun20GaugeFactory.java index 5a9006be0..8817b3820 100644 --- a/com/hbm/handler/guncfg/Gun20GaugeFactory.java +++ b/com/hbm/handler/guncfg/Gun20GaugeFactory.java @@ -6,7 +6,6 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.items.ModItems; -import com.hbm.potion.HbmPotion; import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.potion.Potion; diff --git a/com/hbm/handler/guncfg/GunRocketFactory.java b/com/hbm/handler/guncfg/GunRocketFactory.java index 287a116b9..4c60a6c7b 100644 --- a/com/hbm/handler/guncfg/GunRocketFactory.java +++ b/com/hbm/handler/guncfg/GunRocketFactory.java @@ -6,13 +6,11 @@ import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; -import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.interfaces.IBulletRicochetBehavior; import com.hbm.items.ModItems; import com.hbm.render.util.RenderScreenOverlay.Crosshair; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; import net.minecraft.world.World; public class GunRocketFactory { diff --git a/com/hbm/handler/nei/AssemblerRecipeHandler.java b/com/hbm/handler/nei/AssemblerRecipeHandler.java index 451d514eb..9402158e3 100644 --- a/com/hbm/handler/nei/AssemblerRecipeHandler.java +++ b/com/hbm/handler/nei/AssemblerRecipeHandler.java @@ -13,7 +13,6 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class AssemblerRecipeHandler extends TemplateRecipeHandler { diff --git a/com/hbm/handler/nei/FluidRecipeHandler.java b/com/hbm/handler/nei/FluidRecipeHandler.java index e27a4113a..32ad101e9 100644 --- a/com/hbm/handler/nei/FluidRecipeHandler.java +++ b/com/hbm/handler/nei/FluidRecipeHandler.java @@ -1,14 +1,11 @@ package com.hbm.handler.nei; import java.awt.Rectangle; -import java.util.ArrayList; import java.util.Arrays; -import java.util.LinkedList; import java.util.List; import java.util.Map; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIMachineShredder; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; diff --git a/com/hbm/handler/nei/PressRecipeHandler.java b/com/hbm/handler/nei/PressRecipeHandler.java index 8a7bf1e22..becb5e6de 100644 --- a/com/hbm/handler/nei/PressRecipeHandler.java +++ b/com/hbm/handler/nei/PressRecipeHandler.java @@ -7,11 +7,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.handler.nei.ShredderRecipeHandler.Fuel; import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineEPress; import com.hbm.inventory.gui.GUIMachinePress; -import com.hbm.inventory.gui.GUIMachineShredder; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; diff --git a/com/hbm/interfaces/ILaserable.java b/com/hbm/interfaces/ILaserable.java index 9b1feb079..c6e87abb6 100644 --- a/com/hbm/interfaces/ILaserable.java +++ b/com/hbm/interfaces/ILaserable.java @@ -1,7 +1,9 @@ package com.hbm.interfaces; +import net.minecraftforge.common.util.ForgeDirection; + public interface ILaserable { - public void addEnergy(long energy); + public void addEnergy(long energy, ForgeDirection dir); } diff --git a/com/hbm/inventory/FluidTank.java b/com/hbm/inventory/FluidTank.java index e5a2b6d12..8b84130c9 100644 --- a/com/hbm/inventory/FluidTank.java +++ b/com/hbm/inventory/FluidTank.java @@ -1,7 +1,5 @@ package com.hbm.inventory; -import java.util.Arrays; - import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.gui.GuiInfoContainer; import com.hbm.items.ModItems; diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 7351b2188..4cc2e9835 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -13,7 +13,6 @@ import com.hbm.items.tool.ItemAssemblyTemplate; import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; import com.hbm.items.tool.ItemChemistryTemplate; import com.hbm.items.tool.ItemFluidIcon; -import com.hbm.items.tool.ItemSatChip; import com.hbm.main.MainRegistry; import net.minecraft.enchantment.Enchantment; @@ -444,7 +443,7 @@ public class MachineRecipes { @SuppressWarnings("incomplete-switch") public static int getFluidConsumedGasCent(FluidType fluid) { - List list = new ArrayList(); + new ArrayList(); switch(fluid) { case LAVA: diff --git a/com/hbm/inventory/container/ContainerAMSBase.java b/com/hbm/inventory/container/ContainerAMSBase.java index 8284ec1b2..fd293f63f 100644 --- a/com/hbm/inventory/container/ContainerAMSBase.java +++ b/com/hbm/inventory/container/ContainerAMSBase.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.machine.TileEntityAMSBase; -import com.hbm.tileentity.machine.TileEntityAMSEmitter; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerAMSEmitter.java b/com/hbm/inventory/container/ContainerAMSEmitter.java index 84e03ccc1..6a4841a30 100644 --- a/com/hbm/inventory/container/ContainerAMSEmitter.java +++ b/com/hbm/inventory/container/ContainerAMSEmitter.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.machine.TileEntityAMSEmitter; -import com.hbm.tileentity.machine.TileEntityAMSLimiter; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerAMSLimiter.java b/com/hbm/inventory/container/ContainerAMSLimiter.java index 81b734f9a..83efdc5b6 100644 --- a/com/hbm/inventory/container/ContainerAMSLimiter.java +++ b/com/hbm/inventory/container/ContainerAMSLimiter.java @@ -1,9 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityAMSLimiter; -import com.hbm.tileentity.machine.TileEntityMachinePress; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerCelPrime.java b/com/hbm/inventory/container/ContainerCelPrime.java index 906efe2c9..5e1adfb8f 100644 --- a/com/hbm/inventory/container/ContainerCelPrime.java +++ b/com/hbm/inventory/container/ContainerCelPrime.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.bomb.TileEntityCelPrime; -import com.hbm.tileentity.bomb.TileEntityNukeSolinium; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerCentrifuge.java b/com/hbm/inventory/container/ContainerCentrifuge.java index 9f2adc94a..aa7ec57d8 100644 --- a/com/hbm/inventory/container/ContainerCentrifuge.java +++ b/com/hbm/inventory/container/ContainerCentrifuge.java @@ -6,7 +6,6 @@ import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/container/ContainerCompactLauncher.java b/com/hbm/inventory/container/ContainerCompactLauncher.java index 928e92dd3..a48c477ab 100644 --- a/com/hbm/inventory/container/ContainerCompactLauncher.java +++ b/com/hbm/inventory/container/ContainerCompactLauncher.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerCoreEmitter.java b/com/hbm/inventory/container/ContainerCoreEmitter.java index a884a381f..bdfdde1d5 100644 --- a/com/hbm/inventory/container/ContainerCoreEmitter.java +++ b/com/hbm/inventory/container/ContainerCoreEmitter.java @@ -19,13 +19,13 @@ public class ContainerCoreEmitter extends Container { { for(int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 56)); + this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); } } for(int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 56)); + this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); } } diff --git a/com/hbm/inventory/container/ContainerCrateIron.java b/com/hbm/inventory/container/ContainerCrateIron.java index 089654aa4..a8dd26573 100644 --- a/com/hbm/inventory/container/ContainerCrateIron.java +++ b/com/hbm/inventory/container/ContainerCrateIron.java @@ -1,13 +1,9 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityCrateIron; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/container/ContainerCrateSteel.java b/com/hbm/inventory/container/ContainerCrateSteel.java index b1756129f..5f8d4cc60 100644 --- a/com/hbm/inventory/container/ContainerCrateSteel.java +++ b/com/hbm/inventory/container/ContainerCrateSteel.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityCrateIron; import com.hbm.tileentity.machine.TileEntityCrateSteel; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerForceField.java b/com/hbm/inventory/container/ContainerForceField.java index f40195c32..f886664c6 100644 --- a/com/hbm/inventory/container/ContainerForceField.java +++ b/com/hbm/inventory/container/ContainerForceField.java @@ -1,9 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityForceField; -import com.hbm.tileentity.machine.TileEntityMachineTurbine; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerLeadBox.java b/com/hbm/inventory/container/ContainerLeadBox.java index 78e258ca1..c22392c4d 100644 --- a/com/hbm/inventory/container/ContainerLeadBox.java +++ b/com/hbm/inventory/container/ContainerLeadBox.java @@ -1,13 +1,9 @@ package com.hbm.inventory.container; import com.hbm.inventory.inv.InventoryLeadBox; -import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemLeadBox; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/container/ContainerMachineArcFurnace.java b/com/hbm/inventory/container/ContainerMachineArcFurnace.java index 72a31760d..d3f41dffb 100644 --- a/com/hbm/inventory/container/ContainerMachineArcFurnace.java +++ b/com/hbm/inventory/container/ContainerMachineArcFurnace.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachineArcFurnace; -import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineBoiler.java b/com/hbm/inventory/container/ContainerMachineBoiler.java index 936b40d05..44b7cb12d 100644 --- a/com/hbm/inventory/container/ContainerMachineBoiler.java +++ b/com/hbm/inventory/container/ContainerMachineBoiler.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachineBoiler; -import com.hbm.tileentity.machine.TileEntityMachineGasCent; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineBoilerElectric.java b/com/hbm/inventory/container/ContainerMachineBoilerElectric.java index c956ec9a2..c5e05b496 100644 --- a/com/hbm/inventory/container/ContainerMachineBoilerElectric.java +++ b/com/hbm/inventory/container/ContainerMachineBoilerElectric.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineBoiler; import com.hbm.tileentity.machine.TileEntityMachineBoilerElectric; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineChemplant.java b/com/hbm/inventory/container/ContainerMachineChemplant.java index 88f86cf39..86d5cdeeb 100644 --- a/com/hbm/inventory/container/ContainerMachineChemplant.java +++ b/com/hbm/inventory/container/ContainerMachineChemplant.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineEPress.java b/com/hbm/inventory/container/ContainerMachineEPress.java index 3b42c05c0..fa7376df3 100644 --- a/com/hbm/inventory/container/ContainerMachineEPress.java +++ b/com/hbm/inventory/container/ContainerMachineEPress.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachineEPress; -import com.hbm.tileentity.machine.TileEntityMachinePress; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineFluidTank.java b/com/hbm/inventory/container/ContainerMachineFluidTank.java index eb509f9c4..5cbf7bc84 100644 --- a/com/hbm/inventory/container/ContainerMachineFluidTank.java +++ b/com/hbm/inventory/container/ContainerMachineFluidTank.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityMachineBattery; import com.hbm.tileentity.machine.TileEntityMachineFluidTank; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineInserter.java b/com/hbm/inventory/container/ContainerMachineInserter.java index 29623bb8a..72d465ff0 100644 --- a/com/hbm/inventory/container/ContainerMachineInserter.java +++ b/com/hbm/inventory/container/ContainerMachineInserter.java @@ -2,12 +2,9 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachineInserter; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/container/ContainerMachineMissileAssembly.java b/com/hbm/inventory/container/ContainerMachineMissileAssembly.java index e6214f20a..144a77997 100644 --- a/com/hbm/inventory/container/ContainerMachineMissileAssembly.java +++ b/com/hbm/inventory/container/ContainerMachineMissileAssembly.java @@ -1,13 +1,11 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/container/ContainerMachinePress.java b/com/hbm/inventory/container/ContainerMachinePress.java index 5cd223b37..a88aa8d27 100644 --- a/com/hbm/inventory/container/ContainerMachinePress.java +++ b/com/hbm/inventory/container/ContainerMachinePress.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachinePress; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachinePumpjack.java b/com/hbm/inventory/container/ContainerMachinePumpjack.java index 9c281b65e..bbda70e7c 100644 --- a/com/hbm/inventory/container/ContainerMachinePumpjack.java +++ b/com/hbm/inventory/container/ContainerMachinePumpjack.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineOilWell; import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineRadGen.java b/com/hbm/inventory/container/ContainerMachineRadGen.java index 27db36fbf..20b12fda4 100644 --- a/com/hbm/inventory/container/ContainerMachineRadGen.java +++ b/com/hbm/inventory/container/ContainerMachineRadGen.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.machine.TileEntityMachineRadGen; -import com.hbm.tileentity.machine.TileEntityMachineSiren; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineRadar.java b/com/hbm/inventory/container/ContainerMachineRadar.java index 85717bf48..acf0b5823 100644 --- a/com/hbm/inventory/container/ContainerMachineRadar.java +++ b/com/hbm/inventory/container/ContainerMachineRadar.java @@ -1,14 +1,11 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityMachineRadGen; import com.hbm.tileentity.machine.TileEntityMachineRadar; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; public class ContainerMachineRadar extends Container { diff --git a/com/hbm/inventory/container/ContainerMachineReactorSmall.java b/com/hbm/inventory/container/ContainerMachineReactorSmall.java index 991ff1c26..07410684c 100644 --- a/com/hbm/inventory/container/ContainerMachineReactorSmall.java +++ b/com/hbm/inventory/container/ContainerMachineReactorSmall.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; -import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineSatLinker.java b/com/hbm/inventory/container/ContainerMachineSatLinker.java index 1f20735ee..449ee965e 100644 --- a/com/hbm/inventory/container/ContainerMachineSatLinker.java +++ b/com/hbm/inventory/container/ContainerMachineSatLinker.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityMachineSiren; import com.hbm.tileentity.machine.TileEntityMachineSatLinker; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineSelenium.java b/com/hbm/inventory/container/ContainerMachineSelenium.java index 3b5ae94d3..1254431a1 100644 --- a/com/hbm/inventory/container/ContainerMachineSelenium.java +++ b/com/hbm/inventory/container/ContainerMachineSelenium.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.bomb.TileEntityCelPrime; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineSiren.java b/com/hbm/inventory/container/ContainerMachineSiren.java index b2e18e625..322577fc9 100644 --- a/com/hbm/inventory/container/ContainerMachineSiren.java +++ b/com/hbm/inventory/container/ContainerMachineSiren.java @@ -1,9 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachineSiren; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineTeleLinker.java b/com/hbm/inventory/container/ContainerMachineTeleLinker.java index e1958b93d..3d1bc5d28 100644 --- a/com/hbm/inventory/container/ContainerMachineTeleLinker.java +++ b/com/hbm/inventory/container/ContainerMachineTeleLinker.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityMachineSatLinker; import com.hbm.tileentity.machine.TileEntityMachineTeleLinker; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineTurbofan.java b/com/hbm/inventory/container/ContainerMachineTurbofan.java index 10cac1af2..1086cf0b6 100644 --- a/com/hbm/inventory/container/ContainerMachineTurbofan.java +++ b/com/hbm/inventory/container/ContainerMachineTurbofan.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeN2.java b/com/hbm/inventory/container/ContainerNukeN2.java index 5e1af94dc..0b22a4470 100644 --- a/com/hbm/inventory/container/ContainerNukeN2.java +++ b/com/hbm/inventory/container/ContainerNukeN2.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.bomb.TileEntityNukeN2; -import com.hbm.tileentity.bomb.TileEntityNukeSolinium; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerNukeN45.java b/com/hbm/inventory/container/ContainerNukeN45.java index 878333ae4..9829f3210 100644 --- a/com/hbm/inventory/container/ContainerNukeN45.java +++ b/com/hbm/inventory/container/ContainerNukeN45.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.bomb.TileEntityNukeN45; -import com.hbm.tileentity.machine.TileEntityForceField; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerNukeSolinium.java b/com/hbm/inventory/container/ContainerNukeSolinium.java index dd87096be..94b309d3e 100644 --- a/com/hbm/inventory/container/ContainerNukeSolinium.java +++ b/com/hbm/inventory/container/ContainerNukeSolinium.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.bomb.TileEntityNukeFleija; import com.hbm.tileentity.bomb.TileEntityNukeSolinium; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerRadiobox.java b/com/hbm/inventory/container/ContainerRadiobox.java index a184571c6..4ce5a24c6 100644 --- a/com/hbm/inventory/container/ContainerRadiobox.java +++ b/com/hbm/inventory/container/ContainerRadiobox.java @@ -1,13 +1,10 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityRadiobox; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; public class ContainerRadiobox extends Container { diff --git a/com/hbm/inventory/container/ContainerReactorControl.java b/com/hbm/inventory/container/ContainerReactorControl.java index 2e1ea7913..9bbe2042e 100644 --- a/com/hbm/inventory/container/ContainerReactorControl.java +++ b/com/hbm/inventory/container/ContainerReactorControl.java @@ -5,7 +5,6 @@ import com.hbm.tileentity.machine.TileEntityReactorControl; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/container/ContainerReactorMultiblock.java b/com/hbm/inventory/container/ContainerReactorMultiblock.java index 0609e2a3f..1f872a4b1 100644 --- a/com/hbm/inventory/container/ContainerReactorMultiblock.java +++ b/com/hbm/inventory/container/ContainerReactorMultiblock.java @@ -2,12 +2,9 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge; -import com.hbm.tileentity.machine.TileEntityReactorMultiblock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/container/ContainerSafe.java b/com/hbm/inventory/container/ContainerSafe.java index 91f13f804..89c810254 100644 --- a/com/hbm/inventory/container/ContainerSafe.java +++ b/com/hbm/inventory/container/ContainerSafe.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityCrateSteel; import com.hbm.tileentity.machine.TileEntitySafe; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerSatDock.java b/com/hbm/inventory/container/ContainerSatDock.java index 5e2accc48..9ee0b37d5 100644 --- a/com/hbm/inventory/container/ContainerSatDock.java +++ b/com/hbm/inventory/container/ContainerSatDock.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.bomb.TileEntityNukeN45; import com.hbm.tileentity.machine.TileEntityMachineSatDock; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerSoyuzLauncher.java b/com/hbm/inventory/container/ContainerSoyuzLauncher.java index 7399af085..0bc6a8b25 100644 --- a/com/hbm/inventory/container/ContainerSoyuzLauncher.java +++ b/com/hbm/inventory/container/ContainerSoyuzLauncher.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.bomb.TileEntityLaunchTable; import com.hbm.tileentity.machine.TileEntitySoyuzLauncher; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerWasteDrum.java b/com/hbm/inventory/container/ContainerWasteDrum.java index 3c23643b1..f21ec7ee7 100644 --- a/com/hbm/inventory/container/ContainerWasteDrum.java +++ b/com/hbm/inventory/container/ContainerWasteDrum.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityCrateIron; import com.hbm.tileentity.machine.TileEntityWasteDrum; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/gui/GUIAMSEmitter.java b/com/hbm/inventory/gui/GUIAMSEmitter.java index b3b81e78a..9b127d3da 100644 --- a/com/hbm/inventory/gui/GUIAMSEmitter.java +++ b/com/hbm/inventory/gui/GUIAMSEmitter.java @@ -4,11 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerAMSEmitter; -import com.hbm.inventory.container.ContainerAMSLimiter; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityAMSEmitter; -import com.hbm.tileentity.machine.TileEntityAMSLimiter; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/gui/GUICelPrime.java b/com/hbm/inventory/gui/GUICelPrime.java index fc732c6a0..10ea154ee 100644 --- a/com/hbm/inventory/gui/GUICelPrime.java +++ b/com/hbm/inventory/gui/GUICelPrime.java @@ -3,12 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCelPrime; -import com.hbm.inventory.container.ContainerNukeSolinium; -import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityCelPrime; -import com.hbm.tileentity.bomb.TileEntityNukeSolinium; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUICoreAdvanced.java b/com/hbm/inventory/gui/GUICoreAdvanced.java index acedd9ee5..ad88a5601 100644 --- a/com/hbm/inventory/gui/GUICoreAdvanced.java +++ b/com/hbm/inventory/gui/GUICoreAdvanced.java @@ -2,13 +2,11 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.container.ContainerCoreAdvanced; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityCoreAdvanced; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUICoreEmitter.java b/com/hbm/inventory/gui/GUICoreEmitter.java index 7252a612b..8ac34de76 100644 --- a/com/hbm/inventory/gui/GUICoreEmitter.java +++ b/com/hbm/inventory/gui/GUICoreEmitter.java @@ -81,7 +81,7 @@ public class GUICoreEmitter extends GuiInfoContainer { String name = this.emitter.hasCustomInventoryName() ? this.emitter.getInventoryName() : I18n.format(this.emitter.getInventoryName()); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString("Output: " + Library.getShortNumber(emitter.joules) + "Spk", 50, 30, 0xFF7F7F); + this.fontRendererObj.drawString("Output: " + Library.getShortNumber(emitter.prev) + "Spk", 50, 30, 0xFF7F7F); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); } diff --git a/com/hbm/inventory/gui/GUICoreTitanium.java b/com/hbm/inventory/gui/GUICoreTitanium.java index 8ac3645eb..63bf0124e 100644 --- a/com/hbm/inventory/gui/GUICoreTitanium.java +++ b/com/hbm/inventory/gui/GUICoreTitanium.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityCoreTitanium; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUICrateIron.java b/com/hbm/inventory/gui/GUICrateIron.java index b1b4f2d60..d134c782a 100644 --- a/com/hbm/inventory/gui/GUICrateIron.java +++ b/com/hbm/inventory/gui/GUICrateIron.java @@ -2,13 +2,9 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerCrateIron; -import com.hbm.inventory.container.ContainerMachineTurbofan; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityCrateIron; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUICrateSteel.java b/com/hbm/inventory/gui/GUICrateSteel.java index 0c4afe596..f5ec9d945 100644 --- a/com/hbm/inventory/gui/GUICrateSteel.java +++ b/com/hbm/inventory/gui/GUICrateSteel.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerCrateIron; import com.hbm.inventory.container.ContainerCrateSteel; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityCrateIron; import com.hbm.tileentity.machine.TileEntityCrateSteel; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIFWatzCore.java b/com/hbm/inventory/gui/GUIFWatzCore.java index 26c0ec974..ba109c68e 100644 --- a/com/hbm/inventory/gui/GUIFWatzCore.java +++ b/com/hbm/inventory/gui/GUIFWatzCore.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityFWatzCore; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIForceField.java b/com/hbm/inventory/gui/GUIForceField.java index 8171a71f9..506541074 100644 --- a/com/hbm/inventory/gui/GUIForceField.java +++ b/com/hbm/inventory/gui/GUIForceField.java @@ -2,10 +2,7 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerForceField; -import com.hbm.inventory.container.ContainerMachineTurbine; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/com/hbm/inventory/gui/GUIFusionMultiblock.java b/com/hbm/inventory/gui/GUIFusionMultiblock.java index 111893bf7..89e0ae8db 100644 --- a/com/hbm/inventory/gui/GUIFusionMultiblock.java +++ b/com/hbm/inventory/gui/GUIFusionMultiblock.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityFusionMultiblock; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIIGenerator.java b/com/hbm/inventory/gui/GUIIGenerator.java index b95d7ded1..be3129e42 100644 --- a/com/hbm/inventory/gui/GUIIGenerator.java +++ b/com/hbm/inventory/gui/GUIIGenerator.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUILeadBox.java b/com/hbm/inventory/gui/GUILeadBox.java index c336bb9be..a82e0dfac 100644 --- a/com/hbm/inventory/gui/GUILeadBox.java +++ b/com/hbm/inventory/gui/GUILeadBox.java @@ -3,18 +3,11 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerLeadBox; -import com.hbm.inventory.container.ContainerWasteDrum; import com.hbm.inventory.inv.InventoryLeadBox; -import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemLeadBox; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityWasteDrum; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; public class GUILeadBox extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIMachineAssembler.java b/com/hbm/inventory/gui/GUIMachineAssembler.java index 651cc4a7f..2f10ae3bd 100644 --- a/com/hbm/inventory/gui/GUIMachineAssembler.java +++ b/com/hbm/inventory/gui/GUIMachineAssembler.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineAssembler; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineBattery.java b/com/hbm/inventory/gui/GUIMachineBattery.java index 89c62a3f5..6139ac1aa 100644 --- a/com/hbm/inventory/gui/GUIMachineBattery.java +++ b/com/hbm/inventory/gui/GUIMachineBattery.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineBoiler.java b/com/hbm/inventory/gui/GUIMachineBoiler.java index a1cf18b4c..1654cd081 100644 --- a/com/hbm/inventory/gui/GUIMachineBoiler.java +++ b/com/hbm/inventory/gui/GUIMachineBoiler.java @@ -5,11 +5,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineBoiler; -import com.hbm.inventory.container.ContainerMachineGasCent; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineBoiler; -import com.hbm.tileentity.machine.TileEntityMachineGasCent; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/gui/GUIMachineCMBFactory.java b/com/hbm/inventory/gui/GUIMachineCMBFactory.java index 439b0266b..e87fe76ce 100644 --- a/com/hbm/inventory/gui/GUIMachineCMBFactory.java +++ b/com/hbm/inventory/gui/GUIMachineCMBFactory.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineCMBFactory; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineCentrifuge.java b/com/hbm/inventory/gui/GUIMachineCentrifuge.java index 387cad551..7bbd7da1f 100644 --- a/com/hbm/inventory/gui/GUIMachineCentrifuge.java +++ b/com/hbm/inventory/gui/GUIMachineCentrifuge.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineChemplant.java b/com/hbm/inventory/gui/GUIMachineChemplant.java index 78959b852..4fac9a382 100644 --- a/com/hbm/inventory/gui/GUIMachineChemplant.java +++ b/com/hbm/inventory/gui/GUIMachineChemplant.java @@ -3,15 +3,12 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.container.ContainerMachineAssembler; import com.hbm.inventory.container.ContainerMachineChemplant; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineCoal.java b/com/hbm/inventory/gui/GUIMachineCoal.java index a6e9953d8..0cb44b87d 100644 --- a/com/hbm/inventory/gui/GUIMachineCoal.java +++ b/com/hbm/inventory/gui/GUIMachineCoal.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java index b51407710..f316c2fb2 100644 --- a/com/hbm/inventory/gui/GUIMachineCompactLauncher.java +++ b/com/hbm/inventory/gui/GUIMachineCompactLauncher.java @@ -4,20 +4,12 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerCompactLauncher; -import com.hbm.inventory.container.ContainerMachineMissileAssembly; import com.hbm.items.weapon.ItemCustomMissile; -import com.hbm.items.weapon.ItemMissile; import com.hbm.lib.RefStrings; -import com.hbm.packet.AuxButtonPacket; -import com.hbm.packet.PacketDispatcher; import com.hbm.render.util.MissileMultipart; -import com.hbm.render.util.MissilePart; import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; -import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; - import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; diff --git a/com/hbm/inventory/gui/GUIMachineCyclotron.java b/com/hbm/inventory/gui/GUIMachineCyclotron.java index 234c88544..4d3013510 100644 --- a/com/hbm/inventory/gui/GUIMachineCyclotron.java +++ b/com/hbm/inventory/gui/GUIMachineCyclotron.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineCyclotron; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineDiesel.java b/com/hbm/inventory/gui/GUIMachineDiesel.java index 52639ad36..4586bc2ac 100644 --- a/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -5,11 +5,9 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.lib.RefStrings; -import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityMachineDiesel; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineEPress.java b/com/hbm/inventory/gui/GUIMachineEPress.java index 9abe4c799..e3d131c1e 100644 --- a/com/hbm/inventory/gui/GUIMachineEPress.java +++ b/com/hbm/inventory/gui/GUIMachineEPress.java @@ -2,15 +2,10 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.container.ContainerMachineEPress; -import com.hbm.inventory.container.ContainerMachinePress; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineEPress; -import com.hbm.tileentity.machine.TileEntityMachinePress; - import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineElectricFurnace.java b/com/hbm/inventory/gui/GUIMachineElectricFurnace.java index ad106eb95..865742034 100644 --- a/com/hbm/inventory/gui/GUIMachineElectricFurnace.java +++ b/com/hbm/inventory/gui/GUIMachineElectricFurnace.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineFluidTank.java b/com/hbm/inventory/gui/GUIMachineFluidTank.java index 98799682b..69149c6e8 100644 --- a/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -3,14 +3,11 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.container.ContainerElectricFurnace; import com.hbm.inventory.container.ContainerMachineFluidTank; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; import com.hbm.tileentity.machine.TileEntityMachineFluidTank; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineGasCent.java b/com/hbm/inventory/gui/GUIMachineGasCent.java index cb0057144..536600987 100644 --- a/com/hbm/inventory/gui/GUIMachineGasCent.java +++ b/com/hbm/inventory/gui/GUIMachineGasCent.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineGasCent; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineGasFlare.java b/com/hbm/inventory/gui/GUIMachineGasFlare.java index 537b0533e..8df711523 100644 --- a/com/hbm/inventory/gui/GUIMachineGasFlare.java +++ b/com/hbm/inventory/gui/GUIMachineGasFlare.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineGasFlare; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineGenerator.java b/com/hbm/inventory/gui/GUIMachineGenerator.java index 8e13dc90a..d1414f5c6 100644 --- a/com/hbm/inventory/gui/GUIMachineGenerator.java +++ b/com/hbm/inventory/gui/GUIMachineGenerator.java @@ -1,7 +1,6 @@ package com.hbm.inventory.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineInserter.java b/com/hbm/inventory/gui/GUIMachineInserter.java index 79aa39132..e6a153dc8 100644 --- a/com/hbm/inventory/gui/GUIMachineInserter.java +++ b/com/hbm/inventory/gui/GUIMachineInserter.java @@ -4,11 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineInserter; -import com.hbm.inventory.container.ContainerMachineTurbofan; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineInserter; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/gui/GUIMachineLaunchTable.java b/com/hbm/inventory/gui/GUIMachineLaunchTable.java index d3252d981..1e517a4ac 100644 --- a/com/hbm/inventory/gui/GUIMachineLaunchTable.java +++ b/com/hbm/inventory/gui/GUIMachineLaunchTable.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.container.ContainerCompactLauncher; import com.hbm.inventory.container.ContainerLaunchTable; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile.PartSize; @@ -12,7 +11,6 @@ import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.render.util.MissileMultipart; import com.hbm.render.util.MissilePronter; -import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineMiningDrill.java b/com/hbm/inventory/gui/GUIMachineMiningDrill.java index d1e13712a..aa2d9f7dc 100644 --- a/com/hbm/inventory/gui/GUIMachineMiningDrill.java +++ b/com/hbm/inventory/gui/GUIMachineMiningDrill.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineMissileAssembly.java b/com/hbm/inventory/gui/GUIMachineMissileAssembly.java index e635277e1..c40100afa 100644 --- a/com/hbm/inventory/gui/GUIMachineMissileAssembly.java +++ b/com/hbm/inventory/gui/GUIMachineMissileAssembly.java @@ -2,17 +2,13 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerMachineAssembler; import com.hbm.inventory.container.ContainerMachineMissileAssembly; -import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.main.ResourceManager; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.render.util.MissileMultipart; import com.hbm.render.util.MissilePart; import com.hbm.render.util.MissilePronter; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineOilWell.java b/com/hbm/inventory/gui/GUIMachineOilWell.java index fa1f020db..d278e9033 100644 --- a/com/hbm/inventory/gui/GUIMachineOilWell.java +++ b/com/hbm/inventory/gui/GUIMachineOilWell.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineOilWell; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachinePress.java b/com/hbm/inventory/gui/GUIMachinePress.java index 21fbf964e..efb77f14b 100644 --- a/com/hbm/inventory/gui/GUIMachinePress.java +++ b/com/hbm/inventory/gui/GUIMachinePress.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerMachineAssembler; import com.hbm.inventory.container.ContainerMachinePress; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachinePress; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachinePuF6Tank.java b/com/hbm/inventory/gui/GUIMachinePuF6Tank.java index 172005720..03322880e 100644 --- a/com/hbm/inventory/gui/GUIMachinePuF6Tank.java +++ b/com/hbm/inventory/gui/GUIMachinePuF6Tank.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachinePumpjack.java b/com/hbm/inventory/gui/GUIMachinePumpjack.java index 7a973052b..41a1d08c5 100644 --- a/com/hbm/inventory/gui/GUIMachinePumpjack.java +++ b/com/hbm/inventory/gui/GUIMachinePumpjack.java @@ -3,14 +3,11 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.container.ContainerMachineOilWell; import com.hbm.inventory.container.ContainerMachinePumpjack; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineOilWell; import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineRTG.java b/com/hbm/inventory/gui/GUIMachineRTG.java index 439e7ce96..f031bb6a9 100644 --- a/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/com/hbm/inventory/gui/GUIMachineRTG.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineRTG; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineRadGen.java b/com/hbm/inventory/gui/GUIMachineRadGen.java index 32d904ce3..2d7a5887b 100644 --- a/com/hbm/inventory/gui/GUIMachineRadGen.java +++ b/com/hbm/inventory/gui/GUIMachineRadGen.java @@ -3,14 +3,9 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineRadGen; -import com.hbm.inventory.container.ContainerMachineSiren; -import com.hbm.items.tool.ItemCassette.TrackType; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineRadGen; -import com.hbm.tileentity.machine.TileEntityMachineSiren; - import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineRadar.java b/com/hbm/inventory/gui/GUIMachineRadar.java index 1e421b7d4..c5f3454ff 100644 --- a/com/hbm/inventory/gui/GUIMachineRadar.java +++ b/com/hbm/inventory/gui/GUIMachineRadar.java @@ -4,12 +4,9 @@ import java.util.Arrays; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.FluidTank; -import com.hbm.inventory.container.ContainerGenerator; import com.hbm.inventory.container.ContainerMachineRadar; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineGenerator; import com.hbm.tileentity.machine.TileEntityMachineRadar; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineReactorSmall.java b/com/hbm/inventory/gui/GUIMachineReactorSmall.java index 620f70c98..da5ecf795 100644 --- a/com/hbm/inventory/gui/GUIMachineReactorSmall.java +++ b/com/hbm/inventory/gui/GUIMachineReactorSmall.java @@ -2,16 +2,12 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineReactorSmall; -import com.hbm.inventory.container.ContainerMachineSelenium; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; -import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineReactorSmallOld.java b/com/hbm/inventory/gui/GUIMachineReactorSmallOld.java index 3a7aeb77f..e2f30e5db 100644 --- a/com/hbm/inventory/gui/GUIMachineReactorSmallOld.java +++ b/com/hbm/inventory/gui/GUIMachineReactorSmallOld.java @@ -4,13 +4,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineReactorSmallOld; -import com.hbm.inventory.container.ContainerMachineSelenium; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.machine.TileEntityMachineReactorSmallOld; -import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineRefinery.java b/com/hbm/inventory/gui/GUIMachineRefinery.java index 3bf244216..70f9a0bf4 100644 --- a/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineRefinery; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineSatLinker.java b/com/hbm/inventory/gui/GUIMachineSatLinker.java index c921f4072..9bd5eeb50 100644 --- a/com/hbm/inventory/gui/GUIMachineSatLinker.java +++ b/com/hbm/inventory/gui/GUIMachineSatLinker.java @@ -3,14 +3,10 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineSatLinker; -import com.hbm.inventory.container.ContainerMachineSiren; -import com.hbm.items.tool.ItemCassette.TrackType; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineSiren; import com.hbm.tileentity.machine.TileEntityMachineSatLinker; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java index 3d8989515..aa5c186c0 100644 --- a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java +++ b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineSelenium.java b/com/hbm/inventory/gui/GUIMachineSelenium.java index d722ad6b1..26c787065 100644 --- a/com/hbm/inventory/gui/GUIMachineSelenium.java +++ b/com/hbm/inventory/gui/GUIMachineSelenium.java @@ -3,10 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.inventory.container.ContainerMachineSelenium; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineShredder.java b/com/hbm/inventory/gui/GUIMachineShredder.java index 091e48944..255b789ba 100644 --- a/com/hbm/inventory/gui/GUIMachineShredder.java +++ b/com/hbm/inventory/gui/GUIMachineShredder.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineShredder; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIMachineSiren.java b/com/hbm/inventory/gui/GUIMachineSiren.java index 1d2f6425a..1dd6bb3c2 100644 --- a/com/hbm/inventory/gui/GUIMachineSiren.java +++ b/com/hbm/inventory/gui/GUIMachineSiren.java @@ -2,11 +2,9 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerMachineBattery; import com.hbm.inventory.container.ContainerMachineSiren; import com.hbm.items.tool.ItemCassette.TrackType; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineBattery; import com.hbm.tileentity.machine.TileEntityMachineSiren; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineTurbofan.java b/com/hbm/inventory/gui/GUIMachineTurbofan.java index 29ece80cf..c04655766 100644 --- a/com/hbm/inventory/gui/GUIMachineTurbofan.java +++ b/com/hbm/inventory/gui/GUIMachineTurbofan.java @@ -3,10 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; -import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.inventory.container.ContainerMachineTurbofan; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUINukeN2.java b/com/hbm/inventory/gui/GUINukeN2.java index 78b22071a..735587e1b 100644 --- a/com/hbm/inventory/gui/GUINukeN2.java +++ b/com/hbm/inventory/gui/GUINukeN2.java @@ -3,12 +3,9 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeN2; -import com.hbm.inventory.container.ContainerNukeSolinium; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.tileentity.bomb.TileEntityNukeN2; -import com.hbm.tileentity.bomb.TileEntityNukeSolinium; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUINukeN45.java b/com/hbm/inventory/gui/GUINukeN45.java index ea9503083..81f62f0a6 100644 --- a/com/hbm/inventory/gui/GUINukeN45.java +++ b/com/hbm/inventory/gui/GUINukeN45.java @@ -2,16 +2,10 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerForceField; import com.hbm.inventory.container.ContainerNukeN45; import com.hbm.lib.RefStrings; -import com.hbm.packet.AuxButtonPacket; -import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.bomb.TileEntityNukeN45; -import com.hbm.tileentity.machine.TileEntityForceField; - import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUINukeSolinium.java b/com/hbm/inventory/gui/GUINukeSolinium.java index 392cd11a1..965b78b8a 100644 --- a/com/hbm/inventory/gui/GUINukeSolinium.java +++ b/com/hbm/inventory/gui/GUINukeSolinium.java @@ -2,11 +2,9 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerNukeFleija; import com.hbm.inventory.container.ContainerNukeSolinium; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.bomb.TileEntityNukeFleija; import com.hbm.tileentity.bomb.TileEntityNukeSolinium; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIRadiobox.java b/com/hbm/inventory/gui/GUIRadiobox.java index 3475c9306..9edae4559 100644 --- a/com/hbm/inventory/gui/GUIRadiobox.java +++ b/com/hbm/inventory/gui/GUIRadiobox.java @@ -5,26 +5,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.io.Charsets; import org.apache.commons.lang3.math.NumberUtils; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.container.ContainerMachineReactorSmall; import com.hbm.inventory.container.ContainerRadiobox; -import com.hbm.inventory.gui.GUIScreenTemplateFolder.FolderButton; -import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemCassette; -import com.hbm.items.tool.ItemFluidIdentifier; -import com.hbm.items.tool.ItemCassette.TrackType; import com.hbm.lib.RefStrings; -import com.hbm.packet.AuxButtonPacket; -import com.hbm.packet.ItemFolderPacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; import com.hbm.tileentity.machine.TileEntityRadiobox; import net.minecraft.client.Minecraft; @@ -32,9 +18,6 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.ResourceLocation; public class GUIRadiobox extends GuiInfoContainer { diff --git a/com/hbm/inventory/gui/GUIReactorMultiblock.java b/com/hbm/inventory/gui/GUIReactorMultiblock.java index 4380c5209..ccc64c3bf 100644 --- a/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -8,11 +8,8 @@ import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge; -import com.hbm.tileentity.machine.TileEntityReactorMultiblock; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUISafe.java b/com/hbm/inventory/gui/GUISafe.java index 3b6fbac0c..e5a40b72f 100644 --- a/com/hbm/inventory/gui/GUISafe.java +++ b/com/hbm/inventory/gui/GUISafe.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerCrateSteel; import com.hbm.inventory.container.ContainerSafe; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityCrateSteel; import com.hbm.tileentity.machine.TileEntitySafe; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUISatDock.java b/com/hbm/inventory/gui/GUISatDock.java index 946e5e1ab..3276564df 100644 --- a/com/hbm/inventory/gui/GUISatDock.java +++ b/com/hbm/inventory/gui/GUISatDock.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerNukeN45; import com.hbm.inventory.container.ContainerSatDock; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.bomb.TileEntityNukeN45; import com.hbm.tileentity.machine.TileEntityMachineSatDock; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIScreenBobmazon.java b/com/hbm/inventory/gui/GUIScreenBobmazon.java index 24f229ef7..18873a3da 100644 --- a/com/hbm/inventory/gui/GUIScreenBobmazon.java +++ b/com/hbm/inventory/gui/GUIScreenBobmazon.java @@ -6,31 +6,18 @@ import java.util.List; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; -import com.hbm.items.tool.ItemCassette; -import com.hbm.items.tool.ItemCassette.TrackType; -import com.hbm.items.tool.ItemChemistryTemplate; -import com.hbm.items.tool.ItemFluidIdentifier; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.packet.ItemBobmazonPacket; -import com.hbm.packet.ItemFolderPacket; import com.hbm.packet.PacketDispatcher; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIScreenDesignator.java b/com/hbm/inventory/gui/GUIScreenDesignator.java index ab0d67357..67cae4179 100644 --- a/com/hbm/inventory/gui/GUIScreenDesignator.java +++ b/com/hbm/inventory/gui/GUIScreenDesignator.java @@ -6,28 +6,15 @@ import java.util.List; import org.lwjgl.opengl.GL11; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; -import com.hbm.items.tool.ItemCassette; -import com.hbm.items.tool.ItemCassette.TrackType; -import com.hbm.items.tool.ItemChemistryTemplate; -import com.hbm.items.tool.ItemFluidIdentifier; import com.hbm.lib.RefStrings; import com.hbm.packet.ItemDesignatorPacket; -import com.hbm.packet.ItemFolderPacket; import com.hbm.packet.PacketDispatcher; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIScreenSatInterface.java b/com/hbm/inventory/gui/GUIScreenSatInterface.java index c5f5c15a5..e8ecdb563 100644 --- a/com/hbm/inventory/gui/GUIScreenSatInterface.java +++ b/com/hbm/inventory/gui/GUIScreenSatInterface.java @@ -18,16 +18,10 @@ import com.hbm.saveddata.SatelliteSaveStructure.SatelliteType; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index 7f79a5fc5..dbdbdf676 100644 --- a/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -20,12 +20,9 @@ import com.hbm.packet.PacketDispatcher; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUISoyuzLauncher.java b/com/hbm/inventory/gui/GUISoyuzLauncher.java index bd7ec924f..c4924dc40 100644 --- a/com/hbm/inventory/gui/GUISoyuzLauncher.java +++ b/com/hbm/inventory/gui/GUISoyuzLauncher.java @@ -2,23 +2,13 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerSoyuzLauncher; -import com.hbm.items.weapon.ItemCustomMissile; -import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.lib.RefStrings; -import com.hbm.packet.AuxButtonPacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.render.util.MissileMultipart; -import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.machine.TileEntitySoyuzLauncher; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; public class GUISoyuzLauncher extends GuiInfoContainer { diff --git a/com/hbm/inventory/gui/GUIWasteDrum.java b/com/hbm/inventory/gui/GUIWasteDrum.java index 10ae27aba..dc9ae9131 100644 --- a/com/hbm/inventory/gui/GUIWasteDrum.java +++ b/com/hbm/inventory/gui/GUIWasteDrum.java @@ -2,14 +2,11 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerCrateIron; import com.hbm.inventory.container.ContainerWasteDrum; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityCrateIron; import com.hbm.tileentity.machine.TileEntityWasteDrum; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIWatzCore.java b/com/hbm/inventory/gui/GUIWatzCore.java index 234034716..975034aa2 100644 --- a/com/hbm/inventory/gui/GUIWatzCore.java +++ b/com/hbm/inventory/gui/GUIWatzCore.java @@ -8,7 +8,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityWatzCore; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/inv/InventoryLeadBox.java b/com/hbm/inventory/inv/InventoryLeadBox.java index df265dcd0..8e476719e 100644 --- a/com/hbm/inventory/inv/InventoryLeadBox.java +++ b/com/hbm/inventory/inv/InventoryLeadBox.java @@ -1,8 +1,6 @@ package com.hbm.inventory.inv; import com.hbm.items.special.ItemRadioactive; -import com.hbm.items.tool.ItemLeadBox; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/com/hbm/items/bomb/ItemSolinium.java b/com/hbm/items/bomb/ItemSolinium.java index 3a29dcaa1..5e536920a 100644 --- a/com/hbm/items/bomb/ItemSolinium.java +++ b/com/hbm/items/bomb/ItemSolinium.java @@ -2,11 +2,9 @@ package com.hbm.items.bomb; import java.util.List; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemRadioactive; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; public class ItemSolinium extends ItemRadioactive { diff --git a/com/hbm/items/food/ItemLemon.java b/com/hbm/items/food/ItemLemon.java index 86045960d..d1167859f 100644 --- a/com/hbm/items/food/ItemLemon.java +++ b/com/hbm/items/food/ItemLemon.java @@ -213,9 +213,6 @@ public class ItemLemon extends ItemFood { } if(this == ModItems.med_schizophrenia) { - int o = 0; - - int z = 5 / o; } if(this == ModItems.loop_stew) { diff --git a/com/hbm/items/gear/ArmorModel.java b/com/hbm/items/gear/ArmorModel.java index c3640b7fa..7606970ba 100644 --- a/com/hbm/items/gear/ArmorModel.java +++ b/com/hbm/items/gear/ArmorModel.java @@ -5,9 +5,7 @@ import java.util.List; import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; -import com.hbm.lib.Library; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelCloak; import com.hbm.render.model.ModelGasMask; import com.hbm.render.model.ModelGoggles; diff --git a/com/hbm/items/gear/JetpackBooster.java b/com/hbm/items/gear/JetpackBooster.java index 1c968116d..31fd32323 100644 --- a/com/hbm/items/gear/JetpackBooster.java +++ b/com/hbm/items/gear/JetpackBooster.java @@ -3,11 +3,7 @@ package com.hbm.items.gear; import java.util.List; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.items.ModItems; -import com.hbm.render.model.ModelGoggles; import com.hbm.render.model.ModelJetPack; -import com.hbm.render.model.ModelOxygenMask; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; diff --git a/com/hbm/items/gear/JetpackBreak.java b/com/hbm/items/gear/JetpackBreak.java index b4af7f067..e2fb4afb6 100644 --- a/com/hbm/items/gear/JetpackBreak.java +++ b/com/hbm/items/gear/JetpackBreak.java @@ -13,7 +13,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/com/hbm/items/gear/JetpackRegular.java b/com/hbm/items/gear/JetpackRegular.java index ff0d9d274..6025b062a 100644 --- a/com/hbm/items/gear/JetpackRegular.java +++ b/com/hbm/items/gear/JetpackRegular.java @@ -3,11 +3,7 @@ package com.hbm.items.gear; import java.util.List; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.items.ModItems; -import com.hbm.render.model.ModelGoggles; import com.hbm.render.model.ModelJetPack; -import com.hbm.render.model.ModelOxygenMask; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; diff --git a/com/hbm/items/gear/JetpackVectorized.java b/com/hbm/items/gear/JetpackVectorized.java index 96757af0e..9ebca4f25 100644 --- a/com/hbm/items/gear/JetpackVectorized.java +++ b/com/hbm/items/gear/JetpackVectorized.java @@ -13,7 +13,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/com/hbm/items/special/ItemAntiCheat.java b/com/hbm/items/special/ItemAntiCheat.java index 8169a06cc..d3e2102e3 100644 --- a/com/hbm/items/special/ItemAntiCheat.java +++ b/com/hbm/items/special/ItemAntiCheat.java @@ -1,9 +1,6 @@ package com.hbm.items.special; -import com.hbm.items.ModItems; -import com.hbm.lib.ModDamageSource; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/items/special/ItemBlades.java b/com/hbm/items/special/ItemBlades.java index 43802abdb..54af61630 100644 --- a/com/hbm/items/special/ItemBlades.java +++ b/com/hbm/items/special/ItemBlades.java @@ -3,9 +3,6 @@ package com.hbm.items.special; import java.util.List; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemCassette; -import com.hbm.items.tool.ItemCassette.TrackType; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/com/hbm/items/special/ItemCatalyst.java b/com/hbm/items/special/ItemCatalyst.java index a75204787..d75d5befd 100644 --- a/com/hbm/items/special/ItemCatalyst.java +++ b/com/hbm/items/special/ItemCatalyst.java @@ -2,8 +2,6 @@ package com.hbm.items.special; import java.util.List; -import com.hbm.items.ModItems; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/com/hbm/items/special/ItemFuelRod.java b/com/hbm/items/special/ItemFuelRod.java index 06c75d121..8dc6bb214 100644 --- a/com/hbm/items/special/ItemFuelRod.java +++ b/com/hbm/items/special/ItemFuelRod.java @@ -2,8 +2,6 @@ package com.hbm.items.special; import java.util.List; -import com.hbm.items.ModItems; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/items/special/ItemPolaroid.java b/com/hbm/items/special/ItemPolaroid.java index 7f7736b4f..6eaf27fbe 100644 --- a/com/hbm/items/special/ItemPolaroid.java +++ b/com/hbm/items/special/ItemPolaroid.java @@ -2,8 +2,6 @@ package com.hbm.items.special; import java.util.List; -import org.lwjgl.input.Keyboard; - import com.hbm.main.MainRegistry; import net.minecraft.entity.Entity; @@ -13,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import scala.swing.event.Key; public class ItemPolaroid extends Item { diff --git a/com/hbm/items/special/ItemUnstable.java b/com/hbm/items/special/ItemUnstable.java index 731af0cbd..bf93d64e4 100644 --- a/com/hbm/items/special/ItemUnstable.java +++ b/com/hbm/items/special/ItemUnstable.java @@ -2,8 +2,6 @@ package com.hbm.items.special; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/com/hbm/items/tool/ItemAnalyzer.java b/com/hbm/items/tool/ItemAnalyzer.java index a63facf01..2afeadb7d 100644 --- a/com/hbm/items/tool/ItemAnalyzer.java +++ b/com/hbm/items/tool/ItemAnalyzer.java @@ -15,7 +15,6 @@ import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index d552f8626..fdd7b072f 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -2,28 +2,17 @@ package com.hbm.items.tool; import java.util.Arrays; import java.util.List; -import java.util.Random; - -import org.lwjgl.input.Keyboard; - import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; public class ItemAssemblyTemplate extends Item { diff --git a/com/hbm/items/tool/ItemBombCaller.java b/com/hbm/items/tool/ItemBombCaller.java index 197a4be4f..9d39a924d 100644 --- a/com/hbm/items/tool/ItemBombCaller.java +++ b/com/hbm/items/tool/ItemBombCaller.java @@ -3,7 +3,6 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.entity.logic.EntityBomber; -import com.hbm.interfaces.IBomb; import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/items/tool/ItemChemistryIcon.java b/com/hbm/items/tool/ItemChemistryIcon.java index 8f6d6eee9..83e6d7639 100644 --- a/com/hbm/items/tool/ItemChemistryIcon.java +++ b/com/hbm/items/tool/ItemChemistryIcon.java @@ -4,8 +4,6 @@ import java.util.List; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate; -import com.hbm.lib.RefStrings; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,7 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; public class ItemChemistryIcon extends Item { diff --git a/com/hbm/items/tool/ItemChemistryTemplate.java b/com/hbm/items/tool/ItemChemistryTemplate.java index 31e080532..9b7acdf17 100644 --- a/com/hbm/items/tool/ItemChemistryTemplate.java +++ b/com/hbm/items/tool/ItemChemistryTemplate.java @@ -2,7 +2,6 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.FluidStack; import com.hbm.inventory.MachineRecipes; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/items/tool/ItemFluidDuct.java b/com/hbm/items/tool/ItemFluidDuct.java index 605d8e543..28c4eba08 100644 --- a/com/hbm/items/tool/ItemFluidDuct.java +++ b/com/hbm/items/tool/ItemFluidDuct.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.items.ModItems; import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/items/tool/ItemFluidIcon.java b/com/hbm/items/tool/ItemFluidIcon.java index 403b1953a..b7197af2d 100644 --- a/com/hbm/items/tool/ItemFluidIcon.java +++ b/com/hbm/items/tool/ItemFluidIcon.java @@ -2,22 +2,15 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate; -import com.hbm.tileentity.conductor.TileEntityFluidDuct; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; public class ItemFluidIcon extends Item { diff --git a/com/hbm/items/tool/ItemFluidIdentifier.java b/com/hbm/items/tool/ItemFluidIdentifier.java index eb2d1f1b6..9d6be9f18 100644 --- a/com/hbm/items/tool/ItemFluidIdentifier.java +++ b/com/hbm/items/tool/ItemFluidIdentifier.java @@ -2,7 +2,6 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.items.ModItems; import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/items/tool/ItemFluidTank.java b/com/hbm/items/tool/ItemFluidTank.java index 613c0dc00..740d25ae6 100644 --- a/com/hbm/items/tool/ItemFluidTank.java +++ b/com/hbm/items/tool/ItemFluidTank.java @@ -2,22 +2,15 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; -import com.hbm.tileentity.conductor.TileEntityFluidDuct; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; -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.util.StatCollector; -import net.minecraft.world.World; public class ItemFluidTank extends Item { diff --git a/com/hbm/items/tool/ItemLeadBox.java b/com/hbm/items/tool/ItemLeadBox.java index 3d1b0f961..2287e4fd5 100644 --- a/com/hbm/items/tool/ItemLeadBox.java +++ b/com/hbm/items/tool/ItemLeadBox.java @@ -1,11 +1,6 @@ package com.hbm.items.tool; -import com.hbm.items.ModItems; -import com.hbm.items.special.ItemRadioactive; -import com.hbm.main.MainRegistry; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/items/tool/ItemModDoor.java b/com/hbm/items/tool/ItemModDoor.java index e87f98c8d..973863648 100644 --- a/com/hbm/items/tool/ItemModDoor.java +++ b/com/hbm/items/tool/ItemModDoor.java @@ -4,10 +4,8 @@ import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; diff --git a/com/hbm/items/tool/ItemReactorSensor.java b/com/hbm/items/tool/ItemReactorSensor.java index 17a95c067..c593fec8a 100644 --- a/com/hbm/items/tool/ItemReactorSensor.java +++ b/com/hbm/items/tool/ItemReactorSensor.java @@ -3,15 +3,11 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.tileentity.machine.TileEntityMachineTeleporter; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemReactorSensor extends Item { diff --git a/com/hbm/items/tool/ItemSatInterface.java b/com/hbm/items/tool/ItemSatInterface.java index eccbd75fc..100245d93 100644 --- a/com/hbm/items/tool/ItemSatInterface.java +++ b/com/hbm/items/tool/ItemSatInterface.java @@ -1,6 +1,5 @@ package com.hbm.items.tool; -import com.hbm.inventory.gui.GUIScreenSatInterface; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.PacketDispatcher; @@ -9,7 +8,6 @@ import com.hbm.saveddata.SatelliteSavedData; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/items/tool/ItemTemplateFolder.java b/com/hbm/items/tool/ItemTemplateFolder.java index 04bcd9ae7..bcd4a8c94 100644 --- a/com/hbm/items/tool/ItemTemplateFolder.java +++ b/com/hbm/items/tool/ItemTemplateFolder.java @@ -8,10 +8,7 @@ import com.hbm.main.MainRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ArrowNockEvent; public class ItemTemplateFolder extends Item { diff --git a/com/hbm/items/tool/ItemTurretChip.java b/com/hbm/items/tool/ItemTurretChip.java index 4839c0e9e..24491255f 100644 --- a/com/hbm/items/tool/ItemTurretChip.java +++ b/com/hbm/items/tool/ItemTurretChip.java @@ -1,15 +1,11 @@ package com.hbm.items.tool; import java.util.Arrays; -import java.util.List; - import com.hbm.blocks.bomb.TurretBase; import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; diff --git a/com/hbm/items/weapon/GunB92.java b/com/hbm/items/weapon/GunB92.java index 27562cd3e..41fcfbcd5 100644 --- a/com/hbm/items/weapon/GunB92.java +++ b/com/hbm/items/weapon/GunB92.java @@ -6,13 +6,9 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityExplosiveBeam; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; diff --git a/com/hbm/items/weapon/GunB92Cell.java b/com/hbm/items/weapon/GunB92Cell.java index 7d482a093..eac40f6f3 100644 --- a/com/hbm/items/weapon/GunB92Cell.java +++ b/com/hbm/items/weapon/GunB92Cell.java @@ -3,8 +3,6 @@ package com.hbm.items.weapon; import java.util.List; import com.hbm.items.ModItems; -import com.hbm.main.MainRegistry; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/com/hbm/items/weapon/GunB93.java b/com/hbm/items/weapon/GunB93.java index 36ba6293a..70998acb3 100644 --- a/com/hbm/items/weapon/GunB93.java +++ b/com/hbm/items/weapon/GunB93.java @@ -6,14 +6,7 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityExplosiveBeam; import com.hbm.entity.projectile.EntityModBeam; -import com.hbm.items.ModItems; -import com.hbm.main.MainRegistry; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; diff --git a/com/hbm/items/weapon/GunBaleFlare.java b/com/hbm/items/weapon/GunBaleFlare.java index da706af3c..f7de2e152 100644 --- a/com/hbm/items/weapon/GunBaleFlare.java +++ b/com/hbm/items/weapon/GunBaleFlare.java @@ -109,7 +109,7 @@ public class GunBaleFlare extends Item { */ @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); diff --git a/com/hbm/items/weapon/GunBrimstone.java b/com/hbm/items/weapon/GunBrimstone.java index 7f4c68bac..0a0df42c4 100644 --- a/com/hbm/items/weapon/GunBrimstone.java +++ b/com/hbm/items/weapon/GunBrimstone.java @@ -38,7 +38,7 @@ public class GunBrimstone extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunCalamity.java b/com/hbm/items/weapon/GunCalamity.java index c45b6922a..47f79635d 100644 --- a/com/hbm/items/weapon/GunCalamity.java +++ b/com/hbm/items/weapon/GunCalamity.java @@ -40,7 +40,7 @@ public class GunCalamity extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunCryolator.java b/com/hbm/items/weapon/GunCryolator.java index 9fe418ba4..1a0c8b44f 100644 --- a/com/hbm/items/weapon/GunCryolator.java +++ b/com/hbm/items/weapon/GunCryolator.java @@ -38,7 +38,7 @@ public class GunCryolator extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunDampfmaschine.java b/com/hbm/items/weapon/GunDampfmaschine.java index 7ed9f49cd..3eaf7a036 100644 --- a/com/hbm/items/weapon/GunDampfmaschine.java +++ b/com/hbm/items/weapon/GunDampfmaschine.java @@ -37,7 +37,7 @@ public class GunDampfmaschine extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunDash.java b/com/hbm/items/weapon/GunDash.java index 2c3f534c8..c0ebd1e06 100644 --- a/com/hbm/items/weapon/GunDash.java +++ b/com/hbm/items/weapon/GunDash.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityLaser; import com.hbm.items.ModItems; import com.hbm.lib.Library; @@ -42,7 +41,7 @@ public class GunDash extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunDefabricator.java b/com/hbm/items/weapon/GunDefabricator.java index 6c5be0c34..ce1457033 100644 --- a/com/hbm/items/weapon/GunDefabricator.java +++ b/com/hbm/items/weapon/GunDefabricator.java @@ -40,7 +40,7 @@ public class GunDefabricator extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunEMPRay.java b/com/hbm/items/weapon/GunEMPRay.java index 1a12ffa60..7edf7a31a 100644 --- a/com/hbm/items/weapon/GunEMPRay.java +++ b/com/hbm/items/weapon/GunEMPRay.java @@ -42,7 +42,7 @@ public class GunEMPRay extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); diff --git a/com/hbm/items/weapon/GunEuthanasia.java b/com/hbm/items/weapon/GunEuthanasia.java index 13a7b9bdc..adf81090d 100644 --- a/com/hbm/items/weapon/GunEuthanasia.java +++ b/com/hbm/items/weapon/GunEuthanasia.java @@ -39,7 +39,7 @@ public class GunEuthanasia extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunHP.java b/com/hbm/items/weapon/GunHP.java index 170ad0d99..8d3d0f31b 100644 --- a/com/hbm/items/weapon/GunHP.java +++ b/com/hbm/items/weapon/GunHP.java @@ -37,7 +37,7 @@ public class GunHP extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunImmolator.java b/com/hbm/items/weapon/GunImmolator.java index fd6b7a793..e725f19b1 100644 --- a/com/hbm/items/weapon/GunImmolator.java +++ b/com/hbm/items/weapon/GunImmolator.java @@ -38,7 +38,7 @@ public class GunImmolator extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunLacunae.java b/com/hbm/items/weapon/GunLacunae.java index a76317384..6acdfb5e8 100644 --- a/com/hbm/items/weapon/GunLacunae.java +++ b/com/hbm/items/weapon/GunLacunae.java @@ -18,8 +18,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ArrowNockEvent; @@ -44,7 +42,7 @@ public class GunLacunae extends Item implements IHoldableWeapon { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World world, EntityPlayer player) { - ArrowNockEvent event = new ArrowNockEvent(player, p_77659_1_); + new ArrowNockEvent(player, p_77659_1_); { player.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunLeverAction.java b/com/hbm/items/weapon/GunLeverAction.java index ca19b83b7..a0980d7b5 100644 --- a/com/hbm/items/weapon/GunLeverAction.java +++ b/com/hbm/items/weapon/GunLeverAction.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.items.ModItems; @@ -19,8 +18,6 @@ import net.minecraft.item.EnumAction; 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.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; diff --git a/com/hbm/items/weapon/GunLeverActionS.java b/com/hbm/items/weapon/GunLeverActionS.java index efab0265e..97742bbce 100644 --- a/com/hbm/items/weapon/GunLeverActionS.java +++ b/com/hbm/items/weapon/GunLeverActionS.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; diff --git a/com/hbm/items/weapon/GunMP.java b/com/hbm/items/weapon/GunMP.java index 67c4bba62..d3dab92c3 100644 --- a/com/hbm/items/weapon/GunMP.java +++ b/com/hbm/items/weapon/GunMP.java @@ -38,7 +38,7 @@ public class GunMP extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunOSIPR.java b/com/hbm/items/weapon/GunOSIPR.java index ce1083454..bae321b8e 100644 --- a/com/hbm/items/weapon/GunOSIPR.java +++ b/com/hbm/items/weapon/GunOSIPR.java @@ -40,7 +40,7 @@ public class GunOSIPR extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunProtoMirv.java b/com/hbm/items/weapon/GunProtoMirv.java index cac1fcc1e..b851f7ad4 100644 --- a/com/hbm/items/weapon/GunProtoMirv.java +++ b/com/hbm/items/weapon/GunProtoMirv.java @@ -6,8 +6,6 @@ import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.items.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; @@ -16,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; diff --git a/com/hbm/items/weapon/GunRevolver.java b/com/hbm/items/weapon/GunRevolver.java index 390ceb33b..cdb1569b4 100644 --- a/com/hbm/items/weapon/GunRevolver.java +++ b/com/hbm/items/weapon/GunRevolver.java @@ -18,13 +18,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class GunRevolver extends Item { diff --git a/com/hbm/items/weapon/GunSMG.java b/com/hbm/items/weapon/GunSMG.java index c0c9cb393..e5cb4cf58 100644 --- a/com/hbm/items/weapon/GunSMG.java +++ b/com/hbm/items/weapon/GunSMG.java @@ -4,10 +4,8 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfigSyncingUtil; -import com.hbm.handler.guncfg.BulletConfigFactory; import com.hbm.items.ModItems; import net.minecraft.enchantment.Enchantment; @@ -15,7 +13,6 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -43,7 +40,7 @@ public class GunSMG extends Item { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunStinger.java b/com/hbm/items/weapon/GunStinger.java index 1c7aee6b4..781a1ddda 100644 --- a/com/hbm/items/weapon/GunStinger.java +++ b/com/hbm/items/weapon/GunStinger.java @@ -3,12 +3,9 @@ package com.hbm.items.weapon; import java.util.List; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityRocket; import com.hbm.entity.projectile.EntityRocketHoming; import com.hbm.items.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; @@ -17,7 +14,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; diff --git a/com/hbm/items/weapon/GunSuicide.java b/com/hbm/items/weapon/GunSuicide.java index 739c7d744..792f608dc 100644 --- a/com/hbm/items/weapon/GunSuicide.java +++ b/com/hbm/items/weapon/GunSuicide.java @@ -15,7 +15,6 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; -import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; diff --git a/com/hbm/items/weapon/GunUZI.java b/com/hbm/items/weapon/GunUZI.java index 21a719948..630347f80 100644 --- a/com/hbm/items/weapon/GunUZI.java +++ b/com/hbm/items/weapon/GunUZI.java @@ -42,7 +42,7 @@ public class GunUZI extends Item implements IHoldableWeapon { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + new ArrowNockEvent(p_77659_3_, p_77659_1_); { p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); } diff --git a/com/hbm/items/weapon/GunXVL1456.java b/com/hbm/items/weapon/GunXVL1456.java index 4d0700ef8..56381afe1 100644 --- a/com/hbm/items/weapon/GunXVL1456.java +++ b/com/hbm/items/weapon/GunXVL1456.java @@ -9,7 +9,6 @@ import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/weapon/GunZOMG.java b/com/hbm/items/weapon/GunZOMG.java index 88f1fe660..971592633 100644 --- a/com/hbm/items/weapon/GunZOMG.java +++ b/com/hbm/items/weapon/GunZOMG.java @@ -7,8 +7,6 @@ import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityRainbow; import com.hbm.items.ModItems; -import com.hbm.lib.Library; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; @@ -42,7 +40,7 @@ public class GunZOMG extends Item { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - ArrowNockEvent event = new ArrowNockEvent(player, stack); + new ArrowNockEvent(player, stack); { player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); } @@ -121,8 +119,7 @@ public class GunZOMG extends Item { if (!player.isSneaking()) { if (stack.stackTagCompound.getBoolean("valid")) { - boolean flag = player.capabilities.isCreativeMode - || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; + EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack); if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.nugget_euphemium) || player.inventory.hasItem(ModItems.ingot_euphemium)) && count % 1 == 0) { if (!stack.stackTagCompound.getBoolean("superuser")) { diff --git a/com/hbm/items/weapon/ItemCustomMissile.java b/com/hbm/items/weapon/ItemCustomMissile.java index a6a300d85..12490f7fc 100644 --- a/com/hbm/items/weapon/ItemCustomMissile.java +++ b/com/hbm/items/weapon/ItemCustomMissile.java @@ -6,15 +6,11 @@ import com.hbm.handler.MissileStruct; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.WarheadType; -import com.hbm.render.util.MissilePart; - -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; public class ItemCustomMissile extends Item { diff --git a/com/hbm/items/weapon/ItemGunBase.java b/com/hbm/items/weapon/ItemGunBase.java index 7374362dc..77c3f03aa 100644 --- a/com/hbm/items/weapon/ItemGunBase.java +++ b/com/hbm/items/weapon/ItemGunBase.java @@ -10,18 +10,14 @@ import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; import com.hbm.interfaces.IHoldableWeapon; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.GunButtonPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.render.util.RenderScreenOverlay.Crosshair; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.resources.I18n; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -32,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import net.minecraftforge.client.event.MouseEvent; public class ItemGunBase extends Item implements IHoldableWeapon { @@ -522,7 +517,7 @@ public class ItemGunBase extends Item implements IHoldableWeapon { public static BulletConfiguration getBeltCfg(EntityPlayer player, ItemStack stack) { ItemGunBase gun = (ItemGunBase)stack.getItem(); - Item ammo = getBeltType(player, stack); + getBeltType(player, stack); for(Integer config : gun.mainConfig.config) { diff --git a/com/hbm/items/weapon/ItemGunOSIPR.java b/com/hbm/items/weapon/ItemGunOSIPR.java index 46346302a..64c37c23c 100644 --- a/com/hbm/items/weapon/ItemGunOSIPR.java +++ b/com/hbm/items/weapon/ItemGunOSIPR.java @@ -1,38 +1,11 @@ package com.hbm.items.weapon; -import java.util.List; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - -import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.entity.projectile.EntityCombineBall; -import com.hbm.handler.BulletConfigSyncingUtil; -import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; -import com.hbm.interfaces.IHoldableWeapon; import com.hbm.items.ModItems; -import com.hbm.main.MainRegistry; -import com.hbm.packet.GunButtonPacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.render.util.RenderScreenOverlay.Crosshair; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.resources.I18n; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.client.event.MouseEvent; public class ItemGunOSIPR extends ItemGunBase { diff --git a/com/hbm/items/weapon/ItemMissile.java b/com/hbm/items/weapon/ItemMissile.java index c6bdf0051..cfe4e4835 100644 --- a/com/hbm/items/weapon/ItemMissile.java +++ b/com/hbm/items/weapon/ItemMissile.java @@ -1,11 +1,8 @@ package com.hbm.items.weapon; -import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemLootCrate; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; diff --git a/com/hbm/items/weapon/ItemTurretAmmo.java b/com/hbm/items/weapon/ItemTurretAmmo.java index 5499eca0d..325afc01a 100644 --- a/com/hbm/items/weapon/ItemTurretAmmo.java +++ b/com/hbm/items/weapon/ItemTurretAmmo.java @@ -1,6 +1,5 @@ package com.hbm.items.weapon; -import com.hbm.items.ModItems; import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.block.Block; diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 8da7ce174..5e973d7d0 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -6,8 +6,6 @@ import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.items.weapon.GunB92Cell; -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 35dd9985e..2e9c6d210 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1,27 +1,18 @@ package com.hbm.main; -import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.dispenser.BehaviorProjectileDispense; -import net.minecraft.dispenser.IBehaviorDispenseItem; -import net.minecraft.dispenser.IBlockSource; import net.minecraft.dispenser.IPosition; -import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.IProjectile; -import net.minecraft.entity.projectile.EntityEgg; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.stats.Achievement; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.common.AchievementPage; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.LoadingCallback; @@ -66,8 +57,6 @@ import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; import com.hbm.potion.HbmPotion; -import com.hbm.render.loader.HmfModelLoader; -import com.hbm.render.util.MissilePart; import com.hbm.tileentity.bomb.*; import com.hbm.tileentity.conductor.*; import com.hbm.tileentity.deco.*; diff --git a/com/hbm/packet/AuxElectricityPacket.java b/com/hbm/packet/AuxElectricityPacket.java index b5372cc2b..0ca05cedf 100644 --- a/com/hbm/packet/AuxElectricityPacket.java +++ b/com/hbm/packet/AuxElectricityPacket.java @@ -2,7 +2,6 @@ package com.hbm.packet; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; -import com.hbm.tileentity.machine.TileEntityMachinePress; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -11,8 +10,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; public class AuxElectricityPacket implements IMessage { diff --git a/com/hbm/packet/AuxGaugePacket.java b/com/hbm/packet/AuxGaugePacket.java index 84ec16476..4edb6d875 100644 --- a/com/hbm/packet/AuxGaugePacket.java +++ b/com/hbm/packet/AuxGaugePacket.java @@ -1,7 +1,5 @@ package com.hbm.packet; -import com.hbm.interfaces.IConsumer; -import com.hbm.interfaces.ISource; import com.hbm.interfaces.Spaghetti; import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.tileentity.TileEntityMachineBase; diff --git a/com/hbm/packet/AuxParticlePacket.java b/com/hbm/packet/AuxParticlePacket.java index cf96a11b7..1483e297d 100644 --- a/com/hbm/packet/AuxParticlePacket.java +++ b/com/hbm/packet/AuxParticlePacket.java @@ -1,16 +1,11 @@ package com.hbm.packet; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; -import com.hbm.tileentity.machine.TileEntityMachinePumpjack; 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 io.netty.buffer.ByteBuf; -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class AuxParticlePacket implements IMessage { diff --git a/com/hbm/packet/GunButtonPacket.java b/com/hbm/packet/GunButtonPacket.java index 3c2f6f9a8..2e3c13103 100644 --- a/com/hbm/packet/GunButtonPacket.java +++ b/com/hbm/packet/GunButtonPacket.java @@ -1,34 +1,14 @@ package com.hbm.packet; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.items.weapon.ItemGunBase; -import com.hbm.saveddata.SatelliteSaveStructure; -import com.hbm.saveddata.SatelliteSavedData; -import com.hbm.tileentity.bomb.TileEntityTurretCIWS; -import com.hbm.tileentity.bomb.TileEntityTurretCheapo; -import com.hbm.tileentity.machine.TileEntityAMSBase; -import com.hbm.tileentity.machine.TileEntityAMSEmitter; -import com.hbm.tileentity.machine.TileEntityAMSLimiter; -import com.hbm.tileentity.machine.TileEntityForceField; -import com.hbm.tileentity.machine.TileEntityMachineDiesel; -import com.hbm.tileentity.machine.TileEntityMachineReactorLarge; -import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; -import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; -import com.hbm.tileentity.machine.TileEntityRadioRec; -import com.hbm.tileentity.machine.TileEntityReactorControl; import cpw.mods.fml.common.FMLCommonHandler; 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.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; public class GunButtonPacket implements IMessage { diff --git a/com/hbm/packet/ItemBobmazonPacket.java b/com/hbm/packet/ItemBobmazonPacket.java index 0ac113f9f..27195ffae 100644 --- a/com/hbm/packet/ItemBobmazonPacket.java +++ b/com/hbm/packet/ItemBobmazonPacket.java @@ -1,33 +1,22 @@ package com.hbm.packet; -import java.util.List; import java.util.Random; import com.hbm.entity.missile.EntityBobmazon; import com.hbm.handler.BobmazonOfferFactory; import com.hbm.inventory.gui.GUIScreenBobmazon.Offer; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemAssemblyTemplate; -import com.hbm.items.tool.ItemCassette; -import com.hbm.items.tool.ItemChemistryTemplate; -import com.hbm.items.tool.ItemFluidIdentifier; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; -import cpw.mods.fml.common.network.ByteBufUtils; 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 io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; diff --git a/com/hbm/packet/ItemDesignatorPacket.java b/com/hbm/packet/ItemDesignatorPacket.java index a02fae135..126325b16 100644 --- a/com/hbm/packet/ItemDesignatorPacket.java +++ b/com/hbm/packet/ItemDesignatorPacket.java @@ -1,18 +1,12 @@ package com.hbm.packet; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemAssemblyTemplate; -import com.hbm.items.tool.ItemCassette; -import com.hbm.items.tool.ItemChemistryTemplate; -import com.hbm.items.tool.ItemFluidIdentifier; 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 io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/packet/ItemFolderPacket.java b/com/hbm/packet/ItemFolderPacket.java index a7c29d739..0de223706 100644 --- a/com/hbm/packet/ItemFolderPacket.java +++ b/com/hbm/packet/ItemFolderPacket.java @@ -1,7 +1,5 @@ package com.hbm.packet; -import java.util.List; - import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemAssemblyTemplate; @@ -11,18 +9,15 @@ import com.hbm.items.tool.ItemChemistryTemplate; import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate; import com.hbm.items.tool.ItemFluidIdentifier; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; 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 io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; public class ItemFolderPacket implements IMessage { diff --git a/com/hbm/packet/LoopedEntitySoundPacket.java b/com/hbm/packet/LoopedEntitySoundPacket.java index 95e7aeee2..0d364608f 100644 --- a/com/hbm/packet/LoopedEntitySoundPacket.java +++ b/com/hbm/packet/LoopedEntitySoundPacket.java @@ -1,25 +1,7 @@ package com.hbm.packet; -import org.lwjgl.opengl.GL11; - import com.hbm.entity.logic.EntityBomber; -import com.hbm.main.ResourceManager; import com.hbm.sound.MovingSoundBomber; -import com.hbm.sound.SoundLoopAssembler; -import com.hbm.sound.SoundLoopBroadcaster; -import com.hbm.sound.SoundLoopCentrifuge; -import com.hbm.sound.SoundLoopChemplant; -import com.hbm.sound.SoundLoopIGen; -import com.hbm.sound.SoundLoopMiner; -import com.hbm.sound.SoundLoopTurbofan; -import com.hbm.tileentity.machine.TileEntityBroadcaster; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; -import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; -import com.hbm.tileentity.machine.TileEntityMachineChemplant; -import com.hbm.tileentity.machine.TileEntityMachineGasCent; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -29,7 +11,6 @@ import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; public class LoopedEntitySoundPacket implements IMessage { diff --git a/com/hbm/packet/LoopedSoundPacket.java b/com/hbm/packet/LoopedSoundPacket.java index d75c39a6d..6fb1b4445 100644 --- a/com/hbm/packet/LoopedSoundPacket.java +++ b/com/hbm/packet/LoopedSoundPacket.java @@ -148,8 +148,6 @@ public class LoopedSoundPacket implements IMessage { flag = false; } - int j = te.xCoord + te.zCoord + te.yCoord; - if(flag && te.getWorldObj().isRemote && ((TileEntityMachineCentrifuge)te).isProgressing) Minecraft.getMinecraft().getSoundHandler().playSound(new SoundLoopCentrifuge(new ResourceLocation("hbm:block.centrifugeOperate"), te)); } @@ -162,8 +160,6 @@ public class LoopedSoundPacket implements IMessage { flag = false; } - int j = te.xCoord + te.zCoord + te.yCoord; - if(flag && te.getWorldObj().isRemote && ((TileEntityMachineGasCent)te).isProgressing) Minecraft.getMinecraft().getSoundHandler().playSound(new SoundLoopCentrifuge(new ResourceLocation("hbm:block.centrifugeOperate"), te)); } diff --git a/com/hbm/packet/NBTPacket.java b/com/hbm/packet/NBTPacket.java new file mode 100644 index 000000000..93ae772cd --- /dev/null +++ b/com/hbm/packet/NBTPacket.java @@ -0,0 +1,94 @@ +package com.hbm.packet; + +import java.io.IOException; + +import com.hbm.tileentity.TileEntityMachineBase; + +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 io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import net.minecraft.client.Minecraft; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; +import net.minecraft.tileentity.TileEntity; + +public class NBTPacket implements IMessage { + + PacketBuffer buffer; + int x; + int y; + int z; + + public NBTPacket() { } + + public NBTPacket(NBTTagCompound nbt, int x, int y, int z) { + + this.buffer = new PacketBuffer(Unpooled.buffer()); + this.x = x; + this.y = y; + this.z = z; + + try { + buffer.writeNBTTagCompoundToBuffer(nbt); + + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void fromBytes(ByteBuf buf) { + + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); + + if (buffer == null) { + buffer = new PacketBuffer(Unpooled.buffer()); + } + buffer.writeBytes(buf); + } + + @Override + public void toBytes(ByteBuf buf) { + + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); + + if (buffer == null) { + buffer = new PacketBuffer(Unpooled.buffer()); + } + buf.writeBytes(buffer); + } + + public static class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(NBTPacket m, MessageContext ctx) { + + TileEntity te = Minecraft.getMinecraft().theWorld.getTileEntity(m.x, m.y, m.z); + + if(!(te instanceof TileEntityMachineBase)) + return null; + + TileEntityMachineBase base = (TileEntityMachineBase)te; + + try { + + NBTTagCompound nbt = m.buffer.readNBTTagCompoundFromBuffer(); + + if(nbt != null) + base.networkUnpack(nbt); + + } catch (IOException e) { + e.printStackTrace(); + } + + return null; + } + } + +} diff --git a/com/hbm/packet/PacketDispatcher.java b/com/hbm/packet/PacketDispatcher.java index 193aefb66..52f7e0b69 100644 --- a/com/hbm/packet/PacketDispatcher.java +++ b/com/hbm/packet/PacketDispatcher.java @@ -87,6 +87,8 @@ public class PacketDispatcher { wrapper.registerMessage(ItemBobmazonPacket.Handler.class, ItemBobmazonPacket.class, i++, Side.SERVER); //Packet to send missile multipart information to TEs wrapper.registerMessage(TEMissileMultipartPacket.Handler.class, TEMissileMultipartPacket.class, i++, Side.CLIENT); + //Packet to send NBT data to tile entities + wrapper.registerMessage(NBTPacket.Handler.class, NBTPacket.class, i++, Side.CLIENT); } } diff --git a/com/hbm/packet/ParticleBurstPacket.java b/com/hbm/packet/ParticleBurstPacket.java index 0302934c5..c6b58a8b7 100644 --- a/com/hbm/packet/ParticleBurstPacket.java +++ b/com/hbm/packet/ParticleBurstPacket.java @@ -1,15 +1,11 @@ package com.hbm.packet; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; -import com.hbm.tileentity.machine.TileEntityMachinePumpjack; - 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 io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.tileentity.TileEntity; public class ParticleBurstPacket implements IMessage { diff --git a/com/hbm/packet/SatLaserPacket.java b/com/hbm/packet/SatLaserPacket.java index bbf2ac679..09606d683 100644 --- a/com/hbm/packet/SatLaserPacket.java +++ b/com/hbm/packet/SatLaserPacket.java @@ -1,8 +1,6 @@ package com.hbm.packet; import com.hbm.entity.logic.EntityDeathBlast; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; import com.hbm.saveddata.SatelliteSaveStructure; import com.hbm.saveddata.SatelliteSavedData; @@ -11,8 +9,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; public class SatLaserPacket implements IMessage { diff --git a/com/hbm/packet/SatPanelPacket.java b/com/hbm/packet/SatPanelPacket.java index c1a338971..cbbd06a34 100644 --- a/com/hbm/packet/SatPanelPacket.java +++ b/com/hbm/packet/SatPanelPacket.java @@ -4,8 +4,6 @@ import com.hbm.items.tool.ItemSatInterface; import com.hbm.saveddata.SatelliteSaveStructure; import com.hbm.saveddata.SatelliteSaveStructure.SatelliteType; import com.hbm.saveddata.SatelliteSavedData; -import com.hbm.tileentity.machine.TileEntityMachineRadar; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -14,7 +12,6 @@ import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; public class SatPanelPacket implements IMessage { diff --git a/com/hbm/packet/TEChemplantPacket.java b/com/hbm/packet/TEChemplantPacket.java index 7b4030f81..155cb45a6 100644 --- a/com/hbm/packet/TEChemplantPacket.java +++ b/com/hbm/packet/TEChemplantPacket.java @@ -1,6 +1,5 @@ package com.hbm.packet; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachineChemplant; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TEControlPacket.java b/com/hbm/packet/TEControlPacket.java index 4b581d5cf..8ef4a53b2 100644 --- a/com/hbm/packet/TEControlPacket.java +++ b/com/hbm/packet/TEControlPacket.java @@ -1,6 +1,5 @@ package com.hbm.packet; -import com.hbm.tileentity.machine.TileEntityForceField; import com.hbm.tileentity.machine.TileEntityReactorControl; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TEFFPacket.java b/com/hbm/packet/TEFFPacket.java index 7164805a6..4549dfc11 100644 --- a/com/hbm/packet/TEFFPacket.java +++ b/com/hbm/packet/TEFFPacket.java @@ -1,9 +1,6 @@ package com.hbm.packet; -import com.hbm.tileentity.machine.TileEntityBlastDoor; import com.hbm.tileentity.machine.TileEntityForceField; -import com.hbm.tileentity.machine.TileEntityVaultDoor; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEMissileMultipartPacket.java b/com/hbm/packet/TEMissileMultipartPacket.java index e4106dc2d..9bf955906 100644 --- a/com/hbm/packet/TEMissileMultipartPacket.java +++ b/com/hbm/packet/TEMissileMultipartPacket.java @@ -1,10 +1,8 @@ package com.hbm.packet; import com.hbm.handler.MissileStruct; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; -import com.hbm.tileentity.conductor.TileEntityFluidDuct; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TEPressPacket.java b/com/hbm/packet/TEPressPacket.java index b8912f99d..79dc45f2c 100644 --- a/com/hbm/packet/TEPressPacket.java +++ b/com/hbm/packet/TEPressPacket.java @@ -1,10 +1,7 @@ package com.hbm.packet; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineEPress; import com.hbm.tileentity.machine.TileEntityMachinePress; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEPumpjackPacket.java b/com/hbm/packet/TEPumpjackPacket.java index aefb80281..7aa813434 100644 --- a/com/hbm/packet/TEPumpjackPacket.java +++ b/com/hbm/packet/TEPumpjackPacket.java @@ -1,6 +1,5 @@ package com.hbm.packet; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TERadarDestructorPacket.java b/com/hbm/packet/TERadarDestructorPacket.java index e70de5128..4b5a14763 100644 --- a/com/hbm/packet/TERadarDestructorPacket.java +++ b/com/hbm/packet/TERadarDestructorPacket.java @@ -1,7 +1,5 @@ package com.hbm.packet; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import com.hbm.tileentity.machine.TileEntityMachineRadar; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TERadarPacket.java b/com/hbm/packet/TERadarPacket.java index 4036a4214..661438627 100644 --- a/com/hbm/packet/TERadarPacket.java +++ b/com/hbm/packet/TERadarPacket.java @@ -1,7 +1,5 @@ package com.hbm.packet; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import com.hbm.tileentity.machine.TileEntityMachineRadar; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TESirenPacket.java b/com/hbm/packet/TESirenPacket.java index 7e203ddf4..65fd0a658 100644 --- a/com/hbm/packet/TESirenPacket.java +++ b/com/hbm/packet/TESirenPacket.java @@ -2,19 +2,8 @@ package com.hbm.packet; import com.hbm.items.tool.ItemCassette.SoundType; import com.hbm.items.tool.ItemCassette.TrackType; -import com.hbm.sound.SoundLoopAssembler; -import com.hbm.sound.SoundLoopChemplant; -import com.hbm.sound.SoundLoopIGen; -import com.hbm.sound.SoundLoopMiner; import com.hbm.sound.SoundLoopSiren; -import com.hbm.sound.SoundLoopTurbofan; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; -import com.hbm.tileentity.machine.TileEntityMachineChemplant; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import com.hbm.tileentity.machine.TileEntityMachineSiren; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TETurbofanPacket.java b/com/hbm/packet/TETurbofanPacket.java index ea7ee0a4d..6b7fd8f38 100644 --- a/com/hbm/packet/TETurbofanPacket.java +++ b/com/hbm/packet/TETurbofanPacket.java @@ -1,6 +1,5 @@ package com.hbm.packet; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TETurretPacket.java b/com/hbm/packet/TETurretPacket.java index c7e7c6f8b..346949ae8 100644 --- a/com/hbm/packet/TETurretPacket.java +++ b/com/hbm/packet/TETurretPacket.java @@ -1,8 +1,6 @@ package com.hbm.packet; import com.hbm.tileentity.bomb.TileEntityTurretBase; -import com.hbm.tileentity.machine.TileEntityStructureMarker; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEVaultPacket.java b/com/hbm/packet/TEVaultPacket.java index f87cf327e..2b0139e92 100644 --- a/com/hbm/packet/TEVaultPacket.java +++ b/com/hbm/packet/TEVaultPacket.java @@ -1,7 +1,6 @@ package com.hbm.packet; import com.hbm.tileentity.machine.TileEntityBlastDoor; -import com.hbm.tileentity.machine.TileEntityMachineRadar; import com.hbm.tileentity.machine.TileEntityVaultDoor; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/render/block/RenderFence.java b/com/hbm/render/block/RenderFence.java index 8b46b0693..c3dfa1384 100644 --- a/com/hbm/render/block/RenderFence.java +++ b/com/hbm/render/block/RenderFence.java @@ -6,7 +6,6 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; public class RenderFence implements ISimpleBlockRenderingHandler { @@ -52,8 +51,6 @@ public class RenderFence implements ISimpleBlockRenderingHandler { f = 0.4375F; f1 = 0.5625F; - float f2 = 0.75F; - float f3 = 0.9375F; float f4 = flag3 ? 0.0F : f; float f5 = flag4 ? 1.0F : f1; float f6 = flag5 ? 0.0F : f; diff --git a/com/hbm/render/block/RenderScaffoldBlock.java b/com/hbm/render/block/RenderScaffoldBlock.java index dce202cb1..135d56284 100644 --- a/com/hbm/render/block/RenderScaffoldBlock.java +++ b/com/hbm/render/block/RenderScaffoldBlock.java @@ -2,17 +2,12 @@ package com.hbm.render.block; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelSteelRoof; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.WavefrontObject; diff --git a/com/hbm/render/block/RenderTaintBlock.java b/com/hbm/render/block/RenderTaintBlock.java index 7fe468709..50b7328ea 100644 --- a/com/hbm/render/block/RenderTaintBlock.java +++ b/com/hbm/render/block/RenderTaintBlock.java @@ -1,13 +1,11 @@ package com.hbm.render.block; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public class RenderTaintBlock implements ISimpleBlockRenderingHandler { @@ -43,7 +41,7 @@ public class RenderTaintBlock implements ISimpleBlockRenderingHandler { double d0 = (double)iicon.getMaxU(); double d1 = (double)iicon.getMaxV(); double d2 = 0.05000000074505806D; - int i1 = renderer.blockAccess.getBlockMetadata(x, y, z); + renderer.blockAccess.getBlockMetadata(x, y, z); if (side2) { diff --git a/com/hbm/render/entity/FogRenderer.java b/com/hbm/render/entity/FogRenderer.java index e7a457b58..20c3c6349 100644 --- a/com/hbm/render/entity/FogRenderer.java +++ b/com/hbm/render/entity/FogRenderer.java @@ -12,7 +12,6 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; public class FogRenderer extends Render { diff --git a/com/hbm/render/entity/RenderBoosterMissile.java b/com/hbm/render/entity/RenderBoosterMissile.java index 234f33f2a..132ccce69 100644 --- a/com/hbm/render/entity/RenderBoosterMissile.java +++ b/com/hbm/render/entity/RenderBoosterMissile.java @@ -2,14 +2,11 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderBoosterMissile extends Render { diff --git a/com/hbm/render/entity/RenderCarrierMissile.java b/com/hbm/render/entity/RenderCarrierMissile.java index 9a160489b..48735070d 100644 --- a/com/hbm/render/entity/RenderCarrierMissile.java +++ b/com/hbm/render/entity/RenderCarrierMissile.java @@ -2,10 +2,7 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelShrapnel; - import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/entity/RenderFallout.java b/com/hbm/render/entity/RenderFallout.java index b215eac70..694323c10 100644 --- a/com/hbm/render/entity/RenderFallout.java +++ b/com/hbm/render/entity/RenderFallout.java @@ -123,7 +123,6 @@ public class RenderFallout extends Render { b0 = 10; } - boolean flag = false; byte b1 = -1; float f5 = this.rendererUpdateCount + p_78474_1_; @@ -132,8 +131,6 @@ public class RenderFallout extends Render { } GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - flag = false; - for (int l = i3 - b0; l <= i3 + b0; ++l) { for (int i1 = k2 - b0; i1 <= k2 + b0; ++i1) { int j1 = (l - i3 + 16) * 32 + i1 - k2 + 16; @@ -163,7 +160,7 @@ public class RenderFallout extends Render { if (l1 != i2) { this.random.setSeed(i1 * i1 * 3121 + i1 * 45238971 ^ l * l * 418711 + l * 13761); - float f9 = biomegenbase.getFloatTemperature(i1, l1, l); + biomegenbase.getFloatTemperature(i1, l1, l); float f10; double d4; diff --git a/com/hbm/render/entity/RenderHunterChopper.java b/com/hbm/render/entity/RenderHunterChopper.java index 249ec468e..2e4d42e4c 100644 --- a/com/hbm/render/entity/RenderHunterChopper.java +++ b/com/hbm/render/entity/RenderHunterChopper.java @@ -33,9 +33,6 @@ public class RenderHunterChopper extends Render { GL11.glScalef(4F, 4F, 4F); GL11.glRotatef(180, 1, 0, 0); - float yaw = rocket.prevRotationYaw + (rocket.rotationYaw - rocket.prevRotationYaw) * p_76986_9_ - 90.0F; - float pitch = rocket.prevRotationPitch + (rocket.rotationPitch - rocket.prevRotationPitch) * p_76986_9_; - GL11.glRotatef(rocket.prevRotationYaw + (rocket.rotationYaw - rocket.prevRotationYaw) * p_76986_9_ - 90.0F, 0, 1.0F, 0); GL11.glRotatef(rocket.prevRotationPitch + (rocket.rotationPitch - rocket.prevRotationPitch) * p_76986_9_, 0, 0, 1.0F); diff --git a/com/hbm/render/entity/RenderLaser.java b/com/hbm/render/entity/RenderLaser.java index 2676a2d0f..4d28a913c 100644 --- a/com/hbm/render/entity/RenderLaser.java +++ b/com/hbm/render/entity/RenderLaser.java @@ -30,9 +30,7 @@ public class RenderLaser extends Render { if(player != null) { - double dX = laser.posX - player.posX; - double dY = laser.posY - player.posY; - double dZ = laser.posZ - player.posZ; + //GL11.glTranslated(x - dX, y - dY, z - dZ); diff --git a/com/hbm/render/entity/RenderMeteor.java b/com/hbm/render/entity/RenderMeteor.java index b1ae12549..e651743f6 100644 --- a/com/hbm/render/entity/RenderMeteor.java +++ b/com/hbm/render/entity/RenderMeteor.java @@ -3,8 +3,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelRubble; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/entity/RenderMissileDoomsday.java b/com/hbm/render/entity/RenderMissileDoomsday.java index 03298697b..b11e65d2a 100644 --- a/com/hbm/render/entity/RenderMissileDoomsday.java +++ b/com/hbm/render/entity/RenderMissileDoomsday.java @@ -2,14 +2,11 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileDoomsday extends Render { diff --git a/com/hbm/render/entity/RenderMissileGeneric.java b/com/hbm/render/entity/RenderMissileGeneric.java index b85530a43..899c8e669 100644 --- a/com/hbm/render/entity/RenderMissileGeneric.java +++ b/com/hbm/render/entity/RenderMissileGeneric.java @@ -7,14 +7,11 @@ import com.hbm.entity.missile.EntityMissileBunkerBuster; import com.hbm.entity.missile.EntityMissileCluster; import com.hbm.entity.missile.EntityMissileGeneric; import com.hbm.entity.missile.EntityMissileIncendiary; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileGeneric extends Render { diff --git a/com/hbm/render/entity/RenderMissileHuge.java b/com/hbm/render/entity/RenderMissileHuge.java index 0f646d3ad..7c8a4c436 100644 --- a/com/hbm/render/entity/RenderMissileHuge.java +++ b/com/hbm/render/entity/RenderMissileHuge.java @@ -6,14 +6,11 @@ import com.hbm.entity.missile.EntityMissileBurst; import com.hbm.entity.missile.EntityMissileDrill; import com.hbm.entity.missile.EntityMissileInferno; import com.hbm.entity.missile.EntityMissileRain; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileHuge extends Render { diff --git a/com/hbm/render/entity/RenderMissileMirv.java b/com/hbm/render/entity/RenderMissileMirv.java index d12835304..4b91671b0 100644 --- a/com/hbm/render/entity/RenderMissileMirv.java +++ b/com/hbm/render/entity/RenderMissileMirv.java @@ -2,14 +2,11 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileMirv extends Render { diff --git a/com/hbm/render/entity/RenderMissileNuclear.java b/com/hbm/render/entity/RenderMissileNuclear.java index 023325b2d..8298e72e5 100644 --- a/com/hbm/render/entity/RenderMissileNuclear.java +++ b/com/hbm/render/entity/RenderMissileNuclear.java @@ -2,14 +2,11 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileNuclear extends Render { diff --git a/com/hbm/render/entity/RenderMissileStrong.java b/com/hbm/render/entity/RenderMissileStrong.java index 82ff62a31..1d892b734 100644 --- a/com/hbm/render/entity/RenderMissileStrong.java +++ b/com/hbm/render/entity/RenderMissileStrong.java @@ -7,14 +7,11 @@ import com.hbm.entity.missile.EntityMissileClusterStrong; import com.hbm.entity.missile.EntityMissileEMPStrong; import com.hbm.entity.missile.EntityMissileIncendiaryStrong; import com.hbm.entity.missile.EntityMissileStrong; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileStrong extends Render { diff --git a/com/hbm/render/entity/RenderMissileTaint.java b/com/hbm/render/entity/RenderMissileTaint.java index 598f5deba..275ec6eec 100644 --- a/com/hbm/render/entity/RenderMissileTaint.java +++ b/com/hbm/render/entity/RenderMissileTaint.java @@ -6,14 +6,11 @@ import com.hbm.entity.missile.EntityMissileBHole; import com.hbm.entity.missile.EntityMissileEMP; import com.hbm.entity.missile.EntityMissileSchrabidium; import com.hbm.entity.missile.EntityMissileTaint; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileTaint extends Render { diff --git a/com/hbm/render/entity/RenderMissileThermo.java b/com/hbm/render/entity/RenderMissileThermo.java index 0f1ab3c21..6b01087d2 100644 --- a/com/hbm/render/entity/RenderMissileThermo.java +++ b/com/hbm/render/entity/RenderMissileThermo.java @@ -4,14 +4,11 @@ import org.lwjgl.opengl.GL11; import com.hbm.entity.missile.EntityMissileEndo; import com.hbm.entity.missile.EntityMissileExo; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMissileThermo extends Render { diff --git a/com/hbm/render/entity/RenderRubble.java b/com/hbm/render/entity/RenderRubble.java index ebc3cd339..b289df992 100644 --- a/com/hbm/render/entity/RenderRubble.java +++ b/com/hbm/render/entity/RenderRubble.java @@ -1,19 +1,14 @@ package com.hbm.render.entity; -import java.lang.reflect.Field; - import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelRubble; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; public class RenderRubble extends Render { diff --git a/com/hbm/render/entity/RenderTaintedCreeper.java b/com/hbm/render/entity/RenderTaintedCreeper.java index 1fa96f110..fd8fdf278 100644 --- a/com/hbm/render/entity/RenderTaintedCreeper.java +++ b/com/hbm/render/entity/RenderTaintedCreeper.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelCreeper; -import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/render/item/ItemRenderBullshit.java b/com/hbm/render/item/ItemRenderBullshit.java index 00e08f88a..01f84e436 100644 --- a/com/hbm/render/item/ItemRenderBullshit.java +++ b/com/hbm/render/item/ItemRenderBullshit.java @@ -2,26 +2,16 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; -import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelBaleflare; -import com.hbm.render.model.ModelDash; -import com.hbm.render.model.ModelDefabricator; -import com.hbm.render.model.ModelEuthanasia; -import com.hbm.render.model.ModelHP; -import com.hbm.render.model.ModelJack; import com.hbm.render.model.ModelMP40; import com.hbm.render.model.ModelPip; import com.hbm.render.model.ModelSpark; -import com.hbm.render.model.ModelTwiGun; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderBullshit implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderGunAnim.java b/com/hbm/render/item/ItemRenderGunAnim.java index 06ce922c4..79de56b20 100644 --- a/com/hbm/render/item/ItemRenderGunAnim.java +++ b/com/hbm/render/item/ItemRenderGunAnim.java @@ -11,25 +11,12 @@ import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelB92; import com.hbm.render.model.ModelB93; import com.hbm.render.model.ModelBoltAction; -import com.hbm.render.model.ModelDash; -import com.hbm.render.model.ModelDefabricator; -import com.hbm.render.model.ModelEuthanasia; -import com.hbm.render.model.ModelHP; -import com.hbm.render.model.ModelJack; import com.hbm.render.model.ModelLeverAction; -import com.hbm.render.model.ModelPip; -import com.hbm.render.model.ModelSpark; -import com.hbm.render.model.ModelTwiGun; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderGunAnim implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderMissile.java b/com/hbm/render/item/ItemRenderMissile.java index a526c4ef9..4fbdcc8bf 100644 --- a/com/hbm/render/item/ItemRenderMissile.java +++ b/com/hbm/render/item/ItemRenderMissile.java @@ -3,16 +3,12 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.items.weapon.ItemCustomMissile; -import com.hbm.items.weapon.ItemMissile; import com.hbm.render.util.MissileMultipart; -import com.hbm.render.util.MissilePart; import com.hbm.render.util.MissilePronter; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderMissile implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderObj.java b/com/hbm/render/item/ItemRenderObj.java index 863827943..f77005578 100644 --- a/com/hbm/render/item/ItemRenderObj.java +++ b/com/hbm/render/item/ItemRenderObj.java @@ -8,8 +8,6 @@ import com.hbm.main.ResourceManager; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderObj implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderOverkill.java b/com/hbm/render/item/ItemRenderOverkill.java index 25b31678c..d41c721c4 100644 --- a/com/hbm/render/item/ItemRenderOverkill.java +++ b/com/hbm/render/item/ItemRenderOverkill.java @@ -6,7 +6,6 @@ import com.hbm.items.ModItems; import com.hbm.items.weapon.GunFolly; import com.hbm.items.weapon.ItemGunBase; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelCalBarrel; import com.hbm.render.model.ModelCalDualStock; import com.hbm.render.model.ModelCalStock; @@ -14,7 +13,6 @@ import com.hbm.render.model.ModelDash; import com.hbm.render.model.ModelDefabricator; import com.hbm.render.model.ModelEuthanasia; import com.hbm.render.model.ModelFolly; -import com.hbm.render.model.ModelGun; import com.hbm.render.model.ModelHP; import com.hbm.render.model.ModelJack; import com.hbm.render.model.ModelLacunae; @@ -25,7 +23,6 @@ import com.hbm.render.model.ModelTwiGun; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; diff --git a/com/hbm/render/item/ItemRenderRevolver.java b/com/hbm/render/item/ItemRenderRevolver.java index b4a9e0ebc..f06057d4a 100644 --- a/com/hbm/render/item/ItemRenderRevolver.java +++ b/com/hbm/render/item/ItemRenderRevolver.java @@ -7,11 +7,8 @@ import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelRevolver; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; diff --git a/com/hbm/render/item/ItemRenderRpg.java b/com/hbm/render/item/ItemRenderRpg.java index f0c30e932..78250d216 100644 --- a/com/hbm/render/item/ItemRenderRpg.java +++ b/com/hbm/render/item/ItemRenderRpg.java @@ -4,11 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelAt4; import com.hbm.render.model.ModelGustav; import com.hbm.render.model.ModelPanzerschreck; -import com.hbm.render.model.ModelStinger; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/com/hbm/render/item/ItemRenderShim.java b/com/hbm/render/item/ItemRenderShim.java index 6023823b0..4e433898f 100644 --- a/com/hbm/render/item/ItemRenderShim.java +++ b/com/hbm/render/item/ItemRenderShim.java @@ -3,18 +3,10 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelSword; - import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderShim implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderStinger.java b/com/hbm/render/item/ItemRenderStinger.java index 3eb1b9623..ef66261ab 100644 --- a/com/hbm/render/item/ItemRenderStinger.java +++ b/com/hbm/render/item/ItemRenderStinger.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelAt4; import com.hbm.render.model.ModelStinger; import net.minecraft.client.Minecraft; @@ -12,8 +11,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderStinger implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderUZI.java b/com/hbm/render/item/ItemRenderUZI.java index 2dda25997..dae5773eb 100644 --- a/com/hbm/render/item/ItemRenderUZI.java +++ b/com/hbm/render/item/ItemRenderUZI.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelMP40; import com.hbm.render.model.ModelUzi; import com.hbm.render.model.ModelUziBarrel; import com.hbm.render.model.ModelUziSilencer; @@ -14,8 +13,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderUZI implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderWeaponObj.java b/com/hbm/render/item/ItemRenderWeaponObj.java index 7302442a0..2d0ab1118 100644 --- a/com/hbm/render/item/ItemRenderWeaponObj.java +++ b/com/hbm/render/item/ItemRenderWeaponObj.java @@ -3,19 +3,11 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelGustav; -import com.hbm.render.model.ModelPanzerschreck; - import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderWeaponObj implements IItemRenderer { diff --git a/com/hbm/render/loader/HmfModelLoader.java b/com/hbm/render/loader/HmfModelLoader.java index 0b49b40fd..96884f13d 100644 --- a/com/hbm/render/loader/HmfModelLoader.java +++ b/com/hbm/render/loader/HmfModelLoader.java @@ -4,7 +4,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.client.model.IModelCustomLoader; import net.minecraftforge.client.model.ModelFormatException; -import net.minecraftforge.client.model.obj.WavefrontObject; public class HmfModelLoader implements IModelCustomLoader { diff --git a/com/hbm/render/model/ModelDash.java b/com/hbm/render/model/ModelDash.java index 81741c8bd..24f56ecc2 100755 --- a/com/hbm/render/model/ModelDash.java +++ b/com/hbm/render/model/ModelDash.java @@ -9,8 +9,6 @@ package com.hbm.render.model; //Path where the model is located -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/model/ModelJetPack.java b/com/hbm/render/model/ModelJetPack.java index 841b3a8fb..b15e7a53c 100644 --- a/com/hbm/render/model/ModelJetPack.java +++ b/com/hbm/render/model/ModelJetPack.java @@ -6,9 +6,6 @@ package com.hbm.render.model; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -148,8 +145,6 @@ public class ModelJetPack extends ModelBiped { } } } - float s = 1 / 16; - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); this.JetPack.rotationPointX = this.bipedBody.rotationPointX; this.JetPack.rotationPointY = this.bipedBody.rotationPointY; diff --git a/com/hbm/render/model/ModelM65.java b/com/hbm/render/model/ModelM65.java index 408d64853..4b1eb423b 100644 --- a/com/hbm/render/model/ModelM65.java +++ b/com/hbm/render/model/ModelM65.java @@ -8,7 +8,6 @@ package com.hbm.render.model; import org.lwjgl.opengl.GL11; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/model/ModelT45Chest.java b/com/hbm/render/model/ModelT45Chest.java index 6a217a402..472c70417 100644 --- a/com/hbm/render/model/ModelT45Chest.java +++ b/com/hbm/render/model/ModelT45Chest.java @@ -225,8 +225,6 @@ public class ModelT45Chest extends ModelBiped { } } } - float s = 1 / 16; - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); this.chest.rotationPointX = this.bipedBody.rotationPointX; this.chest.rotationPointY = this.bipedBody.rotationPointY; diff --git a/com/hbm/render/tileentity/RenderAMSEmitter.java b/com/hbm/render/tileentity/RenderAMSEmitter.java index 78b90d954..0454f808d 100644 --- a/com/hbm/render/tileentity/RenderAMSEmitter.java +++ b/com/hbm/render/tileentity/RenderAMSEmitter.java @@ -4,18 +4,12 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityAMSBase; import com.hbm.tileentity.machine.TileEntityAMSEmitter; -import com.hbm.tileentity.machine.TileEntityAMSLimiter; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderAMSEmitter extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderAMSLimiter.java b/com/hbm/render/tileentity/RenderAMSLimiter.java index 882034dbf..8d3abdd52 100644 --- a/com/hbm/render/tileentity/RenderAMSLimiter.java +++ b/com/hbm/render/tileentity/RenderAMSLimiter.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityAMSBase; -import com.hbm.tileentity.machine.TileEntityAMSEmitter; import com.hbm.tileentity.machine.TileEntityAMSLimiter; import net.minecraft.client.renderer.RenderHelper; @@ -80,7 +79,6 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer { boolean flag = false; double maxSize = 5; double minSize = 0.5; - double rad = maxSize; if(meta == 2 && tileEntity.getWorldObj().getTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord - 6) instanceof TileEntityAMSBase && !limiter.locked) { flag = true; TileEntityAMSBase base = (TileEntityAMSBase)tileEntity.getWorldObj().getTileEntity(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord - 6); diff --git a/com/hbm/render/tileentity/RenderAssembler.java b/com/hbm/render/tileentity/RenderAssembler.java index a09496c4a..9f71be4a8 100644 --- a/com/hbm/render/tileentity/RenderAssembler.java +++ b/com/hbm/render/tileentity/RenderAssembler.java @@ -3,7 +3,6 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityMachineAssembler; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderBlastDoor.java b/com/hbm/render/tileentity/RenderBlastDoor.java index cc92a6642..3e28d0efb 100644 --- a/com/hbm/render/tileentity/RenderBlastDoor.java +++ b/com/hbm/render/tileentity/RenderBlastDoor.java @@ -2,7 +2,6 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityBlastDoor; diff --git a/com/hbm/render/tileentity/RenderCentrifuge.java b/com/hbm/render/tileentity/RenderCentrifuge.java index da7b67c39..64f687b49 100644 --- a/com/hbm/render/tileentity/RenderCentrifuge.java +++ b/com/hbm/render/tileentity/RenderCentrifuge.java @@ -2,16 +2,12 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import com.hbm.tileentity.machine.TileEntityMachineGasCent; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderCentrifuge extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderCheapoTurret.java b/com/hbm/render/tileentity/RenderCheapoTurret.java index 7dd1a7b81..cd1d29a87 100644 --- a/com/hbm/render/tileentity/RenderCheapoTurret.java +++ b/com/hbm/render/tileentity/RenderCheapoTurret.java @@ -4,12 +4,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; import com.hbm.tileentity.bomb.TileEntityTurretBase; -import com.hbm.tileentity.bomb.TileEntityTurretCIWS; import com.hbm.tileentity.bomb.TileEntityTurretCheapo; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Vec3; public class RenderCheapoTurret extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderChemplant.java b/com/hbm/render/tileentity/RenderChemplant.java index 89e757e4f..62b457e33 100644 --- a/com/hbm/render/tileentity/RenderChemplant.java +++ b/com/hbm/render/tileentity/RenderChemplant.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.lib.RefStrings; -import com.hbm.main.ResourceManager; import com.hbm.render.loader.HmfController; import com.hbm.tileentity.machine.TileEntityMachineChemplant; diff --git a/com/hbm/render/tileentity/RenderCompactLauncher.java b/com/hbm/render/tileentity/RenderCompactLauncher.java index a14f45499..1be2cf9fe 100644 --- a/com/hbm/render/tileentity/RenderCompactLauncher.java +++ b/com/hbm/render/tileentity/RenderCompactLauncher.java @@ -2,19 +2,13 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.items.weapon.ItemCustomMissile; -import com.hbm.items.weapon.ItemMissile; import com.hbm.main.ResourceManager; -import com.hbm.render.util.ErrorPronter; import com.hbm.render.util.MissileMultipart; -import com.hbm.render.util.MissilePart; import com.hbm.render.util.MissilePronter; import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; public class RenderCompactLauncher extends TileEntitySpecialRenderer { @@ -37,8 +31,6 @@ public class RenderCompactLauncher extends TileEntitySpecialRenderer { /// DRAW MISSILE START GL11.glPushMatrix(); - MissileMultipart missile; - if(launcher.load != null) { //ItemStack custom = launcher.getStackInSlot(0); diff --git a/com/hbm/render/tileentity/RenderCoreComponent.java b/com/hbm/render/tileentity/RenderCoreComponent.java index 27567eea1..810c16541 100644 --- a/com/hbm/render/tileentity/RenderCoreComponent.java +++ b/com/hbm/render/tileentity/RenderCoreComponent.java @@ -54,9 +54,9 @@ public class RenderCoreComponent extends TileEntitySpecialRenderer { int range = ((TileEntityCoreEmitter)tileEntity).beam; if(range > 0) { - BeamPronter.prontHelix(Vec3.createVectorHelper(0, 0, range), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0xFFFF00, 0xFFFF00, 0, 1, 0F, 2, 0.0625F); - BeamPronter.prontHelix(Vec3.createVectorHelper(0, 0, range), EnumWaveType.RANDOM, EnumBeamType.SOLID, 0xFF6000, 0xFF6000, (int)tileEntity.getWorldObj().getTotalWorldTime() % 100, range * 2, 0.125F, 4, 0.0625F); - BeamPronter.prontHelix(Vec3.createVectorHelper(0, 0, range), EnumWaveType.RANDOM, EnumBeamType.SOLID, 0xFF6000, 0xFF6000, (int)tileEntity.getWorldObj().getTotalWorldTime() % 100 + 1, range * 2, 0.125F, 4, 0.0625F); + BeamPronter.prontHelix(Vec3.createVectorHelper(0, 0, range), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0x404000, 0x404000, 0, 1, 0F, 2, 0.0625F); + BeamPronter.prontHelix(Vec3.createVectorHelper(0, 0, range), EnumWaveType.RANDOM, EnumBeamType.SOLID, 0x401500, 0x401500, (int)tileEntity.getWorldObj().getTotalWorldTime() % 1000, range * 2, 0.125F, 4, 0.0625F); + BeamPronter.prontHelix(Vec3.createVectorHelper(0, 0, range), EnumWaveType.RANDOM, EnumBeamType.SOLID, 0x401500, 0x401500, (int)tileEntity.getWorldObj().getTotalWorldTime() % 1000 + 1, range * 2, 0.125F, 4, 0.0625F); } } diff --git a/com/hbm/render/tileentity/RenderFlamerTurret.java b/com/hbm/render/tileentity/RenderFlamerTurret.java index fe0f32fac..0839af47a 100644 --- a/com/hbm/render/tileentity/RenderFlamerTurret.java +++ b/com/hbm/render/tileentity/RenderFlamerTurret.java @@ -2,13 +2,11 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; public class RenderFlamerTurret extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderFluidTank.java b/com/hbm/render/tileentity/RenderFluidTank.java index ec483540f..7d8cbbb85 100644 --- a/com/hbm/render/tileentity/RenderFluidTank.java +++ b/com/hbm/render/tileentity/RenderFluidTank.java @@ -4,8 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineFluidTank; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/tileentity/RenderForceField.java b/com/hbm/render/tileentity/RenderForceField.java index ed8f4ae8f..d998f4ef4 100644 --- a/com/hbm/render/tileentity/RenderForceField.java +++ b/com/hbm/render/tileentity/RenderForceField.java @@ -26,7 +26,7 @@ public class RenderForceField extends TileEntitySpecialRenderer { GL11.glTranslated(0, 0.5D, 0); - double rot = (System.currentTimeMillis() / 10D) % 360; + System.currentTimeMillis(); generateSphere(8, 16, 10F, 0x0088FF); diff --git a/com/hbm/render/tileentity/RenderHeavyTurret.java b/com/hbm/render/tileentity/RenderHeavyTurret.java index 3c433bf20..657c64c96 100644 --- a/com/hbm/render/tileentity/RenderHeavyTurret.java +++ b/com/hbm/render/tileentity/RenderHeavyTurret.java @@ -2,16 +2,10 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.bomb.TileEntityTurretBase; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderHeavyTurret extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderLandmine.java b/com/hbm/render/tileentity/RenderLandmine.java index 8e9d2d7fe..bc41fc0f7 100644 --- a/com/hbm/render/tileentity/RenderLandmine.java +++ b/com/hbm/render/tileentity/RenderLandmine.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.main.ResourceManager; import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderLaunchTable.java b/com/hbm/render/tileentity/RenderLaunchTable.java index 46db02f20..20e1c131b 100644 --- a/com/hbm/render/tileentity/RenderLaunchTable.java +++ b/com/hbm/render/tileentity/RenderLaunchTable.java @@ -5,11 +5,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.weapon.ItemMissile; import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.main.ResourceManager; -import com.hbm.render.util.ErrorPronter; import com.hbm.render.util.MissileMultipart; import com.hbm.render.util.MissilePronter; -import com.hbm.render.util.SoyuzPronter; -import com.hbm.tileentity.bomb.TileEntityCompactLauncher; import com.hbm.tileentity.bomb.TileEntityLaunchTable; import net.minecraft.client.Minecraft; diff --git a/com/hbm/render/tileentity/RenderLightTurret.java b/com/hbm/render/tileentity/RenderLightTurret.java index 39529d26a..e0cbf14d9 100644 --- a/com/hbm/render/tileentity/RenderLightTurret.java +++ b/com/hbm/render/tileentity/RenderLightTurret.java @@ -2,13 +2,11 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; public class RenderLightTurret extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderMachineShredder.java b/com/hbm/render/tileentity/RenderMachineShredder.java index ddadf68a4..6cb9f6c06 100644 --- a/com/hbm/render/tileentity/RenderMachineShredder.java +++ b/com/hbm/render/tileentity/RenderMachineShredder.java @@ -3,8 +3,6 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderMissileAssembly.java b/com/hbm/render/tileentity/RenderMissileAssembly.java index 4f866a6f6..373cbce34 100644 --- a/com/hbm/render/tileentity/RenderMissileAssembly.java +++ b/com/hbm/render/tileentity/RenderMissileAssembly.java @@ -2,9 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelTestRender; import com.hbm.render.util.MissileMultipart; import com.hbm.render.util.MissilePart; import com.hbm.render.util.MissilePronter; @@ -13,7 +11,6 @@ import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; public class RenderMissileAssembly extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderNukeSolinium.java b/com/hbm/render/tileentity/RenderNukeSolinium.java index 48b1a5da7..44e9cb120 100644 --- a/com/hbm/render/tileentity/RenderNukeSolinium.java +++ b/com/hbm/render/tileentity/RenderNukeSolinium.java @@ -2,14 +2,10 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderNukeSolinium extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderPress.java b/com/hbm/render/tileentity/RenderPress.java index 25bde4399..cdd38987c 100644 --- a/com/hbm/render/tileentity/RenderPress.java +++ b/com/hbm/render/tileentity/RenderPress.java @@ -2,17 +2,10 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelRotationTester; import com.hbm.render.util.RenderDecoItem; -import com.hbm.tileentity.deco.TileEntityDecoBlockAltF; -import com.hbm.tileentity.deco.TileEntityDecoBlockAltW; import com.hbm.tileentity.machine.TileEntityMachinePress; -import net.minecraft.block.Block; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -21,7 +14,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; public class RenderPress extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderPumpjack.java b/com/hbm/render/tileentity/RenderPumpjack.java index dfa9d89c3..5e76d41dd 100644 --- a/com/hbm/render/tileentity/RenderPumpjack.java +++ b/com/hbm/render/tileentity/RenderPumpjack.java @@ -2,15 +2,12 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.bomb.TileEntityTurretBase; import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; public class RenderPumpjack extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderRadGen.java b/com/hbm/render/tileentity/RenderRadGen.java index 2b0cea947..fb8ee7647 100644 --- a/com/hbm/render/tileentity/RenderRadGen.java +++ b/com/hbm/render/tileentity/RenderRadGen.java @@ -2,16 +2,9 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; -import com.hbm.tileentity.machine.TileEntityMachineRadGen; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderRadGen extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderRadar.java b/com/hbm/render/tileentity/RenderRadar.java index 86cfe02c5..e9979b59d 100644 --- a/com/hbm/render/tileentity/RenderRadar.java +++ b/com/hbm/render/tileentity/RenderRadar.java @@ -3,7 +3,6 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import com.hbm.tileentity.machine.TileEntityMachineRadar; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderRocketTurret.java b/com/hbm/render/tileentity/RenderRocketTurret.java index 6a86da1da..8e2194766 100644 --- a/com/hbm/render/tileentity/RenderRocketTurret.java +++ b/com/hbm/render/tileentity/RenderRocketTurret.java @@ -2,13 +2,11 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; public class RenderRocketTurret extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderSelenium.java b/com/hbm/render/tileentity/RenderSelenium.java index fbce8da1a..8ee84a595 100644 --- a/com/hbm/render/tileentity/RenderSelenium.java +++ b/com/hbm/render/tileentity/RenderSelenium.java @@ -2,7 +2,6 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; diff --git a/com/hbm/render/tileentity/RenderSmallReactor.java b/com/hbm/render/tileentity/RenderSmallReactor.java index 32a4598df..1e1e03ee8 100644 --- a/com/hbm/render/tileentity/RenderSmallReactor.java +++ b/com/hbm/render/tileentity/RenderSmallReactor.java @@ -4,8 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; -import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderTauTurret.java b/com/hbm/render/tileentity/RenderTauTurret.java index 59995aac8..8ea01a286 100644 --- a/com/hbm/render/tileentity/RenderTauTurret.java +++ b/com/hbm/render/tileentity/RenderTauTurret.java @@ -2,13 +2,11 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; public class RenderTauTurret extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderTurbofan.java b/com/hbm/render/tileentity/RenderTurbofan.java index ba45ffda8..a696472fa 100644 --- a/com/hbm/render/tileentity/RenderTurbofan.java +++ b/com/hbm/render/tileentity/RenderTurbofan.java @@ -2,16 +2,11 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderTurbofan extends TileEntitySpecialRenderer { diff --git a/com/hbm/render/tileentity/RenderVaultDoor.java b/com/hbm/render/tileentity/RenderVaultDoor.java index 174feedec..10c7f1ee3 100644 --- a/com/hbm/render/tileentity/RenderVaultDoor.java +++ b/com/hbm/render/tileentity/RenderVaultDoor.java @@ -2,9 +2,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.main.MainRegistry; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; import com.hbm.tileentity.machine.TileEntityVaultDoor; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RendererObjTester.java b/com/hbm/render/tileentity/RendererObjTester.java index bfee1c9dc..f578345ca 100644 --- a/com/hbm/render/tileentity/RendererObjTester.java +++ b/com/hbm/render/tileentity/RendererObjTester.java @@ -1,21 +1,12 @@ package com.hbm.render.tileentity; -import java.util.Random; - import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.main.ResourceManager; -import com.hbm.render.model.ModelCalBarrel; -import com.hbm.render.model.ModelCalDualStock; -import com.hbm.render.model.ModelCalStock; import com.hbm.render.util.BeamPronter; -import com.hbm.render.util.SoyuzPronter; -import com.hbm.render.util.TomPronter; import com.hbm.render.util.BeamPronter.EnumBeamType; import com.hbm.render.util.BeamPronter.EnumWaveType; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/util/MissileMultipart.java b/com/hbm/render/util/MissileMultipart.java index 948e58cc3..979a53b15 100644 --- a/com/hbm/render/util/MissileMultipart.java +++ b/com/hbm/render/util/MissileMultipart.java @@ -5,8 +5,6 @@ import com.hbm.items.weapon.ItemMissile.PartType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.Item; @SideOnly(Side.CLIENT) public class MissileMultipart { diff --git a/com/hbm/render/util/MissilePart.java b/com/hbm/render/util/MissilePart.java index 20327467f..cafb35ddb 100644 --- a/com/hbm/render/util/MissilePart.java +++ b/com/hbm/render/util/MissilePart.java @@ -1,9 +1,6 @@ package com.hbm.render.util; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; - import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemMissile.PartType; import com.hbm.main.ResourceManager; diff --git a/com/hbm/render/util/MissilePronter.java b/com/hbm/render/util/MissilePronter.java index 1f6154233..dfe8321f0 100644 --- a/com/hbm/render/util/MissilePronter.java +++ b/com/hbm/render/util/MissilePronter.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.weapon.ItemMissile.PartType; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; public class MissilePronter { @@ -16,8 +15,6 @@ public class MissilePronter { GL11.glPushMatrix(); - double height = 0; - if(missile.thruster != null && missile.thruster.type.name().equals(PartType.THRUSTER.name())) { tex.bindTexture(missile.thruster.texture); diff --git a/com/hbm/render/util/RenderScreenOverlay.java b/com/hbm/render/util/RenderScreenOverlay.java index 009ae74f6..f372f8fdb 100644 --- a/com/hbm/render/util/RenderScreenOverlay.java +++ b/com/hbm/render/util/RenderScreenOverlay.java @@ -1,7 +1,5 @@ package com.hbm.render.util; -import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.CROSSHAIRS; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -16,7 +14,6 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.GuiIngameForge; public class RenderScreenOverlay { diff --git a/com/hbm/saveddata/BroadcastSaveStructure.java b/com/hbm/saveddata/BroadcastSaveStructure.java index 09d82affb..1777d65ea 100644 --- a/com/hbm/saveddata/BroadcastSaveStructure.java +++ b/com/hbm/saveddata/BroadcastSaveStructure.java @@ -2,8 +2,6 @@ package com.hbm.saveddata; import java.util.Arrays; -import com.hbm.handler.FluidTypeHandler.FluidType; - import net.minecraft.nbt.NBTTagCompound; public class BroadcastSaveStructure { diff --git a/com/hbm/saveddata/SatelliteSaveStructure.java b/com/hbm/saveddata/SatelliteSaveStructure.java index eac519be2..8b50b4b8c 100644 --- a/com/hbm/saveddata/SatelliteSaveStructure.java +++ b/com/hbm/saveddata/SatelliteSaveStructure.java @@ -2,8 +2,6 @@ package com.hbm.saveddata; import java.util.Arrays; -import com.hbm.handler.FluidTypeHandler.FluidType; - import net.minecraft.nbt.NBTTagCompound; public class SatelliteSaveStructure { diff --git a/com/hbm/sound/AudioDynamic.java b/com/hbm/sound/AudioDynamic.java index fd1237c44..d9401fd77 100644 --- a/com/hbm/sound/AudioDynamic.java +++ b/com/hbm/sound/AudioDynamic.java @@ -4,7 +4,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.MovingSound; -import net.minecraft.client.audio.PositionedSound; import net.minecraft.util.ResourceLocation; @SideOnly(Side.CLIENT) diff --git a/com/hbm/sound/AudioWrapperClient.java b/com/hbm/sound/AudioWrapperClient.java index d14476113..70ace516f 100644 --- a/com/hbm/sound/AudioWrapperClient.java +++ b/com/hbm/sound/AudioWrapperClient.java @@ -2,7 +2,6 @@ package com.hbm.sound; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.audio.MovingSound; import net.minecraft.util.ResourceLocation; @SideOnly(Side.CLIENT) diff --git a/com/hbm/sound/MovingSoundBomber.java b/com/hbm/sound/MovingSoundBomber.java index e27a49cee..c20a0cfe0 100644 --- a/com/hbm/sound/MovingSoundBomber.java +++ b/com/hbm/sound/MovingSoundBomber.java @@ -9,7 +9,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.MovingSound; import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; public class MovingSoundBomber extends MovingSound { diff --git a/com/hbm/sound/SoundLoopAssembler.java b/com/hbm/sound/SoundLoopAssembler.java index 6385e267b..c69ea40c6 100644 --- a/com/hbm/sound/SoundLoopAssembler.java +++ b/com/hbm/sound/SoundLoopAssembler.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.tileentity.machine.TileEntityMachineAssembler; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/SoundLoopBroadcaster.java b/com/hbm/sound/SoundLoopBroadcaster.java index 9a16d9fca..3b00039a5 100644 --- a/com/hbm/sound/SoundLoopBroadcaster.java +++ b/com/hbm/sound/SoundLoopBroadcaster.java @@ -4,9 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.tileentity.machine.TileEntityBroadcaster; -import com.hbm.tileentity.machine.TileEntityMachineChemplant; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.entity.EntityClientPlayerMP; diff --git a/com/hbm/sound/SoundLoopCentrifuge.java b/com/hbm/sound/SoundLoopCentrifuge.java index 62eaa6d4d..2989ddf9c 100644 --- a/com/hbm/sound/SoundLoopCentrifuge.java +++ b/com/hbm/sound/SoundLoopCentrifuge.java @@ -4,10 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; -import com.hbm.tileentity.machine.TileEntityMachineChemplant; import com.hbm.tileentity.machine.TileEntityMachineGasCent; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; - import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/SoundLoopChemplant.java b/com/hbm/sound/SoundLoopChemplant.java index d01d4ae56..813b7170b 100644 --- a/com/hbm/sound/SoundLoopChemplant.java +++ b/com/hbm/sound/SoundLoopChemplant.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.tileentity.machine.TileEntityMachineChemplant; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/SoundLoopIGen.java b/com/hbm/sound/SoundLoopIGen.java index 362c87df7..5daab81cc 100644 --- a/com/hbm/sound/SoundLoopIGen.java +++ b/com/hbm/sound/SoundLoopIGen.java @@ -3,10 +3,7 @@ package com.hbm.sound; import java.util.ArrayList; import java.util.List; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; import com.hbm.tileentity.machine.TileEntityMachineIGenerator; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/SoundLoopSiren.java b/com/hbm/sound/SoundLoopSiren.java index c1eb9d555..fc612299d 100644 --- a/com/hbm/sound/SoundLoopSiren.java +++ b/com/hbm/sound/SoundLoopSiren.java @@ -4,15 +4,11 @@ import java.util.ArrayList; import java.util.List; import com.hbm.items.tool.ItemCassette.SoundType; -import com.hbm.items.tool.ItemCassette.TrackType; -import com.hbm.tileentity.machine.TileEntityMachineChemplant; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import com.hbm.tileentity.machine.TileEntityMachineSiren; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/SoundLoopTurbofan.java b/com/hbm/sound/SoundLoopTurbofan.java index fc4dedd07..4d5b125f3 100644 --- a/com/hbm/sound/SoundLoopTurbofan.java +++ b/com/hbm/sound/SoundLoopTurbofan.java @@ -3,8 +3,6 @@ package com.hbm.sound; import java.util.ArrayList; import java.util.List; -import com.hbm.tileentity.machine.TileEntityMachineAssembler; -import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityMachineBase.java b/com/hbm/tileentity/TileEntityMachineBase.java index cb4b7bbae..5172e3e1f 100644 --- a/com/hbm/tileentity/TileEntityMachineBase.java +++ b/com/hbm/tileentity/TileEntityMachineBase.java @@ -2,6 +2,7 @@ package com.hbm.tileentity; import com.hbm.interfaces.Spaghetti; import com.hbm.packet.AuxGaugePacket; +import com.hbm.packet.NBTPacket; import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; @@ -144,14 +145,24 @@ public abstract class TileEntityMachineBase extends TileEntity implements ISided @Override public abstract void updateEntity(); + @Deprecated public void updateGauge(int val, int id, int range) { if(!worldObj.isRemote) PacketDispatcher.wrapper.sendToAllAround(new AuxGaugePacket(xCoord, yCoord, zCoord, val, id), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, range)); } - + + @Deprecated public void processGauge(int val, int id) { } + public void networkPack(NBTTagCompound nbt, int range) { + + if(!worldObj.isRemote) + PacketDispatcher.wrapper.sendToAllAround(new NBTPacket(nbt, xCoord, yCoord, zCoord), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, range)); + } + + public void networkUnpack(NBTTagCompound nbt) { } + @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); diff --git a/com/hbm/tileentity/bomb/TileEntityCelPrime.java b/com/hbm/tileentity/bomb/TileEntityCelPrime.java index 0d8bc7428..4ff8f63a3 100644 --- a/com/hbm/tileentity/bomb/TileEntityCelPrime.java +++ b/com/hbm/tileentity/bomb/TileEntityCelPrime.java @@ -1,7 +1,5 @@ package com.hbm.tileentity.bomb; -import com.hbm.items.ModItems; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java index 52c8b8382..cc8564018 100644 --- a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java +++ b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java @@ -15,7 +15,6 @@ import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.PartSize; -import com.hbm.items.weapon.ItemMissile.PartType; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxElectricityPacket; diff --git a/com/hbm/tileentity/bomb/TileEntityLandmine.java b/com/hbm/tileentity/bomb/TileEntityLandmine.java index 882fd62d8..6ea852f6b 100644 --- a/com/hbm/tileentity/bomb/TileEntityLandmine.java +++ b/com/hbm/tileentity/bomb/TileEntityLandmine.java @@ -4,8 +4,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.Landmine; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.main.ResourceManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java index 2e180adf8..1978f0dd6 100644 --- a/com/hbm/tileentity/bomb/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java @@ -1,9 +1,7 @@ package com.hbm.tileentity.bomb; import com.hbm.interfaces.IConsumer; -import com.hbm.items.ModItems; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissilePacket; @@ -17,7 +15,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; public class TileEntityLaunchPad extends TileEntity implements ISidedInventory, IConsumer { diff --git a/com/hbm/tileentity/bomb/TileEntityNukeCustom.java b/com/hbm/tileentity/bomb/TileEntityNukeCustom.java index a7c03d2c8..01f5b7eab 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeCustom.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeCustom.java @@ -2,8 +2,6 @@ package com.hbm.tileentity.bomb; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; -import com.hbm.packet.AuxGaugePacket; -import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/bomb/TileEntityNukeN45.java b/com/hbm/tileentity/bomb/TileEntityNukeN45.java index aa5108bc2..65c30f1b1 100644 --- a/com/hbm/tileentity/bomb/TileEntityNukeN45.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeN45.java @@ -17,7 +17,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/com/hbm/tileentity/bomb/TileEntitySellafield.java b/com/hbm/tileentity/bomb/TileEntitySellafield.java index 60f5fabc6..ee71abab2 100644 --- a/com/hbm/tileentity/bomb/TileEntitySellafield.java +++ b/com/hbm/tileentity/bomb/TileEntitySellafield.java @@ -2,10 +2,8 @@ package com.hbm.tileentity.bomb; import java.util.List; -import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/bomb/TileEntityTurretBase.java b/com/hbm/tileentity/bomb/TileEntityTurretBase.java index 976aff93f..802b96c20 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretBase.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretBase.java @@ -7,9 +7,7 @@ import com.hbm.blocks.bomb.TurretBase; import com.hbm.entity.logic.EntityBomber; import com.hbm.entity.missile.EntityMissileBaseAdvanced; import com.hbm.entity.missile.EntityMissileCustom; -import com.hbm.items.tool.ItemTurretBiometry; import com.hbm.lib.Library; -import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TETurretPacket; @@ -18,12 +16,9 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; public abstract class TileEntityTurretBase extends TileEntity { diff --git a/com/hbm/tileentity/bomb/TileEntityTurretCIWS.java b/com/hbm/tileentity/bomb/TileEntityTurretCIWS.java index df5948da5..6a1f3b316 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretCIWS.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretCIWS.java @@ -1,11 +1,8 @@ package com.hbm.tileentity.bomb; -import com.hbm.main.MainRegistry; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; -import net.minecraft.tileentity.TileEntity; - public class TileEntityTurretCIWS extends TileEntityTurretBase { public int spin; diff --git a/com/hbm/tileentity/bomb/TileEntityTurretCheapo.java b/com/hbm/tileentity/bomb/TileEntityTurretCheapo.java index e385d26cb..db45ba692 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretCheapo.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretCheapo.java @@ -3,8 +3,6 @@ package com.hbm.tileentity.bomb; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; -import net.minecraft.tileentity.TileEntity; - public class TileEntityTurretCheapo extends TileEntityTurretBase { public int spin; diff --git a/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java b/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java index 720d284bd..cbc8f21da 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java @@ -1,10 +1,5 @@ package com.hbm.tileentity.bomb; -import com.hbm.entity.particle.EntityGasFlameFX; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Vec3; - public class TileEntityTurretFlamer extends TileEntityTurretBase { } diff --git a/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java b/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java index 69ea8972f..3627c2b40 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java @@ -1,7 +1,5 @@ package com.hbm.tileentity.bomb; -import net.minecraft.tileentity.TileEntity; - public class TileEntityTurretHeavy extends TileEntityTurretBase { } diff --git a/com/hbm/tileentity/bomb/TileEntityTurretLight.java b/com/hbm/tileentity/bomb/TileEntityTurretLight.java index 9d3831e9f..6597f783a 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretLight.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretLight.java @@ -1,7 +1,5 @@ package com.hbm.tileentity.bomb; -import net.minecraft.tileentity.TileEntity; - public class TileEntityTurretLight extends TileEntityTurretBase { } diff --git a/com/hbm/tileentity/bomb/TileEntityTurretRocket.java b/com/hbm/tileentity/bomb/TileEntityTurretRocket.java index 3b74991a1..e7fdb51c2 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretRocket.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretRocket.java @@ -1,7 +1,5 @@ package com.hbm.tileentity.bomb; -import net.minecraft.tileentity.TileEntity; - public class TileEntityTurretRocket extends TileEntityTurretBase { } diff --git a/com/hbm/tileentity/bomb/TileEntityTurretSpitfire.java b/com/hbm/tileentity/bomb/TileEntityTurretSpitfire.java index ebf223f8d..5323ff669 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretSpitfire.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretSpitfire.java @@ -1,7 +1,5 @@ package com.hbm.tileentity.bomb; -import net.minecraft.tileentity.TileEntity; - public class TileEntityTurretSpitfire extends TileEntityTurretBase { } diff --git a/com/hbm/tileentity/bomb/TileEntityTurretTau.java b/com/hbm/tileentity/bomb/TileEntityTurretTau.java index 0208d6778..0c2c6ecf0 100644 --- a/com/hbm/tileentity/bomb/TileEntityTurretTau.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretTau.java @@ -1,7 +1,5 @@ package com.hbm.tileentity.bomb; -import net.minecraft.tileentity.TileEntity; - public class TileEntityTurretTau extends TileEntityTurretBase { } diff --git a/com/hbm/tileentity/conductor/TileEntityCableSwitch.java b/com/hbm/tileentity/conductor/TileEntityCableSwitch.java index 6af382b7b..78ebee792 100644 --- a/com/hbm/tileentity/conductor/TileEntityCableSwitch.java +++ b/com/hbm/tileentity/conductor/TileEntityCableSwitch.java @@ -1,9 +1,5 @@ package com.hbm.tileentity.conductor; -import com.hbm.interfaces.IConductor; - -import net.minecraft.tileentity.TileEntity; - public class TileEntityCableSwitch extends TileEntityWireCoated { } diff --git a/com/hbm/tileentity/deco/TileEntityDecoBlockAltF.java b/com/hbm/tileentity/deco/TileEntityDecoBlockAltF.java index 8f4578f7c..b577b016e 100644 --- a/com/hbm/tileentity/deco/TileEntityDecoBlockAltF.java +++ b/com/hbm/tileentity/deco/TileEntityDecoBlockAltF.java @@ -20,7 +20,7 @@ public class TileEntityDecoBlockAltF extends TileEntity { public void updateEntity() { int strength = 4; float f = strength; - HashSet hashset = new HashSet(); + new HashSet(); int i; int j; int k; @@ -28,9 +28,6 @@ public class TileEntityDecoBlockAltF extends TileEntity { double d6; double d7; double wat = 4*2; - boolean isOccupied = false; - - strength *= 2.0F; i = MathHelper.floor_double(this.xCoord - wat - 1.0D); j = MathHelper.floor_double(this.xCoord + wat + 1.0D); @@ -39,7 +36,7 @@ public class TileEntityDecoBlockAltF extends TileEntity { int l = MathHelper.floor_double(this.zCoord - wat - 1.0D); int j2 = MathHelper.floor_double(this.zCoord + wat + 1.0D); List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(this.xCoord, this.yCoord, this.zCoord); + Vec3.createVectorHelper(this.xCoord, this.yCoord, this.zCoord); for (int i1 = 0; i1 < list.size(); ++i1) { diff --git a/com/hbm/tileentity/deco/TileEntityTaint.java b/com/hbm/tileentity/deco/TileEntityTaint.java index a8bdfe11d..b06d217f2 100644 --- a/com/hbm/tileentity/deco/TileEntityTaint.java +++ b/com/hbm/tileentity/deco/TileEntityTaint.java @@ -2,7 +2,6 @@ package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; public class TileEntityTaint extends TileEntity { diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index b7e60f8df..35e9eb7de 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -20,7 +20,6 @@ import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.saveddata.SatelliteSaveStructure; import com.hbm.saveddata.SatelliteSaveStructure.SatelliteType; import com.hbm.saveddata.SatelliteSavedData; @@ -34,7 +33,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentText; import scala.util.Random; public class TileEntityAMSBase extends TileEntity implements ISidedInventory, ISource, IFluidContainer, IFluidAcceptor { diff --git a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index fd9945988..7c279954c 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -3,7 +3,6 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/tileentity/machine/TileEntityCore.java b/com/hbm/tileentity/machine/TileEntityCore.java index 53782afcb..cac49d0ce 100644 --- a/com/hbm/tileentity/machine/TileEntityCore.java +++ b/com/hbm/tileentity/machine/TileEntityCore.java @@ -2,8 +2,6 @@ package com.hbm.tileentity.machine; import com.hbm.tileentity.TileEntityMachineBase; -import net.minecraft.tileentity.TileEntity; - public class TileEntityCore extends TileEntityMachineBase { public TileEntityCore() { diff --git a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index a4bc3b131..8b11dccfd 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -16,6 +16,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; @@ -68,9 +69,12 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon if(isOn) { + //i.e. 50,000,000 HE = 10,000 SPK + //1 SPK = 5,000HE + if(power >= demand) { power -= demand; - long add = watts; + long add = watts * 100; joules += add; } prev = joules; @@ -89,7 +93,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon if(te instanceof ILaserable) { - ((ILaserable)te).addEnergy(joules * 98 / 100); + ((ILaserable)te).addEnergy(joules * 98 / 100, dir); break; } @@ -119,7 +123,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon List list = worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB.getBoundingBox(blx, bly, blz, bux, buy, buz)); for(Entity e : list) { - e.attackEntityFrom(ModDamageSource.amsCore, 5); + e.attackEntityFrom(ModDamageSource.amsCore, 50); e.setFire(10); } } @@ -128,21 +132,23 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon prev = 0; } - this.updateGauge((int) power, 0, 50); - this.updateGauge(watts, 1, 50); - this.updateGauge((int) prev, 2, 50); - this.updateGauge(beam, 3, 50); - this.updateGauge(isOn ? 1 : 0, 4, 250); + NBTTagCompound data = new NBTTagCompound(); + data.setLong("power", power); + data.setInteger("watts", watts); + data.setLong("prev", prev); + data.setInteger("beam", beam); + data.setBoolean("isOn", isOn); + this.networkPack(data, 250); } } - public void processGauge(int val, int id) { + public void networkUnpack(NBTTagCompound data) { - if(id == 0) power = val; - if(id == 1) watts = val; - if(id == 2) joules = val; - if(id == 3) beam = val; - if(id == 4) isOn = val == 1; + power = data.getLong("power"); + watts = data.getInteger("watts"); + prev = data.getLong("prev"); + beam = data.getInteger("beam"); + isOn = data.getBoolean("isOn"); } public long getPowerScaled(long i) { @@ -209,8 +215,11 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon } @Override - public void addEnergy(long energy) { - joules += energy; + public void addEnergy(long energy, ForgeDirection dir) { + + //do not accept lasers from the front + if(dir.getOpposite().ordinal() != this.getBlockMetadata()) + joules += energy; } @Override diff --git a/com/hbm/tileentity/machine/TileEntityCoreReceiver.java b/com/hbm/tileentity/machine/TileEntityCoreReceiver.java index 9872c8378..bda7d756c 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreReceiver.java +++ b/com/hbm/tileentity/machine/TileEntityCoreReceiver.java @@ -1,7 +1,185 @@ package com.hbm.tileentity.machine; +import java.util.ArrayList; +import java.util.List; + +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.interfaces.IConsumer; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.interfaces.ILaserable; +import com.hbm.interfaces.ISource; +import com.hbm.inventory.FluidTank; +import com.hbm.lib.Library; +import com.hbm.tileentity.TileEntityMachineBase; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityCoreReceiver extends TileEntity { +public class TileEntityCoreReceiver extends TileEntityMachineBase implements ISource, IFluidAcceptor, ILaserable { + + public long power; + public long joules; + public FluidTank tank; + public List list = new ArrayList(); + public int age = 0; + public TileEntityCoreReceiver() { + super(0); + tank = new FluidTank(FluidType.CRYOGEL, 64000, 0); + } + + @Override + public String getName() { + return "container.dfcReceiver"; + } + + @Override + public void updateEntity() { + + if (!worldObj.isRemote) { + + tank.updateTank(xCoord, yCoord, zCoord); + + power += joules * 5000; + + if(joules > 0) { + + if(tank.getFill() >= 20) { + tank.setFill(tank.getFill() - 20); + } else { + worldObj.setBlock(xCoord, yCoord, zCoord, Blocks.flowing_lava); + return; + } + } + + joules = 0; + + age++; + if(age >= 20) + { + age = 0; + } + + if(age == 9 || age == 19) { + ffgeuaInit(); + + if(!getTact()) + power = 0; + } + } + } + + @Override + public void ffgeua(int x, int y, int z, boolean newTact) { + + Library.ffgeua(x, y, z, newTact, this, worldObj); + } + + @Override + public void ffgeuaInit() { + ffgeua(this.xCoord, this.yCoord + 1, this.zCoord, getTact()); + ffgeua(this.xCoord, this.yCoord - 1, this.zCoord, getTact()); + ffgeua(this.xCoord - 1, this.yCoord, this.zCoord, getTact()); + ffgeua(this.xCoord + 1, this.yCoord, this.zCoord, getTact()); + ffgeua(this.xCoord, this.yCoord, this.zCoord - 1, getTact()); + ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); + } + + @Override + public boolean getTact() { + if(age >= 0 && age < 10) + { + return true; + } + + return false; + } + + @Override + public long getSPower() { + return power; + } + + @Override + public void setSPower(long i) { + this.power = i; + } + + @Override + public List getList() { + return list; + } + + @Override + public void clearList() { + this.list.clear(); + } + + @Override + public void setFluidFill(int i, FluidType type) { + if(type.name().equals(tank.getTankType().name())) + tank.setFill(i); + } + + @Override + public int getFluidFill(FluidType type) { + if(type.name().equals(tank.getTankType().name())) + return tank.getFill(); + else + return 0; + } + + @Override + public int getMaxFluidFill(FluidType type) { + if(type.name().equals(tank.getTankType().name())) + return tank.getMaxFill(); + else + return 0; + } + + @Override + public void setFillstate(int fill, int index) { + tank.setFill(fill); + } + + @Override + public void setType(FluidType type, int index) { + tank.setTankType(type); + } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } + + @Override + public void addEnergy(long energy, ForgeDirection dir) { + + //only accept lasers from the front + if(dir.getOpposite().ordinal() == this.getBlockMetadata()) { + joules += energy; + } else { + worldObj.func_147480_a(xCoord, yCoord, zCoord, false); + worldObj.createExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 2.5F, true); + } + } + + @Override + public AxisAlignedBB getRenderBoundingBox() { + return TileEntity.INFINITE_EXTENT_AABB; + } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() + { + return 65536.0D; + } } diff --git a/com/hbm/tileentity/machine/TileEntityCrateSteel.java b/com/hbm/tileentity/machine/TileEntityCrateSteel.java index 1983f7deb..68aea3e3a 100644 --- a/com/hbm/tileentity/machine/TileEntityCrateSteel.java +++ b/com/hbm/tileentity/machine/TileEntityCrateSteel.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; public class TileEntityCrateSteel extends TileEntityLockableBase implements ISidedInventory { diff --git a/com/hbm/tileentity/machine/TileEntityDiFurnace.java b/com/hbm/tileentity/machine/TileEntityDiFurnace.java index dc794f372..c1777d87c 100644 --- a/com/hbm/tileentity/machine/TileEntityDiFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityDiFurnace.java @@ -285,7 +285,7 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory { @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(hasPower() && isProcessing()) diff --git a/com/hbm/tileentity/machine/TileEntityDummy.java b/com/hbm/tileentity/machine/TileEntityDummy.java index 3ef22edfb..5fdae4aa6 100644 --- a/com/hbm/tileentity/machine/TileEntityDummy.java +++ b/com/hbm/tileentity/machine/TileEntityDummy.java @@ -2,7 +2,6 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IMultiblock; -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/machine/TileEntityFF.java b/com/hbm/tileentity/machine/TileEntityFF.java index bbbcb9dfa..400fa5c8a 100644 --- a/com/hbm/tileentity/machine/TileEntityFF.java +++ b/com/hbm/tileentity/machine/TileEntityFF.java @@ -3,8 +3,6 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.lib.ModDamageSource; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; diff --git a/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java index 29756a8e0..f28908f37 100644 --- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -297,42 +297,35 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } else { int i = getSingularityType(); - boolean isWorking = false; - if(i == 1 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 75 >= 0) { tanks[0].setFill(tanks[0].getFill() - 150); tanks[1].setFill(tanks[1].getFill() - 75); tanks[2].setFill(tanks[2].getFill() - 75); power += 5000000; - isWorking = true; } if(i == 2 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 35 >= 0) { tanks[0].setFill(tanks[0].getFill() - 75); tanks[1].setFill(tanks[1].getFill() - 35); tanks[2].setFill(tanks[2].getFill() - 30); power += 2500000; - isWorking = true; } if(i == 3 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 140 >= 0) { tanks[0].setFill(tanks[0].getFill() - 300); tanks[1].setFill(tanks[1].getFill() - 75); tanks[2].setFill(tanks[2].getFill() - 140); power += 10000000; - isWorking = true; } if(i == 4 && tanks[1].getFill() - 100 >= 0 && tanks[2].getFill() - 100 >= 0) { tanks[0].setFill(tanks[0].getFill() - 100); tanks[1].setFill(tanks[1].getFill() - 100); tanks[2].setFill(tanks[2].getFill() - 100); power += 10000000; - isWorking = true; } if(i == 5 && tanks[1].getFill() - 15 >= 0 && tanks[2].getFill() - 15 >= 0) { tanks[0].setFill(tanks[0].getFill() - 150); tanks[1].setFill(tanks[1].getFill() - 15); tanks[2].setFill(tanks[2].getFill() - 15); power += 100000000; - isWorking = true; } if(power > maxPower) diff --git a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index 3fe8f1c6a..e85c76d36 100644 --- a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -18,7 +18,6 @@ import com.hbm.packet.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/tileentity/machine/TileEntityLockableBase.java b/com/hbm/tileentity/machine/TileEntityLockableBase.java index 87e278a70..4ce4113dc 100644 --- a/com/hbm/tileentity/machine/TileEntityLockableBase.java +++ b/com/hbm/tileentity/machine/TileEntityLockableBase.java @@ -8,7 +8,6 @@ import com.hbm.main.MainRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; public abstract class TileEntityLockableBase extends TileEntity { diff --git a/com/hbm/tileentity/machine/TileEntityMachineAmgen.java b/com/hbm/tileentity/machine/TileEntityMachineAmgen.java index 1c1c4cd30..05f0777aa 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineAmgen.java +++ b/com/hbm/tileentity/machine/TileEntityMachineAmgen.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.lib.Library; diff --git a/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java b/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java index 9d868a758..e41901722 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java @@ -315,7 +315,7 @@ public class TileEntityMachineArcFurnace extends TileEntity implements ISidedInv //TODO: fix this punjabi trash @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(!worldObj.isRemote) diff --git a/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java b/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java index 8fcb92c92..a8f6d455a 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java @@ -2,7 +2,6 @@ package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; @@ -13,10 +12,8 @@ import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -300,7 +297,7 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(!worldObj.isRemote) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 135e58cb0..6c1ed0983 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; @@ -15,21 +14,18 @@ import com.hbm.inventory.FluidTank; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; -import com.hbm.items.tool.ItemAssemblyTemplate; import com.hbm.items.tool.ItemChemistryTemplate; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxParticlePacket; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEAssemblerPacket; import com.hbm.packet.TEChemplantPacket; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/com/hbm/tileentity/machine/TileEntityMachineCoal.java index b34c73c28..008128e5a 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -1,10 +1,8 @@ package com.hbm.tileentity.machine; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -232,9 +230,6 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory if(age == 9 || age == 19) ffgeuaInit(); - boolean flag = this.burnTime > 0; - boolean flag1 = false; - if(!worldObj.isRemote) { @@ -255,7 +250,6 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory if(trigger) { - flag1 = true; MachineCoal.updateBlockState(this.burnTime > 0, this.worldObj, this.xCoord, this.yCoord, this.zCoord); } diff --git a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index e461ca975..5ba356582 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -18,9 +18,7 @@ import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java b/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java index 44ba44566..4ac7774b2 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java @@ -270,7 +270,7 @@ public class TileEntityMachineElectricFurnace extends TileEntity implements ISid @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(!worldObj.isRemote) diff --git a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index 3e2223119..f0b9a2d4d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -4,11 +4,9 @@ import java.util.ArrayList; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; -import com.hbm.interfaces.IMultiblock; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; import com.hbm.lib.Library; diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java index d1af80e12..74d199cd0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java @@ -10,10 +10,8 @@ import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; -import com.hbm.interfaces.IGasAcceptor; import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; diff --git a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java index d2d583210..a44a2afe0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java +++ b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java @@ -11,7 +11,6 @@ import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEDrillPacket; -import com.hbm.packet.TEDrillSoundPacket; import com.hbm.sound.SoundLoopMachine; import cpw.mods.fml.relauncher.Side; @@ -28,7 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.oredict.OreDictionary; public class TileEntityMachineMiningDrill extends TileEntity implements ISidedInventory, IConsumer { @@ -816,7 +814,6 @@ public class TileEntityMachineMiningDrill extends TileEntity implements ISidedIn return true; } - int size = st.stackSize; st.stackSize = 1; ItemStack[] fakeArray = slots.clone(); diff --git a/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java b/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java index 4b6508234..c30b3fc86 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java +++ b/com/hbm/tileentity/machine/TileEntityMachineMissileAssembly.java @@ -1,24 +1,12 @@ package com.hbm.tileentity.machine; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.handler.MissileStruct; -import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.FluidContainerRegistry; -import com.hbm.inventory.FluidTank; -import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile; import com.hbm.items.weapon.ItemMissile.FuelType; import com.hbm.items.weapon.ItemMissile.PartType; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEMissileMultipartPacket; -import com.hbm.render.util.MissileMultipart; -import com.hbm.render.util.MissilePart; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java index 6620b1540..245fdeac3 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java +++ b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java @@ -12,10 +12,6 @@ import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; -import com.hbm.interfaces.IGasAcceptor; -import com.hbm.interfaces.IGasSource; -import com.hbm.interfaces.IOilAcceptor; -import com.hbm.interfaces.IOilSource; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; diff --git a/com/hbm/tileentity/machine/TileEntityMachinePress.java b/com/hbm/tileentity/machine/TileEntityMachinePress.java index 89078c00b..f7c8bff65 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePress.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePress.java @@ -1,31 +1,15 @@ package com.hbm.tileentity.machine; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.interfaces.IFluidContainer; -import com.hbm.inventory.FluidTank; import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.items.special.ItemBlades; -import com.hbm.main.MainRegistry; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEPressPacket; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemSword; -import net.minecraft.item.ItemTool; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java index 4b38494f0..8dd2c6994 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java @@ -6,7 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.particle.EntityGasFX; -import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; @@ -18,7 +17,6 @@ import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEAssemblerPacket; import com.hbm.packet.TEPumpjackPacket; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/tileentity/machine/TileEntityMachineRadGen.java b/com/hbm/tileentity/machine/TileEntityMachineRadGen.java index 7ee3eec18..d8f19b732 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRadGen.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRadGen.java @@ -9,15 +9,10 @@ import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEIGeneratorPacket; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/com/hbm/tileentity/machine/TileEntityMachineRadar.java b/com/hbm/tileentity/machine/TileEntityMachineRadar.java index 36069542b..55d16966e 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRadar.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRadar.java @@ -5,9 +5,7 @@ import java.util.List; import com.hbm.entity.missile.EntityMissileAntiBallistic; import com.hbm.entity.missile.EntityMissileBaseAdvanced; -import com.hbm.entity.projectile.EntityRocketHoming; import com.hbm.interfaces.IConsumer; -import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; @@ -18,11 +16,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; public class TileEntityMachineRadar extends TileEntity implements IConsumer { diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactor.java b/com/hbm/tileentity/machine/TileEntityMachineReactor.java index c1e92bdf2..fec751f80 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactor.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactor.java @@ -310,7 +310,7 @@ public class TileEntityMachineReactor extends TileEntity implements ISidedInvent @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(!worldObj.isRemote) diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index 9f073499f..990bbb51a 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -12,18 +12,13 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; -import com.hbm.items.special.ItemFuelRod; import com.hbm.lib.Library; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.saveddata.RadiationSavedData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; @@ -31,7 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; public class TileEntityMachineReactorLarge extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource { diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java index 0db5fe236..13cb7e7d8 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java @@ -21,7 +21,6 @@ import com.hbm.saveddata.RadiationSavedData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -425,7 +424,7 @@ public class TileEntityMachineReactorSmallOld extends TileEntity && worldObj.getBlock(xCoord, yCoord + 1, zCoord + 1) != Blocks.air && worldObj.getBlock(xCoord, yCoord + 1, zCoord - 1) != Blocks.air)) { - List list = (List) worldObj.getEntitiesWithinAABBExcludingEntity(null, + worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(xCoord + 0.5 - 5, yCoord + 1.5 - 5, zCoord + 0.5 - 5, xCoord + 0.5 + 5, yCoord + 1.5 + 5, zCoord + 0.5 + 5)); diff --git a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java index 81cb44146..33fd96d0b 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java @@ -8,7 +8,6 @@ import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; -import com.hbm.interfaces.IOilAcceptor; import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/machine/TileEntityMachineSPP.java b/com/hbm/tileentity/machine/TileEntityMachineSPP.java index d873929e0..8dbc53e0d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSPP.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSPP.java @@ -4,14 +4,9 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.explosion.ExplosionThermo; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; -import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.PacketDispatcher; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/machine/TileEntityMachineSatDock.java b/com/hbm/tileentity/machine/TileEntityMachineSatDock.java index 7c3645de1..8df7dae06 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSatDock.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSatDock.java @@ -1,25 +1,11 @@ package com.hbm.tileentity.machine; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Random; import com.hbm.entity.missile.EntityMinerRocket; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.interfaces.IConsumer; -import com.hbm.interfaces.IFluidAcceptor; -import com.hbm.interfaces.IFluidContainer; -import com.hbm.inventory.FluidTank; -import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.MachineRecipes.GasCentOutput; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemSatChip; -import com.hbm.lib.Library; -import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.AuxGaugePacket; -import com.hbm.packet.LoopedSoundPacket; -import com.hbm.packet.PacketDispatcher; import com.hbm.saveddata.SatelliteSaveStructure; import com.hbm.saveddata.SatelliteSaveStructure.SatelliteType; import com.hbm.saveddata.SatelliteSavedData; diff --git a/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java b/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java index f042d31a1..6fb5a999b 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSatLinker.java @@ -1,8 +1,5 @@ package com.hbm.tileentity.machine; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.FluidTank; -import com.hbm.items.ModItems; import com.hbm.items.tool.ItemSatChip; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index fb067d556..e35fc9adf 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -19,7 +19,6 @@ import com.hbm.packet.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/com/hbm/tileentity/machine/TileEntityMachineShredder.java b/com/hbm/tileentity/machine/TileEntityMachineShredder.java index b6392c642..8337d8274 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -208,7 +208,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(!worldObj.isRemote) diff --git a/com/hbm/tileentity/machine/TileEntityMachineShredderLarge.java b/com/hbm/tileentity/machine/TileEntityMachineShredderLarge.java index 44e6a56cf..c7cc707e3 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineShredderLarge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineShredderLarge.java @@ -1,32 +1,20 @@ package com.hbm.tileentity.machine; -import java.util.List; import java.util.Random; import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; -import com.hbm.items.tool.ItemAssemblyTemplate; -import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEAssemblerPacket; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.oredict.OreDictionary; public class TileEntityMachineShredderLarge extends TileEntity implements ISidedInventory, IConsumer { diff --git a/com/hbm/tileentity/machine/TileEntityMachineSiren.java b/com/hbm/tileentity/machine/TileEntityMachineSiren.java index 7c56a5914..b697502a1 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSiren.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSiren.java @@ -1,15 +1,9 @@ package com.hbm.tileentity.machine; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; - -import com.hbm.interfaces.IConsumer; -import com.hbm.items.ModItems; import com.hbm.items.tool.ItemCassette; import com.hbm.items.tool.ItemCassette.SoundType; import com.hbm.items.tool.ItemCassette.TrackType; -import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TESirenPacket; diff --git a/com/hbm/tileentity/machine/TileEntityMachineTeleLinker.java b/com/hbm/tileentity/machine/TileEntityMachineTeleLinker.java index 33261beef..4c52f350b 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTeleLinker.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTeleLinker.java @@ -1,6 +1,5 @@ package com.hbm.tileentity.machine; -import com.hbm.items.tool.ItemSatChip; import com.hbm.items.tool.ItemTurretBiometry; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/tileentity/machine/TileEntityMachineTransformer.java b/com/hbm/tileentity/machine/TileEntityMachineTransformer.java index 06f4bf5ea..0c2413cfb 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTransformer.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTransformer.java @@ -5,12 +5,9 @@ import java.util.List; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; -import com.hbm.items.ModItems; import com.hbm.lib.Library; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; public class TileEntityMachineTransformer extends TileEntity implements ISource, IConsumer { diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index 7a801474e..f54bcb15b 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -14,7 +14,6 @@ import com.hbm.inventory.MachineRecipes; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; @@ -23,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityFurnace; public class TileEntityMachineTurbine extends TileEntity implements ISidedInventory, IFluidContainer, IFluidAcceptor, IFluidSource, ISource { @@ -214,8 +212,6 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent @Override public void updateEntity() { - boolean mark = false; - if(!worldObj.isRemote) { age++; diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index 3fdd3056f..72a8a210d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -18,7 +18,6 @@ import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEIGeneratorPacket; import com.hbm.packet.TETurbofanPacket; import cpw.mods.fml.relauncher.Side; @@ -26,7 +25,6 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/com/hbm/tileentity/machine/TileEntityMultiblock.java b/com/hbm/tileentity/machine/TileEntityMultiblock.java index 7d4bdeb41..c2d91a40d 100644 --- a/com/hbm/tileentity/machine/TileEntityMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityMultiblock.java @@ -8,7 +8,6 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; public class TileEntityMultiblock extends TileEntity { diff --git a/com/hbm/tileentity/machine/TileEntityNukeFurnace.java b/com/hbm/tileentity/machine/TileEntityNukeFurnace.java index 76289f204..d83d09dd9 100644 --- a/com/hbm/tileentity/machine/TileEntityNukeFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityNukeFurnace.java @@ -316,7 +316,7 @@ public class TileEntityNukeFurnace extends TileEntity implements ISidedInventory @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(!worldObj.isRemote) diff --git a/com/hbm/tileentity/machine/TileEntityRadioRec.java b/com/hbm/tileentity/machine/TileEntityRadioRec.java index 03a450923..abdf96c37 100644 --- a/com/hbm/tileentity/machine/TileEntityRadioRec.java +++ b/com/hbm/tileentity/machine/TileEntityRadioRec.java @@ -3,9 +3,7 @@ package com.hbm.tileentity.machine; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; public class TileEntityRadioRec extends TileEntity { diff --git a/com/hbm/tileentity/machine/TileEntityRadiobox.java b/com/hbm/tileentity/machine/TileEntityRadiobox.java index e6bc0dec9..f85dd1683 100644 --- a/com/hbm/tileentity/machine/TileEntityRadiobox.java +++ b/com/hbm/tileentity/machine/TileEntityRadiobox.java @@ -3,9 +3,6 @@ package com.hbm.tileentity.machine; import java.util.List; import com.hbm.lib.ModDamageSource; -import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEAssemblerPacket; - import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityMob; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/machine/TileEntityReactorControl.java b/com/hbm/tileentity/machine/TileEntityReactorControl.java index 7de9c3630..2801274da 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorControl.java +++ b/com/hbm/tileentity/machine/TileEntityReactorControl.java @@ -2,14 +2,12 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemKeyPin; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEControlPacket; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneComparator; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/tileentity/machine/TileEntityRtgFurnace.java b/com/hbm/tileentity/machine/TileEntityRtgFurnace.java index aeca04c01..eba2a2ba9 100644 --- a/com/hbm/tileentity/machine/TileEntityRtgFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityRtgFurnace.java @@ -256,7 +256,7 @@ public class TileEntityRtgFurnace extends TileEntity implements ISidedInventory @Override public void updateEntity() { - boolean flag = this.hasPower(); + this.hasPower(); boolean flag1 = false; if(!worldObj.isRemote) diff --git a/com/hbm/tileentity/machine/TileEntitySafe.java b/com/hbm/tileentity/machine/TileEntitySafe.java index e1005ef75..63543b039 100644 --- a/com/hbm/tileentity/machine/TileEntitySafe.java +++ b/com/hbm/tileentity/machine/TileEntitySafe.java @@ -5,7 +5,6 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; public class TileEntitySafe extends TileEntityLockableBase implements ISidedInventory { diff --git a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java index aa20eebb2..58e6d33f8 100644 --- a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java +++ b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java @@ -10,18 +10,10 @@ import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemCustomMissile; -import com.hbm.items.weapon.ItemMissile; -import com.hbm.items.weapon.ItemMissile.FuelType; -import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEMissileMultipartPacket; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; diff --git a/com/hbm/tileentity/machine/TileEntityVaultDoor.java b/com/hbm/tileentity/machine/TileEntityVaultDoor.java index 1f3d40645..0a033123f 100644 --- a/com/hbm/tileentity/machine/TileEntityVaultDoor.java +++ b/com/hbm/tileentity/machine/TileEntityVaultDoor.java @@ -2,7 +2,6 @@ package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.DummyBlockVault; -import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEVaultPacket; diff --git a/com/hbm/tileentity/machine/TileEntityWasteDrum.java b/com/hbm/tileentity/machine/TileEntityWasteDrum.java index c5a90ad1d..6c2ccd806 100644 --- a/com/hbm/tileentity/machine/TileEntityWasteDrum.java +++ b/com/hbm/tileentity/machine/TileEntityWasteDrum.java @@ -1,13 +1,6 @@ package com.hbm.tileentity.machine; -import java.util.Arrays; - import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemCassette.SoundType; -import com.hbm.items.tool.ItemCassette.TrackType; -import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TESirenPacket; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.ISidedInventory; diff --git a/com/hbm/tileentity/machine/TileEntityWatzCore.java b/com/hbm/tileentity/machine/TileEntityWatzCore.java index cddf673cb..61c1ef21f 100644 --- a/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -23,7 +23,6 @@ import com.hbm.packet.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/world/Barrel.java b/com/hbm/world/Barrel.java index 806d9d315..f0ffe7307 100644 --- a/com/hbm/world/Barrel.java +++ b/com/hbm/world/Barrel.java @@ -15,7 +15,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemDoor; -import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/com/hbm/world/DesertAtom003.java b/com/hbm/world/DesertAtom003.java index ec4be7ef8..018069e68 100644 --- a/com/hbm/world/DesertAtom003.java +++ b/com/hbm/world/DesertAtom003.java @@ -372,29 +372,21 @@ public class DesertAtom003 TileEntity tank0 = world.getTileEntity(x + 28, y + 4, z + 7); if(tank0 instanceof TileEntityMachineUF6Tank) { - TileEntityMachineUF6Tank tankuf0 = (TileEntityMachineUF6Tank)tank0; - //tankuf0.fillState = rand.nextInt(tankuf0.maxFill); } world.setBlock(x + 29, y + 4, z + 7, Block20, 3, 3); - TileEntity tank1 = world.getTileEntity(x + 29, y + 4, z + 7); + world.getTileEntity(x + 29, y + 4, z + 7); if(tank0 instanceof TileEntityMachineUF6Tank) { - TileEntityMachineUF6Tank tankuf1 = (TileEntityMachineUF6Tank)tank1; - //tankuf1.fillState = rand.nextInt(tankuf1.maxFill); } world.setBlock(x + 30, y + 4, z + 7, Block21, 3, 3); - TileEntity tank2 = world.getTileEntity(x + 30, y + 4, z + 7); + world.getTileEntity(x + 30, y + 4, z + 7); if(tank0 instanceof TileEntityMachinePuF6Tank) { - TileEntityMachinePuF6Tank tankuf2 = (TileEntityMachinePuF6Tank)tank2; - //tankuf2.fillState = rand.nextInt(TileEntityMachinePuF6Tank.maxFill); } world.setBlock(x + 31, y + 4, z + 7, Block21, 3, 3); TileEntity tank3 = world.getTileEntity(x + 31, y + 4, z + 7); if(tank3 instanceof TileEntityMachinePuF6Tank) { - TileEntityMachinePuF6Tank tankuf3 = (TileEntityMachinePuF6Tank)tank3; - //tankuf3.fillState = rand.nextInt(TileEntityMachinePuF6Tank.maxFill); } world.setBlock(x + 32, y + 4, z + 7, Block2, 0, 3); world.setBlock(x + 33, y + 4, z + 7, Block22, 0, 3); diff --git a/com/hbm/world/Geyser.java b/com/hbm/world/Geyser.java index 10c28fbea..9e702f058 100755 --- a/com/hbm/world/Geyser.java +++ b/com/hbm/world/Geyser.java @@ -6,8 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/com/hbm/world/GeyserLarge.java b/com/hbm/world/GeyserLarge.java index 5fca83e42..be5d5b1c8 100755 --- a/com/hbm/world/GeyserLarge.java +++ b/com/hbm/world/GeyserLarge.java @@ -6,8 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/com/hbm/world/Meteorite.java b/com/hbm/world/Meteorite.java index 173286e29..828f4341b 100644 --- a/com/hbm/world/Meteorite.java +++ b/com/hbm/world/Meteorite.java @@ -18,10 +18,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; public class Meteorite { diff --git a/com/hbm/world/NuclearReactor.java b/com/hbm/world/NuclearReactor.java index 1f9443d51..bfc3107c7 100644 --- a/com/hbm/world/NuclearReactor.java +++ b/com/hbm/world/NuclearReactor.java @@ -7,7 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/com/hbm/world/Radio01.java b/com/hbm/world/Radio01.java index 736c2f9b5..db58ff193 100644 --- a/com/hbm/world/Radio01.java +++ b/com/hbm/world/Radio01.java @@ -5,7 +5,6 @@ package com.hbm.world; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.items.tool.ItemModDoor; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; import com.hbm.tileentity.machine.TileEntityCrateSteel; diff --git a/com/hbm/world/Relay.java b/com/hbm/world/Relay.java index c0be57378..24e66c195 100644 --- a/com/hbm/world/Relay.java +++ b/com/hbm/world/Relay.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemDoor; -import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/com/hbm/world/Spaceship.java b/com/hbm/world/Spaceship.java index 99478a174..ddb985ecf 100644 --- a/com/hbm/world/Spaceship.java +++ b/com/hbm/world/Spaceship.java @@ -44,7 +44,7 @@ public class Spaceship extends WorldGenerator { Block checkBlock = world.getBlock(x, y - 1, z); - Block blockAbove = world.getBlock(x, y , z); + world.getBlock(x, y , z); Block blockBelow = world.getBlock(x, y - 2, z); for (Block i : GetValidSpawnBlocks())