From 417969fe83c3a443696a3abb82922a69592a45a8 Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 8 Feb 2022 15:47:54 +0100 Subject: [PATCH] organized tile entities, upgrades for solidifier and liquefactor --- .../hbm/blocks/generic/BlockStorageCrate.java | 8 +++---- .../hbm/blocks/machine/BlockFluidBarrel.java | 2 +- .../blocks/machine/DummyBlockFluidTank.java | 2 +- .../hbm/blocks/machine/MachineBattery.java | 2 +- .../blocks/machine/MachineBigAssTank9000.java | 2 +- .../hbm/blocks/machine/MachineFluidTank.java | 2 +- .../blocks/machine/MachineLiquefactor.java | 2 +- .../com/hbm/blocks/machine/MachineOrbus.java | 2 +- .../hbm/blocks/machine/MachinePuF6Tank.java | 2 +- .../hbm/blocks/machine/MachineSolidifier.java | 2 +- .../hbm/blocks/machine/MachineUF6Tank.java | 2 +- .../com/hbm/blocks/machine/SoyuzCapsule.java | 2 +- .../entity/missile/EntitySoyuzCapsule.java | 2 +- src/main/java/com/hbm/handler/GUIHandler.java | 5 ++--- .../inventory/container/ContainerBarrel.java | 2 +- .../container/ContainerCrateIron.java | 3 ++- .../container/ContainerCrateSteel.java | 2 +- .../container/ContainerCrateTungsten.java | 2 +- .../container/ContainerLiquefactor.java | 2 +- .../container/ContainerMachineBattery.java | 2 +- .../container/ContainerMachineFluidTank.java | 2 +- .../container/ContainerPuF6Tank.java | 2 +- .../inventory/container/ContainerSafe.java | 2 +- .../container/ContainerSolidifier.java | 2 +- .../container/ContainerSoyuzCapsule.java | 2 +- .../inventory/container/ContainerUF6Tank.java | 2 +- .../java/com/hbm/inventory/gui/GUIBarrel.java | 2 +- .../com/hbm/inventory/gui/GUICrateIron.java | 3 ++- .../com/hbm/inventory/gui/GUICrateSteel.java | 2 +- .../hbm/inventory/gui/GUICrateTungsten.java | 2 +- .../com/hbm/inventory/gui/GUILiquefactor.java | 2 +- .../hbm/inventory/gui/GUIMachineBattery.java | 2 +- .../inventory/gui/GUIMachineFluidTank.java | 2 +- .../hbm/inventory/gui/GUIMachinePuF6Tank.java | 2 +- .../hbm/inventory/gui/GUIMachineUF6Tank.java | 2 +- .../java/com/hbm/inventory/gui/GUISafe.java | 2 +- .../com/hbm/inventory/gui/GUISolidifier.java | 2 +- .../hbm/inventory/gui/GUISoyuzCapsule.java | 2 +- src/main/java/com/hbm/lib/HbmWorldGen.java | 4 ++-- src/main/java/com/hbm/main/ClientProxy.java | 1 + .../java/com/hbm/packet/AuxButtonPacket.java | 4 ++-- .../hbm/render/tileentity/RenderBAT9000.java | 2 +- .../render/tileentity/RenderFluidBarrel.java | 2 +- .../render/tileentity/RenderFluidTank.java | 3 ++- .../render/tileentity/RenderLiquefactor.java | 2 +- .../hbm/render/tileentity/RenderOrbus.java | 2 +- .../render/tileentity/RenderSolidifier.java | 2 +- .../java/com/hbm/tileentity/TileMappings.java | 1 + .../machine/TileEntityMachineAssembler.java | 2 ++ .../machine/TileEntityMachineChemplant.java | 2 ++ .../machine/TileEntityMachineFENSU.java | 1 + .../TileEntityMachineLiquefactor.java | 21 ++++++++++++++++--- .../TileEntityMachineSolidifier.java | 21 ++++++++++++++++--- .../{ => storage}/TileEntityBarrel.java | 9 ++++---- .../{ => storage}/TileEntityCrateIron.java | 4 +++- .../{ => storage}/TileEntityCrateSteel.java | 4 +++- .../TileEntityCrateTungsten.java | 3 ++- .../TileEntityMachineBAT9000.java | 2 +- .../TileEntityMachineBattery.java | 2 +- .../TileEntityMachineFluidTank.java | 2 +- .../{ => storage}/TileEntityMachineOrbus.java | 2 +- .../TileEntityMachinePuF6Tank.java | 2 +- .../TileEntityMachineUF6Tank.java | 2 +- .../machine/{ => storage}/TileEntitySafe.java | 4 +++- .../{ => storage}/TileEntitySoyuzCapsule.java | 2 +- .../java/com/hbm/world/dungeon/Barrel.java | 2 +- .../com/hbm/world/dungeon/DesertAtom002.java | 2 +- .../com/hbm/world/dungeon/DesertAtom003.java | 4 ++-- .../java/com/hbm/world/dungeon/Radio01.java | 2 +- .../java/com/hbm/world/dungeon/Relay.java | 2 +- .../generator/room/TestDungeonRoom8.java | 2 +- 71 files changed, 127 insertions(+), 82 deletions(-) rename src/main/java/com/hbm/tileentity/machine/{ => oil}/TileEntityMachineLiquefactor.java (87%) rename src/main/java/com/hbm/tileentity/machine/{ => oil}/TileEntityMachineSolidifier.java (86%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityBarrel.java (95%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityCrateIron.java (97%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityCrateSteel.java (97%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityCrateTungsten.java (98%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityMachineBAT9000.java (97%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityMachineBattery.java (95%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityMachineFluidTank.java (99%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityMachineOrbus.java (97%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityMachinePuF6Tank.java (94%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntityMachineUF6Tank.java (94%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntitySafe.java (97%) rename src/main/java/com/hbm/tileentity/machine/{ => storage}/TileEntitySoyuzCapsule.java (92%) diff --git a/src/main/java/com/hbm/blocks/generic/BlockStorageCrate.java b/src/main/java/com/hbm/blocks/generic/BlockStorageCrate.java index d86689853..91c44cfd1 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockStorageCrate.java +++ b/src/main/java/com/hbm/blocks/generic/BlockStorageCrate.java @@ -7,11 +7,11 @@ import com.hbm.items.ModItems; import com.hbm.items.tool.ItemLock; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityCrateIron; -import com.hbm.tileentity.machine.TileEntityCrateSteel; -import com.hbm.tileentity.machine.TileEntityCrateTungsten; import com.hbm.tileentity.machine.TileEntityLockableBase; -import com.hbm.tileentity.machine.TileEntitySafe; +import com.hbm.tileentity.machine.storage.TileEntityCrateIron; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; +import com.hbm.tileentity.machine.storage.TileEntityCrateTungsten; +import com.hbm.tileentity.machine.storage.TileEntitySafe; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java b/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java index dd1d2511e..159b10303 100644 --- a/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java +++ b/src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java @@ -4,7 +4,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityBarrel; +import com.hbm.tileentity.machine.storage.TileEntityBarrel; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/src/main/java/com/hbm/blocks/machine/DummyBlockFluidTank.java b/src/main/java/com/hbm/blocks/machine/DummyBlockFluidTank.java index 38641b40d..cccb4b798 100644 --- a/src/main/java/com/hbm/blocks/machine/DummyBlockFluidTank.java +++ b/src/main/java/com/hbm/blocks/machine/DummyBlockFluidTank.java @@ -6,7 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.storage.TileEntityMachineFluidTank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/blocks/machine/MachineBattery.java b/src/main/java/com/hbm/blocks/machine/MachineBattery.java index 80fe0ec8c..fb4913d82 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineBattery.java +++ b/src/main/java/com/hbm/blocks/machine/MachineBattery.java @@ -6,7 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDiFurnace; -import com.hbm.tileentity.machine.TileEntityMachineBattery; +import com.hbm.tileentity.machine.storage.TileEntityMachineBattery; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java b/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java index a7c04e8f9..6f9d58b59 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java +++ b/src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java @@ -5,7 +5,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandlerXR; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; -import com.hbm.tileentity.machine.TileEntityMachineBAT9000; +import com.hbm.tileentity.machine.storage.TileEntityMachineBAT9000; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/blocks/machine/MachineFluidTank.java b/src/main/java/com/hbm/blocks/machine/MachineFluidTank.java index d5ded328d..6de4dd1a6 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFluidTank.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFluidTank.java @@ -7,7 +7,7 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.machine.TileEntityDummy; -import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.storage.TileEntityMachineFluidTank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/blocks/machine/MachineLiquefactor.java b/src/main/java/com/hbm/blocks/machine/MachineLiquefactor.java index d63e89512..729f06640 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineLiquefactor.java +++ b/src/main/java/com/hbm/blocks/machine/MachineLiquefactor.java @@ -8,7 +8,7 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ITooltipProvider; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; -import com.hbm.tileentity.machine.TileEntityMachineLiquefactor; +import com.hbm.tileentity.machine.oil.TileEntityMachineLiquefactor; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/blocks/machine/MachineOrbus.java b/src/main/java/com/hbm/blocks/machine/MachineOrbus.java index 60b36984b..5bf08f383 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineOrbus.java +++ b/src/main/java/com/hbm/blocks/machine/MachineOrbus.java @@ -4,7 +4,7 @@ import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityProxyCombo; -import com.hbm.tileentity.machine.TileEntityMachineOrbus; +import com.hbm.tileentity.machine.storage.TileEntityMachineOrbus; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java b/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java index dadea4072..280ce1519 100644 --- a/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java +++ b/src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.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.machine.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/blocks/machine/MachineSolidifier.java b/src/main/java/com/hbm/blocks/machine/MachineSolidifier.java index 4c3638218..96d426511 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineSolidifier.java +++ b/src/main/java/com/hbm/blocks/machine/MachineSolidifier.java @@ -7,7 +7,7 @@ import org.lwjgl.input.Keyboard; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ITooltipProvider; import com.hbm.tileentity.TileEntityProxyCombo; -import com.hbm.tileentity.machine.TileEntityMachineSolidifier; +import com.hbm.tileentity.machine.oil.TileEntityMachineSolidifier; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java b/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java index 5249c08b2..e0a5df63c 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java +++ b/src/main/java/com/hbm/blocks/machine/MachineUF6Tank.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.machine.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java b/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java index 915cabafa..aab456164 100644 --- a/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java +++ b/src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java @@ -4,7 +4,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntitySoyuzCapsule; +import com.hbm.tileentity.machine.storage.TileEntitySoyuzCapsule; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/entity/missile/EntitySoyuzCapsule.java b/src/main/java/com/hbm/entity/missile/EntitySoyuzCapsule.java index f0321c8ea..9dd767f66 100644 --- a/src/main/java/com/hbm/entity/missile/EntitySoyuzCapsule.java +++ b/src/main/java/com/hbm/entity/missile/EntitySoyuzCapsule.java @@ -2,7 +2,7 @@ package com.hbm.entity.missile; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; -import com.hbm.tileentity.machine.TileEntitySoyuzCapsule; +import com.hbm.tileentity.machine.storage.TileEntitySoyuzCapsule; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/hbm/handler/GUIHandler.java b/src/main/java/com/hbm/handler/GUIHandler.java index 222974e54..6a17678b6 100644 --- a/src/main/java/com/hbm/handler/GUIHandler.java +++ b/src/main/java/com/hbm/handler/GUIHandler.java @@ -10,10 +10,9 @@ import com.hbm.inventory.inv.InventoryLeadBox; import com.hbm.items.ModItems; import com.hbm.tileentity.bomb.*; import com.hbm.tileentity.machine.*; -import com.hbm.tileentity.machine.oil.TileEntityMachineGasFlare; -import com.hbm.tileentity.machine.oil.TileEntityMachineRefinery; -import com.hbm.tileentity.machine.oil.TileEntityOilDrillBase; +import com.hbm.tileentity.machine.oil.*; import com.hbm.tileentity.machine.rbmk.*; +import com.hbm.tileentity.machine.storage.*; import com.hbm.tileentity.turret.*; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerBarrel.java b/src/main/java/com/hbm/inventory/container/ContainerBarrel.java index bb49b6000..1c4ae8e44 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerBarrel.java +++ b/src/main/java/com/hbm/inventory/container/ContainerBarrel.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityBarrel; +import com.hbm.tileentity.machine.storage.TileEntityBarrel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java b/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java index 9a479d8ca..7f6a92d8a 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateIron.java @@ -1,6 +1,7 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityCrateIron; +import com.hbm.tileentity.machine.storage.TileEntityCrateIron; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java b/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java index 9090c4224..ceb673ac1 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityCrateSteel; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java b/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java index 1bda75cc7..7103e95e7 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java +++ b/src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityCrateTungsten; +import com.hbm.tileentity.machine.storage.TileEntityCrateTungsten; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerLiquefactor.java b/src/main/java/com/hbm/inventory/container/ContainerLiquefactor.java index e12ffd7c1..3cf745bcd 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerLiquefactor.java +++ b/src/main/java/com/hbm/inventory/container/ContainerLiquefactor.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotUpgrade; -import com.hbm.tileentity.machine.TileEntityMachineLiquefactor; +import com.hbm.tileentity.machine.oil.TileEntityMachineLiquefactor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineBattery.java b/src/main/java/com/hbm/inventory/container/ContainerMachineBattery.java index 8a6821224..f6317f10e 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineBattery.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineBattery.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityMachineBattery; +import com.hbm.tileentity.machine.storage.TileEntityMachineBattery; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineFluidTank.java b/src/main/java/com/hbm/inventory/container/ContainerMachineFluidTank.java index aec60d831..ca77a0c70 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineFluidTank.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineFluidTank.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.storage.TileEntityMachineFluidTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerPuF6Tank.java b/src/main/java/com/hbm/inventory/container/ContainerPuF6Tank.java index 2ea145880..9f94a4e90 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerPuF6Tank.java +++ b/src/main/java/com/hbm/inventory/container/ContainerPuF6Tank.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerSafe.java b/src/main/java/com/hbm/inventory/container/ContainerSafe.java index bb2593461..3957b899e 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerSafe.java +++ b/src/main/java/com/hbm/inventory/container/ContainerSafe.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntitySafe; +import com.hbm.tileentity.machine.storage.TileEntitySafe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerSolidifier.java b/src/main/java/com/hbm/inventory/container/ContainerSolidifier.java index b16c27f2d..cfac4a148 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerSolidifier.java +++ b/src/main/java/com/hbm/inventory/container/ContainerSolidifier.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotUpgrade; -import com.hbm.tileentity.machine.TileEntityMachineSolidifier; +import com.hbm.tileentity.machine.oil.TileEntityMachineSolidifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerSoyuzCapsule.java b/src/main/java/com/hbm/inventory/container/ContainerSoyuzCapsule.java index 60e689f7c..390391847 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerSoyuzCapsule.java +++ b/src/main/java/com/hbm/inventory/container/ContainerSoyuzCapsule.java @@ -1,6 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.machine.TileEntitySoyuzCapsule; +import com.hbm.tileentity.machine.storage.TileEntitySoyuzCapsule; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/container/ContainerUF6Tank.java b/src/main/java/com/hbm/inventory/container/ContainerUF6Tank.java index 73c5d6594..9199bf973 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerUF6Tank.java +++ b/src/main/java/com/hbm/inventory/container/ContainerUF6Tank.java @@ -1,7 +1,7 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/hbm/inventory/gui/GUIBarrel.java b/src/main/java/com/hbm/inventory/gui/GUIBarrel.java index 5342faf13..e197a1d3b 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIBarrel.java +++ b/src/main/java/com/hbm/inventory/gui/GUIBarrel.java @@ -7,7 +7,7 @@ import com.hbm.inventory.container.ContainerBarrel; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.machine.TileEntityBarrel; +import com.hbm.tileentity.machine.storage.TileEntityBarrel; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateIron.java b/src/main/java/com/hbm/inventory/gui/GUICrateIron.java index d134c782a..83ae322de 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateIron.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateIron.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCrateIron; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityCrateIron; +import com.hbm.tileentity.machine.storage.TileEntityCrateIron; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java b/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java index f5ec9d945..2deaef207 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateSteel.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCrateSteel; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityCrateSteel; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java b/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java index 40fb78469..7da006832 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCrateTungsten; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityCrateTungsten; +import com.hbm.tileentity.machine.storage.TileEntityCrateTungsten; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java b/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java index 0053d6866..102e5ac01 100644 --- a/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java +++ b/src/main/java/com/hbm/inventory/gui/GUILiquefactor.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerLiquefactor; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineLiquefactor; +import com.hbm.tileentity.machine.oil.TileEntityMachineLiquefactor; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineBattery.java b/src/main/java/com/hbm/inventory/gui/GUIMachineBattery.java index a79480997..9c28e2c69 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineBattery.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineBattery.java @@ -13,7 +13,7 @@ import com.hbm.inventory.container.ContainerMachineBattery; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.machine.TileEntityMachineBattery; +import com.hbm.tileentity.machine.storage.TileEntityMachineBattery; import com.hbm.util.BobMathUtil; public class GUIMachineBattery extends GuiInfoContainer { diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java b/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java index 03a4fff72..5563d0a20 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -7,7 +7,7 @@ import com.hbm.inventory.container.ContainerMachineFluidTank; import com.hbm.lib.RefStrings; import com.hbm.packet.AuxButtonPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.storage.TileEntityMachineFluidTank; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java b/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java index 0bfd234c9..e2831808a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java +++ b/src/main/java/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.machine.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java b/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java index d6d587474..f9bffb001 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java +++ b/src/main/java/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.machine.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/hbm/inventory/gui/GUISafe.java b/src/main/java/com/hbm/inventory/gui/GUISafe.java index e5a40b72f..a7c6d0e8d 100644 --- a/src/main/java/com/hbm/inventory/gui/GUISafe.java +++ b/src/main/java/com/hbm/inventory/gui/GUISafe.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerSafe; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntitySafe; +import com.hbm.tileentity.machine.storage.TileEntitySafe; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/com/hbm/inventory/gui/GUISolidifier.java b/src/main/java/com/hbm/inventory/gui/GUISolidifier.java index cd70af185..ab193ae90 100644 --- a/src/main/java/com/hbm/inventory/gui/GUISolidifier.java +++ b/src/main/java/com/hbm/inventory/gui/GUISolidifier.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.FluidTank; import com.hbm.inventory.container.ContainerSolidifier; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntityMachineSolidifier; +import com.hbm.tileentity.machine.oil.TileEntityMachineSolidifier; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/hbm/inventory/gui/GUISoyuzCapsule.java b/src/main/java/com/hbm/inventory/gui/GUISoyuzCapsule.java index e880738c4..055aeabd5 100644 --- a/src/main/java/com/hbm/inventory/gui/GUISoyuzCapsule.java +++ b/src/main/java/com/hbm/inventory/gui/GUISoyuzCapsule.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerSoyuzCapsule; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.machine.TileEntitySoyuzCapsule; +import com.hbm.tileentity.machine.storage.TileEntitySoyuzCapsule; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index 88ddb03cf..2662fea0a 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -7,8 +7,8 @@ import com.hbm.config.GeneralConfig; import com.hbm.config.WorldConfig; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntitySafe; -import com.hbm.tileentity.machine.TileEntitySoyuzCapsule; +import com.hbm.tileentity.machine.storage.TileEntitySafe; +import com.hbm.tileentity.machine.storage.TileEntitySoyuzCapsule; import com.hbm.world.dungeon.AncientTomb; import com.hbm.world.dungeon.Antenna; import com.hbm.world.dungeon.ArcticVault; diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index ad5af54f7..4a14f4409 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -79,6 +79,7 @@ import com.hbm.tileentity.deco.*; import com.hbm.tileentity.machine.*; import com.hbm.tileentity.machine.oil.*; import com.hbm.tileentity.machine.rbmk.*; +import com.hbm.tileentity.machine.storage.*; import com.hbm.tileentity.network.*; import com.hbm.tileentity.turret.*; diff --git a/src/main/java/com/hbm/packet/AuxButtonPacket.java b/src/main/java/com/hbm/packet/AuxButtonPacket.java index 98d56995e..a0bdc91fe 100644 --- a/src/main/java/com/hbm/packet/AuxButtonPacket.java +++ b/src/main/java/com/hbm/packet/AuxButtonPacket.java @@ -8,17 +8,17 @@ import com.hbm.items.weapon.ItemMissile.PartSize; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.tileentity.TileEntityTickingBase; import com.hbm.tileentity.bomb.TileEntityLaunchTable; -import com.hbm.tileentity.machine.TileEntityBarrel; import com.hbm.tileentity.machine.TileEntityCoreEmitter; import com.hbm.tileentity.machine.TileEntityCoreStabilizer; import com.hbm.tileentity.machine.TileEntityForceField; -import com.hbm.tileentity.machine.TileEntityMachineBattery; import com.hbm.tileentity.machine.TileEntityMachineMiningLaser; import com.hbm.tileentity.machine.TileEntityMachineMissileAssembly; import com.hbm.tileentity.machine.TileEntityMachineReactorLarge; import com.hbm.tileentity.machine.TileEntityRadioRec; import com.hbm.tileentity.machine.TileEntityReactorZirnox; import com.hbm.tileentity.machine.TileEntitySoyuzLauncher; +import com.hbm.tileentity.machine.storage.TileEntityBarrel; +import com.hbm.tileentity.machine.storage.TileEntityMachineBattery; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java b/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java index fcc4d174e..7ce43646c 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java +++ b/src/main/java/com/hbm/render/tileentity/RenderBAT9000.java @@ -7,7 +7,7 @@ import com.hbm.inventory.fluid.Fluids; import com.hbm.main.ResourceManager; import com.hbm.render.util.DiamondPronter; import com.hbm.render.util.EnumSymbol; -import com.hbm.tileentity.machine.TileEntityMachineBAT9000; +import com.hbm.tileentity.machine.storage.TileEntityMachineBAT9000; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java index 7b788108e..4eb711e4f 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java +++ b/src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java @@ -6,7 +6,7 @@ import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.render.util.DiamondPronter; import com.hbm.render.util.EnumSymbol; -import com.hbm.tileentity.machine.TileEntityBarrel; +import com.hbm.tileentity.machine.storage.TileEntityBarrel; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/src/main/java/com/hbm/render/tileentity/RenderFluidTank.java b/src/main/java/com/hbm/render/tileentity/RenderFluidTank.java index 4a23a3ddb..165729f45 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderFluidTank.java +++ b/src/main/java/com/hbm/render/tileentity/RenderFluidTank.java @@ -4,7 +4,8 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.storage.TileEntityMachineFluidTank; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/hbm/render/tileentity/RenderLiquefactor.java b/src/main/java/com/hbm/render/tileentity/RenderLiquefactor.java index c7e4d8185..76b2c8632 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderLiquefactor.java +++ b/src/main/java/com/hbm/render/tileentity/RenderLiquefactor.java @@ -3,7 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineLiquefactor; +import com.hbm.tileentity.machine.oil.TileEntityMachineLiquefactor; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/src/main/java/com/hbm/render/tileentity/RenderOrbus.java b/src/main/java/com/hbm/render/tileentity/RenderOrbus.java index cf951b07d..92b23a7cc 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderOrbus.java +++ b/src/main/java/com/hbm/render/tileentity/RenderOrbus.java @@ -7,7 +7,7 @@ import com.hbm.main.ResourceManager; import com.hbm.render.util.BeamPronter; import com.hbm.render.util.BeamPronter.EnumBeamType; import com.hbm.render.util.BeamPronter.EnumWaveType; -import com.hbm.tileentity.machine.TileEntityMachineOrbus; +import com.hbm.tileentity.machine.storage.TileEntityMachineOrbus; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/hbm/render/tileentity/RenderSolidifier.java b/src/main/java/com/hbm/render/tileentity/RenderSolidifier.java index bad93f910..8be0f6af6 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderSolidifier.java +++ b/src/main/java/com/hbm/render/tileentity/RenderSolidifier.java @@ -4,7 +4,7 @@ import org.lwjgl.opengl.GL11; import com.hbm.blocks.BlockDummyable; import com.hbm.main.ResourceManager; -import com.hbm.tileentity.machine.TileEntityMachineSolidifier; +import com.hbm.tileentity.machine.oil.TileEntityMachineSolidifier; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 48c578b18..5a1a76d81 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -11,6 +11,7 @@ import com.hbm.tileentity.machine.*; import com.hbm.tileentity.machine.oil.*; import com.hbm.tileentity.machine.pile.*; import com.hbm.tileentity.machine.rbmk.*; +import com.hbm.tileentity.machine.storage.*; import com.hbm.tileentity.network.*; import com.hbm.tileentity.turret.*; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java index 1f547a8d1..8bd372ce6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java @@ -19,6 +19,8 @@ import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEAssemblerPacket; import com.hbm.sound.AudioWrapper; import com.hbm.tileentity.TileEntityMachineBase; +import com.hbm.tileentity.machine.storage.TileEntityCrateIron; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; import api.hbm.energy.IBatteryItem; import api.hbm.energy.IEnergyUser; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 30ad77711..71e3e5bd6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -23,6 +23,8 @@ import com.hbm.packet.AuxParticlePacket; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEChemplantPacket; +import com.hbm.tileentity.machine.storage.TileEntityCrateIron; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; import com.hbm.util.ItemStackUtil; import api.hbm.energy.IBatteryItem; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java index 265f6253d..7126d6310 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java @@ -1,6 +1,7 @@ package com.hbm.tileentity.machine; import com.hbm.lib.Library; +import com.hbm.tileentity.machine.storage.TileEntityMachineBattery; import api.hbm.energy.IEnergyConductor; import api.hbm.energy.IEnergyConnector; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java similarity index 87% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java rename to src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java index d0fcf7dcf..9f7de17bc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.oil; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,11 @@ import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.FluidStack; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.UpgradeManager; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.LiquefactionRecipes; +import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; @@ -24,9 +26,11 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen public long power; public static final long maxPower = 100000; - public static final int usage = 500; + public static final int usageBase = 500; + public int usage; public int progress; - public static final int processTime = 200; + public static final int processTimeBase = 200; + public int processTime; public FluidTank tank; @@ -53,6 +57,13 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen this.trySubscribe(worldObj, xCoord - 2, yCoord + 1, zCoord, Library.NEG_X); this.trySubscribe(worldObj, xCoord, yCoord + 1, zCoord + 2, Library.POS_Z); this.trySubscribe(worldObj, xCoord, yCoord + 1, zCoord - 2, Library.NEG_Z); + + UpgradeManager.eval(slots, 2, 3); + int speed = Math.min(UpgradeManager.getLevel(UpgradeType.SPEED), 3); + int power = Math.min(UpgradeManager.getLevel(UpgradeType.POWER), 3); + + this.processTime = processTimeBase - (processTimeBase / 4) * speed; + this.usage = usageBase - (usageBase / 4) * speed; if(this.canProcess()) this.process(); @@ -66,6 +77,8 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen NBTTagCompound data = new NBTTagCompound(); data.setLong("power", this.power); data.setInteger("progress", this.progress); + data.setInteger("usage", this.usage); + data.setInteger("processTime", this.processTime); this.networkPack(data, 50); } } @@ -125,6 +138,8 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen public void networkUnpack(NBTTagCompound nbt) { this.power = nbt.getLong("power"); this.progress = nbt.getInteger("progress"); + this.usage = nbt.getInteger("usage"); + this.processTime = nbt.getInteger("processTime"); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolidifier.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java similarity index 86% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolidifier.java rename to src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java index a68f0b169..ab7493b2c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolidifier.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java @@ -1,13 +1,15 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.oil; import java.util.ArrayList; import java.util.List; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.inventory.FluidTank; +import com.hbm.inventory.UpgradeManager; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.SolidificationRecipes; +import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType; import com.hbm.lib.Library; import com.hbm.tileentity.TileEntityMachineBase; import com.hbm.util.Tuple.Pair; @@ -23,9 +25,11 @@ public class TileEntityMachineSolidifier extends TileEntityMachineBase implement public long power; public static final long maxPower = 100000; - public static final int usage = 500; + public static final int usageBase = 500; + public int usage; public int progress; - public static final int processTime = 200; + public static final int processTimeBase = 200; + public int processTime; public FluidTank tank; @@ -53,6 +57,13 @@ public class TileEntityMachineSolidifier extends TileEntityMachineBase implement this.trySubscribe(worldObj, xCoord - 2, yCoord + 1, zCoord, Library.NEG_X); this.trySubscribe(worldObj, xCoord, yCoord + 1, zCoord + 2, Library.POS_Z); this.trySubscribe(worldObj, xCoord, yCoord + 1, zCoord - 2, Library.NEG_Z); + + UpgradeManager.eval(slots, 2, 3); + int speed = Math.min(UpgradeManager.getLevel(UpgradeType.SPEED), 3); + int power = Math.min(UpgradeManager.getLevel(UpgradeType.POWER), 3); + + this.processTime = processTimeBase - (processTimeBase / 4) * speed; + this.usage = usageBase - (usageBase / 4) * speed; if(this.canProcess()) this.process(); @@ -62,6 +73,8 @@ public class TileEntityMachineSolidifier extends TileEntityMachineBase implement NBTTagCompound data = new NBTTagCompound(); data.setLong("power", this.power); data.setInteger("progress", this.progress); + data.setInteger("usage", this.usage); + data.setInteger("processTime", this.processTime); this.networkPack(data, 50); } } @@ -136,6 +149,8 @@ public class TileEntityMachineSolidifier extends TileEntityMachineBase implement public void networkUnpack(NBTTagCompound nbt) { this.power = nbt.getLong("power"); this.progress = nbt.getInteger("progress"); + this.usage = nbt.getInteger("usage"); + this.processTime = nbt.getInteger("processTime"); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java similarity index 95% rename from src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java index 3ac9a6832..4555402bd 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import java.util.ArrayList; import java.util.List; @@ -137,7 +137,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc if(mode == 2 || mode == 3) return 0; - return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; + return type == this.tank.getTankType() ? tank.getMaxFill() : 0; } @Override @@ -167,13 +167,12 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc @Override public int getFluidFill(FluidType type) { - return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; + return type == this.tank.getTankType() ? tank.getFill() : 0; } @Override public void setFluidFill(int i, FluidType type) { - if(type.name().equals(tank.getTankType().name())) - tank.setFill(i); + if(type == tank.getTankType()) tank.setFill(i); } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCrateIron.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java similarity index 97% rename from src/main/java/com/hbm/tileentity/machine/TileEntityCrateIron.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java index 96ca9f4a3..29298a441 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCrateIron.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java @@ -1,4 +1,6 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; + +import com.hbm.tileentity.machine.TileEntityLockableBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCrateSteel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java similarity index 97% rename from src/main/java/com/hbm/tileentity/machine/TileEntityCrateSteel.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java index 68aea3e3a..135e74e32 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCrateSteel.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java @@ -1,4 +1,6 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; + +import com.hbm.tileentity.machine.TileEntityLockableBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCrateTungsten.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java similarity index 98% rename from src/main/java/com/hbm/tileentity/machine/TileEntityCrateTungsten.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java index 770c1111e..1a509aff3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCrateTungsten.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java @@ -1,6 +1,7 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import com.hbm.items.ModItems; +import com.hbm.tileentity.machine.TileEntityLockableBase; import api.hbm.block.ILaserable; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBAT9000.java similarity index 97% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBAT9000.java index 3aa65b08d..411a42a3f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBAT9000.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import com.hbm.inventory.fluid.FluidType; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java similarity index 95% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java index b0258f0b2..af29de991 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import com.hbm.blocks.machine.MachineBattery; import com.hbm.lib.Library; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java similarity index 99% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java index 29fc72037..e1bec2abf 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineOrbus.java similarity index 97% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineOrbus.java index 28cb51c2e..64e5bf878 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineOrbus.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import com.hbm.blocks.BlockDummyable; import com.hbm.inventory.fluid.FluidType; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java similarity index 94% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java index 144dca889..54af5b7b5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java similarity index 94% rename from src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java index 9b5bc0799..9cfb79a9c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySafe.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java similarity index 97% rename from src/main/java/com/hbm/tileentity/machine/TileEntitySafe.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java index 63543b039..a2664bcfc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySafe.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java @@ -1,4 +1,6 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; + +import com.hbm.tileentity.machine.TileEntityLockableBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java similarity index 92% rename from src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java rename to src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java index 101e4b0ea..6eea311be 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java @@ -1,4 +1,4 @@ -package com.hbm.tileentity.machine; +package com.hbm.tileentity.machine.storage; import com.hbm.tileentity.TileEntityInventoryBase; diff --git a/src/main/java/com/hbm/world/dungeon/Barrel.java b/src/main/java/com/hbm/world/dungeon/Barrel.java index d83add726..59d3c49c1 100644 --- a/src/main/java/com/hbm/world/dungeon/Barrel.java +++ b/src/main/java/com/hbm/world/dungeon/Barrel.java @@ -10,7 +10,7 @@ import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import com.hbm.tileentity.bomb.TileEntitySellafield; -import com.hbm.tileentity.machine.TileEntityCrateSteel; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom002.java b/src/main/java/com/hbm/world/dungeon/DesertAtom002.java index d44a9363a..6f668f55d 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom002.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom002.java @@ -7,7 +7,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; -import com.hbm.tileentity.machine.TileEntityCrateSteel; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java index 9d50cf43d..c648ba0c7 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java @@ -9,8 +9,8 @@ import com.hbm.config.GeneralConfig; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityMachinePuF6Tank; -import com.hbm.tileentity.machine.TileEntityMachineUF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.machine.storage.TileEntityMachineUF6Tank; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/hbm/world/dungeon/Radio01.java b/src/main/java/com/hbm/world/dungeon/Radio01.java index b6bb38130..7aea2227e 100644 --- a/src/main/java/com/hbm/world/dungeon/Radio01.java +++ b/src/main/java/com/hbm/world/dungeon/Radio01.java @@ -7,7 +7,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; -import com.hbm.tileentity.machine.TileEntityCrateSteel; +import com.hbm.tileentity.machine.storage.TileEntityCrateSteel; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/world/dungeon/Relay.java b/src/main/java/com/hbm/world/dungeon/Relay.java index 8aef28321..996713360 100644 --- a/src/main/java/com/hbm/world/dungeon/Relay.java +++ b/src/main/java/com/hbm/world/dungeon/Relay.java @@ -13,7 +13,7 @@ import com.hbm.items.ModItems; import com.hbm.lib.HbmChestContents; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.machine.TileEntityCrateIron; +import com.hbm.tileentity.machine.storage.TileEntityCrateIron; import com.hbm.util.LootGenerator; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java b/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java index c2f3607a8..1754d377b 100644 --- a/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java +++ b/src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java @@ -3,7 +3,7 @@ package com.hbm.world.generator.room; import com.hbm.blocks.ModBlocks; import com.hbm.crafting.handlers.MKUCraftingHandler; import com.hbm.items.ModItems; -import com.hbm.tileentity.machine.TileEntitySafe; +import com.hbm.tileentity.machine.storage.TileEntitySafe; import com.hbm.world.generator.CellularDungeon; import com.hbm.world.generator.CellularDungeonRoom; import com.hbm.world.generator.DungeonToolbox;