diff --git a/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java b/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java index 1aa4e19ed..ca67eee3a 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockFissureBomb.java @@ -12,7 +12,7 @@ public class BlockFissureBomb extends BlockTNTBase { @Override public void explodeEntity(World world, double x, double y, double z, EntityTNTPrimedBase entity) { - ExplosionNukeSmall.explode(world, x, y, z, ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(world, x, y, z, ExplosionNukeSmall.PARAMS_MEDIUM); int range = 5; diff --git a/src/main/java/com/hbm/blocks/bomb/CheaterVirus.java b/src/main/java/com/hbm/blocks/bomb/CheaterVirus.java index c81a16827..4995e3d08 100644 --- a/src/main/java/com/hbm/blocks/bomb/CheaterVirus.java +++ b/src/main/java/com/hbm/blocks/bomb/CheaterVirus.java @@ -5,8 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.explosion.ExplosionChaos; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/hbm/blocks/bomb/CheaterVirusSeed.java b/src/main/java/com/hbm/blocks/bomb/CheaterVirusSeed.java index 1fe495783..cfd1a75c7 100644 --- a/src/main/java/com/hbm/blocks/bomb/CheaterVirusSeed.java +++ b/src/main/java/com/hbm/blocks/bomb/CheaterVirusSeed.java @@ -4,8 +4,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/blocks/bomb/CrystalVirus.java b/src/main/java/com/hbm/blocks/bomb/CrystalVirus.java index 63a889c16..2f1522b26 100644 --- a/src/main/java/com/hbm/blocks/bomb/CrystalVirus.java +++ b/src/main/java/com/hbm/blocks/bomb/CrystalVirus.java @@ -4,8 +4,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/blocks/bomb/IDetConnectible.java b/src/main/java/com/hbm/blocks/bomb/IDetConnectible.java index 9c0a63e86..6adcd2aa2 100644 --- a/src/main/java/com/hbm/blocks/bomb/IDetConnectible.java +++ b/src/main/java/com/hbm/blocks/bomb/IDetConnectible.java @@ -2,7 +2,6 @@ package com.hbm.blocks.bomb; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public interface IDetConnectible { diff --git a/src/main/java/com/hbm/blocks/bomb/Landmine.java b/src/main/java/com/hbm/blocks/bomb/Landmine.java index e1050e32e..6d43d6106 100644 --- a/src/main/java/com/hbm/blocks/bomb/Landmine.java +++ b/src/main/java/com/hbm/blocks/bomb/Landmine.java @@ -165,7 +165,7 @@ public class Landmine extends BlockContainer implements IBomb { } if(this == ModBlocks.mine_fat) { - ExplosionNukeSmall.explode(world, x + 0.5, y + 0.5, z + 0.5, ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(world, x + 0.5, y + 0.5, z + 0.5, ExplosionNukeSmall.PARAMS_MEDIUM); } } diff --git a/src/main/java/com/hbm/blocks/bomb/NukeMike.java b/src/main/java/com/hbm/blocks/bomb/NukeMike.java index cb6d476cf..75216a1eb 100644 --- a/src/main/java/com/hbm/blocks/bomb/NukeMike.java +++ b/src/main/java/com/hbm/blocks/bomb/NukeMike.java @@ -4,8 +4,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.BombConfig; -import com.hbm.config.GeneralConfig; -import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityNukeExplosionMK5; import com.hbm.interfaces.IBomb; diff --git a/src/main/java/com/hbm/blocks/generic/BlockBobble.java b/src/main/java/com/hbm/blocks/generic/BlockBobble.java index 51c0b0e6a..df84bf616 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockBobble.java +++ b/src/main/java/com/hbm/blocks/generic/BlockBobble.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import com.hbm.inventory.gui.GUIScreenBobble; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemPlasticScrap.ScrapType; import com.hbm.main.MainRegistry; import com.hbm.tileentity.IGUIProvider; diff --git a/src/main/java/com/hbm/blocks/generic/BlockFallingRad.java b/src/main/java/com/hbm/blocks/generic/BlockFallingRad.java index 600713236..6ddb170fb 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockFallingRad.java +++ b/src/main/java/com/hbm/blocks/generic/BlockFallingRad.java @@ -10,13 +10,10 @@ import net.minecraft.world.World; public class BlockFallingRad extends BlockFalling { private float radIn = 0.0F; - private float radMax = 0.0F; - public BlockFallingRad(Material mat, float rad, float max) { super(mat); this.setTickRandomly(true); radIn = rad; - radMax = max; } @Override diff --git a/src/main/java/com/hbm/blocks/generic/BlockGeneric.java b/src/main/java/com/hbm/blocks/generic/BlockGeneric.java index 34aea6122..0b660a30c 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockGeneric.java +++ b/src/main/java/com/hbm/blocks/generic/BlockGeneric.java @@ -2,7 +2,6 @@ package com.hbm.blocks.generic; import com.hbm.blocks.BlockBase; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; public class BlockGeneric extends BlockBase { diff --git a/src/main/java/com/hbm/blocks/generic/BlockModDoor.java b/src/main/java/com/hbm/blocks/generic/BlockModDoor.java index b478ed1e0..2d003020c 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockModDoor.java +++ b/src/main/java/com/hbm/blocks/generic/BlockModDoor.java @@ -25,8 +25,6 @@ public class BlockModDoor extends Block { private IIcon[] field_150017_a; @SideOnly(Side.CLIENT) private IIcon[] field_150016_b; - private static final String __OBFID = "CL_00000230"; - public BlockModDoor(Material p_i45402_1_) { super(p_i45402_1_); float f = 0.5F; diff --git a/src/main/java/com/hbm/blocks/generic/BlockMush.java b/src/main/java/com/hbm/blocks/generic/BlockMush.java index 6f78cebd5..1651682a5 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockMush.java +++ b/src/main/java/com/hbm/blocks/generic/BlockMush.java @@ -6,7 +6,6 @@ import java.util.Set; import com.google.common.collect.Sets; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; -import com.hbm.main.MainRegistry; import com.hbm.world.feature.HugeMush; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/blocks/generic/BlockRadResistant.java b/src/main/java/com/hbm/blocks/generic/BlockRadResistant.java index ff067431e..fe34dbd05 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockRadResistant.java +++ b/src/main/java/com/hbm/blocks/generic/BlockRadResistant.java @@ -1,8 +1,6 @@ package com.hbm.blocks.generic; import com.hbm.blocks.IRadResistantBlock; -import com.hbm.handler.radiation.ChunkRadiationHandlerNT; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/blocks/generic/BlockSellafield.java b/src/main/java/com/hbm/blocks/generic/BlockSellafield.java index 1a98563e9..2f4a618c3 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockSellafield.java +++ b/src/main/java/com/hbm/blocks/generic/BlockSellafield.java @@ -11,7 +11,6 @@ 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.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java b/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java index 3964decd6..d0c8bdb22 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java +++ b/src/main/java/com/hbm/blocks/generic/BlockSnowglobe.java @@ -3,9 +3,7 @@ package com.hbm.blocks.generic; import java.util.List; import java.util.Random; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.IGUIProvider; import com.hbm.wiaj.WorldInAJar; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; @@ -14,13 +12,11 @@ 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.gui.GuiScreen; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/hbm/blocks/generic/BlockUberConcrete.java b/src/main/java/com/hbm/blocks/generic/BlockUberConcrete.java index c98ec21d2..e1179a829 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockUberConcrete.java +++ b/src/main/java/com/hbm/blocks/generic/BlockUberConcrete.java @@ -17,7 +17,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import scala.actors.threadpool.Arrays; public class BlockUberConcrete extends BlockBase { diff --git a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java index a59e6f5f7..2731b4408 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java +++ b/src/main/java/com/hbm/blocks/machine/BlockConverterRfHe.java @@ -4,9 +4,7 @@ import com.hbm.tileentity.network.TileEntityConverterRfHe; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class BlockConverterRfHe extends BlockContainer { diff --git a/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java b/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java index 385725c33..4d4564e37 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java +++ b/src/main/java/com/hbm/blocks/machine/BlockHadronCore.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; diff --git a/src/main/java/com/hbm/blocks/machine/CoreCore.java b/src/main/java/com/hbm/blocks/machine/CoreCore.java index 64cf4edac..80ab50b9d 100644 --- a/src/main/java/com/hbm/blocks/machine/CoreCore.java +++ b/src/main/java/com/hbm/blocks/machine/CoreCore.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityCore; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java b/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java index 8855b9a1e..fbd2c14d1 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockRefinery.java @@ -1,9 +1,6 @@ package com.hbm.blocks.machine; -import java.util.Random; - import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.oil.TileEntityMachineRefinery; @@ -11,8 +8,6 @@ import com.hbm.tileentity.machine.oil.TileEntityMachineRefinery; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; 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.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/com/hbm/blocks/machine/FWatzHatch.java b/src/main/java/com/hbm/blocks/machine/FWatzHatch.java index 4e9330356..5b3df59dd 100644 --- a/src/main/java/com/hbm/blocks/machine/FWatzHatch.java +++ b/src/main/java/com/hbm/blocks/machine/FWatzHatch.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.RefStrings; diff --git a/src/main/java/com/hbm/blocks/machine/FactoryHatch.java b/src/main/java/com/hbm/blocks/machine/FactoryHatch.java index 55d64c79d..b8915a4dc 100644 --- a/src/main/java/com/hbm/blocks/machine/FactoryHatch.java +++ b/src/main/java/com/hbm/blocks/machine/FactoryHatch.java @@ -1,22 +1,14 @@ package com.hbm.blocks.machine; -import java.util.Random; - import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; 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.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java b/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java index 7e36712d9..178d0dbb8 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java +++ b/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.IPersistentInfoProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; diff --git a/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java b/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java index c512187d7..92210dd35 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCMBFactory.java @@ -26,7 +26,6 @@ import net.minecraft.world.World; public class MachineCMBFactory extends BlockContainer { private final Random field_149933_a = new Random(); - private Random rand; private static boolean keepInventory; @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/blocks/machine/MachineChemplant.java b/src/main/java/com/hbm/blocks/machine/MachineChemplant.java index b446392a5..c5c7e1cca 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineChemplant.java +++ b/src/main/java/com/hbm/blocks/machine/MachineChemplant.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityMachineChemplant; diff --git a/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java b/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java index 9ddb76d2d..25ea1b062 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCrystallizer.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.TileEntityProxyInventory; diff --git a/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java b/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java index 3cbfc2c66..285f2f838 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCyclotron.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityMachineCyclotron; diff --git a/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java b/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java index 32a22e913..b51c033cf 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDeuterium.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineDeuterium; @@ -25,7 +24,6 @@ import net.minecraft.world.World; public class MachineDeuterium extends BlockContainer { private final Random field_149933_a = new Random(); - private Random rand; private static boolean keepInventory; @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java b/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java index d7e27a52f..a90699da4 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDiFurnaceRTG.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.TileEntityDiFurnace; import com.hbm.tileentity.machine.TileEntityDiFurnaceRTG; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/src/main/java/com/hbm/blocks/machine/MachineEPress.java b/src/main/java/com/hbm/blocks/machine/MachineEPress.java index 3d5bfbe79..d7d06624c 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineEPress.java +++ b/src/main/java/com/hbm/blocks/machine/MachineEPress.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineEPress; diff --git a/src/main/java/com/hbm/blocks/machine/MachineFEL.java b/src/main/java/com/hbm/blocks/machine/MachineFEL.java index 5a4f51f64..beab00ebf 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFEL.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFEL.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyEnergy; import com.hbm.tileentity.machine.TileEntityFEL; @@ -9,7 +8,6 @@ import com.hbm.tileentity.machine.TileEntityFEL; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/com/hbm/blocks/machine/MachineFENSU.java b/src/main/java/com/hbm/blocks/machine/MachineFENSU.java index 51e4154e2..e9d8facff 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFENSU.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFENSU.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ILookOverlay; import com.hbm.blocks.IPersistentInfoProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.storage.TileEntityMachineBattery; import com.hbm.tileentity.machine.storage.TileEntityMachineFENSU; diff --git a/src/main/java/com/hbm/blocks/machine/MachineForceField.java b/src/main/java/com/hbm/blocks/machine/MachineForceField.java index b90553f92..43d64e136 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineForceField.java +++ b/src/main/java/com/hbm/blocks/machine/MachineForceField.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityForceField; diff --git a/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java b/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java index 8a1244a76..5b198ed09 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFrackingTower.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; diff --git a/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java b/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java index d9d489457..4fd9166b4 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java +++ b/src/main/java/com/hbm/blocks/machine/MachineGasFlare.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ITooltipProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.oil.TileEntityMachineGasFlare; diff --git a/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java b/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java index b1e5a425f..8c00aeffb 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java +++ b/src/main/java/com/hbm/blocks/machine/MachineIGenerator.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityMachineIGenerator; diff --git a/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java b/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java index 805f6183a..16160ff3a 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java +++ b/src/main/java/com/hbm/blocks/machine/MachineKeyForge.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineKeyForge; @@ -25,7 +24,6 @@ import net.minecraft.world.World; public class MachineKeyForge extends BlockContainer { private final Random field_149933_a = new Random(); - private Random rand; private static boolean keepInventory; @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java b/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java index 75b8a26a4..8150f91e6 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java +++ b/src/main/java/com/hbm/blocks/machine/MachineLargeTurbine.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ITooltipProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityMachineLargeTurbine; diff --git a/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java b/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java index 99e49f8de..c148d4918 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java +++ b/src/main/java/com/hbm/blocks/machine/MachineMicrowave.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.machine.TileEntityMicrowave; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java b/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java index f241392a4..ada5bff34 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java +++ b/src/main/java/com/hbm/blocks/machine/MachineMiningLaser.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ITooltipProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.TileEntityProxyEnergy; diff --git a/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java b/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java index 1f4d1b9d6..ef271e773 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java +++ b/src/main/java/com/hbm/blocks/machine/MachineMissileAssembly.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; diff --git a/src/main/java/com/hbm/blocks/machine/MachineOilWell.java b/src/main/java/com/hbm/blocks/machine/MachineOilWell.java index 03000400a..6e0e85968 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineOilWell.java +++ b/src/main/java/com/hbm/blocks/machine/MachineOilWell.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.oil.TileEntityMachineOilWell; diff --git a/src/main/java/com/hbm/blocks/machine/MachineOrbus.java b/src/main/java/com/hbm/blocks/machine/MachineOrbus.java index 0daff7a76..b1ddbb028 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineOrbus.java +++ b/src/main/java/com/hbm/blocks/machine/MachineOrbus.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.IPersistentInfoProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.main.MainRegistry; diff --git a/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java b/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java index 908ab1514..311995331 100644 --- a/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java +++ b/src/main/java/com/hbm/blocks/machine/MachinePumpjack.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadGen.java b/src/main/java/com/hbm/blocks/machine/MachineRadGen.java index b61b130c3..c434b5886 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadGen.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadGen.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityMachineRadGen; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadar.java b/src/main/java/com/hbm/blocks/machine/MachineRadar.java index e5ed1f5f8..9a7ccb8f6 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadar.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadar.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; import com.hbm.config.WeaponConfig; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineRadar; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java index 70155f788..304b202c9 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRadiolysis.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; diff --git a/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java b/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java index 5958f2b86..bde522787 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java +++ b/src/main/java/com/hbm/blocks/machine/MachineReactorBreeding.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyInventory; import com.hbm.tileentity.machine.TileEntityMachineReactorBreeding; diff --git a/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java b/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java index b29cdc7c5..7899a85d3 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java +++ b/src/main/java/com/hbm/blocks/machine/MachineReactorControl.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityReactorControl; diff --git a/src/main/java/com/hbm/blocks/machine/MachineRefinery.java b/src/main/java/com/hbm/blocks/machine/MachineRefinery.java index 8cb272b62..4b61f0e86 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineRefinery.java +++ b/src/main/java/com/hbm/blocks/machine/MachineRefinery.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ILookOverlay; import com.hbm.blocks.IPersistentInfoProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityBombletZeta; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.tank.FluidTank; diff --git a/src/main/java/com/hbm/blocks/machine/MachineReiXMainframe.java b/src/main/java/com/hbm/blocks/machine/MachineReiXMainframe.java index 55599ac9c..5a0defe5b 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineReiXMainframe.java +++ b/src/main/java/com/hbm/blocks/machine/MachineReiXMainframe.java @@ -2,33 +2,19 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; 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.EntityLivingBase; -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.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class MachineReiXMainframe extends BlockContainer { private final Random field_149933_a = new Random(); - private Random rand; - @SideOnly(Side.CLIENT) private IIcon iconTop; private IIcon iconBottom; diff --git a/src/main/java/com/hbm/blocks/machine/MachineSILEX.java b/src/main/java/com/hbm/blocks/machine/MachineSILEX.java index adfac31a2..1a40ae4b3 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSILEX.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSILEX.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntitySILEX; diff --git a/src/main/java/com/hbm/blocks/machine/MachineSatDock.java b/src/main/java/com/hbm/blocks/machine/MachineSatDock.java index af1cbefc4..c8773ac60 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSatDock.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSatDock.java @@ -26,8 +26,6 @@ import net.minecraft.world.World; public class MachineSatDock extends BlockContainer implements IMultiblock { private final Random field_149933_a = new Random(); - private Random rand; - public MachineSatDock(Material p_i45386_1_) { super(p_i45386_1_); } diff --git a/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java b/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java index 62eb931c6..4a24450b0 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSatLinker.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineSatLinker; @@ -26,7 +25,6 @@ import net.minecraft.world.World; public class MachineSatLinker extends BlockContainer { private final Random field_149933_a = new Random(); - private Random rand; private static boolean keepInventory; @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java b/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java index 50b26e53c..d1d598932 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSeleniumEngine.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ITooltipProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.inventory.fluid.trait.FT_Combustible.FuelGrade; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; diff --git a/src/main/java/com/hbm/blocks/machine/MachineShredder.java b/src/main/java/com/hbm/blocks/machine/MachineShredder.java index 10eb959aa..5c061351b 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineShredder.java +++ b/src/main/java/com/hbm/blocks/machine/MachineShredder.java @@ -26,7 +26,6 @@ import net.minecraft.world.World; public class MachineShredder extends BlockContainer { private final Random field_149933_a = new Random(); - private Random rand; private static boolean keepInventory; @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/blocks/machine/MachineSiren.java b/src/main/java/com/hbm/blocks/machine/MachineSiren.java index 8cecae509..ede6b32f6 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSiren.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSiren.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineSiren; diff --git a/src/main/java/com/hbm/blocks/machine/MachineTurbine.java b/src/main/java/com/hbm/blocks/machine/MachineTurbine.java index 9c9637891..5e52baad6 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineTurbine.java +++ b/src/main/java/com/hbm/blocks/machine/MachineTurbine.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ITooltipProvider; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineTurbine; diff --git a/src/main/java/com/hbm/blocks/machine/ReactorHatch.java b/src/main/java/com/hbm/blocks/machine/ReactorHatch.java index b951d3a9c..3f14c0e4e 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorHatch.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorHatch.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.RefStrings; diff --git a/src/main/java/com/hbm/blocks/machine/ReactorResearch.java b/src/main/java/com/hbm/blocks/machine/ReactorResearch.java index e41db09fc..db9cee1e1 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorResearch.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorResearch.java @@ -3,11 +3,7 @@ package com.hbm.blocks.machine; import java.util.Random; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; -import com.hbm.handler.MultiblockHandler; -import com.hbm.handler.MultiblockHandlerXR; -import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityReactorResearch; @@ -15,16 +11,8 @@ import com.hbm.tileentity.machine.TileEntityReactorResearch; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; 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.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; 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.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java index bde22278a..409925e53 100644 --- a/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java +++ b/src/main/java/com/hbm/blocks/machine/ReactorZirnox.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.main.MainRegistry; diff --git a/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java b/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java index 86a2f7a35..3bee65cf6 100644 --- a/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java +++ b/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.storage.TileEntitySoyuzCapsule; diff --git a/src/main/java/com/hbm/blocks/machine/WasteDrum.java b/src/main/java/com/hbm/blocks/machine/WasteDrum.java index 84d1190a5..2f6287c08 100644 --- a/src/main/java/com/hbm/blocks/machine/WasteDrum.java +++ b/src/main/java/com/hbm/blocks/machine/WasteDrum.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityWasteDrum; diff --git a/src/main/java/com/hbm/blocks/machine/WatzHatch.java b/src/main/java/com/hbm/blocks/machine/WatzHatch.java index e38795122..157a02036 100644 --- a/src/main/java/com/hbm/blocks/machine/WatzHatch.java +++ b/src/main/java/com/hbm/blocks/machine/WatzHatch.java @@ -2,7 +2,6 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.lib.RefStrings; diff --git a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledTE.java b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledTE.java index d43f6d86c..5aff70327 100644 --- a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledTE.java +++ b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledTE.java @@ -2,8 +2,6 @@ package com.hbm.blocks.machine.pile; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; public abstract class BlockGraphiteDrilledTE extends BlockGraphiteDrilledBase implements ITileEntityProvider { diff --git a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteFuel.java b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteFuel.java index cf3b61c80..d3b768d6c 100644 --- a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteFuel.java +++ b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteFuel.java @@ -1,7 +1,5 @@ package com.hbm.blocks.machine.pile; -import java.util.ArrayList; - import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java index 07a62af98..cb8d0c048 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKBoiler.java @@ -1,14 +1,11 @@ package com.hbm.blocks.machine.rbmk; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.TileEntityProxyCombo; -import com.hbm.tileentity.machine.rbmk.RBMKDials; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBoiler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class RBMKBoiler extends RBMKBase { diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java index 9ed9caaa0..723ecff52 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKConsole.java @@ -1,7 +1,6 @@ package com.hbm.blocks.machine.rbmk; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java index 1be934637..c01ff59e9 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControl.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine.rbmk; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlManual; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java index 9765e12c6..3ca461556 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKControlAuto.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine.rbmk; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControlAuto; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java index 13e3c9bf2..17e6087d7 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutgasser.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine.rbmk; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKOutgasser; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java index 794285b8b..de5ef940d 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine.rbmk; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; import com.hbm.tileentity.TileEntityProxyInventory; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKRod; diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java index 69ddb6521..4226a9724 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKStorage.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine.rbmk; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.BossSpawnHandler; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKStorage; diff --git a/src/main/java/com/hbm/blocks/network/PylonRedWire.java b/src/main/java/com/hbm/blocks/network/PylonRedWire.java index fbf88259f..79a44f541 100644 --- a/src/main/java/com/hbm/blocks/network/PylonRedWire.java +++ b/src/main/java/com/hbm/blocks/network/PylonRedWire.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.tileentity.network.TileEntityPylon; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/blocks/siege/SiegeBase.java b/src/main/java/com/hbm/blocks/siege/SiegeBase.java index fbab5ef47..6a4d4fa23 100644 --- a/src/main/java/com/hbm/blocks/siege/SiegeBase.java +++ b/src/main/java/com/hbm/blocks/siege/SiegeBase.java @@ -1,7 +1,5 @@ package com.hbm.blocks.siege; -import java.util.Random; - import com.hbm.blocks.BlockBase; import com.hbm.blocks.ModBlocks; diff --git a/src/main/java/com/hbm/blocks/test/TestBombAdvanced.java b/src/main/java/com/hbm/blocks/test/TestBombAdvanced.java index e49b4dcd2..2be4012a6 100644 --- a/src/main/java/com/hbm/blocks/test/TestBombAdvanced.java +++ b/src/main/java/com/hbm/blocks/test/TestBombAdvanced.java @@ -1,9 +1,7 @@ package com.hbm.blocks.test; -import com.hbm.entity.logic.EntityNukeExplosionMK5; import com.hbm.entity.logic.EntityNukeExplosionNT; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntityTestBombAdvanced; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/blocks/test/TestEventTester.java b/src/main/java/com/hbm/blocks/test/TestEventTester.java index 04e66efa2..3491b2fb1 100644 --- a/src/main/java/com/hbm/blocks/test/TestEventTester.java +++ b/src/main/java/com/hbm/blocks/test/TestEventTester.java @@ -4,10 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Random; -import java.util.Map.Entry; - -import com.hbm.blocks.ModBlocks; -import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.main.MainRegistry; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; @@ -20,9 +16,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; public class TestEventTester extends Block { diff --git a/src/main/java/com/hbm/blocks/test/TestNuke.java b/src/main/java/com/hbm/blocks/test/TestNuke.java index ddacaef88..f04e8d4b6 100644 --- a/src/main/java/com/hbm/blocks/test/TestNuke.java +++ b/src/main/java/com/hbm/blocks/test/TestNuke.java @@ -37,9 +37,7 @@ public class TestNuke extends BlockContainer { private final Random field_149933_a = new Random(); private static boolean keepInventory = false; private Map field_77288_k = new HashMap(); - private boolean isExploding = false; - - public TestNuke(Material p_i45386_1_) { + public TestNuke(Material p_i45386_1_) { super(p_i45386_1_); } diff --git a/src/main/java/com/hbm/blocks/turret/TurretBrandon.java b/src/main/java/com/hbm/blocks/turret/TurretBrandon.java index 012547a80..abd60db0a 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretBrandon.java +++ b/src/main/java/com/hbm/blocks/turret/TurretBrandon.java @@ -1,6 +1,5 @@ package com.hbm.blocks.turret; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretBrandon; diff --git a/src/main/java/com/hbm/blocks/turret/TurretChekhov.java b/src/main/java/com/hbm/blocks/turret/TurretChekhov.java index 311891950..d04fa2532 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretChekhov.java +++ b/src/main/java/com/hbm/blocks/turret/TurretChekhov.java @@ -1,7 +1,6 @@ package com.hbm.blocks.turret; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretChekhov; diff --git a/src/main/java/com/hbm/blocks/turret/TurretFriendly.java b/src/main/java/com/hbm/blocks/turret/TurretFriendly.java index 380c621ff..655f9814e 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretFriendly.java +++ b/src/main/java/com/hbm/blocks/turret/TurretFriendly.java @@ -1,7 +1,6 @@ package com.hbm.blocks.turret; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretFriendly; diff --git a/src/main/java/com/hbm/blocks/turret/TurretFritz.java b/src/main/java/com/hbm/blocks/turret/TurretFritz.java index 8d9f78170..b43858658 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretFritz.java +++ b/src/main/java/com/hbm/blocks/turret/TurretFritz.java @@ -1,6 +1,5 @@ package com.hbm.blocks.turret; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretFritz; diff --git a/src/main/java/com/hbm/blocks/turret/TurretHoward.java b/src/main/java/com/hbm/blocks/turret/TurretHoward.java index 0a6f9ff5a..155364774 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretHoward.java +++ b/src/main/java/com/hbm/blocks/turret/TurretHoward.java @@ -1,7 +1,6 @@ package com.hbm.blocks.turret; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretHoward; diff --git a/src/main/java/com/hbm/blocks/turret/TurretJeremy.java b/src/main/java/com/hbm/blocks/turret/TurretJeremy.java index 48abc022d..051b6037f 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretJeremy.java +++ b/src/main/java/com/hbm/blocks/turret/TurretJeremy.java @@ -1,7 +1,6 @@ package com.hbm.blocks.turret; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretJeremy; diff --git a/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java b/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java index 593ba41b3..f3026cf58 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java +++ b/src/main/java/com/hbm/blocks/turret/TurretMaxwell.java @@ -1,6 +1,5 @@ package com.hbm.blocks.turret; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretMaxwell; diff --git a/src/main/java/com/hbm/blocks/turret/TurretRichard.java b/src/main/java/com/hbm/blocks/turret/TurretRichard.java index 84ac8e99c..f05c52385 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretRichard.java +++ b/src/main/java/com/hbm/blocks/turret/TurretRichard.java @@ -1,7 +1,6 @@ package com.hbm.blocks.turret; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretRichard; diff --git a/src/main/java/com/hbm/blocks/turret/TurretTauon.java b/src/main/java/com/hbm/blocks/turret/TurretTauon.java index d5039ca91..5a8d044a2 100644 --- a/src/main/java/com/hbm/blocks/turret/TurretTauon.java +++ b/src/main/java/com/hbm/blocks/turret/TurretTauon.java @@ -1,7 +1,6 @@ package com.hbm.blocks.turret; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.turret.TileEntityTurretTauon; diff --git a/src/main/java/com/hbm/crafting/RodRecipes.java b/src/main/java/com/hbm/crafting/RodRecipes.java index df96051fd..7860157e9 100644 --- a/src/main/java/com/hbm/crafting/RodRecipes.java +++ b/src/main/java/com/hbm/crafting/RodRecipes.java @@ -7,7 +7,6 @@ import com.hbm.items.machine.ItemZirnoxRod.EnumZirnoxType; import com.hbm.main.CraftingManager; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; diff --git a/src/main/java/com/hbm/entity/EntityMappings.java b/src/main/java/com/hbm/entity/EntityMappings.java index 2ffa58ae4..e9a261459 100644 --- a/src/main/java/com/hbm/entity/EntityMappings.java +++ b/src/main/java/com/hbm/entity/EntityMappings.java @@ -76,7 +76,6 @@ public class EntityMappings { addEntity(EntityGrenadeMk2.class, "entity_grenade_mk2", 500); addEntity(EntityGrenadeZOMG.class, "entity_grenade_zomg", 500); addEntity(EntityGrenadeASchrab.class, "entity_grenade_aschrab", 500); - addEntity(EntityNukeCloudNoShroom.class, "entity_nuke_cloud_no", 1000); addEntity(EntityFalloutRain.class, "entity_fallout", 1000); addEntity(EntityDischarge.class, "entity_emp_discharge", 500); addEntity(EntityEMPBlast.class, "entity_emp_blast", 1000); diff --git a/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java b/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java index e02824c6f..3ce773740 100644 --- a/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java +++ b/src/main/java/com/hbm/entity/cart/EntityMinecartCrate.java @@ -5,7 +5,6 @@ import java.io.IOException; import com.hbm.blocks.ModBlocks; import com.hbm.inventory.container.ContainerCrateSteel; import com.hbm.inventory.gui.GUICrateSteel; -import com.hbm.items.ModItems; import com.hbm.items.tool.ItemModMinecart; import com.hbm.items.tool.ItemModMinecart.EnumCartBase; import com.hbm.items.tool.ItemModMinecart.EnumMinecart; diff --git a/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java b/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java index c8aa8f245..7d11fc8e4 100644 --- a/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java +++ b/src/main/java/com/hbm/entity/cart/EntityMinecartDestroyer.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.inventory.container.ContainerCartDestroyer; import com.hbm.inventory.gui.GUICartDestroyer; -import com.hbm.items.ModItems; import com.hbm.items.tool.ItemModMinecart; import com.hbm.items.tool.ItemModMinecart.EnumCartBase; import com.hbm.items.tool.ItemModMinecart.EnumMinecart; diff --git a/src/main/java/com/hbm/entity/effect/EntityNukeCloudNoShroom.java b/src/main/java/com/hbm/entity/effect/EntityNukeCloudNoShroom.java deleted file mode 100644 index 03a70b810..000000000 --- a/src/main/java/com/hbm/entity/effect/EntityNukeCloudNoShroom.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hbm.entity.effect; - -import net.minecraft.world.World; - -public class EntityNukeCloudNoShroom extends EntityNukeCloudSmall { - - public EntityNukeCloudNoShroom(World p_i1582_1_) { - super(p_i1582_1_); - } - - public EntityNukeCloudNoShroom(World p_i1582_1_, int maxAge) { - super(p_i1582_1_, maxAge, 1.0F); - } - -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java index 7b3a25e7d..4a5229ca4 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java @@ -9,8 +9,6 @@ import com.hbm.items.weapon.ItemGrenade; public class EntityGrenadeBlackHole extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; - public EntityGrenadeBlackHole(World p_i1773_1_) { super(p_i1773_1_); diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java index c1f11293d..bfe9085f6 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java @@ -9,8 +9,6 @@ import com.hbm.items.weapon.ItemGrenade; public class EntityGrenadeCluster extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; - public EntityGrenadeCluster(World p_i1773_1_) { super(p_i1773_1_); diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java index 201983773..b2a8e44d1 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java @@ -9,8 +9,6 @@ import net.minecraft.world.World; public class EntityGrenadeElectric extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; - public EntityGrenadeElectric(World p_i1773_1_) { super(p_i1773_1_); diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java index cbd525028..5d3cd267c 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java @@ -10,7 +10,6 @@ import com.hbm.items.weapon.ItemGrenade; public class EntityGrenadeFire extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; public Entity shooter; public EntityGrenadeFire(World p_i1773_1_) diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java index 05aff7ad5..8acc150d5 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; public class EntityGrenadeFlare extends EntityThrowable { - private static final String __OBFID = "CL_00001722"; public Entity shooter; public EntityGrenadeFlare(World p_i1773_1_) diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java index afcfb8d80..9dc1248a1 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java @@ -10,7 +10,6 @@ import com.hbm.items.weapon.ItemGrenade; public class EntityGrenadeFrag extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; public Entity shooter; public EntityGrenadeFrag(World p_i1773_1_) diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java index fadaf343e..5526b87a0 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java @@ -10,7 +10,6 @@ import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGrenade; public class EntityGrenadeGas extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; Random rand = new Random(); public EntityGrenadeGas(World p_i1773_1_) { diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java index 290fc4a96..6afb56a1f 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java @@ -5,8 +5,6 @@ import net.minecraft.world.World; public class EntityGrenadeGeneric extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; - public EntityGrenadeGeneric(World p_i1773_1_) { super(p_i1773_1_); diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java index 0440d5b64..ef8ec0f99 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java @@ -9,8 +9,6 @@ import net.minecraft.world.World; public class EntityGrenadeLemon extends EntityGrenadeBouncyBase { - private static final String __OBFID = "CL_00001722"; - public EntityGrenadeLemon(World p_i1773_1_) { super(p_i1773_1_); diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java index 18381e742..0f8cca46a 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java @@ -27,7 +27,7 @@ public class EntityGrenadeNuclear extends EntityGrenadeBouncyBase { if(!this.worldObj.isRemote) { this.setDead(); - ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.tots); + ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.PARAMS_TOTS); } } diff --git a/src/main/java/com/hbm/entity/item/EntityMinecartModBase.java b/src/main/java/com/hbm/entity/item/EntityMinecartModBase.java index edc020f52..c4c7b5cd0 100644 --- a/src/main/java/com/hbm/entity/item/EntityMinecartModBase.java +++ b/src/main/java/com/hbm/entity/item/EntityMinecartModBase.java @@ -56,8 +56,6 @@ public abstract class EntityMinecartModBase extends EntityMinecart private double velocityY; @SideOnly(Side.CLIENT) private double velocityZ; - private static final String __OBFID = "CL_00001670"; - /* Forge: Minecart Compatibility Layer Integration. */ public static float defaultMaxSpeedAirLateral = 0.4f; public static float defaultMaxSpeedAirVertical = -1f; diff --git a/src/main/java/com/hbm/entity/item/EntityMinecartTest.java b/src/main/java/com/hbm/entity/item/EntityMinecartTest.java index 924c9c3c1..d4eaa7d99 100644 --- a/src/main/java/com/hbm/entity/item/EntityMinecartTest.java +++ b/src/main/java/com/hbm/entity/item/EntityMinecartTest.java @@ -16,8 +16,6 @@ import net.minecraft.world.World; public class EntityMinecartTest extends EntityMinecartModBase { private int minecartTNTFuse = -1; - private static final String __OBFID = "CL_00001680"; - public EntityMinecartTest(World p_i1727_1_) { super(p_i1727_1_); diff --git a/src/main/java/com/hbm/entity/missile/EntityCarrier.java b/src/main/java/com/hbm/entity/missile/EntityCarrier.java index bb6ad4eae..89ec901d8 100644 --- a/src/main/java/com/hbm/entity/missile/EntityCarrier.java +++ b/src/main/java/com/hbm/entity/missile/EntityCarrier.java @@ -3,7 +3,6 @@ package com.hbm.entity.missile; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ISatChip; import com.hbm.items.ModItems; -import com.hbm.items.machine.ItemSatChip; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileMicro.java b/src/main/java/com/hbm/entity/missile/EntityMissileMicro.java index cc0418aa5..a85d7a980 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileMicro.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileMicro.java @@ -23,8 +23,7 @@ public class EntityMissileMicro extends EntityMissileBaseAdvanced { @Override public void onImpact() { if(!this.worldObj.isRemote) { - - ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.high); + ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.PARAMS_HIGH); } } diff --git a/src/main/java/com/hbm/entity/mob/EntityBurrowingSwingingBase.java b/src/main/java/com/hbm/entity/mob/EntityBurrowingSwingingBase.java index eff3ae1a5..f366c54cb 100644 --- a/src/main/java/com/hbm/entity/mob/EntityBurrowingSwingingBase.java +++ b/src/main/java/com/hbm/entity/mob/EntityBurrowingSwingingBase.java @@ -3,10 +3,6 @@ package com.hbm.entity.mob; import java.util.List; import com.hbm.entity.mob.ai.EntityAINearestAttackableTargetNT; -import com.hbm.packet.AuxParticlePacketNT; -import com.hbm.packet.PacketDispatcher; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IEntityLivingData; diff --git a/src/main/java/com/hbm/entity/mob/EntityFBI.java b/src/main/java/com/hbm/entity/mob/EntityFBI.java index f0ec89070..df1ed0755 100644 --- a/src/main/java/com/hbm/entity/mob/EntityFBI.java +++ b/src/main/java/com/hbm/entity/mob/EntityFBI.java @@ -13,7 +13,6 @@ import com.hbm.items.ModItems; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.IRangedAttackMob; import net.minecraft.entity.SharedMonsterAttributes; @@ -32,7 +31,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; diff --git a/src/main/java/com/hbm/entity/mob/EntityHunterChopper.java b/src/main/java/com/hbm/entity/mob/EntityHunterChopper.java index c6b8ee6dc..42d2856ee 100644 --- a/src/main/java/com/hbm/entity/mob/EntityHunterChopper.java +++ b/src/main/java/com/hbm/entity/mob/EntityHunterChopper.java @@ -1,13 +1,10 @@ package com.hbm.entity.mob; -import com.hbm.config.GeneralConfig; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityChopperMine; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java b/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java index 89c569ab2..fa5f8b85b 100644 --- a/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java +++ b/src/main/java/com/hbm/entity/mob/EntityNuclearCreeper.java @@ -325,9 +325,9 @@ public class EntityNuclearCreeper extends EntityMob { } else { if(flag) { - ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.PARAMS_MEDIUM); } else { - ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.safe); + ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.PARAMS_SAFE); } } diff --git a/src/main/java/com/hbm/entity/mob/EntityUFO.java b/src/main/java/com/hbm/entity/mob/EntityUFO.java index 2a165fbe9..95e03d499 100644 --- a/src/main/java/com/hbm/entity/mob/EntityUFO.java +++ b/src/main/java/com/hbm/entity/mob/EntityUFO.java @@ -300,7 +300,7 @@ public class EntityUFO extends EntityFlying implements IMob, IBossDisplayData, I if(this.deathTime == 19 && !worldObj.isRemote) { worldObj.newExplosion(this, posX, posY, posZ, 10F, true, true); - ExplosionNukeSmall.explode(worldObj, posX, posY, posZ, ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(worldObj, posX, posY, posZ, ExplosionNukeSmall.PARAMS_MEDIUM); List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, this.boundingBox.expand(200, 200, 200)); diff --git a/src/main/java/com/hbm/entity/mob/ai/EntityAINuclearCreeperSwell.java b/src/main/java/com/hbm/entity/mob/ai/EntityAINuclearCreeperSwell.java index 99a746cd7..665d9dd88 100644 --- a/src/main/java/com/hbm/entity/mob/ai/EntityAINuclearCreeperSwell.java +++ b/src/main/java/com/hbm/entity/mob/ai/EntityAINuclearCreeperSwell.java @@ -10,8 +10,6 @@ public class EntityAINuclearCreeperSwell extends EntityAIBase { EntityNuclearCreeper swellingCreeper; /** The creeper's attack target. This is used for the changing of the creeper's state. */ EntityLivingBase creeperAttackTarget; - private static final String __OBFID = "CL_00001614"; - public EntityAINuclearCreeperSwell(EntityNuclearCreeper p_i1655_1_) { this.swellingCreeper = p_i1655_1_; diff --git a/src/main/java/com/hbm/entity/mob/ai/EntityAITaintedCreeperSwell.java b/src/main/java/com/hbm/entity/mob/ai/EntityAITaintedCreeperSwell.java index b53fda9c2..44c749cbe 100644 --- a/src/main/java/com/hbm/entity/mob/ai/EntityAITaintedCreeperSwell.java +++ b/src/main/java/com/hbm/entity/mob/ai/EntityAITaintedCreeperSwell.java @@ -10,8 +10,6 @@ public class EntityAITaintedCreeperSwell extends EntityAIBase { EntityTaintedCreeper swellingCreeper; /** The creeper's attack target. This is used for the changing of the creeper's state. */ EntityLivingBase creeperAttackTarget; - private static final String __OBFID = "CL_00001614"; - public EntityAITaintedCreeperSwell(EntityTaintedCreeper p_i1655_1_) { this.swellingCreeper = p_i1655_1_; diff --git a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeCraft.java b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeCraft.java index 17ae827df..aba873b3b 100644 --- a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeCraft.java +++ b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeCraft.java @@ -4,11 +4,8 @@ import java.util.List; import com.hbm.entity.mob.EntityUFOBase; import com.hbm.entity.projectile.EntitySiegeLaser; -import com.hbm.explosion.ExplosionNukeSmall; import com.hbm.handler.SiegeOrchestrator; -import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import com.hbm.util.ContaminationUtil; diff --git a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeUFO.java b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeUFO.java index 2377864e3..30670edc8 100644 --- a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeUFO.java +++ b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeUFO.java @@ -3,8 +3,6 @@ package com.hbm.entity.mob.siege; import com.hbm.entity.mob.EntityUFOBase; import com.hbm.entity.projectile.EntitySiegeLaser; import com.hbm.handler.SiegeOrchestrator; -import com.hbm.items.ModItems; - import api.hbm.entity.IRadiationImmune; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeZombie.java b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeZombie.java index 86d16fe02..49dac097b 100644 --- a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeZombie.java +++ b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeZombie.java @@ -1,8 +1,6 @@ package com.hbm.entity.mob.siege; import com.hbm.handler.SiegeOrchestrator; -import com.hbm.items.ModItems; - import api.hbm.entity.IRadiationImmune; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/com/hbm/entity/particle/EntityBSmokeFX.java b/src/main/java/com/hbm/entity/particle/EntityBSmokeFX.java index 372af265d..ebbed1d98 100644 --- a/src/main/java/com/hbm/entity/particle/EntityBSmokeFX.java +++ b/src/main/java/com/hbm/entity/particle/EntityBSmokeFX.java @@ -6,8 +6,6 @@ import net.minecraft.world.World; public class EntityBSmokeFX extends EntityModFX { - private static final String __OBFID = "CL_00000924"; - public EntityBSmokeFX(World world) { super(world, 0, 0, 0); } diff --git a/src/main/java/com/hbm/entity/particle/EntityDSmokeFX.java b/src/main/java/com/hbm/entity/particle/EntityDSmokeFX.java index 47b61d63d..64889f204 100644 --- a/src/main/java/com/hbm/entity/particle/EntityDSmokeFX.java +++ b/src/main/java/com/hbm/entity/particle/EntityDSmokeFX.java @@ -3,8 +3,6 @@ package com.hbm.entity.particle; import net.minecraft.world.World; public class EntityDSmokeFX extends EntityModFX { - private static final String __OBFID = "CL_00000924"; - public EntityDSmokeFX(World world) { super(world, 0, 0, 0); } diff --git a/src/main/java/com/hbm/entity/particle/EntityGasFX.java b/src/main/java/com/hbm/entity/particle/EntityGasFX.java index c4431895d..c34d1df66 100644 --- a/src/main/java/com/hbm/entity/particle/EntityGasFX.java +++ b/src/main/java/com/hbm/entity/particle/EntityGasFX.java @@ -7,8 +7,6 @@ public class EntityGasFX extends EntityModFX float smokeParticleScale; public int particleAge; public int maxAge; - private static final String __OBFID = "CL_00000924"; - public EntityGasFX(World world) { super(world, 0, 0, 0); } diff --git a/src/main/java/com/hbm/entity/particle/EntityOilSpillFX.java b/src/main/java/com/hbm/entity/particle/EntityOilSpillFX.java index eae4419dd..249e16e14 100644 --- a/src/main/java/com/hbm/entity/particle/EntityOilSpillFX.java +++ b/src/main/java/com/hbm/entity/particle/EntityOilSpillFX.java @@ -7,8 +7,6 @@ public class EntityOilSpillFX extends EntityModFX float smokeParticleScale; public int particleAge; public int maxAge; - private static final String __OBFID = "CL_00000924"; - public EntityOilSpillFX(World world) { super(world, 0, 0, 0); } diff --git a/src/main/java/com/hbm/entity/particle/EntitySSmokeFX.java b/src/main/java/com/hbm/entity/particle/EntitySSmokeFX.java index ae4eedf61..699821ba1 100644 --- a/src/main/java/com/hbm/entity/particle/EntitySSmokeFX.java +++ b/src/main/java/com/hbm/entity/particle/EntitySSmokeFX.java @@ -6,8 +6,6 @@ import net.minecraft.world.World; public class EntitySSmokeFX extends EntityModFX { - private static final String __OBFID = "CL_00000924"; - public EntitySSmokeFX(World world) { super(world, 0, 0, 0); } diff --git a/src/main/java/com/hbm/entity/particle/EntitySmokeFX.java b/src/main/java/com/hbm/entity/particle/EntitySmokeFX.java index 8ec8d32e9..8281443d9 100644 --- a/src/main/java/com/hbm/entity/particle/EntitySmokeFX.java +++ b/src/main/java/com/hbm/entity/particle/EntitySmokeFX.java @@ -6,8 +6,6 @@ import net.minecraft.world.World; public class EntitySmokeFX extends EntityModFX { - private static final String __OBFID = "CL_00000924"; - public EntitySmokeFX(World world) { super(world, 0, 0, 0); } diff --git a/src/main/java/com/hbm/entity/particle/EntityTSmokeFX.java b/src/main/java/com/hbm/entity/particle/EntityTSmokeFX.java index e0c5cc87d..e5723cf0c 100644 --- a/src/main/java/com/hbm/entity/particle/EntityTSmokeFX.java +++ b/src/main/java/com/hbm/entity/particle/EntityTSmokeFX.java @@ -4,8 +4,6 @@ import net.minecraft.world.World; public class EntityTSmokeFX extends EntityModFX { - private static final String __OBFID = "CL_00000924"; - public EntityTSmokeFX(World world) { super(world, 0, 0, 0); } diff --git a/src/main/java/com/hbm/entity/projectile/EntityChopperMine.java b/src/main/java/com/hbm/entity/projectile/EntityChopperMine.java index ca43d6c3d..20594e945 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityChopperMine.java +++ b/src/main/java/com/hbm/entity/projectile/EntityChopperMine.java @@ -16,11 +16,6 @@ public class EntityChopperMine extends Entity implements IProjectile { public int timer = 0; public Entity shooter; - private int field_145791_d = -1; - private int field_145792_e = -1; - private int field_145789_f = -1; - private boolean inGround; - public EntityChopperMine(World p_i1582_1_) { super(p_i1582_1_); } diff --git a/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java b/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java index 6ed531ce3..fe59e30f2 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java +++ b/src/main/java/com/hbm/entity/projectile/EntityCombineBall.java @@ -5,7 +5,6 @@ import cpw.mods.fml.relauncher.SideOnly; import java.util.List; -import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import net.minecraft.block.Block; @@ -17,7 +16,6 @@ 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.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -47,9 +45,6 @@ public class EntityCombineBall extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityCombineBall(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityDischarge.java b/src/main/java/com/hbm/entity/projectile/EntityDischarge.java index 0c889a8c3..59b11bc82 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityDischarge.java +++ b/src/main/java/com/hbm/entity/projectile/EntityDischarge.java @@ -7,7 +7,6 @@ import java.util.List; import com.hbm.entity.effect.EntityEMPBlast; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import net.minecraft.block.Block; @@ -19,7 +18,6 @@ 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.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -49,9 +47,6 @@ public class EntityDischarge extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityDischarge(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityExplosiveBeam.java b/src/main/java/com/hbm/entity/projectile/EntityExplosiveBeam.java index 3e3f95d9d..67c0f73a4 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityExplosiveBeam.java +++ b/src/main/java/com/hbm/entity/projectile/EntityExplosiveBeam.java @@ -2,7 +2,6 @@ package com.hbm.entity.projectile; import java.util.List; -import com.hbm.config.BombConfig; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.grenade.EntityGrenadeZOMG; import com.hbm.entity.logic.EntityNukeExplosionMK3; @@ -40,11 +39,6 @@ public class EntityExplosiveBeam extends Entity implements IProjectile private int ticksInGround; private int ticksInAir; private double damage = 2.0D; - /** The amount of knockback an arrow applies when it hits a mob. */ - private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityExplosiveBeam(World p_i1753_1_) { super(p_i1753_1_); @@ -429,7 +423,6 @@ public class EntityExplosiveBeam extends Entity implements IProjectile */ public void setKnockbackStrength(int p_70240_1_) { - this.knockbackStrength = p_70240_1_; } /** diff --git a/src/main/java/com/hbm/entity/projectile/EntityFire.java b/src/main/java/com/hbm/entity/projectile/EntityFire.java index a0d6ad316..535c82346 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityFire.java +++ b/src/main/java/com/hbm/entity/projectile/EntityFire.java @@ -6,7 +6,6 @@ import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import net.minecraft.block.Block; @@ -18,7 +17,6 @@ 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.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -49,9 +47,6 @@ public class EntityFire extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityFire(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityLN2.java b/src/main/java/com/hbm/entity/projectile/EntityLN2.java index 56d283091..a1e64cccc 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityLN2.java +++ b/src/main/java/com/hbm/entity/projectile/EntityLN2.java @@ -3,7 +3,6 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.explosion.ExplosionThermo; -import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import cpw.mods.fml.relauncher.Side; @@ -17,7 +16,6 @@ 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.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -48,9 +46,6 @@ public class EntityLN2 extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityLN2(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityLaserBeam.java b/src/main/java/com/hbm/entity/projectile/EntityLaserBeam.java index a3f3f9323..bee0ba850 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityLaserBeam.java +++ b/src/main/java/com/hbm/entity/projectile/EntityLaserBeam.java @@ -46,9 +46,6 @@ public class EntityLaserBeam extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityLaserBeam(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityMinerBeam.java b/src/main/java/com/hbm/entity/projectile/EntityMinerBeam.java index 332c435ba..485137bd3 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityMinerBeam.java +++ b/src/main/java/com/hbm/entity/projectile/EntityMinerBeam.java @@ -50,9 +50,6 @@ public class EntityMinerBeam extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityMinerBeam(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityNightmareBlast.java b/src/main/java/com/hbm/entity/projectile/EntityNightmareBlast.java index 8767962e1..0ddbb2409 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityNightmareBlast.java +++ b/src/main/java/com/hbm/entity/projectile/EntityNightmareBlast.java @@ -44,9 +44,6 @@ public class EntityNightmareBlast extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityNightmareBlast(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityPlasmaBeam.java b/src/main/java/com/hbm/entity/projectile/EntityPlasmaBeam.java index 2a5ffca3e..406d71d14 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityPlasmaBeam.java +++ b/src/main/java/com/hbm/entity/projectile/EntityPlasmaBeam.java @@ -51,9 +51,6 @@ public class EntityPlasmaBeam extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityPlasmaBeam(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityRainbow.java b/src/main/java/com/hbm/entity/projectile/EntityRainbow.java index 6ee46d925..08257f0e6 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityRainbow.java +++ b/src/main/java/com/hbm/entity/projectile/EntityRainbow.java @@ -46,9 +46,6 @@ public class EntityRainbow extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityRainbow(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityRocket.java b/src/main/java/com/hbm/entity/projectile/EntityRocket.java index 9adaeaa04..d46c15a82 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityRocket.java +++ b/src/main/java/com/hbm/entity/projectile/EntityRocket.java @@ -6,8 +6,6 @@ import cpw.mods.fml.relauncher.SideOnly; import java.util.List; import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; @@ -17,7 +15,6 @@ 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.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -47,9 +44,6 @@ public class EntityRocket extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntityRocket(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java b/src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java index 908859d79..b3a1ca7da 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java +++ b/src/main/java/com/hbm/entity/projectile/EntityRocketHoming.java @@ -13,7 +13,6 @@ import com.hbm.explosion.ExplosionNukeSmall; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.items.ModItems; import com.hbm.lib.Library; -import com.hbm.main.ModEventHandler; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -52,7 +51,6 @@ public class EntityRocketHoming extends Entity implements IProjectile private double damage = 2.0D; private int knockbackStrength; private float explosionStrength; - private static final String __OBFID = "CL_00001715"; // specifies the type of stinger rocket that was fired /* 0 = Normal @@ -754,8 +752,8 @@ public class EntityRocketHoming extends Entity implements IProjectile case 1: ExplosionLarge.explode(worldObj, posX, posY, posZ, strength * 2, true, false, true); break; case 2: ExplosionLarge.explodeFire(worldObj, posX, posY, posZ, strength, true, false, false); break; case 4: - ExplosionLarge.explode(worldObj, posX, posY, posZ, strength * 3, false, false, true); - ExplosionNukeSmall.explode(worldObj, posX, posY, posZ, (int)strength * 5); + //ExplosionLarge.explode(worldObj, posX, posY, posZ, strength * 3, false, false, true); + ExplosionNukeSmall.explode(worldObj, posX, posY, posZ, ExplosionNukeSmall.PARAMS_MEDIUM); break; default: break; } diff --git a/src/main/java/com/hbm/entity/projectile/EntitySchrab.java b/src/main/java/com/hbm/entity/projectile/EntitySchrab.java index c2974df2f..c61199a9e 100644 --- a/src/main/java/com/hbm/entity/projectile/EntitySchrab.java +++ b/src/main/java/com/hbm/entity/projectile/EntitySchrab.java @@ -12,7 +12,6 @@ import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -24,8 +23,6 @@ import net.minecraft.world.World; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.items.ModItems; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -49,9 +46,6 @@ public class EntitySchrab extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntitySchrab(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntitySparkBeam.java b/src/main/java/com/hbm/entity/projectile/EntitySparkBeam.java index cd116b935..56c6b0376 100644 --- a/src/main/java/com/hbm/entity/projectile/EntitySparkBeam.java +++ b/src/main/java/com/hbm/entity/projectile/EntitySparkBeam.java @@ -44,9 +44,6 @@ public class EntitySparkBeam extends Entity implements IProjectile private double damage = 2.0D; /** The amount of knockback an arrow applies when it hits a mob. */ private int knockbackStrength; - private static final String __OBFID = "CL_00001715"; - - public EntitySparkBeam(World p_i1753_1_) { super(p_i1753_1_); diff --git a/src/main/java/com/hbm/entity/projectile/EntityWaterSplash.java b/src/main/java/com/hbm/entity/projectile/EntityWaterSplash.java index 252587aa5..d8501c733 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityWaterSplash.java +++ b/src/main/java/com/hbm/entity/projectile/EntityWaterSplash.java @@ -1,10 +1,6 @@ package com.hbm.entity.projectile; import com.hbm.main.MainRegistry; -import com.hbm.packet.AuxParticlePacket; -import com.hbm.packet.PacketDispatcher; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/hbm/explosion/ExplosionChaos.java b/src/main/java/com/hbm/explosion/ExplosionChaos.java index 31067b6c8..38b3514da 100644 --- a/src/main/java/com/hbm/explosion/ExplosionChaos.java +++ b/src/main/java/com/hbm/explosion/ExplosionChaos.java @@ -6,7 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.grenade.EntityGrenadeTau; import com.hbm.entity.grenade.EntityGrenadeZOMG; -import com.hbm.entity.missile.EntityMIRV; import com.hbm.entity.missile.EntityMissileAntiBallistic; import com.hbm.entity.missile.EntityMissileBase; import com.hbm.entity.particle.EntityChlorineFX; diff --git a/src/main/java/com/hbm/explosion/ExplosionNT.java b/src/main/java/com/hbm/explosion/ExplosionNT.java index 508cfbbb5..1f56cc251 100644 --- a/src/main/java/com/hbm/explosion/ExplosionNT.java +++ b/src/main/java/com/hbm/explosion/ExplosionNT.java @@ -36,7 +36,7 @@ public class ExplosionNT extends Explosion { protected int resolution = 16; protected Map affectedEntities = new HashMap(); - public static final List nukeAttribs = Arrays.asList(new ExAttrib[] { ExAttrib.FIRE, ExAttrib.NOPARTICLE, ExAttrib.NOSOUND, ExAttrib.NODROP, ExAttrib.NOHURT }); + @Deprecated public static final List nukeAttribs = Arrays.asList(new ExAttrib[] { ExAttrib.FIRE, ExAttrib.NOPARTICLE, ExAttrib.NOSOUND, ExAttrib.NODROP, ExAttrib.NOHURT }); public ExplosionNT(World world, Entity exploder, double x, double y, double z, float strength) { super(world, exploder, x, y, z, strength); diff --git a/src/main/java/com/hbm/explosion/ExplosionNukeSmall.java b/src/main/java/com/hbm/explosion/ExplosionNukeSmall.java index e1afb269c..32d3b0f79 100644 --- a/src/main/java/com/hbm/explosion/ExplosionNukeSmall.java +++ b/src/main/java/com/hbm/explosion/ExplosionNukeSmall.java @@ -2,6 +2,7 @@ package com.hbm.explosion; import com.hbm.config.BombConfig; import com.hbm.entity.logic.EntityNukeExplosionMK5; +import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.handler.radiation.ChunkRadiationManager; import com.hbm.main.MainRegistry; import com.hbm.packet.AuxParticlePacketNT; @@ -12,12 +13,13 @@ import net.minecraft.world.World; public class ExplosionNukeSmall { - public static final int safe = 0; - public static final int tots = 1; - public static final int low = 2; - public static final int medium = 3; - public static final int high = 4; + /*@Deprecated public static final int safe = 0; + @Deprecated public static final int tots = 1; + @Deprecated public static final int low = 2; + @Deprecated public static final int medium = 3; + @Deprecated public static final int high = 4; + @Deprecated public static void explode(World world, double posX, double posY, double posZ, int size) { @@ -63,9 +65,63 @@ public class ExplosionNukeSmall { if(size == safe) radMod = 0.66F; - for(int i = -2; i <= 2; i++) - for(int j = -2; j <= 2; j++) - if(i + j < 4) + for(int i = -2; i <= 2; i++) { + for(int j = -2; j <= 2; j++) { + if(i + j < 4) { ChunkRadiationManager.proxy.incrementRad(world, (int) Math.floor(posX + i * 16), (int) Math.floor(posY), (int) Math.floor(posZ + j * 16), 50 / (Math.abs(i) + Math.abs(j) + 1) * radMod); + } + } + } + }*/ + + public static void explode(World world, double posX, double posY, double posZ, MukeParams params) { + + // spawn particles, if present + if(params.particle != null) { + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", params.particle); + // if the FX type is "muke", apply random BF effect + if(params.particle.equals("muke") && (MainRegistry.polaroidID == 11 || world.rand.nextInt(100) == 0)) { + data.setBoolean("balefire", true); + } + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY + 0.5, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 250)); + } + + // play the sound in any case + world.playSoundEffect(posX, posY, posZ, "hbm:weapon.mukeExplosion", 15.0F, 1.0F); + + if(params.shrapnelCount > 0) ExplosionLarge.spawnShrapnels(world, posX, posY, posZ, params.shrapnelCount); + if(params.miniNuke && !params.safe) new ExplosionNT(world, null, posX, posY, posZ, params.blastRadius).addAllAttrib(params.explosionAttribs).overrideResolution(params.resolution).explode(); + if(params.killRadius > 0) ExplosionNukeGeneric.dealDamage(world, posX, posY, posZ, params.killRadius); + if(!params.miniNuke) world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, (int) params.blastRadius, posX, posY, posZ).mute()); + + float radMod = params.radiationLevel / 3F; + + for(int i = -2; i <= 2; i++) { + for(int j = -2; j <= 2; j++) { + if(Math.abs(i) + Math.abs(j) < 4) { + ChunkRadiationManager.proxy.incrementRad(world, (int) Math.floor(posX + i * 16), (int) Math.floor(posY), (int) Math.floor(posZ + j * 16), 50 / (Math.abs(i) + Math.abs(j) + 1) * radMod); + } + } + } + } + + public static MukeParams PARAMS_SAFE = new MukeParams() {{ safe = true; killRadius = 45F; radiationLevel = 2F; }}; + public static MukeParams PARAMS_TOTS = new MukeParams() {{ blastRadius = 10F; killRadius = 30F; particle = "tinytot"; shrapnelCount = 0; resolution = 32; radiationLevel = 1; }}; + public static MukeParams PARAMS_LOW = new MukeParams() {{ blastRadius = 15F; killRadius = 45F; radiationLevel = 2; }}; + public static MukeParams PARAMS_MEDIUM = new MukeParams() {{ blastRadius = 20F; killRadius = 55F; radiationLevel = 3; }}; + public static MukeParams PARAMS_HIGH = new MukeParams() {{ miniNuke = false; blastRadius = BombConfig.fatmanRadius; shrapnelCount = 0; radiationLevel = 4; }}; + + /* more sensible approach with more customization options, idea shamelessly stolen from Martin */ + public static class MukeParams { + public boolean miniNuke = true; + public boolean safe = false; + public float blastRadius; + public float killRadius; + public float radiationLevel = 1F; + public String particle = "muke"; + public int shrapnelCount = 25; + public int resolution = 64; + public ExAttrib[] explosionAttribs = new ExAttrib[] { ExAttrib.FIRE, ExAttrib.NOPARTICLE, ExAttrib.NOSOUND, ExAttrib.NODROP, ExAttrib.NOHURT }; //TODO: replace with VNT } } diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java index ffd94f992..845bbd9a6 100644 --- a/src/main/java/com/hbm/handler/EntityEffectHandler.java +++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java @@ -80,7 +80,7 @@ public class EntityEffectHandler { HbmLivingProps.setTimer(entity, timer - 1); if(timer == 1) { - ExplosionNukeSmall.explode(entity.worldObj, entity.posX, entity.posY, entity.posZ, ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(entity.worldObj, entity.posX, entity.posY, entity.posZ, ExplosionNukeSmall.PARAMS_MEDIUM); } } diff --git a/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java b/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java index b60e9b385..c8e3bebd0 100644 --- a/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/BulletConfigFactory.java @@ -6,6 +6,7 @@ import java.util.Random; import com.hbm.entity.particle.EntityBSmokeFX; import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.explosion.ExplosionNukeSmall; +import com.hbm.explosion.ExplosionNukeSmall.MukeParams; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.interfaces.IBulletImpactBehavior; @@ -291,13 +292,13 @@ public class BulletConfigFactory { * 3 - medium * 4 - big */ - public static void nuclearExplosion(EntityBulletBase bullet, int x, int y, int z, int size) { + public static void nuclearExplosion(Entity entity, int x, int y, int z, MukeParams params) { - if(!bullet.worldObj.isRemote) { + if(!entity.worldObj.isRemote) { - double posX = bullet.posX; - double posY = bullet.posY + 0.5; - double posZ = bullet.posZ; + double posX = entity.posX; + double posY = entity.posY + 0.5; + double posZ = entity.posZ; if(y >= 0) { posX = x + 0.5; @@ -305,7 +306,7 @@ public class BulletConfigFactory { posZ = z + 0.5; } - ExplosionNukeSmall.explode(bullet.worldObj, posX, posY, posZ, size); + ExplosionNukeSmall.explode(entity.worldObj, posX, posY, posZ, params); } } diff --git a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java index 158fddc1d..191867b61 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java @@ -526,7 +526,7 @@ public class Gun4GaugeFactory { for(EntityCreature creature : creatures) { if(creature.getClass().getCanonicalName().startsWith("net.minecraft.entity.titan")) { - ExplosionNukeSmall.explode(bullet.worldObj, creature.posX, creature.posY, creature.posZ, ExplosionNukeSmall.medium); + BulletConfigFactory.nuclearExplosion(creature, 0, 0, 0, ExplosionNukeSmall.PARAMS_TOTS); bullet.worldObj.removeEntity(creature); bullet.worldObj.unloadEntities(new ArrayList() {{ add(creature); }}); diff --git a/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java b/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java index 50c0fdff2..42a79013e 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunCannonFactory.java @@ -1,6 +1,7 @@ package com.hbm.handler.guncfg; import com.hbm.entity.projectile.EntityBulletBase; +import com.hbm.explosion.ExplosionNukeSmall; import com.hbm.handler.BulletConfiguration; import com.hbm.interfaces.IBulletImpactBehavior; import com.hbm.inventory.RecipesCommon.ComparableStack; @@ -89,7 +90,7 @@ public class GunCannonFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 1); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_TOTS); } }; diff --git a/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java b/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java index b11625a66..0e8dbbd24 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunFatmanFactory.java @@ -6,6 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionNT; +import com.hbm.explosion.ExplosionNukeSmall; import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; @@ -136,7 +137,7 @@ public class GunFatmanFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 3); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_MEDIUM); } }; @@ -152,7 +153,7 @@ public class GunFatmanFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 2); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_LOW); } }; @@ -168,7 +169,7 @@ public class GunFatmanFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 4); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_HIGH); } }; @@ -188,7 +189,7 @@ public class GunFatmanFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 1); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_TOTS); } }; @@ -204,7 +205,7 @@ public class GunFatmanFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 0); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_SAFE); } }; diff --git a/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java b/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java index f68f17774..0c787f9a9 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunGrenadeFactory.java @@ -3,6 +3,7 @@ package com.hbm.handler.guncfg; import java.util.ArrayList; import com.hbm.entity.projectile.EntityBulletBase; +import com.hbm.explosion.ExplosionNukeSmall; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.CasingEjector; @@ -216,7 +217,7 @@ public class GunGrenadeFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 1); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_TOTS); } }; diff --git a/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java b/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java index 42df5aa30..8af201e52 100644 --- a/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/GunRocketFactory.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import com.hbm.entity.effect.EntitySpear; import com.hbm.entity.projectile.EntityBulletBase; +import com.hbm.explosion.ExplosionNukeSmall; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; @@ -290,7 +291,7 @@ public class GunRocketFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { - BulletConfigFactory.nuclearExplosion(bullet, x, y, z, 2); + BulletConfigFactory.nuclearExplosion(bullet, x, y, z, ExplosionNukeSmall.PARAMS_MEDIUM); } }; diff --git a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java index 1ac0d7620..8292a342f 100644 --- a/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java +++ b/src/main/java/com/hbm/hazard/modifier/HazardModifierFuelRadiation.java @@ -1,7 +1,5 @@ package com.hbm.hazard.modifier; -import com.hbm.items.machine.ItemFuelRod; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/hbm/interfaces/ICustomWarhead.java b/src/main/java/com/hbm/interfaces/ICustomWarhead.java index 2e83108a6..9c9301bc2 100644 --- a/src/main/java/com/hbm/interfaces/ICustomWarhead.java +++ b/src/main/java/com/hbm/interfaces/ICustomWarhead.java @@ -8,9 +8,6 @@ import org.apache.logging.log4j.Level; import com.google.common.annotations.Beta; import com.hbm.hazard.HazardRegistry; -import com.hbm.interfaces.ICustomWarhead.EnumCustomWarhead.EnumBioType; -import com.hbm.interfaces.ICustomWarhead.EnumCustomWarhead.EnumChemicalType; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.util.BobMathUtil; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/inventory/container/ContainerBarrel.java b/src/main/java/com/hbm/inventory/container/ContainerBarrel.java index 1c4ae8e44..559750eca 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerBarrel.java +++ b/src/main/java/com/hbm/inventory/container/ContainerBarrel.java @@ -12,11 +12,7 @@ import net.minecraft.item.ItemStack; public class ContainerBarrel extends Container { private TileEntityBarrel diFurnace; - private int power; - public ContainerBarrel(InventoryPlayer invPlayer, TileEntityBarrel tedf) { - power = 0; - diFurnace = tedf; this.addSlotToContainer(new Slot(tedf, 0, 8, 17)); diff --git a/src/main/java/com/hbm/inventory/container/ContainerIGenerator.java b/src/main/java/com/hbm/inventory/container/ContainerIGenerator.java index 3f2e1dd82..324424c76 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerIGenerator.java +++ b/src/main/java/com/hbm/inventory/container/ContainerIGenerator.java @@ -6,7 +6,6 @@ import com.hbm.tileentity.machine.TileEntityMachineIGenerator; 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/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java b/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java index 307b41fc0..cb40f3b2c 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineAssembler.java @@ -6,7 +6,6 @@ import com.hbm.tileentity.machine.TileEntityMachineAssembler; 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/src/main/java/com/hbm/inventory/container/ContainerMachineDeuterium.java b/src/main/java/com/hbm/inventory/container/ContainerMachineDeuterium.java index 132c5f96a..a31ca0f72 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineDeuterium.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineDeuterium.java @@ -14,7 +14,6 @@ public class ContainerMachineDeuterium extends Container { private TileEntityMachineDeuterium nukeBoy; - private int power; private int water; private int sulfur; private int progress; diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineRadar.java b/src/main/java/com/hbm/inventory/container/ContainerMachineRadar.java index acf0b5823..5599c4f76 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineRadar.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineRadar.java @@ -9,10 +9,7 @@ import net.minecraft.inventory.ICrafting; public class ContainerMachineRadar extends Container { - private TileEntityMachineRadar radar; - public ContainerMachineRadar(InventoryPlayer invPlayer, TileEntityMachineRadar tedf) { - this.radar = tedf; } @Override diff --git a/src/main/java/com/hbm/inventory/container/ContainerPlasmaHeater.java b/src/main/java/com/hbm/inventory/container/ContainerPlasmaHeater.java index 8fcaef816..04ceddb5f 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerPlasmaHeater.java +++ b/src/main/java/com/hbm/inventory/container/ContainerPlasmaHeater.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.machine.TileEntityMachinePlasmaHeater; -import com.hbm.tileentity.machine.TileEntityMicrowave; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/hbm/inventory/container/ContainerRBMKControl.java b/src/main/java/com/hbm/inventory/container/ContainerRBMKControl.java index a0c59ffd8..e8aad8b76 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerRBMKControl.java +++ b/src/main/java/com/hbm/inventory/container/ContainerRBMKControl.java @@ -10,11 +10,7 @@ import net.minecraft.item.ItemStack; public class ContainerRBMKControl extends Container { - private TileEntityRBMKControlManual rbmk; - public ContainerRBMKControl(InventoryPlayer invPlayer, TileEntityRBMKControlManual tedf) { - rbmk = tedf; - for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 20)); diff --git a/src/main/java/com/hbm/inventory/container/ContainerRBMKControlAuto.java b/src/main/java/com/hbm/inventory/container/ContainerRBMKControlAuto.java index 76649025e..3f65bb626 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerRBMKControlAuto.java +++ b/src/main/java/com/hbm/inventory/container/ContainerRBMKControlAuto.java @@ -10,11 +10,7 @@ import net.minecraft.item.ItemStack; public class ContainerRBMKControlAuto extends Container { - private TileEntityRBMKControlAuto rbmk; - public ContainerRBMKControlAuto(InventoryPlayer invPlayer, TileEntityRBMKControlAuto tedf) { - rbmk = tedf; - for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18 + 20)); diff --git a/src/main/java/com/hbm/inventory/container/ContainerReactorMultiblock.java b/src/main/java/com/hbm/inventory/container/ContainerReactorMultiblock.java index a03392966..c2d0a47c6 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerReactorMultiblock.java +++ b/src/main/java/com/hbm/inventory/container/ContainerReactorMultiblock.java @@ -12,8 +12,6 @@ public class ContainerReactorMultiblock extends Container { private TileEntityMachineReactorLarge diFurnace; - private int heat; - public ContainerReactorMultiblock(InventoryPlayer invPlayer, TileEntityMachineReactorLarge tedf) { diFurnace = tedf; diff --git a/src/main/java/com/hbm/inventory/container/ContainerReactorResearch.java b/src/main/java/com/hbm/inventory/container/ContainerReactorResearch.java index 5bea2c066..5bf42ad83 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerReactorResearch.java +++ b/src/main/java/com/hbm/inventory/container/ContainerReactorResearch.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.items.machine.ItemPlateFuel; import com.hbm.tileentity.machine.TileEntityReactorResearch; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerRtgFurnace.java b/src/main/java/com/hbm/inventory/container/ContainerRtgFurnace.java index 2d288d6f7..4ef90d30a 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerRtgFurnace.java +++ b/src/main/java/com/hbm/inventory/container/ContainerRtgFurnace.java @@ -14,12 +14,8 @@ public class ContainerRtgFurnace extends Container { private TileEntityRtgFurnace diFurnace; private int dualCookTime; - private int lastItemBurnTime; - public ContainerRtgFurnace(InventoryPlayer invPlayer, TileEntityRtgFurnace tedf) { dualCookTime = 0; - lastItemBurnTime = 0; - diFurnace = tedf; this.addSlotToContainer(new Slot(tedf, 0, 56, 17)); diff --git a/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java b/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java index 35f522588..08d91b392 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAMSBase.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerAMSBase; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityAMSBase; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java b/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java index 036b610a4..a4bf1c205 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAMSEmitter.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerAMSEmitter; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityAMSEmitter; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java b/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java index 6a6ff3757..e54a957d8 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAMSLimiter.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerAMSLimiter; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityAMSLimiter; diff --git a/src/main/java/com/hbm/inventory/gui/GUIBarrel.java b/src/main/java/com/hbm/inventory/gui/GUIBarrel.java index 4b52a4f29..e739e81d6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIBarrel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIBarrel.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerBarrel; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIBookLore.java b/src/main/java/com/hbm/inventory/gui/GUIBookLore.java index 85f3658f4..b8f203f23 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIBookLore.java +++ b/src/main/java/com/hbm/inventory/gui/GUIBookLore.java @@ -6,10 +6,7 @@ import java.util.List; import org.lwjgl.opengl.GL11; import com.hbm.items.special.ItemBookLore.*; -import com.hbm.items.tool.ItemGuideBook.BookType; import com.hbm.lib.RefStrings; -import com.hbm.util.I18nUtil; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; @@ -17,7 +14,6 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; // and you may ask yourself: vaer, why do this? this is basically just a copy of GUIScreenGuide. // and I would answer, shut the fuck up nerd, the guide book system is too involved for my small diff --git a/src/main/java/com/hbm/inventory/gui/GUICore.java b/src/main/java/com/hbm/inventory/gui/GUICore.java index f10382b55..ce87a0779 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICore.java +++ b/src/main/java/com/hbm/inventory/gui/GUICore.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCore; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityCore; diff --git a/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java b/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java index 1fe07a89f..e8ac99bda 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java +++ b/src/main/java/com/hbm/inventory/gui/GUICoreEmitter.java @@ -5,7 +5,6 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCoreEmitter; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java b/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java index 53de30586..8c9e6b8ad 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java +++ b/src/main/java/com/hbm/inventory/gui/GUICoreInjector.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCoreInjector; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityCoreInjector; diff --git a/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java b/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java index bd849a217..86c54131b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java +++ b/src/main/java/com/hbm/inventory/gui/GUICoreReceiver.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCoreReceiver; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityCoreReceiver; import com.hbm.util.BobMathUtil; diff --git a/src/main/java/com/hbm/inventory/gui/GUIElectrolyser.java b/src/main/java/com/hbm/inventory/gui/GUIElectrolyser.java index 33bfb2f9c..7a9748372 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIElectrolyser.java +++ b/src/main/java/com/hbm/inventory/gui/GUIElectrolyser.java @@ -9,7 +9,6 @@ import com.hbm.tileentity.machine.TileEntityElectrolyser; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; public class GUIElectrolyser extends GuiInfoContainer { diff --git a/src/main/java/com/hbm/inventory/gui/GUIFEL.java b/src/main/java/com/hbm/inventory/gui/GUIFEL.java index 12bac9043..890cb3299 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFEL.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFEL.java @@ -13,7 +13,6 @@ import com.hbm.tileentity.machine.TileEntityFEL; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java b/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java index 92899dc15..5f9fd0bd4 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java +++ b/src/main/java/com/hbm/inventory/gui/GUIFWatzCore.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerFWatzCore; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityFWatzCore; diff --git a/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java b/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java index 92515e83d..8c2ef0b81 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java +++ b/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerIGenerator; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineIGenerator; diff --git a/src/main/java/com/hbm/inventory/gui/GUIITER.java b/src/main/java/com/hbm/inventory/gui/GUIITER.java index afce8ac71..4e9b1d85c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIITER.java +++ b/src/main/java/com/hbm/inventory/gui/GUIITER.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerITER; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java b/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java index 80757c69b..3f9c0072c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java +++ b/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerLiquefactor; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.oil.TileEntityMachineLiquefactor; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java b/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java index 0360424f2..9c434f5e2 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineBoiler; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineBoiler; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java b/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java index 3fd16c846..b4fa16e56 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineBoilerElectric; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineBoilerElectric; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java index 47369d642..1391cf2c4 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCMBFactory.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineCMBFactory; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineCMBFactory; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java index 533f600c0..cb9181e3c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCompactLauncher.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCompactLauncher; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.lib.RefStrings; import com.hbm.render.util.MissileMultipart; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java b/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java index 7488de6b0..c0ad1c777 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineCyclotron.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineCyclotron; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java index d1c34d7ad..06a41f19c 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -1,16 +1,12 @@ package com.hbm.inventory.gui; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.Map.Entry; - import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.util.BobMathUtil; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java b/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java index 358322623..54ddb47e9 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineFluidTank; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java index b5b853cd7..987b5caa6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineGasCent; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineGasCent; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java b/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java index b3ab1c226..de4118421 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineInserter.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineInserter; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineInserter; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java b/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java index d0b12175a..d0cea85c8 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineLargeTurbine; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineLargeTurbine; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java b/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java index fbe7f393a..fc4621b1f 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineLaunchTable.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerLaunchTable; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.items.weapon.ItemCustomMissile; import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.lib.RefStrings; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java b/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java index facd91088..faa229824 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineOilWell; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.oil.TileEntityOilDrillBase; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java b/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java index b5d02932a..4ec995798 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerPuF6Tank; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineReactorBreeding.java b/src/main/java/com/hbm/inventory/gui/GUIMachineReactorBreeding.java index efe6032ad..2e8662d35 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineReactorBreeding.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineReactorBreeding.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineReactorBreeding; -import com.hbm.inventory.recipes.BreederRecipes; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineReactorBreeding; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java index c0eb74cc4..c271c162d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineRefinery; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java index 4a52718ec..20ea31ba8 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java @@ -2,16 +2,12 @@ package com.hbm.inventory.gui; import java.util.ArrayList; import java.util.List; -import java.util.Map.Entry; - import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineSelenium; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineDiesel; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; import com.hbm.util.BobMathUtil; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java index d4603404a..b4a71e84e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineTurbine; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineTurbine; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java b/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java index e9ae176dc..a7c838c52 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerUF6Tank; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java b/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java index d0d5194dc..79681e6f8 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMiningLaser.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMiningLaser; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java b/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java index a292c9fc2..042ca6dbb 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java +++ b/src/main/java/com/hbm/inventory/gui/GUIPlasmaHeater.java @@ -2,12 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerMicrowave; import com.hbm.inventory.container.ContainerPlasmaHeater; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; -import com.hbm.packet.AuxButtonPacket; -import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.machine.TileEntityMachinePlasmaHeater; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java index 1a1dfd1e2..2b25ba85a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java +++ b/src/main/java/com/hbm/inventory/gui/GUIRadiolysis.java @@ -5,7 +5,6 @@ import java.util.List; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerRadiolysis; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.items.machine.ItemRTGPellet; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineRadiolysis; diff --git a/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java b/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java index a12ad1119..7cf44051e 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -5,7 +5,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerReactorMultiblock; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java b/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java index a533c74fb..392f620f9 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenSatInterface.java @@ -5,7 +5,6 @@ import java.util.List; import org.lwjgl.opengl.GL11; -import com.hbm.entity.missile.EntityMissileBaseAdvanced; import com.hbm.inventory.recipes.MachineRecipes; import com.hbm.items.ISatChip; import com.hbm.items.tool.ItemSatInterface; diff --git a/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java b/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java index d6f2ccda9..644f6eff6 100644 --- a/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java +++ b/src/main/java/com/hbm/inventory/gui/GUISoyuzLauncher.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerSoyuzLauncher; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java b/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java index 7fb4700fa..30dc93484 100644 --- a/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java +++ b/src/main/java/com/hbm/inventory/gui/GUITurretFritz.java @@ -5,7 +5,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.turret.TileEntityTurretBaseNT; import com.hbm.tileentity.turret.TileEntityTurretFritz; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java b/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java index 2ed9d628d..68aa1a7c5 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java +++ b/src/main/java/com/hbm/inventory/gui/GUIWatzCore.java @@ -3,7 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerWatzCore; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityWatzCore; diff --git a/src/main/java/com/hbm/items/armor/ArmorBismuth.java b/src/main/java/com/hbm/items/armor/ArmorBismuth.java index d2ab75713..418d657fa 100644 --- a/src/main/java/com/hbm/items/armor/ArmorBismuth.java +++ b/src/main/java/com/hbm/items/armor/ArmorBismuth.java @@ -1,8 +1,6 @@ package com.hbm.items.armor; import com.hbm.render.model.ModelArmorBismuth; -import com.hbm.render.model.ModelArmorRPA; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/com/hbm/items/block/ItemBlockLore.java b/src/main/java/com/hbm/items/block/ItemBlockLore.java index e5b6fa081..6d26836e0 100644 --- a/src/main/java/com/hbm/items/block/ItemBlockLore.java +++ b/src/main/java/com/hbm/items/block/ItemBlockLore.java @@ -8,9 +8,7 @@ import com.hbm.blocks.generic.RedBarrel; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class ItemBlockLore extends ItemBlockBase { diff --git a/src/main/java/com/hbm/items/bomb/ItemMissileShuttle.java b/src/main/java/com/hbm/items/bomb/ItemMissileShuttle.java index 701376c90..edbcbc693 100644 --- a/src/main/java/com/hbm/items/bomb/ItemMissileShuttle.java +++ b/src/main/java/com/hbm/items/bomb/ItemMissileShuttle.java @@ -2,8 +2,6 @@ package com.hbm.items.bomb; 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/src/main/java/com/hbm/items/food/ItemLemon.java b/src/main/java/com/hbm/items/food/ItemLemon.java index a6833860d..25bb74a9e 100644 --- a/src/main/java/com/hbm/items/food/ItemLemon.java +++ b/src/main/java/com/hbm/items/food/ItemLemon.java @@ -2,7 +2,6 @@ package com.hbm.items.food; import java.util.List; -import com.hbm.entity.effect.EntityVortex; import com.hbm.items.ModItems; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/items/food/ItemWaffle.java b/src/main/java/com/hbm/items/food/ItemWaffle.java index b7c7e6036..c6dba928b 100644 --- a/src/main/java/com/hbm/items/food/ItemWaffle.java +++ b/src/main/java/com/hbm/items/food/ItemWaffle.java @@ -17,7 +17,7 @@ public class ItemWaffle extends ItemFood { public void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { if(!world.isRemote) - ExplosionNukeSmall.explode(world, player.posX, player.posY + 0.5, player.posZ, ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(world, player.posX, player.posY + 0.5, player.posZ, ExplosionNukeSmall.PARAMS_MEDIUM); } } diff --git a/src/main/java/com/hbm/items/machine/ItemBlades.java b/src/main/java/com/hbm/items/machine/ItemBlades.java index 6fae73dff..79d8ddeea 100644 --- a/src/main/java/com/hbm/items/machine/ItemBlades.java +++ b/src/main/java/com/hbm/items/machine/ItemBlades.java @@ -1,11 +1,6 @@ package com.hbm.items.machine; -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; public class ItemBlades extends Item { diff --git a/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java b/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java index dce26eb02..43ad52bcb 100644 --- a/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java +++ b/src/main/java/com/hbm/items/machine/ItemFluidIDMulti.java @@ -8,7 +8,6 @@ import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.gui.GUIScreenFluid; import com.hbm.items.IItemControlReceiver; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.PlayerInformPacket; diff --git a/src/main/java/com/hbm/items/machine/ItemFuelRod.java b/src/main/java/com/hbm/items/machine/ItemFuelRod.java index f443fca48..41156412f 100644 --- a/src/main/java/com/hbm/items/machine/ItemFuelRod.java +++ b/src/main/java/com/hbm/items/machine/ItemFuelRod.java @@ -1,14 +1,8 @@ package com.hbm.items.machine; -import java.util.List; - -import com.hbm.lib.Library; - -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; public class ItemFuelRod extends Item { diff --git a/src/main/java/com/hbm/items/machine/ItemPileRod.java b/src/main/java/com/hbm/items/machine/ItemPileRod.java index 68debdd78..103e68494 100644 --- a/src/main/java/com/hbm/items/machine/ItemPileRod.java +++ b/src/main/java/com/hbm/items/machine/ItemPileRod.java @@ -2,13 +2,11 @@ package com.hbm.items.machine; import java.util.List; -import com.hbm.items.ModItems; import com.hbm.util.I18nUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; public class ItemPileRod extends Item { diff --git a/src/main/java/com/hbm/items/machine/ItemPlateFuel.java b/src/main/java/com/hbm/items/machine/ItemPlateFuel.java index 7184db282..f30978de9 100644 --- a/src/main/java/com/hbm/items/machine/ItemPlateFuel.java +++ b/src/main/java/com/hbm/items/machine/ItemPlateFuel.java @@ -5,9 +5,7 @@ import java.util.List; import com.hbm.util.BobMathUtil; 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.world.World; diff --git a/src/main/java/com/hbm/items/special/ItemBook.java b/src/main/java/com/hbm/items/special/ItemBook.java index 2a3818926..5759ea383 100644 --- a/src/main/java/com/hbm/items/special/ItemBook.java +++ b/src/main/java/com/hbm/items/special/ItemBook.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.inventory.container.ContainerBook; import com.hbm.inventory.gui.GUIBook; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.tileentity.IGUIProvider; diff --git a/src/main/java/com/hbm/items/special/ItemBookLore.java b/src/main/java/com/hbm/items/special/ItemBookLore.java index 18439bd19..b34aa2598 100644 --- a/src/main/java/com/hbm/items/special/ItemBookLore.java +++ b/src/main/java/com/hbm/items/special/ItemBookLore.java @@ -4,17 +4,12 @@ import java.util.List; import com.hbm.inventory.gui.GUIBookLore; import com.hbm.inventory.gui.GUIBookLore.GUIAppearance; -import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemGuideBook.BookType; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.IGUIProvider; import com.hbm.util.I18nUtil; -import com.hbm.world.generator.room.TestDungeonRoom8; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -23,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; /*players can have a lil lore, as a treat. diff --git a/src/main/java/com/hbm/items/special/ItemCigarette.java b/src/main/java/com/hbm/items/special/ItemCigarette.java index 042d49a7c..5e960f35d 100644 --- a/src/main/java/com/hbm/items/special/ItemCigarette.java +++ b/src/main/java/com/hbm/items/special/ItemCigarette.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.ArrowNockEvent; public class ItemCigarette extends Item { diff --git a/src/main/java/com/hbm/items/special/ItemHolotapeImage.java b/src/main/java/com/hbm/items/special/ItemHolotapeImage.java index 46f89d797..5c4cb8a27 100644 --- a/src/main/java/com/hbm/items/special/ItemHolotapeImage.java +++ b/src/main/java/com/hbm/items/special/ItemHolotapeImage.java @@ -3,7 +3,6 @@ package com.hbm.items.special; import java.util.List; import com.hbm.inventory.gui.GUIScreenHolotape; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.tileentity.IGUIProvider; import com.hbm.util.EnumUtil; diff --git a/src/main/java/com/hbm/items/special/ItemKitCustom.java b/src/main/java/com/hbm/items/special/ItemKitCustom.java index 7e013a018..0649c73ac 100644 --- a/src/main/java/com/hbm/items/special/ItemKitCustom.java +++ b/src/main/java/com/hbm/items/special/ItemKitCustom.java @@ -6,13 +6,10 @@ import com.hbm.util.ItemStackUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; -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.IIcon; -import net.minecraft.world.World; public class ItemKitCustom extends ItemKitNBT { diff --git a/src/main/java/com/hbm/items/special/ItemPlasticScrap.java b/src/main/java/com/hbm/items/special/ItemPlasticScrap.java index 3e9aa71e9..a262df155 100644 --- a/src/main/java/com/hbm/items/special/ItemPlasticScrap.java +++ b/src/main/java/com/hbm/items/special/ItemPlasticScrap.java @@ -2,8 +2,6 @@ package com.hbm.items.special; import com.hbm.items.ItemEnumMulti; -import net.minecraft.item.Item; - public class ItemPlasticScrap extends ItemEnumMulti { public ItemPlasticScrap() { diff --git a/src/main/java/com/hbm/items/tool/ItemAnalyzer.java b/src/main/java/com/hbm/items/tool/ItemAnalyzer.java index 7fa9b84ff..ebfdbe208 100644 --- a/src/main/java/com/hbm/items/tool/ItemAnalyzer.java +++ b/src/main/java/com/hbm/items/tool/ItemAnalyzer.java @@ -1,10 +1,6 @@ package com.hbm.items.tool; -import java.util.List; - -import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidDuct; -import com.hbm.inventory.fluid.tank.FluidTank; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.TileEntityLockableBase; import com.hbm.tileentity.network.TileEntityPylon; diff --git a/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java b/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java index 2d37857db..bfffd9b3b 100644 --- a/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java +++ b/src/main/java/com/hbm/items/tool/ItemDesingatorManual.java @@ -3,7 +3,6 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.inventory.gui.GUIScreenDesignator; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.tileentity.IGUIProvider; diff --git a/src/main/java/com/hbm/items/tool/ItemGuideBook.java b/src/main/java/com/hbm/items/tool/ItemGuideBook.java index 161116879..f9579af33 100644 --- a/src/main/java/com/hbm/items/tool/ItemGuideBook.java +++ b/src/main/java/com/hbm/items/tool/ItemGuideBook.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.inventory.gui.GUIScreenGuide; -import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.IGUIProvider; diff --git a/src/main/java/com/hbm/items/tool/ItemMeteorRemote.java b/src/main/java/com/hbm/items/tool/ItemMeteorRemote.java index 958936b9f..06d03add3 100644 --- a/src/main/java/com/hbm/items/tool/ItemMeteorRemote.java +++ b/src/main/java/com/hbm/items/tool/ItemMeteorRemote.java @@ -3,7 +3,6 @@ package com.hbm.items.tool; import java.util.List; import java.util.Random; -import com.hbm.entity.projectile.EntityMeteor; import com.hbm.handler.BossSpawnHandler; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/items/tool/ItemMultiDetonator.java b/src/main/java/com/hbm/items/tool/ItemMultiDetonator.java index 321c87e42..45adee13f 100644 --- a/src/main/java/com/hbm/items/tool/ItemMultiDetonator.java +++ b/src/main/java/com/hbm/items/tool/ItemMultiDetonator.java @@ -15,7 +15,6 @@ 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.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/items/tool/ItemStructurePattern.java b/src/main/java/com/hbm/items/tool/ItemStructurePattern.java index 60f7c39f4..0e4832ad4 100644 --- a/src/main/java/com/hbm/items/tool/ItemStructurePattern.java +++ b/src/main/java/com/hbm/items/tool/ItemStructurePattern.java @@ -6,7 +6,6 @@ import com.hbm.util.fauxpointtwelve.BlockPos; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/items/tool/ItemSurveyScanner.java b/src/main/java/com/hbm/items/tool/ItemSurveyScanner.java index fdee5a51f..2f9d3cda0 100644 --- a/src/main/java/com/hbm/items/tool/ItemSurveyScanner.java +++ b/src/main/java/com/hbm/items/tool/ItemSurveyScanner.java @@ -1,7 +1,5 @@ package com.hbm.items.tool; -import java.util.Random; - import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/items/tool/ItemSwordAbility.java b/src/main/java/com/hbm/items/tool/ItemSwordAbility.java index c8be968db..5c8132c58 100644 --- a/src/main/java/com/hbm/items/tool/ItemSwordAbility.java +++ b/src/main/java/com/hbm/items/tool/ItemSwordAbility.java @@ -10,22 +10,14 @@ 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.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.network.play.client.C07PacketPlayerDigging; -import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.event.world.BlockEvent; public class ItemSwordAbility extends ItemSword implements IItemAbility { diff --git a/src/main/java/com/hbm/items/tool/ItemToolAbility.java b/src/main/java/com/hbm/items/tool/ItemToolAbility.java index c1e4cbb1b..e5b006909 100644 --- a/src/main/java/com/hbm/items/tool/ItemToolAbility.java +++ b/src/main/java/com/hbm/items/tool/ItemToolAbility.java @@ -31,7 +31,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; public class ItemToolAbility extends ItemTool implements IItemAbility, IDepthRockTool { diff --git a/src/main/java/com/hbm/items/tool/ItemWandD.java b/src/main/java/com/hbm/items/tool/ItemWandD.java index e98c71ad1..867c68fc1 100644 --- a/src/main/java/com/hbm/items/tool/ItemWandD.java +++ b/src/main/java/com/hbm/items/tool/ItemWandD.java @@ -2,41 +2,14 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.BlockBedrockOreTE.TileEntityBedrockOre; -import com.hbm.config.WorldConfig; -import com.hbm.entity.effect.EntityNukeTorex; -import com.hbm.entity.logic.EntityNukeExplosionMK5; -import com.hbm.entity.logic.EntityTomBlast; -import com.hbm.entity.mob.siege.EntitySiegeTunneler; -import com.hbm.inventory.FluidStack; -import com.hbm.inventory.fluid.Fluids; -import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBookLore; -import com.hbm.items.special.ItemBookLore.BookLoreType; -import com.hbm.items.special.ItemKitCustom; -import com.hbm.items.special.ItemBedrockOre.EnumBedrockOre; import com.hbm.lib.Library; import com.hbm.saveddata.TomSaveData; -import com.hbm.world.feature.OilSpot; -import com.hbm.world.generator.DungeonToolbox; -import cpw.mods.fml.relauncher.ReflectionHelper; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.EntityTracker; -import net.minecraft.entity.EntityTrackerEntry; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IntHashMap; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraft.world.gen.structure.MapGenStronghold; -import net.minecraft.world.gen.structure.StructureBoundingBox; public class ItemWandD extends Item { diff --git a/src/main/java/com/hbm/items/weapon/GunRpg.java b/src/main/java/com/hbm/items/weapon/GunRpg.java index 2ed240136..e3c8fa53e 100644 --- a/src/main/java/com/hbm/items/weapon/GunRpg.java +++ b/src/main/java/com/hbm/items/weapon/GunRpg.java @@ -26,8 +26,6 @@ public class GunRpg extends Item { public static final String[] bowPullIconNameArray = new String[] { "pulling_0", "pulling_1", "pulling_2" }; @SideOnly(Side.CLIENT) private IIcon[] iconArray; - private static final String __OBFID = "CL_00001777"; - public GunRpg() { this.maxStackSize = 1; this.setMaxDamage(500); diff --git a/src/main/java/com/hbm/items/weapon/GunSuicide.java b/src/main/java/com/hbm/items/weapon/GunSuicide.java index b2a1d10b6..b94700be1 100644 --- a/src/main/java/com/hbm/items/weapon/GunSuicide.java +++ b/src/main/java/com/hbm/items/weapon/GunSuicide.java @@ -28,7 +28,6 @@ public class GunSuicide extends Item { public static final String[] bowPullIconNameArray = new String[] {"pulling_0", "pulling_1", "pulling_2"}; @SideOnly(Side.CLIENT) private IIcon[] iconArray; - private static final String __OBFID = "CL_00001777"; private Item ammo; Random rand = new Random(); diff --git a/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java b/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java index 44a668afc..0898913b9 100644 --- a/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java +++ b/src/main/java/com/hbm/items/weapon/ItemAmmoArty.java @@ -244,7 +244,7 @@ public class ItemAmmoArty extends Item { public void onImpact(EntityArtilleryShell shell, MovingObjectPosition mop) { shell.killAndClear(); Vec3 vec = Vec3.createVectorHelper(shell.motionX, shell.motionY, shell.motionZ).normalize(); - ExplosionNukeSmall.explode(shell.worldObj, mop.hitVec.xCoord - vec.xCoord, mop.hitVec.yCoord - vec.yCoord, mop.hitVec.zCoord - vec.zCoord, ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(shell.worldObj, mop.hitVec.xCoord - vec.xCoord, mop.hitVec.yCoord - vec.yCoord, mop.hitVec.zCoord - vec.zCoord, ExplosionNukeSmall.PARAMS_MEDIUM); } }; diff --git a/src/main/java/com/hbm/items/weapon/ItemGunOSIPR.java b/src/main/java/com/hbm/items/weapon/ItemGunOSIPR.java index 7f8d76a53..dd8f945bc 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGunOSIPR.java +++ b/src/main/java/com/hbm/items/weapon/ItemGunOSIPR.java @@ -1,6 +1,5 @@ package com.hbm.items.weapon; -import com.hbm.entity.projectile.EntityCombineBall; import com.hbm.entity.projectile.EntityCombineBallNT; import com.hbm.handler.BulletConfigSyncingUtil; import com.hbm.handler.GunConfiguration; diff --git a/src/main/java/com/hbm/items/weapon/ItemGunVortex.java b/src/main/java/com/hbm/items/weapon/ItemGunVortex.java index 8b2be3d0c..fb8422d72 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGunVortex.java +++ b/src/main/java/com/hbm/items/weapon/ItemGunVortex.java @@ -1,37 +1,8 @@ package com.hbm.items.weapon; -import java.util.List; - -import org.lwjgl.opengl.GL11; - -import com.hbm.entity.projectile.EntityBeamVortex; import com.hbm.handler.GunConfiguration; -import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; -import com.hbm.packet.GunAnimationPacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.particle.ParticleVortexCircle; -import com.hbm.particle.ParticleVortexGlow; -import com.hbm.particle.ParticleVortexParticle; -import com.hbm.render.anim.HbmAnimations.AnimType; -import com.hbm.util.BobMathUtil; -import com.hbm.util.EntityDamageUtil; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; public class ItemGunVortex extends ItemGunBase { diff --git a/src/main/java/com/hbm/items/weapon/WeaponizedCell.java b/src/main/java/com/hbm/items/weapon/WeaponizedCell.java index e9d6a9b5e..7a359e122 100644 --- a/src/main/java/com/hbm/items/weapon/WeaponizedCell.java +++ b/src/main/java/com/hbm/items/weapon/WeaponizedCell.java @@ -5,8 +5,6 @@ import java.util.List; import com.hbm.config.WeaponConfig; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.main.MainRegistry; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/com/hbm/items/weapon/gununified/GunRealoadable.java b/src/main/java/com/hbm/items/weapon/gununified/GunRealoadable.java index 0b673d73c..d1cfc831f 100644 --- a/src/main/java/com/hbm/items/weapon/gununified/GunRealoadable.java +++ b/src/main/java/com/hbm/items/weapon/gununified/GunRealoadable.java @@ -7,10 +7,8 @@ import com.hbm.handler.HbmKeybinds; import api.hbm.item.IButtonReceiver; 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.item.ItemStack; -import net.minecraft.world.World; public class GunRealoadable extends GunFrame implements IButtonReceiver { diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 974fe7fac..9ae3bb696 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -656,7 +656,6 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleijaRainbow.class, new RenderCloudRainbow()); RenderingRegistry.registerEntityRenderingHandler(EntityCloudSolinium.class, new RenderCloudSolinium()); RenderingRegistry.registerEntityRenderingHandler(EntityCloudTom.class, new RenderCloudTom()); - RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudNoShroom.class, new RenderNoCloud()); RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout()); RenderingRegistry.registerEntityRenderingHandler(EntityBlackHole.class, new RenderBlackHole()); RenderingRegistry.registerEntityRenderingHandler(EntityVortex.class, new RenderBlackHole()); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index a48f5e8c1..7f7aa4a2a 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -985,7 +985,6 @@ public class ResourceManager { public static final ResourceLocation fireball = new ResourceLocation(RefStrings.MODID, "textures/models/explosion/fireball.png"); public static final ResourceLocation balefire = new ResourceLocation(RefStrings.MODID, "textures/models/explosion/balefire.png"); public static final ResourceLocation tomblast = new ResourceLocation(RefStrings.MODID, "textures/models/explosion/tomblast.png"); - public static final ResourceLocation dust = new ResourceLocation(RefStrings.MODID, "textures/models/explosion/dust.png"); //Boxcar public static final ResourceLocation boxcar_tex = new ResourceLocation(RefStrings.MODID, "textures/models/boxcar.png"); diff --git a/src/main/java/com/hbm/particle/ParticleCoolingTower.java b/src/main/java/com/hbm/particle/ParticleCoolingTower.java index 265d58c6d..ced14c05f 100644 --- a/src/main/java/com/hbm/particle/ParticleCoolingTower.java +++ b/src/main/java/com/hbm/particle/ParticleCoolingTower.java @@ -1,18 +1,12 @@ package com.hbm.particle; -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; import com.hbm.main.ModEventHandlerClient; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/particle/ParticleNT.java b/src/main/java/com/hbm/particle/ParticleNT.java index 6e380eeea..8d651e208 100644 --- a/src/main/java/com/hbm/particle/ParticleNT.java +++ b/src/main/java/com/hbm/particle/ParticleNT.java @@ -8,11 +8,8 @@ import net.minecraft.world.World; @SideOnly(Side.CLIENT) public class ParticleNT extends EntityFX { - private ParticleDefinition definition; - public ParticleNT(World world, double x, double y, double z, ParticleDefinition definition) { super(world, x, y, z); - this.definition = definition; } public ParticleNT(World world, double x, double y, double z, double moX, double moY, double moZ, ParticleDefinition definition) { diff --git a/src/main/java/com/hbm/particle/ParticleRadiationFog.java b/src/main/java/com/hbm/particle/ParticleRadiationFog.java index a7c2951cd..d1eb3dcea 100644 --- a/src/main/java/com/hbm/particle/ParticleRadiationFog.java +++ b/src/main/java/com/hbm/particle/ParticleRadiationFog.java @@ -22,7 +22,6 @@ public class ParticleRadiationFog extends EntityFX { private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/fog.png"); private TextureManager theRenderEngine; - private int age; private int maxAge; public ParticleRadiationFog(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) { diff --git a/src/main/java/com/hbm/render/entity/effect/BSmokeRenderer.java b/src/main/java/com/hbm/render/entity/effect/BSmokeRenderer.java index 466a77a08..66ad9eb7a 100644 --- a/src/main/java/com/hbm/render/entity/effect/BSmokeRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/BSmokeRenderer.java @@ -15,12 +15,8 @@ import net.minecraft.util.ResourceLocation; public class BSmokeRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public BSmokeRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public BSmokeRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/effect/DSmokeRenderer.java b/src/main/java/com/hbm/render/entity/effect/DSmokeRenderer.java index 74f4e2ee7..9daadd21f 100644 --- a/src/main/java/com/hbm/render/entity/effect/DSmokeRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/DSmokeRenderer.java @@ -15,12 +15,8 @@ import net.minecraft.util.ResourceLocation; public class DSmokeRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public DSmokeRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public DSmokeRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/effect/ElectricityRenderer.java b/src/main/java/com/hbm/render/entity/effect/ElectricityRenderer.java index a6901e84c..6fe82111c 100644 --- a/src/main/java/com/hbm/render/entity/effect/ElectricityRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/ElectricityRenderer.java @@ -13,12 +13,8 @@ import net.minecraft.util.ResourceLocation; public class ElectricityRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public ElectricityRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public ElectricityRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/effect/GasRenderer.java b/src/main/java/com/hbm/render/entity/effect/GasRenderer.java index d6ff25a09..456271a96 100644 --- a/src/main/java/com/hbm/render/entity/effect/GasRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/GasRenderer.java @@ -16,12 +16,8 @@ import net.minecraft.util.ResourceLocation; public class GasRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public GasRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public GasRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/effect/ModEffectRenderer.java b/src/main/java/com/hbm/render/entity/effect/ModEffectRenderer.java index 58380d534..39f136324 100644 --- a/src/main/java/com/hbm/render/entity/effect/ModEffectRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/ModEffectRenderer.java @@ -15,12 +15,8 @@ import net.minecraft.util.ResourceLocation; public class ModEffectRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public ModEffectRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public ModEffectRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/effect/MultiCloudRenderer.java b/src/main/java/com/hbm/render/entity/effect/MultiCloudRenderer.java index 103d5d5a5..cd1d6e120 100644 --- a/src/main/java/com/hbm/render/entity/effect/MultiCloudRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/MultiCloudRenderer.java @@ -17,8 +17,6 @@ import net.minecraft.util.ResourceLocation; public class MultiCloudRenderer extends Render { private Item[] field_94151_a; private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public MultiCloudRenderer(Item[] p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; this.field_94150_f = p_i1259_2_; diff --git a/src/main/java/com/hbm/render/entity/effect/RenderFireball.java b/src/main/java/com/hbm/render/entity/effect/RenderFireball.java index 693e20f8e..32036a1b4 100644 --- a/src/main/java/com/hbm/render/entity/effect/RenderFireball.java +++ b/src/main/java/com/hbm/render/entity/effect/RenderFireball.java @@ -16,13 +16,9 @@ import net.minecraft.util.ResourceLocation; public class RenderFireball extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public RenderFireball(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public RenderFireball(Item p_i1260_1_) diff --git a/src/main/java/com/hbm/render/entity/effect/RenderNoCloud.java b/src/main/java/com/hbm/render/entity/effect/RenderNoCloud.java deleted file mode 100644 index 28772b128..000000000 --- a/src/main/java/com/hbm/render/entity/effect/RenderNoCloud.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.hbm.render.entity.effect; - -import java.util.Random; - -import org.lwjgl.opengl.GL11; - -import com.hbm.entity.effect.EntityNukeCloudNoShroom; -import com.hbm.lib.RefStrings; - -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -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 RenderNoCloud extends Render { - - private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/NukeCloudSmall.obj"); - private IModelCustom blastModel; - private ResourceLocation blastTexture; - private static final ResourceLocation ringModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Ring.obj"); - private IModelCustom ringModel; - private ResourceLocation ringTexture; - private static final ResourceLocation ringBigModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/RingBig.obj"); - private IModelCustom ringBigModel; - private ResourceLocation ringBigTexture; - public float scale = 0; - public float ring = 0; - - public RenderNoCloud() { - blastModel = AdvancedModelLoader.loadModel(objTesterModelRL); - blastTexture = new ResourceLocation(RefStrings.MODID, "textures/models/NukeCloudFire.png"); - ringModel = AdvancedModelLoader.loadModel(ringModelRL); - ringTexture = new ResourceLocation(RefStrings.MODID, "textures/models/Ring2.png"); - ringBigModel = AdvancedModelLoader.loadModel(ringBigModelRL); - ringBigTexture = new ResourceLocation(RefStrings.MODID, "textures/models/Ring2.png"); - scale = 0; - ring = 0; - } - - @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - if(((EntityNukeCloudNoShroom)p_76986_1_).age > 100) - { } else { - this.renderFlare((EntityNukeCloudNoShroom)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); - } - this.renderRing((EntityNukeCloudNoShroom)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); - } - - public void renderRing(EntityNukeCloudNoShroom p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glTranslatef(0.0F, 18F, 0.0F); - //ring += 0.1F; - - bindTexture(ringTexture); - ringModel.renderAll(); - GL11.glPopMatrix(); - } - - public void renderFlare(EntityNukeCloudNoShroom p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - - Tessellator tessellator = Tessellator.instance; - RenderHelper.disableStandardItemLighting(); - float f1 = (p_76986_1_.ticksExisted + 2.0F) / 200.0F; - float f2 = 0.0F; - int count = 250; - - if(p_76986_1_.ticksExisted < 250) - { - count = p_76986_1_.ticksExisted * 3; - } - - if (f1 > 0.8F) - { - f2 = (f1 - 0.8F) / 0.2F; - } - - Random random = new Random(432L); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDepthMask(false); - GL11.glPushMatrix(); - //GL11.glTranslatef(0.0F, -1.0F, -2.0F); - GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_ + 15, (float)p_76986_6_); - GL11.glScalef(5F, 5F, 5F); - - //for (int i = 0; (float)i < (f1 + f1 * f1) / 2.0F * 60.0F; ++i) - for(int i = 0; i < count; i++) - { - GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(random.nextFloat() * 360.0F + f1 * 90.0F, 0.0F, 0.0F, 1.0F); - tessellator.startDrawing(6); - float f3 = random.nextFloat() * 20.0F + 5.0F + f2 * 10.0F; - float f4 = random.nextFloat() * 2.0F + 1.0F + f2 * 2.0F; - //tessellator.setColorRGBA_I(16777215, (int)(255.0F * (1.0F - f2))); - tessellator.setColorRGBA_I(59345715, (int)(255.0F * (1.0F - f2))); - tessellator.addVertex(0.0D, 0.0D, 0.0D); - //tessellator.setColorRGBA_I(16711935, 0); - tessellator.setColorRGBA_I(59345735, 0); - tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); - tessellator.addVertex(0.866D * f4, f3, -0.5F * f4); - tessellator.addVertex(0.0D, f3, 1.0F * f4); - tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4); - tessellator.draw(); - } - - GL11.glPopMatrix(); - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glEnable(GL11.GL_ALPHA_TEST); - RenderHelper.enableStandardItemLighting(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { - return null; - } -} diff --git a/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK3.java b/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK3.java index 411b37589..5434244c0 100644 --- a/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK3.java +++ b/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK3.java @@ -20,10 +20,8 @@ public class RenderSmallNukeMK3 extends Render { private IModelCustom blastModel; private static final ResourceLocation ringModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Ring.obj"); private IModelCustom ringModel; - private ResourceLocation ringTexture; private static final ResourceLocation ringBigModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/RingBig.obj"); private IModelCustom ringBigModel; - private ResourceLocation ringBigTexture; public float scale = 0; public float ring = 0; @@ -31,9 +29,7 @@ public class RenderSmallNukeMK3 extends Render { public RenderSmallNukeMK3() { blastModel = AdvancedModelLoader.loadModel(objTesterModelRL); ringModel = AdvancedModelLoader.loadModel(ringModelRL); - ringTexture = new ResourceLocation(RefStrings.MODID, "textures/models/explosion/Ring2.png"); ringBigModel = AdvancedModelLoader.loadModel(ringBigModelRL); - ringBigTexture = new ResourceLocation(RefStrings.MODID, "textures/models/explosion/Ring2.png"); scale = 0; ring = 0; } diff --git a/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK4.java b/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK4.java index baa4212f2..bb2f8b852 100644 --- a/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK4.java +++ b/src/main/java/com/hbm/render/entity/effect/RenderSmallNukeMK4.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; import net.minecraftforge.client.model.IModelCustom; public class RenderSmallNukeMK4 extends Render { @@ -92,22 +91,6 @@ public class RenderSmallNukeMK4 extends Render { } } - @Deprecated - private void shockwaveWrapper(EntityNukeCloudSmall cloud, float interp) { - - if(cloud.age < 300) { - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - - GL11.glShadeModel(GL11.GL_SMOOTH); - - renderShockwave((cloud.age + interp) * 0.5D); - - GL11.glShadeModel(GL11.GL_FLAT); - } - } - /** * Wrapper for the entire mush (head + stem) * Renders the entire thing twice to allow for smooth color gradients @@ -302,20 +285,6 @@ public class RenderSmallNukeMK4 extends Render { RenderHelper.enableStandardItemLighting(); } - @Deprecated - private void renderShockwave(double scale) { - - GL11.glPushMatrix(); - - double s = 3; - double timescale = 250; - - bindTexture(ResourceManager.dust); - printShockwave(scale * s, 5, 32, -(System.currentTimeMillis() % timescale * 8) / (timescale)); - - GL11.glPopMatrix(); - } - /** * Render call for the mush head model * Includes offset and smoothing @@ -407,62 +376,4 @@ public class RenderSmallNukeMK4 extends Render { tess.addVertexWithUV((double)(posX + f1 * scale - f3 * scale), (double)(posY - f5 * scale), (double)(posZ + f2 * scale - f4 * scale), 0, 1); } - - /* - * ////// ////// ////// // // ////// ////// ////// ////// - * // // // // // //// // // // // // // - * ////// //// // // //// // //// //// ////// - * // // // // // // // // // // // - * // // // ////// // // // ////// // // ////// - */ - - @Deprecated - private void printShockwave(double scale, double radius, int segments, double offset) { - - double angle = 360D / segments; - - double[][] verts = new double[12][3]; - double[][] lastverts = new double[12][3]; - - Tessellator tess = Tessellator.instance; - tess.startDrawingQuads(); - - for(int i = -1; i < segments; i++) { - - double rot = i * angle; - - for(int j = 0; j < 12; j++) { - - Vec3 vec = Vec3.createVectorHelper(radius, 0, 0); - vec.rotateAroundZ((float) Math.toRadians(360D /12D * j)); - vec.rotateAroundY((float) Math.toRadians(rot)); - - lastverts[j] = verts[j]; - verts[j] = new double[] {vec.xCoord, vec.yCoord, vec.zCoord}; - } - - if(i == -1) - continue; - - Vec3 rotor = Vec3.createVectorHelper(scale, 0, 0); - rotor.rotateAroundY((float) Math.toRadians(rot)); - Vec3 last = Vec3.createVectorHelper(scale, 0, 0); - last.rotateAroundY((float) Math.toRadians(rot - angle)); - - for(int k = 0; k < 12; k++) { - - int n = (k + 1) % 12; - - double uvlower = offset * 0.125; - double uvupper = 1 + offset * 0.125; - - tess.addVertexWithUV(lastverts[k][0] + last.xCoord, lastverts[k][1], lastverts[k][2] + last.zCoord, uvlower, 0); - tess.addVertexWithUV(verts[k][0] + rotor.xCoord, verts[k][1], verts[k][2] + rotor.zCoord, uvlower, 1); - tess.addVertexWithUV(verts[n][0] + rotor.xCoord, verts[n][1], verts[n][2] + rotor.zCoord, uvupper, 1); - tess.addVertexWithUV(lastverts[n][0] + last.xCoord, lastverts[n][1], lastverts[n][2] + last.zCoord, uvupper, 0); - } - } - - tess.draw(); - } } diff --git a/src/main/java/com/hbm/render/entity/effect/SSmokeRenderer.java b/src/main/java/com/hbm/render/entity/effect/SSmokeRenderer.java index 0c9f72881..5a4d6c3fa 100644 --- a/src/main/java/com/hbm/render/entity/effect/SSmokeRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/SSmokeRenderer.java @@ -15,12 +15,8 @@ import net.minecraft.util.ResourceLocation; public class SSmokeRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public SSmokeRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public SSmokeRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/effect/SpillRenderer.java b/src/main/java/com/hbm/render/entity/effect/SpillRenderer.java index ea036b0d0..6d492e823 100644 --- a/src/main/java/com/hbm/render/entity/effect/SpillRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/SpillRenderer.java @@ -15,12 +15,8 @@ import net.minecraft.util.ResourceLocation; public class SpillRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public SpillRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public SpillRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/effect/TSmokeRenderer.java b/src/main/java/com/hbm/render/entity/effect/TSmokeRenderer.java index 1df1b079e..263869a51 100644 --- a/src/main/java/com/hbm/render/entity/effect/TSmokeRenderer.java +++ b/src/main/java/com/hbm/render/entity/effect/TSmokeRenderer.java @@ -15,12 +15,8 @@ import net.minecraft.util.ResourceLocation; public class TSmokeRenderer extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public TSmokeRenderer(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public TSmokeRenderer(Item p_i1260_1_) { diff --git a/src/main/java/com/hbm/render/entity/item/RenderMinecartTest.java b/src/main/java/com/hbm/render/entity/item/RenderMinecartTest.java index 6b4cce5ad..f342cf664 100644 --- a/src/main/java/com/hbm/render/entity/item/RenderMinecartTest.java +++ b/src/main/java/com/hbm/render/entity/item/RenderMinecartTest.java @@ -21,8 +21,6 @@ public class RenderMinecartTest extends RenderMinecart private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/LilBoy1.obj"); private IModelCustom boyModel; private ResourceLocation boyTexture; - private static final String __OBFID = "CL_00001029"; - public RenderMinecartTest() { boyModel = AdvancedModelLoader.loadModel(objTesterModelRL); boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/LilBoy2.png"); diff --git a/src/main/java/com/hbm/render/entity/item/RenderTNTPrimedBase.java b/src/main/java/com/hbm/render/entity/item/RenderTNTPrimedBase.java index 9776f4aef..7c121733c 100644 --- a/src/main/java/com/hbm/render/entity/item/RenderTNTPrimedBase.java +++ b/src/main/java/com/hbm/render/entity/item/RenderTNTPrimedBase.java @@ -4,12 +4,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.entity.item.EntityTNTPrimedBase; -import net.minecraft.client.renderer.OpenGlHelper; 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.init.Blocks; import net.minecraft.util.ResourceLocation; public class RenderTNTPrimedBase extends Render { diff --git a/src/main/java/com/hbm/render/entity/mob/RenderDuck.java b/src/main/java/com/hbm/render/entity/mob/RenderDuck.java index 9d86576d5..88269daa4 100644 --- a/src/main/java/com/hbm/render/entity/mob/RenderDuck.java +++ b/src/main/java/com/hbm/render/entity/mob/RenderDuck.java @@ -6,7 +6,6 @@ import com.hbm.lib.RefStrings; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderChicken; import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntityChicken; import net.minecraft.util.ResourceLocation; public class RenderDuck extends RenderChicken { diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderLN2.java b/src/main/java/com/hbm/render/entity/projectile/RenderLN2.java index fe68074b5..923677c39 100644 --- a/src/main/java/com/hbm/render/entity/projectile/RenderLN2.java +++ b/src/main/java/com/hbm/render/entity/projectile/RenderLN2.java @@ -16,13 +16,9 @@ import net.minecraft.util.ResourceLocation; public class RenderLN2 extends Render { private Item field_94151_a; - private int field_94150_f; - private static final String __OBFID = "CL_00001008"; - public RenderLN2(Item p_i1259_1_, int p_i1259_2_) { this.field_94151_a = p_i1259_1_; - this.field_94150_f = p_i1259_2_; } public RenderLN2(Item p_i1260_1_) diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderRocket.java b/src/main/java/com/hbm/render/entity/projectile/RenderRocket.java index 5b9651dfc..babd06065 100644 --- a/src/main/java/com/hbm/render/entity/projectile/RenderRocket.java +++ b/src/main/java/com/hbm/render/entity/projectile/RenderRocket.java @@ -6,7 +6,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -66,216 +65,4 @@ public class RenderRocket extends Render { return null; } - - private void renderFlechette() { - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_LIGHTING); - - GL11.glScalef(1F/16F, 1F/16F, 1F/16F); - GL11.glScalef(-1, 1, 1); - - Tessellator tess = Tessellator.instance; - - //back - GL11.glColor3f(0.15F, 0.15F, 0.15F); - tess.startDrawingQuads(); - tess.addVertex(0, 1, -1); - tess.addVertex(0, -1, -1); - tess.addVertex(0, -1, 1); - tess.addVertex(0, 1, 1); - tess.draw(); - - //base - tess.startDrawingQuads(); - tess.addVertex(1, -0.5, -0.5); - tess.addVertex(0, -1, -1); - tess.addVertex(0, 1, -1); - tess.addVertex(1, 0.5, -0.5); - tess.draw(); - - tess.startDrawingQuads(); - tess.addVertex(0, -1, 1); - tess.addVertex(1, -0.5, 0.5); - tess.addVertex(1, 0.5, 0.5); - tess.addVertex(0, 1, 1); - tess.draw(); - - tess.startDrawingQuads(); - tess.addVertex(0, -1, -1); - tess.addVertex(1, -0.5, -0.5); - tess.addVertex(1, -0.5, 0.5); - tess.addVertex(0, -1, 1); - tess.draw(); - - tess.startDrawingQuads(); - tess.addVertex(1, 0.5, -0.5); - tess.addVertex(0, 1, -1); - tess.addVertex(0, 1, 1); - tess.addVertex(1, 0.5, 0.5); - tess.draw(); - - //pin - tess.startDrawing(4); - tess.addVertex(1, -0.5, -0.5); - tess.addVertex(1, 0.5, -0.5); - tess.addVertex(6, 0, 0); - tess.draw(); - - tess.startDrawing(4); - tess.addVertex(1, -0.5, 0.5); - tess.addVertex(6, 0, 0); - tess.addVertex(1, 0.5, 0.5); - tess.draw(); - - tess.startDrawing(4); - tess.addVertex(1, -0.5, -0.5); - tess.addVertex(6, 0, 0); - tess.addVertex(1, -0.5, 0.5); - tess.draw(); - - tess.startDrawing(4); - tess.addVertex(1, 0.5, -0.5); - tess.addVertex(1, 0.5, 0.5); - tess.addVertex(6, 0, 0); - tess.draw(); - - - GL11.glEnable(GL11.GL_TEXTURE_2D); - - GL11.glPopMatrix(); - } - - private void renderDart() { - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GL11.glDepthMask(false); - - GL11.glScalef(1F/4F, 1F/8F, 1F/8F); - GL11.glScalef(-1, 1, 1); - - GL11.glScalef(2, 2, 2); - - Tessellator tess = Tessellator.instance; - - float red = 0.5F; - float green = 0.5F; - float blue = 0.0F; - - //front - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(6, 0, 0); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(3, -1, -1); - tess.addVertex(3, 1, -1); - tess.draw(); - - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(3, -1, 1); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(6, 0, 0); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(3, 1, 1); - tess.draw(); - - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(3, -1, -1); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(6, 0, 0); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(3, -1, 1); - tess.draw(); - - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(6, 0, 0); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(3, 1, -1); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(3, 1, 1); - tess.draw(); - - //mid - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(6, 0, 0); - tess.addVertex(4, -0.5, -0.5); - tess.addVertex(4, 0.5, -0.5); - tess.draw(); - - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(4, -0.5, 0.5); - tess.addVertex(6, 0, 0); - tess.addVertex(4, 0.5, 0.5); - tess.draw(); - - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(4, -0.5, -0.5); - tess.addVertex(6, 0, 0); - tess.addVertex(4, -0.5, 0.5); - tess.draw(); - - tess.startDrawing(4); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(6, 0, 0); - tess.addVertex(4, 0.5, -0.5); - tess.addVertex(4, 0.5, 0.5); - tess.draw(); - - //tail - tess.startDrawingQuads(); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(4, 0.5, -0.5); - tess.addVertex(4, 0.5, 0.5); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(0, 0.5, 0.5); - tess.addVertex(0, 0.5, -0.5); - tess.draw(); - - tess.startDrawingQuads(); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(4, -0.5, -0.5); - tess.addVertex(4, -0.5, 0.5); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(0, -0.5, 0.5); - tess.addVertex(0, -0.5, -0.5); - tess.draw(); - - tess.startDrawingQuads(); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(4, -0.5, 0.5); - tess.addVertex(4, 0.5, 0.5); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(0, 0.5, 0.5); - tess.addVertex(0, -0.5, 0.5); - tess.draw(); - - tess.startDrawingQuads(); - tess.setColorRGBA_F(red, green, blue, 1); - tess.addVertex(4, -0.5, -0.5); - tess.addVertex(4, 0.5, -0.5); - tess.setColorRGBA_F(red, green, blue, 0); - tess.addVertex(0, 0.5, -0.5); - tess.addVertex(0, -0.5, -0.5); - tess.draw(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDepthMask(true); - - GL11.glPopMatrix(); - } - } \ No newline at end of file diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderVortexBeam.java b/src/main/java/com/hbm/render/entity/projectile/RenderVortexBeam.java index 5b3e3192a..5707ca936 100644 --- a/src/main/java/com/hbm/render/entity/projectile/RenderVortexBeam.java +++ b/src/main/java/com/hbm/render/entity/projectile/RenderVortexBeam.java @@ -3,7 +3,6 @@ package com.hbm.render.entity.projectile; import org.lwjgl.opengl.GL11; import com.hbm.entity.projectile.EntityBeamBase; -import com.hbm.entity.projectile.EntityLaser; import com.hbm.lib.Library; import com.hbm.render.util.BeamPronter; import com.hbm.render.util.BeamPronter.EnumBeamType; diff --git a/src/main/java/com/hbm/render/item/ItemRendererMeteorSword.java b/src/main/java/com/hbm/render/item/ItemRendererMeteorSword.java index f6a4488e6..fa0dc5387 100644 --- a/src/main/java/com/hbm/render/item/ItemRendererMeteorSword.java +++ b/src/main/java/com/hbm/render/item/ItemRendererMeteorSword.java @@ -2,7 +2,6 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.render.util.RenderItemStack; import com.hbm.render.util.RenderMiscEffects; @@ -11,7 +10,6 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; public class ItemRendererMeteorSword implements IItemRenderer { diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderChainsaw.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderChainsaw.java index 2f3aecabe..26522b8ef 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderChainsaw.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderChainsaw.java @@ -1,23 +1,15 @@ package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import com.hbm.handler.BulletConfigSyncingUtil; -import com.hbm.items.ModItems; import com.hbm.items.tool.ItemToolAbilityFueled; -import com.hbm.items.weapon.ItemGunBase; import com.hbm.main.ResourceManager; import com.hbm.render.anim.HbmAnimations; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderChainsaw implements IItemRenderer { diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java index 8b99b1496..153b07ee5 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java @@ -6,9 +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.render.model.ModelCalBarrel; -import com.hbm.render.model.ModelCalDualStock; -import com.hbm.render.model.ModelCalStock; import com.hbm.render.model.ModelDash; import com.hbm.render.model.ModelDefabricator; import com.hbm.render.model.ModelEuthanasia; diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java index 50dad76f9..c2f5b537d 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java @@ -2,19 +2,14 @@ package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; -import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; import com.hbm.render.model.ModelRevolver; 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 ItemRenderRevolverInverted implements IItemRenderer { diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java index a2ac27531..5e5b5d36d 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java @@ -3,12 +3,8 @@ package com.hbm.render.item.weapon; 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.ModelStinger; - 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; diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderTestBombAdvanced.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderTestBombAdvanced.java index 9b4c26be1..90a3275c4 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderTestBombAdvanced.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderTestBombAdvanced.java @@ -3,7 +3,6 @@ package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelTestBombAdvanced; import com.hbm.tileentity.bomb.TileEntityTestBombAdvanced; import net.minecraft.client.Minecraft; @@ -14,12 +13,6 @@ import net.minecraftforge.client.IItemRenderer; public class ItemRenderTestBombAdvanced implements IItemRenderer { - private ModelTestBombAdvanced bombModel; - - public ItemRenderTestBombAdvanced() { - bombModel = new ModelTestBombAdvanced(); - } - @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { switch(type) { diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFBolt.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFBolt.java index 232a97859..4573ea079 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFBolt.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponFFBolt.java @@ -2,11 +2,9 @@ package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; -import com.hbm.items.ModItems; import com.hbm.render.anim.HbmAnimations; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; diff --git a/src/main/java/com/hbm/render/model/ModelHunterChopper.java b/src/main/java/com/hbm/render/model/ModelHunterChopper.java index 665f6d4e7..92b83cd86 100644 --- a/src/main/java/com/hbm/render/model/ModelHunterChopper.java +++ b/src/main/java/com/hbm/render/model/ModelHunterChopper.java @@ -6,8 +6,6 @@ package com.hbm.render.model; -import com.hbm.main.MainRegistry; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/hbm/render/model/ModelM65Blaze.java b/src/main/java/com/hbm/render/model/ModelM65Blaze.java index 7ea392017..b7ff21058 100644 --- a/src/main/java/com/hbm/render/model/ModelM65Blaze.java +++ b/src/main/java/com/hbm/render/model/ModelM65Blaze.java @@ -8,8 +8,6 @@ package com.hbm.render.model; import org.lwjgl.opengl.GL11; -import com.hbm.entity.mob.EntityRADBeast; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderIGenerator.java b/src/main/java/com/hbm/render/tileentity/RenderIGenerator.java index 0586c9372..5431dc93c 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderIGenerator.java +++ b/src/main/java/com/hbm/render/tileentity/RenderIGenerator.java @@ -4,14 +4,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.blocks.BlockDummyable; import com.hbm.main.ResourceManager; -import com.hbm.render.util.BeamPronter; -import com.hbm.render.util.BeamPronter.EnumBeamType; -import com.hbm.render.util.BeamPronter.EnumWaveType; import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Vec3; public class RenderIGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/com/hbm/render/tileentity/RenderMiningDrill.java b/src/main/java/com/hbm/render/tileentity/RenderMiningDrill.java index 6868b3c46..a034556c5 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderMiningDrill.java +++ b/src/main/java/com/hbm/render/tileentity/RenderMiningDrill.java @@ -2,15 +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.TileEntityMachineMiningDrill; 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 RenderMiningDrill extends TileEntitySpecialRenderer { diff --git a/src/main/java/com/hbm/render/tileentity/RenderPuF6Tank.java b/src/main/java/com/hbm/render/tileentity/RenderPuF6Tank.java index 428cc617e..c0778fcd1 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderPuF6Tank.java +++ b/src/main/java/com/hbm/render/tileentity/RenderPuF6Tank.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 RenderPuF6Tank extends TileEntitySpecialRenderer { diff --git a/src/main/java/com/hbm/render/tileentity/RenderPylon.java b/src/main/java/com/hbm/render/tileentity/RenderPylon.java index f700bd3ed..f36a62bbf 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderPylon.java +++ b/src/main/java/com/hbm/render/tileentity/RenderPylon.java @@ -3,18 +3,11 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.main.ModEventHandler; import com.hbm.render.model.ModelPylon; import com.hbm.tileentity.network.TileEntityPylon; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; public class RenderPylon extends RenderPylonBase { diff --git a/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java b/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java index 9728ae856..bd0b153b3 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java +++ b/src/main/java/com/hbm/render/tileentity/RenderSmallReactor.java @@ -1,7 +1,5 @@ package com.hbm.render.tileentity; -import java.util.Random; - import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; diff --git a/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java b/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java index e59b535c3..78a680d52 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java +++ b/src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java @@ -5,7 +5,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; import com.hbm.tileentity.turret.TileEntityTurretHowardDamaged; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; diff --git a/src/main/java/com/hbm/render/tileentity/RenderUF6Tank.java b/src/main/java/com/hbm/render/tileentity/RenderUF6Tank.java index 42d4e9048..3bd5edba9 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderUF6Tank.java +++ b/src/main/java/com/hbm/render/tileentity/RenderUF6Tank.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 RenderUF6Tank extends TileEntitySpecialRenderer { diff --git a/src/main/java/com/hbm/render/tileentity/RendererObjTester.java b/src/main/java/com/hbm/render/tileentity/RendererObjTester.java index 4658a45ee..89465b88b 100644 --- a/src/main/java/com/hbm/render/tileentity/RendererObjTester.java +++ b/src/main/java/com/hbm/render/tileentity/RendererObjTester.java @@ -1,6 +1,5 @@ package com.hbm.render.tileentity; -import java.nio.ByteBuffer; import java.nio.FloatBuffer; import org.lwjgl.BufferUtils; @@ -9,19 +8,11 @@ import org.lwjgl.opengl.GL12; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.render.util.BeamPronter; import com.hbm.render.util.HorsePronter; -import com.hbm.render.util.RenderMiscEffects; -import com.hbm.render.util.BeamPronter.EnumBeamType; -import com.hbm.render.util.BeamPronter.EnumWaveType; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; diff --git a/src/main/java/com/hbm/tileentity/IRTGUser.java b/src/main/java/com/hbm/tileentity/IRTGUser.java index 1a41abb7f..dc6347c75 100644 --- a/src/main/java/com/hbm/tileentity/IRTGUser.java +++ b/src/main/java/com/hbm/tileentity/IRTGUser.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import com.google.common.annotations.Beta; -import com.hbm.config.MachineConfig; import com.hbm.config.VersatileConfig; import com.hbm.interfaces.Untested; diff --git a/src/main/java/com/hbm/tileentity/IRadioisotopeFuel.java b/src/main/java/com/hbm/tileentity/IRadioisotopeFuel.java index b8a1e61dd..829bfba2f 100644 --- a/src/main/java/com/hbm/tileentity/IRadioisotopeFuel.java +++ b/src/main/java/com/hbm/tileentity/IRadioisotopeFuel.java @@ -5,10 +5,8 @@ import java.util.List; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import com.hbm.config.MachineConfig; import com.hbm.config.VersatileConfig; import com.hbm.interfaces.ICustomWarhead.SaltedFuel.HalfLifeType; -import com.hbm.lib.Library; import com.hbm.util.BobMathUtil; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/tileentity/TileEntityProxyBase.java b/src/main/java/com/hbm/tileentity/TileEntityProxyBase.java index 0bcf59043..3d3cdfb8c 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityProxyBase.java +++ b/src/main/java/com/hbm/tileentity/TileEntityProxyBase.java @@ -1,7 +1,6 @@ package com.hbm.tileentity; import com.hbm.blocks.BlockDummyable; -import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.BlockHadronAccess; import com.hbm.tileentity.machine.TileEntityHadron; diff --git a/src/main/java/com/hbm/tileentity/TileEntityTickingBase.java b/src/main/java/com/hbm/tileentity/TileEntityTickingBase.java index cc82f97ee..aa11fb99a 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityTickingBase.java +++ b/src/main/java/com/hbm/tileentity/TileEntityTickingBase.java @@ -5,7 +5,6 @@ import com.hbm.packet.PacketDispatcher; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidTank; public abstract class TileEntityTickingBase extends TileEntityLoadedBase implements INBTPacketReceiver { diff --git a/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java b/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java index 60ede37f4..f169b7647 100644 --- a/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java +++ b/src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java @@ -1,25 +1,7 @@ package com.hbm.tileentity.conductor; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.interfaces.IFluidDuct; -import com.hbm.inventory.fluid.FluidType; -import com.hbm.inventory.fluid.Fluids; -import com.hbm.lib.Library; -import com.hbm.packet.PacketDispatcher; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; public class TileEntityFluidDuct extends TileEntityFluidDuctSimple { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java index f8db39c17..47dd95969 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java @@ -235,7 +235,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent if(slots[15] != null && ISatChip.getFreqS(slots[15]) != rocket.getDataWatcher().getWatchableObjectInt(17)) { rocket.setDead(); - ExplosionNukeSmall.explode(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, ExplosionNukeSmall.tots); + ExplosionNukeSmall.explode(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, ExplosionNukeSmall.PARAMS_TOTS); break; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java index 76432878f..fb48aebab 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java @@ -25,8 +25,6 @@ import net.minecraft.world.World; public class TileEntityReactorControl extends TileEntityMachineBase implements IControlReceiver, IGUIProvider { - private static final int[] slots_io = new int[] {0}; - public TileEntityReactorControl() { super(1); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java index e3e1d2b4d..2ceec4118 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntitySolarBoiler.java @@ -16,7 +16,6 @@ import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; diff --git a/src/main/java/com/hbm/tileentity/machine/pile/TileEntityPileNeutronDetector.java b/src/main/java/com/hbm/tileentity/machine/pile/TileEntityPileNeutronDetector.java index 421f14eb2..c05f164fd 100644 --- a/src/main/java/com/hbm/tileentity/machine/pile/TileEntityPileNeutronDetector.java +++ b/src/main/java/com/hbm/tileentity/machine/pile/TileEntityPileNeutronDetector.java @@ -1,12 +1,10 @@ package com.hbm.tileentity.machine.pile; import api.hbm.block.IPileNeutronReceiver; -import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.pile.BlockGraphiteNeutronDetector; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; public class TileEntityPileNeutronDetector extends TileEntity implements IPileNeutronReceiver { diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java index b3426410c..26536ffb5 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretHowardDamaged.java @@ -2,8 +2,6 @@ package com.hbm.tileentity.turret; import com.hbm.config.WeaponConfig; import com.hbm.handler.guncfg.GunDGKFactory; -import com.hbm.inventory.container.ContainerTurretBase; -import com.hbm.inventory.gui.GUITurretHoward; import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/world/dungeon/Antenna.java b/src/main/java/com/hbm/world/dungeon/Antenna.java index d33529077..b3832a1ab 100644 --- a/src/main/java/com/hbm/world/dungeon/Antenna.java +++ b/src/main/java/com/hbm/world/dungeon/Antenna.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/world/dungeon/Barrel.java b/src/main/java/com/hbm/world/dungeon/Barrel.java index 59a4da103..40f80cd9f 100644 --- a/src/main/java/com/hbm/world/dungeon/Barrel.java +++ b/src/main/java/com/hbm/world/dungeon/Barrel.java @@ -8,7 +8,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntitySellafield; import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; diff --git a/src/main/java/com/hbm/world/dungeon/Bunker.java b/src/main/java/com/hbm/world/dungeon/Bunker.java index 35b897e0f..3290d5ebd 100644 --- a/src/main/java/com/hbm/world/dungeon/Bunker.java +++ b/src/main/java/com/hbm/world/dungeon/Bunker.java @@ -10,8 +10,6 @@ import com.hbm.blocks.generic.BlockBobble.TileEntityBobble; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java b/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java index 5364d5fc3..d171f253b 100644 --- a/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java +++ b/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java index d00d76cfc..23104ddd3 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java @@ -8,7 +8,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank; import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank; diff --git a/src/main/java/com/hbm/world/dungeon/LibraryDungeon.java b/src/main/java/com/hbm/world/dungeon/LibraryDungeon.java index 9e0207bea..b02116528 100644 --- a/src/main/java/com/hbm/world/dungeon/LibraryDungeon.java +++ b/src/main/java/com/hbm/world/dungeon/LibraryDungeon.java @@ -7,8 +7,6 @@ import static net.minecraftforge.common.ChestGenHooks.DUNGEON_CHEST; import java.util.Random; import com.hbm.config.GeneralConfig; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntityChest; diff --git a/src/main/java/com/hbm/world/dungeon/Radio02.java b/src/main/java/com/hbm/world/dungeon/Radio02.java index 5d3d713b7..0bf878a73 100644 --- a/src/main/java/com/hbm/world/dungeon/Radio02.java +++ b/src/main/java/com/hbm/world/dungeon/Radio02.java @@ -6,8 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; -import com.hbm.main.MainRegistry; - import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/world/dungeon/Silo.java b/src/main/java/com/hbm/world/dungeon/Silo.java index 5a96b2169..fba097d42 100644 --- a/src/main/java/com/hbm/world/dungeon/Silo.java +++ b/src/main/java/com/hbm/world/dungeon/Silo.java @@ -8,8 +8,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/world/dungeon/Vertibird.java b/src/main/java/com/hbm/world/dungeon/Vertibird.java index fd44ba091..a8b09f4b0 100644 --- a/src/main/java/com/hbm/world/dungeon/Vertibird.java +++ b/src/main/java/com/hbm/world/dungeon/Vertibird.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; -import com.hbm.main.MainRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/world/feature/Meteorite.java b/src/main/java/com/hbm/world/feature/Meteorite.java index 47c856c27..3f78561a6 100644 --- a/src/main/java/com/hbm/world/feature/Meteorite.java +++ b/src/main/java/com/hbm/world/feature/Meteorite.java @@ -9,6 +9,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.config.WorldConfig; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionNukeSmall; +import com.hbm.interfaces.Spaghetti; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; @@ -19,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +@Spaghetti("why") public class Meteorite { public static boolean safeMode = false; @@ -120,7 +122,7 @@ public class Meteorite { case 11: // Atomic meteorite - ExplosionNukeSmall.explode(world, x + 0.5, y + 0.5, z + 0.5, safe ? ExplosionNukeSmall.safe : ExplosionNukeSmall.medium); + ExplosionNukeSmall.explode(world, x + 0.5, y + 0.5, z + 0.5, safe ? ExplosionNukeSmall.PARAMS_SAFE : ExplosionNukeSmall.PARAMS_MEDIUM); return; case 12: // Star Blaster diff --git a/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java b/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java index 302c57c88..59d68d846 100644 --- a/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java +++ b/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java @@ -12,9 +12,6 @@ import com.hbm.world.generator.DungeonToolbox; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; import net.minecraft.world.World; public class TestDungeonRoom8 extends CellularDungeonRoom { diff --git a/src/main/java/com/hbm/world/worldgen/components/Component.java b/src/main/java/com/hbm/world/worldgen/components/Component.java index fb9c13813..9c6c8e527 100644 --- a/src/main/java/com/hbm/world/worldgen/components/Component.java +++ b/src/main/java/com/hbm/world/worldgen/components/Component.java @@ -10,10 +10,7 @@ import com.hbm.config.StructureConfig; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBookLore.BookLoreType; -import com.hbm.lib.HbmChestContents; import com.hbm.tileentity.machine.TileEntityLockableBase; -import com.hbm.tileentity.machine.storage.TileEntityCrateIron; - import net.minecraft.block.Block; import net.minecraft.block.BlockWeb; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/world/worldgen/components/OfficeFeatures.java b/src/main/java/com/hbm/world/worldgen/components/OfficeFeatures.java index 25bba3f1b..22ad5fead 100644 --- a/src/main/java/com/hbm/world/worldgen/components/OfficeFeatures.java +++ b/src/main/java/com/hbm/world/worldgen/components/OfficeFeatures.java @@ -5,8 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.HbmChestContents; import com.hbm.util.LootGenerator; -import com.hbm.world.worldgen.components.Component.ConcreteBricks; - import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/world/worldgen/components/ProceduralComponents.java b/src/main/java/com/hbm/world/worldgen/components/ProceduralComponents.java index 172f3ea80..4bf1f4801 100644 --- a/src/main/java/com/hbm/world/worldgen/components/ProceduralComponents.java +++ b/src/main/java/com/hbm/world/worldgen/components/ProceduralComponents.java @@ -5,10 +5,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import com.hbm.world.worldgen.components.ProceduralComponents.ControlComponent; - import net.minecraft.world.gen.structure.StructureBoundingBox; -import net.minecraft.world.gen.structure.StructureComponent; public abstract class ProceduralComponents {