From 924542911f4e670e583a4d33e8e5620378cc6fbb Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sat, 9 Sep 2017 19:17:34 +0200 Subject: [PATCH] New tile entity order, added alternate (original) sledge textures --- assets/hbm/lang/en_US.lang | 2 +- .../textures/items/shimmer_head_original.png | Bin 0 -> 262 bytes .../items/shimmer_sledge_hd_original.png | Bin 0 -> 442 bytes .../items/shimmer_sledge_original.png | Bin 0 -> 261 bytes com/hbm/blocks/bomb/BlockCrashedBomb.java | 2 +- com/hbm/blocks/bomb/BombMulti.java | 2 +- com/hbm/blocks/bomb/LaunchPad.java | 2 +- com/hbm/blocks/bomb/NukeBoy.java | 2 +- com/hbm/blocks/bomb/NukeCustom.java | 2 +- com/hbm/blocks/bomb/NukeFleija.java | 2 +- com/hbm/blocks/bomb/NukeGadget.java | 2 +- com/hbm/blocks/bomb/NukeMan.java | 2 +- com/hbm/blocks/bomb/NukeMike.java | 2 +- com/hbm/blocks/bomb/NukePrototype.java | 2 +- com/hbm/blocks/bomb/NukeTsar.java | 2 +- com/hbm/blocks/bomb/TurretFlamer.java | 4 +- com/hbm/blocks/bomb/TurretHeavy.java | 2 +- com/hbm/blocks/bomb/TurretLight.java | 4 +- com/hbm/blocks/bomb/TurretRocket.java | 4 +- com/hbm/blocks/bomb/TurretTau.java | 4 +- com/hbm/blocks/generic/BlockMarker.java | 2 +- com/hbm/blocks/generic/DecoBlock.java | 2 +- com/hbm/blocks/generic/DecoBlockAlt.java | 8 +- .../generic/DecoPoleSatelliteReceiver.java | 2 +- com/hbm/blocks/generic/DecoPoleTop.java | 2 +- com/hbm/blocks/generic/DecoSteelPoles.java | 2 +- com/hbm/blocks/generic/DecoTapeRecorder.java | 2 +- com/hbm/blocks/generic/RedBarrel.java | 2 +- com/hbm/blocks/generic/YellowBarrel.java | 2 +- com/hbm/blocks/machine/BlockCable.java | 3 +- .../blocks/machine/BlockConverterHeRf.java | 2 +- .../blocks/machine/BlockConverterRfHe.java | 2 +- com/hbm/blocks/machine/BlockFluidDuct.java | 3 +- com/hbm/blocks/machine/BlockGasDuct.java | 3 +- com/hbm/blocks/machine/BlockHatch.java | 2 +- com/hbm/blocks/machine/BlockOilDuct.java | 2 +- com/hbm/blocks/machine/BlockSeal.java | 3 +- .../blocks/machine/DummyBlockAssembler.java | 5 +- .../blocks/machine/DummyBlockCentrifuge.java | 5 +- .../blocks/machine/DummyBlockChemplant.java | 5 +- .../blocks/machine/DummyBlockCyclotron.java | 4 +- com/hbm/blocks/machine/DummyBlockDrill.java | 5 +- com/hbm/blocks/machine/DummyBlockFlare.java | 4 +- .../blocks/machine/DummyBlockFluidTank.java | 6 +- .../blocks/machine/DummyBlockIGenerator.java | 5 +- .../blocks/machine/DummyBlockPumpjack.java | 6 +- .../blocks/machine/DummyBlockRefinery.java | 6 +- .../blocks/machine/DummyBlockTurbofan.java | 6 +- com/hbm/blocks/machine/DummyBlockWell.java | 5 +- com/hbm/blocks/machine/FWatzCore.java | 3 +- com/hbm/blocks/machine/FWatzHatch.java | 3 +- .../blocks/machine/FactoryCoreAdvanced.java | 2 +- .../blocks/machine/FactoryCoreTitanium.java | 2 +- com/hbm/blocks/machine/FactoryHatch.java | 4 +- com/hbm/blocks/machine/FusionCore.java | 2 +- com/hbm/blocks/machine/FusionHatch.java | 2 +- com/hbm/blocks/machine/GasDuctSolid.java | 3 +- com/hbm/blocks/machine/MachineAssembler.java | 5 +- com/hbm/blocks/machine/MachineBattery.java | 4 +- com/hbm/blocks/machine/MachineCMBFactory.java | 3 +- com/hbm/blocks/machine/MachineCentrifuge.java | 2 +- com/hbm/blocks/machine/MachineChemplant.java | 5 +- com/hbm/blocks/machine/MachineCoal.java | 2 +- com/hbm/blocks/machine/MachineCyclotron.java | 5 +- com/hbm/blocks/machine/MachineDeuterium.java | 2 +- com/hbm/blocks/machine/MachineDiFurnace.java | 2 +- com/hbm/blocks/machine/MachineDiesel.java | 2 +- .../machine/MachineElectricFurnace.java | 2 +- com/hbm/blocks/machine/MachineFluidTank.java | 6 +- com/hbm/blocks/machine/MachineGasFlare.java | 5 +- com/hbm/blocks/machine/MachineGenerator.java | 2 +- com/hbm/blocks/machine/MachineIGenerator.java | 5 +- .../blocks/machine/MachineMiningDrill.java | 4 +- .../blocks/machine/MachineNukeFurnace.java | 2 +- com/hbm/blocks/machine/MachineOilWell.java | 4 +- com/hbm/blocks/machine/MachinePuF6Tank.java | 2 +- com/hbm/blocks/machine/MachinePumpjack.java | 6 +- com/hbm/blocks/machine/MachineRTG.java | 3 +- com/hbm/blocks/machine/MachineReactor.java | 2 +- com/hbm/blocks/machine/MachineRefinery.java | 4 +- .../blocks/machine/MachineReiXMainframe.java | 2 +- com/hbm/blocks/machine/MachineRtgFurnace.java | 2 +- .../MachineSchrabidiumTransmutator.java | 2 +- com/hbm/blocks/machine/MachineShredder.java | 2 +- com/hbm/blocks/machine/MachineTeleporter.java | 2 +- com/hbm/blocks/machine/MachineTurbofan.java | 6 +- com/hbm/blocks/machine/MachineUF6Tank.java | 2 +- com/hbm/blocks/machine/OilDuctSolid.java | 3 +- com/hbm/blocks/machine/PylonRedWire.java | 2 +- com/hbm/blocks/machine/ReactorCore.java | 2 +- com/hbm/blocks/machine/ReactorHatch.java | 2 +- com/hbm/blocks/machine/WatzCore.java | 2 +- com/hbm/blocks/machine/WatzHatch.java | 2 +- com/hbm/blocks/machine/WireCoated.java | 2 +- com/hbm/blocks/test/TestBombAdvanced.java | 2 +- com/hbm/blocks/test/TestContainer.java | 2 +- com/hbm/blocks/test/TestMissile.java | 2 +- com/hbm/blocks/test/TestNuke.java | 2 +- com/hbm/blocks/test/TestObjTester.java | 2 +- com/hbm/blocks/test/TestRender.java | 2 +- com/hbm/blocks/test/TestRotationTester.java | 2 +- com/hbm/explosion/ExplosionNukeGeneric.java | 2 +- com/hbm/handler/GUIHandler.java | 65 ++++++++ com/hbm/handler/MultiblockHandler.java | 2 +- .../container/ContainerBombMulti.java | 2 +- .../container/ContainerCentrifuge.java | 2 +- .../container/ContainerConverterHeRf.java | 3 +- .../container/ContainerConverterRfHe.java | 3 +- .../container/ContainerCoreAdvanced.java | 3 +- .../container/ContainerCoreTitanium.java | 3 +- .../container/ContainerDiFurnace.java | 2 +- .../container/ContainerElectricFurnace.java | 2 +- .../container/ContainerFWatzCore.java | 3 +- .../container/ContainerFusionMultiblock.java | 3 +- .../container/ContainerGenerator.java | 2 +- .../container/ContainerIGenerator.java | 3 +- .../container/ContainerLaunchPadTier1.java | 2 +- .../container/ContainerMachineAssembler.java | 3 +- .../container/ContainerMachineBattery.java | 2 +- .../container/ContainerMachineCMBFactory.java | 3 +- .../container/ContainerMachineChemplant.java | 4 +- .../container/ContainerMachineCoal.java | 2 +- .../container/ContainerMachineCyclotron.java | 3 +- .../container/ContainerMachineDeuterium.java | 2 +- .../container/ContainerMachineDiesel.java | 2 +- .../container/ContainerMachineFluidTank.java | 4 +- .../container/ContainerMachineGasFlare.java | 3 +- .../ContainerMachineMiningDrill.java | 17 +- .../container/ContainerMachineOilWell.java | 3 +- .../container/ContainerMachinePumpjack.java | 4 +- .../container/ContainerMachineRTG.java | 3 +- .../container/ContainerMachineRefinery.java | 2 +- ...ntainerMachineSchrabidiumTransmutator.java | 2 +- .../container/ContainerMachineShredder.java | 2 +- .../container/ContainerMachineTeleporter.java | 2 +- .../container/ContainerMachineTurbofan.java | 5 + .../inventory/container/ContainerNukeBoy.java | 2 +- .../container/ContainerNukeCustom.java | 2 +- .../container/ContainerNukeFleija.java | 2 +- .../container/ContainerNukeFurnace.java | 2 +- .../container/ContainerNukeGadget.java | 2 +- .../inventory/container/ContainerNukeMan.java | 2 +- .../container/ContainerNukeMike.java | 2 +- .../container/ContainerNukePrototype.java | 2 +- .../container/ContainerNukeTsar.java | 2 +- .../container/ContainerPuF6Tank.java | 2 +- .../inventory/container/ContainerReactor.java | 2 +- .../container/ContainerReactorMultiblock.java | 2 +- .../container/ContainerReiXMainframe.java | 2 +- .../container/ContainerRtgFurnace.java | 2 +- .../container/ContainerTestNuke.java | 2 +- .../inventory/container/ContainerUF6Tank.java | 2 +- .../container/ContainerWatzCore.java | 2 +- com/hbm/inventory/gui/GUIBombMulti.java | 2 +- com/hbm/inventory/gui/GUIConverterHeRf.java | 2 +- com/hbm/inventory/gui/GUIConverterRfHe.java | 2 +- com/hbm/inventory/gui/GUICoreAdvanced.java | 3 +- com/hbm/inventory/gui/GUICoreTitanium.java | 3 +- com/hbm/inventory/gui/GUIFWatzCore.java | 3 +- .../inventory/gui/GUIFusionMultiblock.java | 3 +- com/hbm/inventory/gui/GUIIGenerator.java | 3 +- com/hbm/inventory/gui/GUILaunchPadTier1.java | 2 +- .../inventory/gui/GUIMachineAssembler.java | 3 +- com/hbm/inventory/gui/GUIMachineBattery.java | 2 +- .../inventory/gui/GUIMachineCMBFactory.java | 3 +- .../inventory/gui/GUIMachineCentrifuge.java | 2 +- .../inventory/gui/GUIMachineChemplant.java | 4 +- com/hbm/inventory/gui/GUIMachineCoal.java | 2 +- .../inventory/gui/GUIMachineCyclotron.java | 3 +- .../inventory/gui/GUIMachineDeuterium.java | 2 +- com/hbm/inventory/gui/GUIMachineDiesel.java | 2 +- .../gui/GUIMachineElectricFurnace.java | 2 +- .../inventory/gui/GUIMachineFluidTank.java | 4 +- com/hbm/inventory/gui/GUIMachineGasFlare.java | 3 +- .../inventory/gui/GUIMachineGenerator.java | 2 +- .../inventory/gui/GUIMachineMiningDrill.java | 2 +- com/hbm/inventory/gui/GUIMachineOilWell.java | 3 +- com/hbm/inventory/gui/GUIMachinePuF6Tank.java | 2 +- com/hbm/inventory/gui/GUIMachinePumpjack.java | 4 +- com/hbm/inventory/gui/GUIMachineRTG.java | 3 +- com/hbm/inventory/gui/GUIMachineReactor.java | 2 +- com/hbm/inventory/gui/GUIMachineRefinery.java | 2 +- .../GUIMachineSchrabidiumTransmutator.java | 2 +- com/hbm/inventory/gui/GUIMachineShredder.java | 2 +- .../inventory/gui/GUIMachineTeleporter.java | 2 +- com/hbm/inventory/gui/GUIMachineTurbofan.java | 5 + com/hbm/inventory/gui/GUIMachineUF6Tank.java | 2 +- com/hbm/inventory/gui/GUINukeBoy.java | 2 +- com/hbm/inventory/gui/GUINukeCustom.java | 2 +- com/hbm/inventory/gui/GUINukeFleija.java | 2 +- com/hbm/inventory/gui/GUINukeFurnace.java | 2 +- com/hbm/inventory/gui/GUINukeGadget.java | 2 +- com/hbm/inventory/gui/GUINukeMan.java | 2 +- com/hbm/inventory/gui/GUINukeMike.java | 2 +- com/hbm/inventory/gui/GUINukePrototype.java | 2 +- com/hbm/inventory/gui/GUINukeTsar.java | 2 +- .../inventory/gui/GUIReactorMultiblock.java | 3 +- com/hbm/inventory/gui/GUIReiXMainframe.java | 2 +- com/hbm/inventory/gui/GUIRtgFurnace.java | 2 +- com/hbm/inventory/gui/GUITestDiFurnace.java | 2 +- com/hbm/inventory/gui/GUITestNuke.java | 2 +- com/hbm/inventory/gui/GUIWatzCore.java | 2 +- com/hbm/items/special/ItemTeleLink.java | 2 +- com/hbm/items/tool/ItemFluidIcon.java | 2 +- com/hbm/items/tool/ItemFluidIdentifier.java | 2 +- com/hbm/items/tool/ItemFluidTank.java | 2 +- com/hbm/items/tool/ItemTurretControl.java | 2 +- com/hbm/items/tool/ItemWandD.java | 2 +- com/hbm/items/tool/ItemWiring.java | 2 +- com/hbm/lib/Library.java | 22 +-- com/hbm/main/ClientProxy.java | 104 ++++++------ com/hbm/main/MainRegistry.java | 154 +++++++++--------- com/hbm/packet/ItemFolderPacket.java | 2 +- com/hbm/packet/LoopedSoundPacket.java | 7 +- com/hbm/packet/TEAssemblerPacket.java | 3 +- com/hbm/packet/TEChemplantPacket.java | 4 +- com/hbm/packet/TEDrillPacket.java | 3 +- com/hbm/packet/TEDrillSoundPacket.java | 3 +- com/hbm/packet/TEFluidPipePacket.java | 3 +- com/hbm/packet/TEIGeneratorPacket.java | 3 +- com/hbm/packet/TEMissilePacket.java | 3 +- com/hbm/packet/TEPumpjackPacket.java | 4 +- com/hbm/packet/TEPylonDestructorPacket.java | 2 +- com/hbm/packet/TEPylonSenderPacket.java | 2 +- com/hbm/packet/TEStructurePacket.java | 2 +- com/hbm/packet/TETurretPacket.java | 4 +- .../item/ItemRenderTestBombAdvanced.java | 2 +- .../render/item/ItemRenderTestContainer.java | 2 +- .../render/tileentity/RenderAssembler.java | 3 +- com/hbm/render/tileentity/RenderCable.java | 2 +- .../render/tileentity/RenderChemplant.java | 2 +- .../render/tileentity/RenderDecoBlockAlt.java | 6 +- .../render/tileentity/RenderFlamerTurret.java | 2 +- .../render/tileentity/RenderFluidDuct.java | 3 +- .../render/tileentity/RenderFluidTank.java | 4 +- com/hbm/render/tileentity/RenderGasDuct.java | 3 +- .../render/tileentity/RenderHeavyTurret.java | 4 +- .../render/tileentity/RenderIGenerator.java | 2 +- .../tileentity/RenderLaunchPadTier1.java | 2 +- .../render/tileentity/RenderLightTurret.java | 2 +- .../render/tileentity/RenderMiningDrill.java | 2 +- com/hbm/render/tileentity/RenderOilDuct.java | 2 +- com/hbm/render/tileentity/RenderPumpjack.java | 4 +- com/hbm/render/tileentity/RenderPylon.java | 2 +- .../render/tileentity/RenderRocketTurret.java | 2 +- .../tileentity/RenderStructureMaker.java | 2 +- .../render/tileentity/RenderTauTurret.java | 2 +- .../tileentity/RenderTestContainer.java | 2 +- com/hbm/render/tileentity/RenderTurbofan.java | 2 +- com/hbm/sound/SoundLoopAssembler.java | 4 +- com/hbm/sound/SoundLoopChemplant.java | 4 +- com/hbm/sound/SoundLoopMiner.java | 2 +- .../{ => bomb}/TileEntityBombMulti.java | 2 +- .../{ => bomb}/TileEntityCrashedBomb.java | 2 +- .../{ => bomb}/TileEntityLaunchPad.java | 2 +- .../{ => bomb}/TileEntityNukeBoy.java | 2 +- .../{ => bomb}/TileEntityNukeCustom.java | 2 +- .../{ => bomb}/TileEntityNukeFleija.java | 2 +- .../{ => bomb}/TileEntityNukeGadget.java | 2 +- .../{ => bomb}/TileEntityNukeMan.java | 2 +- .../{ => bomb}/TileEntityNukeMike.java | 2 +- .../{ => bomb}/TileEntityNukePrototype.java | 2 +- .../{ => bomb}/TileEntityNukeTsar.java | 2 +- .../{ => bomb}/TileEntityRedBarrel.java | 2 +- .../TileEntityTestBombAdvanced.java | 2 +- .../{ => bomb}/TileEntityTestNuke.java | 2 +- .../{ => bomb}/TileEntityTurretBase.java | 2 +- .../{ => bomb}/TileEntityTurretFlamer.java | 2 +- .../{ => bomb}/TileEntityTurretHeavy.java | 2 +- .../{ => bomb}/TileEntityTurretLight.java | 2 +- .../{ => bomb}/TileEntityTurretRocket.java | 2 +- .../{ => bomb}/TileEntityTurretTau.java | 2 +- .../{ => conductor}/TileEntityCable.java | 2 +- .../{ => conductor}/TileEntityFluidDuct.java | 2 +- .../{ => conductor}/TileEntityGasDuct.java | 2 +- .../TileEntityGasDuctSolid.java | 2 +- .../{ => conductor}/TileEntityOilDuct.java | 2 +- .../TileEntityOilDuctSolid.java | 2 +- .../TileEntityPylonRedWire.java | 2 +- .../{ => conductor}/TileEntityWireCoated.java | 2 +- .../{ => deco}/TileEntityDecoBlock.java | 2 +- .../{ => deco}/TileEntityDecoBlockAlt.java | 2 +- .../{ => deco}/TileEntityDecoBlockAltF.java | 2 +- .../{ => deco}/TileEntityDecoBlockAltG.java | 2 +- .../{ => deco}/TileEntityDecoBlockAltW.java | 2 +- .../TileEntityDecoPoleSatelliteReceiver.java | 2 +- .../{ => deco}/TileEntityDecoPoleTop.java | 2 +- .../{ => deco}/TileEntityDecoSteelPoles.java | 2 +- .../TileEntityDecoTapeRecorder.java | 2 +- .../{ => deco}/TileEntityObjTester.java | 2 +- .../{ => deco}/TileEntityRotationTester.java | 2 +- .../{ => deco}/TileEntityTestContainer.java | 2 +- .../{ => deco}/TileEntityTestRender.java | 2 +- .../{ => deco}/TileEntityYellowBarrel.java | 2 +- .../TileEntityConverterHeRf.java | 2 +- .../TileEntityConverterRfHe.java | 2 +- .../{ => machine}/TileEntityCoreAdvanced.java | 2 +- .../{ => machine}/TileEntityCoreTitanium.java | 2 +- .../{ => machine}/TileEntityDiFurnace.java | 2 +- .../{ => machine}/TileEntityDummy.java | 2 +- .../{ => machine}/TileEntityFWatzCore.java | 2 +- .../TileEntityFusionMultiblock.java | 2 +- .../{ => machine}/TileEntityHatch.java | 2 +- .../TileEntityMachineAssembler.java | 2 +- .../TileEntityMachineBattery.java | 2 +- .../TileEntityMachineCMBFactory.java | 2 +- .../TileEntityMachineCentrifuge.java | 2 +- .../TileEntityMachineChemplant.java | 2 +- .../{ => machine}/TileEntityMachineCoal.java | 2 +- .../TileEntityMachineCyclotron.java | 2 +- .../TileEntityMachineDeuterium.java | 2 +- .../TileEntityMachineDiesel.java | 2 +- .../TileEntityMachineElectricFurnace.java | 2 +- .../TileEntityMachineFluidTank.java | 2 +- .../TileEntityMachineGasFlare.java | 2 +- .../TileEntityMachineGenerator.java | 2 +- .../TileEntityMachineIGenerator.java | 2 +- .../TileEntityMachineMiningDrill.java | 2 +- .../TileEntityMachineOilWell.java | 2 +- .../TileEntityMachinePuF6Tank.java | 2 +- .../TileEntityMachinePumpjack.java | 2 +- .../{ => machine}/TileEntityMachineRTG.java | 2 +- .../TileEntityMachineReactor.java | 2 +- .../TileEntityMachineRefinery.java | 2 +- ...eEntityMachineSchrabidiumTransmutator.java | 2 +- .../TileEntityMachineShredder.java | 2 +- .../TileEntityMachineTeleporter.java | 2 +- .../TileEntityMachineTurbofan.java | 2 +- .../TileEntityMachineUF6Tank.java | 2 +- .../{ => machine}/TileEntityNukeFurnace.java | 2 +- .../TileEntityReactorMultiblock.java | 2 +- .../TileEntityReiXMainframe.java | 2 +- .../{ => machine}/TileEntityRtgFurnace.java | 2 +- .../TileEntityStructureMarker.java | 2 +- .../{ => machine}/TileEntityWatzCore.java | 2 +- com/hbm/world/DesertAtom003.java | 4 +- 336 files changed, 667 insertions(+), 529 deletions(-) create mode 100644 assets/hbm/textures/items/shimmer_head_original.png create mode 100644 assets/hbm/textures/items/shimmer_sledge_hd_original.png create mode 100644 assets/hbm/textures/items/shimmer_sledge_original.png create mode 100644 com/hbm/inventory/container/ContainerMachineTurbofan.java create mode 100644 com/hbm/inventory/gui/GUIMachineTurbofan.java rename com/hbm/tileentity/{ => bomb}/TileEntityBombMulti.java (94%) rename com/hbm/tileentity/{ => bomb}/TileEntityCrashedBomb.java (84%) rename com/hbm/tileentity/{ => bomb}/TileEntityLaunchPad.java (94%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukeBoy.java (94%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukeCustom.java (95%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukeFleija.java (95%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukeGadget.java (95%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukeMan.java (94%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukeMike.java (95%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukePrototype.java (95%) rename com/hbm/tileentity/{ => bomb}/TileEntityNukeTsar.java (95%) rename com/hbm/tileentity/{ => bomb}/TileEntityRedBarrel.java (85%) rename com/hbm/tileentity/{ => bomb}/TileEntityTestBombAdvanced.java (73%) rename com/hbm/tileentity/{ => bomb}/TileEntityTestNuke.java (95%) rename com/hbm/tileentity/{ => bomb}/TileEntityTurretBase.java (96%) rename com/hbm/tileentity/{ => bomb}/TileEntityTurretFlamer.java (85%) rename com/hbm/tileentity/{ => bomb}/TileEntityTurretHeavy.java (77%) rename com/hbm/tileentity/{ => bomb}/TileEntityTurretLight.java (77%) rename com/hbm/tileentity/{ => bomb}/TileEntityTurretRocket.java (77%) rename com/hbm/tileentity/{ => bomb}/TileEntityTurretTau.java (77%) rename com/hbm/tileentity/{ => conductor}/TileEntityCable.java (94%) rename com/hbm/tileentity/{ => conductor}/TileEntityFluidDuct.java (98%) rename com/hbm/tileentity/{ => conductor}/TileEntityGasDuct.java (98%) rename com/hbm/tileentity/{ => conductor}/TileEntityGasDuctSolid.java (93%) rename com/hbm/tileentity/{ => conductor}/TileEntityOilDuct.java (98%) rename com/hbm/tileentity/{ => conductor}/TileEntityOilDuctSolid.java (93%) rename com/hbm/tileentity/{ => conductor}/TileEntityPylonRedWire.java (99%) rename com/hbm/tileentity/{ => conductor}/TileEntityWireCoated.java (87%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoBlock.java (88%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoBlockAlt.java (88%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoBlockAltF.java (95%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoBlockAltG.java (88%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoBlockAltW.java (88%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoPoleSatelliteReceiver.java (86%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoPoleTop.java (85%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoSteelPoles.java (85%) rename com/hbm/tileentity/{ => deco}/TileEntityDecoTapeRecorder.java (90%) rename com/hbm/tileentity/{ => deco}/TileEntityObjTester.java (89%) rename com/hbm/tileentity/{ => deco}/TileEntityRotationTester.java (87%) rename com/hbm/tileentity/{ => deco}/TileEntityTestContainer.java (96%) rename com/hbm/tileentity/{ => deco}/TileEntityTestRender.java (72%) rename com/hbm/tileentity/{ => deco}/TileEntityYellowBarrel.java (96%) rename com/hbm/tileentity/{ => machine}/TileEntityConverterHeRf.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityConverterRfHe.java (94%) rename com/hbm/tileentity/{ => machine}/TileEntityCoreAdvanced.java (96%) rename com/hbm/tileentity/{ => machine}/TileEntityCoreTitanium.java (96%) rename com/hbm/tileentity/{ => machine}/TileEntityDiFurnace.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityDummy.java (96%) rename com/hbm/tileentity/{ => machine}/TileEntityFWatzCore.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityFusionMultiblock.java (98%) rename com/hbm/tileentity/{ => machine}/TileEntityHatch.java (97%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineAssembler.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineBattery.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineCMBFactory.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineCentrifuge.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineChemplant.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineCoal.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineCyclotron.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineDeuterium.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineDiesel.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineElectricFurnace.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineFluidTank.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineGasFlare.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineGenerator.java (96%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineIGenerator.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineMiningDrill.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineOilWell.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachinePuF6Tank.java (94%) rename com/hbm/tileentity/{ => machine}/TileEntityMachinePumpjack.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineRTG.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineReactor.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineRefinery.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineSchrabidiumTransmutator.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineShredder.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineTeleporter.java (98%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineTurbofan.java (75%) rename com/hbm/tileentity/{ => machine}/TileEntityMachineUF6Tank.java (94%) rename com/hbm/tileentity/{ => machine}/TileEntityNukeFurnace.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityReactorMultiblock.java (97%) rename com/hbm/tileentity/{ => machine}/TileEntityReiXMainframe.java (99%) rename com/hbm/tileentity/{ => machine}/TileEntityRtgFurnace.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityStructureMarker.java (95%) rename com/hbm/tileentity/{ => machine}/TileEntityWatzCore.java (96%) 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 0000000000000000000000000000000000000000..91a496383c1756b1fd7b3849dee1fd889d055f3c GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfX^s z6T`IB!pgAEr|(tFWn{QkS{fRv+ORE`-~P)DCyxH;-`~HnnNF(gQsB_I3-kzsr>mdK II;Vst0GV)S!Tx=Z^GihH0z zp%oJ@9ptC^YZASmamWL~3y6Mr?vjhbkRjc&SS->Y2-3FiA8BG>56Yg$am;eLZ2VrM zM>;}^~=fG<1t|v zmK^FZ*iV~)1ZRxF7;_jGaaWnj@AuyWs0ftT;?=7T+k8Hx0AFu^IZ*bP&1R)_s0tI* z&w5|R$LluNl8meFZFko~MVpkTm+c6)OeT{QU_PIhnv$q2{(96ga<$g&0?uJ=P;KHA z<_ZN4VJ=bN2<93E4qzH6xDcj=f(u}pC^!?Qje;|_BzcC?L_tTGpdO#^RZ-AkDg~9@ zgrg`@d!B3c!PiDX3s@g0Xn^&Ff)lVlQBVWx8wC}xTR=hKKIZ%WO`xEnG0*c-`MuW{ ksy3eIwf?(k$dHEo0}3xqHTpgL{u=+BZeuIb-`<^GdYTyHcSkHC)3(y3OXsYINbl<8f_4BdXN1( zv8G+?YDL?!XXbxD^VEjPz<1HA{n|bSQbz5UBN$A4Co|sK_BZaK?4EP(jqLw4J{