From 57d0185e7329bbacff4562f404777cee4464c2c9 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 22 Mar 2020 21:38:06 +0100 Subject: [PATCH] did some code cleanup, radiation system now uses hashmaps --- com/hbm/blocks/bomb/BlockCloudResidue.java | 8 - com/hbm/blocks/bomb/BlockCrashedBomb.java | 3 - com/hbm/blocks/bomb/BombRejuvinator.java | 11 -- com/hbm/blocks/bomb/LaunchPad.java | 1 - com/hbm/blocks/bomb/NukeBoy.java | 1 - com/hbm/blocks/bomb/NukeCustom.java | 3 - com/hbm/blocks/bomb/NukeFleija.java | 2 - com/hbm/blocks/bomb/NukeGadget.java | 2 - com/hbm/blocks/bomb/NukeMan.java | 2 - com/hbm/blocks/bomb/NukeMike.java | 3 - com/hbm/blocks/bomb/NukeN2.java | 4 - com/hbm/blocks/bomb/NukeN45.java | 6 - com/hbm/blocks/bomb/NukePrototype.java | 1 - com/hbm/blocks/bomb/NukeSolinium.java | 1 - com/hbm/blocks/bomb/NukeTsar.java | 2 - com/hbm/blocks/bomb/TurretCIWS.java | 3 - com/hbm/blocks/bomb/TurretFlamer.java | 3 - com/hbm/blocks/bomb/TurretSpitfire.java | 3 - com/hbm/blocks/fluid/MudBlock.java | 6 - com/hbm/blocks/fluid/ToxicBlock.java | 8 - com/hbm/blocks/generic/BlockClorine.java | 2 - com/hbm/blocks/generic/BlockFallingRad.java | 1 - com/hbm/blocks/generic/BlockOre.java | 10 -- com/hbm/blocks/generic/DecoTapeRecorder.java | 3 - com/hbm/blocks/generic/WasteEarth.java | 8 - com/hbm/blocks/machine/BlastDoor.java | 1 - com/hbm/blocks/machine/BlockAMSBase.java | 1 - com/hbm/blocks/machine/BlockAMSEmitter.java | 1 - com/hbm/blocks/machine/BlockAMSLimiter.java | 1 - com/hbm/blocks/machine/BlockDecon.java | 3 - com/hbm/blocks/machine/DummyBlockAMSBase.java | 1 - .../blocks/machine/DummyBlockAMSEmitter.java | 1 - .../blocks/machine/DummyBlockAMSLimiter.java | 1 - .../blocks/machine/DummyBlockFluidTank.java | 1 - com/hbm/blocks/machine/DummyBlockMachine.java | 3 - .../blocks/machine/DummyBlockPumpjack.java | 1 - com/hbm/blocks/machine/DummyBlockRadGen.java | 1 - .../blocks/machine/DummyBlockRefinery.java | 1 - .../blocks/machine/DummyBlockTurbofan.java | 1 - com/hbm/blocks/machine/DummyBlockVault.java | 3 - com/hbm/blocks/machine/MachineArcFurnace.java | 2 - com/hbm/blocks/machine/MachineBoiler.java | 4 - com/hbm/blocks/machine/MachineChemplant.java | 1 - com/hbm/blocks/machine/MachineCoal.java | 2 - com/hbm/blocks/machine/MachineDeuterium.java | 2 - com/hbm/blocks/machine/MachineEPress.java | 2 - .../machine/MachineElectricFurnace.java | 2 - com/hbm/blocks/machine/MachineFluidTank.java | 1 - com/hbm/blocks/machine/MachineForceField.java | 2 - com/hbm/blocks/machine/MachineRadGen.java | 1 - .../blocks/machine/MachineReactorControl.java | 2 - .../blocks/machine/MachineReactorSmall.java | 1 - com/hbm/blocks/machine/MachineRefinery.java | 6 - .../blocks/machine/MachineSeleniumEngine.java | 2 - com/hbm/blocks/machine/MachineSiren.java | 1 - com/hbm/blocks/machine/MachineTeleLinker.java | 2 - .../blocks/machine/MachineTransformer.java | 1 - com/hbm/blocks/machine/MachineTurbofan.java | 2 - .../blocks/machine/PinkCloudBroadcaster.java | 1 - com/hbm/blocks/machine/RadioRec.java | 3 - com/hbm/blocks/machine/Radiobox.java | 5 - com/hbm/blocks/test/TestEventTester.java | 106 +----------- com/hbm/blocks/test/TestMissile.java | 2 - com/hbm/blocks/test/TestNuke.java | 4 - com/hbm/creativetabs/ControlTab.java | 1 - com/hbm/creativetabs/MissileTab.java | 1 - com/hbm/creativetabs/TemplateTab.java | 1 - com/hbm/creativetabs/WeaponTab.java | 1 - .../entity/grenade/EntityGrenadeASchrab.java | 1 - .../grenade/EntityGrenadeBlackHole.java | 1 - .../entity/grenade/EntityGrenadeIFNull.java | 2 - com/hbm/entity/grenade/EntityGrenadeMIRV.java | 5 - .../entity/grenade/EntityGrenadeNuclear.java | 2 - com/hbm/entity/logic/EntityBalefire.java | 4 - com/hbm/entity/logic/EntityBomber.java | 3 - com/hbm/entity/logic/EntityEMP.java | 4 - .../logic/EntityNukeExplosionAdvanced.java | 5 - com/hbm/entity/missile/EntityBobmazon.java | 3 - .../entity/missile/EntityBombletSelena.java | 6 - .../entity/missile/EntityBombletTheta.java | 4 - com/hbm/entity/missile/EntityBooster.java | 7 - com/hbm/entity/missile/EntityCarrier.java | 9 - com/hbm/entity/missile/EntityMIRV.java | 2 - .../missile/EntityMissileAntiBallistic.java | 3 - .../entity/missile/EntityMissileBHole.java | 7 - .../entity/missile/EntityMissileDrill.java | 2 - com/hbm/entity/missile/EntityMissileEMP.java | 8 - .../missile/EntityMissileEMPStrong.java | 1 - com/hbm/entity/missile/EntityMissileEndo.java | 2 - com/hbm/entity/missile/EntityMissileExo.java | 2 - .../entity/missile/EntityMissileGeneric.java | 2 - .../missile/EntityMissileIncendiary.java | 4 - .../EntityMissileIncendiaryStrong.java | 2 - .../entity/missile/EntityMissileInferno.java | 2 - .../entity/missile/EntityMissileMicro.java | 4 - com/hbm/entity/missile/EntityMissileMirv.java | 5 - .../entity/missile/EntityMissileNuclear.java | 4 - com/hbm/entity/missile/EntityMissileRain.java | 2 - .../missile/EntityMissileSchrabidium.java | 6 - .../entity/missile/EntityMissileStrong.java | 2 - com/hbm/entity/mob/EntityNuclearCreeper.java | 66 +------- com/hbm/entity/particle/EntityOrangeFX.java | 2 - .../entity/projectile/EntityBaleflare.java | 1 - .../entity/projectile/EntityBombletZeta.java | 3 - com/hbm/entity/projectile/EntityBoxcar.java | 4 - com/hbm/entity/projectile/EntityBullet.java | 1 - .../entity/projectile/EntityBurningFOEQ.java | 9 - .../projectile/EntityDuchessGambit.java | 4 - .../projectile/EntityExplosiveBeam.java | 13 -- .../entity/projectile/EntityFallingNuke.java | 10 -- com/hbm/entity/projectile/EntityMeteor.java | 4 - com/hbm/entity/projectile/EntityModBeam.java | 5 - .../entity/projectile/EntityRocketHoming.java | 5 - .../entity/projectile/EntityWaterSplash.java | 1 - com/hbm/explosion/ExplosionChaos.java | 121 +++++--------- com/hbm/explosion/ExplosionNukeGeneric.java | 18 -- com/hbm/explosion/ExplosionSolinium.java | 3 - com/hbm/explosion/ExplosionTom.java | 8 - com/hbm/handler/nei/BoilerRecipeHandler.java | 10 -- .../handler/nei/ChemplantRecipeHandler.java | 9 - .../nei/GasCentrifugeRecipeHandler.java | 9 - com/hbm/handler/nei/ModInfoHandler.java | 12 -- .../handler/nei/RefineryRecipeHandler.java | 2 - com/hbm/interfaces/IDummy.java | 1 + .../inventory/gui/GUIScreenSatInterface.java | 12 -- com/hbm/items/food/ItemWaffle.java | 1 - com/hbm/items/gear/ModArmor.java | 5 - com/hbm/items/special/ItemCell.java | 3 - com/hbm/items/special/ItemDrop.java | 1 - com/hbm/items/special/ItemTaintBlock.java | 3 - com/hbm/items/tool/ItemCatalog.java | 6 +- com/hbm/items/tool/ItemLaserDetonator.java | 2 - com/hbm/items/tool/ItemLock.java | 5 - com/hbm/items/tool/ItemMeteorRemote.java | 2 - com/hbm/items/tool/ItemTurretBiometry.java | 6 - com/hbm/items/tool/ItemTurretControl.java | 6 - com/hbm/items/weapon/GunBrimstone.java | 3 - com/hbm/items/weapon/GunDampfmaschine.java | 5 - com/hbm/items/weapon/GunFolly.java | 3 - com/hbm/items/weapon/ItemGunGauss.java | 25 --- com/hbm/items/weapon/ItemGunLacunae.java | 29 ---- com/hbm/render/entity/MultiCloudRenderer.java | 3 - com/hbm/render/entity/RenderBullet.java | 1 - com/hbm/render/entity/RenderCloudRainbow.java | 1 - com/hbm/render/entity/RenderDeathBlast.java | 1 - .../render/entity/RenderMissileCustom.java | 5 - com/hbm/render/entity/RenderSRocket.java | 2 - com/hbm/render/entity/RenderSmallNukeMK3.java | 4 - .../render/item/ItemRenderMissilePart.java | 12 -- com/hbm/saveddata/RadiationSaveStructure.java | 35 ---- com/hbm/saveddata/RadiationSavedData.java | 157 +++++++----------- .../conductor/TileEntityFluidDuct.java | 1 - .../conductor/TileEntityGasDuct.java | 3 - .../conductor/TileEntityGasDuctSolid.java | 2 - .../conductor/TileEntityOilDuct.java | 3 - .../conductor/TileEntityOilDuctSolid.java | 2 - com/hbm/tileentity/deco/TileEntityGeysir.java | 1 - .../deco/TileEntityYellowBarrel.java | 20 --- .../tileentity/machine/TileEntityAMSBase.java | 3 - .../machine/TileEntityConverterRfHe.java | 1 - .../machine/TileEntityCrateIron.java | 8 - .../machine/TileEntityForceField.java | 4 - .../machine/TileEntityMachineArcFurnace.java | 1 + .../machine/TileEntityMachineBoiler.java | 7 - .../machine/TileEntityMachineDiesel.java | 1 - .../machine/TileEntityMachineReactor.java | 1 - .../TileEntityMachineReactorSmall.java | 11 -- .../TileEntityMachineReactorSmallOld.java | 6 - .../TileEntityMachineSeleniumEngine.java | 1 - .../machine/TileEntityMachineTurbofan.java | 4 - .../machine/TileEntityReactorMultiblock.java | 16 -- 171 files changed, 125 insertions(+), 1025 deletions(-) delete mode 100644 com/hbm/saveddata/RadiationSaveStructure.java diff --git a/com/hbm/blocks/bomb/BlockCloudResidue.java b/com/hbm/blocks/bomb/BlockCloudResidue.java index 39f2443f5..0b7ab3264 100644 --- a/com/hbm/blocks/bomb/BlockCloudResidue.java +++ b/com/hbm/blocks/bomb/BlockCloudResidue.java @@ -1,22 +1,14 @@ package com.hbm.blocks.bomb; -import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; 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.block.material.MapColor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.world.World; public class BlockCloudResidue extends Block { diff --git a/com/hbm/blocks/bomb/BlockCrashedBomb.java b/com/hbm/blocks/bomb/BlockCrashedBomb.java index 3137c6b11..b7797bd67 100644 --- a/com/hbm/blocks/bomb/BlockCrashedBomb.java +++ b/com/hbm/blocks/bomb/BlockCrashedBomb.java @@ -4,9 +4,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.logic.EntityBalefire; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.explosion.ExplosionParticleB; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/BombRejuvinator.java b/com/hbm/blocks/bomb/BombRejuvinator.java index 5a276ed04..8be767d15 100644 --- a/com/hbm/blocks/bomb/BombRejuvinator.java +++ b/com/hbm/blocks/bomb/BombRejuvinator.java @@ -2,26 +2,15 @@ package com.hbm.blocks.bomb; import java.util.Random; -import com.hbm.blocks.ModBlocks; -import com.hbm.explosion.ExplosionChaos; import com.hbm.interfaces.IBomb; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineInserter; -import com.hbm.tileentity.machine.TileEntityNukeFurnace; -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.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; diff --git a/com/hbm/blocks/bomb/LaunchPad.java b/com/hbm/blocks/bomb/LaunchPad.java index ca248d799..77067b302 100644 --- a/com/hbm/blocks/bomb/LaunchPad.java +++ b/com/hbm/blocks/bomb/LaunchPad.java @@ -5,7 +5,6 @@ import java.util.Random; import org.apache.logging.log4j.Level; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.logic.EntityMissileTest; import com.hbm.entity.missile.EntityCarrier; import com.hbm.entity.missile.EntityMissileAntiBallistic; import com.hbm.entity.missile.EntityMissileBHole; diff --git a/com/hbm/blocks/bomb/NukeBoy.java b/com/hbm/blocks/bomb/NukeBoy.java index d3ec2ac36..e2aff8edc 100644 --- a/com/hbm/blocks/bomb/NukeBoy.java +++ b/com/hbm/blocks/bomb/NukeBoy.java @@ -5,7 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/NukeCustom.java b/com/hbm/blocks/bomb/NukeCustom.java index d8c0779c6..4e2c96565 100644 --- a/com/hbm/blocks/bomb/NukeCustom.java +++ b/com/hbm/blocks/bomb/NukeCustom.java @@ -9,9 +9,6 @@ import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.grenade.EntityGrenadeZOMG; import com.hbm.entity.logic.EntityNukeExplosionPlus; -import com.hbm.entity.missile.EntityMIRV; -import com.hbm.entity.particle.EntityDSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.entity.projectile.EntityFallingNuke; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; diff --git a/com/hbm/blocks/bomb/NukeFleija.java b/com/hbm/blocks/bomb/NukeFleija.java index d25765ae1..5cda2dccb 100644 --- a/com/hbm/blocks/bomb/NukeFleija.java +++ b/com/hbm/blocks/bomb/NukeFleija.java @@ -6,8 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.effect.EntityCloudFleijaRainbow; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/NukeGadget.java b/com/hbm/blocks/bomb/NukeGadget.java index 08d20ae5c..56d8804b1 100644 --- a/com/hbm/blocks/bomb/NukeGadget.java +++ b/com/hbm/blocks/bomb/NukeGadget.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/NukeMan.java b/com/hbm/blocks/bomb/NukeMan.java index a95becd36..c4d1d4226 100644 --- a/com/hbm/blocks/bomb/NukeMan.java +++ b/com/hbm/blocks/bomb/NukeMan.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/NukeMike.java b/com/hbm/blocks/bomb/NukeMike.java index 2116e56a4..4dc26c169 100644 --- a/com/hbm/blocks/bomb/NukeMike.java +++ b/com/hbm/blocks/bomb/NukeMike.java @@ -5,11 +5,8 @@ import java.util.Map; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.effect.EntityNukeCloudBig; import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/NukeN2.java b/com/hbm/blocks/bomb/NukeN2.java index 35898297d..711259f73 100644 --- a/com/hbm/blocks/bomb/NukeN2.java +++ b/com/hbm/blocks/bomb/NukeN2.java @@ -1,13 +1,9 @@ package com.hbm.blocks.bomb; -import java.util.HashMap; -import java.util.Map; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.effect.EntityCloudSolinium; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/NukeN45.java b/com/hbm/blocks/bomb/NukeN45.java index 90855e18d..989750ebb 100644 --- a/com/hbm/blocks/bomb/NukeN45.java +++ b/com/hbm/blocks/bomb/NukeN45.java @@ -1,22 +1,16 @@ package com.hbm.blocks.bomb; -import java.util.HashMap; -import java.util.Map; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.bomb.TileEntityNukeN2; import com.hbm.tileentity.bomb.TileEntityNukeN45; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; 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; diff --git a/com/hbm/blocks/bomb/NukePrototype.java b/com/hbm/blocks/bomb/NukePrototype.java index e4c4cb38b..8f5ce631e 100644 --- a/com/hbm/blocks/bomb/NukePrototype.java +++ b/com/hbm/blocks/bomb/NukePrototype.java @@ -6,7 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.interfaces.IBomb; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/bomb/NukeSolinium.java b/com/hbm/blocks/bomb/NukeSolinium.java index 5a6edec42..3df200e73 100644 --- a/com/hbm/blocks/bomb/NukeSolinium.java +++ b/com/hbm/blocks/bomb/NukeSolinium.java @@ -5,7 +5,6 @@ import java.util.Map; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.effect.EntityCloudSolinium; import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.interfaces.IBomb; diff --git a/com/hbm/blocks/bomb/NukeTsar.java b/com/hbm/blocks/bomb/NukeTsar.java index 1b0efa047..882d74d70 100644 --- a/com/hbm/blocks/bomb/NukeTsar.java +++ b/com/hbm/blocks/bomb/NukeTsar.java @@ -6,8 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; diff --git a/com/hbm/blocks/bomb/TurretCIWS.java b/com/hbm/blocks/bomb/TurretCIWS.java index 6076cbcfd..528f9d0fe 100644 --- a/com/hbm/blocks/bomb/TurretCIWS.java +++ b/com/hbm/blocks/bomb/TurretCIWS.java @@ -3,12 +3,9 @@ package com.hbm.blocks.bomb; import java.util.List; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntityTurretCIWS; -import com.hbm.tileentity.bomb.TileEntityTurretCheapo; -import com.hbm.tileentity.bomb.TileEntityTurretSpitfire; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/com/hbm/blocks/bomb/TurretFlamer.java b/com/hbm/blocks/bomb/TurretFlamer.java index f3e4a5b41..8c26601fb 100644 --- a/com/hbm/blocks/bomb/TurretFlamer.java +++ b/com/hbm/blocks/bomb/TurretFlamer.java @@ -1,10 +1,7 @@ package com.hbm.blocks.bomb; -import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityFire; import com.hbm.tileentity.bomb.TileEntityTurretFlamer; -import com.hbm.tileentity.bomb.TileEntityTurretHeavy; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/bomb/TurretSpitfire.java b/com/hbm/blocks/bomb/TurretSpitfire.java index 2ecc234e4..41a650d14 100644 --- a/com/hbm/blocks/bomb/TurretSpitfire.java +++ b/com/hbm/blocks/bomb/TurretSpitfire.java @@ -1,11 +1,8 @@ package com.hbm.blocks.bomb; -import com.hbm.entity.particle.EntityDSmokeFX; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.projectile.EntityAAShell; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.tileentity.bomb.TileEntityTurretSpitfire; -import com.hbm.tileentity.bomb.TileEntityTurretTau; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/fluid/MudBlock.java b/com/hbm/blocks/fluid/MudBlock.java index 77cdc58a8..57ed6b74d 100644 --- a/com/hbm/blocks/fluid/MudBlock.java +++ b/com/hbm/blocks/fluid/MudBlock.java @@ -3,7 +3,6 @@ package com.hbm.blocks.fluid; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.lib.RefStrings; @@ -13,11 +12,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.DamageSource; diff --git a/com/hbm/blocks/fluid/ToxicBlock.java b/com/hbm/blocks/fluid/ToxicBlock.java index 168df42cd..5a6b0ba15 100644 --- a/com/hbm/blocks/fluid/ToxicBlock.java +++ b/com/hbm/blocks/fluid/ToxicBlock.java @@ -3,9 +3,7 @@ package com.hbm.blocks.fluid; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; import com.hbm.lib.RefStrings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -13,12 +11,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; diff --git a/com/hbm/blocks/generic/BlockClorine.java b/com/hbm/blocks/generic/BlockClorine.java index 58cafa17f..eaa11a604 100644 --- a/com/hbm/blocks/generic/BlockClorine.java +++ b/com/hbm/blocks/generic/BlockClorine.java @@ -2,7 +2,6 @@ package com.hbm.blocks.generic; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; @@ -17,7 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Facing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/com/hbm/blocks/generic/BlockFallingRad.java b/com/hbm/blocks/generic/BlockFallingRad.java index 58bb4b6e7..41bb797fd 100644 --- a/com/hbm/blocks/generic/BlockFallingRad.java +++ b/com/hbm/blocks/generic/BlockFallingRad.java @@ -2,7 +2,6 @@ package com.hbm.blocks.generic; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.saveddata.RadiationSavedData; import net.minecraft.block.BlockFalling; diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index 17d816990..2f764d4c3 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -3,10 +3,7 @@ package com.hbm.blocks.generic; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.items.ModItems; -import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; import com.hbm.potion.HbmPotion; import com.hbm.saveddata.RadiationSavedData; @@ -16,18 +13,11 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityCow; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class BlockOre extends Block { diff --git a/com/hbm/blocks/generic/DecoTapeRecorder.java b/com/hbm/blocks/generic/DecoTapeRecorder.java index b8604cad0..80074dbcc 100644 --- a/com/hbm/blocks/generic/DecoTapeRecorder.java +++ b/com/hbm/blocks/generic/DecoTapeRecorder.java @@ -1,8 +1,5 @@ package com.hbm.blocks.generic; -import com.hbm.blocks.ModBlocks; -import com.hbm.tileentity.deco.TileEntityDecoTapeRecorder; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/generic/WasteEarth.java b/com/hbm/blocks/generic/WasteEarth.java index 975b306b7..ff8f7f9e2 100644 --- a/com/hbm/blocks/generic/WasteEarth.java +++ b/com/hbm/blocks/generic/WasteEarth.java @@ -3,8 +3,6 @@ package com.hbm.blocks.generic; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.mob.EntityNuclearCreeper; -import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.potion.HbmPotion; @@ -18,12 +16,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityCow; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/com/hbm/blocks/machine/BlastDoor.java b/com/hbm/blocks/machine/BlastDoor.java index 37082e8b4..384b810cf 100644 --- a/com/hbm/blocks/machine/BlastDoor.java +++ b/com/hbm/blocks/machine/BlastDoor.java @@ -5,7 +5,6 @@ import com.hbm.interfaces.IMultiblock; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemLock; import com.hbm.tileentity.machine.TileEntityBlastDoor; -import com.hbm.tileentity.machine.TileEntityVaultDoor; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/machine/BlockAMSBase.java b/com/hbm/blocks/machine/BlockAMSBase.java index 5f20487a3..b5b81d8b3 100644 --- a/com/hbm/blocks/machine/BlockAMSBase.java +++ b/com/hbm/blocks/machine/BlockAMSBase.java @@ -5,7 +5,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSBase; -import com.hbm.tileentity.machine.TileEntityAMSEmitter; import com.hbm.tileentity.machine.TileEntityDummy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/BlockAMSEmitter.java b/com/hbm/blocks/machine/BlockAMSEmitter.java index 3876651c4..f3b55ed50 100644 --- a/com/hbm/blocks/machine/BlockAMSEmitter.java +++ b/com/hbm/blocks/machine/BlockAMSEmitter.java @@ -5,7 +5,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSEmitter; -import com.hbm.tileentity.machine.TileEntityAMSLimiter; import com.hbm.tileentity.machine.TileEntityDummy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/BlockAMSLimiter.java b/com/hbm/blocks/machine/BlockAMSLimiter.java index 320b942f1..bd4581e73 100644 --- a/com/hbm/blocks/machine/BlockAMSLimiter.java +++ b/com/hbm/blocks/machine/BlockAMSLimiter.java @@ -5,7 +5,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSLimiter; -import com.hbm.tileentity.machine.TileEntityConverterHeRf; import com.hbm.tileentity.machine.TileEntityDummy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/BlockDecon.java b/com/hbm/blocks/machine/BlockDecon.java index c8a039efd..3aeb909a5 100644 --- a/com/hbm/blocks/machine/BlockDecon.java +++ b/com/hbm/blocks/machine/BlockDecon.java @@ -2,10 +2,8 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityDecon; -import com.hbm.tileentity.machine.TileEntityMachineDeuterium; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -48,7 +46,6 @@ public class BlockDecon extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World p_149734_1_, int x, int y, int z, Random rand) { - int l = p_149734_1_.getBlockMetadata(x, y, z); float f = x + 0.5F; float f1 = y + 1.0F; float f2 = z + 0.5F; diff --git a/com/hbm/blocks/machine/DummyBlockAMSBase.java b/com/hbm/blocks/machine/DummyBlockAMSBase.java index 4eb3fd137..302dbaaf0 100644 --- a/com/hbm/blocks/machine/DummyBlockAMSBase.java +++ b/com/hbm/blocks/machine/DummyBlockAMSBase.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSBase; -import com.hbm.tileentity.machine.TileEntityAMSEmitter; import com.hbm.tileentity.machine.TileEntityDummy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/DummyBlockAMSEmitter.java b/com/hbm/blocks/machine/DummyBlockAMSEmitter.java index e4b40fa78..356fb7070 100644 --- a/com/hbm/blocks/machine/DummyBlockAMSEmitter.java +++ b/com/hbm/blocks/machine/DummyBlockAMSEmitter.java @@ -7,7 +7,6 @@ import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSEmitter; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/DummyBlockAMSLimiter.java b/com/hbm/blocks/machine/DummyBlockAMSLimiter.java index 0273d909e..cb92d3014 100644 --- a/com/hbm/blocks/machine/DummyBlockAMSLimiter.java +++ b/com/hbm/blocks/machine/DummyBlockAMSLimiter.java @@ -7,7 +7,6 @@ import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityAMSLimiter; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/DummyBlockFluidTank.java b/com/hbm/blocks/machine/DummyBlockFluidTank.java index 863443529..22f38ad28 100644 --- a/com/hbm/blocks/machine/DummyBlockFluidTank.java +++ b/com/hbm/blocks/machine/DummyBlockFluidTank.java @@ -6,7 +6,6 @@ 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.TileEntityMachineCyclotron; import com.hbm.tileentity.machine.TileEntityMachineFluidTank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/DummyBlockMachine.java b/com/hbm/blocks/machine/DummyBlockMachine.java index cef78bf5d..17f20a8a3 100644 --- a/com/hbm/blocks/machine/DummyBlockMachine.java +++ b/com/hbm/blocks/machine/DummyBlockMachine.java @@ -2,11 +2,8 @@ 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.TileEntityAMSBase; -import com.hbm.tileentity.machine.TileEntityAMSEmitter; import com.hbm.tileentity.machine.TileEntityDummy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/DummyBlockPumpjack.java b/com/hbm/blocks/machine/DummyBlockPumpjack.java index ef7e01f69..8767282c3 100644 --- a/com/hbm/blocks/machine/DummyBlockPumpjack.java +++ b/com/hbm/blocks/machine/DummyBlockPumpjack.java @@ -6,7 +6,6 @@ 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.TileEntityMachineChemplant; import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/DummyBlockRadGen.java b/com/hbm/blocks/machine/DummyBlockRadGen.java index e1cf23085..44503bc9e 100644 --- a/com/hbm/blocks/machine/DummyBlockRadGen.java +++ b/com/hbm/blocks/machine/DummyBlockRadGen.java @@ -5,7 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityAMSBase; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.TileEntityMachineRadGen; diff --git a/com/hbm/blocks/machine/DummyBlockRefinery.java b/com/hbm/blocks/machine/DummyBlockRefinery.java index 1abe3070c..074717cce 100644 --- a/com/hbm/blocks/machine/DummyBlockRefinery.java +++ b/com/hbm/blocks/machine/DummyBlockRefinery.java @@ -6,7 +6,6 @@ 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.TileEntityMachineCyclotron; import com.hbm.tileentity.machine.TileEntityMachineRefinery; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/DummyBlockTurbofan.java b/com/hbm/blocks/machine/DummyBlockTurbofan.java index 2947ff34b..1369bbc89 100644 --- a/com/hbm/blocks/machine/DummyBlockTurbofan.java +++ b/com/hbm/blocks/machine/DummyBlockTurbofan.java @@ -6,7 +6,6 @@ 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.TileEntityMachinePumpjack; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/DummyBlockVault.java b/com/hbm/blocks/machine/DummyBlockVault.java index 56fc41876..e00d39cce 100644 --- a/com/hbm/blocks/machine/DummyBlockVault.java +++ b/com/hbm/blocks/machine/DummyBlockVault.java @@ -7,12 +7,9 @@ import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IDummy; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemLock; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineRadGen; import com.hbm.tileentity.machine.TileEntityVaultDoor; -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; diff --git a/com/hbm/blocks/machine/MachineArcFurnace.java b/com/hbm/blocks/machine/MachineArcFurnace.java index 80d86f30a..c34eff6d0 100644 --- a/com/hbm/blocks/machine/MachineArcFurnace.java +++ b/com/hbm/blocks/machine/MachineArcFurnace.java @@ -257,8 +257,6 @@ public class MachineArcFurnace extends BlockContainer { float f2 = z + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - float f5 = rand.nextFloat(); - float f6 = rand.nextFloat(); if (l == 4) { diff --git a/com/hbm/blocks/machine/MachineBoiler.java b/com/hbm/blocks/machine/MachineBoiler.java index 2834d9561..f89f9c003 100644 --- a/com/hbm/blocks/machine/MachineBoiler.java +++ b/com/hbm/blocks/machine/MachineBoiler.java @@ -286,8 +286,6 @@ public class MachineBoiler extends BlockContainer { float f2 = z + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - float f5 = rand.nextFloat(); - float f6 = rand.nextFloat(); if (l == 4) { @@ -316,8 +314,6 @@ public class MachineBoiler extends BlockContainer { float f2 = z + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - float f5 = rand.nextFloat(); - float f6 = rand.nextFloat(); if (l == 4) { diff --git a/com/hbm/blocks/machine/MachineChemplant.java b/com/hbm/blocks/machine/MachineChemplant.java index 1bc7f5f7c..ab382e6ba 100644 --- a/com/hbm/blocks/machine/MachineChemplant.java +++ b/com/hbm/blocks/machine/MachineChemplant.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/machine/MachineCoal.java b/com/hbm/blocks/machine/MachineCoal.java index 3ba4156ad..8b910d972 100644 --- a/com/hbm/blocks/machine/MachineCoal.java +++ b/com/hbm/blocks/machine/MachineCoal.java @@ -233,8 +233,6 @@ public class MachineCoal extends BlockContainer { float f2 = z + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - float f5 = rand.nextFloat(); - float f6 = rand.nextFloat(); if (l == 4) { diff --git a/com/hbm/blocks/machine/MachineDeuterium.java b/com/hbm/blocks/machine/MachineDeuterium.java index 40b38f3f1..d29119daf 100644 --- a/com/hbm/blocks/machine/MachineDeuterium.java +++ b/com/hbm/blocks/machine/MachineDeuterium.java @@ -16,7 +16,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; 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; @@ -136,7 +135,6 @@ public class MachineDeuterium extends BlockContainer { { if (((TileEntityMachineDeuterium) p_149734_1_.getTileEntity(x, y, z)).isProcessing()) { - int l = p_149734_1_.getBlockMetadata(x, y, z); float f = x + 0.5F; float f1 = y + 1.0F; float f2 = z + 0.5F; diff --git a/com/hbm/blocks/machine/MachineEPress.java b/com/hbm/blocks/machine/MachineEPress.java index b51242a5b..a4bf7b094 100644 --- a/com/hbm/blocks/machine/MachineEPress.java +++ b/com/hbm/blocks/machine/MachineEPress.java @@ -5,7 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityMachineEPress; -import com.hbm.tileentity.machine.TileEntityRtgFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; @@ -15,7 +14,6 @@ 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; diff --git a/com/hbm/blocks/machine/MachineElectricFurnace.java b/com/hbm/blocks/machine/MachineElectricFurnace.java index 50ee71f0d..ab4c32809 100644 --- a/com/hbm/blocks/machine/MachineElectricFurnace.java +++ b/com/hbm/blocks/machine/MachineElectricFurnace.java @@ -234,8 +234,6 @@ public class MachineElectricFurnace extends BlockContainer { float f2 = z + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - float f5 = rand.nextFloat(); - float f6 = rand.nextFloat(); if (l == 4) { diff --git a/com/hbm/blocks/machine/MachineFluidTank.java b/com/hbm/blocks/machine/MachineFluidTank.java index 44e862e90..fd77ab5ac 100644 --- a/com/hbm/blocks/machine/MachineFluidTank.java +++ b/com/hbm/blocks/machine/MachineFluidTank.java @@ -8,7 +8,6 @@ import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.TileEntityMachineFluidTank; -import com.hbm.tileentity.machine.TileEntityMachineGasFlare; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachineForceField.java b/com/hbm/blocks/machine/MachineForceField.java index 5750e4e50..6807159c9 100644 --- a/com/hbm/blocks/machine/MachineForceField.java +++ b/com/hbm/blocks/machine/MachineForceField.java @@ -66,7 +66,6 @@ public class MachineForceField extends BlockContainer { float f = x; float f1 = y + 2F; float f2 = z; - float f3 = 0.52F; float f4 = rand.nextFloat(); float f5 = rand.nextFloat(); @@ -80,7 +79,6 @@ public class MachineForceField extends BlockContainer { float f = x; float f1 = y + 2F; float f2 = z; - float f3 = 0.52F; float f4 = rand.nextFloat(); float f5 = rand.nextFloat(); diff --git a/com/hbm/blocks/machine/MachineRadGen.java b/com/hbm/blocks/machine/MachineRadGen.java index aaf66af13..2fd3af1d5 100644 --- a/com/hbm/blocks/machine/MachineRadGen.java +++ b/com/hbm/blocks/machine/MachineRadGen.java @@ -7,7 +7,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import com.hbm.tileentity.machine.TileEntityMachineRadGen; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineReactorControl.java b/com/hbm/blocks/machine/MachineReactorControl.java index 67137b91d..6db8bb14d 100644 --- a/com/hbm/blocks/machine/MachineReactorControl.java +++ b/com/hbm/blocks/machine/MachineReactorControl.java @@ -17,8 +17,6 @@ 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.inventory.Container; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/com/hbm/blocks/machine/MachineReactorSmall.java b/com/hbm/blocks/machine/MachineReactorSmall.java index 4d92e26fd..849fea0c9 100644 --- a/com/hbm/blocks/machine/MachineReactorSmall.java +++ b/com/hbm/blocks/machine/MachineReactorSmall.java @@ -7,7 +7,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachinePress; import com.hbm.tileentity.machine.TileEntityMachineReactorSmall; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineRefinery.java b/com/hbm/blocks/machine/MachineRefinery.java index 351345227..f45d035cf 100644 --- a/com/hbm/blocks/machine/MachineRefinery.java +++ b/com/hbm/blocks/machine/MachineRefinery.java @@ -5,18 +5,14 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.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.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -24,8 +20,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class MachineRefinery extends BlockContainer implements IMultiblock { diff --git a/com/hbm/blocks/machine/MachineSeleniumEngine.java b/com/hbm/blocks/machine/MachineSeleniumEngine.java index ecf331c43..09831c0c8 100644 --- a/com/hbm/blocks/machine/MachineSeleniumEngine.java +++ b/com/hbm/blocks/machine/MachineSeleniumEngine.java @@ -3,9 +3,7 @@ package com.hbm.blocks.machine; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.handler.MultiblockHandler; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineSiren.java b/com/hbm/blocks/machine/MachineSiren.java index fc2968307..d5d6ac446 100644 --- a/com/hbm/blocks/machine/MachineSiren.java +++ b/com/hbm/blocks/machine/MachineSiren.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.TileEntityConverterHeRf; import com.hbm.tileentity.machine.TileEntityMachineSiren; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineTeleLinker.java b/com/hbm/blocks/machine/MachineTeleLinker.java index 41e24ea79..f34b5df80 100644 --- a/com/hbm/blocks/machine/MachineTeleLinker.java +++ b/com/hbm/blocks/machine/MachineTeleLinker.java @@ -5,9 +5,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachineShredder; import com.hbm.tileentity.machine.TileEntityMachineTeleLinker; -import com.hbm.tileentity.machine.TileEntityMachineSatLinker; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineTransformer.java b/com/hbm/blocks/machine/MachineTransformer.java index 40ddb6792..9d665d461 100644 --- a/com/hbm/blocks/machine/MachineTransformer.java +++ b/com/hbm/blocks/machine/MachineTransformer.java @@ -6,7 +6,6 @@ import com.hbm.tileentity.machine.TileEntityMachineTransformer; 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; diff --git a/com/hbm/blocks/machine/MachineTurbofan.java b/com/hbm/blocks/machine/MachineTurbofan.java index 54875faf5..27e4fb9d2 100644 --- a/com/hbm/blocks/machine/MachineTurbofan.java +++ b/com/hbm/blocks/machine/MachineTurbofan.java @@ -8,8 +8,6 @@ import com.hbm.interfaces.IMultiblock; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineIGenerator; -import com.hbm.tileentity.machine.TileEntityMachineTeleporter; import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/PinkCloudBroadcaster.java b/com/hbm/blocks/machine/PinkCloudBroadcaster.java index 0ee45eda0..c975e5ae1 100644 --- a/com/hbm/blocks/machine/PinkCloudBroadcaster.java +++ b/com/hbm/blocks/machine/PinkCloudBroadcaster.java @@ -1,6 +1,5 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; import com.hbm.tileentity.machine.TileEntityBroadcaster; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/RadioRec.java b/com/hbm/blocks/machine/RadioRec.java index d4e025629..9bb6b8caf 100644 --- a/com/hbm/blocks/machine/RadioRec.java +++ b/com/hbm/blocks/machine/RadioRec.java @@ -1,10 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityRadioRec; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/machine/Radiobox.java b/com/hbm/blocks/machine/Radiobox.java index 1360258ac..6fcf01a6c 100644 --- a/com/hbm/blocks/machine/Radiobox.java +++ b/com/hbm/blocks/machine/Radiobox.java @@ -1,12 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityDiFurnace; -import com.hbm.tileentity.machine.TileEntityMachineBattery; import com.hbm.tileentity.machine.TileEntityRadiobox; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/test/TestEventTester.java b/com/hbm/blocks/test/TestEventTester.java index a0f6d73d4..cbbd0cb14 100644 --- a/com/hbm/blocks/test/TestEventTester.java +++ b/com/hbm/blocks/test/TestEventTester.java @@ -1,64 +1,26 @@ package com.hbm.blocks.test; -import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; 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.EntityBlackHole; -import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.effect.EntityCloudFleijaRainbow; -import com.hbm.entity.logic.EntityEMP; -import com.hbm.entity.missile.EntityMinerRocket; -import com.hbm.entity.projectile.EntityBurningFOEQ; -import com.hbm.entity.projectile.EntityMeteor; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionNukeRay; -import com.hbm.explosion.ExplosionNukeRay.FloatTriplet; -import com.hbm.lib.HbmChestContents; -import com.hbm.main.MainRegistry; -import com.hbm.main.ModEventHandler; -import com.hbm.packet.AuxParticlePacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.potion.HbmPotion; -import com.hbm.render.util.MissilePart; -import com.hbm.saveddata.RadiationSaveStructure; import com.hbm.saveddata.RadiationSavedData; -import com.hbm.saveddata.SatelliteSaveStructure; -import com.hbm.saveddata.SatelliteSavedData; -import com.hbm.tileentity.machine.TileEntityCrateSteel; -import com.hbm.world.Barrel; -import com.hbm.world.Geyser; -import com.hbm.world.GeyserLarge; -import com.hbm.world.Meteorite; -import com.hbm.world.Sellafield; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraft.village.VillageCollection; +import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderServer; public class TestEventTester extends Block { @@ -232,8 +194,6 @@ public class TestEventTester extends Block { if(worldObj.getBlock(x1, y1 - 1, z1) == ModBlocks.block_red_copper) { - Chunk chunk = worldObj.getChunkFromBlockCoords(x1, z1); - data.jettisonData(); } @@ -245,9 +205,9 @@ public class TestEventTester extends Block { if(worldObj.getBlock(x1, y1 - 1, z1) == ModBlocks.block_uranium) { float r = 0; - - for(RadiationSaveStructure st : data.contamination) { - r += st.radiation; + + for(Entry struct : data.contamination.entrySet()) { + r += struct.getValue(); } System.out.println(r); @@ -418,23 +378,6 @@ public class TestEventTester extends Block { return true; } - /*public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int i, float a, float b, float c) - { - EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(world); - entity.posX = x; - entity.posY = y; - entity.posZ = z; - entity.destructionRange = 20; - entity.speed = 25; - entity.coefficient = 3.5F; - - world.spawnEntityInWorld(entity); - - System.out.print("\nCALLED!!"); - - return true; - }*/ - public void buildEvent(World world, int x, int y, int z, int r) { Random rand = new Random(); @@ -466,7 +409,6 @@ public class TestEventTester extends Block { world.playSoundEffect(x + 0.5D, y + 0.5D, z + 0.5D, "random.break", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); float f = this.explosionSize; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -484,7 +426,6 @@ public class TestEventTester extends Block { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); Vec3 vec4 = Vec3.createVectorHelper(x, y + 1, z); for (int i1 = 0; i1 < list.size(); ++i1) @@ -530,41 +471,4 @@ public class TestEventTester extends Block { this.explosionSize = f; } - - /*public void killEvent1(World world, int x, int y, int z) { - double explosionDimension = 20.0D; - float damageDealt = 1000.0F; - world.playSoundEffect((double)x + 0.5D, (double)y + 0.5D, (double)z + 0.5D, "random.break", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); - - List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(explosionDimension, explosionDimension, explosionDimension, -explosionDimension, -explosionDimension, -explosionDimension)); //Many thanks Pridenauer, it's a fucking cube now, are you proud of yourself now? Oh, yes you are -_- - - for(int i = 0; i < list.size(); i++) - { - Entity entity = (Entity)list.get(i); - entity.attackEntityFrom(DamageSource.generic, damageDealt); - - double d5 = entity.posX - x; - double d6 = entity.posY + (double)entity.getEyeHeight() - y; - double d7 = entity.posZ - z; - double d9 = (double)MathHelper.sqrt_double(d5 * d5 + d6 * d6 + d7 * d7); - double d4 = entity.getDistance(x, y, z) / (double)this.explosionSize; - d5 /= d9; - d6 /= d9; - d7 /= d9; - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); - double d10 = (double)world.getBlockDensity(vec3, entity.boundingBox); - double d11 = (1.0D - d4) * d10; - double d8 = EnchantmentProtection.func_92092_a(entity, d11); - entity.motionX += d5 * d8; - entity.motionY += d6 * d8; - entity.motionZ += d7 * d8; - } - }*/ - /* - @SideOnly(Side.CLIENT) - public void randomDisplayTick(World p_149734_1_, int x, int y, int z, Random rand) - { - p_149734_1_.spawnParticle("largesmoke", x + 0.5F, y + 1, z + 0.5F, 0, 0, 0); - }*/ - } diff --git a/com/hbm/blocks/test/TestMissile.java b/com/hbm/blocks/test/TestMissile.java index e0a75a533..9ad7a0a0d 100644 --- a/com/hbm/blocks/test/TestMissile.java +++ b/com/hbm/blocks/test/TestMissile.java @@ -1,7 +1,6 @@ package com.hbm.blocks.test; import com.hbm.entity.missile.EntityTestMissile; -import com.hbm.tileentity.bomb.TileEntityTestNuke; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -16,7 +15,6 @@ public class TestMissile extends Block { @Override public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_) { - TileEntityTestNuke entity = (TileEntityTestNuke) p_149695_1_.getTileEntity(x, y, z); if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) { EntityTestMissile missile = new EntityTestMissile(p_149695_1_, x + 150, z + 150, x + 0.5F, y + 2F, z + 0.5F); diff --git a/com/hbm/blocks/test/TestNuke.java b/com/hbm/blocks/test/TestNuke.java index ff44ce666..46e066b39 100644 --- a/com/hbm/blocks/test/TestNuke.java +++ b/com/hbm/blocks/test/TestNuke.java @@ -1,7 +1,6 @@ package com.hbm.blocks.test; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Random; @@ -189,7 +188,6 @@ public class TestNuke extends BlockContainer { //BlockTNT.class Damage code float f = bombStartStrength; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -207,7 +205,6 @@ public class TestNuke extends BlockContainer { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { @@ -226,7 +223,6 @@ public class TestNuke extends BlockContainer { d5 /= d9; d6 /= d9; d7 /= d9; - double d10 = world.getBlockDensity(vec3, entity.boundingBox); double d11 = (1.0D - d4);// * d10; entity.attackEntityFrom(DamageSource.generic, ((int)((d11 * d11 + d11) / 2.0D * 8.0D * bombStartStrength + 1.0D))); double d8 = EnchantmentProtection.func_92092_a(entity, d11); diff --git a/com/hbm/creativetabs/ControlTab.java b/com/hbm/creativetabs/ControlTab.java index 1f5573192..469ee6e47 100644 --- a/com/hbm/creativetabs/ControlTab.java +++ b/com/hbm/creativetabs/ControlTab.java @@ -1,6 +1,5 @@ package com.hbm.creativetabs; -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import net.minecraft.creativetab.CreativeTabs; diff --git a/com/hbm/creativetabs/MissileTab.java b/com/hbm/creativetabs/MissileTab.java index abccb4c4d..2fc94aa92 100644 --- a/com/hbm/creativetabs/MissileTab.java +++ b/com/hbm/creativetabs/MissileTab.java @@ -2,7 +2,6 @@ package com.hbm.creativetabs; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemCustomMissile; diff --git a/com/hbm/creativetabs/TemplateTab.java b/com/hbm/creativetabs/TemplateTab.java index d5609a3ea..303e57c37 100644 --- a/com/hbm/creativetabs/TemplateTab.java +++ b/com/hbm/creativetabs/TemplateTab.java @@ -1,6 +1,5 @@ package com.hbm.creativetabs; -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import net.minecraft.creativetab.CreativeTabs; diff --git a/com/hbm/creativetabs/WeaponTab.java b/com/hbm/creativetabs/WeaponTab.java index 18544fde8..01636faa6 100644 --- a/com/hbm/creativetabs/WeaponTab.java +++ b/com/hbm/creativetabs/WeaponTab.java @@ -1,6 +1,5 @@ package com.hbm.creativetabs; -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import net.minecraft.creativetab.CreativeTabs; diff --git a/com/hbm/entity/grenade/EntityGrenadeASchrab.java b/com/hbm/entity/grenade/EntityGrenadeASchrab.java index 7a3091fc1..4e15b044a 100644 --- a/com/hbm/entity/grenade/EntityGrenadeASchrab.java +++ b/com/hbm/entity/grenade/EntityGrenadeASchrab.java @@ -1,7 +1,6 @@ package com.hbm.entity.grenade; import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.main.MainRegistry; diff --git a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java index cb662e7f1..7b3a25e7d 100644 --- a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java +++ b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java @@ -4,7 +4,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import com.hbm.entity.effect.EntityBlackHole; -import com.hbm.entity.effect.EntityRagingVortex; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGrenade; diff --git a/com/hbm/entity/grenade/EntityGrenadeIFNull.java b/com/hbm/entity/grenade/EntityGrenadeIFNull.java index 3bbcd2e2e..601381cee 100644 --- a/com/hbm/entity/grenade/EntityGrenadeIFNull.java +++ b/com/hbm/entity/grenade/EntityGrenadeIFNull.java @@ -2,8 +2,6 @@ package com.hbm.entity.grenade; import java.util.List; -import com.hbm.entity.effect.EntityVortex; -import com.hbm.entity.particle.EntityDSmokeFX; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGrenade; diff --git a/com/hbm/entity/grenade/EntityGrenadeMIRV.java b/com/hbm/entity/grenade/EntityGrenadeMIRV.java index b867f4ec8..c0c3479b3 100644 --- a/com/hbm/entity/grenade/EntityGrenadeMIRV.java +++ b/com/hbm/entity/grenade/EntityGrenadeMIRV.java @@ -1,14 +1,9 @@ package com.hbm.entity.grenade; -import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; import com.hbm.items.weapon.ItemGrenade; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class EntityGrenadeMIRV extends EntityGrenadeBouncyBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeNuclear.java b/com/hbm/entity/grenade/EntityGrenadeNuclear.java index 23b1f59db..c7ba6683e 100644 --- a/com/hbm/entity/grenade/EntityGrenadeNuclear.java +++ b/com/hbm/entity/grenade/EntityGrenadeNuclear.java @@ -1,7 +1,5 @@ package com.hbm.entity.grenade; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; diff --git a/com/hbm/entity/logic/EntityBalefire.java b/com/hbm/entity/logic/EntityBalefire.java index 89a36e315..e969d4cbd 100644 --- a/com/hbm/entity/logic/EntityBalefire.java +++ b/com/hbm/entity/logic/EntityBalefire.java @@ -2,12 +2,8 @@ package com.hbm.entity.logic; import org.apache.logging.log4j.Level; -import com.hbm.entity.effect.EntityFalloutRain; import com.hbm.explosion.ExplosionBalefire; -import com.hbm.explosion.ExplosionFleija; -import com.hbm.explosion.ExplosionNukeAdvanced; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.explosion.ExplosionSolinium; import com.hbm.main.MainRegistry; import net.minecraft.entity.Entity; diff --git a/com/hbm/entity/logic/EntityBomber.java b/com/hbm/entity/logic/EntityBomber.java index 105c844d9..82d30c53b 100644 --- a/com/hbm/entity/logic/EntityBomber.java +++ b/com/hbm/entity/logic/EntityBomber.java @@ -3,7 +3,6 @@ package com.hbm.entity.logic; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.projectile.EntityBombletZeta; import com.hbm.entity.projectile.EntityBoxcar; @@ -14,8 +13,6 @@ import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import com.hbm.packet.LoopedEntitySoundPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.deco.TileEntityBomber; -import com.hbm.tileentity.machine.TileEntityMachineRadar; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/entity/logic/EntityEMP.java b/com/hbm/entity/logic/EntityEMP.java index 5b07f1797..5ee7b7b4b 100644 --- a/com/hbm/entity/logic/EntityEMP.java +++ b/com/hbm/entity/logic/EntityEMP.java @@ -3,9 +3,6 @@ package com.hbm.entity.logic; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; -import com.hbm.entity.effect.EntityEMPBlast; -import com.hbm.explosion.ExplosionLarge; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.packet.PacketDispatcher; @@ -95,7 +92,6 @@ public class EntityEMP extends Entity { private void emp(int x, int y, int z) { - Block b = worldObj.getBlock(x,y,z); TileEntity te = worldObj.getTileEntity(x, y, z); boolean flag = false; diff --git a/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java b/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java index c61c9608e..1f54288b0 100644 --- a/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java +++ b/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java @@ -4,11 +4,6 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import com.hbm.entity.effect.EntityFalloutRain; -import com.hbm.explosion.ExplosionFleija; -import com.hbm.explosion.ExplosionNukeAdvanced; -import com.hbm.explosion.ExplosionNukeGeneric; - public class EntityNukeExplosionAdvanced extends Entity { //public int age = 0; diff --git a/com/hbm/entity/missile/EntityBobmazon.java b/com/hbm/entity/missile/EntityBobmazon.java index 29d483398..3e0ce7113 100644 --- a/com/hbm/entity/missile/EntityBobmazon.java +++ b/com/hbm/entity/missile/EntityBobmazon.java @@ -1,7 +1,5 @@ package com.hbm.entity.missile; -import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.packet.AuxParticlePacket; import com.hbm.packet.PacketDispatcher; @@ -10,7 +8,6 @@ import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityBombletSelena.java b/com/hbm/entity/missile/EntityBombletSelena.java index f9d7bbb24..bd0d6efc1 100644 --- a/com/hbm/entity/missile/EntityBombletSelena.java +++ b/com/hbm/entity/missile/EntityBombletSelena.java @@ -1,13 +1,7 @@ package com.hbm.entity.missile; -import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.particle.EntityOilSpillFX; -import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; -import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/entity/missile/EntityBombletTheta.java b/com/hbm/entity/missile/EntityBombletTheta.java index 886f24ace..603f7d88f 100644 --- a/com/hbm/entity/missile/EntityBombletTheta.java +++ b/com/hbm/entity/missile/EntityBombletTheta.java @@ -1,11 +1,7 @@ package com.hbm.entity.missile; -import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; -import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/entity/missile/EntityBooster.java b/com/hbm/entity/missile/EntityBooster.java index 7768ffdcf..5ddb30ae8 100644 --- a/com/hbm/entity/missile/EntityBooster.java +++ b/com/hbm/entity/missile/EntityBooster.java @@ -1,14 +1,7 @@ package com.hbm.entity.missile; -import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.entity.particle.EntityTSmokeFX; import com.hbm.explosion.ExplosionLarge; -import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/entity/missile/EntityCarrier.java b/com/hbm/entity/missile/EntityCarrier.java index 81b50e04c..965e4e9f0 100644 --- a/com/hbm/entity/missile/EntityCarrier.java +++ b/com/hbm/entity/missile/EntityCarrier.java @@ -1,9 +1,6 @@ package com.hbm.entity.missile; -import com.hbm.entity.particle.EntityDSmokeFX; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemSatChip; @@ -16,15 +13,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.Type; public class EntityCarrier extends EntityThrowable { diff --git a/com/hbm/entity/missile/EntityMIRV.java b/com/hbm/entity/missile/EntityMIRV.java index 4beac4a2b..55f98c9d8 100644 --- a/com/hbm/entity/missile/EntityMIRV.java +++ b/com/hbm/entity/missile/EntityMIRV.java @@ -1,8 +1,6 @@ package com.hbm.entity.missile; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.main.MainRegistry; diff --git a/com/hbm/entity/missile/EntityMissileAntiBallistic.java b/com/hbm/entity/missile/EntityMissileAntiBallistic.java index 28b6881a7..3c97294bc 100644 --- a/com/hbm/entity/missile/EntityMissileAntiBallistic.java +++ b/com/hbm/entity/missile/EntityMissileAntiBallistic.java @@ -2,10 +2,7 @@ package com.hbm.entity.missile; import java.util.List; -import com.hbm.calc.EasyLocation; -import com.hbm.entity.particle.EntityDSmokeFX; import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/entity/missile/EntityMissileBHole.java b/com/hbm/entity/missile/EntityMissileBHole.java index a257d8e27..5a7427e8c 100644 --- a/com/hbm/entity/missile/EntityMissileBHole.java +++ b/com/hbm/entity/missile/EntityMissileBHole.java @@ -4,14 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.hbm.entity.effect.EntityBlackHole; -import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionParticle; -import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; -import com.hbm.main.MainRegistry; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/com/hbm/entity/missile/EntityMissileDrill.java b/com/hbm/entity/missile/EntityMissileDrill.java index 82c2b4c54..b75e75a43 100644 --- a/com/hbm/entity/missile/EntityMissileDrill.java +++ b/com/hbm/entity/missile/EntityMissileDrill.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileEMP.java b/com/hbm/entity/missile/EntityMissileEMP.java index d1582b354..df893bd7a 100644 --- a/com/hbm/entity/missile/EntityMissileEMP.java +++ b/com/hbm/entity/missile/EntityMissileEMP.java @@ -5,17 +5,9 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityEMPBlast; -import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.explosion.ExplosionParticle; -import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; -import com.hbm.main.MainRegistry; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileEMPStrong.java b/com/hbm/entity/missile/EntityMissileEMPStrong.java index 07c4e4bce..413d5710f 100644 --- a/com/hbm/entity/missile/EntityMissileEMPStrong.java +++ b/com/hbm/entity/missile/EntityMissileEMPStrong.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import com.hbm.entity.logic.EntityEMP; -import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; import net.minecraft.item.ItemStack; diff --git a/com/hbm/entity/missile/EntityMissileEndo.java b/com/hbm/entity/missile/EntityMissileEndo.java index 7f43dbbf9..2f0f01bcd 100644 --- a/com/hbm/entity/missile/EntityMissileEndo.java +++ b/com/hbm/entity/missile/EntityMissileEndo.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionThermo; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileExo.java b/com/hbm/entity/missile/EntityMissileExo.java index 227679a2a..244dd06d6 100644 --- a/com/hbm/entity/missile/EntityMissileExo.java +++ b/com/hbm/entity/missile/EntityMissileExo.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionThermo; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileGeneric.java b/com/hbm/entity/missile/EntityMissileGeneric.java index 54dcc99c9..fc5168d00 100644 --- a/com/hbm/entity/missile/EntityMissileGeneric.java +++ b/com/hbm/entity/missile/EntityMissileGeneric.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileIncendiary.java b/com/hbm/entity/missile/EntityMissileIncendiary.java index 2f15f5f94..3bf9f3bb6 100644 --- a/com/hbm/entity/missile/EntityMissileIncendiary.java +++ b/com/hbm/entity/missile/EntityMissileIncendiary.java @@ -3,13 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java b/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java index 6295ae1f1..28d4a5193 100644 --- a/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java +++ b/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java @@ -3,12 +3,10 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileInferno.java b/com/hbm/entity/missile/EntityMissileInferno.java index 3d60a5e01..2dbca1e8a 100644 --- a/com/hbm/entity/missile/EntityMissileInferno.java +++ b/com/hbm/entity/missile/EntityMissileInferno.java @@ -3,12 +3,10 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileMicro.java b/com/hbm/entity/missile/EntityMissileMicro.java index 3463e12c9..1e9c1e71c 100644 --- a/com/hbm/entity/missile/EntityMissileMicro.java +++ b/com/hbm/entity/missile/EntityMissileMicro.java @@ -3,16 +3,12 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileMirv.java b/com/hbm/entity/missile/EntityMissileMirv.java index 2884f030f..089b2391d 100644 --- a/com/hbm/entity/missile/EntityMissileMirv.java +++ b/com/hbm/entity/missile/EntityMissileMirv.java @@ -4,15 +4,10 @@ import java.util.ArrayList; import java.util.List; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileNuclear.java b/com/hbm/entity/missile/EntityMissileNuclear.java index 9766a8da6..88711ccc6 100644 --- a/com/hbm/entity/missile/EntityMissileNuclear.java +++ b/com/hbm/entity/missile/EntityMissileNuclear.java @@ -4,14 +4,10 @@ import java.util.ArrayList; import java.util.List; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileRain.java b/com/hbm/entity/missile/EntityMissileRain.java index 07a817b7d..15c5ea87a 100644 --- a/com/hbm/entity/missile/EntityMissileRain.java +++ b/com/hbm/entity/missile/EntityMissileRain.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileSchrabidium.java b/com/hbm/entity/missile/EntityMissileSchrabidium.java index 5e6e566b9..94a2fa383 100644 --- a/com/hbm/entity/missile/EntityMissileSchrabidium.java +++ b/com/hbm/entity/missile/EntityMissileSchrabidium.java @@ -5,15 +5,9 @@ import java.util.List; import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionParticle; -import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileStrong.java b/com/hbm/entity/missile/EntityMissileStrong.java index 59c46ffed..0231b31b0 100644 --- a/com/hbm/entity/missile/EntityMissileStrong.java +++ b/com/hbm/entity/missile/EntityMissileStrong.java @@ -3,11 +3,9 @@ package com.hbm.entity.missile; import java.util.ArrayList; import java.util.List; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/com/hbm/entity/mob/EntityNuclearCreeper.java b/com/hbm/entity/mob/EntityNuclearCreeper.java index 403d740aa..8744d4688 100644 --- a/com/hbm/entity/mob/EntityNuclearCreeper.java +++ b/com/hbm/entity/mob/EntityNuclearCreeper.java @@ -1,22 +1,18 @@ package com.hbm.entity.mob; -import java.util.HashSet; import java.util.List; import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAIAttackOnCollide; import net.minecraft.entity.ai.EntityAIHurtByTarget; @@ -26,13 +22,9 @@ import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWander; import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Blocks; @@ -40,12 +32,8 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class EntityNuclearCreeper extends EntityMob { @@ -220,53 +208,12 @@ public class EntityNuclearCreeper extends EntityMob { this.func_146077_cc(); } } - int strength = 1; - float f = strength; - HashSet hashset = new HashSet(); - int i; - int j; - int k; - double d5; - double d6; - double d7; - double wat = f*2; - boolean isOccupied = false; + List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(posX - 2, posY - 2, posZ - 2, posX + 2, posY + 2, posZ + 2)); - strength *= 2.0F; - i = MathHelper.floor_double(this.posX - wat - 1.0D); - j = MathHelper.floor_double(this.posX + wat + 1.0D); - k = MathHelper.floor_double(this.posY - wat - 1.0D); - int i2 = MathHelper.floor_double(this.posY + wat + 1.0D); - int l = MathHelper.floor_double(this.posZ - wat - 1.0D); - int j2 = MathHelper.floor_double(this.posZ + wat + 1.0D); - List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); - - for (int i1 = 0; i1 < list.size(); ++i1) - { - Entity entity = (Entity)list.get(i1); - double d4 = entity.getDistance(this.posX, this.posY, this.posZ) / 4; - - if (d4 <= 1.0D) - { - d5 = entity.posX - this.posX; - d6 = entity.posY + entity.getEyeHeight() - this.posY; - d7 = entity.posZ - this.posZ; - double d9 = MathHelper.sqrt_double(d5 * d5 + d6 * d6 + d7 * d7); - if (d9 < wat) - { - if(entity instanceof EntityLivingBase && !(entity instanceof EntityNuclearCreeper)) - { - //Library.applyRadiation(entity, 20, 9, 5, 2); - - Library.applyRadData(entity, 0.25F); - } - } - } - } - - strength = (int)f; + for(Entity e : list) + if(!(e instanceof EntityNuclearCreeper)) + Library.applyRadData(e, 0.25F); super.onUpdate(); @@ -434,7 +381,10 @@ public class EntityNuclearCreeper extends EntityMob { this.explosionRadius *= 3; } - worldObj.spawnEntityInWorld(EntityNukeExplosionMK4.statFac(worldObj, explosionRadius, posX, posY, posZ)); + if(flag) + worldObj.spawnEntityInWorld(EntityNukeExplosionMK4.statFac(worldObj, explosionRadius, posX, posY, posZ)); + else + worldObj.createExplosion(this, posX, posY, posZ, explosionRadius, false); if(this.getPowered()) { diff --git a/com/hbm/entity/particle/EntityOrangeFX.java b/com/hbm/entity/particle/EntityOrangeFX.java index e853b14fb..8f7495b63 100644 --- a/com/hbm/entity/particle/EntityOrangeFX.java +++ b/com/hbm/entity/particle/EntityOrangeFX.java @@ -1,11 +1,9 @@ package com.hbm.entity.particle; -import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionNukeGeneric; import net.minecraft.block.material.Material; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class EntityOrangeFX extends EntityModFX { diff --git a/com/hbm/entity/projectile/EntityBaleflare.java b/com/hbm/entity/projectile/EntityBaleflare.java index 1f2db53d1..574827ac3 100644 --- a/com/hbm/entity/projectile/EntityBaleflare.java +++ b/com/hbm/entity/projectile/EntityBaleflare.java @@ -3,7 +3,6 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.logic.EntityBalefire; -import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.explosion.ExplosionParticleB; import com.hbm.main.MainRegistry; diff --git a/com/hbm/entity/projectile/EntityBombletZeta.java b/com/hbm/entity/projectile/EntityBombletZeta.java index b616fe675..1c6dec375 100644 --- a/com/hbm/entity/projectile/EntityBombletZeta.java +++ b/com/hbm/entity/projectile/EntityBombletZeta.java @@ -1,8 +1,6 @@ package com.hbm.entity.projectile; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.missile.EntityBombletSelena; -import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionParticle; @@ -15,7 +13,6 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class EntityBombletZeta extends EntityThrowable { diff --git a/com/hbm/entity/projectile/EntityBoxcar.java b/com/hbm/entity/projectile/EntityBoxcar.java index 670413634..74a4f9a47 100644 --- a/com/hbm/entity/projectile/EntityBoxcar.java +++ b/com/hbm/entity/projectile/EntityBoxcar.java @@ -3,12 +3,8 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; -import com.hbm.world.Meteorite; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/entity/projectile/EntityBullet.java b/com/hbm/entity/projectile/EntityBullet.java index 697989f11..452917081 100644 --- a/com/hbm/entity/projectile/EntityBullet.java +++ b/com/hbm/entity/projectile/EntityBullet.java @@ -33,7 +33,6 @@ import net.minecraft.world.World; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.generic.RedBarrel; import com.hbm.entity.grenade.EntityGrenadeTau; -import com.hbm.entity.mob.EntityHunterChopper; import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.entity.particle.EntityBSmokeFX; import com.hbm.items.ModItems; diff --git a/com/hbm/entity/projectile/EntityBurningFOEQ.java b/com/hbm/entity/projectile/EntityBurningFOEQ.java index a8d8d6cf8..b1f303312 100644 --- a/com/hbm/entity/projectile/EntityBurningFOEQ.java +++ b/com/hbm/entity/projectile/EntityBurningFOEQ.java @@ -1,15 +1,7 @@ package com.hbm.entity.projectile; -import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.missile.EntityBombletSelena; -import com.hbm.entity.particle.EntityDSmokeFX; -import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.explosion.ExplosionParticle; -import com.hbm.explosion.ExplosionParticleB; -import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +9,6 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class EntityBurningFOEQ extends EntityThrowable { diff --git a/com/hbm/entity/projectile/EntityDuchessGambit.java b/com/hbm/entity/projectile/EntityDuchessGambit.java index 4885c2da8..b156ae9b8 100644 --- a/com/hbm/entity/projectile/EntityDuchessGambit.java +++ b/com/hbm/entity/projectile/EntityDuchessGambit.java @@ -3,12 +3,8 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; -import com.hbm.world.Meteorite; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/entity/projectile/EntityExplosiveBeam.java b/com/hbm/entity/projectile/EntityExplosiveBeam.java index 497e4528e..233adecf9 100644 --- a/com/hbm/entity/projectile/EntityExplosiveBeam.java +++ b/com/hbm/entity/projectile/EntityExplosiveBeam.java @@ -2,33 +2,20 @@ package com.hbm.entity.projectile; import java.util.List; -import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.grenade.EntityGrenadeZOMG; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionThermo; -import com.hbm.items.ModItems; -import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; -import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; diff --git a/com/hbm/entity/projectile/EntityFallingNuke.java b/com/hbm/entity/projectile/EntityFallingNuke.java index d0ae4ee0e..7a48e87af 100644 --- a/com/hbm/entity/projectile/EntityFallingNuke.java +++ b/com/hbm/entity/projectile/EntityFallingNuke.java @@ -1,22 +1,12 @@ package com.hbm.entity.projectile; import com.hbm.blocks.bomb.NukeCustom; -import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.missile.EntityBombletSelena; -import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionParticle; -import com.hbm.explosion.ExplosionParticleB; -import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class EntityFallingNuke extends EntityThrowable { diff --git a/com/hbm/entity/projectile/EntityMeteor.java b/com/hbm/entity/projectile/EntityMeteor.java index a06279041..c0e3d5879 100644 --- a/com/hbm/entity/projectile/EntityMeteor.java +++ b/com/hbm/entity/projectile/EntityMeteor.java @@ -1,8 +1,5 @@ package com.hbm.entity.projectile; -import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionLarge; @@ -13,7 +10,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; diff --git a/com/hbm/entity/projectile/EntityModBeam.java b/com/hbm/entity/projectile/EntityModBeam.java index 8be5adf27..d4097e352 100644 --- a/com/hbm/entity/projectile/EntityModBeam.java +++ b/com/hbm/entity/projectile/EntityModBeam.java @@ -3,7 +3,6 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.effect.EntityBlackHole; -import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.effect.EntityRagingVortex; @@ -11,11 +10,7 @@ import com.hbm.entity.effect.EntityVortex; import com.hbm.entity.grenade.EntityGrenadeZOMG; import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionThermo; -import com.hbm.items.ModItems; -import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; import com.hbm.potion.HbmPotion; diff --git a/com/hbm/entity/projectile/EntityRocketHoming.java b/com/hbm/entity/projectile/EntityRocketHoming.java index 1effdb184..d49c9f8e0 100644 --- a/com/hbm/entity/projectile/EntityRocketHoming.java +++ b/com/hbm/entity/projectile/EntityRocketHoming.java @@ -3,15 +3,10 @@ package com.hbm.entity.projectile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.hbm.entity.particle.EntityDSmokeFX; -import com.hbm.entity.particle.EntityGasFX; -import com.hbm.entity.particle.EntityOilSpillFX; -import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.entity.particle.EntityTSmokeFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.items.ModItems; diff --git a/com/hbm/entity/projectile/EntityWaterSplash.java b/com/hbm/entity/projectile/EntityWaterSplash.java index 216e4131d..01335eac9 100644 --- a/com/hbm/entity/projectile/EntityWaterSplash.java +++ b/com/hbm/entity/projectile/EntityWaterSplash.java @@ -1,6 +1,5 @@ package com.hbm.entity.projectile; -import com.hbm.entity.particle.EntityOilSpillFX; import com.hbm.packet.AuxParticlePacket; import com.hbm.packet.PacketDispatcher; diff --git a/com/hbm/explosion/ExplosionChaos.java b/com/hbm/explosion/ExplosionChaos.java index f7e7a840f..fa3eceadc 100644 --- a/com/hbm/explosion/ExplosionChaos.java +++ b/com/hbm/explosion/ExplosionChaos.java @@ -1,6 +1,5 @@ package com.hbm.explosion; -import java.util.HashSet; import java.util.List; import java.util.Random; @@ -12,7 +11,6 @@ import com.hbm.entity.missile.EntityMissileAntiBallistic; import com.hbm.entity.missile.EntityMissileBase; import com.hbm.entity.particle.EntityChlorineFX; import com.hbm.entity.particle.EntityCloudFX; -import com.hbm.entity.particle.EntityDSmokeFX; import com.hbm.entity.particle.EntityModFX; import com.hbm.entity.particle.EntityOrangeFX; import com.hbm.entity.particle.EntityPinkCloudFX; @@ -22,15 +20,11 @@ import com.hbm.entity.projectile.EntityRainbow; import com.hbm.entity.projectile.EntityRocket; import com.hbm.entity.projectile.EntityRubble; import com.hbm.entity.projectile.EntitySchrab; -import com.hbm.interfaces.IConductor; -import com.hbm.interfaces.IConsumer; -import com.hbm.interfaces.ISource; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.potion.HbmPotion; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -42,10 +36,8 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Blocks; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -615,7 +607,6 @@ public class ExplosionChaos { public static void poison(World world, int x, int y, int z, int bombStartStrength) { float f = bombStartStrength; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -623,7 +614,6 @@ public class ExplosionChaos { double d6; double d7; double wat = bombStartStrength * 2; - boolean isOccupied = false; bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -633,7 +623,6 @@ public class ExplosionChaos { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -669,7 +658,6 @@ public class ExplosionChaos { public static void pc(World world, int x, int y, int z, int bombStartStrength) { float f = bombStartStrength; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -677,7 +665,6 @@ public class ExplosionChaos { double d6; double d7; double wat = bombStartStrength * 2; - boolean isOccupied = false; bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -687,7 +674,6 @@ public class ExplosionChaos { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -719,7 +705,6 @@ public class ExplosionChaos { public static void c(World world, int x, int y, int z, int bombStartStrength) { float f = bombStartStrength; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -727,7 +712,6 @@ public class ExplosionChaos { double d6; double d7; double wat = bombStartStrength * 2; - boolean isOccupied = false; bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -737,7 +721,6 @@ public class ExplosionChaos { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -809,7 +792,6 @@ public class ExplosionChaos { public static void move(World world, int x, int y, int z, int radius, int a, int b, int c) { float f = radius; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -817,7 +799,6 @@ public class ExplosionChaos { double d6; double d7; double wat = radius; - boolean isOccupied = false; int rand = 0; radius *= 2.0F; @@ -828,7 +809,6 @@ public class ExplosionChaos { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -863,7 +843,6 @@ public class ExplosionChaos { public static Entity getHomingTarget(World world, int x, int y, int z, int radius, Entity e) { float f = radius; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -871,7 +850,6 @@ public class ExplosionChaos { double d6; double d7; double wat = radius * 2; - boolean isOccupied = false; radius *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -881,7 +859,6 @@ public class ExplosionChaos { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(e, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -896,7 +873,6 @@ public class ExplosionChaos { d5 /= d9; d6 /= d9; d7 /= d9; - double d10 = world.getBlockDensity(vec3, entity.boundingBox); if (entity instanceof EntityMissileBase && !(entity instanceof EntityMissileAntiBallistic)) { return entity; } @@ -910,7 +886,6 @@ public class ExplosionChaos { public static void delMissiles(World world, int x, int y, int z, int radius, Entity e) { float f = radius; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -918,7 +893,6 @@ public class ExplosionChaos { double d6; double d7; double wat = radius * 2; - boolean isOccupied = false; radius *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -928,7 +902,6 @@ public class ExplosionChaos { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(e, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -943,7 +916,6 @@ public class ExplosionChaos { d5 /= d9; d6 /= d9; d7 /= d9; - double d10 = world.getBlockDensity(vec3, entity.boundingBox); if (entity instanceof EntityMissileBase) { entity = null; } @@ -957,7 +929,6 @@ public class ExplosionChaos { public static void mirv(World world, double x, double y, double z) { double modifier = 2.5; double zeta = Math.sqrt(2) / 2; - double theta = Math.sqrt(1 - Math.pow(0.5, 2)); EntityMIRV mirv1 = new EntityMIRV(world); EntityMIRV mirv2 = new EntityMIRV(world); EntityMIRV mirv3 = new EntityMIRV(world); @@ -1050,7 +1021,6 @@ public class ExplosionChaos { public static void miniMirv(World world, double x, double y, double z) { double modifier = 1.25; double zeta = Math.sqrt(2) / 2; - double theta = Math.sqrt(1 - Math.pow(0.5, 2)); EntityMiniNuke mirv1 = new EntityMiniNuke(world); EntityMiniNuke mirv2 = new EntityMiniNuke(world); EntityMiniNuke mirv3 = new EntityMiniNuke(world); @@ -1271,66 +1241,63 @@ public class ExplosionChaos { } public static void decontaminate(World world, int x, int y, int z) { - //Bridged - //if (!world.isRemote) { - { int rand; - Random random = new Random(); - - if (world.getBlock(x, y, z) == ModBlocks.waste_earth && random.nextInt(3) != 0) { - world.setBlock(x, y, z, Blocks.grass); - } + + Random random = new Random(); - else if (world.getBlock(x, y, z) == ModBlocks.waste_mycelium && random.nextInt(5) == 0) { - world.setBlock(x, y, z, Blocks.mycelium); - } + if (world.getBlock(x, y, z) == ModBlocks.waste_earth && random.nextInt(3) != 0) { + world.setBlock(x, y, z, Blocks.grass); + } - else if (world.getBlock(x, y, z) == ModBlocks.waste_trinitite && random.nextInt(3) == 0) { - world.setBlock(x, y, z, Blocks.sand); - } + else if (world.getBlock(x, y, z) == ModBlocks.waste_mycelium && random.nextInt(5) == 0) { + world.setBlock(x, y, z, Blocks.mycelium); + } - else if (world.getBlock(x, y, z) == ModBlocks.waste_trinitite_red && random.nextInt(3) == 0) { - world.setBlock(x, y, z, Blocks.sand, 1, 2); - } + else if (world.getBlock(x, y, z) == ModBlocks.waste_trinitite && random.nextInt(3) == 0) { + world.setBlock(x, y, z, Blocks.sand); + } - else if (world.getBlock(x, y, z) == ModBlocks.waste_log && random.nextInt(3) != 0) { - world.setBlock(x, y, z, Blocks.log); - } + else if (world.getBlock(x, y, z) == ModBlocks.waste_trinitite_red && random.nextInt(3) == 0) { + world.setBlock(x, y, z, Blocks.sand, 1, 2); + } - else if (world.getBlock(x, y, z) == ModBlocks.waste_planks && random.nextInt(3) != 0) { - world.setBlock(x, y, z, Blocks.planks); - } + else if (world.getBlock(x, y, z) == ModBlocks.waste_log && random.nextInt(3) != 0) { + world.setBlock(x, y, z, Blocks.log); + } - else if (world.getBlock(x, y, z) == ModBlocks.block_trinitite && random.nextInt(10) == 0) { - world.setBlock(x, y, z, ModBlocks.block_lead); - } + else if (world.getBlock(x, y, z) == ModBlocks.waste_planks && random.nextInt(3) != 0) { + world.setBlock(x, y, z, Blocks.planks); + } - else if (world.getBlock(x, y, z) == ModBlocks.block_waste && random.nextInt(10) == 0) { - world.setBlock(x, y, z, ModBlocks.block_lead); - } + else if (world.getBlock(x, y, z) == ModBlocks.block_trinitite && random.nextInt(10) == 0) { + world.setBlock(x, y, z, ModBlocks.block_lead); + } - else if (world.getBlock(x, y, z) == ModBlocks.sellafield_core && random.nextInt(10) == 0) { - world.setBlock(x, y, z, ModBlocks.sellafield_4); - } + else if (world.getBlock(x, y, z) == ModBlocks.block_waste && random.nextInt(10) == 0) { + world.setBlock(x, y, z, ModBlocks.block_lead); + } - else if (world.getBlock(x, y, z) == ModBlocks.sellafield_4 && random.nextInt(5) == 0) { - world.setBlock(x, y, z, ModBlocks.sellafield_3); - } + else if (world.getBlock(x, y, z) == ModBlocks.sellafield_core && random.nextInt(10) == 0) { + world.setBlock(x, y, z, ModBlocks.sellafield_4); + } - else if (world.getBlock(x, y, z) == ModBlocks.sellafield_3 && random.nextInt(5) == 0) { - world.setBlock(x, y, z, ModBlocks.sellafield_2); - } + else if (world.getBlock(x, y, z) == ModBlocks.sellafield_4 && random.nextInt(5) == 0) { + world.setBlock(x, y, z, ModBlocks.sellafield_3); + } - else if (world.getBlock(x, y, z) == ModBlocks.sellafield_2 && random.nextInt(5) == 0) { - world.setBlock(x, y, z, ModBlocks.sellafield_1); - } + else if (world.getBlock(x, y, z) == ModBlocks.sellafield_3 && random.nextInt(5) == 0) { + world.setBlock(x, y, z, ModBlocks.sellafield_2); + } - else if (world.getBlock(x, y, z) == ModBlocks.sellafield_1 && random.nextInt(5) == 0) { - world.setBlock(x, y, z, ModBlocks.sellafield_0); - } + else if (world.getBlock(x, y, z) == ModBlocks.sellafield_2 && random.nextInt(5) == 0) { + world.setBlock(x, y, z, ModBlocks.sellafield_1); + } - else if (world.getBlock(x, y, z) == ModBlocks.sellafield_0 && random.nextInt(5) == 0) { - world.setBlock(x, y, z, ModBlocks.sellafield_slaked); - } + else if (world.getBlock(x, y, z) == ModBlocks.sellafield_1 && random.nextInt(5) == 0) { + world.setBlock(x, y, z, ModBlocks.sellafield_0); + } + + else if (world.getBlock(x, y, z) == ModBlocks.sellafield_0 && random.nextInt(5) == 0) { + world.setBlock(x, y, z, ModBlocks.sellafield_slaked); } } diff --git a/com/hbm/explosion/ExplosionNukeGeneric.java b/com/hbm/explosion/ExplosionNukeGeneric.java index 517154092..afa2081fb 100644 --- a/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/com/hbm/explosion/ExplosionNukeGeneric.java @@ -1,13 +1,10 @@ package com.hbm.explosion; -import java.util.HashSet; import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockStairs; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; @@ -20,13 +17,11 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.common.util.ForgeDirection; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.DecoBlockAlt; import com.hbm.entity.effect.EntityBlackHole; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.grenade.EntityGrenadeASchrab; @@ -42,7 +37,6 @@ import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.tileentity.bomb.TileEntityTurretBase; -import com.hbm.tileentity.machine.TileEntityDummy; import cofh.api.energy.IEnergyProvider; @@ -119,7 +113,6 @@ public class ExplosionNukeGeneric { public static void dealDamage(World world, int x, int y, int z, int bombStartStrength) { float f = bombStartStrength; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -128,7 +121,6 @@ public class ExplosionNukeGeneric { double d7; double wat = bombStartStrength/** 2 */ ; - boolean isOccupied = false; // bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -138,7 +130,6 @@ public class ExplosionNukeGeneric { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -185,8 +176,6 @@ public class ExplosionNukeGeneric { } public static void succ(World world, int x, int y, int z, int radius) { - float f = radius; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -195,7 +184,6 @@ public class ExplosionNukeGeneric { double d7; double wat = radius/** 2 */ ; - boolean isOccupied = false; // bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -205,7 +193,6 @@ public class ExplosionNukeGeneric { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -239,8 +226,6 @@ public class ExplosionNukeGeneric { } public static boolean dedify(World world, int x, int y, int z, int radius) { - float f = radius; - HashSet hashset = new HashSet(); int i; int j; int k; @@ -249,7 +234,6 @@ public class ExplosionNukeGeneric { double d7; double wat = radius/** 2 */ ; - boolean isOccupied = false; // bombStartStrength *= 2.0F; i = MathHelper.floor_double(x - wat - 1.0D); @@ -259,7 +243,6 @@ public class ExplosionNukeGeneric { int l = MathHelper.floor_double(z - wat - 1.0D); int j2 = MathHelper.floor_double(z + wat + 1.0D); List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); for (int i1 = 0; i1 < list.size(); ++i1) { Entity entity = (Entity) list.get(i1); @@ -279,7 +262,6 @@ public class ExplosionNukeGeneric { // double d10 = (double)world.getBlockDensity(vec3, // entity.boundingBox); // if(d10 > 0) isOccupied = true; - double d11 = (1.0D - d4);// * d10; if(entity instanceof EntityItem && ((EntityItem)entity).getEntityItem().getItem() == ModItems.flame_pony) { entity.setDead(); diff --git a/com/hbm/explosion/ExplosionSolinium.java b/com/hbm/explosion/ExplosionSolinium.java index a3219c297..46c19e327 100644 --- a/com/hbm/explosion/ExplosionSolinium.java +++ b/com/hbm/explosion/ExplosionSolinium.java @@ -1,8 +1,5 @@ package com.hbm.explosion; -import com.hbm.blocks.generic.DecoBlockAlt; - -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/com/hbm/explosion/ExplosionTom.java b/com/hbm/explosion/ExplosionTom.java index 95025b8cf..5100ec26e 100644 --- a/com/hbm/explosion/ExplosionTom.java +++ b/com/hbm/explosion/ExplosionTom.java @@ -1,8 +1,5 @@ package com.hbm.explosion; -import com.hbm.blocks.ModBlocks; - -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -108,11 +105,6 @@ public class ExplosionTom if(y == 0) break; - float hardness = worldObj.getBlock(pX, y, pZ).getBlockHardness(worldObj, pX, y, pZ); - - if(worldObj.getBlock(pX, y, pZ).getMaterial().isLiquid()) - hardness = Blocks.air.getBlockHardness(worldObj, pX, y + 1, pZ); - worldObj.setBlockToAir(pX, y, pZ); y--; diff --git a/com/hbm/handler/nei/BoilerRecipeHandler.java b/com/hbm/handler/nei/BoilerRecipeHandler.java index 55e86b9f9..b366917ff 100644 --- a/com/hbm/handler/nei/BoilerRecipeHandler.java +++ b/com/hbm/handler/nei/BoilerRecipeHandler.java @@ -1,29 +1,19 @@ package com.hbm.handler.nei; import java.awt.Rectangle; -import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.handler.nei.RefineryRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineBoiler; import com.hbm.inventory.gui.GUIMachineBoilerElectric; -import com.hbm.inventory.gui.GUIMachineRefinery; import com.hbm.lib.RefStrings; import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; public class BoilerRecipeHandler extends TemplateRecipeHandler { diff --git a/com/hbm/handler/nei/ChemplantRecipeHandler.java b/com/hbm/handler/nei/ChemplantRecipeHandler.java index 692c1e8ae..993a39546 100644 --- a/com/hbm/handler/nei/ChemplantRecipeHandler.java +++ b/com/hbm/handler/nei/ChemplantRecipeHandler.java @@ -7,23 +7,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.handler.nei.AssemblerRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIMachineAssembler; import com.hbm.inventory.gui.GUIMachineChemplant; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; public class ChemplantRecipeHandler extends TemplateRecipeHandler { diff --git a/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java b/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java index 26212eafb..2d8b4493e 100644 --- a/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java +++ b/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java @@ -6,22 +6,13 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.handler.nei.CentrifugeRecipeHandler.Fuel; -import com.hbm.handler.nei.CentrifugeRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIMachineCentrifuge; import com.hbm.inventory.gui.GUIMachineGasCent; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.IUsageHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler { diff --git a/com/hbm/handler/nei/ModInfoHandler.java b/com/hbm/handler/nei/ModInfoHandler.java index 01540d25e..90d008eeb 100644 --- a/com/hbm/handler/nei/ModInfoHandler.java +++ b/com/hbm/handler/nei/ModInfoHandler.java @@ -1,29 +1,17 @@ package com.hbm.handler.nei; -import java.awt.Rectangle; import java.util.Arrays; -import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.handler.nei.CyclotronRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIMachineCyclotron; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; public class ModInfoHandler extends TemplateRecipeHandler { diff --git a/com/hbm/handler/nei/RefineryRecipeHandler.java b/com/hbm/handler/nei/RefineryRecipeHandler.java index 6b8003bdc..113181536 100644 --- a/com/hbm/handler/nei/RefineryRecipeHandler.java +++ b/com/hbm/handler/nei/RefineryRecipeHandler.java @@ -8,11 +8,9 @@ import java.util.List; import java.util.Map; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIMachineAssembler; import com.hbm.inventory.gui.GUIMachineRefinery; import com.hbm.lib.RefStrings; -import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/interfaces/IDummy.java b/com/hbm/interfaces/IDummy.java index b1c2ac9af..73a5ddcf2 100644 --- a/com/hbm/interfaces/IDummy.java +++ b/com/hbm/interfaces/IDummy.java @@ -1,5 +1,6 @@ package com.hbm.interfaces; +@Spaghetti("no spaghetti per se, but the entire dummy system is fundamentally flawed. only use the new xR mutliblock system in the future") public interface IDummy { } diff --git a/com/hbm/inventory/gui/GUIScreenSatInterface.java b/com/hbm/inventory/gui/GUIScreenSatInterface.java index 16dbe09d1..c5f5c15a5 100644 --- a/com/hbm/inventory/gui/GUIScreenSatInterface.java +++ b/com/hbm/inventory/gui/GUIScreenSatInterface.java @@ -1,32 +1,20 @@ package com.hbm.inventory.gui; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.lwjgl.opengl.GL11; -import com.hbm.entity.missile.EntityMissileBase; import com.hbm.entity.missile.EntityMissileBaseAdvanced; -import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIScreenTemplateFolder.FolderButton; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; -import com.hbm.items.tool.ItemCassette; -import com.hbm.items.tool.ItemCassette.TrackType; -import com.hbm.items.tool.ItemChemistryTemplate; -import com.hbm.items.tool.ItemFluidIdentifier; import com.hbm.items.tool.ItemSatChip; import com.hbm.items.tool.ItemSatInterface; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; -import com.hbm.packet.ItemFolderPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.SatLaserPacket; import com.hbm.saveddata.SatelliteSaveStructure; import com.hbm.saveddata.SatelliteSaveStructure.SatelliteType; -import com.hbm.saveddata.SatelliteSavedData; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; diff --git a/com/hbm/items/food/ItemWaffle.java b/com/hbm/items/food/ItemWaffle.java index f14ab2361..60ed2060b 100644 --- a/com/hbm/items/food/ItemWaffle.java +++ b/com/hbm/items/food/ItemWaffle.java @@ -1,6 +1,5 @@ package com.hbm.items.food; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.logic.EntityNukeExplosionMK4; import com.hbm.explosion.ExplosionParticle; import com.hbm.main.MainRegistry; diff --git a/com/hbm/items/gear/ModArmor.java b/com/hbm/items/gear/ModArmor.java index e5c12be66..de761997c 100644 --- a/com/hbm/items/gear/ModArmor.java +++ b/com/hbm/items/gear/ModArmor.java @@ -1,16 +1,11 @@ package com.hbm.items.gear; -import com.google.common.collect.Multimap; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import net.minecraft.entity.Entity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class ModArmor extends ItemArmor { diff --git a/com/hbm/items/special/ItemCell.java b/com/hbm/items/special/ItemCell.java index ac2292b4d..66fb7a083 100644 --- a/com/hbm/items/special/ItemCell.java +++ b/com/hbm/items/special/ItemCell.java @@ -3,9 +3,6 @@ package com.hbm.items.special; import java.util.Random; import com.hbm.blocks.bomb.BlockCrashedBomb; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/special/ItemDrop.java b/com/hbm/items/special/ItemDrop.java index ab83d5fb2..54177cb15 100644 --- a/com/hbm/items/special/ItemDrop.java +++ b/com/hbm/items/special/ItemDrop.java @@ -8,7 +8,6 @@ import com.hbm.entity.effect.EntityBlackHole; import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.effect.EntityRagingVortex; import com.hbm.entity.effect.EntityVortex; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.logic.EntityNukeExplosionMK3; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; diff --git a/com/hbm/items/special/ItemTaintBlock.java b/com/hbm/items/special/ItemTaintBlock.java index 83fd8f920..0676cd247 100644 --- a/com/hbm/items/special/ItemTaintBlock.java +++ b/com/hbm/items/special/ItemTaintBlock.java @@ -2,16 +2,13 @@ package com.hbm.items.special; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.BlockTaint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemDye; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; diff --git a/com/hbm/items/tool/ItemCatalog.java b/com/hbm/items/tool/ItemCatalog.java index 065258c09..5a476092e 100644 --- a/com/hbm/items/tool/ItemCatalog.java +++ b/com/hbm/items/tool/ItemCatalog.java @@ -24,7 +24,9 @@ public class ItemCatalog extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { - list.add("For a guide on how to obtain this, visit https://bit.ly/2TPgcqT"); - list.add("No tricks this time, i promise."); + if(this == ModItems.bobmazon_hidden) { + list.add("For a guide on how to obtain this, visit https://bit.ly/2TPgcqT"); + list.add("No tricks this time, i promise."); + } } } diff --git a/com/hbm/items/tool/ItemLaserDetonator.java b/com/hbm/items/tool/ItemLaserDetonator.java index 3c99ddb5a..da3f2233b 100644 --- a/com/hbm/items/tool/ItemLaserDetonator.java +++ b/com/hbm/items/tool/ItemLaserDetonator.java @@ -4,7 +4,6 @@ import java.util.List; import org.apache.logging.log4j.Level; -import com.hbm.blocks.bomb.LaunchPad; import com.hbm.interfaces.IBomb; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; @@ -12,7 +11,6 @@ import com.hbm.main.MainRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; diff --git a/com/hbm/items/tool/ItemLock.java b/com/hbm/items/tool/ItemLock.java index d98b0ccb9..0672f90a7 100644 --- a/com/hbm/items/tool/ItemLock.java +++ b/com/hbm/items/tool/ItemLock.java @@ -1,16 +1,11 @@ package com.hbm.items.tool; -import java.util.List; - -import com.hbm.blocks.bomb.TurretBase; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.TileEntityLockableBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemLock extends ItemKeyPin { diff --git a/com/hbm/items/tool/ItemMeteorRemote.java b/com/hbm/items/tool/ItemMeteorRemote.java index 3970df25d..8faf544eb 100644 --- a/com/hbm/items/tool/ItemMeteorRemote.java +++ b/com/hbm/items/tool/ItemMeteorRemote.java @@ -3,11 +3,9 @@ package com.hbm.items.tool; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.entity.projectile.EntityMeteor; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; diff --git a/com/hbm/items/tool/ItemTurretBiometry.java b/com/hbm/items/tool/ItemTurretBiometry.java index 025a91659..867474d22 100644 --- a/com/hbm/items/tool/ItemTurretBiometry.java +++ b/com/hbm/items/tool/ItemTurretBiometry.java @@ -3,14 +3,10 @@ package com.hbm.items.tool; import java.util.Arrays; import java.util.List; -import com.hbm.blocks.bomb.TurretBase; -import com.hbm.tileentity.bomb.TileEntityTurretBase; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; @@ -28,8 +24,6 @@ public class ItemTurretBiometry extends Item { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { - int i = 0; - addName(stack, player.getUniqueID().toString()); if(world.isRemote) diff --git a/com/hbm/items/tool/ItemTurretControl.java b/com/hbm/items/tool/ItemTurretControl.java index f9a7a1e60..84ffeb91d 100644 --- a/com/hbm/items/tool/ItemTurretControl.java +++ b/com/hbm/items/tool/ItemTurretControl.java @@ -2,16 +2,10 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.blocks.bomb.LaunchPad; import com.hbm.blocks.bomb.TurretBase; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.items.ModItems; -import com.hbm.lib.ModDamageSource; import com.hbm.tileentity.bomb.TileEntityTurretBase; import com.hbm.tileentity.bomb.TileEntityTurretCheapo; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; diff --git a/com/hbm/items/weapon/GunBrimstone.java b/com/hbm/items/weapon/GunBrimstone.java index 437974bd4..7f4c68bac 100644 --- a/com/hbm/items/weapon/GunBrimstone.java +++ b/com/hbm/items/weapon/GunBrimstone.java @@ -4,10 +4,8 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityLaser; import com.hbm.items.ModItems; -import com.hbm.lib.Library; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -17,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ArrowNockEvent; diff --git a/com/hbm/items/weapon/GunDampfmaschine.java b/com/hbm/items/weapon/GunDampfmaschine.java index d675bbdea..7ed9f49cd 100644 --- a/com/hbm/items/weapon/GunDampfmaschine.java +++ b/com/hbm/items/weapon/GunDampfmaschine.java @@ -5,13 +5,8 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.missile.EntityBombletSelena; -import com.hbm.entity.missile.EntityBombletTheta; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityRocket; -import com.hbm.items.ModItems; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/weapon/GunFolly.java b/com/hbm/items/weapon/GunFolly.java index 46734c48d..9fa3a0a8a 100644 --- a/com/hbm/items/weapon/GunFolly.java +++ b/com/hbm/items/weapon/GunFolly.java @@ -1,11 +1,8 @@ package com.hbm.items.weapon; -import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityBulletBase; import com.hbm.handler.BulletConfigSyncingUtil; -import com.hbm.handler.guncfg.BulletConfigFactory; import com.hbm.interfaces.IHoldableWeapon; import com.hbm.items.ModItems; import com.hbm.render.util.RenderScreenOverlay.Crosshair; diff --git a/com/hbm/items/weapon/ItemGunGauss.java b/com/hbm/items/weapon/ItemGunGauss.java index 30a95706b..810df5fa8 100644 --- a/com/hbm/items/weapon/ItemGunGauss.java +++ b/com/hbm/items/weapon/ItemGunGauss.java @@ -2,38 +2,13 @@ package com.hbm.items.weapon; import java.util.List; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - -import com.hbm.entity.projectile.EntityBulletBase; -import com.hbm.entity.projectile.EntityCombineBall; -import com.hbm.handler.BulletConfigSyncingUtil; -import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; -import com.hbm.interfaces.IHoldableWeapon; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import com.hbm.packet.GunButtonPacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.render.util.RenderScreenOverlay.Crosshair; import com.hbm.sound.AudioWrapper; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.resources.I18n; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.client.event.MouseEvent; public class ItemGunGauss extends ItemGunBase { diff --git a/com/hbm/items/weapon/ItemGunLacunae.java b/com/hbm/items/weapon/ItemGunLacunae.java index 62312bfdd..8c7ab8aae 100644 --- a/com/hbm/items/weapon/ItemGunLacunae.java +++ b/com/hbm/items/weapon/ItemGunLacunae.java @@ -1,39 +1,10 @@ package com.hbm.items.weapon; -import java.util.List; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; - -import com.hbm.entity.projectile.EntityBulletBase; -import com.hbm.entity.projectile.EntityCombineBall; -import com.hbm.handler.BulletConfigSyncingUtil; -import com.hbm.handler.BulletConfiguration; import com.hbm.handler.GunConfiguration; -import com.hbm.interfaces.IHoldableWeapon; -import com.hbm.items.ModItems; -import com.hbm.main.MainRegistry; -import com.hbm.packet.GunButtonPacket; -import com.hbm.packet.PacketDispatcher; -import com.hbm.render.util.RenderScreenOverlay.Crosshair; -import com.hbm.sound.AudioWrapper; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.resources.I18n; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.client.event.MouseEvent; public class ItemGunLacunae extends ItemGunBase { diff --git a/com/hbm/render/entity/MultiCloudRenderer.java b/com/hbm/render/entity/MultiCloudRenderer.java index 4d36eec99..f594ab129 100644 --- a/com/hbm/render/entity/MultiCloudRenderer.java +++ b/com/hbm/render/entity/MultiCloudRenderer.java @@ -5,10 +5,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.hbm.entity.particle.EntityBSmokeFX; -import com.hbm.entity.particle.EntityChlorineFX; import com.hbm.entity.particle.EntityModFX; -import com.hbm.items.ModItems; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; diff --git a/com/hbm/render/entity/RenderBullet.java b/com/hbm/render/entity/RenderBullet.java index 9f521b21a..8e1cd16ce 100644 --- a/com/hbm/render/entity/RenderBullet.java +++ b/com/hbm/render/entity/RenderBullet.java @@ -4,7 +4,6 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.handler.BulletConfiguration; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; diff --git a/com/hbm/render/entity/RenderCloudRainbow.java b/com/hbm/render/entity/RenderCloudRainbow.java index 630ea983d..7693a3539 100644 --- a/com/hbm/render/entity/RenderCloudRainbow.java +++ b/com/hbm/render/entity/RenderCloudRainbow.java @@ -2,7 +2,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.lib.RefStrings; diff --git a/com/hbm/render/entity/RenderDeathBlast.java b/com/hbm/render/entity/RenderDeathBlast.java index ef4b301a1..5ac4db69b 100644 --- a/com/hbm/render/entity/RenderDeathBlast.java +++ b/com/hbm/render/entity/RenderDeathBlast.java @@ -2,7 +2,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityDeathBlast; import com.hbm.lib.RefStrings; diff --git a/com/hbm/render/entity/RenderMissileCustom.java b/com/hbm/render/entity/RenderMissileCustom.java index 7c9a44ea8..973c532f0 100644 --- a/com/hbm/render/entity/RenderMissileCustom.java +++ b/com/hbm/render/entity/RenderMissileCustom.java @@ -2,11 +2,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.entity.missile.EntityMissileAntiBallistic; -import com.hbm.entity.missile.EntityMissileBunkerBuster; -import com.hbm.entity.missile.EntityMissileCluster; -import com.hbm.entity.missile.EntityMissileGeneric; -import com.hbm.entity.missile.EntityMissileIncendiary; import com.hbm.main.ResourceManager; import com.hbm.render.util.MissileMultipart; import com.hbm.render.util.MissilePart; diff --git a/com/hbm/render/entity/RenderSRocket.java b/com/hbm/render/entity/RenderSRocket.java index a15b045c9..2cc72bbbe 100644 --- a/com/hbm/render/entity/RenderSRocket.java +++ b/com/hbm/render/entity/RenderSRocket.java @@ -2,10 +2,8 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityRocketHoming; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBullet; import com.hbm.render.model.ModelSRocket; import net.minecraft.client.renderer.entity.Render; diff --git a/com/hbm/render/entity/RenderSmallNukeMK3.java b/com/hbm/render/entity/RenderSmallNukeMK3.java index 83b680414..26623a138 100644 --- a/com/hbm/render/entity/RenderSmallNukeMK3.java +++ b/com/hbm/render/entity/RenderSmallNukeMK3.java @@ -1,16 +1,12 @@ package com.hbm.render.entity; -import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -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; diff --git a/com/hbm/render/item/ItemRenderMissilePart.java b/com/hbm/render/item/ItemRenderMissilePart.java index f83ad06a3..fbff9a4ce 100644 --- a/com/hbm/render/item/ItemRenderMissilePart.java +++ b/com/hbm/render/item/ItemRenderMissilePart.java @@ -2,23 +2,11 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.ModBlocks; -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelSteelBeam; -import com.hbm.render.model.ModelSteelCorner; -import com.hbm.render.model.ModelSteelRoof; -import com.hbm.render.model.ModelSteelScaffold; -import com.hbm.render.model.ModelSteelWall; import com.hbm.render.util.MissilePart; import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.Item; 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 ItemRenderMissilePart implements IItemRenderer { diff --git a/com/hbm/saveddata/RadiationSaveStructure.java b/com/hbm/saveddata/RadiationSaveStructure.java deleted file mode 100644 index c0a440fb4..000000000 --- a/com/hbm/saveddata/RadiationSaveStructure.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hbm.saveddata; - -import java.util.Arrays; - -import com.hbm.handler.FluidTypeHandler.FluidType; - -import net.minecraft.nbt.NBTTagCompound; - -public class RadiationSaveStructure { - - public int chunkX; - public int chunkY; - public float radiation; - - public RadiationSaveStructure() { } - - public RadiationSaveStructure(int x, int y, float rad) { - chunkX = x; - chunkY = y; - radiation = rad; - } - - public void readFromNBT(NBTTagCompound nbt, int index) { - chunkX = nbt.getInteger("rad_" + index + "_x"); - chunkY = nbt.getInteger("rad_" + index + "_y"); - radiation = nbt.getFloat("rad_" + index + "_level"); - } - - public void writeToNBT(NBTTagCompound nbt, int index) { - nbt.setInteger("rad_" + index + "_x", chunkX); - nbt.setInteger("rad_" + index + "_y", chunkY); - nbt.setFloat("rad_" + index + "_level", radiation); - } - -} diff --git a/com/hbm/saveddata/RadiationSavedData.java b/com/hbm/saveddata/RadiationSavedData.java index 4b500d779..fe3a36297 100644 --- a/com/hbm/saveddata/RadiationSavedData.java +++ b/com/hbm/saveddata/RadiationSavedData.java @@ -1,23 +1,23 @@ package com.hbm.saveddata; -import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; +import java.util.Map.Entry; -import com.hbm.entity.particle.EntityFogFX; 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.nbt.NBTTagCompound; +import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; -import net.minecraft.world.WorldProviderHell; import net.minecraft.world.WorldSavedData; import net.minecraft.world.chunk.Chunk; public class RadiationSavedData extends WorldSavedData { - - public List contamination = new ArrayList(); + + //public List contamination = new ArrayList(); + public HashMap contamination = new HashMap(); private static RadiationSavedData openInstance; @@ -34,23 +34,6 @@ public class RadiationSavedData extends WorldSavedData { this.markDirty(); } - public boolean doesEntryExist(int x, int y) { - - return getRadFromCoord(x, y) != null; - } - - public void createEntry(int x, int y, float rad) { - - contamination.add(new RadiationSaveStructure(x, y, rad)); - this.markDirty(); - } - - public void deleteEntry(RadiationSaveStructure struct) { - - contamination.remove(struct); - this.markDirty(); - } - public void jettisonData() { contamination.clear(); @@ -58,109 +41,80 @@ public class RadiationSavedData extends WorldSavedData { } public void setRadForCoord(int x, int y, float radiation) { - - RadiationSaveStructure entry = null; - - for(RadiationSaveStructure rad : contamination) - if(rad.chunkX == x && rad.chunkY == y) { - entry = rad; - break; - } - - if(entry == null) { - entry = new RadiationSaveStructure(x, y, radiation); - contamination.add(entry); - } - - entry.radiation = radiation; + ChunkCoordIntPair pair = new ChunkCoordIntPair(x, y); + contamination.put(pair, radiation); this.markDirty(); } - public RadiationSaveStructure getRadFromCoord(int x, int y) { - - for(RadiationSaveStructure rad : contamination) - if(rad.chunkX == x && rad.chunkY == y) - return rad; - - return null; - } - public float getRadNumFromCoord(int x, int y) { - for(RadiationSaveStructure rad : contamination) - if(rad.chunkX == x && rad.chunkY == y) - return rad.radiation; + ChunkCoordIntPair pair = new ChunkCoordIntPair(x, y); + Float rad = contamination.get(pair); - if(worldObj != null && worldObj.provider instanceof WorldProviderHell) - return MainRegistry.hellRad; - - return 0F; + return rad == null ? 0 : rad; } public void updateSystem() { - List tempList = new ArrayList(contamination); - + HashMap tempList = new HashMap(contamination); contamination.clear(); - for(RadiationSaveStructure struct : tempList) { + for(Entry struct : tempList.entrySet()) { - if(struct.radiation != 0) { + if(struct.getValue() != 0) { + + float rad = struct.getValue(); //struct.radiation *= 0.999F; - struct.radiation *= 0.99F; - struct.radiation -= 0.5F; + rad *= 0.99F; + rad -= 0.5F; - if(struct.radiation <= 0) { - struct.radiation = 0; + if(rad <= 0) { + rad = 0; } - if(struct.radiation > MainRegistry.fogRad && worldObj != null && worldObj.rand.nextInt(MainRegistry.fogCh) == 0 && worldObj.getChunkFromChunkCoords(struct.chunkX, struct.chunkY).isChunkLoaded) { + if(rad > MainRegistry.fogRad && worldObj != null && worldObj.rand.nextInt(MainRegistry.fogCh) == 0 && worldObj.getChunkFromChunkCoords(struct.getKey().chunkXPos, struct.getKey().chunkZPos).isChunkLoaded) { - int x = struct.chunkX * 16 + worldObj.rand.nextInt(16); - int z = struct.chunkY * 16 + worldObj.rand.nextInt(16); + int x = struct.getKey().chunkXPos * 16 + worldObj.rand.nextInt(16); + int z = struct.getKey().chunkZPos * 16 + worldObj.rand.nextInt(16); int y = worldObj.getHeightValue(x, z) + worldObj.rand.nextInt(5); - //EntityFogFX fog = new EntityFogFX(worldObj); - //fog.setPosition(x, y, z); - //System.out.println(x + " " + y + " " + z); - //worldObj.spawnEntityInWorld(fog); PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacket(x, y, z, 3), new TargetPoint(worldObj.provider.dimensionId, x, y, z, 100)); } - if(struct.radiation > 1) { + if(rad > 1) { float[] rads = new float[9]; - rads[0] = getRadNumFromCoord(struct.chunkX + 1, struct.chunkY + 1); - rads[1] = getRadNumFromCoord(struct.chunkX, struct.chunkY + 1); - rads[2] = getRadNumFromCoord(struct.chunkX - 1, struct.chunkY + 1); - rads[3] = getRadNumFromCoord(struct.chunkX - 1, struct.chunkY); - rads[4] = getRadNumFromCoord(struct.chunkX - 1, struct.chunkY - 1); - rads[5] = getRadNumFromCoord(struct.chunkX, struct.chunkY - 1); - rads[6] = getRadNumFromCoord(struct.chunkX + 1, struct.chunkY - 1); - rads[7] = getRadNumFromCoord(struct.chunkX + 1, struct.chunkY); - rads[8] = getRadNumFromCoord(struct.chunkX, struct.chunkY); + rads[0] = getRadNumFromCoord(struct.getKey().chunkXPos + 1, struct.getKey().chunkZPos + 1); + rads[1] = getRadNumFromCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos + 1); + rads[2] = getRadNumFromCoord(struct.getKey().chunkXPos - 1, struct.getKey().chunkZPos + 1); + rads[3] = getRadNumFromCoord(struct.getKey().chunkXPos - 1, struct.getKey().chunkZPos); + rads[4] = getRadNumFromCoord(struct.getKey().chunkXPos - 1, struct.getKey().chunkZPos - 1); + rads[5] = getRadNumFromCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos - 1); + rads[6] = getRadNumFromCoord(struct.getKey().chunkXPos + 1, struct.getKey().chunkZPos - 1); + rads[7] = getRadNumFromCoord(struct.getKey().chunkXPos + 1, struct.getKey().chunkZPos); + rads[8] = getRadNumFromCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos); float main = 0.6F; float side = 0.075F; float corner = 0.025F; - setRadForCoord(struct.chunkX + 1, struct.chunkY + 1, rads[0] + struct.radiation * corner); - setRadForCoord(struct.chunkX, struct.chunkY + 1, rads[1] + struct.radiation * side); - setRadForCoord(struct.chunkX - 1, struct.chunkY + 1, rads[2] + struct.radiation * corner); - setRadForCoord(struct.chunkX - 1, struct.chunkY, rads[3] + struct.radiation * side); - setRadForCoord(struct.chunkX - 1, struct.chunkY - 1, rads[4] + struct.radiation * corner); - setRadForCoord(struct.chunkX, struct.chunkY - 1, rads[5] + struct.radiation * side); - setRadForCoord(struct.chunkX + 1, struct.chunkY - 1, rads[6] + struct.radiation * corner); - setRadForCoord(struct.chunkX + 1, struct.chunkY, rads[7] + struct.radiation * side); - setRadForCoord(struct.chunkX, struct.chunkY, rads[8] + struct.radiation * main); + setRadForCoord(struct.getKey().chunkXPos + 1, struct.getKey().chunkZPos + 1, rads[0] + rad * corner); + setRadForCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos + 1, rads[1] + rad * side); + setRadForCoord(struct.getKey().chunkXPos - 1, struct.getKey().chunkZPos + 1, rads[2] + rad * corner); + setRadForCoord(struct.getKey().chunkXPos - 1, struct.getKey().chunkZPos, rads[3] + rad * side); + setRadForCoord(struct.getKey().chunkXPos - 1, struct.getKey().chunkZPos - 1, rads[4] + rad * corner); + setRadForCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos - 1, rads[5] + rad * side); + setRadForCoord(struct.getKey().chunkXPos + 1, struct.getKey().chunkZPos - 1, rads[6] + rad * corner); + setRadForCoord(struct.getKey().chunkXPos + 1, struct.getKey().chunkZPos, rads[7] + rad * side); + setRadForCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos, rads[8] + rad * main); } else { - this.setRadForCoord(struct.chunkX, struct.chunkY, getRadNumFromCoord(struct.chunkX, struct.chunkY) + struct.radiation); + this.setRadForCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos, getRadNumFromCoord(struct.getKey().chunkXPos, struct.getKey().chunkZPos) + rad); } } } @@ -173,10 +127,17 @@ public class RadiationSavedData extends WorldSavedData { int count = nbt.getInteger("radCount"); for(int i = 0; i < count; i++) { - RadiationSaveStructure struct = new RadiationSaveStructure(); - struct.readFromNBT(nbt, i); + + ChunkCoordIntPair pair = new ChunkCoordIntPair( + nbt.getInteger("cposX" + i), + nbt.getInteger("cposZ" + i) + + ); - contamination.add(struct); + contamination.put( + pair, + nbt.getFloat("crad" + i) + ); } } @@ -184,9 +145,15 @@ public class RadiationSavedData extends WorldSavedData { public void writeToNBT(NBTTagCompound nbt) { nbt.setInteger("radCount", contamination.size()); - for(int i = 0; i < contamination.size(); i++) { - contamination.get(i).writeToNBT(nbt, i); - } + int i = 0; + + for(Entry struct : contamination.entrySet()) { + nbt.setInteger("cposX" + i, struct.getKey().chunkXPos); + nbt.setInteger("cposZ" + i, struct.getKey().chunkZPos); + nbt.setFloat("crad" + i, struct.getValue()); + + i++; + } } public static RadiationSavedData getData(World worldObj) { diff --git a/com/hbm/tileentity/conductor/TileEntityFluidDuct.java b/com/hbm/tileentity/conductor/TileEntityFluidDuct.java index 46b86e90e..edf6221d5 100644 --- a/com/hbm/tileentity/conductor/TileEntityFluidDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityFluidDuct.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; diff --git a/com/hbm/tileentity/conductor/TileEntityGasDuct.java b/com/hbm/tileentity/conductor/TileEntityGasDuct.java index 315e98d73..48319dcf6 100644 --- a/com/hbm/tileentity/conductor/TileEntityGasDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityGasDuct.java @@ -1,14 +1,11 @@ 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.calc.UnionOfTileEntitiesAndBooleansForGas; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; -import com.hbm.interfaces.IGasDuct; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFluidPipePacket; diff --git a/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java b/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java index 67f55dc7d..6c258d0b0 100644 --- a/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java +++ b/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java @@ -4,10 +4,8 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.calc.UnionOfTileEntitiesAndBooleansForGas; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; -import com.hbm.interfaces.IGasDuct; import net.minecraft.tileentity.TileEntity; public class TileEntityGasDuctSolid extends TileEntity implements IFluidDuct { diff --git a/com/hbm/tileentity/conductor/TileEntityOilDuct.java b/com/hbm/tileentity/conductor/TileEntityOilDuct.java index 03658112c..b8ff89973 100644 --- a/com/hbm/tileentity/conductor/TileEntityOilDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityOilDuct.java @@ -1,14 +1,11 @@ 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.calc.UnionOfTileEntitiesAndBooleansForOil; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; -import com.hbm.interfaces.IOilDuct; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFluidPipePacket; diff --git a/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java b/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java index dc5d7cb26..a11c9ad58 100644 --- a/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java +++ b/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java @@ -4,10 +4,8 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; -import com.hbm.calc.UnionOfTileEntitiesAndBooleansForOil; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; -import com.hbm.interfaces.IOilDuct; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/deco/TileEntityGeysir.java b/com/hbm/tileentity/deco/TileEntityGeysir.java index 990508287..c0bf00e8e 100644 --- a/com/hbm/tileentity/deco/TileEntityGeysir.java +++ b/com/hbm/tileentity/deco/TileEntityGeysir.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityChlorineFX; import com.hbm.entity.particle.EntityOrangeFX; import com.hbm.entity.projectile.EntityWaterSplash; diff --git a/com/hbm/tileentity/deco/TileEntityYellowBarrel.java b/com/hbm/tileentity/deco/TileEntityYellowBarrel.java index b7b083afb..603327d75 100644 --- a/com/hbm/tileentity/deco/TileEntityYellowBarrel.java +++ b/com/hbm/tileentity/deco/TileEntityYellowBarrel.java @@ -1,28 +1,8 @@ package com.hbm.tileentity.deco; -import java.util.HashSet; -import java.util.List; - -import com.hbm.entity.mob.EntityNuclearCreeper; -import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; -import com.hbm.potion.HbmPotion; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; public class TileEntityYellowBarrel extends TileEntity { diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index c653c0c4e..b7e60f8df 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -3,11 +3,8 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; diff --git a/com/hbm/tileentity/machine/TileEntityConverterRfHe.java b/com/hbm/tileentity/machine/TileEntityConverterRfHe.java index 3ac24fcae..ff203393a 100644 --- a/com/hbm/tileentity/machine/TileEntityConverterRfHe.java +++ b/com/hbm/tileentity/machine/TileEntityConverterRfHe.java @@ -8,7 +8,6 @@ import com.hbm.interfaces.ISource; import com.hbm.lib.Library; import cofh.api.energy.EnergyStorage; -import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyReceiver; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; diff --git a/com/hbm/tileentity/machine/TileEntityCrateIron.java b/com/hbm/tileentity/machine/TileEntityCrateIron.java index b79b144b6..96ca9f4a3 100644 --- a/com/hbm/tileentity/machine/TileEntityCrateIron.java +++ b/com/hbm/tileentity/machine/TileEntityCrateIron.java @@ -1,18 +1,10 @@ package com.hbm.tileentity.machine; -import com.hbm.blocks.ModBlocks; -import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.FluidTank; -import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; public class TileEntityCrateIron extends TileEntityLockableBase implements ISidedInventory { diff --git a/com/hbm/tileentity/machine/TileEntityForceField.java b/com/hbm/tileentity/machine/TileEntityForceField.java index 321150add..d2b256268 100644 --- a/com/hbm/tileentity/machine/TileEntityForceField.java +++ b/com/hbm/tileentity/machine/TileEntityForceField.java @@ -3,13 +3,10 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.machine.MachineElectricFurnace; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; -import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFFPacket; @@ -19,7 +16,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java b/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java index 99fbf8a7c..9d868a758 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityMachineArcFurnace.java @@ -312,6 +312,7 @@ public class TileEntityMachineArcFurnace extends TileEntity implements ISidedInv } } + //TODO: fix this punjabi trash @Override public void updateEntity() { boolean flag = this.hasPower(); diff --git a/com/hbm/tileentity/machine/TileEntityMachineBoiler.java b/com/hbm/tileentity/machine/TileEntityMachineBoiler.java index c5c01d8ee..969ab0229 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineBoiler.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBoiler.java @@ -5,24 +5,17 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineBoiler; -import com.hbm.blocks.machine.MachineCoal; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; -import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; -import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index a1725e7de..e461ca975 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -3,7 +3,6 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactor.java b/com/hbm/tileentity/machine/TileEntityMachineReactor.java index 7e352bd20..c1e92bdf2 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactor.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactor.java @@ -1,6 +1,5 @@ package com.hbm.tileentity.machine; -import com.hbm.blocks.machine.MachineDiFurnace; import com.hbm.blocks.machine.MachineReactor; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index 7a5db9a85..1266fecfb 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -2,34 +2,24 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.machine.MachineGenerator; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.IFluidSource; -import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.items.special.ItemFuelRod; import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; -import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.potion.HbmPotion; import com.hbm.saveddata.RadiationSavedData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -38,7 +28,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java index 9f197eb2d..0db5fe236 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java @@ -2,9 +2,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import java.util.Random; -import com.hbm.blocks.machine.MachineGenerator; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; @@ -16,17 +14,14 @@ import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.items.special.ItemFuelRod; import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.potion.HbmPotion; import com.hbm.saveddata.RadiationSavedData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -35,7 +30,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index 999f1ae19..fb067d556 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -3,7 +3,6 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index 111a9b8ff..3fdd3056f 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -4,9 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityDSmokeFX; -import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.entity.particle.EntityTSmokeFX; import com.hbm.handler.FluidTypeHandler.FluidType; @@ -16,7 +13,6 @@ import com.hbm.interfaces.IFluidContainer; import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.packet.AuxElectricityPacket; diff --git a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index 8f23a8167..10692b8c2 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -1,47 +1,31 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.machine.MachineGenerator; import com.hbm.entity.logic.EntityNukeExplosionMK4; -import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.explosion.ExplosionParticle; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidContainer; -import com.hbm.interfaces.IReactor; import com.hbm.interfaces.ISource; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; import com.hbm.items.special.ItemFuelRod; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.potion.HbmPotion; import com.hbm.saveddata.RadiationSavedData; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class TileEntityReactorMultiblock extends TileEntity implements ISidedInventory, ISource, IFluidContainer, IFluidAcceptor {