diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java index 6ebb523b8..69e5ab73d 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java @@ -20,6 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.IClimateControlled; @@ -34,7 +35,7 @@ import forestry.core.inventory.TileInventoryAdapter; import forestry.core.network.GuiId; import forestry.core.tiles.ILiquidTankTile; -public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IInventory, ILiquidTankTile, IAlvearyComponent.Climatiser { +public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IInventory, ILiquidTankTile, IFluidHandler, IAlvearyComponent.Climatiser { private final HygroregulatorRecipe[] recipes; @@ -56,7 +57,7 @@ public class TileAlvearyHygroregulator extends TileAlvearyWithGui implements IIn Fluid liquidIce = Fluids.ICE.getFluid(); this.liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce); - this.tankManager = new TankManager(liquidTank); + this.tankManager = new TankManager(this, liquidTank); this.recipes = new HygroregulatorRecipe[]{new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f), new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f), diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index 9dd1d8aaa..114d546d6 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -14,7 +14,6 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -45,6 +44,7 @@ import forestry.core.network.PacketTankLevelUpdate; import forestry.core.proxy.Proxies; import forestry.core.render.EnumTankLevel; import forestry.core.tiles.ILiquidTankTile; +import forestry.core.tiles.IRenderableTile; import forestry.core.utils.NBTUtil; import forestry.core.utils.NBTUtil.NBTList; @@ -60,7 +60,6 @@ public class TankManager implements ITankManager, IStreamable, INBTTagable { private final Table prevFluidStacks = HashBasedTable.create(); // tank tile updates, for blocks that show fluid levels on the outside - @Nullable private final ILiquidTankTile tile; private final List tankLevels = new ArrayList<>(); @@ -68,11 +67,7 @@ public class TankManager implements ITankManager, IStreamable, INBTTagable { this.tile = null; } - public TankManager(StandardTank... tanks) { - this(null, tanks); - } - - public TankManager(@Nullable ILiquidTankTile tile, StandardTank... tanks) { + public TankManager(ILiquidTankTile tile, StandardTank... tanks) { this.tile = tile; addAll(Arrays.asList(tanks)); } @@ -241,7 +236,7 @@ public class TankManager implements ITankManager, IStreamable, INBTTagable { } private void updateTankLevels(StandardTank tank, boolean sendUpdate) { - if (tile == null) { + if (!(tile instanceof IRenderableTile)) { return; } diff --git a/src/main/java/forestry/core/tiles/ILiquidTankTile.java b/src/main/java/forestry/core/tiles/ILiquidTankTile.java index 92f0ff6d9..e54167e79 100644 --- a/src/main/java/forestry/core/tiles/ILiquidTankTile.java +++ b/src/main/java/forestry/core/tiles/ILiquidTankTile.java @@ -12,22 +12,14 @@ package forestry.core.tiles; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; - -import net.minecraftforge.fluids.IFluidHandler; import forestry.core.fluids.ITankManager; -public interface ILiquidTankTile extends IFluidHandler { +public interface ILiquidTankTile extends ILocatable { ITankManager getTankManager(); void getGUINetworkData(int messageId, int data); void sendGUINetworkData(Container container, ICrafting iCrafting); - - ChunkCoordinates getCoordinates(); - - World getWorld(); } diff --git a/src/main/java/forestry/core/tiles/ILocatable.java b/src/main/java/forestry/core/tiles/ILocatable.java new file mode 100644 index 000000000..fdcc6aaad --- /dev/null +++ b/src/main/java/forestry/core/tiles/ILocatable.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.tiles; + +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; + +public interface ILocatable { + ChunkCoordinates getCoordinates(); + + World getWorld(); +} diff --git a/src/main/java/forestry/core/tiles/TileAnalyzer.java b/src/main/java/forestry/core/tiles/TileAnalyzer.java index 02489f8ac..d1241c8e1 100644 --- a/src/main/java/forestry/core/tiles/TileAnalyzer.java +++ b/src/main/java/forestry/core/tiles/TileAnalyzer.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.arboriculture.TreeManager; import forestry.api.core.ForestryAPI; @@ -52,7 +53,7 @@ import forestry.core.utils.InventoryUtil; import forestry.core.utils.SlotUtil; import forestry.plugins.PluginManager; -public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankTile, IItemStackDisplay { +public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler, IItemStackDisplay { /* CONSTANTS */ private static final int TIME_TO_ANALYZE = 125; @@ -80,7 +81,7 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui super(800, Constants.MACHINE_MAX_ENERGY, 160); setInternalInventory(new AnalyzerInventoryAdapter(this)); resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, Fluids.HONEY.getFluid()); - tankManager = new TankManager(resourceTank); + tankManager = new TankManager(this, resourceTank); invInput = new InventoryMapper(getInternalInventory(), SLOT_INPUT_1, SLOT_INPUT_COUNT); invOutput = new InventoryMapper(getInternalInventory(), SLOT_OUTPUT_1, SLOT_OUTPUT_COUNT); } diff --git a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java index 40c0098dd..38635981d 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -24,6 +24,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; @@ -45,7 +46,7 @@ import forestry.core.network.GuiId; import forestry.core.tiles.ILiquidTankTile; import forestry.core.tiles.TileEngine; -public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILiquidTankTile { +public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILiquidTankTile, IFluidHandler { /* CONSTANTS */ public static final short SLOT_CAN = 0; @@ -71,7 +72,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi fuelTank.tankMode = StandardTank.TankMode.DEFAULT; heatingTank = new FilteredTank(Constants.ENGINE_TANK_CAPACITY, FluidRegistry.LAVA); heatingTank.tankMode = StandardTank.TankMode.INPUT; - this.tankManager = new TankManager(fuelTank, heatingTank); + this.tankManager = new TankManager(this, fuelTank, heatingTank); } @Override diff --git a/src/main/java/forestry/energy/tiles/TileGenerator.java b/src/main/java/forestry/energy/tiles/TileGenerator.java index fca9ba1cd..e11a2782e 100644 --- a/src/main/java/forestry/energy/tiles/TileGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileGenerator.java @@ -23,6 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; @@ -47,7 +48,7 @@ import forestry.plugins.PluginIC2; import ic2.api.energy.prefab.BasicSource; -public class TileGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile { +public class TileGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IFluidHandler, IRenderableTile { // / CONSTANTS private static final int maxEnergy = 30000; diff --git a/src/main/java/forestry/factory/tiles/TileBottler.java b/src/main/java/forestry/factory/tiles/TileBottler.java index ee69a8b92..6afb5f4a0 100644 --- a/src/main/java/forestry/factory/tiles/TileBottler.java +++ b/src/main/java/forestry/factory/tiles/TileBottler.java @@ -30,6 +30,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional; @@ -53,7 +54,7 @@ import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; -public class TileBottler extends TilePowered implements ISidedInventory, ILiquidTankTile { +public class TileBottler extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler { private static final int TICKS_PER_RECIPE_TIME = 10; private static final int ENERGY_PER_RECIPE_TIME = 750; diff --git a/src/main/java/forestry/factory/tiles/TileCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java index f6a1a9a5b..d08fddae6 100644 --- a/src/main/java/forestry/factory/tiles/TileCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; @@ -51,7 +52,7 @@ import forestry.core.utils.PlayerUtil; import forestry.core.utils.SlotUtil; import forestry.factory.recipes.CarpenterRecipeManager; -public class TileCarpenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IItemStackDisplay { +public class TileCarpenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler, IItemStackDisplay { /* CONSTANTS */ public final static int SLOT_CRAFTING_1 = 0; diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index 32cd73828..8de02c36a 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -25,6 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.ForestryAPI; import forestry.api.recipes.IFabricatorRecipe; @@ -51,7 +52,7 @@ import forestry.core.utils.SlotUtil; import forestry.factory.recipes.FabricatorRecipeManager; import forestry.factory.recipes.FabricatorSmeltingRecipeManager; -public class TileFabricator extends TilePowered implements ICrafter, ILiquidTankTile, ISidedInventory { +public class TileFabricator extends TilePowered implements ICrafter, ILiquidTankTile, IFluidHandler, ISidedInventory { /* CONSTANTS */ private static final int MAX_HEAT = 5000; @@ -83,7 +84,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank setInternalInventory(new FabricatorInventoryAdapter(this)); moltenTank = new FilteredTank(2 * Constants.BUCKET_VOLUME, Fluids.GLASS.getFluid()); moltenTank.tankMode = StandardTank.TankMode.INTERNAL; - tankManager = new TankManager(moltenTank); + tankManager = new TankManager(this, moltenTank); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileFermenter.java b/src/main/java/forestry/factory/tiles/TileFermenter.java index 669c81eae..4d1d97416 100644 --- a/src/main/java/forestry/factory/tiles/TileFermenter.java +++ b/src/main/java/forestry/factory/tiles/TileFermenter.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional; @@ -54,7 +55,7 @@ import forestry.factory.triggers.FactoryTriggers; import buildcraft.api.statements.ITriggerExternal; -public class TileFermenter extends TilePowered implements ISidedInventory, ILiquidTankTile { +public class TileFermenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler { // / CONSTANTS public static final short SLOT_RESOURCE = 0; diff --git a/src/main/java/forestry/factory/tiles/TileMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java index 7a223ddb1..a50791ff5 100644 --- a/src/main/java/forestry/factory/tiles/TileMoistener.java +++ b/src/main/java/forestry/factory/tiles/TileMoistener.java @@ -25,6 +25,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; @@ -51,7 +52,7 @@ import forestry.core.utils.ItemStackUtil; import forestry.core.utils.SlotUtil; import forestry.factory.recipes.MoistenerRecipeManager; -public class TileMoistener extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile { +public class TileMoistener extends TileBase implements ISidedInventory, ILiquidTankTile, IFluidHandler, IRenderableTile { /* CONSTANTS */ private static final short SLOT_STASH_1 = 0; diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index 7438deed4..6d6870b62 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -25,6 +25,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.BiomeHelper; import forestry.api.core.ForestryAPI; @@ -44,7 +45,7 @@ import forestry.core.tiles.ILiquidTankTile; import forestry.core.tiles.TileBase; import forestry.core.utils.ItemStackUtil; -public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile { +public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile, IFluidHandler { /* CONSTANTS */ public static final short SLOT_RESOURCE = 0; @@ -63,7 +64,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa setHints(Config.hints.get("raintank")); resourceTank = new FilteredTank(Constants.RAINTANK_TANK_CAPACITY, FluidRegistry.WATER); - tankManager = new TankManager(resourceTank); + tankManager = new TankManager(this, resourceTank); } @Override diff --git a/src/main/java/forestry/factory/tiles/TileSqueezer.java b/src/main/java/forestry/factory/tiles/TileSqueezer.java index 5bd09c19b..1bee0b5dc 100644 --- a/src/main/java/forestry/factory/tiles/TileSqueezer.java +++ b/src/main/java/forestry/factory/tiles/TileSqueezer.java @@ -23,6 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; @@ -52,7 +53,7 @@ import forestry.core.utils.ItemStackUtil; import forestry.core.utils.PlayerUtil; import forestry.factory.recipes.SqueezerRecipeManager; -public class TileSqueezer extends TilePowered implements ISocketable, ISidedInventory, ILiquidTankTile, ISpeedUpgradable { +public class TileSqueezer extends TilePowered implements ISocketable, ISidedInventory, ILiquidTankTile, IFluidHandler, ISpeedUpgradable { private static final int TICKS_PER_RECIPE_TIME = 4; private static final int ENERGY_PER_RECIPE_TIME = 200; diff --git a/src/main/java/forestry/factory/tiles/TileStill.java b/src/main/java/forestry/factory/tiles/TileStill.java index cdd58c850..8aed36a5f 100644 --- a/src/main/java/forestry/factory/tiles/TileStill.java +++ b/src/main/java/forestry/factory/tiles/TileStill.java @@ -23,6 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; @@ -44,7 +45,7 @@ import forestry.core.tiles.ILiquidTankTile; import forestry.core.tiles.TilePowered; import forestry.factory.recipes.StillRecipeManager; -public class TileStill extends TilePowered implements ISidedInventory, ILiquidTankTile { +public class TileStill extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler { /* CONSTANTS */ public static final short SLOT_PRODUCT = 0; diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 9abfed0e6..1a54b4b46 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -24,6 +24,8 @@ import java.util.Stack; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChunkCoordinates; @@ -68,6 +70,7 @@ import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.PacketGuiUpdate; import forestry.core.proxy.Proxies; +import forestry.core.tiles.ILiquidTankTile; import forestry.core.utils.Log; import forestry.core.utils.PlayerUtil; import forestry.core.utils.vect.Vect; @@ -78,7 +81,7 @@ import forestry.farming.gui.IFarmLedgerDelegate; import forestry.farming.logic.FarmLogicArboreal; import forestry.farming.tiles.TileGearbox; -public class FarmController extends RectangularMultiblockControllerBase implements IFarmController { +public class FarmController extends RectangularMultiblockControllerBase implements IFarmController, ILiquidTankTile { private enum Stage { CULTIVATE, HARVEST; @@ -136,7 +139,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen super(world); FilteredTank liquidTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); - this.tankManager = new TankManager(liquidTank); + this.tankManager = new TankManager(this, liquidTank); this.inventory = new FarmInventory(this); this.sockets = new InventoryAdapter(1, "sockets"); @@ -165,6 +168,16 @@ public class FarmController extends RectangularMultiblockControllerBase implemen return tankManager; } + @Override + public void getGUINetworkData(int messageId, int data) { + + } + + @Override + public void sendGUINetworkData(Container container, ICrafting iCrafting) { + + } + private BiomeGenBase getBiome() { if (cachedBiome == null) { CoordTriplet coords = getReferenceCoord(); diff --git a/src/main/java/forestry/farming/tiles/TileValve.java b/src/main/java/forestry/farming/tiles/TileValve.java index 4cd3b3c2e..dc0f2c69f 100644 --- a/src/main/java/forestry/farming/tiles/TileValve.java +++ b/src/main/java/forestry/farming/tiles/TileValve.java @@ -18,11 +18,12 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import forestry.core.fluids.ITankManager; import forestry.core.tiles.ILiquidTankTile; -public class TileValve extends TileFarm implements ILiquidTankTile { +public class TileValve extends TileFarm implements ILiquidTankTile, IFluidHandler { /* ILIQUIDTANKCONTAINER */ @Override