xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

organized tile entities, upgrades for solidifier and liquefactor

Browse Source
This commit is contained in:
Boblet 2022-02-08 15:47:54 +01:00
parent edb78440ca
commit 417969fe83
71 changed files with 127 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/hbm/blocks/generic/BlockStorageCrate.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/BlockFluidBarrel.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/DummyBlockFluidTank.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachineBattery.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachineBigAssTank9000.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachineFluidTank.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachineLiquefactor.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachineOrbus.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachinePuF6Tank.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachineSolidifier.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/MachineUF6Tank.java
View File

@ -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;

2
src/main/java/com/hbm/blocks/machine/SoyuzCapsule.java
View File

@ -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;

2
src/main/java/com/hbm/entity/missile/EntitySoyuzCapsule.java
View File

@ -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;

5
src/main/java/com/hbm/handler/GUIHandler.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerBarrel.java
View File

@ -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;

3
src/main/java/com/hbm/inventory/container/ContainerCrateIron.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerCrateSteel.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerCrateTungsten.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerLiquefactor.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerMachineBattery.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerMachineFluidTank.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerPuF6Tank.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerSafe.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerSolidifier.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerSoyuzCapsule.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/container/ContainerUF6Tank.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUIBarrel.java
View File

@ -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;

3
src/main/java/com/hbm/inventory/gui/GUICrateIron.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUICrateSteel.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUICrateTungsten.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUILiquefactor.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUIMachineBattery.java
View File

@ -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 {

2
src/main/java/com/hbm/inventory/gui/GUIMachineFluidTank.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUIMachinePuF6Tank.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUIMachineUF6Tank.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUISafe.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUISolidifier.java
View File

@ -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;

2
src/main/java/com/hbm/inventory/gui/GUISoyuzCapsule.java
View File

@ -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;

4
src/main/java/com/hbm/lib/HbmWorldGen.java
View File

@ -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;

1
src/main/java/com/hbm/main/ClientProxy.java
View File

@ -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.*;

4
src/main/java/com/hbm/packet/AuxButtonPacket.java
View File

@ -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;

2
src/main/java/com/hbm/render/tileentity/RenderBAT9000.java
View File

@ -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;

2
src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java
View File

@ -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;

3
src/main/java/com/hbm/render/tileentity/RenderFluidTank.java
View File

@ -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;

2
src/main/java/com/hbm/render/tileentity/RenderLiquefactor.java
View File

@ -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;

2
src/main/java/com/hbm/render/tileentity/RenderOrbus.java
View File

@ -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;

2
src/main/java/com/hbm/render/tileentity/RenderSolidifier.java
View File

@ -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;

1
src/main/java/com/hbm/tileentity/TileMappings.java
View File

@ -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.*;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssembler.java
View File

@ -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;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java
View File

@ -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;

1
src/main/java/com/hbm/tileentity/machine/TileEntityMachineFENSU.java
View File

@ -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;

21
src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java → src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java
View File

@ -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

21
src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolidifier.java → src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java
View File

@ -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

9
src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java
View File

@ -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

4
src/main/java/com/hbm/tileentity/machine/TileEntityCrateIron.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateIron.java
View File

@ -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;

4
src/main/java/com/hbm/tileentity/machine/TileEntityCrateSteel.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateSteel.java
View File

@ -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;

3
src/main/java/com/hbm/tileentity/machine/TileEntityCrateTungsten.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateTungsten.java
View File

@ -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;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBAT9000.java
View File

@ -1,4 +1,4 @@
package com.hbm.tileentity.machine;
package com.hbm.tileentity.machine.storage;
import com.hbm.inventory.fluid.FluidType;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineBattery.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java
View File

@ -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;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java
View File

@ -1,4 +1,4 @@
package com.hbm.tileentity.machine;
package com.hbm.tileentity.machine.storage;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineOrbus.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineOrbus.java
View File

@ -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;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachinePuF6Tank.java
View File

@ -1,4 +1,4 @@
package com.hbm.tileentity.machine;
package com.hbm.tileentity.machine.storage;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineUF6Tank.java
View File

@ -1,4 +1,4 @@
package com.hbm.tileentity.machine;
package com.hbm.tileentity.machine.storage;
import java.util.ArrayList;
import java.util.List;

4
src/main/java/com/hbm/tileentity/machine/TileEntitySafe.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntitySafe.java
View File

@ -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;

2
src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzCapsule.java → src/main/java/com/hbm/tileentity/machine/storage/TileEntitySoyuzCapsule.java
View File

@ -1,4 +1,4 @@
package com.hbm.tileentity.machine;
package com.hbm.tileentity.machine.storage;
import com.hbm.tileentity.TileEntityInventoryBase;

2
src/main/java/com/hbm/world/dungeon/Barrel.java
View File

@ -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;

2
src/main/java/com/hbm/world/dungeon/DesertAtom002.java
View File

@ -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;

4
src/main/java/com/hbm/world/dungeon/DesertAtom003.java
View File

@ -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;

2
src/main/java/com/hbm/world/dungeon/Radio01.java
View File

@ -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;

2
src/main/java/com/hbm/world/dungeon/Relay.java
View File

@ -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;

2
src/main/java/com/hbm/world/generator/room/TestDungeonRoom8.java
View File

@ -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;