From 3c1496740cdf3ddbc32a6a58ce4020f2ab3bcd8c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 24 Feb 2016 17:01:43 -0500 Subject: [PATCH] Tiered Gas Tanks and tiered Fluid Tanks! --- .../java/mekanism/client/ClientProxy.java | 10 +- .../mekanism/client/MekanismKeyHandler.java | 2 +- ...GuiPortableTank.java => GuiFluidTank.java} | 8 +- .../java/mekanism/client/gui/GuiGasTank.java | 4 +- ...lPortableTank.java => ModelFluidTank.java} | 9 +- ...ChemicalInjectionChamberRecipeHandler.java | 20 ++- .../nei/PurificationChamberRecipeHandler.java | 8 +- .../client/render/MekanismRenderer.java | 4 +- .../render/item/ItemRenderingHandler.java | 23 ++-- ...PortableTank.java => RenderFluidTank.java} | 27 ++-- .../render/tileentity/RenderGasTank.java | 7 +- .../java/mekanism/common/CommonProxy.java | 10 +- src/main/java/mekanism/common/Mekanism.java | 58 ++++++--- src/main/java/mekanism/common/Tier.java | 121 ++++++++++++++++++ .../java/mekanism/common/base/ITierItem.java | 11 ++ .../mekanism/common/block/BlockBasic.java | 10 +- .../common/block/BlockEnergyCube.java | 1 + .../mekanism/common/block/BlockGasTank.java | 8 ++ .../mekanism/common/block/BlockMachine.java | 40 ++++-- .../container/ContainerPortableTank.java | 6 +- .../mekanism/common/item/ItemBlockBasic.java | 25 ++-- .../common/item/ItemBlockEnergyCube.java | 1 + .../common/item/ItemBlockGasTank.java | 71 +++++++--- .../common/item/ItemBlockMachine.java | 67 +++++++--- .../common/item/ItemGaugeDropper.java | 6 +- ...ableTank.java => TileEntityFluidTank.java} | 35 +++-- .../common/tile/TileEntityGasTank.java | 33 +++-- .../mekanism/common/util/MekanismUtils.java | 21 ++- .../mekanism/common/util/RecipeUtils.java | 6 +- .../generators/common/MekanismGenerators.java | 3 +- .../resources/assets/mekanism/lang/en_US.lang | 14 +- .../assets/mekanism/render/FluidTank.png | Bin 0 -> 2578 bytes .../assets/mekanism/render/FluidTankOn.png | Bin 0 -> 2638 bytes .../assets/mekanism/render/GasTank.png | Bin 3253 -> 0 bytes .../mekanism/render/GasTankAdvanced.png | Bin 0 -> 3245 bytes .../assets/mekanism/render/GasTankBasic.png | Bin 0 -> 3241 bytes .../assets/mekanism/render/GasTankElite.png | Bin 0 -> 3231 bytes .../mekanism/render/GasTankUltimate.png | Bin 0 -> 3238 bytes .../assets/mekanism/render/PortableTank.png | Bin 1775 -> 0 bytes .../assets/mekanism/render/PortableTankOn.png | Bin 1284 -> 0 bytes 40 files changed, 498 insertions(+), 171 deletions(-) rename src/main/java/mekanism/client/gui/{GuiPortableTank.java => GuiFluidTank.java} (91%) rename src/main/java/mekanism/client/model/{ModelPortableTank.java => ModelFluidTank.java} (93%) rename src/main/java/mekanism/client/render/tileentity/{RenderPortableTank.java => RenderFluidTank.java} (84%) create mode 100644 src/main/java/mekanism/common/base/ITierItem.java rename src/main/java/mekanism/common/tile/{TileEntityPortableTank.java => TileEntityFluidTank.java} (92%) create mode 100755 src/main/resources/assets/mekanism/render/FluidTank.png create mode 100644 src/main/resources/assets/mekanism/render/FluidTankOn.png delete mode 100644 src/main/resources/assets/mekanism/render/GasTank.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankAdvanced.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankBasic.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankElite.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankUltimate.png delete mode 100755 src/main/resources/assets/mekanism/render/PortableTank.png delete mode 100644 src/main/resources/assets/mekanism/render/PortableTankOn.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index df433814c..06e6f1fde 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -41,7 +41,7 @@ import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPasswordEnter; import mekanism.client.gui.GuiPasswordModify; -import mekanism.client.gui.GuiPortableTank; +import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRobitCrafting; @@ -93,7 +93,7 @@ import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; -import mekanism.client.render.tileentity.RenderPortableTank; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderThermalEvaporationController; @@ -160,7 +160,7 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; @@ -320,7 +320,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); - ClientRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank", new RenderPortableTank()); + ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank", new RenderFluidTank()); //TODO rename ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); @@ -490,7 +490,7 @@ public class ClientProxy extends CommonProxy case 40: return new GuiPRC(player.inventory, (TileEntityPRC)tileEntity); case 41: - return new GuiPortableTank(player.inventory, (TileEntityPortableTank)tileEntity); + return new GuiFluidTank(player.inventory, (TileEntityFluidTank)tileEntity); case 42: return new GuiFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity); case 43: diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 5b8a0cf9f..42d9a1dd8 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -91,7 +91,7 @@ public class MekanismKeyHandler extends MekKeyHandler { ItemBlockMachine machine = (ItemBlockMachine)item; - if(MachineType.get(toolStack) == MachineType.PORTABLE_TANK) + if(MachineType.get(toolStack) == MachineType.FLUID_TANK) { machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack)); Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack))); diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java similarity index 91% rename from src/main/java/mekanism/client/gui/GuiPortableTank.java rename to src/main/java/mekanism/client/gui/GuiFluidTank.java index 4412516a7..f60d72a5e 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -7,7 +7,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerPortableTank; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -19,11 +19,11 @@ import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class GuiPortableTank extends GuiMekanism +public class GuiFluidTank extends GuiMekanism { - public TileEntityPortableTank tileEntity; + public TileEntityFluidTank tileEntity; - public GuiPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity) + public GuiFluidTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { super(tentity, new ContainerPortableTank(inventory, tentity)); tileEntity = tentity; diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 737d80b25..3bec4dfcf 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -46,7 +46,7 @@ public class GuiGasTank extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.MAX_GAS; + String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.tier.storage; fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040); @@ -74,7 +74,7 @@ public class GuiGasTank extends GuiMekanism if(tileEntity.gasTank.getGas() != null) { - int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.MAX_GAS) * 72); + int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.tier.storage) * 72); drawTexturedModalRect(guiWidth + 65, guiHeight + 17, 176, 0, scale, 10); } diff --git a/src/main/java/mekanism/client/model/ModelPortableTank.java b/src/main/java/mekanism/client/model/ModelFluidTank.java similarity index 93% rename from src/main/java/mekanism/client/model/ModelPortableTank.java rename to src/main/java/mekanism/client/model/ModelFluidTank.java index 297e199fc..ffc7d375d 100644 --- a/src/main/java/mekanism/client/model/ModelPortableTank.java +++ b/src/main/java/mekanism/client/model/ModelFluidTank.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - +import mekanism.common.Tier.FluidTankTier; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelPortableTank extends ModelBase +public class ModelFluidTank extends ModelBase { ModelRenderer Base; ModelRenderer PoleFL; @@ -21,7 +21,7 @@ public class ModelPortableTank extends ModelBase ModelRenderer RightGlass; ModelRenderer LeftGlass; - public ModelPortableTank() + public ModelFluidTank() { textureWidth = 128; textureHeight = 128; @@ -88,7 +88,7 @@ public class ModelPortableTank extends ModelBase setRotation(LeftGlass, 0F, 0F, 0F); } - public void render(float size) + public void render(float size, FluidTankTier tier) { Base.render(size); PoleFL.render(size); @@ -98,6 +98,7 @@ public class ModelPortableTank extends ModelBase Top.render(size); MekanismRenderer.blendOn(); + MekanismRenderer.color(tier.getBaseTier().getColor()); FrontGlass.render(size); BackGlass.render(size); RightGlass.render(size); diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 7bd17aeb0..e94cb15cf 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -9,6 +9,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.InjectionRecipe; import mekanism.common.util.LangUtils; @@ -49,18 +50,31 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSulfur")); - fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("sulfuricAcid"))); + + for(GasTankTier tier : GasTankTier.values()) + { + fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("sulfuricAcid"))); + } + return fuels; } else if(gasType == GasRegistry.getGas("water")) { - return ListUtils.asList(MekanismUtils.getFullGasTank(GasRegistry.getGas("water"))); + for(GasTankTier tier : GasTankTier.values()) + { + return ListUtils.asList(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("water"))); + } } else if(gasType == GasRegistry.getGas("hydrogenChloride")) { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSalt")); - fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); + + for(GasTankTier tier : GasTankTier.values()) + { + fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("hydrogenChloride"))); + } + return fuels; } diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index 0643f41dd..db1e61bca 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -7,8 +7,9 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.PurificationRecipe; import mekanism.common.util.LangUtils; @@ -53,7 +54,10 @@ public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandl { if(gasType == GasRegistry.getGas("oxygen")) { - return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(GasRegistry.getGas("oxygen"))); + for(GasTankTier tier : GasTankTier.values()) + { + return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("oxygen"))); + } } return new ArrayList(); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 8e0465d7c..cf2165b7a 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -15,7 +15,7 @@ import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderPortableTank; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.common.ObfuscatedNames; import mekanism.common.base.ISpecialBounds; @@ -142,7 +142,7 @@ public class MekanismRenderer RenderDynamicTank.resetDisplayInts(); RenderThermalEvaporationController.resetDisplayInts(); - RenderPortableTank.resetDisplayInts(); + RenderFluidTank.resetDisplayInts(); } } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index f25da80c0..075a5a830 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -9,12 +9,12 @@ import mekanism.client.model.ModelAtomicDisassembler; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.model.ModelFlamethrower; +import mekanism.client.model.ModelFluidTank; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelGasTank; import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelObsidianTNT; -import mekanism.client.model.ModelPortableTank; import mekanism.client.model.ModelRobit; import mekanism.client.model.ModelScubaTank; import mekanism.client.render.MekanismRenderer; @@ -22,16 +22,19 @@ import mekanism.client.render.RenderGlowPanel; import mekanism.client.render.RenderPartTransmitter; import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.tileentity.RenderBin; -import mekanism.client.render.tileentity.RenderPortableTank; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IEnergyCube; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemBlockBasic; +import mekanism.common.item.ItemBlockGasTank; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; @@ -43,7 +46,7 @@ import mekanism.common.multipart.ItemGlowPanel; import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.TransmitterType; import mekanism.common.tile.TileEntityBin; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; @@ -84,12 +87,12 @@ public class ItemRenderingHandler implements IItemRenderer public ModelScubaTank scubaTank = new ModelScubaTank(); public ModelFreeRunners freeRunners = new ModelFreeRunners(); public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); - public ModelPortableTank portableTank = new ModelPortableTank(); + public ModelFluidTank portableTank = new ModelFluidTank(); public ModelFlamethrower flamethrower = new ModelFlamethrower(); private final RenderBalloon balloonRenderer = new RenderBalloon(); private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class); - private final RenderPortableTank portableTankRenderer = (RenderPortableTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityPortableTank.class); + private final RenderFluidTank portableTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); @Override @@ -293,7 +296,8 @@ public class ItemRenderingHandler implements IItemRenderer else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png")); + BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); @@ -506,15 +510,16 @@ public class ItemRenderingHandler implements IItemRenderer flamethrower.render(0.0625F); GL11.glPopMatrix(); } - else if(MachineType.get(item) == MachineType.PORTABLE_TANK) + else if(MachineType.get(item) == MachineType.FLUID_TANK) { GL11.glPushMatrix(); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PortableTank.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem(); + FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()]; Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null; - portableTankRenderer.render(fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5); + portableTankRenderer.render(tier, fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5); GL11.glPopMatrix(); } else { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java similarity index 84% rename from src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java rename to src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index 1179a1367..b081e9eab 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -3,46 +3,47 @@ package mekanism.client.render.tileentity; import java.util.HashMap; import java.util.Map; -import mekanism.client.model.ModelPortableTank; +import mekanism.client.model.ModelFluidTank; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) -public class RenderPortableTank extends TileEntitySpecialRenderer +public class RenderFluidTank extends TileEntitySpecialRenderer { private static Map cachedCenterFluids = new HashMap(); private static Map cachedValveFluids = new HashMap(); private static int stages = 1400; - private ModelPortableTank model = new ModelPortableTank(); + private ModelFluidTank model = new ModelFluidTank(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - renderAModelAt((TileEntityPortableTank)tileEntity, x, y, z, partialTick); + renderAModelAt((TileEntityFluidTank)tileEntity, x, y, z, partialTick); } - private void renderAModelAt(TileEntityPortableTank tileEntity, double x, double y, double z, float partialTick) + private void renderAModelAt(TileEntityFluidTank tileEntity, double x, double y, double z, float partialTick) { Fluid fluid = tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid() : null; - render(fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z); + render(tileEntity.tier, fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z); } - public void render(Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z) + public void render(FluidTankTier tier, Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z) { if(fluid != null && fluidScale > 0) { @@ -93,10 +94,10 @@ public class RenderPortableTank extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PortableTank" + (active ? "On" : "") + ".png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank" + (active ? "On" : "") + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, tier); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 2e9ffea99..af4af146d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -7,11 +7,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderGasTank extends TileEntitySpecialRenderer { @@ -27,7 +28,7 @@ public class RenderGasTank extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getName() + ".png")); switch(tileEntity.facing) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 9d3efa86e..29b71547b 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -49,9 +49,9 @@ import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.inventory.container.ContainerSeismicVibrator; -import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.inventory.container.ContainerTeleporter; +import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; @@ -82,6 +82,7 @@ import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; @@ -98,15 +99,14 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; -import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; +import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -180,7 +180,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer"); GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); - GameRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank"); + GameRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank"); //TODO rename GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier"); @@ -508,7 +508,7 @@ public class CommonProxy implements IGuiProvider case 40: return new ContainerPRC(player.inventory, (TileEntityPRC)tileEntity); case 41: - return new ContainerPortableTank(player.inventory, (TileEntityPortableTank)tileEntity); + return new ContainerPortableTank(player.inventory, (TileEntityFluidTank)tileEntity); case 42: return new ContainerFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity); case 43: diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index bf008715b..58ab386a4 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -34,6 +34,8 @@ import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.base.IChunkLoadHandler; @@ -78,9 +80,9 @@ import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; -import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.util.MekanismUtils; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; @@ -314,9 +316,6 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] { "AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(), new Object[] { - "PPP", "PDP", "PPP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('D'), "dustIron" - })); MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), new Object[] { "IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingotOsmium" })); @@ -382,11 +381,11 @@ public class Mekanism Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore })); MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), new Object[] { - "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), - Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 11) + "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), + Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), new Object[] { - "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank() + "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Dictionary), new Object[] { "C", "B", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), Items.book @@ -398,10 +397,10 @@ public class Mekanism " C ", "ATA", "SSS", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), "ingotSteel" })); MachineType.CHEMICAL_OXIDIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 1), new Object[] { - "ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy + "ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy })); MachineType.CHEMICAL_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 2), new Object[] { - "ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), MekanismItems.EnrichedAlloy + "ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy })); MachineType.CHEMICAL_INJECTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 3), new Object[] { "RCR", "GPG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('G'), "ingotGold", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 9) @@ -431,13 +430,13 @@ public class Mekanism " S ", "SCS", " S ", Character.valueOf('C'), "ingotCopper", Character.valueOf('S'), "ingotSteel" })); MachineType.CHEMICAL_DISSOLUTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 6), new Object[] { - "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy + "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy })); MachineType.CHEMICAL_WASHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7), new Object[] { - "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); MachineType.CHEMICAL_CRYSTALLIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), new Object[] { - "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.FreeRunners.getUnchargedItem(), new Object[] { "C C", "A A", "T T", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem() @@ -455,12 +454,9 @@ public class Mekanism "TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); MachineType.PRESSURIZED_REACTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10), new Object[] { - "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), + "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0), Character.valueOf('F'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9) })); - MachineType.PORTABLE_TANK.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 11), new Object[] { - "III", "GCG", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); MachineType.FLUIDIC_PLENISHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12), new Object[] { "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) })); @@ -468,7 +464,7 @@ public class Mekanism "O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood" })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(), new Object[] { - "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED) + "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), new Object[] { " O ", "G G", "GGG", Character.valueOf('O'), "ingotOsmium", Character.valueOf('G'), "paneGlass" @@ -530,6 +526,34 @@ public class Mekanism "ATA", "dEd", "ATA", Character.valueOf('A'), "alloyUltimate", Character.valueOf('d'), "gemDiamond", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE) })); + //Gas Tank Recipes + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), new Object[] { + "APA", "P P", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyBasic" + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ELITE), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ULTIMATE), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ELITE) + })); + + //Fluid Tank Recipes + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC), new Object[] { + "AIA", "I I", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyBasic" + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC) + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED) + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ULTIMATE), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE) + })); + //Induction Cell recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), new Object[] { "LTL", "TET", "LTL", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('L'), "dustLithium" diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 9ccad9cb2..8d86122f3 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -553,6 +553,97 @@ public final class Tier } } + public static enum FluidTankTier + { + BASIC(14000, 400), + ADVANCED(28000, 800), + ELITE(56000, 1600), + ULTIMATE(112000, 3200); + + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + public int storage; + private int baseStorage; + + public int output; + private int baseOutput; + + private FluidTankTier(int s, int o) + { + baseStorage = storage = s; + baseOutput = output = o; + } + + protected void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankStorage", baseStorage).getInt(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankOutput", baseOutput).getInt(); + } + + protected void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + output = dataStream.readInt(); + } + + protected void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + dataStream.writeInt(output); + } + } + + /** + * The tiers used by Logistical Transporters and their corresponding values. + * @author AidanBrady + * + */ + public static enum GasTankTier + { + BASIC(64000, 256), + ADVANCED(128000, 512), + ELITE(256000, 1028), + ULTIMATE(512000, 2056); + + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + public int storage; + private int baseStorage; + + public int output; + private int baseOutput; + + private GasTankTier(int s, int o) + { + baseStorage = storage = s; + baseOutput = output = o; + } + + protected void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankStorage", baseStorage).getInt(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankOutput", baseOutput).getInt(); + } + + protected void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + output = dataStream.readInt(); + } + + protected void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + dataStream.writeInt(output); + } + } + public static void loadConfig() { for(CableTier tier : CableTier.values()) @@ -594,6 +685,16 @@ public final class Tier { tier.loadConfig(); } + + for(FluidTankTier tier : FluidTankTier.values()) + { + tier.loadConfig(); + } + + for(GasTankTier tier : GasTankTier.values()) + { + tier.loadConfig(); + } } public static void readConfig(ByteBuf dataStream) @@ -637,6 +738,16 @@ public final class Tier { tier.readConfig(dataStream); } + + for(FluidTankTier tier : FluidTankTier.values()) + { + tier.readConfig(dataStream); + } + + for(GasTankTier tier : GasTankTier.values()) + { + tier.readConfig(dataStream); + } } public static void writeConfig(ByteBuf dataStream) @@ -680,5 +791,15 @@ public final class Tier { tier.writeConfig(dataStream); } + + for(FluidTankTier tier : FluidTankTier.values()) + { + tier.writeConfig(dataStream); + } + + for(GasTankTier tier : GasTankTier.values()) + { + tier.writeConfig(dataStream); + } } } diff --git a/src/main/java/mekanism/common/base/ITierItem.java b/src/main/java/mekanism/common/base/ITierItem.java new file mode 100644 index 000000000..31912c6d8 --- /dev/null +++ b/src/main/java/mekanism/common/base/ITierItem.java @@ -0,0 +1,11 @@ +package mekanism.common.base; + +import mekanism.common.Tier.BaseTier; +import net.minecraft.item.ItemStack; + +public interface ITierItem +{ + public BaseTier getBaseTier(ItemStack stack); + + public void setBaseTier(ItemStack stack, BaseTier tier); +} diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index b5f046276..79fa0e1ce 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -119,11 +119,11 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 3) { - return icons[3][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()]; + return icons[3][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; } else if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 4) { - return icons[4][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()]; + return icons[4][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; } return getIcon(side, stack.getItemDamage()); @@ -331,7 +331,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon if(tier.isObtainable()) { ItemStack stack = new ItemStack(item, 1, type.meta); - ((ItemBlockBasic)stack.getItem()).setTier(stack, tier); + ((ItemBlockBasic)stack.getItem()).setBaseTier(stack, tier); list.add(stack); } } @@ -830,12 +830,12 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon else if(type == BasicType.INDUCTION_CELL) { TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(x, y, z); - ((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier()); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); } else if(type == BasicType.INDUCTION_PROVIDER) { TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(x, y, z); - ((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier()); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); } TileEntity tileEntity = world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index a5c461df1..8e01d8974 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -164,6 +164,7 @@ public class BlockEnergyCube extends BlockContainer tileEntity.setFacing((short)change); world.notifyBlocksOfNeighborChange(x, y, z, this); + return true; } } diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index e4e4b34d4..710c985df 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -6,6 +6,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ITierItem; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; @@ -102,12 +103,15 @@ public class BlockGasTank extends BlockContainer } if(MekanismUtils.isBCWrench(tool)) + { ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; tileEntity.setFacing((short)change); world.notifyBlocksOfNeighborChange(x, y, z, this); + return true; } } @@ -120,6 +124,7 @@ public class BlockGasTank extends BlockContainer return true; } } + return false; } @@ -203,6 +208,9 @@ public class BlockGasTank extends BlockContainer { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); + + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); IGasItem storageTank = (IGasItem)itemStack.getItem(); storageTank.setGas(itemStack, tileEntity.gasTank.getGas()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 02a75bace..7cfe78d1b 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -22,6 +22,7 @@ import mekanism.common.CTMData; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; @@ -34,6 +35,7 @@ import mekanism.common.base.ISpecialBounds; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; +import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; @@ -63,6 +65,7 @@ import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; @@ -72,7 +75,6 @@ import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; @@ -141,7 +143,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:8: Chemical Crystallizer * 1:9: Seismic Vibrator * 1:10: Pressurized Reaction Chamber - * 1:11: Portable Tank + * 1:11: Fluid Tank * 1:12: Fluidic Plenisher * 1:13: Laser * 1:14: Laser Amplifier @@ -515,17 +517,23 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } break; - case PORTABLE_TANK: - list.add(new ItemStack(item, 1, type.meta)); + case FLUID_TANK: + ItemBlockMachine itemMachine = (ItemBlockMachine)item; + + for(FluidTankTier tier : FluidTankTier.values()) + { + ItemStack stack = new ItemStack(item, 1, type.meta); + itemMachine.setBaseTier(stack, tier.getBaseTier()); + list.add(stack); + } if(general.prefilledPortableTanks) { - ItemBlockMachine itemMachine = (ItemBlockMachine)item; - for(Fluid f : FluidRegistry.getRegisteredFluids().values()) { try { //Prevent bad IDs ItemStack filled = new ItemStack(item, 1, type.meta); + itemMachine.setBaseTier(filled, BaseTier.ULTIMATE); itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled); itemMachine.setPrevScale(filled, 1); list.add(filled); @@ -620,10 +628,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return true; } break; - case PORTABLE_TANK: + case FLUID_TANK: if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem())) { - if(manageInventory(entityplayer, (TileEntityPortableTank)tileEntity)) + if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity)) { entityplayer.inventory.markDirty(); return true; @@ -758,7 +766,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return world.setBlockToAir(x, y, z); } - private boolean manageInventory(EntityPlayer player, TileEntityPortableTank tileEntity) + private boolean manageInventory(EntityPlayer player, TileEntityFluidTank tileEntity) { ItemStack itemStack = player.getCurrentEquippedItem(); @@ -911,6 +919,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { itemStack.setTagCompound(new NBTTagCompound()); } + + if(tileEntity instanceof TileEntityFluidTank) + { + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, ((TileEntityFluidTank)tileEntity).tier.getBaseTier()); + } if(tileEntity instanceof IUpgradeTile) { @@ -1034,7 +1048,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case CHARGEPAD: setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.06F, 1.0F); break; - case PORTABLE_TANK: + case FLUID_TANK: setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 1.0F, 0.875F); break; default: @@ -1064,7 +1078,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case CHARGEPAD: case ELECTRIC_CHEST: return false; - case PORTABLE_TANK: + case FLUID_TANK: return side == ForgeDirection.UP || side == ForgeDirection.DOWN; default: return true; @@ -1122,7 +1136,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo CHEMICAL_CRYSTALLIZER(MachineBlock.MACHINE_BLOCK_2, 8, "ChemicalCrystallizer", 37, TileEntityChemicalCrystallizer.class, true, true, true), SEISMIC_VIBRATOR(MachineBlock.MACHINE_BLOCK_2, 9, "SeismicVibrator", 39, TileEntitySeismicVibrator.class, true, true, false), PRESSURIZED_REACTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 10, "PressurizedReactionChamber", 40, TileEntityPRC.class, true, true, false), - PORTABLE_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "PortableTank", 41, TileEntityPortableTank.class, false, true, false), + FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false), FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false), LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false), @@ -1283,7 +1297,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return usage.seismicVibratorUsage; case PRESSURIZED_REACTION_CHAMBER: return usage.pressurizedReactionBaseUsage; - case PORTABLE_TANK: + case FLUID_TANK: return 0; case FLUIDIC_PLENISHER: return usage.fluidicPlenisherUsage; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java index f30ffc361..986978c37 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java @@ -1,7 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,9 +12,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry; public class ContainerPortableTank extends Container { - private TileEntityPortableTank tileEntity; + private TileEntityFluidTank tileEntity; - public ContainerPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity) + public ContainerPortableTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 146, 19)); diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 041c7702b..82e2ca70b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -15,6 +15,7 @@ import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; +import mekanism.common.base.ITierItem; import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -66,7 +67,7 @@ import cpw.mods.fml.relauncher.SideOnly; * @author AidanBrady * */ -public class ItemBlockBasic extends ItemBlock implements IEnergizedItem +public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierItem { public Block metaBlock; @@ -91,7 +92,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem public ItemStack getUnchargedCell(InductionCellTier tier) { ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 3); - setTier(stack, tier.getBaseTier()); + setBaseTier(stack, tier.getBaseTier()); return stack; } @@ -99,12 +100,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem public ItemStack getUnchargedProvider(InductionProviderTier tier) { ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 4); - setTier(stack, tier.getBaseTier()); + setBaseTier(stack, tier.getBaseTier()); return stack; } - public BaseTier getTier(ItemStack itemstack) + @Override + public BaseTier getBaseTier(ItemStack itemstack) { if(itemstack.stackTagCompound == null) { @@ -114,7 +116,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; } - public void setTier(ItemStack itemstack, BaseTier tier) + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) { if(itemstack.stackTagCompound == null) { @@ -161,13 +164,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem } else if(type == BasicType.INDUCTION_CELL) { - InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()]; + InductionCellTier tier = InductionCellTier.values()[getBaseTier(itemstack).ordinal()]; list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy)); } else if(type == BasicType.INDUCTION_PROVIDER) { - InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()]; + InductionProviderTier tier = InductionProviderTier.values()[getBaseTier(itemstack).ordinal()]; list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output)); } @@ -250,7 +253,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem else if(type == BasicType.INDUCTION_CELL) { TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(x, y, z); - tileEntity.tier = InductionCellTier.values()[getTier(stack).ordinal()]; + tileEntity.tier = InductionCellTier.values()[getBaseTier(stack).ordinal()]; if(!world.isRemote) { @@ -260,7 +263,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem else if(type == BasicType.INDUCTION_PROVIDER) { TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(x, y, z); - tileEntity.tier = InductionProviderTier.values()[getTier(stack).ordinal()]; + tileEntity.tier = InductionProviderTier.values()[getBaseTier(stack).ordinal()]; if(!world.isRemote) { @@ -290,7 +293,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem if(type == BasicType.INDUCTION_CELL || type == BasicType.INDUCTION_PROVIDER) { - name += getTier(itemstack).getName(); + name += getBaseTier(itemstack).getName(); } return name; @@ -334,7 +337,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { if(BasicType.get(itemStack) == BasicType.INDUCTION_CELL) { - return InductionCellTier.values()[getTier(itemStack).ordinal()].maxEnergy; + return InductionCellTier.values()[getBaseTier(itemStack).ordinal()].maxEnergy; } return 0; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 23f7ca534..b0712eaa2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -76,6 +76,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE ItemStack stack = new ItemStack(this); setEnergyCubeTier(stack, tier); stack.setItemDamage(100); + return stack; } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index e7b8629c2..d67b42e12 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -1,8 +1,11 @@ package mekanism.common.item; +import java.util.ArrayList; import java.util.List; +import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -10,7 +13,11 @@ import mekanism.api.gas.IGasItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ITierItem; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -26,7 +33,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory +public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem { public Block metaBlock; @@ -58,11 +65,11 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { return metaBlock.getIcon(2, i); } - + @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getItemStackDisplayName(ItemStack itemstack) { - return getUnlocalizedName() + "." + "GasTank"; + return LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getName() + ".name"); } @Override @@ -73,9 +80,16 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(place) { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); + tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()]; + tileEntity.gasTank.setMaxGas(tileEntity.tier.storage); tileEntity.gasTank.setGas(getGas(stack)); ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); + + if(!world.isRemote) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + } } return place; @@ -103,12 +117,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } } - @Override - public void onCreated(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - itemstack = getEmptyItem(); - } - @Override public GasStack getGas(ItemStack itemstack) { @@ -152,43 +160,72 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } } - public ItemStack getEmptyItem() + public ItemStack getEmptyItem(GasTankTier tier) { ItemStack empty = new ItemStack(this); + setBaseTier(empty, tier.getBaseTier()); setGas(empty, null); empty.setItemDamage(100); + return empty; } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { - ItemStack empty = new ItemStack(this); - setGas(empty, null); - empty.setItemDamage(100); - list.add(empty); + for(GasTankTier tier : GasTankTier.values()) + { + ItemStack empty = new ItemStack(this); + setBaseTier(empty, tier.getBaseTier()); + setGas(empty, null); + empty.setItemDamage(100); + list.add(empty); + } for(Gas type : GasRegistry.getRegisteredGasses()) { if(type.isVisible()) { ItemStack filled = new ItemStack(this); + setBaseTier(filled, BaseTier.ULTIMATE); setGas(filled, new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled))); list.add(filled); } } } + + @Override + public BaseTier getBaseTier(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return BaseTier.BASIC; + } + + return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + } + + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + } @Override public int getMaxGas(ItemStack itemstack) { - return MAX_GAS; + return GasTankTier.values()[getBaseTier(itemstack).ordinal()].storage; } @Override public int getRate(ItemStack itemstack) { - return TRANSFER_RATE; + return GasTankTier.values()[getBaseTier(itemstack).ordinal()].output; } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 40f9c1f94..3b864ed49 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -17,6 +17,7 @@ import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; @@ -26,6 +27,7 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; +import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IC2ItemManager; @@ -36,7 +38,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityFactory; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -113,7 +115,7 @@ import cpw.mods.fml.relauncher.SideOnly; @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem +public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem { public Block metaBlock; @@ -159,6 +161,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return tier.getLocalizedName() + " " + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); } + else if(type == MachineType.FLUID_TANK) + { + return LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getName() + ".name"); + } return super.getItemStackDisplayName(itemstack); } @@ -171,7 +177,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - if(type == MachineType.PORTABLE_TANK) + if(type == MachineType.FLUID_TANK) { FluidStack fluidStack = getFluidStack(itemstack); @@ -197,7 +203,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack))); } - if(type == MachineType.PORTABLE_TANK) + if(type == MachineType.FLUID_TANK) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack))); } @@ -207,7 +213,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } - if(hasTank(itemstack) && type != MachineType.PORTABLE_TANK) + if(hasTank(itemstack) && type != MachineType.FLUID_TANK) { FluidStack fluidStack = getFluidStack(itemstack); @@ -242,7 +248,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = MachineType.get(stack); - if(type == MachineType.PORTABLE_TANK && getBucketMode(stack)) + if(type == MachineType.FLUID_TANK && getBucketMode(stack)) { return false; } @@ -287,6 +293,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + if(tileEntity instanceof TileEntityFluidTank) + { + TileEntityFluidTank tile = (TileEntityFluidTank)tileEntity; + tile.tier = FluidTankTier.values()[getBaseTier(stack).ordinal()]; + tile.fluidTank.setCapacity(tile.tier.storage); + } + if(tileEntity instanceof IUpgradeTile) { if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("upgrades")) @@ -442,11 +455,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == MachineType.PORTABLE_TANK) + else if(type == MachineType.FLUID_TANK) { if(world != null && !world.isRemote) { - float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/TileEntityPortableTank.MAX_FLUID; + float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/getCapacity(itemstack); if(Math.abs(getPrevScale(itemstack) - targetScale) > 0.01) { @@ -525,7 +538,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == MachineType.PORTABLE_TANK && getBucketMode(itemstack)) + else if(type == MachineType.FLUID_TANK && getBucketMode(itemstack)) { MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking()); @@ -554,7 +567,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) { - int needed = TileEntityPortableTank.MAX_FLUID-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); + int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); if(fluid.amount > needed) { @@ -715,7 +728,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec MachineType type = MachineType.get((ItemStack)data[0]); - return type == MachineType.ELECTRIC_PUMP || type == MachineType.PORTABLE_TANK || type == MachineType.FLUIDIC_PLENISHER; + return type == MachineType.ELECTRIC_PUMP || type == MachineType.FLUID_TANK || type == MachineType.FLUIDIC_PLENISHER; } @Override @@ -984,13 +997,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public int getCapacity(ItemStack container) { - return TileEntityPortableTank.MAX_FLUID; + return FluidTankTier.values()[getBaseTier(container).ordinal()].storage; } @Override public int fill(ItemStack container, FluidStack resource, boolean doFill) { - if(MachineType.get(container) == MachineType.PORTABLE_TANK && resource != null) + if(MachineType.get(container) == MachineType.FLUID_TANK && resource != null) { FluidStack stored = getFluidStack(container); int toFill; @@ -1002,10 +1015,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(stored == null) { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID); + toFill = Math.min(resource.amount, getCapacity(container)); } else { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount); + toFill = Math.min(resource.amount, getCapacity(container)-stored.amount); } if(doFill) @@ -1023,7 +1036,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { - if(MachineType.get(container) == MachineType.PORTABLE_TANK) + if(MachineType.get(container) == MachineType.FLUID_TANK) { FluidStack stored = getFluidStack(container); @@ -1043,4 +1056,26 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return null; } + + @Override + public BaseTier getBaseTier(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return BaseTier.BASIC; + } + + return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + } + + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + } } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 7a1a8be6c..0c21269eb 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -6,7 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -160,10 +160,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo if(stored == null) { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID); + toFill = Math.min(resource.amount, CAPACITY); } else { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount); + toFill = Math.min(resource.amount, CAPACITY-stored.amount); } if(doFill) diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java similarity index 92% rename from src/main/java/mekanism/common/tile/TileEntityPortableTank.java rename to src/main/java/mekanism/common/tile/TileEntityFluidTank.java index b6a246546..f45fcde94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -9,6 +9,7 @@ import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IFluidContainerManager; import mekanism.common.base.ISustainedTank; @@ -17,6 +18,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -32,18 +34,18 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityPortableTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager +public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager { public boolean isActive; public boolean clientActive; - public static final int MAX_FLUID = 14000; - - public FluidTank fluidTank = new FluidTank(MAX_FLUID); + public FluidTank fluidTank; public ContainerEditMode editMode = ContainerEditMode.BOTH; + public FluidTankTier tier = FluidTankTier.BASIC; + public int updateDelay; public int prevAmount; @@ -55,10 +57,11 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements public boolean needsPacket; - public TileEntityPortableTank() + public TileEntityFluidTank() { - super("PortableTank"); + super("FluidTank"); + fluidTank = new FluidTank(tier.storage); inventory = new ItemStack[2]; } @@ -140,6 +143,12 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } } + @Override + public String getInventoryName() + { + return LangUtils.localize("tile.FluidTank" + tier.getBaseTier().getName() + ".name"); + } + private void activeEmit() { if(fluidTank.getFluid() != null) @@ -148,7 +157,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements if(tileEntity instanceof IFluidHandler) { - FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(100, fluidTank.getFluidAmount())); + FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(tier.output, fluidTank.getFluidAmount())); fluidTank.drain(((IFluidHandler)tileEntity).fill(ForgeDirection.UP, toDrain, true), true); } } @@ -287,7 +296,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { Coord4D up = Coord4D.get(this).getFromSide(ForgeDirection.UP); - if(up.getTileEntity(worldObj) instanceof TileEntityPortableTank) + if(up.getTileEntity(worldObj) instanceof TileEntityFluidTank) { IFluidHandler handler = (IFluidHandler)up.getTileEntity(worldObj); @@ -353,6 +362,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.writeToNBT(nbtTags); + nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("editMode", editMode.ordinal()); @@ -367,6 +377,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.readFromNBT(nbtTags); + tier = FluidTankTier.values()[nbtTags.getInteger("tier")]; clientActive = isActive = nbtTags.getBoolean("isActive"); editMode = ContainerEditMode.values()[nbtTags.getInteger("editMode")]; @@ -381,6 +392,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.handlePacketData(dataStream); + tier = FluidTankTier.values()[dataStream.readInt()]; clientActive = dataStream.readBoolean(); valve = dataStream.readInt(); editMode = ContainerEditMode.values()[dataStream.readInt()]; @@ -415,9 +427,9 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements Coord4D top = Coord4D.get(this).getFromSide(ForgeDirection.UP); - if(top.getTileEntity(worldObj) instanceof TileEntityPortableTank) + if(top.getTileEntity(worldObj) instanceof TileEntityFluidTank) { - needed += ((TileEntityPortableTank)top.getTileEntity(worldObj)).getCurrentNeeded(); + needed += ((TileEntityFluidTank)top.getTileEntity(worldObj)).getCurrentNeeded(); } return needed; @@ -428,6 +440,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.getNetworkedData(data); + data.add(tier.ordinal()); data.add(isActive); data.add(valve); data.add(editMode.ordinal()); @@ -558,7 +571,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { TileEntity tile = Coord4D.get(this).getFromSide(ForgeDirection.DOWN).getTileEntity(worldObj); - if(isActive && !(tile instanceof TileEntityPortableTank)) + if(isActive && !(tile instanceof TileEntityFluidTank)) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index cff2b66f1..ead765dbc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -17,6 +17,7 @@ import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; +import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IEjector; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -24,6 +25,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -42,12 +44,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } /** The type of gas stored in this tank. */ - public GasTank gasTank = new GasTank(MAX_GAS); - - public static final int MAX_GAS = 96000; - - /** How fast this tank can output gas. */ - public int output = 256; + public GasTank gasTank; + + public GasTankTier tier = GasTankTier.BASIC; public GasMode dumping; @@ -74,6 +73,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH configComponent.setIOConfig(TransmissionType.GAS); configComponent.setEjecting(TransmissionType.GAS, true); + gasTank = new GasTank(tier.storage); inventory = new ItemStack[2]; dumping = GasMode.IDLE; controlType = RedstoneControl.DISABLED; @@ -100,19 +100,19 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { if(configComponent.isEjecting(TransmissionType.GAS)) { - GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), output)); + GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), tier.output)); gasTank.draw(GasTransmission.emit(toSend, this, configComponent.getSidesForData(TransmissionType.GAS, facing, 2)), true); } } if(dumping == GasMode.DUMPING) { - gasTank.draw(8, true); + gasTank.draw(tier.storage/400, true); } - if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < output) + if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < tier.output) { - gasTank.draw(output-gasTank.getNeeded(), true); + gasTank.draw(tier.output-gasTank.getNeeded(), true); } int newGasAmount = gasTank.getStored(); @@ -125,6 +125,12 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH currentGasAmount = newGasAmount; } } + + @Override + public String getInventoryName() + { + return LangUtils.localize("tile.GasTank" + tier.getBaseTier().getName() + ".name"); + } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) @@ -226,6 +232,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } super.handlePacketData(dataStream); + + tier = GasTankTier.values()[dataStream.readInt()]; + gasTank.setMaxGas(tier.storage); if(dataStream.readBoolean()) { @@ -246,6 +255,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { super.readFromNBT(nbtTags); + tier = GasTankTier.values()[nbtTags.getInteger("tier")]; gasTank.read(nbtTags.getCompoundTag("gasTank")); dumping = GasMode.values()[nbtTags.getInteger("dumping")]; @@ -257,6 +267,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { super.writeToNBT(nbtTags); + nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); nbtTags.setInteger("dumping", dumping.ordinal()); nbtTags.setInteger("controlType", controlType.ordinal()); @@ -266,6 +277,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); + + data.add(tier.ordinal()); if(gasTank.getGas() != null) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index d6a9eee0f..528d642c1 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -34,6 +34,8 @@ import mekanism.common.OreDictCache; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.Upgrade; @@ -49,6 +51,7 @@ import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockGasTank; +import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; @@ -368,10 +371,18 @@ public final class MekanismUtils * Retrieves an empty Gas Tank. * @return empty gas tank */ - public static ItemStack getEmptyGasTank() + public static ItemStack getEmptyGasTank(GasTankTier tier) { - ItemStack itemstack = ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(); - return itemstack; + return ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(tier); + } + + public static ItemStack getEmptyFluidTank(FluidTankTier tier) + { + ItemStack stack = new ItemStack(MekanismBlocks.MachineBlock2, 1, 11); + ItemBlockMachine itemMachine = (ItemBlockMachine)stack.getItem(); + itemMachine.setBaseTier(stack, tier.getBaseTier()); + + return stack; } /** @@ -1336,9 +1347,9 @@ public final class MekanismUtils * @param gas - gas to fill the tank with * @return filled gas tank */ - public static ItemStack getFullGasTank(Gas gas) + public static ItemStack getFullGasTank(GasTankTier tier, Gas gas) { - ItemStack tank = getEmptyGasTank(); + ItemStack tank = getEmptyGasTank(tier); ItemBlockGasTank item = (ItemBlockGasTank)tank.getItem(); item.setGas(tank, new GasStack(gas, item.MAX_GAS)); diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 482a0e8eb..caf953c41 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -11,8 +11,8 @@ import mekanism.api.gas.IGasItem; import mekanism.common.Upgrade; import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory; +import mekanism.common.base.ITierItem; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.item.ItemBlockBasic; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.recipe.ShapelessMekanismRecipe; import net.minecraft.block.Block; @@ -79,9 +79,9 @@ public class RecipeUtils return false; } } - else if(target.getItem() instanceof ItemBlockBasic && input.getItem() instanceof ItemBlockBasic) + else if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem) { - if(((ItemBlockBasic)target.getItem()).getTier(target) != ((ItemBlockBasic)input.getItem()).getTier(input)) + if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input)) { return false; } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 447a367d5..9b00244c8 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -14,6 +14,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.multiblock.MultiblockManager; @@ -166,7 +167,7 @@ public class MekanismGenerators implements IModule " I ", "IGI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('G'), "blockGlass" })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 1, 0), new Object[] { - "CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank() + "CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.ReactorGlass, 2, 1), new Object[] { " I ", "ILI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.ReactorGlass, 1, 0), Character.valueOf('L'), "blockRedstone" diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index ef79904d5..1ad23d3ab 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -56,7 +56,16 @@ item.EliteControlCircuit.name=Elite Control Circuit item.UltimateControlCircuit.name=Ultimate Control Circuit //Gas Tank -tile.GasTank.GasTank.name=Gas Tank +tile.GasTankBasic.name=Basic Gas Tank +tile.GasTankAdvanced.name=Advanced Gas Tank +tile.GasTankElite.name=Elite Gas Tank +tile.GasTankUltimate.name=Ultimate Gas Tank + +//Fluid Tank (part of MachineBlock2, naming handled differently) +tile.FluidTankBasic.name=Basic Fluid Tank +tile.FluidTankAdvanced.name=Advanced Fluid Tank +tile.FluidTankElite.name=Elite Fluid Tank +tile.FluidTankUltimate.name=Ultimate Fluid Tank //Cardboard Box tile.CardboardBox.name=Cardboard Box @@ -132,7 +141,6 @@ tile.MachineBlock2.ChemicalCrystallizer.name=Chemical Crystallizer tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC -tile.MachineBlock2.PortableTank.name=Portable Tank tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Laser Amplifier @@ -766,7 +774,7 @@ tooltip.ChemicalOxidizer=A machine capable of oxidizing solid materials into gas tooltip.ChemicalInfuser=A machine that produces a new gas by infusing two others. tooltip.SeismicVibrator=A machine that uses seismic vibrations to provide information on differing layers of the world. tooltip.PressurizedReactionChamber=An advanced machine that processes a solid, liquid and gaseous mixture and creates both a gaseous and solid product. -tooltip.PortableTank=A handy, sturdy, portable tank that lets you carry 14 buckets of fluid wherever you please. Also doubles as a bucket! +tooltip.FluidTank=A handy, sturdy, portable tank that lets you carry multiple buckets of fluid wherever you please. Also doubles as a bucket! tooltip.FluidicPlenisher=A machine that is capable of creating entire lakes by filling ravines with fluids. tooltip.Laser=An advanced form of linear energy transfer that utilizes an extremely collimated beam of light. tooltip.LaserAmplifier=A block that can be used to merge, redirect and amplify laser beams, with fine controls over when to fire. diff --git a/src/main/resources/assets/mekanism/render/FluidTank.png b/src/main/resources/assets/mekanism/render/FluidTank.png new file mode 100755 index 0000000000000000000000000000000000000000..b1dc430e97c0010f4c8483e3d1b4cd2929e88440 GIT binary patch literal 2578 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 Aod5s; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/GasTank.png b/src/main/resources/assets/mekanism/render/GasTank.png deleted file mode 100644 index 355a92aa326ab35af6522e85f925de186dd09752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3253 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 diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png new file mode 100644 index 0000000000000000000000000000000000000000..98c797b73239374f5559d03e5cb6446b5981b6d5 GIT binary patch literal 3245 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 Yu`uk=z3|lub0=Y-b4MHdw{z^j0O;;kv;Y7A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/GasTankBasic.png b/src/main/resources/assets/mekanism/render/GasTankBasic.png new file mode 100644 index 0000000000000000000000000000000000000000..7d7dd42ddeee24a98474bea8663a0b673e32adc9 GIT binary patch literal 3241 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 Mo~2>qUAM&l0IuL#8UO$Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/GasTankUltimate.png b/src/main/resources/assets/mekanism/render/GasTankUltimate.png new file mode 100644 index 0000000000000000000000000000000000000000..3b7ad2ab2b3b8b46907644de010f87d55fc80eaa GIT binary patch literal 3238 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 PbC5nyS3j3^P6