From 7d2af897b0166cffc80179c000e2e3869e781b5c Mon Sep 17 00:00:00 2001 From: hunterboerner Date: Tue, 24 Dec 2013 12:27:55 -0600 Subject: [PATCH] Remove Steam Generator code. Compiles fine, went in singleplayer and no problems. Fixes #125 --- .../blocks/BlockSteamGenerator.java | 25 -- .../java/quantumcraft/core/ClientProxy.java | 3 - .../java/quantumcraft/core/CommonProxy.java | 3 - src/main/java/quantumcraft/core/Config.java | 3 - src/main/java/quantumcraft/core/Loader.java | 15 - .../java/quantumcraft/core/QuantumCraft.java | 6 - .../java/quantumcraft/fluid/FluidSteam.java | 15 - .../quantumcraft/gui/GuiSteamGenerator.java | 72 ----- .../gui/abstractguis/GuiBase.java | 11 +- .../inventory/ContainerSteamGenerator.java | 25 -- .../quantumcraft/tile/TileSteamGenerator.java | 257 ------------------ .../textures/blocks/fluidSteam.png | Bin 715 -> 0 bytes .../textures/blocks/fluidSteam.png.mcmeta | 3 - 13 files changed, 2 insertions(+), 436 deletions(-) delete mode 100644 src/main/java/quantumcraft/blocks/BlockSteamGenerator.java delete mode 100644 src/main/java/quantumcraft/fluid/FluidSteam.java delete mode 100644 src/main/java/quantumcraft/gui/GuiSteamGenerator.java delete mode 100644 src/main/java/quantumcraft/inventory/ContainerSteamGenerator.java delete mode 100644 src/main/java/quantumcraft/tile/TileSteamGenerator.java delete mode 100644 src/main/resources/assets/quantumcraft/textures/blocks/fluidSteam.png delete mode 100644 src/main/resources/assets/quantumcraft/textures/blocks/fluidSteam.png.mcmeta diff --git a/src/main/java/quantumcraft/blocks/BlockSteamGenerator.java b/src/main/java/quantumcraft/blocks/BlockSteamGenerator.java deleted file mode 100644 index 8c99f6e..0000000 --- a/src/main/java/quantumcraft/blocks/BlockSteamGenerator.java +++ /dev/null @@ -1,25 +0,0 @@ -package quantumcraft.blocks; - -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import quantumcraft.blocks.abstractblocks.BlockMachine; -import quantumcraft.tile.TileSteamGenerator; - -public class BlockSteamGenerator extends BlockMachine{ - - public BlockSteamGenerator(int id) { - super(id, Material.iron); - } - - @Override - public void registerIcons(IconRegister iconRegister) { - //TODO icons! - } - - @Override - public TileEntity createNewTileEntity(World world) { - return new TileSteamGenerator(); - } -} diff --git a/src/main/java/quantumcraft/core/ClientProxy.java b/src/main/java/quantumcraft/core/ClientProxy.java index eaf117e..3df03d0 100644 --- a/src/main/java/quantumcraft/core/ClientProxy.java +++ b/src/main/java/quantumcraft/core/ClientProxy.java @@ -34,9 +34,6 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int case 7: TileQCapacitor te7 = (TileQCapacitor) world.getBlockTileEntity(x,y,z); return new GuiQCapacitor(new ContainerQCapacitor(player.inventory, te7)); - case 8: - TileSteamGenerator te8 = (TileSteamGenerator) world.getBlockTileEntity(x,y,z); - return new GuiSteamGenerator(new ContainerSteamGenerator(player.inventory, te8)); } return null; diff --git a/src/main/java/quantumcraft/core/CommonProxy.java b/src/main/java/quantumcraft/core/CommonProxy.java index 1b4ef07..139c5cc 100644 --- a/src/main/java/quantumcraft/core/CommonProxy.java +++ b/src/main/java/quantumcraft/core/CommonProxy.java @@ -40,9 +40,6 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int case 7: return new ContainerQCapacitor(player.inventory, (TileQCapacitor) world.getBlockTileEntity(x, y, z)); - case 8: - return new ContainerSteamGenerator(player.inventory, - (TileSteamGenerator) world.getBlockTileEntity(x, y, z)); } } return null; } diff --git a/src/main/java/quantumcraft/core/Config.java b/src/main/java/quantumcraft/core/Config.java index 0223421..372b1c6 100644 --- a/src/main/java/quantumcraft/core/Config.java +++ b/src/main/java/quantumcraft/core/Config.java @@ -45,7 +45,6 @@ public class Config { public static String NameBlockIOS = "machineIOS"; // Block ION Scanner public static String NameBlockIOH = "machineIOH"; // Block ION Harvester public static String NameBlockQCP = "machineQCP"; // Block Q Capacitor - public static String NameBlockSGN = "machineSGN"; // Block Steam Generator public static String NameBlockQFiberWire = "blockFiberWire"; public static String NameBlockMCasing = "quantumMachineCasing"; public static String NameTextureQOre = "oreQuantonium.ore"; @@ -88,7 +87,6 @@ public class Config { public static int BlockIOSID; public static int BlockIOHID; public static int BlockQCPID; - public static int BlockSGNID; public static int BlockFiberWireID; public static int BlockMCasingID; public static int IONForgeEnergyCost; @@ -161,7 +159,6 @@ public static void loadPropertiesFromFile(File file) { BlockIOTID = config.get("Blocks", "BlockIONTunneler", 3611).getInt(); BlockIOSID = config.get("Blocks", "BlockIONScanner", 3612).getInt(); BlockIOHID = config.get("Blocks", "BlockIONHarvester", 3613).getInt(); - BlockSGNID = config.get("Blocks", "BlockSteamGenerator", 3615).getInt(); // DO NOT PUT ANY BLOCK IDS FROM 3630 TO 3635! BlockQCPID = config.get("Blocks", "BlockQCapacitor", 3630).getInt(); diff --git a/src/main/java/quantumcraft/core/Loader.java b/src/main/java/quantumcraft/core/Loader.java index b4dfad6..1f5df5a 100644 --- a/src/main/java/quantumcraft/core/Loader.java +++ b/src/main/java/quantumcraft/core/Loader.java @@ -11,10 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraftforge.common.EnumHelper; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; import quantumcraft.blocks.*; -import quantumcraft.fluid.FluidSteam; import quantumcraft.items.*; import quantumcraft.items.tools.ItemQuantumAxe; import quantumcraft.items.tools.ItemQuantumPick; @@ -63,7 +61,6 @@ public class Loader { public static BlockIONTunneler BlockIONTunneler; public static BlockIONScanner BlockIONScanner; public static BlockIONHarvester BlockIONHarvester; - public static BlockSteamGenerator BlockSteamGenerator; public static Block BlockMachineCasing; public static BlockQCapacitor[] capacitors = new BlockQCapacitor[5]; /* OTHER BLOCKS */ @@ -78,7 +75,6 @@ public static void initAll() { initRenderers(); initWGen(); initTEs(); - initFluids(); initOreDict(); CraftingManager.addCrafting(); CraftingManager.addSmelting(); @@ -187,10 +183,6 @@ public static void initItems() { LanguageRegistry.addName(ItemQuantumPlating, "Quantum Plating"); } - public static void initFluids() { - FluidRegistry.registerFluid(FluidSteam.fluid); - } - public static void initBlocks() { OreUnbioxenium = (BlockOre) new BlockOre(Config.OreUnbioxeniumID).setCreativeTab(tabQuantumCraft) .setUnlocalizedName(Config.NameOreUnbioxenium) @@ -257,12 +249,6 @@ public static void initBlocks() { GameRegistry.registerBlock(BlockQCapacitor, Config.NameBlockQCP + i); } if (Config.beta.getBoolean(false)) { - BlockSteamGenerator = - (BlockSteamGenerator) new BlockSteamGenerator(Config.BlockSGNID).setCreativeTab(tabQuantumCraft) - .setUnlocalizedName(Config.NameBlockSGN); - LanguageRegistry.addName(BlockSteamGenerator, "Steam Generator"); - GameRegistry.registerBlock(BlockSteamGenerator, Config.NameBlockSGN); - BlockQDislocator = (BlockQDislocator) new BlockQDislocator(Config.BlockQDSID).setCreativeTab(tabQuantumCraft) .setUnlocalizedName(Config.NameBlockQDS); @@ -323,7 +309,6 @@ public static void initTEs() { GameRegistry.registerTileEntity(TileIONScanner.class, "IONScannerTE"); GameRegistry.registerTileEntity(TileIONTunneler.class, "IONTunnelerTE"); GameRegistry.registerTileEntity(TileQCapacitor.class, "QCapacitorTE"); - GameRegistry.registerTileEntity(TileSteamGenerator.class, "SteamGeneratorTE"); if (hasBuildCraft()) { GameRegistry.registerTileEntity(TileQElectrifier.class, "QElectrifierTE"); diff --git a/src/main/java/quantumcraft/core/QuantumCraft.java b/src/main/java/quantumcraft/core/QuantumCraft.java index 9482e12..eb69672 100644 --- a/src/main/java/quantumcraft/core/QuantumCraft.java +++ b/src/main/java/quantumcraft/core/QuantumCraft.java @@ -6,21 +6,16 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import debughandler.DebugRegistry; import debughandler.LogHandler; -import net.minecraft.util.Icon; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import quantumcraft.core.network.PacketHandler; -import quantumcraft.fluid.FluidSteam; - -import java.util.HashMap; @Mod(modid = "QuantumCraft", name = "Quantum Craft", version = "@VERSION@", dependencies = "after:BuildCraft|Silicon") @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = {Config.modNetworkChannel}, @@ -55,6 +50,5 @@ public void postInit(FMLPostInitializationEvent event) { @ForgeSubscribe @SideOnly(Side.CLIENT) public void beforeTextureStitch(TextureStitchEvent.Pre event) { logHandler.debugPrint("preStitch called"); - FluidSteam.fluid.setIcons(event.map.registerIcon("QuantumCraft:fluidSteam")); } } diff --git a/src/main/java/quantumcraft/fluid/FluidSteam.java b/src/main/java/quantumcraft/fluid/FluidSteam.java deleted file mode 100644 index 01cf724..0000000 --- a/src/main/java/quantumcraft/fluid/FluidSteam.java +++ /dev/null @@ -1,15 +0,0 @@ -package quantumcraft.fluid; - -import net.minecraftforge.fluids.Fluid; -import quantumcraft.core.QuantumCraft; - -public class FluidSteam extends Fluid{ - public static final FluidSteam fluid = new FluidSteam(); - - public FluidSteam() { - super("Steam"); - setUnlocalizedName("Steam"); - setGaseous(true); - QuantumCraft.logHandler.debugPrint("Icon for FluidSteam " + getIcon()); - } -} diff --git a/src/main/java/quantumcraft/gui/GuiSteamGenerator.java b/src/main/java/quantumcraft/gui/GuiSteamGenerator.java deleted file mode 100644 index 642d6a3..0000000 --- a/src/main/java/quantumcraft/gui/GuiSteamGenerator.java +++ /dev/null @@ -1,72 +0,0 @@ -package quantumcraft.gui; - -import net.minecraft.inventory.Container; -import org.lwjgl.opengl.GL11; -import quantumcraft.gui.abstractguis.GuiBase; -import quantumcraft.inventory.ContainerSteamGenerator; -import quantumcraft.tile.TileQDematerializer; -import quantumcraft.tile.TileSteamGenerator; - -public class GuiSteamGenerator extends GuiBase { - - public GuiSteamGenerator(Container container) { - super(container, 200, 170); - tile = ((ContainerSteamGenerator) container).tile; - addHoverHandler(new HoverHandler(0, this), 189, 9, 9, 9); - addHoverHandler(new HoverHandler(1, this), 206, 50, 12, 68); - addClickHandler(new ClickHandler(0), 189, 9, 9, 9); - } - - protected void drawBackground() { - if (this.renderContents) { - drawBaseBG(); - bindImage(GuiTextures.GUI_1SLOT_BG); - drawQuad(30, 50, 0, 1, 0, 1, 18, 18); - bindImage(GuiTextures.GUI_DIVIDER_V); - drawQuad(110, 31, 0, 1, 0, 1, 2, 59); - } - } - - protected void drawProgressBar() { - int x = 33; - int y = 70; - int width = 47 - (int) ((float) ((TileSteamGenerator) tile).fuelBuffer / - (float) ((TileSteamGenerator) tile).curMaxFuelBuffer * 47F); - if (width > 45) { - width = 0; - } - int height = 5; - bindImage(GuiTextures.GUI_PROGRESS_BELOW); - drawQuad(x, y, 0, (float) width / 47F, 0, (float) height / 5F, width, height); - } - - protected void drawForeground() { - if (this.renderContents) { - bindImage(GuiTextures.GUI_BUTTON_CLOSE); - GL11.glColor3f(1F, buffHT[0] ? 0F : 0.4F, buffHT[0] ? 0F : 0.4F); - drawQuad(189, 9, 0, 1, 0, 1, 9, 9); - GL11.glColor3f(1F, 1F, 1F); - - float flt = (float) ((TileSteamGenerator) tile).getSteamBuffer() / - (float) ((TileSteamGenerator) tile).getSteamTankMax(); - int h = (int) (flt * 67); - int tarx = 213 + 3; - int tary = 40 + 11 + 8 + (67 - h); - bindImage(GuiTextures.GUI_POWER_BAR); - drawTexturedModalRect(213, 40, 8, 9, 17, 105); - drawTexturedModalRect(tarx, tary, 51, 9 + (67 - h), 10, h); - drawTexturedModalRect(tarx, 40 + 11 + 8, 33, 9, 10, 67); - - drawTexturedModalRect(tarx, 40 + 11 + 8, 69, 9, 10, 67); - - drawProgressBar(); - - this.fontRenderer.drawString(((TileSteamGenerator) tile).getInvName(), 15, 15, 0x000000); - this.fontRenderer.drawString("Reserved for", 128, 55, 0x333333); - this.fontRenderer.drawString("upgrades", 138, 65, 0x333333); - this.fontRenderer.drawString("Heat: " + ((TileSteamGenerator)tile).heat, 60, 65, 0x333333); - - handleHover(); - } - } -} diff --git a/src/main/java/quantumcraft/gui/abstractguis/GuiBase.java b/src/main/java/quantumcraft/gui/abstractguis/GuiBase.java index 0c9fa15..a8001c9 100644 --- a/src/main/java/quantumcraft/gui/abstractguis/GuiBase.java +++ b/src/main/java/quantumcraft/gui/abstractguis/GuiBase.java @@ -10,9 +10,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import quantumcraft.gui.GuiSteamGenerator; import quantumcraft.gui.GuiTextures; -import quantumcraft.tile.TileSteamGenerator; import quantumcraft.tile.abstracttiles.TileMachineBase; import java.util.ArrayList; @@ -39,13 +37,8 @@ protected void handleHover() { renderTooltipText("Close this GUI", buffHX, buffHY); } if (buffHT[1]) { - if (this instanceof GuiSteamGenerator) { - renderTooltipText(((TileSteamGenerator) tile).getSteamBuffer() + " / " + - ((TileSteamGenerator) tile).getSteamTankMax() + " Steam", buffHX, buffHY); - } else { - renderTooltipText(tile.getCurrentEnergy() + " / " + tile.getMaxEnergy() + " QEU", buffHX, buffHY); - } - } + renderTooltipText(tile.getCurrentEnergy() + " / " + tile.getMaxEnergy() + " QEU", buffHX, buffHY); + } } protected void drawBaseBG() { diff --git a/src/main/java/quantumcraft/inventory/ContainerSteamGenerator.java b/src/main/java/quantumcraft/inventory/ContainerSteamGenerator.java deleted file mode 100644 index 89fd0b0..0000000 --- a/src/main/java/quantumcraft/inventory/ContainerSteamGenerator.java +++ /dev/null @@ -1,25 +0,0 @@ -package quantumcraft.inventory; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import quantumcraft.inventory.abstractinv.ContainerUpdatedBase; -import quantumcraft.tile.TileSteamGenerator; - -public class ContainerSteamGenerator extends ContainerUpdatedBase { - - public TileSteamGenerator tile; - - public ContainerSteamGenerator(InventoryPlayer ip, TileSteamGenerator te) { - super(ip); - tile = te; - this.addSlotToContainer(new Slot(tile, 0, 40, 60)); - } - - @Override - public boolean canInteractWith(EntityPlayer entityPlayer) { - return this.tile.isUseableByPlayer(entityPlayer); - } - -} diff --git a/src/main/java/quantumcraft/tile/TileSteamGenerator.java b/src/main/java/quantumcraft/tile/TileSteamGenerator.java deleted file mode 100644 index 5683e33..0000000 --- a/src/main/java/quantumcraft/tile/TileSteamGenerator.java +++ /dev/null @@ -1,257 +0,0 @@ -package quantumcraft.tile; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.*; -import quantumcraft.core.QuantumCraft; -import quantumcraft.fluid.FluidSteam; -import quantumcraft.inventory.SimpleInventory; -import quantumcraft.tile.abstracttiles.TileMachineBase; -import quantumcraft.util.TileUtil; - -public class TileSteamGenerator extends TileMachineBase implements IFluidHandler, IInventory { - private FluidTank tank = new FluidTank(12000); - public ItemStack[] inventory = new ItemStack[1]; - public int heat = 0; - - public int getSteamBuffer() { - return tank.getFluidAmount(); - } - - public int getSteamTankMax() { - return tank.getCapacity(); - } - - @Override - public int getMaxEnergy() { - return 0; - } - - @Override - public int guiID() { - return 8; - } - - @Override - public void onBlockBreak() { - SimpleInventory tmp = new SimpleInventory(inventory, "tmp", 64); - tmp.dropContents(worldObj, xCoord, yCoord, zCoord); - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - tank.writeToNBT(nbttagcompound); - NBTTagList nbttaglist = new NBTTagList(); - nbttagcompound.setInteger("fuelBuffer", fuelBuffer); - nbttagcompound.setInteger("heat", heat); - for (int i = 0; i < this.inventory.length; ++i) { - if (this.inventory[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - this.inventory[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - nbttagcompound.setTag("Items", nbttaglist); - super.writeToNBT(nbttagcompound); - QuantumCraft.logHandler.debugPrint(this, - "After write to nbt: Fuel buffer, tankFluidAmount: " + fuelBuffer + " | " + tank.getFluidAmount()); - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - heat = nbttagcompound.getInteger("heat"); - fuelBuffer = nbttagcompound.getInteger("fuelBuffer"); - tank.readFromNBT(nbttagcompound); - NBTTagList nbttaglist = nbttagcompound.getTagList("Items"); - this.inventory = new ItemStack[this.getSizeInventory()]; - - for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.tagAt(i); - byte b0 = nbttagcompound1.getByte("Slot"); - - if (b0 >= 0 && b0 < this.inventory.length) { - this.inventory[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); - } - } - QuantumCraft.logHandler.debugPrint(this, - "After readFromNbt: Fuel buffer, tankFluidAmount: " + fuelBuffer + " | " + tank.getFluidAmount()); - updateNextTick = true; - } - - @Override - public int fill(ForgeDirection forgeDirection, FluidStack fluidStack, boolean b) { - return 0; - } - - @Override - public FluidStack drain(ForgeDirection forgeDirection, FluidStack resource, boolean doDrain) { - if (resource.fluidID == FluidSteam.fluid.getID()) { - return tank.drain(resource.amount, doDrain); - } else { - return null; - } - } - - public static int getItemBurnTime(ItemStack par0ItemStack) { - if (par0ItemStack == null) { - return 0; - } else { - int var1 = par0ItemStack.getItem().itemID; - - if (par0ItemStack.getItem() instanceof ItemBlock && Block.blocksList[var1] != null) { - Block var3 = Block.blocksList[var1]; - - if (var3 == Block.woodSingleSlab) { - return 150; - } - - if (var3.blockMaterial == Material.wood) { - return 300; - } - } - - if (var1 == Item.stick.itemID) return 100; - if (var1 == Item.coal.itemID) return 1600; - if (var1 == Item.bucketLava.itemID) return 20000; - if (var1 == Block.sapling.blockID) return 100; - if (var1 == Item.blazeRod.itemID) return 2400; - return GameRegistry.getFuelValue(par0ItemStack); - } - } - - public int fuelBuffer = 0; - public int curMaxFuelBuffer = 0; - - @Override - public void updateEntity() { - super.updateEntity(); - if (worldObj.getWorldTime() % 60 == 0) { - if (fuelBuffer > 0) { - if (heat < 100) heat++; - } else { - if (!(heat <= 1))heat--; - } - } - if (worldObj.getWorldTime() % 10 == 0) { - QuantumCraft.logHandler.debugPrint(this, "Heat value: " + heat); - if (getItemBurnTime(inventory[0]) > 0 && fuelBuffer <= 0 && tank.getCapacity() > tank.getFluidAmount()) { - fuelBuffer += getItemBurnTime(inventory[0]); - curMaxFuelBuffer = getItemBurnTime(inventory[0]); - decrStackSize(0, 1); - } - if (fuelBuffer >= 0) { - if (tank.getFluidAmount() >= tank.getCapacity()) return; - QuantumCraft.logHandler.debugPrint(this, "Fluid in tank: " + tank.getFluidAmount()); - - if (heat <= 0) heat = 1; - int fuelUse = (100 / heat) * 10; - int fluidUse = 10; - if (fluidUse > fuelBuffer) fluidUse = fuelBuffer; - if (fluidUse > tank.getCapacity() - tank.getFluidAmount()) - fluidUse = tank.getCapacity() - tank.getFluidAmount(); - FluidStack fs = new FluidStack(FluidSteam.fluid, fluidUse); - tank.fill(fs, true); - fuelBuffer -= fuelUse; - } - } - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return tank.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(ForgeDirection forgeDirection, Fluid fluid) { - return false; - } - - @Override - public boolean canDrain(ForgeDirection forgeDirection, Fluid fluid) { - return fluid.getID() == FluidSteam.fluid.getID(); - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection forgeDirection) { - return new FluidTankInfo[]{tank.getInfo()}; - } - - @Override - public int getSizeInventory() { - return inventory.length; - } - - @Override - public ItemStack getStackInSlot(int i) { - return inventory[i]; - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return TileUtil.decrStackSize(i, j, inventory); - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - ItemStack stack = inventory[i]; - inventory[i] = null; - return stack; - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemStack) { - inventory[i] = itemStack; - - if (itemStack != null && itemStack.stackSize > this.getInventoryStackLimit()) { - itemStack.stackSize = this.getInventoryStackLimit(); - } - } - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemStack) { - return true; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityPlayer) { - return this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord, this.zCoord) == this && entityPlayer - .getDistanceSq((double) this.xCoord + 0.5D, (double) this.yCoord + 0.5D, (double) this.zCoord + 0.5D) <= - 64.0D; - } - - - @Override - public String getInvName() { - return "Steam Generator"; - } - - @Override - public boolean isInvNameLocalized() { - return false; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public void openChest() { - } - - @Override - public void closeChest() { - } - -} diff --git a/src/main/resources/assets/quantumcraft/textures/blocks/fluidSteam.png b/src/main/resources/assets/quantumcraft/textures/blocks/fluidSteam.png deleted file mode 100644 index a82f6de24ba03fb0bc470017d57fc3e7c081f52b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 715 zcmV;+0yO=JP)WFU8GbZ8()Nlj2>E@cM*00J*bL_t(I%T1C?ZW~t= zM9=+nlTA{xE$@F30fKBQjse*coBiJXWWWqEtU&=)r%L|%!+hrpWR291U@#Amk zMn#zsbQPINXHn9`2;Sbl5va^( z*+*gQI%8{DvF5E-MAT#2%3qx6A|e9`!CMtGpExD5LA?` zqPsCO)C?7+f%!j9=hKPD@xZ@*e`8%1j>mx+-1q$nO+Xb?jjEz~^2tcdjG4)K+i*8y zjKPe6ZYmR1K}4U%hN8&`L=-bXKoq(Pt!k>8jAYJ0M4+E<>lS8A<``5r$WseKj=)TD zRpD~IP*sd$JeN?Rs{p~&F@>hcYTTX7ATu#{JZDigs7Th+N=6bf5mEBLGpQ=3j!MxY zv