From ac4148c01b04fb8d2d2ddf9f050a459f5cea3c3e Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 7 Aug 2016 20:40:28 -0400 Subject: [PATCH] Creative Gas Tanks! --- .../java/mekanism/client/gui/GuiGasTank.java | 3 +- src/main/java/mekanism/common/Tier.java | 3 +- .../common/item/ItemBlockGasTank.java | 14 ++++++-- .../common/item/ItemBlockMachine.java | 1 + .../common/tile/TileEntityGasTank.java | 33 ++++++++++++------ .../assets/mekanism/blockstates/GasTank.json | 3 +- .../resources/assets/mekanism/lang/en_US.lang | 1 + .../blocks/models/gas_tank_creative.png | Bin 0 -> 4128 bytes 8 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_creative.png diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index fb464d793..4c4331417 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -49,7 +49,8 @@ public class GuiGasTank extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.tier.storage; + String stored = "" + (tileEntity.gasTank.getStored() == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : tileEntity.gasTank.getStored()); + String capacityInfo = stored + " / " + (tileEntity.tier.storage == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : tileEntity.tier.storage); fontRendererObj.drawString(tileEntity.getName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index ac95ff16d..6a3ba1ea4 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -624,7 +624,8 @@ public final class Tier BASIC(64000, 256), ADVANCED(128000, 512), ELITE(256000, 1028), - ULTIMATE(512000, 2056); + ULTIMATE(512000, 2056), + CREATIVE(Integer.MAX_VALUE, Integer.MAX_VALUE); public int storage; private int baseStorage; diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index f515cf6f1..09edc3c16 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -121,10 +121,12 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI list.add(EnumColor.DARK_RED + LangUtils.localize("gui.empty") + "."); } else { - list.add(EnumColor.ORANGE + gasStack.getGas().getLocalizedName() + ": " + EnumColor.GREY + gasStack.amount); + String amount = "" + (gasStack.amount == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : gasStack.amount); + list.add(EnumColor.ORANGE + gasStack.getGas().getLocalizedName() + ": " + EnumColor.GREY + amount); } - list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + GasTankTier.values()[getBaseTier(itemstack).ordinal()].storage); + int cap = GasTankTier.values()[getBaseTier(itemstack).ordinal()].storage; + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + (cap == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : cap)); if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { @@ -193,7 +195,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(type.isVisible()) { ItemStack filled = new ItemStack(this); - setBaseTier(filled, BaseTier.ULTIMATE); + setBaseTier(filled, BaseTier.CREATIVE); setGas(filled, new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled))); list.add(filled); } @@ -243,6 +245,12 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI return 0; } + if(getBaseTier(itemstack) == BaseTier.CREATIVE) + { + setGas(itemstack, new GasStack(stack.getGas(), Integer.MAX_VALUE)); + return stack.amount; + } + int toUse = Math.min(getMaxGas(itemstack)-getStored(itemstack), Math.min(getRate(itemstack), stack.amount)); setGas(itemstack, new GasStack(stack.getGas(), getStored(itemstack)+toUse)); diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3ca9742ec..68318f9e3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -786,6 +786,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(getBaseTier(container) == BaseTier.CREATIVE) { setFluidStack(PipeUtils.copy(resource, Integer.MAX_VALUE), container); + return resource.amount; } FluidStack stored = getFluidStack(container); diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 1fd65da32..12c17f4d3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -100,31 +100,39 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { if(inventory[0] != null && gasTank.getGas() != null) { - gasTank.draw(GasTransmission.addGas(inventory[0], gasTank.getGas()), true); + gasTank.draw(GasTransmission.addGas(inventory[0], gasTank.getGas()), tier != GasTankTier.CREATIVE); } if(inventory[1] != null && (gasTank.getGas() == null || gasTank.getGas().amount < gasTank.getMaxGas())) { gasTank.receive(GasTransmission.removeGas(inventory[1], gasTank.getGasType(), gasTank.getNeeded()), true); + + if(tier == GasTankTier.CREATIVE && gasTank.getGas() != null) + { + gasTank.getGas().amount = Integer.MAX_VALUE; + } } - if(gasTank.getGas() != null && MekanismUtils.canFunction(this) && dumping != GasMode.DUMPING) + if(gasTank.getGas() != null && MekanismUtils.canFunction(this) && (tier == GasTankTier.CREATIVE || dumping != GasMode.DUMPING)) { if(configComponent.isEjecting(TransmissionType.GAS)) { 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); + gasTank.draw(GasTransmission.emit(toSend, this, configComponent.getSidesForData(TransmissionType.GAS, facing, 2)), tier != GasTankTier.CREATIVE); } } - if(dumping == GasMode.DUMPING) + if(tier != GasTankTier.CREATIVE) { - gasTank.draw(tier.storage/400, true); - } - - if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < tier.output) - { - gasTank.draw(tier.output-gasTank.getNeeded(), true); + if(dumping == GasMode.DUMPING) + { + gasTank.draw(tier.storage/400, true); + } + + if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < tier.output) + { + gasTank.draw(tier.output-gasTank.getNeeded(), true); + } } int newGasAmount = gasTank.getStored(); @@ -209,6 +217,11 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH @Override public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) { + if(tier == GasTankTier.CREATIVE) + { + return stack != null ? stack.amount : 0; + } + return gasTank.receive(stack, doTransfer); } diff --git a/src/main/resources/assets/mekanism/blockstates/GasTank.json b/src/main/resources/assets/mekanism/blockstates/GasTank.json index c4c950a2f..a88b7ef55 100644 --- a/src/main/resources/assets/mekanism/blockstates/GasTank.json +++ b/src/main/resources/assets/mekanism/blockstates/GasTank.json @@ -16,7 +16,8 @@ "basic": {"textures": {"all": "mekanism:blocks/models/gas_tank_basic"}}, "advanced": {"textures": {"all": "mekanism:blocks/models/gas_tank_advanced"}}, "elite": {"textures": {"all": "mekanism:blocks/models/gas_tank_elite"}}, - "ultimate": {"textures": {"all": "mekanism:blocks/models/gas_tank_ultimate"}} + "ultimate": {"textures": {"all": "mekanism:blocks/models/gas_tank_ultimate"}}, + "creative": {"textures": {"all": "mekanism:blocks/models/gas_tank_creative"}} }, "inventory": [{}] } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 1bf52654d..d619164c0 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -61,6 +61,7 @@ tile.GasTankBasic.name=Basic Gas Tank tile.GasTankAdvanced.name=Advanced Gas Tank tile.GasTankElite.name=Elite Gas Tank tile.GasTankUltimate.name=Ultimate Gas Tank +tile.GasTankCreative.name=Creative Gas Tank //Fluid Tank (part of MachineBlock2, naming handled differently) tile.FluidTankBasic.name=Basic Fluid Tank diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_creative.png b/src/main/resources/assets/mekanism/textures/blocks/models/gas_tank_creative.png new file mode 100644 index 0000000000000000000000000000000000000000..158b1519587fd89d72571dd77c9236fc6714d3e6 GIT binary patch literal 4128 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