diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 789e4fbcb..87d55b4d4 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -953,7 +953,7 @@ entity.hbm.entity_bullet.name=Bullet entity.hbm.entity_rocket.name=Rocket entity.hbm.entity_schrabnel.name=Schrabnel entity.entity_mob_nuclear_creeper.name=Nuclear Creeper -entity.entity_mob_hunter_chopper.name=Hunter ChopperCreeper +entity.entity_mob_hunter_chopper.name=Hunter Chopper entity.entity_cyber_crab.name=Cyber Crab item.cap_aluminium.name=Aluminium Cap diff --git a/assets/hbm/textures/items/shimmer_head_original.png b/assets/hbm/textures/items/shimmer_head_original.png new file mode 100644 index 000000000..91a496383 Binary files /dev/null and b/assets/hbm/textures/items/shimmer_head_original.png differ diff --git a/assets/hbm/textures/items/shimmer_sledge_hd_original.png b/assets/hbm/textures/items/shimmer_sledge_hd_original.png new file mode 100644 index 000000000..697e7df82 Binary files /dev/null and b/assets/hbm/textures/items/shimmer_sledge_hd_original.png differ diff --git a/assets/hbm/textures/items/shimmer_sledge_original.png b/assets/hbm/textures/items/shimmer_sledge_original.png new file mode 100644 index 000000000..e6a8fca29 Binary files /dev/null and b/assets/hbm/textures/items/shimmer_sledge_original.png differ diff --git a/com/hbm/blocks/bomb/BlockCrashedBomb.java b/com/hbm/blocks/bomb/BlockCrashedBomb.java index e3c6a0c56..e1626a12b 100644 --- a/com/hbm/blocks/bomb/BlockCrashedBomb.java +++ b/com/hbm/blocks/bomb/BlockCrashedBomb.java @@ -7,7 +7,7 @@ import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.explosion.ExplosionParticleB; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityCrashedBomb; +import com.hbm.tileentity.bomb.TileEntityCrashedBomb; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/bomb/BombMulti.java b/com/hbm/blocks/bomb/BombMulti.java index 870b45c13..e1550f94f 100644 --- a/com/hbm/blocks/bomb/BombMulti.java +++ b/com/hbm/blocks/bomb/BombMulti.java @@ -25,7 +25,7 @@ import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityBombMulti; +import com.hbm.tileentity.bomb.TileEntityBombMulti; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/bomb/LaunchPad.java b/com/hbm/blocks/bomb/LaunchPad.java index 32e07b22d..0e8f90c76 100644 --- a/com/hbm/blocks/bomb/LaunchPad.java +++ b/com/hbm/blocks/bomb/LaunchPad.java @@ -24,7 +24,7 @@ import com.hbm.entity.missile.EntityMissileStrong; import com.hbm.interfaces.IBomb; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/bomb/NukeBoy.java b/com/hbm/blocks/bomb/NukeBoy.java index 0f1c31593..836477f0c 100644 --- a/com/hbm/blocks/bomb/NukeBoy.java +++ b/com/hbm/blocks/bomb/NukeBoy.java @@ -8,7 +8,7 @@ import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeBoy; +import com.hbm.tileentity.bomb.TileEntityNukeBoy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/NukeCustom.java b/com/hbm/blocks/bomb/NukeCustom.java index e71e22da1..2f1dac836 100644 --- a/com/hbm/blocks/bomb/NukeCustom.java +++ b/com/hbm/blocks/bomb/NukeCustom.java @@ -15,7 +15,7 @@ import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeCustom; +import com.hbm.tileentity.bomb.TileEntityNukeCustom; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/NukeFleija.java b/com/hbm/blocks/bomb/NukeFleija.java index 3dee3616c..6e1d1380b 100644 --- a/com/hbm/blocks/bomb/NukeFleija.java +++ b/com/hbm/blocks/bomb/NukeFleija.java @@ -9,7 +9,7 @@ import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeFleija; +import com.hbm.tileentity.bomb.TileEntityNukeFleija; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/NukeGadget.java b/com/hbm/blocks/bomb/NukeGadget.java index 5b3d0d560..8365e3a3f 100644 --- a/com/hbm/blocks/bomb/NukeGadget.java +++ b/com/hbm/blocks/bomb/NukeGadget.java @@ -10,7 +10,7 @@ import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeGadget; +import com.hbm.tileentity.bomb.TileEntityNukeGadget; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/NukeMan.java b/com/hbm/blocks/bomb/NukeMan.java index 5ea69ad56..172c1267d 100644 --- a/com/hbm/blocks/bomb/NukeMan.java +++ b/com/hbm/blocks/bomb/NukeMan.java @@ -10,7 +10,7 @@ import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeMan; +import com.hbm.tileentity.bomb.TileEntityNukeMan; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/NukeMike.java b/com/hbm/blocks/bomb/NukeMike.java index dce4b50e5..20fddfa8c 100644 --- a/com/hbm/blocks/bomb/NukeMike.java +++ b/com/hbm/blocks/bomb/NukeMike.java @@ -11,7 +11,7 @@ import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeMike; +import com.hbm.tileentity.bomb.TileEntityNukeMike; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/NukePrototype.java b/com/hbm/blocks/bomb/NukePrototype.java index 382caf9fa..997fcc8f9 100644 --- a/com/hbm/blocks/bomb/NukePrototype.java +++ b/com/hbm/blocks/bomb/NukePrototype.java @@ -10,7 +10,7 @@ import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukePrototype; +import com.hbm.tileentity.bomb.TileEntityNukePrototype; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/NukeTsar.java b/com/hbm/blocks/bomb/NukeTsar.java index da5ad9a70..91483055a 100644 --- a/com/hbm/blocks/bomb/NukeTsar.java +++ b/com/hbm/blocks/bomb/NukeTsar.java @@ -8,7 +8,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeTsar; +import com.hbm.tileentity.bomb.TileEntityNukeTsar; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/bomb/TurretFlamer.java b/com/hbm/blocks/bomb/TurretFlamer.java index 7949b1857..c18dad4fe 100644 --- a/com/hbm/blocks/bomb/TurretFlamer.java +++ b/com/hbm/blocks/bomb/TurretFlamer.java @@ -3,8 +3,8 @@ 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.TileEntityTurretFlamer; -import com.hbm.tileentity.TileEntityTurretHeavy; +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/TurretHeavy.java b/com/hbm/blocks/bomb/TurretHeavy.java index 5f4c1f178..fc481eba0 100644 --- a/com/hbm/blocks/bomb/TurretHeavy.java +++ b/com/hbm/blocks/bomb/TurretHeavy.java @@ -4,7 +4,7 @@ import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.particle.EntitySSmokeFX; import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityLaserBeam; -import com.hbm.tileentity.TileEntityTurretHeavy; +import com.hbm.tileentity.bomb.TileEntityTurretHeavy; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/bomb/TurretLight.java b/com/hbm/blocks/bomb/TurretLight.java index 53cf8c6bc..993e1cc91 100644 --- a/com/hbm/blocks/bomb/TurretLight.java +++ b/com/hbm/blocks/bomb/TurretLight.java @@ -2,8 +2,8 @@ package com.hbm.blocks.bomb; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.tileentity.TileEntityTurretHeavy; -import com.hbm.tileentity.TileEntityTurretLight; +import com.hbm.tileentity.bomb.TileEntityTurretHeavy; +import com.hbm.tileentity.bomb.TileEntityTurretLight; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/bomb/TurretRocket.java b/com/hbm/blocks/bomb/TurretRocket.java index 661309466..90ee05384 100644 --- a/com/hbm/blocks/bomb/TurretRocket.java +++ b/com/hbm/blocks/bomb/TurretRocket.java @@ -3,8 +3,8 @@ package com.hbm.blocks.bomb; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityRocket; -import com.hbm.tileentity.TileEntityTurretHeavy; -import com.hbm.tileentity.TileEntityTurretRocket; +import com.hbm.tileentity.bomb.TileEntityTurretHeavy; +import com.hbm.tileentity.bomb.TileEntityTurretRocket; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/bomb/TurretTau.java b/com/hbm/blocks/bomb/TurretTau.java index 8b191ad3c..99bfb8bc8 100644 --- a/com/hbm/blocks/bomb/TurretTau.java +++ b/com/hbm/blocks/bomb/TurretTau.java @@ -2,8 +2,8 @@ package com.hbm.blocks.bomb; import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.tileentity.TileEntityTurretHeavy; -import com.hbm.tileentity.TileEntityTurretTau; +import com.hbm.tileentity.bomb.TileEntityTurretHeavy; +import com.hbm.tileentity.bomb.TileEntityTurretTau; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/generic/BlockMarker.java b/com/hbm/blocks/generic/BlockMarker.java index 98defc517..2c8d92731 100644 --- a/com/hbm/blocks/generic/BlockMarker.java +++ b/com/hbm/blocks/generic/BlockMarker.java @@ -2,7 +2,7 @@ package com.hbm.blocks.generic; import java.util.Random; -import com.hbm.tileentity.TileEntityStructureMarker; +import com.hbm.tileentity.machine.TileEntityStructureMarker; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/generic/DecoBlock.java b/com/hbm/blocks/generic/DecoBlock.java index 8e55ee611..f20888cb8 100644 --- a/com/hbm/blocks/generic/DecoBlock.java +++ b/com/hbm/blocks/generic/DecoBlock.java @@ -1,7 +1,7 @@ package com.hbm.blocks.generic; import com.hbm.blocks.ModBlocks; -import com.hbm.tileentity.TileEntityDecoBlock; +import com.hbm.tileentity.deco.TileEntityDecoBlock; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/generic/DecoBlockAlt.java b/com/hbm/blocks/generic/DecoBlockAlt.java index 36d28b354..4e7d7657f 100644 --- a/com/hbm/blocks/generic/DecoBlockAlt.java +++ b/com/hbm/blocks/generic/DecoBlockAlt.java @@ -5,10 +5,10 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityDecoBlockAlt; -import com.hbm.tileentity.TileEntityDecoBlockAltF; -import com.hbm.tileentity.TileEntityDecoBlockAltG; -import com.hbm.tileentity.TileEntityDecoBlockAltW; +import com.hbm.tileentity.deco.TileEntityDecoBlockAlt; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltF; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltG; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltW; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/generic/DecoPoleSatelliteReceiver.java b/com/hbm/blocks/generic/DecoPoleSatelliteReceiver.java index 8fa535167..481236f78 100644 --- a/com/hbm/blocks/generic/DecoPoleSatelliteReceiver.java +++ b/com/hbm/blocks/generic/DecoPoleSatelliteReceiver.java @@ -1,6 +1,6 @@ package com.hbm.blocks.generic; -import com.hbm.tileentity.TileEntityDecoPoleSatelliteReceiver; +import com.hbm.tileentity.deco.TileEntityDecoPoleSatelliteReceiver; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/generic/DecoPoleTop.java b/com/hbm/blocks/generic/DecoPoleTop.java index 30937dddc..7a25a06e3 100644 --- a/com/hbm/blocks/generic/DecoPoleTop.java +++ b/com/hbm/blocks/generic/DecoPoleTop.java @@ -1,6 +1,6 @@ package com.hbm.blocks.generic; -import com.hbm.tileentity.TileEntityDecoPoleTop; +import com.hbm.tileentity.deco.TileEntityDecoPoleTop; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/generic/DecoSteelPoles.java b/com/hbm/blocks/generic/DecoSteelPoles.java index 773bcd6cc..d1f17ef2a 100644 --- a/com/hbm/blocks/generic/DecoSteelPoles.java +++ b/com/hbm/blocks/generic/DecoSteelPoles.java @@ -1,6 +1,6 @@ package com.hbm.blocks.generic; -import com.hbm.tileentity.TileEntityDecoSteelPoles; +import com.hbm.tileentity.deco.TileEntityDecoSteelPoles; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/generic/DecoTapeRecorder.java b/com/hbm/blocks/generic/DecoTapeRecorder.java index a92cc3dc8..b6ee5094e 100644 --- a/com/hbm/blocks/generic/DecoTapeRecorder.java +++ b/com/hbm/blocks/generic/DecoTapeRecorder.java @@ -1,6 +1,6 @@ package com.hbm.blocks.generic; -import com.hbm.tileentity.TileEntityDecoTapeRecorder; +import com.hbm.tileentity.deco.TileEntityDecoTapeRecorder; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/generic/RedBarrel.java b/com/hbm/blocks/generic/RedBarrel.java index 5659b1bc1..f70559265 100644 --- a/com/hbm/blocks/generic/RedBarrel.java +++ b/com/hbm/blocks/generic/RedBarrel.java @@ -1,7 +1,7 @@ package com.hbm.blocks.generic; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityRedBarrel; +import com.hbm.tileentity.bomb.TileEntityRedBarrel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/generic/YellowBarrel.java b/com/hbm/blocks/generic/YellowBarrel.java index 7c9d2b3d6..ee1bc1a28 100644 --- a/com/hbm/blocks/generic/YellowBarrel.java +++ b/com/hbm/blocks/generic/YellowBarrel.java @@ -5,7 +5,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityYellowBarrel; +import com.hbm.tileentity.deco.TileEntityYellowBarrel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/BlockCable.java b/com/hbm/blocks/machine/BlockCable.java index 19ff3d025..949222d69 100644 --- a/com/hbm/blocks/machine/BlockCable.java +++ b/com/hbm/blocks/machine/BlockCable.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityCable; +import com.hbm.tileentity.conductor.TileEntityCable; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/BlockConverterHeRf.java b/com/hbm/blocks/machine/BlockConverterHeRf.java index 2cd61dccf..702ed37cc 100644 --- a/com/hbm/blocks/machine/BlockConverterHeRf.java +++ b/com/hbm/blocks/machine/BlockConverterHeRf.java @@ -2,7 +2,7 @@ package com.hbm.blocks.machine; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityConverterHeRf; +import com.hbm.tileentity.machine.TileEntityConverterHeRf; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/BlockConverterRfHe.java b/com/hbm/blocks/machine/BlockConverterRfHe.java index 601c7c9c2..85e5b8b9f 100644 --- a/com/hbm/blocks/machine/BlockConverterRfHe.java +++ b/com/hbm/blocks/machine/BlockConverterRfHe.java @@ -2,7 +2,7 @@ package com.hbm.blocks.machine; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityConverterRfHe; +import com.hbm.tileentity.machine.TileEntityConverterRfHe; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/BlockFluidDuct.java b/com/hbm/blocks/machine/BlockFluidDuct.java index 32df0e48e..5d2e43b65 100644 --- a/com/hbm/blocks/machine/BlockFluidDuct.java +++ b/com/hbm/blocks/machine/BlockFluidDuct.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/BlockGasDuct.java b/com/hbm/blocks/machine/BlockGasDuct.java index 50aa4189c..84a697a88 100644 --- a/com/hbm/blocks/machine/BlockGasDuct.java +++ b/com/hbm/blocks/machine/BlockGasDuct.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityGasDuct; +import com.hbm.tileentity.conductor.TileEntityGasDuct; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/BlockHatch.java b/com/hbm/blocks/machine/BlockHatch.java index 87a8edaba..e0ae85823 100644 --- a/com/hbm/blocks/machine/BlockHatch.java +++ b/com/hbm/blocks/machine/BlockHatch.java @@ -1,6 +1,6 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityHatch; +import com.hbm.tileentity.machine.TileEntityHatch; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/machine/BlockOilDuct.java b/com/hbm/blocks/machine/BlockOilDuct.java index 7751942ff..9c5218b1e 100644 --- a/com/hbm/blocks/machine/BlockOilDuct.java +++ b/com/hbm/blocks/machine/BlockOilDuct.java @@ -1,6 +1,6 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityOilDuct; +import com.hbm.tileentity.conductor.TileEntityOilDuct; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/machine/BlockSeal.java b/com/hbm/blocks/machine/BlockSeal.java index 55590cf98..8e1f5e23a 100644 --- a/com/hbm/blocks/machine/BlockSeal.java +++ b/com/hbm/blocks/machine/BlockSeal.java @@ -5,7 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IBomb; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityHatch; +import com.hbm.tileentity.machine.TileEntityHatch; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/machine/DummyBlockAssembler.java b/com/hbm/blocks/machine/DummyBlockAssembler.java index b9639fbae..3aa0e7971 100644 --- a/com/hbm/blocks/machine/DummyBlockAssembler.java +++ b/com/hbm/blocks/machine/DummyBlockAssembler.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/DummyBlockCentrifuge.java b/com/hbm/blocks/machine/DummyBlockCentrifuge.java index 2a0a60307..6501acf0c 100644 --- a/com/hbm/blocks/machine/DummyBlockCentrifuge.java +++ b/com/hbm/blocks/machine/DummyBlockCentrifuge.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/DummyBlockChemplant.java b/com/hbm/blocks/machine/DummyBlockChemplant.java index 2a5a31e50..e4e56849d 100644 --- a/com/hbm/blocks/machine/DummyBlockChemplant.java +++ b/com/hbm/blocks/machine/DummyBlockChemplant.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/DummyBlockCyclotron.java b/com/hbm/blocks/machine/DummyBlockCyclotron.java index eb2e7349f..63885f1f1 100644 --- a/com/hbm/blocks/machine/DummyBlockCyclotron.java +++ b/com/hbm/blocks/machine/DummyBlockCyclotron.java @@ -5,8 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineCyclotron; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineCyclotron; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/DummyBlockDrill.java b/com/hbm/blocks/machine/DummyBlockDrill.java index 790727396..526545e8b 100644 --- a/com/hbm/blocks/machine/DummyBlockDrill.java +++ b/com/hbm/blocks/machine/DummyBlockDrill.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/DummyBlockFlare.java b/com/hbm/blocks/machine/DummyBlockFlare.java index d82ce81a3..bdb251977 100644 --- a/com/hbm/blocks/machine/DummyBlockFlare.java +++ b/com/hbm/blocks/machine/DummyBlockFlare.java @@ -5,8 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineGasFlare; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineGasFlare; 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 1aba47b74..863443529 100644 --- a/com/hbm/blocks/machine/DummyBlockFluidTank.java +++ b/com/hbm/blocks/machine/DummyBlockFluidTank.java @@ -5,9 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineCyclotron; -import com.hbm.tileentity.TileEntityMachineFluidTank; +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; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/DummyBlockIGenerator.java b/com/hbm/blocks/machine/DummyBlockIGenerator.java index 0a5b9fa85..14c007eb2 100644 --- a/com/hbm/blocks/machine/DummyBlockIGenerator.java +++ b/com/hbm/blocks/machine/DummyBlockIGenerator.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/DummyBlockPumpjack.java b/com/hbm/blocks/machine/DummyBlockPumpjack.java index bd9ccbe9d..ef7e01f69 100644 --- a/com/hbm/blocks/machine/DummyBlockPumpjack.java +++ b/com/hbm/blocks/machine/DummyBlockPumpjack.java @@ -5,9 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineChemplant; -import com.hbm.tileentity.TileEntityMachinePumpjack; +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; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/DummyBlockRefinery.java b/com/hbm/blocks/machine/DummyBlockRefinery.java index 090944311..1abe3070c 100644 --- a/com/hbm/blocks/machine/DummyBlockRefinery.java +++ b/com/hbm/blocks/machine/DummyBlockRefinery.java @@ -5,9 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineCyclotron; -import com.hbm.tileentity.TileEntityMachineRefinery; +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; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/DummyBlockTurbofan.java b/com/hbm/blocks/machine/DummyBlockTurbofan.java index 5c2c10c05..2947ff34b 100644 --- a/com/hbm/blocks/machine/DummyBlockTurbofan.java +++ b/com/hbm/blocks/machine/DummyBlockTurbofan.java @@ -5,9 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachinePumpjack; -import com.hbm.tileentity.TileEntityMachineTurbofan; +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; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/DummyBlockWell.java b/com/hbm/blocks/machine/DummyBlockWell.java index ccef818f5..c645d2724 100644 --- a/com/hbm/blocks/machine/DummyBlockWell.java +++ b/com/hbm/blocks/machine/DummyBlockWell.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/FWatzCore.java b/com/hbm/blocks/machine/FWatzCore.java index d861028a1..252cbab01 100644 --- a/com/hbm/blocks/machine/FWatzCore.java +++ b/com/hbm/blocks/machine/FWatzCore.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityFWatzCore; +import com.hbm.tileentity.machine.TileEntityFWatzCore; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/FWatzHatch.java b/com/hbm/blocks/machine/FWatzHatch.java index be7e03215..852e0b8fb 100644 --- a/com/hbm/blocks/machine/FWatzHatch.java +++ b/com/hbm/blocks/machine/FWatzHatch.java @@ -5,7 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityFWatzCore; +import com.hbm.tileentity.machine.TileEntityFWatzCore; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/FactoryCoreAdvanced.java b/com/hbm/blocks/machine/FactoryCoreAdvanced.java index 65d8f971d..63709f047 100644 --- a/com/hbm/blocks/machine/FactoryCoreAdvanced.java +++ b/com/hbm/blocks/machine/FactoryCoreAdvanced.java @@ -2,7 +2,7 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.tileentity.TileEntityCoreAdvanced; +import com.hbm.tileentity.machine.TileEntityCoreAdvanced; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/FactoryCoreTitanium.java b/com/hbm/blocks/machine/FactoryCoreTitanium.java index 7c0914fe3..9fff1f9b2 100644 --- a/com/hbm/blocks/machine/FactoryCoreTitanium.java +++ b/com/hbm/blocks/machine/FactoryCoreTitanium.java @@ -2,7 +2,7 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.tileentity.TileEntityCoreTitanium; +import com.hbm.tileentity.machine.TileEntityCoreTitanium; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/FactoryHatch.java b/com/hbm/blocks/machine/FactoryHatch.java index b2a1668a2..e04b8c10d 100644 --- a/com/hbm/blocks/machine/FactoryHatch.java +++ b/com/hbm/blocks/machine/FactoryHatch.java @@ -5,8 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityCoreAdvanced; -import com.hbm.tileentity.TileEntityCoreTitanium; +import com.hbm.tileentity.machine.TileEntityCoreAdvanced; +import com.hbm.tileentity.machine.TileEntityCoreTitanium; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/FusionCore.java b/com/hbm/blocks/machine/FusionCore.java index 9876bf3dd..54e758974 100644 --- a/com/hbm/blocks/machine/FusionCore.java +++ b/com/hbm/blocks/machine/FusionCore.java @@ -1,7 +1,7 @@ package com.hbm.blocks.machine; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityFusionMultiblock; +import com.hbm.tileentity.machine.TileEntityFusionMultiblock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/FusionHatch.java b/com/hbm/blocks/machine/FusionHatch.java index b937a265a..5ef103e83 100644 --- a/com/hbm/blocks/machine/FusionHatch.java +++ b/com/hbm/blocks/machine/FusionHatch.java @@ -5,7 +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.TileEntityFusionMultiblock; +import com.hbm.tileentity.machine.TileEntityFusionMultiblock; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/GasDuctSolid.java b/com/hbm/blocks/machine/GasDuctSolid.java index 3304609fa..8351015a7 100644 --- a/com/hbm/blocks/machine/GasDuctSolid.java +++ b/com/hbm/blocks/machine/GasDuctSolid.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityGasDuctSolid; +import com.hbm.tileentity.conductor.TileEntityGasDuctSolid; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/MachineAssembler.java b/com/hbm/blocks/machine/MachineAssembler.java index 90ac834f4..9651e90e7 100644 --- a/com/hbm/blocks/machine/MachineAssembler.java +++ b/com/hbm/blocks/machine/MachineAssembler.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/machine/MachineBattery.java b/com/hbm/blocks/machine/MachineBattery.java index 544987bb0..e02148fbd 100644 --- a/com/hbm/blocks/machine/MachineBattery.java +++ b/com/hbm/blocks/machine/MachineBattery.java @@ -5,8 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDiFurnace; -import com.hbm.tileentity.TileEntityMachineBattery; +import com.hbm.tileentity.machine.TileEntityDiFurnace; +import com.hbm.tileentity.machine.TileEntityMachineBattery; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineCMBFactory.java b/com/hbm/blocks/machine/MachineCMBFactory.java index 51b578fc8..df50eb618 100644 --- a/com/hbm/blocks/machine/MachineCMBFactory.java +++ b/com/hbm/blocks/machine/MachineCMBFactory.java @@ -5,7 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineCMBFactory; +import com.hbm.tileentity.machine.TileEntityMachineCMBFactory; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/MachineCentrifuge.java b/com/hbm/blocks/machine/MachineCentrifuge.java index 90bfc5b11..62c3bd676 100644 --- a/com/hbm/blocks/machine/MachineCentrifuge.java +++ b/com/hbm/blocks/machine/MachineCentrifuge.java @@ -7,7 +7,7 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineChemplant.java b/com/hbm/blocks/machine/MachineChemplant.java index 1000b48a1..6b97cd795 100644 --- a/com/hbm/blocks/machine/MachineChemplant.java +++ b/com/hbm/blocks/machine/MachineChemplant.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/machine/MachineCoal.java b/com/hbm/blocks/machine/MachineCoal.java index 966a1ca47..3ba4156ad 100644 --- a/com/hbm/blocks/machine/MachineCoal.java +++ b/com/hbm/blocks/machine/MachineCoal.java @@ -20,7 +20,7 @@ import net.minecraft.world.World; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineCoal; +import com.hbm.tileentity.machine.TileEntityMachineCoal; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineCyclotron.java b/com/hbm/blocks/machine/MachineCyclotron.java index f8ad6276f..cefaca11b 100644 --- a/com/hbm/blocks/machine/MachineCyclotron.java +++ b/com/hbm/blocks/machine/MachineCyclotron.java @@ -6,8 +6,9 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineCyclotron; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineCyclotron; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachineDeuterium.java b/com/hbm/blocks/machine/MachineDeuterium.java index be8b5eaee..40b38f3f1 100644 --- a/com/hbm/blocks/machine/MachineDeuterium.java +++ b/com/hbm/blocks/machine/MachineDeuterium.java @@ -5,7 +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.TileEntityMachineDeuterium; +import com.hbm.tileentity.machine.TileEntityMachineDeuterium; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineDiFurnace.java b/com/hbm/blocks/machine/MachineDiFurnace.java index 7e347c2e7..59ee3828d 100644 --- a/com/hbm/blocks/machine/MachineDiFurnace.java +++ b/com/hbm/blocks/machine/MachineDiFurnace.java @@ -5,7 +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.TileEntityDiFurnace; +import com.hbm.tileentity.machine.TileEntityDiFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineDiesel.java b/com/hbm/blocks/machine/MachineDiesel.java index 70ad6e89d..4dfaa7095 100644 --- a/com/hbm/blocks/machine/MachineDiesel.java +++ b/com/hbm/blocks/machine/MachineDiesel.java @@ -5,7 +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.TileEntityMachineDiesel; +import com.hbm.tileentity.machine.TileEntityMachineDiesel; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineElectricFurnace.java b/com/hbm/blocks/machine/MachineElectricFurnace.java index 02ccdae8b..50ee71f0d 100644 --- a/com/hbm/blocks/machine/MachineElectricFurnace.java +++ b/com/hbm/blocks/machine/MachineElectricFurnace.java @@ -5,7 +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.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineFluidTank.java b/com/hbm/blocks/machine/MachineFluidTank.java index 7722a3a9e..44e862e90 100644 --- a/com/hbm/blocks/machine/MachineFluidTank.java +++ b/com/hbm/blocks/machine/MachineFluidTank.java @@ -6,9 +6,9 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineFluidTank; -import com.hbm.tileentity.TileEntityMachineGasFlare; +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/MachineGasFlare.java b/com/hbm/blocks/machine/MachineGasFlare.java index 0e0f1066a..a3a6f5902 100644 --- a/com/hbm/blocks/machine/MachineGasFlare.java +++ b/com/hbm/blocks/machine/MachineGasFlare.java @@ -6,8 +6,9 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineGasFlare; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineGasFlare; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachineGenerator.java b/com/hbm/blocks/machine/MachineGenerator.java index 2fc2c4a4f..d60e1126a 100644 --- a/com/hbm/blocks/machine/MachineGenerator.java +++ b/com/hbm/blocks/machine/MachineGenerator.java @@ -6,7 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineGenerator; +import com.hbm.tileentity.machine.TileEntityMachineGenerator; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineIGenerator.java b/com/hbm/blocks/machine/MachineIGenerator.java index 8b48f6ee1..987bf0a88 100644 --- a/com/hbm/blocks/machine/MachineIGenerator.java +++ b/com/hbm/blocks/machine/MachineIGenerator.java @@ -5,8 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/machine/MachineMiningDrill.java b/com/hbm/blocks/machine/MachineMiningDrill.java index e72498d7c..ac6cb78f0 100644 --- a/com/hbm/blocks/machine/MachineMiningDrill.java +++ b/com/hbm/blocks/machine/MachineMiningDrill.java @@ -5,8 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/machine/MachineNukeFurnace.java b/com/hbm/blocks/machine/MachineNukeFurnace.java index e453a9710..08204aa7d 100644 --- a/com/hbm/blocks/machine/MachineNukeFurnace.java +++ b/com/hbm/blocks/machine/MachineNukeFurnace.java @@ -5,7 +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.TileEntityNukeFurnace; +import com.hbm.tileentity.machine.TileEntityNukeFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineOilWell.java b/com/hbm/blocks/machine/MachineOilWell.java index 89cf9491e..aef0004b4 100644 --- a/com/hbm/blocks/machine/MachineOilWell.java +++ b/com/hbm/blocks/machine/MachineOilWell.java @@ -6,8 +6,8 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/machine/MachinePuF6Tank.java b/com/hbm/blocks/machine/MachinePuF6Tank.java index 5cd0eee56..cd1f9c94a 100644 --- a/com/hbm/blocks/machine/MachinePuF6Tank.java +++ b/com/hbm/blocks/machine/MachinePuF6Tank.java @@ -5,7 +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.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachinePumpjack.java b/com/hbm/blocks/machine/MachinePumpjack.java index e5c711366..c2d76f514 100644 --- a/com/hbm/blocks/machine/MachinePumpjack.java +++ b/com/hbm/blocks/machine/MachinePumpjack.java @@ -5,9 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityMachinePumpjack; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachineRTG.java b/com/hbm/blocks/machine/MachineRTG.java index 95dc65344..b5b8492ce 100644 --- a/com/hbm/blocks/machine/MachineRTG.java +++ b/com/hbm/blocks/machine/MachineRTG.java @@ -5,7 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineRTG; +import com.hbm.tileentity.machine.TileEntityMachineRTG; + import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/MachineReactor.java b/com/hbm/blocks/machine/MachineReactor.java index 62a67631b..c8d44f008 100644 --- a/com/hbm/blocks/machine/MachineReactor.java +++ b/com/hbm/blocks/machine/MachineReactor.java @@ -5,7 +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.TileEntityMachineReactor; +import com.hbm.tileentity.machine.TileEntityMachineReactor; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineRefinery.java b/com/hbm/blocks/machine/MachineRefinery.java index 664b44fae..351345227 100644 --- a/com/hbm/blocks/machine/MachineRefinery.java +++ b/com/hbm/blocks/machine/MachineRefinery.java @@ -7,8 +7,8 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineRefinery; +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; diff --git a/com/hbm/blocks/machine/MachineReiXMainframe.java b/com/hbm/blocks/machine/MachineReiXMainframe.java index 6f410281d..395fbfaa3 100644 --- a/com/hbm/blocks/machine/MachineReiXMainframe.java +++ b/com/hbm/blocks/machine/MachineReiXMainframe.java @@ -5,7 +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.TileEntityReiXMainframe; +import com.hbm.tileentity.machine.TileEntityReiXMainframe; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineRtgFurnace.java b/com/hbm/blocks/machine/MachineRtgFurnace.java index c8827f259..8c006cd1d 100644 --- a/com/hbm/blocks/machine/MachineRtgFurnace.java +++ b/com/hbm/blocks/machine/MachineRtgFurnace.java @@ -20,7 +20,7 @@ import net.minecraft.world.World; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityRtgFurnace; +import com.hbm.tileentity.machine.TileEntityRtgFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java b/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java index 4ca149b02..f3434360a 100644 --- a/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java +++ b/com/hbm/blocks/machine/MachineSchrabidiumTransmutator.java @@ -5,7 +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.TileEntityMachineSchrabidiumTransmutator; +import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineShredder.java b/com/hbm/blocks/machine/MachineShredder.java index 337f3a242..56951162c 100644 --- a/com/hbm/blocks/machine/MachineShredder.java +++ b/com/hbm/blocks/machine/MachineShredder.java @@ -5,7 +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.TileEntityMachineShredder; +import com.hbm.tileentity.machine.TileEntityMachineShredder; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineTeleporter.java b/com/hbm/blocks/machine/MachineTeleporter.java index 5ea223d23..48508a6d7 100644 --- a/com/hbm/blocks/machine/MachineTeleporter.java +++ b/com/hbm/blocks/machine/MachineTeleporter.java @@ -6,7 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineTeleporter; +import com.hbm.tileentity.machine.TileEntityMachineTeleporter; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/MachineTurbofan.java b/com/hbm/blocks/machine/MachineTurbofan.java index 15d3a518e..727eff257 100644 --- a/com/hbm/blocks/machine/MachineTurbofan.java +++ b/com/hbm/blocks/machine/MachineTurbofan.java @@ -5,9 +5,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineTurbofan; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineTurbofan; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachineUF6Tank.java b/com/hbm/blocks/machine/MachineUF6Tank.java index 36d45b17d..a529a1c0a 100644 --- a/com/hbm/blocks/machine/MachineUF6Tank.java +++ b/com/hbm/blocks/machine/MachineUF6Tank.java @@ -5,7 +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.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/OilDuctSolid.java b/com/hbm/blocks/machine/OilDuctSolid.java index beabd09e0..cfec07f2d 100644 --- a/com/hbm/blocks/machine/OilDuctSolid.java +++ b/com/hbm/blocks/machine/OilDuctSolid.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityOilDuctSolid; +import com.hbm.tileentity.conductor.TileEntityOilDuctSolid; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/PylonRedWire.java b/com/hbm/blocks/machine/PylonRedWire.java index 3931cd9c7..64f5b82c8 100644 --- a/com/hbm/blocks/machine/PylonRedWire.java +++ b/com/hbm/blocks/machine/PylonRedWire.java @@ -1,6 +1,6 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/machine/ReactorCore.java b/com/hbm/blocks/machine/ReactorCore.java index 426eb7c3c..cc274fd75 100644 --- a/com/hbm/blocks/machine/ReactorCore.java +++ b/com/hbm/blocks/machine/ReactorCore.java @@ -2,7 +2,7 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.tileentity.TileEntityReactorMultiblock; +import com.hbm.tileentity.machine.TileEntityReactorMultiblock; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/ReactorHatch.java b/com/hbm/blocks/machine/ReactorHatch.java index 87ee4cca1..b36fbd790 100644 --- a/com/hbm/blocks/machine/ReactorHatch.java +++ b/com/hbm/blocks/machine/ReactorHatch.java @@ -5,7 +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.TileEntityReactorMultiblock; +import com.hbm.tileentity.machine.TileEntityReactorMultiblock; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/WatzCore.java b/com/hbm/blocks/machine/WatzCore.java index 3b51cce9a..0289ece20 100644 --- a/com/hbm/blocks/machine/WatzCore.java +++ b/com/hbm/blocks/machine/WatzCore.java @@ -1,6 +1,6 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityWatzCore; +import com.hbm.tileentity.machine.TileEntityWatzCore; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/machine/WatzHatch.java b/com/hbm/blocks/machine/WatzHatch.java index 056ec5572..e1ee2fd76 100644 --- a/com/hbm/blocks/machine/WatzHatch.java +++ b/com/hbm/blocks/machine/WatzHatch.java @@ -5,7 +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.TileEntityWatzCore; +import com.hbm.tileentity.machine.TileEntityWatzCore; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/machine/WireCoated.java b/com/hbm/blocks/machine/WireCoated.java index a9e28af9f..bf6feb614 100644 --- a/com/hbm/blocks/machine/WireCoated.java +++ b/com/hbm/blocks/machine/WireCoated.java @@ -1,6 +1,6 @@ package com.hbm.blocks.machine; -import com.hbm.tileentity.TileEntityWireCoated; +import com.hbm.tileentity.conductor.TileEntityWireCoated; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/test/TestBombAdvanced.java b/com/hbm/blocks/test/TestBombAdvanced.java index 5671e4a52..a231a2cff 100644 --- a/com/hbm/blocks/test/TestBombAdvanced.java +++ b/com/hbm/blocks/test/TestBombAdvanced.java @@ -1,7 +1,7 @@ package com.hbm.blocks.test; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityTestBombAdvanced; +import com.hbm.tileentity.bomb.TileEntityTestBombAdvanced; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/test/TestContainer.java b/com/hbm/blocks/test/TestContainer.java index 75e771fd2..304beec6d 100644 --- a/com/hbm/blocks/test/TestContainer.java +++ b/com/hbm/blocks/test/TestContainer.java @@ -6,7 +6,7 @@ import java.util.Iterator; import java.util.Random; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityTestContainer; +import com.hbm.tileentity.deco.TileEntityTestContainer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/test/TestMissile.java b/com/hbm/blocks/test/TestMissile.java index 25709634b..e0a75a533 100644 --- a/com/hbm/blocks/test/TestMissile.java +++ b/com/hbm/blocks/test/TestMissile.java @@ -1,7 +1,7 @@ package com.hbm.blocks.test; import com.hbm.entity.missile.EntityTestMissile; -import com.hbm.tileentity.TileEntityTestNuke; +import com.hbm.tileentity.bomb.TileEntityTestNuke; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/test/TestNuke.java b/com/hbm/blocks/test/TestNuke.java index f0a2e603d..ff44ce666 100644 --- a/com/hbm/blocks/test/TestNuke.java +++ b/com/hbm/blocks/test/TestNuke.java @@ -8,7 +8,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityTestNuke; +import com.hbm.tileentity.bomb.TileEntityTestNuke; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/test/TestObjTester.java b/com/hbm/blocks/test/TestObjTester.java index dbeb61495..1b01d4191 100644 --- a/com/hbm/blocks/test/TestObjTester.java +++ b/com/hbm/blocks/test/TestObjTester.java @@ -1,7 +1,7 @@ package com.hbm.blocks.test; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityObjTester; +import com.hbm.tileentity.deco.TileEntityObjTester; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/test/TestRender.java b/com/hbm/blocks/test/TestRender.java index e85a5f8c3..2efcc0d16 100644 --- a/com/hbm/blocks/test/TestRender.java +++ b/com/hbm/blocks/test/TestRender.java @@ -1,7 +1,7 @@ package com.hbm.blocks.test; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityTestRender; +import com.hbm.tileentity.deco.TileEntityTestRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/test/TestRotationTester.java b/com/hbm/blocks/test/TestRotationTester.java index 0d8777eb3..76e29c5b3 100644 --- a/com/hbm/blocks/test/TestRotationTester.java +++ b/com/hbm/blocks/test/TestRotationTester.java @@ -1,7 +1,7 @@ package com.hbm.blocks.test; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityRotationTester; +import com.hbm.tileentity.deco.TileEntityRotationTester; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/explosion/ExplosionNukeGeneric.java b/com/hbm/explosion/ExplosionNukeGeneric.java index a1c9de5bb..7751dcbbe 100644 --- a/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/com/hbm/explosion/ExplosionNukeGeneric.java @@ -33,7 +33,7 @@ import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; -import com.hbm.tileentity.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityDummy; public class ExplosionNukeGeneric { diff --git a/com/hbm/handler/GUIHandler.java b/com/hbm/handler/GUIHandler.java index 11979e901..6a4c53a06 100644 --- a/com/hbm/handler/GUIHandler.java +++ b/com/hbm/handler/GUIHandler.java @@ -5,6 +5,55 @@ import com.hbm.inventory.container.*; import com.hbm.inventory.gui.*; import com.hbm.items.ModItems; import com.hbm.tileentity.*; +import com.hbm.tileentity.bomb.TileEntityBombMulti; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityNukeBoy; +import com.hbm.tileentity.bomb.TileEntityNukeCustom; +import com.hbm.tileentity.bomb.TileEntityNukeFleija; +import com.hbm.tileentity.bomb.TileEntityNukeGadget; +import com.hbm.tileentity.bomb.TileEntityNukeMan; +import com.hbm.tileentity.bomb.TileEntityNukeMike; +import com.hbm.tileentity.bomb.TileEntityNukePrototype; +import com.hbm.tileentity.bomb.TileEntityNukeTsar; +import com.hbm.tileentity.bomb.TileEntityTestNuke; +import com.hbm.tileentity.machine.TileEntityConverterHeRf; +import com.hbm.tileentity.machine.TileEntityConverterRfHe; +import com.hbm.tileentity.machine.TileEntityCoreAdvanced; +import com.hbm.tileentity.machine.TileEntityCoreTitanium; +import com.hbm.tileentity.machine.TileEntityDiFurnace; +import com.hbm.tileentity.machine.TileEntityFWatzCore; +import com.hbm.tileentity.machine.TileEntityFusionMultiblock; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineBattery; +import com.hbm.tileentity.machine.TileEntityMachineCMBFactory; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineCoal; +import com.hbm.tileentity.machine.TileEntityMachineCyclotron; +import com.hbm.tileentity.machine.TileEntityMachineDeuterium; +import com.hbm.tileentity.machine.TileEntityMachineDiesel; +import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.TileEntityMachineGasFlare; +import com.hbm.tileentity.machine.TileEntityMachineGenerator; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; +import com.hbm.tileentity.machine.TileEntityMachineRTG; +import com.hbm.tileentity.machine.TileEntityMachineReactor; +import com.hbm.tileentity.machine.TileEntityMachineRefinery; +import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator; +import com.hbm.tileentity.machine.TileEntityMachineShredder; +import com.hbm.tileentity.machine.TileEntityMachineTeleporter; +import com.hbm.tileentity.machine.TileEntityMachineTurbofan; +import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.TileEntityNukeFurnace; +import com.hbm.tileentity.machine.TileEntityReactorMultiblock; +import com.hbm.tileentity.machine.TileEntityReiXMainframe; +import com.hbm.tileentity.machine.TileEntityRtgFurnace; +import com.hbm.tileentity.machine.TileEntityWatzCore; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -403,6 +452,14 @@ public class GUIHandler implements IGuiHandler { return new ContainerMachinePumpjack(player.inventory, (TileEntityMachinePumpjack) entity); } } + + case ModBlocks.guiID_machine_turbofan: + { + if(entity instanceof TileEntityMachineTurbofan) + { + //return new ContainerMachineTurbofan(player.inventory, (TileEntityMachineTurbofan) entity); + } + } } return null; } @@ -799,6 +856,14 @@ public class GUIHandler implements IGuiHandler { return new GUIMachinePumpjack(player.inventory, (TileEntityMachinePumpjack) entity); } } + + case ModBlocks.guiID_machine_turbofan: + { + if(entity instanceof TileEntityMachineTurbofan) + { + //return new GUIMachineTurbofan(player.inventory, (TileEntityMachineTurbofan) entity); + } + } } } else { //CLIENTONLY GUIS diff --git a/com/hbm/handler/MultiblockHandler.java b/com/hbm/handler/MultiblockHandler.java index 984380053..b7843bf61 100644 --- a/com/hbm/handler/MultiblockHandler.java +++ b/com/hbm/handler/MultiblockHandler.java @@ -1,7 +1,7 @@ package com.hbm.handler; import com.hbm.interfaces.IDummy; -import com.hbm.tileentity.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityDummy; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/com/hbm/inventory/container/ContainerBombMulti.java b/com/hbm/inventory/container/ContainerBombMulti.java index 7589ac2c8..a118d0461 100644 --- a/com/hbm/inventory/container/ContainerBombMulti.java +++ b/com/hbm/inventory/container/ContainerBombMulti.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityBombMulti; +import com.hbm.tileentity.bomb.TileEntityBombMulti; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerCentrifuge.java b/com/hbm/inventory/container/ContainerCentrifuge.java index 9621b981b..247c3ebf5 100644 --- a/com/hbm/inventory/container/ContainerCentrifuge.java +++ b/com/hbm/inventory/container/ContainerCentrifuge.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerConverterHeRf.java b/com/hbm/inventory/container/ContainerConverterHeRf.java index f2861833a..1dad729c0 100644 --- a/com/hbm/inventory/container/ContainerConverterHeRf.java +++ b/com/hbm/inventory/container/ContainerConverterHeRf.java @@ -1,6 +1,7 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityConverterHeRf; +import com.hbm.tileentity.machine.TileEntityConverterHeRf; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerConverterRfHe.java b/com/hbm/inventory/container/ContainerConverterRfHe.java index 3cf76af42..50ce092f9 100644 --- a/com/hbm/inventory/container/ContainerConverterRfHe.java +++ b/com/hbm/inventory/container/ContainerConverterRfHe.java @@ -1,6 +1,7 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityConverterRfHe; +import com.hbm.tileentity.machine.TileEntityConverterRfHe; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerCoreAdvanced.java b/com/hbm/inventory/container/ContainerCoreAdvanced.java index e744cd365..51ee81aff 100644 --- a/com/hbm/inventory/container/ContainerCoreAdvanced.java +++ b/com/hbm/inventory/container/ContainerCoreAdvanced.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityCoreAdvanced; +import com.hbm.tileentity.machine.TileEntityCoreAdvanced; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerCoreTitanium.java b/com/hbm/inventory/container/ContainerCoreTitanium.java index 18cb91c18..205a72533 100644 --- a/com/hbm/inventory/container/ContainerCoreTitanium.java +++ b/com/hbm/inventory/container/ContainerCoreTitanium.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityCoreTitanium; +import com.hbm.tileentity.machine.TileEntityCoreTitanium; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerDiFurnace.java b/com/hbm/inventory/container/ContainerDiFurnace.java index 0c74eca2c..3d7b6aeb9 100644 --- a/com/hbm/inventory/container/ContainerDiFurnace.java +++ b/com/hbm/inventory/container/ContainerDiFurnace.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityDiFurnace; +import com.hbm.tileentity.machine.TileEntityDiFurnace; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerElectricFurnace.java b/com/hbm/inventory/container/ContainerElectricFurnace.java index 7172cfd98..c05111b05 100644 --- a/com/hbm/inventory/container/ContainerElectricFurnace.java +++ b/com/hbm/inventory/container/ContainerElectricFurnace.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerFWatzCore.java b/com/hbm/inventory/container/ContainerFWatzCore.java index e4e96e543..88b12f174 100644 --- a/com/hbm/inventory/container/ContainerFWatzCore.java +++ b/com/hbm/inventory/container/ContainerFWatzCore.java @@ -1,6 +1,7 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityFWatzCore; +import com.hbm.tileentity.machine.TileEntityFWatzCore; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerFusionMultiblock.java b/com/hbm/inventory/container/ContainerFusionMultiblock.java index b0d662744..2a86a765a 100644 --- a/com/hbm/inventory/container/ContainerFusionMultiblock.java +++ b/com/hbm/inventory/container/ContainerFusionMultiblock.java @@ -1,6 +1,7 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityFusionMultiblock; +import com.hbm.tileentity.machine.TileEntityFusionMultiblock; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerGenerator.java b/com/hbm/inventory/container/ContainerGenerator.java index 0652c3157..c53670312 100644 --- a/com/hbm/inventory/container/ContainerGenerator.java +++ b/com/hbm/inventory/container/ContainerGenerator.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineGenerator; +import com.hbm.tileentity.machine.TileEntityMachineGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerIGenerator.java b/com/hbm/inventory/container/ContainerIGenerator.java index 31ee4ad85..dd00c648f 100644 --- a/com/hbm/inventory/container/ContainerIGenerator.java +++ b/com/hbm/inventory/container/ContainerIGenerator.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerLaunchPadTier1.java b/com/hbm/inventory/container/ContainerLaunchPadTier1.java index 80822b403..b8f41cb57 100644 --- a/com/hbm/inventory/container/ContainerLaunchPadTier1.java +++ b/com/hbm/inventory/container/ContainerLaunchPadTier1.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineAssembler.java b/com/hbm/inventory/container/ContainerMachineAssembler.java index bb57d7103..c7773d272 100644 --- a/com/hbm/inventory/container/ContainerMachineAssembler.java +++ b/com/hbm/inventory/container/ContainerMachineAssembler.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineBattery.java b/com/hbm/inventory/container/ContainerMachineBattery.java index 6b48065bf..6bd1a29ee 100644 --- a/com/hbm/inventory/container/ContainerMachineBattery.java +++ b/com/hbm/inventory/container/ContainerMachineBattery.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityMachineBattery; +import com.hbm.tileentity.machine.TileEntityMachineBattery; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineCMBFactory.java b/com/hbm/inventory/container/ContainerMachineCMBFactory.java index 764efb1b9..2e59ca4e9 100644 --- a/com/hbm/inventory/container/ContainerMachineCMBFactory.java +++ b/com/hbm/inventory/container/ContainerMachineCMBFactory.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineCMBFactory; +import com.hbm.tileentity.machine.TileEntityMachineCMBFactory; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineChemplant.java b/com/hbm/inventory/container/ContainerMachineChemplant.java index 586c86e02..dc27e4440 100644 --- a/com/hbm/inventory/container/ContainerMachineChemplant.java +++ b/com/hbm/inventory/container/ContainerMachineChemplant.java @@ -1,8 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineCoal.java b/com/hbm/inventory/container/ContainerMachineCoal.java index 2b1bbe83a..abef85a8c 100644 --- a/com/hbm/inventory/container/ContainerMachineCoal.java +++ b/com/hbm/inventory/container/ContainerMachineCoal.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineCoal; +import com.hbm.tileentity.machine.TileEntityMachineCoal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineCyclotron.java b/com/hbm/inventory/container/ContainerMachineCyclotron.java index f3aacb1a6..a6e8d532e 100644 --- a/com/hbm/inventory/container/ContainerMachineCyclotron.java +++ b/com/hbm/inventory/container/ContainerMachineCyclotron.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineCyclotron; +import com.hbm.tileentity.machine.TileEntityMachineCyclotron; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineDeuterium.java b/com/hbm/inventory/container/ContainerMachineDeuterium.java index 53832d40e..eec91e41a 100644 --- a/com/hbm/inventory/container/ContainerMachineDeuterium.java +++ b/com/hbm/inventory/container/ContainerMachineDeuterium.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineDeuterium; +import com.hbm.tileentity.machine.TileEntityMachineDeuterium; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineDiesel.java b/com/hbm/inventory/container/ContainerMachineDiesel.java index dcb7381d1..d18e86bc3 100644 --- a/com/hbm/inventory/container/ContainerMachineDiesel.java +++ b/com/hbm/inventory/container/ContainerMachineDiesel.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineDiesel; +import com.hbm.tileentity.machine.TileEntityMachineDiesel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineFluidTank.java b/com/hbm/inventory/container/ContainerMachineFluidTank.java index 833364f07..eb509f9c4 100644 --- a/com/hbm/inventory/container/ContainerMachineFluidTank.java +++ b/com/hbm/inventory/container/ContainerMachineFluidTank.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityMachineBattery; -import com.hbm.tileentity.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.TileEntityMachineBattery; +import com.hbm.tileentity.machine.TileEntityMachineFluidTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineGasFlare.java b/com/hbm/inventory/container/ContainerMachineGasFlare.java index 212151125..d5838a380 100644 --- a/com/hbm/inventory/container/ContainerMachineGasFlare.java +++ b/com/hbm/inventory/container/ContainerMachineGasFlare.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineGasFlare; +import com.hbm.tileentity.machine.TileEntityMachineGasFlare; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineMiningDrill.java b/com/hbm/inventory/container/ContainerMachineMiningDrill.java index 74478b857..06ef5c837 100644 --- a/com/hbm/inventory/container/ContainerMachineMiningDrill.java +++ b/com/hbm/inventory/container/ContainerMachineMiningDrill.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -14,9 +14,7 @@ public class ContainerMachineMiningDrill extends Container { private TileEntityMachineMiningDrill nukeBoy; private int power; - private int water; - private int sulfur; - private int progress; + private int warning; public ContainerMachineMiningDrill(InventoryPlayer invPlayer, TileEntityMachineMiningDrill tedf) { @@ -105,9 +103,14 @@ private TileEntityMachineMiningDrill nukeBoy; { par1.sendProgressBarUpdate(this, 0, this.nukeBoy.power); } + if(this.warning != this.nukeBoy.warning) + { + par1.sendProgressBarUpdate(this, 1, this.nukeBoy.warning); + } } - + this.power = this.nukeBoy.power; + this.warning = this.nukeBoy.warning; } @Override @@ -116,5 +119,9 @@ private TileEntityMachineMiningDrill nukeBoy; { nukeBoy.power = j; } + if(i == 1) + { + nukeBoy.warning = j; + } } } diff --git a/com/hbm/inventory/container/ContainerMachineOilWell.java b/com/hbm/inventory/container/ContainerMachineOilWell.java index a2523e30c..83fae02a1 100644 --- a/com/hbm/inventory/container/ContainerMachineOilWell.java +++ b/com/hbm/inventory/container/ContainerMachineOilWell.java @@ -1,7 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachinePumpjack.java b/com/hbm/inventory/container/ContainerMachinePumpjack.java index 818cbdc3a..23988cc5b 100644 --- a/com/hbm/inventory/container/ContainerMachinePumpjack.java +++ b/com/hbm/inventory/container/ContainerMachinePumpjack.java @@ -1,8 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityMachinePumpjack; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineRTG.java b/com/hbm/inventory/container/ContainerMachineRTG.java index 80a9a60db..1ba3d04b5 100644 --- a/com/hbm/inventory/container/ContainerMachineRTG.java +++ b/com/hbm/inventory/container/ContainerMachineRTG.java @@ -1,6 +1,7 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityMachineRTG; +import com.hbm.tileentity.machine.TileEntityMachineRTG; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineRefinery.java b/com/hbm/inventory/container/ContainerMachineRefinery.java index 09bc79ee8..e6c6a7ad0 100644 --- a/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineRefinery; +import com.hbm.tileentity.machine.TileEntityMachineRefinery; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java b/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java index 829dd9b4f..d67ba5f31 100644 --- a/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java +++ b/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; +import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineShredder.java b/com/hbm/inventory/container/ContainerMachineShredder.java index 176aab6f4..284375dcd 100644 --- a/com/hbm/inventory/container/ContainerMachineShredder.java +++ b/com/hbm/inventory/container/ContainerMachineShredder.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineShredder; +import com.hbm.tileentity.machine.TileEntityMachineShredder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineTeleporter.java b/com/hbm/inventory/container/ContainerMachineTeleporter.java index b26d54a61..000879545 100644 --- a/com/hbm/inventory/container/ContainerMachineTeleporter.java +++ b/com/hbm/inventory/container/ContainerMachineTeleporter.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityMachineTeleporter; +import com.hbm.tileentity.machine.TileEntityMachineTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineTurbofan.java b/com/hbm/inventory/container/ContainerMachineTurbofan.java new file mode 100644 index 000000000..056554520 --- /dev/null +++ b/com/hbm/inventory/container/ContainerMachineTurbofan.java @@ -0,0 +1,5 @@ +package com.hbm.inventory.container; + +public class ContainerMachineTurbofan { + +} diff --git a/com/hbm/inventory/container/ContainerNukeBoy.java b/com/hbm/inventory/container/ContainerNukeBoy.java index dd6e572b5..73b89df1c 100644 --- a/com/hbm/inventory/container/ContainerNukeBoy.java +++ b/com/hbm/inventory/container/ContainerNukeBoy.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukeBoy; +import com.hbm.tileentity.bomb.TileEntityNukeBoy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeCustom.java b/com/hbm/inventory/container/ContainerNukeCustom.java index 1d308c570..82ea5b187 100644 --- a/com/hbm/inventory/container/ContainerNukeCustom.java +++ b/com/hbm/inventory/container/ContainerNukeCustom.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukeCustom; +import com.hbm.tileentity.bomb.TileEntityNukeCustom; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeFleija.java b/com/hbm/inventory/container/ContainerNukeFleija.java index 6debf4de9..1dfcb4f6e 100644 --- a/com/hbm/inventory/container/ContainerNukeFleija.java +++ b/com/hbm/inventory/container/ContainerNukeFleija.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukeFleija; +import com.hbm.tileentity.bomb.TileEntityNukeFleija; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeFurnace.java b/com/hbm/inventory/container/ContainerNukeFurnace.java index 50832dd94..1519def7e 100644 --- a/com/hbm/inventory/container/ContainerNukeFurnace.java +++ b/com/hbm/inventory/container/ContainerNukeFurnace.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityNukeFurnace; +import com.hbm.tileentity.machine.TileEntityNukeFurnace; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeGadget.java b/com/hbm/inventory/container/ContainerNukeGadget.java index 1aa420809..d37b9313f 100644 --- a/com/hbm/inventory/container/ContainerNukeGadget.java +++ b/com/hbm/inventory/container/ContainerNukeGadget.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukeGadget; +import com.hbm.tileentity.bomb.TileEntityNukeGadget; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeMan.java b/com/hbm/inventory/container/ContainerNukeMan.java index 5e2a59180..c79a3b914 100644 --- a/com/hbm/inventory/container/ContainerNukeMan.java +++ b/com/hbm/inventory/container/ContainerNukeMan.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukeMan; +import com.hbm.tileentity.bomb.TileEntityNukeMan; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeMike.java b/com/hbm/inventory/container/ContainerNukeMike.java index e4f08c217..dc5ce78f9 100644 --- a/com/hbm/inventory/container/ContainerNukeMike.java +++ b/com/hbm/inventory/container/ContainerNukeMike.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukeMike; +import com.hbm.tileentity.bomb.TileEntityNukeMike; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukePrototype.java b/com/hbm/inventory/container/ContainerNukePrototype.java index 8b126d3cb..2e3fcf169 100644 --- a/com/hbm/inventory/container/ContainerNukePrototype.java +++ b/com/hbm/inventory/container/ContainerNukePrototype.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukePrototype; +import com.hbm.tileentity.bomb.TileEntityNukePrototype; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerNukeTsar.java b/com/hbm/inventory/container/ContainerNukeTsar.java index 4c7a30da3..aafabe2d5 100644 --- a/com/hbm/inventory/container/ContainerNukeTsar.java +++ b/com/hbm/inventory/container/ContainerNukeTsar.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityNukeTsar; +import com.hbm.tileentity.bomb.TileEntityNukeTsar; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerPuF6Tank.java b/com/hbm/inventory/container/ContainerPuF6Tank.java index 3b6aad3b0..6aa912e99 100644 --- a/com/hbm/inventory/container/ContainerPuF6Tank.java +++ b/com/hbm/inventory/container/ContainerPuF6Tank.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerReactor.java b/com/hbm/inventory/container/ContainerReactor.java index 6e3d0249d..108a5fbac 100644 --- a/com/hbm/inventory/container/ContainerReactor.java +++ b/com/hbm/inventory/container/ContainerReactor.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineReactor; +import com.hbm.tileentity.machine.TileEntityMachineReactor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerReactorMultiblock.java b/com/hbm/inventory/container/ContainerReactorMultiblock.java index da36ffff0..e6db04395 100644 --- a/com/hbm/inventory/container/ContainerReactorMultiblock.java +++ b/com/hbm/inventory/container/ContainerReactorMultiblock.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityReactorMultiblock; +import com.hbm.tileentity.machine.TileEntityReactorMultiblock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerReiXMainframe.java b/com/hbm/inventory/container/ContainerReiXMainframe.java index 88731dbf9..ce83b79ee 100644 --- a/com/hbm/inventory/container/ContainerReiXMainframe.java +++ b/com/hbm/inventory/container/ContainerReiXMainframe.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityReiXMainframe; +import com.hbm.tileentity.machine.TileEntityReiXMainframe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerRtgFurnace.java b/com/hbm/inventory/container/ContainerRtgFurnace.java index 805af8352..ba4919085 100644 --- a/com/hbm/inventory/container/ContainerRtgFurnace.java +++ b/com/hbm/inventory/container/ContainerRtgFurnace.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityRtgFurnace; +import com.hbm.tileentity.machine.TileEntityRtgFurnace; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerTestNuke.java b/com/hbm/inventory/container/ContainerTestNuke.java index a9f5b17c1..94a9d2704 100644 --- a/com/hbm/inventory/container/ContainerTestNuke.java +++ b/com/hbm/inventory/container/ContainerTestNuke.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityTestNuke; +import com.hbm.tileentity.bomb.TileEntityTestNuke; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerUF6Tank.java b/com/hbm/inventory/container/ContainerUF6Tank.java index b6d37a89f..24f6a7fee 100644 --- a/com/hbm/inventory/container/ContainerUF6Tank.java +++ b/com/hbm/inventory/container/ContainerUF6Tank.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/container/ContainerWatzCore.java b/com/hbm/inventory/container/ContainerWatzCore.java index 95913f4e5..1464a13e8 100644 --- a/com/hbm/inventory/container/ContainerWatzCore.java +++ b/com/hbm/inventory/container/ContainerWatzCore.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityWatzCore; +import com.hbm.tileentity.machine.TileEntityWatzCore; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/com/hbm/inventory/gui/GUIBombMulti.java b/com/hbm/inventory/gui/GUIBombMulti.java index a28faeaf6..d14a51d5c 100644 --- a/com/hbm/inventory/gui/GUIBombMulti.java +++ b/com/hbm/inventory/gui/GUIBombMulti.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerBombMulti; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityBombMulti; +import com.hbm.tileentity.bomb.TileEntityBombMulti; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIConverterHeRf.java b/com/hbm/inventory/gui/GUIConverterHeRf.java index 0d37336bd..724b27e49 100644 --- a/com/hbm/inventory/gui/GUIConverterHeRf.java +++ b/com/hbm/inventory/gui/GUIConverterHeRf.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerConverterHeRf; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityConverterHeRf; +import com.hbm.tileentity.machine.TileEntityConverterHeRf; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIConverterRfHe.java b/com/hbm/inventory/gui/GUIConverterRfHe.java index a58661c80..53688126d 100644 --- a/com/hbm/inventory/gui/GUIConverterRfHe.java +++ b/com/hbm/inventory/gui/GUIConverterRfHe.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerConverterRfHe; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityConverterRfHe; +import com.hbm.tileentity.machine.TileEntityConverterRfHe; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUICoreAdvanced.java b/com/hbm/inventory/gui/GUICoreAdvanced.java index 5eb11d7d8..7cf9a1ef7 100644 --- a/com/hbm/inventory/gui/GUICoreAdvanced.java +++ b/com/hbm/inventory/gui/GUICoreAdvanced.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCoreAdvanced; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityCoreAdvanced; +import com.hbm.tileentity.machine.TileEntityCoreAdvanced; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUICoreTitanium.java b/com/hbm/inventory/gui/GUICoreTitanium.java index 245f30379..3098f4e9d 100644 --- a/com/hbm/inventory/gui/GUICoreTitanium.java +++ b/com/hbm/inventory/gui/GUICoreTitanium.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCoreTitanium; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityCoreTitanium; +import com.hbm.tileentity.machine.TileEntityCoreTitanium; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIFWatzCore.java b/com/hbm/inventory/gui/GUIFWatzCore.java index b82cbf780..39e43cbed 100644 --- a/com/hbm/inventory/gui/GUIFWatzCore.java +++ b/com/hbm/inventory/gui/GUIFWatzCore.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerFWatzCore; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityFWatzCore; +import com.hbm.tileentity.machine.TileEntityFWatzCore; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIFusionMultiblock.java b/com/hbm/inventory/gui/GUIFusionMultiblock.java index 755d65b85..9d52dc7c3 100644 --- a/com/hbm/inventory/gui/GUIFusionMultiblock.java +++ b/com/hbm/inventory/gui/GUIFusionMultiblock.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerFusionMultiblock; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityFusionMultiblock; +import com.hbm.tileentity.machine.TileEntityFusionMultiblock; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIIGenerator.java b/com/hbm/inventory/gui/GUIIGenerator.java index 9fccd7203..26b149544 100644 --- a/com/hbm/inventory/gui/GUIIGenerator.java +++ b/com/hbm/inventory/gui/GUIIGenerator.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerIGenerator; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUILaunchPadTier1.java b/com/hbm/inventory/gui/GUILaunchPadTier1.java index c7a24f7f5..6c7da385c 100644 --- a/com/hbm/inventory/gui/GUILaunchPadTier1.java +++ b/com/hbm/inventory/gui/GUILaunchPadTier1.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerLaunchPadTier1; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; public class GUILaunchPadTier1 extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIMachineAssembler.java b/com/hbm/inventory/gui/GUIMachineAssembler.java index b299e40dc..44b8c5c60 100644 --- a/com/hbm/inventory/gui/GUIMachineAssembler.java +++ b/com/hbm/inventory/gui/GUIMachineAssembler.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineAssembler; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineBattery.java b/com/hbm/inventory/gui/GUIMachineBattery.java index 6a9210642..02981036c 100644 --- a/com/hbm/inventory/gui/GUIMachineBattery.java +++ b/com/hbm/inventory/gui/GUIMachineBattery.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineBattery; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineBattery; +import com.hbm.tileentity.machine.TileEntityMachineBattery; public class GUIMachineBattery extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIMachineCMBFactory.java b/com/hbm/inventory/gui/GUIMachineCMBFactory.java index e232e1f0c..f1f31ba5f 100644 --- a/com/hbm/inventory/gui/GUIMachineCMBFactory.java +++ b/com/hbm/inventory/gui/GUIMachineCMBFactory.java @@ -5,7 +5,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineCMBFactory; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineCMBFactory; +import com.hbm.tileentity.machine.TileEntityMachineCMBFactory; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineCentrifuge.java b/com/hbm/inventory/gui/GUIMachineCentrifuge.java index 712e7e7f9..3bf4486f3 100644 --- a/com/hbm/inventory/gui/GUIMachineCentrifuge.java +++ b/com/hbm/inventory/gui/GUIMachineCentrifuge.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCentrifuge; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineChemplant.java b/com/hbm/inventory/gui/GUIMachineChemplant.java index d40b53b8f..bb98ed160 100644 --- a/com/hbm/inventory/gui/GUIMachineChemplant.java +++ b/com/hbm/inventory/gui/GUIMachineChemplant.java @@ -6,8 +6,8 @@ import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineAssembler; import com.hbm.inventory.container.ContainerMachineChemplant; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineCoal.java b/com/hbm/inventory/gui/GUIMachineCoal.java index ba300b851..fe4cbc50f 100644 --- a/com/hbm/inventory/gui/GUIMachineCoal.java +++ b/com/hbm/inventory/gui/GUIMachineCoal.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineCoal; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineCoal; +import com.hbm.tileentity.machine.TileEntityMachineCoal; public class GUIMachineCoal extends GuiFluidContainer { diff --git a/com/hbm/inventory/gui/GUIMachineCyclotron.java b/com/hbm/inventory/gui/GUIMachineCyclotron.java index 47fc0d768..eb5821b34 100644 --- a/com/hbm/inventory/gui/GUIMachineCyclotron.java +++ b/com/hbm/inventory/gui/GUIMachineCyclotron.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineCyclotron; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineCyclotron; +import com.hbm.tileentity.machine.TileEntityMachineCyclotron; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineDeuterium.java b/com/hbm/inventory/gui/GUIMachineDeuterium.java index cb1d6f8f2..1116ff30c 100644 --- a/com/hbm/inventory/gui/GUIMachineDeuterium.java +++ b/com/hbm/inventory/gui/GUIMachineDeuterium.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineDeuterium; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineDeuterium; +import com.hbm.tileentity.machine.TileEntityMachineDeuterium; public class GUIMachineDeuterium extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIMachineDiesel.java b/com/hbm/inventory/gui/GUIMachineDiesel.java index fbf441763..403e148a2 100644 --- a/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineDiesel; +import com.hbm.tileentity.machine.TileEntityMachineDiesel; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineElectricFurnace.java b/com/hbm/inventory/gui/GUIMachineElectricFurnace.java index 97c3835ee..bcd782fe5 100644 --- a/com/hbm/inventory/gui/GUIMachineElectricFurnace.java +++ b/com/hbm/inventory/gui/GUIMachineElectricFurnace.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerElectricFurnace; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; public class GUIMachineElectricFurnace extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIMachineFluidTank.java b/com/hbm/inventory/gui/GUIMachineFluidTank.java index debdc8158..cf56dcebc 100644 --- a/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -6,8 +6,8 @@ import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerElectricFurnace; import com.hbm.inventory.container.ContainerMachineFluidTank; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; -import com.hbm.tileentity.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.machine.TileEntityMachineFluidTank; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineGasFlare.java b/com/hbm/inventory/gui/GUIMachineGasFlare.java index af6c276de..160271718 100644 --- a/com/hbm/inventory/gui/GUIMachineGasFlare.java +++ b/com/hbm/inventory/gui/GUIMachineGasFlare.java @@ -5,7 +5,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineGasFlare; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineGasFlare; +import com.hbm.tileentity.machine.TileEntityMachineGasFlare; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineGenerator.java b/com/hbm/inventory/gui/GUIMachineGenerator.java index b14a52626..95bb7c3dc 100644 --- a/com/hbm/inventory/gui/GUIMachineGenerator.java +++ b/com/hbm/inventory/gui/GUIMachineGenerator.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerGenerator; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineGenerator; +import com.hbm.tileentity.machine.TileEntityMachineGenerator; public class GUIMachineGenerator extends GuiFluidContainer { diff --git a/com/hbm/inventory/gui/GUIMachineMiningDrill.java b/com/hbm/inventory/gui/GUIMachineMiningDrill.java index 1c8eb5195..59a784206 100644 --- a/com/hbm/inventory/gui/GUIMachineMiningDrill.java +++ b/com/hbm/inventory/gui/GUIMachineMiningDrill.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineMiningDrill; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineOilWell.java b/com/hbm/inventory/gui/GUIMachineOilWell.java index e18f3d503..7a3838264 100644 --- a/com/hbm/inventory/gui/GUIMachineOilWell.java +++ b/com/hbm/inventory/gui/GUIMachineOilWell.java @@ -5,7 +5,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineOilWell; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachinePuF6Tank.java b/com/hbm/inventory/gui/GUIMachinePuF6Tank.java index bb90ad016..95ac1cd9d 100644 --- a/com/hbm/inventory/gui/GUIMachinePuF6Tank.java +++ b/com/hbm/inventory/gui/GUIMachinePuF6Tank.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerPuF6Tank; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachinePumpjack.java b/com/hbm/inventory/gui/GUIMachinePumpjack.java index d77335a7d..94b66722a 100644 --- a/com/hbm/inventory/gui/GUIMachinePumpjack.java +++ b/com/hbm/inventory/gui/GUIMachinePumpjack.java @@ -6,8 +6,8 @@ import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineOilWell; import com.hbm.inventory.container.ContainerMachinePumpjack; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityMachinePumpjack; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineRTG.java b/com/hbm/inventory/gui/GUIMachineRTG.java index 3a6729bfb..24b33d07d 100644 --- a/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/com/hbm/inventory/gui/GUIMachineRTG.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineRTG; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineRTG; +import com.hbm.tileentity.machine.TileEntityMachineRTG; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineReactor.java b/com/hbm/inventory/gui/GUIMachineReactor.java index f4e76dc99..b0493fe1e 100644 --- a/com/hbm/inventory/gui/GUIMachineReactor.java +++ b/com/hbm/inventory/gui/GUIMachineReactor.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerReactor; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineReactor; +import com.hbm.tileentity.machine.TileEntityMachineReactor; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineRefinery.java b/com/hbm/inventory/gui/GUIMachineRefinery.java index dee599fdc..db188a443 100644 --- a/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerMachineRefinery; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineRefinery; +import com.hbm.tileentity.machine.TileEntityMachineRefinery; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java index a60cd4c2e..d8b946b67 100644 --- a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java +++ b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineSchrabidiumTransmutator; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; +import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineShredder.java b/com/hbm/inventory/gui/GUIMachineShredder.java index cdf03234a..a81426362 100644 --- a/com/hbm/inventory/gui/GUIMachineShredder.java +++ b/com/hbm/inventory/gui/GUIMachineShredder.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineShredder; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineShredder; +import com.hbm.tileentity.machine.TileEntityMachineShredder; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineTeleporter.java b/com/hbm/inventory/gui/GUIMachineTeleporter.java index 2ea2faf8f..6d3693c85 100644 --- a/com/hbm/inventory/gui/GUIMachineTeleporter.java +++ b/com/hbm/inventory/gui/GUIMachineTeleporter.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineTeleporter; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineTeleporter; +import com.hbm.tileentity.machine.TileEntityMachineTeleporter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIMachineTurbofan.java b/com/hbm/inventory/gui/GUIMachineTurbofan.java new file mode 100644 index 000000000..7f20abd43 --- /dev/null +++ b/com/hbm/inventory/gui/GUIMachineTurbofan.java @@ -0,0 +1,5 @@ +package com.hbm.inventory.gui; + +public class GUIMachineTurbofan { + +} diff --git a/com/hbm/inventory/gui/GUIMachineUF6Tank.java b/com/hbm/inventory/gui/GUIMachineUF6Tank.java index 53243812d..84bc6806d 100644 --- a/com/hbm/inventory/gui/GUIMachineUF6Tank.java +++ b/com/hbm/inventory/gui/GUIMachineUF6Tank.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerUF6Tank; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUINukeBoy.java b/com/hbm/inventory/gui/GUINukeBoy.java index 3e8a786e0..c4d018d3a 100644 --- a/com/hbm/inventory/gui/GUINukeBoy.java +++ b/com/hbm/inventory/gui/GUINukeBoy.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeBoy; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeBoy; +import com.hbm.tileentity.bomb.TileEntityNukeBoy; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUINukeCustom.java b/com/hbm/inventory/gui/GUINukeCustom.java index b2c88f370..510ba5a57 100644 --- a/com/hbm/inventory/gui/GUINukeCustom.java +++ b/com/hbm/inventory/gui/GUINukeCustom.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeCustom; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeCustom; +import com.hbm.tileentity.bomb.TileEntityNukeCustom; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUINukeFleija.java b/com/hbm/inventory/gui/GUINukeFleija.java index a0c2ba255..b5b2c1f7e 100644 --- a/com/hbm/inventory/gui/GUINukeFleija.java +++ b/com/hbm/inventory/gui/GUINukeFleija.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeFleija; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeFleija; +import com.hbm.tileentity.bomb.TileEntityNukeFleija; public class GUINukeFleija extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUINukeFurnace.java b/com/hbm/inventory/gui/GUINukeFurnace.java index 7bd58a4cb..e40e26233 100644 --- a/com/hbm/inventory/gui/GUINukeFurnace.java +++ b/com/hbm/inventory/gui/GUINukeFurnace.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeFurnace; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeFurnace; +import com.hbm.tileentity.machine.TileEntityNukeFurnace; public class GUINukeFurnace extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUINukeGadget.java b/com/hbm/inventory/gui/GUINukeGadget.java index 88bc9fbe8..4146533b8 100644 --- a/com/hbm/inventory/gui/GUINukeGadget.java +++ b/com/hbm/inventory/gui/GUINukeGadget.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeGadget; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeGadget; +import com.hbm.tileentity.bomb.TileEntityNukeGadget; public class GUINukeGadget extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUINukeMan.java b/com/hbm/inventory/gui/GUINukeMan.java index 837859fa1..43297a71d 100644 --- a/com/hbm/inventory/gui/GUINukeMan.java +++ b/com/hbm/inventory/gui/GUINukeMan.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeMan; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeMan; +import com.hbm.tileentity.bomb.TileEntityNukeMan; public class GUINukeMan extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUINukeMike.java b/com/hbm/inventory/gui/GUINukeMike.java index f0258f954..c2b3cbfce 100644 --- a/com/hbm/inventory/gui/GUINukeMike.java +++ b/com/hbm/inventory/gui/GUINukeMike.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeMike; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeMike; +import com.hbm.tileentity.bomb.TileEntityNukeMike; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUINukePrototype.java b/com/hbm/inventory/gui/GUINukePrototype.java index c96262f47..9a248c4c4 100644 --- a/com/hbm/inventory/gui/GUINukePrototype.java +++ b/com/hbm/inventory/gui/GUINukePrototype.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukePrototype; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukePrototype; +import com.hbm.tileentity.bomb.TileEntityNukePrototype; public class GUINukePrototype extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUINukeTsar.java b/com/hbm/inventory/gui/GUINukeTsar.java index cd11034b4..c272c9282 100644 --- a/com/hbm/inventory/gui/GUINukeTsar.java +++ b/com/hbm/inventory/gui/GUINukeTsar.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeTsar; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityNukeTsar; +import com.hbm.tileentity.bomb.TileEntityNukeTsar; public class GUINukeTsar extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIReactorMultiblock.java b/com/hbm/inventory/gui/GUIReactorMultiblock.java index 6e203d323..e39fd3cf1 100644 --- a/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerReactorMultiblock; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityReactorMultiblock; +import com.hbm.tileentity.machine.TileEntityReactorMultiblock; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIReiXMainframe.java b/com/hbm/inventory/gui/GUIReiXMainframe.java index 546b142df..0d3c8a251 100644 --- a/com/hbm/inventory/gui/GUIReiXMainframe.java +++ b/com/hbm/inventory/gui/GUIReiXMainframe.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerReiXMainframe; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityReiXMainframe; +import com.hbm.tileentity.machine.TileEntityReiXMainframe; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUIRtgFurnace.java b/com/hbm/inventory/gui/GUIRtgFurnace.java index 6fa7e0ddd..608cb0280 100644 --- a/com/hbm/inventory/gui/GUIRtgFurnace.java +++ b/com/hbm/inventory/gui/GUIRtgFurnace.java @@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerRtgFurnace; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityRtgFurnace; +import com.hbm.tileentity.machine.TileEntityRtgFurnace; public class GUIRtgFurnace extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUITestDiFurnace.java b/com/hbm/inventory/gui/GUITestDiFurnace.java index 08d861c95..624793fb6 100644 --- a/com/hbm/inventory/gui/GUITestDiFurnace.java +++ b/com/hbm/inventory/gui/GUITestDiFurnace.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerDiFurnace; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityDiFurnace; +import com.hbm.tileentity.machine.TileEntityDiFurnace; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/gui/GUITestNuke.java b/com/hbm/inventory/gui/GUITestNuke.java index b8e8c3757..eaf4e9c69 100644 --- a/com/hbm/inventory/gui/GUITestNuke.java +++ b/com/hbm/inventory/gui/GUITestNuke.java @@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation; import com.hbm.inventory.container.ContainerTestNuke; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityTestNuke; +import com.hbm.tileentity.bomb.TileEntityTestNuke; public class GUITestNuke extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIWatzCore.java b/com/hbm/inventory/gui/GUIWatzCore.java index 8827a4dff..c05627f9c 100644 --- a/com/hbm/inventory/gui/GUIWatzCore.java +++ b/com/hbm/inventory/gui/GUIWatzCore.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerWatzCore; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityWatzCore; +import com.hbm.tileentity.machine.TileEntityWatzCore; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/items/special/ItemTeleLink.java b/com/hbm/items/special/ItemTeleLink.java index eaee7e083..98e60d432 100644 --- a/com/hbm/items/special/ItemTeleLink.java +++ b/com/hbm/items/special/ItemTeleLink.java @@ -3,7 +3,7 @@ package com.hbm.items.special; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.tileentity.TileEntityMachineTeleporter; +import com.hbm.tileentity.machine.TileEntityMachineTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/com/hbm/items/tool/ItemFluidIcon.java b/com/hbm/items/tool/ItemFluidIcon.java index ff525b34d..403b1953a 100644 --- a/com/hbm/items/tool/ItemFluidIcon.java +++ b/com/hbm/items/tool/ItemFluidIcon.java @@ -3,7 +3,7 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate; -import com.hbm.tileentity.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/items/tool/ItemFluidIdentifier.java b/com/hbm/items/tool/ItemFluidIdentifier.java index 2f2393f59..2abed147e 100644 --- a/com/hbm/items/tool/ItemFluidIdentifier.java +++ b/com/hbm/items/tool/ItemFluidIdentifier.java @@ -2,7 +2,7 @@ package com.hbm.items.tool; import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.tileentity.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/items/tool/ItemFluidTank.java b/com/hbm/items/tool/ItemFluidTank.java index 7c436de9b..613c0dc00 100644 --- a/com/hbm/items/tool/ItemFluidTank.java +++ b/com/hbm/items/tool/ItemFluidTank.java @@ -4,7 +4,7 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; -import com.hbm.tileentity.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/items/tool/ItemTurretControl.java b/com/hbm/items/tool/ItemTurretControl.java index e22ab4e16..475fb2234 100644 --- a/com/hbm/items/tool/ItemTurretControl.java +++ b/com/hbm/items/tool/ItemTurretControl.java @@ -7,7 +7,7 @@ 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.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/com/hbm/items/tool/ItemWandD.java b/com/hbm/items/tool/ItemWandD.java index 494d34b60..6f2b155cf 100644 --- a/com/hbm/items/tool/ItemWandD.java +++ b/com/hbm/items/tool/ItemWandD.java @@ -4,7 +4,7 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/tool/ItemWiring.java b/com/hbm/items/tool/ItemWiring.java index 98396a0a9..b5844a037 100644 --- a/com/hbm/items/tool/ItemWiring.java +++ b/com/hbm/items/tool/ItemWiring.java @@ -2,7 +2,7 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.tileentity.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 9546071bf..92a1be55d 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -25,17 +25,17 @@ import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityCable; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityFluidDuct; -import com.hbm.tileentity.TileEntityGasDuct; -import com.hbm.tileentity.TileEntityGasDuctSolid; -import com.hbm.tileentity.TileEntityMachineBattery; -import com.hbm.tileentity.TileEntityMachineFluidTank; -import com.hbm.tileentity.TileEntityOilDuct; -import com.hbm.tileentity.TileEntityOilDuctSolid; -import com.hbm.tileentity.TileEntityPylonRedWire; -import com.hbm.tileentity.TileEntityWireCoated; +import com.hbm.tileentity.conductor.TileEntityCable; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityGasDuct; +import com.hbm.tileentity.conductor.TileEntityGasDuctSolid; +import com.hbm.tileentity.conductor.TileEntityOilDuct; +import com.hbm.tileentity.conductor.TileEntityOilDuctSolid; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityWireCoated; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityMachineBattery; +import com.hbm.tileentity.machine.TileEntityMachineFluidTank; import net.minecraft.block.Block; import net.minecraft.entity.Entity; diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index dfd2f0829..666096916 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -219,58 +219,58 @@ import com.hbm.render.tileentity.RenderTurbofan; import com.hbm.render.tileentity.RenderUF6Tank; import com.hbm.render.tileentity.RenderYellowBarrel; import com.hbm.render.tileentity.RendererObjTester; -import com.hbm.tileentity.TileEntityBombMulti; -import com.hbm.tileentity.TileEntityCable; -import com.hbm.tileentity.TileEntityCrashedBomb; -import com.hbm.tileentity.TileEntityDecoBlock; -import com.hbm.tileentity.TileEntityDecoBlockAlt; -import com.hbm.tileentity.TileEntityDecoBlockAltF; -import com.hbm.tileentity.TileEntityDecoBlockAltG; -import com.hbm.tileentity.TileEntityDecoBlockAltW; -import com.hbm.tileentity.TileEntityDecoPoleSatelliteReceiver; -import com.hbm.tileentity.TileEntityDecoPoleTop; -import com.hbm.tileentity.TileEntityDecoSteelPoles; -import com.hbm.tileentity.TileEntityDecoTapeRecorder; -import com.hbm.tileentity.TileEntityFluidDuct; -import com.hbm.tileentity.TileEntityGasDuct; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityLaunchPad; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineCentrifuge; -import com.hbm.tileentity.TileEntityMachineChemplant; -import com.hbm.tileentity.TileEntityMachineCyclotron; -import com.hbm.tileentity.TileEntityMachineFluidTank; -import com.hbm.tileentity.TileEntityMachineGasFlare; -import com.hbm.tileentity.TileEntityMachinePuF6Tank; -import com.hbm.tileentity.TileEntityMachinePumpjack; -import com.hbm.tileentity.TileEntityMachineRefinery; -import com.hbm.tileentity.TileEntityMachineTurbofan; -import com.hbm.tileentity.TileEntityMachineUF6Tank; -import com.hbm.tileentity.TileEntityNukeBoy; -import com.hbm.tileentity.TileEntityNukeCustom; -import com.hbm.tileentity.TileEntityNukeFleija; -import com.hbm.tileentity.TileEntityNukeGadget; -import com.hbm.tileentity.TileEntityNukeMan; -import com.hbm.tileentity.TileEntityNukeMike; -import com.hbm.tileentity.TileEntityNukePrototype; -import com.hbm.tileentity.TileEntityNukeTsar; -import com.hbm.tileentity.TileEntityObjTester; -import com.hbm.tileentity.TileEntityOilDuct; -import com.hbm.tileentity.TileEntityPylonRedWire; -import com.hbm.tileentity.TileEntityRedBarrel; -import com.hbm.tileentity.TileEntityRotationTester; -import com.hbm.tileentity.TileEntityStructureMarker; -import com.hbm.tileentity.TileEntityTestBombAdvanced; -import com.hbm.tileentity.TileEntityTestContainer; -import com.hbm.tileentity.TileEntityTestRender; -import com.hbm.tileentity.TileEntityTurretFlamer; -import com.hbm.tileentity.TileEntityTurretHeavy; -import com.hbm.tileentity.TileEntityTurretLight; -import com.hbm.tileentity.TileEntityTurretRocket; -import com.hbm.tileentity.TileEntityTurretTau; -import com.hbm.tileentity.TileEntityYellowBarrel; +import com.hbm.tileentity.bomb.TileEntityBombMulti; +import com.hbm.tileentity.bomb.TileEntityCrashedBomb; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityNukeBoy; +import com.hbm.tileentity.bomb.TileEntityNukeCustom; +import com.hbm.tileentity.bomb.TileEntityNukeFleija; +import com.hbm.tileentity.bomb.TileEntityNukeGadget; +import com.hbm.tileentity.bomb.TileEntityNukeMan; +import com.hbm.tileentity.bomb.TileEntityNukeMike; +import com.hbm.tileentity.bomb.TileEntityNukePrototype; +import com.hbm.tileentity.bomb.TileEntityNukeTsar; +import com.hbm.tileentity.bomb.TileEntityRedBarrel; +import com.hbm.tileentity.bomb.TileEntityTestBombAdvanced; +import com.hbm.tileentity.bomb.TileEntityTurretFlamer; +import com.hbm.tileentity.bomb.TileEntityTurretHeavy; +import com.hbm.tileentity.bomb.TileEntityTurretLight; +import com.hbm.tileentity.bomb.TileEntityTurretRocket; +import com.hbm.tileentity.bomb.TileEntityTurretTau; +import com.hbm.tileentity.conductor.TileEntityCable; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityGasDuct; +import com.hbm.tileentity.conductor.TileEntityOilDuct; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; +import com.hbm.tileentity.deco.TileEntityDecoBlock; +import com.hbm.tileentity.deco.TileEntityDecoBlockAlt; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltF; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltG; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltW; +import com.hbm.tileentity.deco.TileEntityDecoPoleSatelliteReceiver; +import com.hbm.tileentity.deco.TileEntityDecoPoleTop; +import com.hbm.tileentity.deco.TileEntityDecoSteelPoles; +import com.hbm.tileentity.deco.TileEntityDecoTapeRecorder; +import com.hbm.tileentity.deco.TileEntityObjTester; +import com.hbm.tileentity.deco.TileEntityRotationTester; +import com.hbm.tileentity.deco.TileEntityTestContainer; +import com.hbm.tileentity.deco.TileEntityTestRender; +import com.hbm.tileentity.deco.TileEntityYellowBarrel; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineCyclotron; +import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.TileEntityMachineGasFlare; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; +import com.hbm.tileentity.machine.TileEntityMachineRefinery; +import com.hbm.tileentity.machine.TileEntityMachineTurbofan; +import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.TileEntityStructureMarker; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 671d67f5e..511acdb84 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -128,83 +128,83 @@ import com.hbm.lib.HbmWorld; import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.TileEntityBombMulti; -import com.hbm.tileentity.TileEntityCable; -import com.hbm.tileentity.TileEntityConverterHeRf; -import com.hbm.tileentity.TileEntityConverterRfHe; -import com.hbm.tileentity.TileEntityCoreAdvanced; -import com.hbm.tileentity.TileEntityCoreTitanium; -import com.hbm.tileentity.TileEntityCrashedBomb; -import com.hbm.tileentity.TileEntityDecoBlock; -import com.hbm.tileentity.TileEntityDecoPoleSatelliteReceiver; -import com.hbm.tileentity.TileEntityDecoPoleTop; -import com.hbm.tileentity.TileEntityDecoSteelPoles; -import com.hbm.tileentity.TileEntityDecoTapeRecorder; -import com.hbm.tileentity.TileEntityDiFurnace; -import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityFWatzCore; -import com.hbm.tileentity.TileEntityFluidDuct; -import com.hbm.tileentity.TileEntityFusionMultiblock; -import com.hbm.tileentity.TileEntityGasDuct; -import com.hbm.tileentity.TileEntityGasDuctSolid; -import com.hbm.tileentity.TileEntityHatch; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityLaunchPad; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineBattery; -import com.hbm.tileentity.TileEntityMachineCMBFactory; -import com.hbm.tileentity.TileEntityMachineCentrifuge; -import com.hbm.tileentity.TileEntityMachineChemplant; -import com.hbm.tileentity.TileEntityMachineCoal; -import com.hbm.tileentity.TileEntityMachineCyclotron; -import com.hbm.tileentity.TileEntityMachineDeuterium; -import com.hbm.tileentity.TileEntityMachineDiesel; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; -import com.hbm.tileentity.TileEntityMachineFluidTank; -import com.hbm.tileentity.TileEntityMachineGasFlare; -import com.hbm.tileentity.TileEntityMachineGenerator; -import com.hbm.tileentity.TileEntityMachinePuF6Tank; -import com.hbm.tileentity.TileEntityMachineRTG; -import com.hbm.tileentity.TileEntityMachineReactor; -import com.hbm.tileentity.TileEntityMachineRefinery; -import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; -import com.hbm.tileentity.TileEntityMachineShredder; -import com.hbm.tileentity.TileEntityMachineTeleporter; -import com.hbm.tileentity.TileEntityMachineTurbofan; -import com.hbm.tileentity.TileEntityMachineUF6Tank; -import com.hbm.tileentity.TileEntityNukeBoy; -import com.hbm.tileentity.TileEntityNukeCustom; -import com.hbm.tileentity.TileEntityNukeFleija; -import com.hbm.tileentity.TileEntityNukeFurnace; -import com.hbm.tileentity.TileEntityNukeGadget; -import com.hbm.tileentity.TileEntityNukeMan; -import com.hbm.tileentity.TileEntityNukeMike; -import com.hbm.tileentity.TileEntityNukePrototype; -import com.hbm.tileentity.TileEntityNukeTsar; -import com.hbm.tileentity.TileEntityObjTester; -import com.hbm.tileentity.TileEntityOilDuct; -import com.hbm.tileentity.TileEntityOilDuctSolid; -import com.hbm.tileentity.TileEntityMachinePumpjack; -import com.hbm.tileentity.TileEntityPylonRedWire; -import com.hbm.tileentity.TileEntityReactorMultiblock; -import com.hbm.tileentity.TileEntityRedBarrel; -import com.hbm.tileentity.TileEntityRotationTester; -import com.hbm.tileentity.TileEntityRtgFurnace; -import com.hbm.tileentity.TileEntityStructureMarker; -import com.hbm.tileentity.TileEntityTestBombAdvanced; -import com.hbm.tileentity.TileEntityTestContainer; -import com.hbm.tileentity.TileEntityTestNuke; -import com.hbm.tileentity.TileEntityTestRender; -import com.hbm.tileentity.TileEntityTurretFlamer; -import com.hbm.tileentity.TileEntityTurretHeavy; -import com.hbm.tileentity.TileEntityTurretLight; -import com.hbm.tileentity.TileEntityTurretRocket; -import com.hbm.tileentity.TileEntityTurretTau; -import com.hbm.tileentity.TileEntityWatzCore; -import com.hbm.tileentity.TileEntityWireCoated; -import com.hbm.tileentity.TileEntityYellowBarrel; +import com.hbm.tileentity.bomb.TileEntityBombMulti; +import com.hbm.tileentity.bomb.TileEntityCrashedBomb; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityNukeBoy; +import com.hbm.tileentity.bomb.TileEntityNukeCustom; +import com.hbm.tileentity.bomb.TileEntityNukeFleija; +import com.hbm.tileentity.bomb.TileEntityNukeGadget; +import com.hbm.tileentity.bomb.TileEntityNukeMan; +import com.hbm.tileentity.bomb.TileEntityNukeMike; +import com.hbm.tileentity.bomb.TileEntityNukePrototype; +import com.hbm.tileentity.bomb.TileEntityNukeTsar; +import com.hbm.tileentity.bomb.TileEntityRedBarrel; +import com.hbm.tileentity.bomb.TileEntityTestBombAdvanced; +import com.hbm.tileentity.bomb.TileEntityTestNuke; +import com.hbm.tileentity.bomb.TileEntityTurretFlamer; +import com.hbm.tileentity.bomb.TileEntityTurretHeavy; +import com.hbm.tileentity.bomb.TileEntityTurretLight; +import com.hbm.tileentity.bomb.TileEntityTurretRocket; +import com.hbm.tileentity.bomb.TileEntityTurretTau; +import com.hbm.tileentity.conductor.TileEntityCable; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityGasDuct; +import com.hbm.tileentity.conductor.TileEntityGasDuctSolid; +import com.hbm.tileentity.conductor.TileEntityOilDuct; +import com.hbm.tileentity.conductor.TileEntityOilDuctSolid; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityWireCoated; +import com.hbm.tileentity.deco.TileEntityDecoBlock; +import com.hbm.tileentity.deco.TileEntityDecoPoleSatelliteReceiver; +import com.hbm.tileentity.deco.TileEntityDecoPoleTop; +import com.hbm.tileentity.deco.TileEntityDecoSteelPoles; +import com.hbm.tileentity.deco.TileEntityDecoTapeRecorder; +import com.hbm.tileentity.deco.TileEntityObjTester; +import com.hbm.tileentity.deco.TileEntityRotationTester; +import com.hbm.tileentity.deco.TileEntityTestContainer; +import com.hbm.tileentity.deco.TileEntityTestRender; +import com.hbm.tileentity.deco.TileEntityYellowBarrel; +import com.hbm.tileentity.machine.TileEntityConverterHeRf; +import com.hbm.tileentity.machine.TileEntityConverterRfHe; +import com.hbm.tileentity.machine.TileEntityCoreAdvanced; +import com.hbm.tileentity.machine.TileEntityCoreTitanium; +import com.hbm.tileentity.machine.TileEntityDiFurnace; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityFWatzCore; +import com.hbm.tileentity.machine.TileEntityFusionMultiblock; +import com.hbm.tileentity.machine.TileEntityHatch; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineBattery; +import com.hbm.tileentity.machine.TileEntityMachineCMBFactory; +import com.hbm.tileentity.machine.TileEntityMachineCentrifuge; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineCoal; +import com.hbm.tileentity.machine.TileEntityMachineCyclotron; +import com.hbm.tileentity.machine.TileEntityMachineDeuterium; +import com.hbm.tileentity.machine.TileEntityMachineDiesel; +import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.TileEntityMachineGasFlare; +import com.hbm.tileentity.machine.TileEntityMachineGenerator; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineOilWell; +import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; +import com.hbm.tileentity.machine.TileEntityMachineRTG; +import com.hbm.tileentity.machine.TileEntityMachineReactor; +import com.hbm.tileentity.machine.TileEntityMachineRefinery; +import com.hbm.tileentity.machine.TileEntityMachineSchrabidiumTransmutator; +import com.hbm.tileentity.machine.TileEntityMachineShredder; +import com.hbm.tileentity.machine.TileEntityMachineTeleporter; +import com.hbm.tileentity.machine.TileEntityMachineTurbofan; +import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.TileEntityNukeFurnace; +import com.hbm.tileentity.machine.TileEntityReactorMultiblock; +import com.hbm.tileentity.machine.TileEntityRtgFurnace; +import com.hbm.tileentity.machine.TileEntityStructureMarker; +import com.hbm.tileentity.machine.TileEntityWatzCore; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; diff --git a/com/hbm/packet/ItemFolderPacket.java b/com/hbm/packet/ItemFolderPacket.java index 2e6870864..62aee93df 100644 --- a/com/hbm/packet/ItemFolderPacket.java +++ b/com/hbm/packet/ItemFolderPacket.java @@ -6,7 +6,7 @@ import com.hbm.items.ModItems; import com.hbm.items.tool.ItemAssemblyTemplate; import com.hbm.items.tool.ItemChemistryTemplate; import com.hbm.items.tool.ItemFluidIdentifier; -import com.hbm.tileentity.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/com/hbm/packet/LoopedSoundPacket.java b/com/hbm/packet/LoopedSoundPacket.java index abc5139ef..f5cc7a669 100644 --- a/com/hbm/packet/LoopedSoundPacket.java +++ b/com/hbm/packet/LoopedSoundPacket.java @@ -3,9 +3,10 @@ package com.hbm.packet; import com.hbm.sound.SoundLoopAssembler; import com.hbm.sound.SoundLoopChemplant; import com.hbm.sound.SoundLoopMiner; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineChemplant; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEAssemblerPacket.java b/com/hbm/packet/TEAssemblerPacket.java index 2cbd1199f..1e9110fe1 100644 --- a/com/hbm/packet/TEAssemblerPacket.java +++ b/com/hbm/packet/TEAssemblerPacket.java @@ -1,6 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEChemplantPacket.java b/com/hbm/packet/TEChemplantPacket.java index 007fa809b..e134529cd 100644 --- a/com/hbm/packet/TEChemplantPacket.java +++ b/com/hbm/packet/TEChemplantPacket.java @@ -1,7 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/com/hbm/packet/TEDrillPacket.java b/com/hbm/packet/TEDrillPacket.java index 0a6baafe8..94ae3918e 100644 --- a/com/hbm/packet/TEDrillPacket.java +++ b/com/hbm/packet/TEDrillPacket.java @@ -1,6 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEDrillSoundPacket.java b/com/hbm/packet/TEDrillSoundPacket.java index 41be4da03..5e8ba4a6c 100644 --- a/com/hbm/packet/TEDrillSoundPacket.java +++ b/com/hbm/packet/TEDrillSoundPacket.java @@ -1,6 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEFluidPipePacket.java b/com/hbm/packet/TEFluidPipePacket.java index 4703b534f..0348b8ff0 100644 --- a/com/hbm/packet/TEFluidPipePacket.java +++ b/com/hbm/packet/TEFluidPipePacket.java @@ -1,7 +1,8 @@ package com.hbm.packet; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.tileentity.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEIGeneratorPacket.java b/com/hbm/packet/TEIGeneratorPacket.java index 28e88ef57..4c57c6b64 100644 --- a/com/hbm/packet/TEIGeneratorPacket.java +++ b/com/hbm/packet/TEIGeneratorPacket.java @@ -1,6 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEMissilePacket.java b/com/hbm/packet/TEMissilePacket.java index 374895a7b..61f14c7d7 100644 --- a/com/hbm/packet/TEMissilePacket.java +++ b/com/hbm/packet/TEMissilePacket.java @@ -1,7 +1,8 @@ package com.hbm.packet; import com.hbm.items.ModItems; -import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEPumpjackPacket.java b/com/hbm/packet/TEPumpjackPacket.java index 782a0df4e..25f3b784f 100644 --- a/com/hbm/packet/TEPumpjackPacket.java +++ b/com/hbm/packet/TEPumpjackPacket.java @@ -1,7 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachinePumpjack; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/com/hbm/packet/TEPylonDestructorPacket.java b/com/hbm/packet/TEPylonDestructorPacket.java index 3429d3e48..585fe196a 100644 --- a/com/hbm/packet/TEPylonDestructorPacket.java +++ b/com/hbm/packet/TEPylonDestructorPacket.java @@ -1,6 +1,6 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/com/hbm/packet/TEPylonSenderPacket.java b/com/hbm/packet/TEPylonSenderPacket.java index 4304f15ca..92b6ce950 100644 --- a/com/hbm/packet/TEPylonSenderPacket.java +++ b/com/hbm/packet/TEPylonSenderPacket.java @@ -1,6 +1,6 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/com/hbm/packet/TEStructurePacket.java b/com/hbm/packet/TEStructurePacket.java index f3d11429b..59af50274 100644 --- a/com/hbm/packet/TEStructurePacket.java +++ b/com/hbm/packet/TEStructurePacket.java @@ -1,6 +1,6 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityStructureMarker; +import com.hbm.tileentity.machine.TileEntityStructureMarker; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/com/hbm/packet/TETurretPacket.java b/com/hbm/packet/TETurretPacket.java index 4d41c7c27..c7e7c6f8b 100644 --- a/com/hbm/packet/TETurretPacket.java +++ b/com/hbm/packet/TETurretPacket.java @@ -1,7 +1,7 @@ package com.hbm.packet; -import com.hbm.tileentity.TileEntityStructureMarker; -import com.hbm.tileentity.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.machine.TileEntityStructureMarker; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/com/hbm/render/item/ItemRenderTestBombAdvanced.java b/com/hbm/render/item/ItemRenderTestBombAdvanced.java index fcc8a93e4..cfcbcbc68 100644 --- a/com/hbm/render/item/ItemRenderTestBombAdvanced.java +++ b/com/hbm/render/item/ItemRenderTestBombAdvanced.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelTestBombAdvanced; -import com.hbm.tileentity.TileEntityTestBombAdvanced; +import com.hbm.tileentity.bomb.TileEntityTestBombAdvanced; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/com/hbm/render/item/ItemRenderTestContainer.java b/com/hbm/render/item/ItemRenderTestContainer.java index 5fa465355..cf9dd25c6 100644 --- a/com/hbm/render/item/ItemRenderTestContainer.java +++ b/com/hbm/render/item/ItemRenderTestContainer.java @@ -1,6 +1,6 @@ package com.hbm.render.item; -import com.hbm.tileentity.TileEntityTestContainer; +import com.hbm.tileentity.deco.TileEntityTestContainer; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/com/hbm/render/tileentity/RenderAssembler.java b/com/hbm/render/tileentity/RenderAssembler.java index d95353c2c..982ea1258 100644 --- a/com/hbm/render/tileentity/RenderAssembler.java +++ b/com/hbm/render/tileentity/RenderAssembler.java @@ -3,7 +3,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/tileentity/RenderCable.java b/com/hbm/render/tileentity/RenderCable.java index 53dccdf40..62c3639a6 100644 --- a/com/hbm/render/tileentity/RenderCable.java +++ b/com/hbm/render/tileentity/RenderCable.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityCable; +import com.hbm.tileentity.conductor.TileEntityCable; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderChemplant.java b/com/hbm/render/tileentity/RenderChemplant.java index 6e96a6137..5f790c44a 100644 --- a/com/hbm/render/tileentity/RenderChemplant.java +++ b/com/hbm/render/tileentity/RenderChemplant.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderDecoBlockAlt.java b/com/hbm/render/tileentity/RenderDecoBlockAlt.java index d86a1c227..bfac5ae0c 100644 --- a/com/hbm/render/tileentity/RenderDecoBlockAlt.java +++ b/com/hbm/render/tileentity/RenderDecoBlockAlt.java @@ -6,9 +6,9 @@ import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelGun; import com.hbm.render.model.ModelStatue; -import com.hbm.tileentity.TileEntityDecoBlockAltF; -import com.hbm.tileentity.TileEntityDecoBlockAltG; -import com.hbm.tileentity.TileEntityDecoBlockAltW; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltF; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltG; +import com.hbm.tileentity.deco.TileEntityDecoBlockAltW; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/com/hbm/render/tileentity/RenderFlamerTurret.java b/com/hbm/render/tileentity/RenderFlamerTurret.java index f58c4ff4a..9791a9c8b 100644 --- a/com/hbm/render/tileentity/RenderFlamerTurret.java +++ b/com/hbm/render/tileentity/RenderFlamerTurret.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderFluidDuct.java b/com/hbm/render/tileentity/RenderFluidDuct.java index 059485f04..5e3bbd830 100644 --- a/com/hbm/render/tileentity/RenderFluidDuct.java +++ b/com/hbm/render/tileentity/RenderFluidDuct.java @@ -3,7 +3,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityFluidDuct; +import com.hbm.tileentity.conductor.TileEntityFluidDuct; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderFluidTank.java b/com/hbm/render/tileentity/RenderFluidTank.java index ffc812c55..ec483540f 100644 --- a/com/hbm/render/tileentity/RenderFluidTank.java +++ b/com/hbm/render/tileentity/RenderFluidTank.java @@ -3,8 +3,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineFluidTank; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderGasDuct.java b/com/hbm/render/tileentity/RenderGasDuct.java index fd5a6b19f..460d20b52 100644 --- a/com/hbm/render/tileentity/RenderGasDuct.java +++ b/com/hbm/render/tileentity/RenderGasDuct.java @@ -3,7 +3,8 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityGasDuct; +import com.hbm.tileentity.conductor.TileEntityGasDuct; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderHeavyTurret.java b/com/hbm/render/tileentity/RenderHeavyTurret.java index 695a71131..1547f3338 100644 --- a/com/hbm/render/tileentity/RenderHeavyTurret.java +++ b/com/hbm/render/tileentity/RenderHeavyTurret.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderIGenerator.java b/com/hbm/render/tileentity/RenderIGenerator.java index 6cf68f173..8309be623 100644 --- a/com/hbm/render/tileentity/RenderIGenerator.java +++ b/com/hbm/render/tileentity/RenderIGenerator.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderLaunchPadTier1.java b/com/hbm/render/tileentity/RenderLaunchPadTier1.java index 2d42426a7..e91ebfb68 100644 --- a/com/hbm/render/tileentity/RenderLaunchPadTier1.java +++ b/com/hbm/render/tileentity/RenderLaunchPadTier1.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.bomb.TileEntityLaunchPad; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderLightTurret.java b/com/hbm/render/tileentity/RenderLightTurret.java index 4497a481a..0d6035b0a 100644 --- a/com/hbm/render/tileentity/RenderLightTurret.java +++ b/com/hbm/render/tileentity/RenderLightTurret.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderMiningDrill.java b/com/hbm/render/tileentity/RenderMiningDrill.java index 85a1482ca..08612eaac 100644 --- a/com/hbm/render/tileentity/RenderMiningDrill.java +++ b/com/hbm/render/tileentity/RenderMiningDrill.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderOilDuct.java b/com/hbm/render/tileentity/RenderOilDuct.java index 2db93e080..ec867972c 100644 --- a/com/hbm/render/tileentity/RenderOilDuct.java +++ b/com/hbm/render/tileentity/RenderOilDuct.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityOilDuct; +import com.hbm.tileentity.conductor.TileEntityOilDuct; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderPumpjack.java b/com/hbm/render/tileentity/RenderPumpjack.java index 36c0c482f..64a8d37da 100644 --- a/com/hbm/render/tileentity/RenderPumpjack.java +++ b/com/hbm/render/tileentity/RenderPumpjack.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.TileEntityMachinePumpjack; -import com.hbm.tileentity.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; +import com.hbm.tileentity.machine.TileEntityMachinePumpjack; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderPylon.java b/com/hbm/render/tileentity/RenderPylon.java index b52df1175..75d0da8c7 100644 --- a/com/hbm/render/tileentity/RenderPylon.java +++ b/com/hbm/render/tileentity/RenderPylon.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelPylon; -import com.hbm.tileentity.TileEntityPylonRedWire; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderRocketTurret.java b/com/hbm/render/tileentity/RenderRocketTurret.java index dcd339e30..e52177bb0 100644 --- a/com/hbm/render/tileentity/RenderRocketTurret.java +++ b/com/hbm/render/tileentity/RenderRocketTurret.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderStructureMaker.java b/com/hbm/render/tileentity/RenderStructureMaker.java index 6d7af9dad..73ad4c1a3 100644 --- a/com/hbm/render/tileentity/RenderStructureMaker.java +++ b/com/hbm/render/tileentity/RenderStructureMaker.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL14; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityStructureMarker; +import com.hbm.tileentity.machine.TileEntityStructureMarker; import com.hbm.world.FWatz; import com.hbm.world.FactoryTitanium; import com.hbm.world.FusionReactor; diff --git a/com/hbm/render/tileentity/RenderTauTurret.java b/com/hbm/render/tileentity/RenderTauTurret.java index dc87a1a4c..c02e3305b 100644 --- a/com/hbm/render/tileentity/RenderTauTurret.java +++ b/com/hbm/render/tileentity/RenderTauTurret.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.TileEntityTurretBase; +import com.hbm.tileentity.bomb.TileEntityTurretBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderTestContainer.java b/com/hbm/render/tileentity/RenderTestContainer.java index 76c33c813..d3a6442c7 100644 --- a/com/hbm/render/tileentity/RenderTestContainer.java +++ b/com/hbm/render/tileentity/RenderTestContainer.java @@ -18,7 +18,7 @@ import org.lwjgl.opengl.GL12; import com.hbm.blocks.test.TestContainer; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityTestContainer; +import com.hbm.tileentity.deco.TileEntityTestContainer; @SideOnly(Side.CLIENT) public class RenderTestContainer extends TileEntitySpecialRenderer diff --git a/com/hbm/render/tileentity/RenderTurbofan.java b/com/hbm/render/tileentity/RenderTurbofan.java index 9cbbcb8c9..a705318e6 100644 --- a/com/hbm/render/tileentity/RenderTurbofan.java +++ b/com/hbm/render/tileentity/RenderTurbofan.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.TileEntityMachineIGenerator; +import com.hbm.tileentity.machine.TileEntityMachineIGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/sound/SoundLoopAssembler.java b/com/hbm/sound/SoundLoopAssembler.java index a1a98994f..6385e267b 100644 --- a/com/hbm/sound/SoundLoopAssembler.java +++ b/com/hbm/sound/SoundLoopAssembler.java @@ -3,8 +3,8 @@ package com.hbm.sound; import java.util.ArrayList; import java.util.List; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineAssembler; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/SoundLoopChemplant.java b/com/hbm/sound/SoundLoopChemplant.java index db89c01fb..d01d4ae56 100644 --- a/com/hbm/sound/SoundLoopChemplant.java +++ b/com/hbm/sound/SoundLoopChemplant.java @@ -3,8 +3,8 @@ package com.hbm.sound; import java.util.ArrayList; import java.util.List; -import com.hbm.tileentity.TileEntityMachineChemplant; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineChemplant; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/SoundLoopMiner.java b/com/hbm/sound/SoundLoopMiner.java index 86b5619cc..0655f0bdf 100644 --- a/com/hbm/sound/SoundLoopMiner.java +++ b/com/hbm/sound/SoundLoopMiner.java @@ -3,7 +3,7 @@ package com.hbm.sound; import java.util.ArrayList; import java.util.List; -import com.hbm.tileentity.TileEntityMachineMiningDrill; +import com.hbm.tileentity.machine.TileEntityMachineMiningDrill; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/tileentity/TileEntityBombMulti.java b/com/hbm/tileentity/bomb/TileEntityBombMulti.java similarity index 94% rename from com/hbm/tileentity/TileEntityBombMulti.java rename to com/hbm/tileentity/bomb/TileEntityBombMulti.java index 395c67a68..069c067e5 100644 --- a/com/hbm/tileentity/TileEntityBombMulti.java +++ b/com/hbm/tileentity/bomb/TileEntityBombMulti.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityCrashedBomb.java b/com/hbm/tileentity/bomb/TileEntityCrashedBomb.java similarity index 84% rename from com/hbm/tileentity/TileEntityCrashedBomb.java rename to com/hbm/tileentity/bomb/TileEntityCrashedBomb.java index 198a1e83f..b4044537f 100644 --- a/com/hbm/tileentity/TileEntityCrashedBomb.java +++ b/com/hbm/tileentity/bomb/TileEntityCrashedBomb.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/tileentity/TileEntityLaunchPad.java b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java similarity index 94% rename from com/hbm/tileentity/TileEntityLaunchPad.java rename to com/hbm/tileentity/bomb/TileEntityLaunchPad.java index b48968b63..e07e42953 100644 --- a/com/hbm/tileentity/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchPad.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukeBoy.java b/com/hbm/tileentity/bomb/TileEntityNukeBoy.java similarity index 94% rename from com/hbm/tileentity/TileEntityNukeBoy.java rename to com/hbm/tileentity/bomb/TileEntityNukeBoy.java index fa886823b..224430dd1 100644 --- a/com/hbm/tileentity/TileEntityNukeBoy.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeBoy.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukeCustom.java b/com/hbm/tileentity/bomb/TileEntityNukeCustom.java similarity index 95% rename from com/hbm/tileentity/TileEntityNukeCustom.java rename to com/hbm/tileentity/bomb/TileEntityNukeCustom.java index 5edb3ea8e..489fe6db7 100644 --- a/com/hbm/tileentity/TileEntityNukeCustom.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeCustom.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukeFleija.java b/com/hbm/tileentity/bomb/TileEntityNukeFleija.java similarity index 95% rename from com/hbm/tileentity/TileEntityNukeFleija.java rename to com/hbm/tileentity/bomb/TileEntityNukeFleija.java index 9fb34c8a0..11c67d48d 100644 --- a/com/hbm/tileentity/TileEntityNukeFleija.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeFleija.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukeGadget.java b/com/hbm/tileentity/bomb/TileEntityNukeGadget.java similarity index 95% rename from com/hbm/tileentity/TileEntityNukeGadget.java rename to com/hbm/tileentity/bomb/TileEntityNukeGadget.java index ae5d8038c..951acc4c1 100644 --- a/com/hbm/tileentity/TileEntityNukeGadget.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeGadget.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukeMan.java b/com/hbm/tileentity/bomb/TileEntityNukeMan.java similarity index 94% rename from com/hbm/tileentity/TileEntityNukeMan.java rename to com/hbm/tileentity/bomb/TileEntityNukeMan.java index 4798a266e..14a90b82e 100644 --- a/com/hbm/tileentity/TileEntityNukeMan.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeMan.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukeMike.java b/com/hbm/tileentity/bomb/TileEntityNukeMike.java similarity index 95% rename from com/hbm/tileentity/TileEntityNukeMike.java rename to com/hbm/tileentity/bomb/TileEntityNukeMike.java index b5dbafac2..bbe8a867c 100644 --- a/com/hbm/tileentity/TileEntityNukeMike.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeMike.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukePrototype.java b/com/hbm/tileentity/bomb/TileEntityNukePrototype.java similarity index 95% rename from com/hbm/tileentity/TileEntityNukePrototype.java rename to com/hbm/tileentity/bomb/TileEntityNukePrototype.java index e6d6098a4..fb4ac7464 100644 --- a/com/hbm/tileentity/TileEntityNukePrototype.java +++ b/com/hbm/tileentity/bomb/TileEntityNukePrototype.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityNukeTsar.java b/com/hbm/tileentity/bomb/TileEntityNukeTsar.java similarity index 95% rename from com/hbm/tileentity/TileEntityNukeTsar.java rename to com/hbm/tileentity/bomb/TileEntityNukeTsar.java index f9f8dd0b5..d65e70075 100644 --- a/com/hbm/tileentity/TileEntityNukeTsar.java +++ b/com/hbm/tileentity/bomb/TileEntityNukeTsar.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityRedBarrel.java b/com/hbm/tileentity/bomb/TileEntityRedBarrel.java similarity index 85% rename from com/hbm/tileentity/TileEntityRedBarrel.java rename to com/hbm/tileentity/bomb/TileEntityRedBarrel.java index bfb0cccd1..279c8ce21 100644 --- a/com/hbm/tileentity/TileEntityRedBarrel.java +++ b/com/hbm/tileentity/bomb/TileEntityRedBarrel.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityTestBombAdvanced.java b/com/hbm/tileentity/bomb/TileEntityTestBombAdvanced.java similarity index 73% rename from com/hbm/tileentity/TileEntityTestBombAdvanced.java rename to com/hbm/tileentity/bomb/TileEntityTestBombAdvanced.java index 64975aacc..f47eb33f5 100644 --- a/com/hbm/tileentity/TileEntityTestBombAdvanced.java +++ b/com/hbm/tileentity/bomb/TileEntityTestBombAdvanced.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityTestNuke.java b/com/hbm/tileentity/bomb/TileEntityTestNuke.java similarity index 95% rename from com/hbm/tileentity/TileEntityTestNuke.java rename to com/hbm/tileentity/bomb/TileEntityTestNuke.java index 1565822fc..7ce11d2f0 100644 --- a/com/hbm/tileentity/TileEntityTestNuke.java +++ b/com/hbm/tileentity/bomb/TileEntityTestNuke.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityTurretBase.java b/com/hbm/tileentity/bomb/TileEntityTurretBase.java similarity index 96% rename from com/hbm/tileentity/TileEntityTurretBase.java rename to com/hbm/tileentity/bomb/TileEntityTurretBase.java index 06badd76e..037f344bc 100644 --- a/com/hbm/tileentity/TileEntityTurretBase.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretBase.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; diff --git a/com/hbm/tileentity/TileEntityTurretFlamer.java b/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java similarity index 85% rename from com/hbm/tileentity/TileEntityTurretFlamer.java rename to com/hbm/tileentity/bomb/TileEntityTurretFlamer.java index 013f055a3..720d284bd 100644 --- a/com/hbm/tileentity/TileEntityTurretFlamer.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretFlamer.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import com.hbm.entity.particle.EntityGasFlameFX; diff --git a/com/hbm/tileentity/TileEntityTurretHeavy.java b/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java similarity index 77% rename from com/hbm/tileentity/TileEntityTurretHeavy.java rename to com/hbm/tileentity/bomb/TileEntityTurretHeavy.java index b84dd1cd7..69ea8972f 100644 --- a/com/hbm/tileentity/TileEntityTurretHeavy.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretHeavy.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityTurretLight.java b/com/hbm/tileentity/bomb/TileEntityTurretLight.java similarity index 77% rename from com/hbm/tileentity/TileEntityTurretLight.java rename to com/hbm/tileentity/bomb/TileEntityTurretLight.java index 0911a0789..9d3831e9f 100644 --- a/com/hbm/tileentity/TileEntityTurretLight.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretLight.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityTurretRocket.java b/com/hbm/tileentity/bomb/TileEntityTurretRocket.java similarity index 77% rename from com/hbm/tileentity/TileEntityTurretRocket.java rename to com/hbm/tileentity/bomb/TileEntityTurretRocket.java index 2950cc1d3..3b74991a1 100644 --- a/com/hbm/tileentity/TileEntityTurretRocket.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretRocket.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityTurretTau.java b/com/hbm/tileentity/bomb/TileEntityTurretTau.java similarity index 77% rename from com/hbm/tileentity/TileEntityTurretTau.java rename to com/hbm/tileentity/bomb/TileEntityTurretTau.java index 6b86c96aa..0208d6778 100644 --- a/com/hbm/tileentity/TileEntityTurretTau.java +++ b/com/hbm/tileentity/bomb/TileEntityTurretTau.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.bomb; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityCable.java b/com/hbm/tileentity/conductor/TileEntityCable.java similarity index 94% rename from com/hbm/tileentity/TileEntityCable.java rename to com/hbm/tileentity/conductor/TileEntityCable.java index c54e60c4c..98b778412 100644 --- a/com/hbm/tileentity/TileEntityCable.java +++ b/com/hbm/tileentity/conductor/TileEntityCable.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityFluidDuct.java b/com/hbm/tileentity/conductor/TileEntityFluidDuct.java similarity index 98% rename from com/hbm/tileentity/TileEntityFluidDuct.java rename to com/hbm/tileentity/conductor/TileEntityFluidDuct.java index c1431a368..cf9b56422 100644 --- a/com/hbm/tileentity/TileEntityFluidDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityFluidDuct.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.Arrays; diff --git a/com/hbm/tileentity/TileEntityGasDuct.java b/com/hbm/tileentity/conductor/TileEntityGasDuct.java similarity index 98% rename from com/hbm/tileentity/TileEntityGasDuct.java rename to com/hbm/tileentity/conductor/TileEntityGasDuct.java index fa226cd5b..4377a440f 100644 --- a/com/hbm/tileentity/TileEntityGasDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityGasDuct.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.Arrays; diff --git a/com/hbm/tileentity/TileEntityGasDuctSolid.java b/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java similarity index 93% rename from com/hbm/tileentity/TileEntityGasDuctSolid.java rename to com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java index 01cf67f65..775867e3d 100644 --- a/com/hbm/tileentity/TileEntityGasDuctSolid.java +++ b/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityOilDuct.java b/com/hbm/tileentity/conductor/TileEntityOilDuct.java similarity index 98% rename from com/hbm/tileentity/TileEntityOilDuct.java rename to com/hbm/tileentity/conductor/TileEntityOilDuct.java index 02994dc1d..2fed9f5cb 100644 --- a/com/hbm/tileentity/TileEntityOilDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityOilDuct.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.Arrays; diff --git a/com/hbm/tileentity/TileEntityOilDuctSolid.java b/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java similarity index 93% rename from com/hbm/tileentity/TileEntityOilDuctSolid.java rename to com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java index aed0ee453..31a024b4e 100644 --- a/com/hbm/tileentity/TileEntityOilDuctSolid.java +++ b/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityPylonRedWire.java b/com/hbm/tileentity/conductor/TileEntityPylonRedWire.java similarity index 99% rename from com/hbm/tileentity/TileEntityPylonRedWire.java rename to com/hbm/tileentity/conductor/TileEntityPylonRedWire.java index 83426bfd4..d7d4ad56f 100644 --- a/com/hbm/tileentity/TileEntityPylonRedWire.java +++ b/com/hbm/tileentity/conductor/TileEntityPylonRedWire.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityWireCoated.java b/com/hbm/tileentity/conductor/TileEntityWireCoated.java similarity index 87% rename from com/hbm/tileentity/TileEntityWireCoated.java rename to com/hbm/tileentity/conductor/TileEntityWireCoated.java index 23e0081be..6a85581f3 100644 --- a/com/hbm/tileentity/TileEntityWireCoated.java +++ b/com/hbm/tileentity/conductor/TileEntityWireCoated.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.conductor; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityDecoBlock.java b/com/hbm/tileentity/deco/TileEntityDecoBlock.java similarity index 88% rename from com/hbm/tileentity/TileEntityDecoBlock.java rename to com/hbm/tileentity/deco/TileEntityDecoBlock.java index 906238b95..9bdee624a 100644 --- a/com/hbm/tileentity/TileEntityDecoBlock.java +++ b/com/hbm/tileentity/deco/TileEntityDecoBlock.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityDecoBlockAlt.java b/com/hbm/tileentity/deco/TileEntityDecoBlockAlt.java similarity index 88% rename from com/hbm/tileentity/TileEntityDecoBlockAlt.java rename to com/hbm/tileentity/deco/TileEntityDecoBlockAlt.java index 418516e73..3c58cdfd7 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAlt.java +++ b/com/hbm/tileentity/deco/TileEntityDecoBlockAlt.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityDecoBlockAltF.java b/com/hbm/tileentity/deco/TileEntityDecoBlockAltF.java similarity index 95% rename from com/hbm/tileentity/TileEntityDecoBlockAltF.java rename to com/hbm/tileentity/deco/TileEntityDecoBlockAltF.java index cbaa3f762..8f4578f7c 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAltF.java +++ b/com/hbm/tileentity/deco/TileEntityDecoBlockAltF.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import java.util.HashSet; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityDecoBlockAltG.java b/com/hbm/tileentity/deco/TileEntityDecoBlockAltG.java similarity index 88% rename from com/hbm/tileentity/TileEntityDecoBlockAltG.java rename to com/hbm/tileentity/deco/TileEntityDecoBlockAltG.java index c7bfff3e0..19c082b70 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAltG.java +++ b/com/hbm/tileentity/deco/TileEntityDecoBlockAltG.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityDecoBlockAltW.java b/com/hbm/tileentity/deco/TileEntityDecoBlockAltW.java similarity index 88% rename from com/hbm/tileentity/TileEntityDecoBlockAltW.java rename to com/hbm/tileentity/deco/TileEntityDecoBlockAltW.java index 53cfe63ff..73115fed0 100644 --- a/com/hbm/tileentity/TileEntityDecoBlockAltW.java +++ b/com/hbm/tileentity/deco/TileEntityDecoBlockAltW.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java b/com/hbm/tileentity/deco/TileEntityDecoPoleSatelliteReceiver.java similarity index 86% rename from com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java rename to com/hbm/tileentity/deco/TileEntityDecoPoleSatelliteReceiver.java index 8ff4c9035..36383abbc 100644 --- a/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java +++ b/com/hbm/tileentity/deco/TileEntityDecoPoleSatelliteReceiver.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityDecoPoleTop.java b/com/hbm/tileentity/deco/TileEntityDecoPoleTop.java similarity index 85% rename from com/hbm/tileentity/TileEntityDecoPoleTop.java rename to com/hbm/tileentity/deco/TileEntityDecoPoleTop.java index 8a05243e6..09a052424 100644 --- a/com/hbm/tileentity/TileEntityDecoPoleTop.java +++ b/com/hbm/tileentity/deco/TileEntityDecoPoleTop.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityDecoSteelPoles.java b/com/hbm/tileentity/deco/TileEntityDecoSteelPoles.java similarity index 85% rename from com/hbm/tileentity/TileEntityDecoSteelPoles.java rename to com/hbm/tileentity/deco/TileEntityDecoSteelPoles.java index bd931d92c..15264f04a 100644 --- a/com/hbm/tileentity/TileEntityDecoSteelPoles.java +++ b/com/hbm/tileentity/deco/TileEntityDecoSteelPoles.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/tileentity/TileEntityDecoTapeRecorder.java b/com/hbm/tileentity/deco/TileEntityDecoTapeRecorder.java similarity index 90% rename from com/hbm/tileentity/TileEntityDecoTapeRecorder.java rename to com/hbm/tileentity/deco/TileEntityDecoTapeRecorder.java index 374c7dac0..11d32c9f9 100644 --- a/com/hbm/tileentity/TileEntityDecoTapeRecorder.java +++ b/com/hbm/tileentity/deco/TileEntityDecoTapeRecorder.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import com.hbm.blocks.generic.DecoTapeRecorder; diff --git a/com/hbm/tileentity/TileEntityObjTester.java b/com/hbm/tileentity/deco/TileEntityObjTester.java similarity index 89% rename from com/hbm/tileentity/TileEntityObjTester.java rename to com/hbm/tileentity/deco/TileEntityObjTester.java index 538783d04..b2520873e 100644 --- a/com/hbm/tileentity/TileEntityObjTester.java +++ b/com/hbm/tileentity/deco/TileEntityObjTester.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/tileentity/TileEntityRotationTester.java b/com/hbm/tileentity/deco/TileEntityRotationTester.java similarity index 87% rename from com/hbm/tileentity/TileEntityRotationTester.java rename to com/hbm/tileentity/deco/TileEntityRotationTester.java index f88e25cf1..f4e23a0b2 100644 --- a/com/hbm/tileentity/TileEntityRotationTester.java +++ b/com/hbm/tileentity/deco/TileEntityRotationTester.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityTestContainer.java b/com/hbm/tileentity/deco/TileEntityTestContainer.java similarity index 96% rename from com/hbm/tileentity/TileEntityTestContainer.java rename to com/hbm/tileentity/deco/TileEntityTestContainer.java index b8362fd38..3fde6ab7a 100644 --- a/com/hbm/tileentity/TileEntityTestContainer.java +++ b/com/hbm/tileentity/deco/TileEntityTestContainer.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import com.hbm.blocks.test.TestContainer; diff --git a/com/hbm/tileentity/TileEntityTestRender.java b/com/hbm/tileentity/deco/TileEntityTestRender.java similarity index 72% rename from com/hbm/tileentity/TileEntityTestRender.java rename to com/hbm/tileentity/deco/TileEntityTestRender.java index 2aadfee6c..251dbc96a 100644 --- a/com/hbm/tileentity/TileEntityTestRender.java +++ b/com/hbm/tileentity/deco/TileEntityTestRender.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityYellowBarrel.java b/com/hbm/tileentity/deco/TileEntityYellowBarrel.java similarity index 96% rename from com/hbm/tileentity/TileEntityYellowBarrel.java rename to com/hbm/tileentity/deco/TileEntityYellowBarrel.java index 18c6e08dd..e66ae93d5 100644 --- a/com/hbm/tileentity/TileEntityYellowBarrel.java +++ b/com/hbm/tileentity/deco/TileEntityYellowBarrel.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.deco; import java.util.HashSet; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityConverterHeRf.java b/com/hbm/tileentity/machine/TileEntityConverterHeRf.java similarity index 95% rename from com/hbm/tileentity/TileEntityConverterHeRf.java rename to com/hbm/tileentity/machine/TileEntityConverterHeRf.java index da50c9d23..412130a6a 100644 --- a/com/hbm/tileentity/TileEntityConverterHeRf.java +++ b/com/hbm/tileentity/machine/TileEntityConverterHeRf.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.calc.Location; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/tileentity/TileEntityConverterRfHe.java b/com/hbm/tileentity/machine/TileEntityConverterRfHe.java similarity index 94% rename from com/hbm/tileentity/TileEntityConverterRfHe.java rename to com/hbm/tileentity/machine/TileEntityConverterRfHe.java index 623a09359..0b9163ed0 100644 --- a/com/hbm/tileentity/TileEntityConverterRfHe.java +++ b/com/hbm/tileentity/machine/TileEntityConverterRfHe.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityCoreAdvanced.java b/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java similarity index 96% rename from com/hbm/tileentity/TileEntityCoreAdvanced.java rename to com/hbm/tileentity/machine/TileEntityCoreAdvanced.java index ede3620b3..a04b83f0a 100644 --- a/com/hbm/tileentity/TileEntityCoreAdvanced.java +++ b/com/hbm/tileentity/machine/TileEntityCoreAdvanced.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/tileentity/TileEntityCoreTitanium.java b/com/hbm/tileentity/machine/TileEntityCoreTitanium.java similarity index 96% rename from com/hbm/tileentity/TileEntityCoreTitanium.java rename to com/hbm/tileentity/machine/TileEntityCoreTitanium.java index faf467a96..3b3fc2060 100644 --- a/com/hbm/tileentity/TileEntityCoreTitanium.java +++ b/com/hbm/tileentity/machine/TileEntityCoreTitanium.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/tileentity/TileEntityDiFurnace.java b/com/hbm/tileentity/machine/TileEntityDiFurnace.java similarity index 95% rename from com/hbm/tileentity/TileEntityDiFurnace.java rename to com/hbm/tileentity/machine/TileEntityDiFurnace.java index cfa8f1834..7957829cc 100644 --- a/com/hbm/tileentity/TileEntityDiFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityDiFurnace.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineDiFurnace; import com.hbm.inventory.MachineRecipes; diff --git a/com/hbm/tileentity/TileEntityDummy.java b/com/hbm/tileentity/machine/TileEntityDummy.java similarity index 96% rename from com/hbm/tileentity/TileEntityDummy.java rename to com/hbm/tileentity/machine/TileEntityDummy.java index 2909bae38..7c101b525 100644 --- a/com/hbm/tileentity/TileEntityDummy.java +++ b/com/hbm/tileentity/machine/TileEntityDummy.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.interfaces.IMultiblock; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/tileentity/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java similarity index 95% rename from com/hbm/tileentity/TileEntityFWatzCore.java rename to com/hbm/tileentity/machine/TileEntityFWatzCore.java index d2f3e68e6..e66ed8d7d 100644 --- a/com/hbm/tileentity/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityFusionMultiblock.java b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java similarity index 98% rename from com/hbm/tileentity/TileEntityFusionMultiblock.java rename to com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index 7e9fb16f6..0f4ef49da 100644 --- a/com/hbm/tileentity/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityHatch.java b/com/hbm/tileentity/machine/TileEntityHatch.java similarity index 97% rename from com/hbm/tileentity/TileEntityHatch.java rename to com/hbm/tileentity/machine/TileEntityHatch.java index d48bae1be..8cc342ea0 100644 --- a/com/hbm/tileentity/TileEntityHatch.java +++ b/com/hbm/tileentity/machine/TileEntityHatch.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.BlockSeal; diff --git a/com/hbm/tileentity/TileEntityMachineAssembler.java b/com/hbm/tileentity/machine/TileEntityMachineAssembler.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineAssembler.java rename to com/hbm/tileentity/machine/TileEntityMachineAssembler.java index 4549f9965..676d18544 100644 --- a/com/hbm/tileentity/TileEntityMachineAssembler.java +++ b/com/hbm/tileentity/machine/TileEntityMachineAssembler.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.List; import java.util.Random; diff --git a/com/hbm/tileentity/TileEntityMachineBattery.java b/com/hbm/tileentity/machine/TileEntityMachineBattery.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineBattery.java rename to com/hbm/tileentity/machine/TileEntityMachineBattery.java index e87c06161..771a133be 100644 --- a/com/hbm/tileentity/TileEntityMachineBattery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBattery.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineCMBFactory.java rename to com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index d17286c41..471a48871 100644 --- a/com/hbm/tileentity/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/tileentity/TileEntityMachineCentrifuge.java b/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineCentrifuge.java rename to com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java index 66479bbaa..23c1b810f 100644 --- a/com/hbm/tileentity/TileEntityMachineCentrifuge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCentrifuge.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityMachineChemplant.java b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineChemplant.java rename to com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 7c96be03f..bbe4fadf9 100644 --- a/com/hbm/tileentity/TileEntityMachineChemplant.java +++ b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineCoal.java b/com/hbm/tileentity/machine/TileEntityMachineCoal.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineCoal.java rename to com/hbm/tileentity/machine/TileEntityMachineCoal.java index 6e106b5be..b0422a125 100644 --- a/com/hbm/tileentity/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/com/hbm/tileentity/TileEntityMachineCyclotron.java b/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineCyclotron.java rename to com/hbm/tileentity/machine/TileEntityMachineCyclotron.java index a261940bd..28f1698d8 100644 --- a/com/hbm/tileentity/TileEntityMachineCyclotron.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCyclotron.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineDeuterium.java b/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineDeuterium.java rename to com/hbm/tileentity/machine/TileEntityMachineDeuterium.java index ab496f133..ceb44a8ee 100644 --- a/com/hbm/tileentity/TileEntityMachineDeuterium.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineDiesel.java rename to com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 3f5ddda59..903da6824 100644 --- a/com/hbm/tileentity/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java b/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineElectricFurnace.java rename to com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java index 5b54ff1da..a2e72aaac 100644 --- a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineElectricFurnace; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/tileentity/TileEntityMachineFluidTank.java b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineFluidTank.java rename to com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index af31266d7..cbed3b551 100644 --- a/com/hbm/tileentity/TileEntityMachineFluidTank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineGasFlare.java b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineGasFlare.java rename to com/hbm/tileentity/machine/TileEntityMachineGasFlare.java index 0dd9f4b8d..fefde9a3d 100644 --- a/com/hbm/tileentity/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java similarity index 96% rename from com/hbm/tileentity/TileEntityMachineGenerator.java rename to com/hbm/tileentity/machine/TileEntityMachineGenerator.java index ee92af52c..ec262e87b 100644 --- a/com/hbm/tileentity/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineIGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineIGenerator.java rename to com/hbm/tileentity/machine/TileEntityMachineIGenerator.java index f5f957fb3..2362c58ae 100644 --- a/com/hbm/tileentity/TileEntityMachineIGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineMiningDrill.java b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineMiningDrill.java rename to com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java index 8fb1556d0..a105dd143 100644 --- a/com/hbm/tileentity/TileEntityMachineMiningDrill.java +++ b/com/hbm/tileentity/machine/TileEntityMachineMiningDrill.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.Random; diff --git a/com/hbm/tileentity/TileEntityMachineOilWell.java b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineOilWell.java rename to com/hbm/tileentity/machine/TileEntityMachineOilWell.java index 38864ef17..8093d1120 100644 --- a/com/hbm/tileentity/TileEntityMachineOilWell.java +++ b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachinePuF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java similarity index 94% rename from com/hbm/tileentity/TileEntityMachinePuF6Tank.java rename to com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java index 36ea148d7..8086d7592 100644 --- a/com/hbm/tileentity/TileEntityMachinePuF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidContainer; diff --git a/com/hbm/tileentity/TileEntityMachinePumpjack.java b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachinePumpjack.java rename to com/hbm/tileentity/machine/TileEntityMachinePumpjack.java index 7bc7cebae..79863ab68 100644 --- a/com/hbm/tileentity/TileEntityMachinePumpjack.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineRTG.java b/com/hbm/tileentity/machine/TileEntityMachineRTG.java similarity index 99% rename from com/hbm/tileentity/TileEntityMachineRTG.java rename to com/hbm/tileentity/machine/TileEntityMachineRTG.java index 515a1c0cc..09c3c646c 100644 --- a/com/hbm/tileentity/TileEntityMachineRTG.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRTG.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineReactor.java b/com/hbm/tileentity/machine/TileEntityMachineReactor.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineReactor.java rename to com/hbm/tileentity/machine/TileEntityMachineReactor.java index 0f6b27c67..c90ea26d1 100644 --- a/com/hbm/tileentity/TileEntityMachineReactor.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactor.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityMachineRefinery.java b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineRefinery.java rename to com/hbm/tileentity/machine/TileEntityMachineRefinery.java index ccae142d5..b59c6debd 100644 --- a/com/hbm/tileentity/TileEntityMachineRefinery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java b/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java rename to com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java index 4a3f277d8..be3213bd4 100644 --- a/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.Random; diff --git a/com/hbm/tileentity/TileEntityMachineShredder.java b/com/hbm/tileentity/machine/TileEntityMachineShredder.java similarity index 95% rename from com/hbm/tileentity/TileEntityMachineShredder.java rename to com/hbm/tileentity/machine/TileEntityMachineShredder.java index 37e4145c8..21685900e 100644 --- a/com/hbm/tileentity/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; import com.hbm.inventory.MachineRecipes; diff --git a/com/hbm/tileentity/TileEntityMachineTeleporter.java b/com/hbm/tileentity/machine/TileEntityMachineTeleporter.java similarity index 98% rename from com/hbm/tileentity/TileEntityMachineTeleporter.java rename to com/hbm/tileentity/machine/TileEntityMachineTeleporter.java index 8bf780eb9..d4e693bf7 100644 --- a/com/hbm/tileentity/TileEntityMachineTeleporter.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTeleporter.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.List; diff --git a/com/hbm/tileentity/TileEntityMachineTurbofan.java b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java similarity index 75% rename from com/hbm/tileentity/TileEntityMachineTurbofan.java rename to com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index 715e3a0e5..b04b2d900 100644 --- a/com/hbm/tileentity/TileEntityMachineTurbofan.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityMachineUF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java similarity index 94% rename from com/hbm/tileentity/TileEntityMachineUF6Tank.java rename to com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java index 6fc4aeced..baa2d5af9 100644 --- a/com/hbm/tileentity/TileEntityMachineUF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidContainer; diff --git a/com/hbm/tileentity/TileEntityNukeFurnace.java b/com/hbm/tileentity/machine/TileEntityNukeFurnace.java similarity index 95% rename from com/hbm/tileentity/TileEntityNukeFurnace.java rename to com/hbm/tileentity/machine/TileEntityNukeFurnace.java index 8d9f28c70..0cfb93195 100644 --- a/com/hbm/tileentity/TileEntityNukeFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityNukeFurnace.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.blocks.machine.MachineNukeFurnace; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java similarity index 97% rename from com/hbm/tileentity/TileEntityReactorMultiblock.java rename to com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index bf275f491..3aa55ebbe 100644 --- a/com/hbm/tileentity/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.HashSet; diff --git a/com/hbm/tileentity/TileEntityReiXMainframe.java b/com/hbm/tileentity/machine/TileEntityReiXMainframe.java similarity index 99% rename from com/hbm/tileentity/TileEntityReiXMainframe.java rename to com/hbm/tileentity/machine/TileEntityReiXMainframe.java index 399060c68..610dab55b 100644 --- a/com/hbm/tileentity/TileEntityReiXMainframe.java +++ b/com/hbm/tileentity/machine/TileEntityReiXMainframe.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; diff --git a/com/hbm/tileentity/TileEntityRtgFurnace.java b/com/hbm/tileentity/machine/TileEntityRtgFurnace.java similarity index 95% rename from com/hbm/tileentity/TileEntityRtgFurnace.java rename to com/hbm/tileentity/machine/TileEntityRtgFurnace.java index 0281339ea..aeca04c01 100644 --- a/com/hbm/tileentity/TileEntityRtgFurnace.java +++ b/com/hbm/tileentity/machine/TileEntityRtgFurnace.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; diff --git a/com/hbm/tileentity/TileEntityStructureMarker.java b/com/hbm/tileentity/machine/TileEntityStructureMarker.java similarity index 95% rename from com/hbm/tileentity/TileEntityStructureMarker.java rename to com/hbm/tileentity/machine/TileEntityStructureMarker.java index 1d90939a6..ce07b9bda 100644 --- a/com/hbm/tileentity/TileEntityStructureMarker.java +++ b/com/hbm/tileentity/machine/TileEntityStructureMarker.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEStructurePacket; diff --git a/com/hbm/tileentity/TileEntityWatzCore.java b/com/hbm/tileentity/machine/TileEntityWatzCore.java similarity index 96% rename from com/hbm/tileentity/TileEntityWatzCore.java rename to com/hbm/tileentity/machine/TileEntityWatzCore.java index c8bb7712e..fd43ab7cb 100644 --- a/com/hbm/tileentity/TileEntityWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity; +package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/world/DesertAtom003.java b/com/hbm/world/DesertAtom003.java index 821747c4d..cca6eddcf 100644 --- a/com/hbm/world/DesertAtom003.java +++ b/com/hbm/world/DesertAtom003.java @@ -7,8 +7,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.HbmChestContents; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachinePuF6Tank; -import com.hbm.tileentity.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; import net.minecraft.block.Block; import net.minecraft.init.Blocks;