mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 12:59:44 +00:00
Update for new fluid capabilities
This commit is contained in:
1 parent
dbbb727576
commit
7bd5bb120d
58 files changed
+968
-1635
No files matched your search
@@ -16,6 +16,7 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
@@ -242,8 +243,8 @@ public class PluginFactory extends BlankForestryPlugin {
|
||||
|
||||
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
|
||||
ItemRegistryApiculture beeItems = PluginApiculture.items;
|
||||
FluidStack liquidGlass = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME);
|
||||
FluidStack liquidGlassX4 = Fluids.GLASS.getFluid(Constants.BUCKET_VOLUME * 4);
|
||||
FluidStack liquidGlass = Fluids.GLASS.getFluid(Fluid.BUCKET_VOLUME);
|
||||
FluidStack liquidGlassX4 = Fluids.GLASS.getFluid(Fluid.BUCKET_VOLUME * 4);
|
||||
for (int i = 0; i < 16; i++) {
|
||||
RecipeManagers.fabricatorManager.addRecipe(beeItems.waxCast.getWildcard(), liquidGlass, new ItemStack(Blocks.STAINED_GLASS, 4, 15 - i), new Object[]{
|
||||
"#", "X",
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.inventory.InventoryAdapterTile;
|
||||
@@ -32,9 +33,9 @@ public class InventoryBottler extends InventoryAdapterTile<TileBottler> {
|
||||
@Override
|
||||
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
|
||||
if (slotIndex == SLOT_INPUT_EMPTY_CAN) {
|
||||
return FluidHelper.isFillableContainer(itemStack);
|
||||
return FluidHelper.isFillableContainerWithRoom(itemStack);
|
||||
} else if (slotIndex == SLOT_INPUT_FULL_CAN) {
|
||||
FluidStack fluidStack = FluidHelper.getFluidStackInContainer(itemStack);
|
||||
FluidStack fluidStack = FluidUtil.getFluidContained(itemStack);
|
||||
return fluidStack != null && FluidRegistry.isFluidRegistered(fluidStack.getFluid());
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -13,9 +13,9 @@ package forestry.factory.inventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.inventory.InventoryAdapterTile;
|
||||
import forestry.core.utils.SlotUtil;
|
||||
import forestry.factory.recipes.CarpenterRecipeManager;
|
||||
@@ -36,8 +36,8 @@ public class InventoryCarpenter extends InventoryAdapterTile<TileCarpenter> {
|
||||
@Override
|
||||
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
|
||||
if (slotIndex == SLOT_CAN_INPUT) {
|
||||
Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
|
||||
return tile.getTankManager().accepts(fluid);
|
||||
FluidStack fluid = FluidUtil.getFluidContained(itemStack);
|
||||
return tile.getTankManager().canFillFluidType(fluid);
|
||||
} else if (slotIndex == SLOT_BOX) {
|
||||
return CarpenterRecipeManager.isBox(itemStack);
|
||||
} else if (canSlotAccept(SLOT_CAN_INPUT, itemStack) || canSlotAccept(SLOT_BOX, itemStack)) {
|
||||
|
||||
@@ -13,7 +13,8 @@ package forestry.factory.inventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
|
||||
import forestry.api.fuels.FuelManager;
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
@@ -37,10 +38,10 @@ public class InventoryFermenter extends InventoryAdapterTile<TileFermenter> {
|
||||
if (slotIndex == SLOT_RESOURCE) {
|
||||
return FermenterRecipeManager.isResource(itemStack);
|
||||
} else if (slotIndex == SLOT_INPUT) {
|
||||
Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
|
||||
return tile.getTankManager().accepts(fluid);
|
||||
FluidStack fluid = FluidUtil.getFluidContained(itemStack);
|
||||
return tile.getTankManager().canFillFluidType(fluid);
|
||||
} else if (slotIndex == SLOT_CAN_INPUT) {
|
||||
return FluidHelper.isFillableContainer(itemStack);
|
||||
return FluidHelper.isFillableContainerWithRoom(itemStack);
|
||||
} else if (slotIndex == SLOT_FUEL) {
|
||||
return FuelManager.fermenterFuel.containsKey(itemStack);
|
||||
}
|
||||
|
||||
@@ -13,10 +13,10 @@ package forestry.factory.inventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
|
||||
import forestry.api.fuels.FuelManager;
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.inventory.InventoryAdapterTile;
|
||||
import forestry.core.utils.SlotUtil;
|
||||
import forestry.factory.recipes.MoistenerRecipeManager;
|
||||
@@ -46,8 +46,8 @@ public class InventoryMoistener extends InventoryAdapterTile<TileMoistener> {
|
||||
}
|
||||
|
||||
if (slotIndex == SLOT_PRODUCT) {
|
||||
Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
|
||||
return tile.getTankManager().accepts(fluid);
|
||||
FluidStack fluid = FluidUtil.getFluidContained(itemStack);
|
||||
return tile.getTankManager().canFillFluidType(fluid);
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@@ -13,8 +13,11 @@ package forestry.factory.inventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.fluids.Fluids;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
import net.minecraftforge.fluids.capability.IFluidHandler;
|
||||
|
||||
import forestry.core.inventory.InventoryAdapterTile;
|
||||
import forestry.factory.tiles.TileRaintank;
|
||||
|
||||
@@ -29,7 +32,10 @@ public class InventoryRaintank extends InventoryAdapterTile<TileRaintank> {
|
||||
@Override
|
||||
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
|
||||
if (slotIndex == SLOT_RESOURCE) {
|
||||
return FluidHelper.getFilledContainer(Fluids.WATER.getFluid(1000), itemStack) != null;
|
||||
IFluidHandler fluidHandler = FluidUtil.getFluidHandler(itemStack);
|
||||
if (fluidHandler != null) {
|
||||
return fluidHandler.fill(new FluidStack(FluidRegistry.WATER, Integer.MAX_VALUE), false) > 0;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -40,11 +40,11 @@ public class InventorySqueezer extends InventoryAdapterTile<TileSqueezer> {
|
||||
@Override
|
||||
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
|
||||
if (slotIndex == SLOT_CAN_INPUT) {
|
||||
return FluidHelper.isEmptyContainer(itemStack);
|
||||
return FluidHelper.isFillableEmptyContainer(itemStack);
|
||||
}
|
||||
|
||||
if (slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) {
|
||||
if (FluidHelper.isEmptyContainer(itemStack)) {
|
||||
if (FluidHelper.isFillableEmptyContainer(itemStack)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -82,6 +82,6 @@ public class InventorySqueezer extends InventoryAdapterTile<TileSqueezer> {
|
||||
if (getStackInSlot(SLOT_CAN_INPUT) == null || fluidStack == null) {
|
||||
return;
|
||||
}
|
||||
FluidHelper.fillContainers(tankManager, this, SLOT_CAN_INPUT, SLOT_CAN_OUTPUT, fluidStack.getFluid());
|
||||
FluidHelper.fillContainers(tankManager, this, SLOT_CAN_INPUT, SLOT_CAN_OUTPUT, fluidStack.getFluid(), true);
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,8 @@ package forestry.factory.inventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.inventory.InventoryAdapterTile;
|
||||
@@ -31,10 +32,10 @@ public class InventoryStill extends InventoryAdapterTile<TileStill> {
|
||||
@Override
|
||||
public boolean canSlotAccept(int slotIndex, ItemStack itemStack) {
|
||||
if (slotIndex == SLOT_RESOURCE) {
|
||||
return FluidHelper.isEmptyContainer(itemStack);
|
||||
return FluidHelper.isFillableEmptyContainer(itemStack);
|
||||
} else if (slotIndex == SLOT_CAN) {
|
||||
Fluid fluid = FluidHelper.getFluidInContainer(itemStack);
|
||||
return tile.getTankManager().accepts(fluid);
|
||||
FluidStack fluid = FluidUtil.getFluidContained(itemStack);
|
||||
return tile.getTankManager().canFillFluidType(fluid);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -12,59 +12,44 @@ package forestry.factory.recipes;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
import net.minecraftforge.fluids.capability.IFluidHandler;
|
||||
|
||||
public class BottlerRecipe {
|
||||
public static BottlerRecipe create(Fluid res, ItemStack empty) {
|
||||
if (res == null || empty == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
ItemStack filled = empty.copy();
|
||||
filled.stackSize = 1;
|
||||
|
||||
IFluidHandler fluidHandler = FluidUtil.getFluidHandler(filled);
|
||||
if (fluidHandler == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
int fillAmount = fluidHandler.fill(new FluidStack(res, Integer.MAX_VALUE), true);
|
||||
if (fillAmount > 0) {
|
||||
return new BottlerRecipe(empty, new FluidStack(res, fillAmount), filled);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public final FluidStack input;
|
||||
public final ItemStack empty;
|
||||
public final ItemStack filled;
|
||||
|
||||
private BottlerRecipe(ItemStack empty, FluidStack input, ItemStack filled) {
|
||||
this.input = input;
|
||||
if (empty.getItem() instanceof IFluidContainerItem) {
|
||||
FluidStack emptyFluid = FluidHelper.getFluidStackInContainer(empty);
|
||||
if (emptyFluid != null) {
|
||||
this.input.amount -= emptyFluid.amount;
|
||||
}
|
||||
if (this.input.amount > Constants.BUCKET_VOLUME) {
|
||||
this.input.amount = Constants.BUCKET_VOLUME;
|
||||
}
|
||||
}
|
||||
this.empty = empty;
|
||||
this.filled = filled;
|
||||
}
|
||||
|
||||
public boolean matches(ItemStack emptyCan, FluidStack resource) {
|
||||
if (emptyCan == null || resource == null || !emptyCan.isItemEqual(empty)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (empty.getItem() instanceof IFluidContainerItem) {
|
||||
return true;
|
||||
} else {
|
||||
return resource.containsFluid(input);
|
||||
}
|
||||
}
|
||||
|
||||
public static BottlerRecipe getRecipe(FluidStack res, ItemStack empty) {
|
||||
if (res == null || empty == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
ItemStack filled = FluidHelper.getFilledContainer(res.getFluid(), empty);
|
||||
if (filled == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
FluidStack input = FluidHelper.getFluidStackInContainer(filled);
|
||||
if (input == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new BottlerRecipe(empty, input, filled);
|
||||
return emptyCan != null && resource != null && emptyCan.isItemEqual(empty) && resource.containsFluid(input);
|
||||
}
|
||||
}
|
||||
@@ -13,9 +13,9 @@ package forestry.factory.recipes;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidUtil;
|
||||
|
||||
import forestry.api.recipes.ISqueezerRecipe;
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
|
||||
public class SqueezerContainerRecipe implements ISqueezerContainerRecipe {
|
||||
@@ -57,7 +57,7 @@ public class SqueezerContainerRecipe implements ISqueezerContainerRecipe {
|
||||
if (filledContainer == null) {
|
||||
return null;
|
||||
}
|
||||
FluidStack fluidOutput = FluidHelper.getFluidStackInContainer(filledContainer);
|
||||
FluidStack fluidOutput = FluidUtil.getFluidContained(filledContainer);
|
||||
if (fluidOutput == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -48,12 +48,11 @@ public class SqueezerRecipeManager implements ISqueezerManager {
|
||||
|
||||
@Nullable
|
||||
public static ISqueezerContainerRecipe findMatchingContainerRecipe(ItemStack filledContainer) {
|
||||
ItemStack emptyContainer = FluidHelper.getEmptyContainer(filledContainer);
|
||||
if (emptyContainer == null) {
|
||||
if (!FluidHelper.isDrainableFilledContainer(filledContainer)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return containerRecipes.get(emptyContainer);
|
||||
return containerRecipes.get(new ItemStack(filledContainer.getItem()));
|
||||
}
|
||||
|
||||
public static ISqueezerRecipe findMatchingRecipe(ItemStack[] items) {
|
||||
|
||||
@@ -5,6 +5,7 @@ import java.util.List;
|
||||
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import forestry.factory.recipes.BottlerRecipe;
|
||||
|
||||
@@ -16,9 +17,12 @@ public class BottlerRecipeMaker {
|
||||
public static List<BottlerRecipeWrapper> getBottlerRecipes() {
|
||||
List<BottlerRecipeWrapper> recipes = new ArrayList<>();
|
||||
for (FluidContainerData container : FluidContainerRegistry.getRegisteredFluidContainerData()) {
|
||||
BottlerRecipe recipe = BottlerRecipe.getRecipe(container.fluid, container.emptyContainer);
|
||||
if (recipe != null) {
|
||||
recipes.add(new BottlerRecipeWrapper(recipe));
|
||||
FluidStack fluid = container.fluid;
|
||||
if (fluid != null) {
|
||||
BottlerRecipe recipe = BottlerRecipe.create(fluid.getFluid(), container.emptyContainer);
|
||||
if (recipe != null) {
|
||||
recipes.add(new BottlerRecipeWrapper(recipe));
|
||||
}
|
||||
}
|
||||
}
|
||||
return recipes;
|
||||
|
||||
@@ -19,10 +19,10 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.core.config.Constants;
|
||||
@@ -41,7 +41,7 @@ import forestry.factory.gui.GuiBottler;
|
||||
import forestry.factory.inventory.InventoryBottler;
|
||||
import forestry.factory.recipes.BottlerRecipe;
|
||||
|
||||
public class TileBottler extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler {
|
||||
public class TileBottler extends TilePowered implements ISidedInventory, ILiquidTankTile {
|
||||
private static final int TICKS_PER_RECIPE_TIME = 5;
|
||||
private static final int ENERGY_PER_RECIPE_TIME = 1000;
|
||||
|
||||
@@ -98,22 +98,25 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid
|
||||
|
||||
@Override
|
||||
public boolean workCycle() {
|
||||
FluidHelper.FillStatus status = FluidHelper.fillContainers(tankManager, this, InventoryBottler.SLOT_INPUT_EMPTY_CAN, InventoryBottler.SLOT_OUTPUT, currentRecipe.input.getFluid());
|
||||
FluidHelper.FillStatus status = FluidHelper.fillContainers(tankManager, this, InventoryBottler.SLOT_INPUT_EMPTY_CAN, InventoryBottler.SLOT_OUTPUT, currentRecipe.input.getFluid(), true);
|
||||
return status == FluidHelper.FillStatus.SUCCESS;
|
||||
}
|
||||
|
||||
private void checkRecipe() {
|
||||
ItemStack emptyCan = getStackInSlot(InventoryBottler.SLOT_INPUT_EMPTY_CAN);
|
||||
FluidStack resource = resourceTank.getFluid();
|
||||
if (resource == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (currentRecipe == null || !currentRecipe.matches(emptyCan, resource)) {
|
||||
currentRecipe = BottlerRecipe.getRecipe(resource, emptyCan);
|
||||
currentRecipe = BottlerRecipe.create(resource.getFluid(), emptyCan);
|
||||
if (currentRecipe != null) {
|
||||
float viscosityMultiplier = resource.getFluid().getViscosity(resource) / 1000.0f;
|
||||
viscosityMultiplier = (viscosityMultiplier - 1f) / 20f + 1f; // scale down the effect
|
||||
|
||||
int fillAmount = Math.min(currentRecipe.input.amount, resource.amount);
|
||||
float fillTime = fillAmount / (float) Constants.BUCKET_VOLUME;
|
||||
float fillTime = fillAmount / (float) Fluid.BUCKET_VOLUME;
|
||||
fillTime *= viscosityMultiplier;
|
||||
|
||||
setTicksPerWorkCycle(Math.round(fillTime * TICKS_PER_RECIPE_TIME));
|
||||
@@ -164,33 +167,22 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
return tankManager.fill(from, resource, doFill);
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
|
||||
return tankManager.drain(from, maxDrain, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/* ITRIGGERPROVIDER */
|
||||
|
||||
@@ -22,10 +22,9 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.api.recipes.ICarpenterRecipe;
|
||||
@@ -50,7 +49,7 @@ import forestry.factory.inventory.InventoryCarpenter;
|
||||
import forestry.factory.inventory.InventoryGhostCrafting;
|
||||
import forestry.factory.recipes.CarpenterRecipeManager;
|
||||
|
||||
public class TileCarpenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler, IItemStackDisplay {
|
||||
public class TileCarpenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IItemStackDisplay {
|
||||
private static final int TICKS_PER_RECIPE_TIME = 1;
|
||||
private static final int ENERGY_PER_WORK_CYCLE = 2040;
|
||||
private static final int ENERGY_PER_RECIPE_TIME = ENERGY_PER_WORK_CYCLE / 10;
|
||||
@@ -70,7 +69,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
public TileCarpenter() {
|
||||
super("carpenter", 1100, 4000);
|
||||
setEnergyPerWorkCycle(ENERGY_PER_WORK_CYCLE);
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, CarpenterRecipeManager.getRecipeFluids());
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY).setFilters(CarpenterRecipeManager.getRecipeFluids());
|
||||
|
||||
craftingInventory = new InventoryGhostCrafting<>(this, 10);
|
||||
craftPreviewInventory = new InventoryCraftResult();
|
||||
@@ -161,11 +160,12 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
|
||||
FluidStack fluid = currentRecipe.getFluidResource();
|
||||
if (fluid != null) {
|
||||
if (!resourceTank.canDrain(fluid)) {
|
||||
FluidStack drained = resourceTank.drainInternal(fluid, false);
|
||||
if (!FluidHelper.areFluidStacksEqual(drained, fluid)) {
|
||||
return false;
|
||||
}
|
||||
if (doRemove) {
|
||||
resourceTank.drain(fluid.amount, true);
|
||||
resourceTank.drainInternal(fluid, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -243,12 +243,6 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
craftPreviewInventory.setInventorySlotContents(0, itemStack);
|
||||
}
|
||||
|
||||
// IFLUIDCONTAINER IMPLEMENTATION
|
||||
@Override
|
||||
public int fill(EnumFacing direction, FluidStack resource, boolean doFill) {
|
||||
return tankManager.fill(direction, resource, doFill);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TankManager getTankManager() {
|
||||
@@ -256,28 +250,22 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
|
||||
return tankManager.drain(from, maxDrain, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -23,20 +23,19 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.api.recipes.IFabricatorRecipe;
|
||||
import forestry.api.recipes.IFabricatorSmeltingRecipe;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.errors.EnumErrorCode;
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.fluids.Fluids;
|
||||
import forestry.core.fluids.TankManager;
|
||||
import forestry.core.fluids.tanks.FilteredTank;
|
||||
import forestry.core.fluids.tanks.StandardTank;
|
||||
import forestry.core.inventory.IInventoryAdapter;
|
||||
import forestry.core.inventory.InventoryAdapter;
|
||||
import forestry.core.inventory.InventoryAdapterTile;
|
||||
@@ -55,7 +54,7 @@ import forestry.factory.inventory.InventoryGhostCrafting;
|
||||
import forestry.factory.recipes.FabricatorRecipeManager;
|
||||
import forestry.factory.recipes.FabricatorSmeltingRecipeManager;
|
||||
|
||||
public class TileFabricator extends TilePowered implements ISlotPickupWatcher, ILiquidTankTile, IFluidHandler, ISidedInventory {
|
||||
public class TileFabricator extends TilePowered implements ISlotPickupWatcher, ILiquidTankTile, ISidedInventory {
|
||||
private static final int MAX_HEAT = 5000;
|
||||
|
||||
private final InventoryAdapterTile craftingInventory;
|
||||
@@ -69,8 +68,9 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I
|
||||
setEnergyPerWorkCycle(200);
|
||||
craftingInventory = new InventoryGhostCrafting<>(this, InventoryGhostCrafting.SLOT_CRAFTING_COUNT);
|
||||
setInternalInventory(new InventoryFabricator(this));
|
||||
moltenTank = new FilteredTank(8 * Constants.BUCKET_VOLUME, Fluids.GLASS.getFluid());
|
||||
moltenTank.tankMode = StandardTank.TankMode.INTERNAL;
|
||||
|
||||
moltenTank = new FilteredTank(8 * Fluid.BUCKET_VOLUME, false, false).setFilters(Fluids.GLASS.getFluid());
|
||||
|
||||
tankManager = new TankManager(this, moltenTank);
|
||||
}
|
||||
|
||||
@@ -144,9 +144,9 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I
|
||||
}
|
||||
|
||||
FluidStack smeltFluid = smelt.getProduct();
|
||||
if (moltenTank.canFill(smeltFluid)) {
|
||||
if (moltenTank.fillInternal(smeltFluid, false) == smeltFluid.amount) {
|
||||
this.decrStackSize(InventoryFabricator.SLOT_METAL, 1);
|
||||
moltenTank.fill(smeltFluid, true);
|
||||
moltenTank.fillInternal(smeltFluid, true);
|
||||
meltingPoint = smelt.getMeltingPoint();
|
||||
}
|
||||
}
|
||||
@@ -215,7 +215,8 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I
|
||||
return;
|
||||
}
|
||||
|
||||
if (!moltenTank.canDrain(liquid)) {
|
||||
FluidStack drained = moltenTank.drainInternal(liquid, false);
|
||||
if (!FluidHelper.areFluidStacksEqual(drained, liquid)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -249,7 +250,9 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I
|
||||
if (recipe != null) {
|
||||
ItemStack[] crafting = InventoryUtil.getStacks(craftingInventory, InventoryGhostCrafting.SLOT_CRAFTING_1, InventoryGhostCrafting.SLOT_CRAFTING_COUNT);
|
||||
hasResources = removeFromInventory(crafting, null, false);
|
||||
hasLiquidResources = moltenTank.canDrain(recipe.getLiquid());
|
||||
FluidStack toDrain = recipe.getLiquid();
|
||||
FluidStack drained = moltenTank.drainInternal(toDrain, false);
|
||||
hasLiquidResources = FluidHelper.areFluidStacksEqual(drained, toDrain);
|
||||
} else {
|
||||
hasRecipe = false;
|
||||
}
|
||||
@@ -310,7 +313,6 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I
|
||||
return craftingInventory;
|
||||
}
|
||||
|
||||
/* ILIQUIDCONTAINER */
|
||||
@Nonnull
|
||||
@Override
|
||||
public TankManager getTankManager() {
|
||||
@@ -318,33 +320,22 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
return tankManager.fill(from, resource, doFill);
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
|
||||
return tankManager.drain(from, maxDrain, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -21,10 +21,10 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.api.fuels.FermenterFuel;
|
||||
@@ -36,7 +36,6 @@ import forestry.core.errors.EnumErrorCode;
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.fluids.TankManager;
|
||||
import forestry.core.fluids.tanks.FilteredTank;
|
||||
import forestry.core.fluids.tanks.StandardTank;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
@@ -47,7 +46,7 @@ import forestry.factory.gui.GuiFermenter;
|
||||
import forestry.factory.inventory.InventoryFermenter;
|
||||
import forestry.factory.recipes.FermenterRecipeManager;
|
||||
|
||||
public class TileFermenter extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler {
|
||||
public class TileFermenter extends TilePowered implements ISidedInventory, ILiquidTankTile {
|
||||
private final FilteredTank resourceTank;
|
||||
private final FilteredTank productTank;
|
||||
private final TankManager tankManager;
|
||||
@@ -64,10 +63,13 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
super("fermenter", 2000, 8000);
|
||||
setEnergyPerWorkCycle(4200);
|
||||
setInternalInventory(new InventoryFermenter(this));
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FermenterRecipeManager.recipeFluidInputs);
|
||||
resourceTank.tankMode = StandardTank.TankMode.INPUT;
|
||||
productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FermenterRecipeManager.recipeFluidOutputs);
|
||||
productTank.tankMode = StandardTank.TankMode.OUTPUT;
|
||||
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, true, false);
|
||||
resourceTank.setFilters(FermenterRecipeManager.recipeFluidInputs);
|
||||
|
||||
productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, false, true);
|
||||
productTank.setFilters(FermenterRecipeManager.recipeFluidOutputs);
|
||||
|
||||
tankManager = new TankManager(this, resourceTank, productTank);
|
||||
}
|
||||
|
||||
@@ -120,7 +122,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
|
||||
FluidStack fluidStack = productTank.getFluid();
|
||||
if (fluidStack != null) {
|
||||
FluidHelper.fillContainers(tankManager, this, InventoryFermenter.SLOT_CAN_INPUT, InventoryFermenter.SLOT_CAN_OUTPUT, fluidStack.getFluid());
|
||||
FluidHelper.fillContainers(tankManager, this, InventoryFermenter.SLOT_CAN_INPUT, InventoryFermenter.SLOT_CAN_OUTPUT, fluidStack.getFluid(), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -129,7 +131,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
public boolean workCycle() {
|
||||
int fermented = Math.min(fermentationTime, fuelCurrentFerment);
|
||||
int productAmount = Math.round(fermented * currentRecipe.getModifier() * currentResourceModifier);
|
||||
productTank.fill(new FluidStack(currentRecipe.getOutput(), productAmount), true);
|
||||
productTank.fillInternal(new FluidStack(currentRecipe.getOutput(), productAmount), true);
|
||||
|
||||
fuelBurnTime--;
|
||||
resourceTank.drain(fermented, true);
|
||||
@@ -222,12 +224,15 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
boolean hasRecipe = currentRecipe != null;
|
||||
boolean hasFuel = fuelBurnTime > 0;
|
||||
boolean hasResource = fermentationTime > 0 || getStackInSlot(InventoryFermenter.SLOT_RESOURCE) != null;
|
||||
boolean hasFluidResource = resourceTank.canDrain(fermented);
|
||||
FluidStack drained = resourceTank.drain(fermented, false);
|
||||
boolean hasFluidResource = drained != null && drained.amount == fermented;
|
||||
boolean hasFluidSpace = true;
|
||||
|
||||
if (hasRecipe) {
|
||||
int productAmount = Math.round(fermented * currentRecipe.getModifier() * currentResourceModifier);
|
||||
hasFluidSpace = productTank.canFill(currentRecipe.getOutput(), productAmount);
|
||||
Fluid output = currentRecipe.getOutput();
|
||||
FluidStack fluidStack = new FluidStack(output, productAmount);
|
||||
hasFluidSpace = productTank.fillInternal(fluidStack, false) == fluidStack.amount;
|
||||
}
|
||||
|
||||
IErrorLogic errorLogic = getErrorLogic();
|
||||
@@ -291,43 +296,12 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
iCrafting.sendProgressBarUpdate(container, 3, fermentationTotalTime);
|
||||
}
|
||||
|
||||
/* ILiquidTankTile */
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
return resourceTank.fill(resource, doFill);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int quantityMax, boolean doEmpty) {
|
||||
return tankManager.drain(from, quantityMax, doEmpty);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TankManager getTankManager() {
|
||||
return tankManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
}
|
||||
|
||||
/* ITRIGGERPROVIDER */
|
||||
// TODO: BuildCraft for 1.9
|
||||
// @Optional.Method(modid = "BuildCraftAPI|statements")
|
||||
@@ -348,4 +322,23 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu
|
||||
public Object getContainer(EntityPlayer player, int data) {
|
||||
return new ContainerFermenter(player.inventory, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -22,11 +22,9 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.api.fuels.FuelManager;
|
||||
@@ -51,7 +49,7 @@ import forestry.factory.gui.GuiMoistener;
|
||||
import forestry.factory.inventory.InventoryMoistener;
|
||||
import forestry.factory.recipes.MoistenerRecipeManager;
|
||||
|
||||
public class TileMoistener extends TileBase implements ISidedInventory, ILiquidTankTile, IFluidHandler, IRenderableTile {
|
||||
public class TileMoistener extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile {
|
||||
private final FilteredTank resourceTank;
|
||||
private final TankManager tankManager;
|
||||
private IMoistenerRecipe currentRecipe;
|
||||
@@ -66,7 +64,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
|
||||
public TileMoistener() {
|
||||
super("moistener");
|
||||
setInternalInventory(new InventoryMoistener(this));
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER);
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY).setFilters(FluidRegistry.WATER);
|
||||
tankManager = new TankManager(this, resourceTank);
|
||||
}
|
||||
|
||||
@@ -480,43 +478,12 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
|
||||
return TankRenderInfo.EMPTY;
|
||||
}
|
||||
|
||||
/* ILiquidTankTile */
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
return tankManager.fill(from, resource, doFill);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TankManager getTankManager() {
|
||||
return tankManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
|
||||
return tankManager.drain(from, maxDrain, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
}
|
||||
|
||||
/* SMP GUI */
|
||||
public void getGUINetworkData(int i, int j) {
|
||||
switch (i) {
|
||||
@@ -551,4 +518,23 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT
|
||||
public Object getContainer(EntityPlayer player, int data) {
|
||||
return new ContainerMoistener(player.inventory, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -23,11 +23,10 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.biome.Biome;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.core.config.Constants;
|
||||
@@ -45,7 +44,7 @@ import forestry.factory.gui.ContainerRaintank;
|
||||
import forestry.factory.gui.GuiRaintank;
|
||||
import forestry.factory.inventory.InventoryRaintank;
|
||||
|
||||
public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile, IFluidHandler {
|
||||
public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTankTile {
|
||||
private static final FluidStack STACK_WATER = Fluids.WATER.getFluid(Constants.RAINTANK_AMOUNT_PER_UPDATE);
|
||||
|
||||
private final FilteredTank resourceTank;
|
||||
@@ -57,7 +56,8 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
|
||||
super("raintank");
|
||||
setInternalInventory(new InventoryRaintank(this));
|
||||
|
||||
resourceTank = new FilteredTank(Constants.RAINTANK_TANK_CAPACITY, FluidRegistry.WATER);
|
||||
resourceTank = new FilteredTank(Constants.RAINTANK_TANK_CAPACITY).setFilters(FluidRegistry.WATER);
|
||||
|
||||
tankManager = new TankManager(this, resourceTank);
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
|
||||
errorLogic.setCondition(!worldObj.isRainingAt(posAbove), EnumErrorCode.NOT_RAINING);
|
||||
|
||||
if (!errorLogic.hasErrors()) {
|
||||
resourceTank.fill(STACK_WATER, true);
|
||||
resourceTank.fillInternal(STACK_WATER, true);
|
||||
}
|
||||
|
||||
if (!ItemStackUtil.isIdenticalItem(usedEmpty, getStackInSlot(InventoryRaintank.SLOT_RESOURCE))) {
|
||||
@@ -126,7 +126,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
|
||||
} else {
|
||||
fillingTime--;
|
||||
if (fillingTime <= 0) {
|
||||
FluidHelper.FillStatus filled = FluidHelper.fillContainers(tankManager, this, InventoryRaintank.SLOT_RESOURCE, InventoryRaintank.SLOT_PRODUCT, Fluids.WATER.getFluid());
|
||||
FluidHelper.FillStatus filled = FluidHelper.fillContainers(tankManager, this, InventoryRaintank.SLOT_RESOURCE, InventoryRaintank.SLOT_PRODUCT, Fluids.WATER.getFluid(), true);
|
||||
if (filled == FluidHelper.FillStatus.SUCCESS) {
|
||||
fillingTime = 0;
|
||||
}
|
||||
@@ -155,32 +155,6 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
|
||||
iCrafting.sendProgressBarUpdate(container, 0, fillingTime);
|
||||
}
|
||||
|
||||
// / ILIQUIDCONTAINER IMPLEMENTATION
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
return tankManager.fill(from, resource, doFill);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
|
||||
return tankManager.drain(from, maxDrain, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TankManager getTankManager() {
|
||||
@@ -188,8 +162,22 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,10 +19,9 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.circuits.ChipsetManager;
|
||||
import forestry.api.circuits.CircuitSocketType;
|
||||
@@ -49,7 +48,7 @@ import forestry.factory.gui.GuiSqueezer;
|
||||
import forestry.factory.inventory.InventorySqueezer;
|
||||
import forestry.factory.recipes.SqueezerRecipeManager;
|
||||
|
||||
public class TileSqueezer extends TilePowered implements ISocketable, ISidedInventory, ILiquidTankTile, IFluidHandler, ISpeedUpgradable {
|
||||
public class TileSqueezer extends TilePowered implements ISocketable, ISidedInventory, ILiquidTankTile, ISpeedUpgradable {
|
||||
private static final int TICKS_PER_RECIPE_TIME = 1;
|
||||
private static final int ENERGY_PER_WORK_CYCLE = 2000;
|
||||
private static final int ENERGY_PER_RECIPE_TIME = ENERGY_PER_WORK_CYCLE / 10;
|
||||
@@ -66,8 +65,7 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
super("squeezer", 1100, Constants.MACHINE_MAX_ENERGY);
|
||||
this.inventory = new InventorySqueezer(this);
|
||||
setInternalInventory(this.inventory);
|
||||
this.productTank = new StandardTank(Constants.PROCESSOR_TANK_CAPACITY);
|
||||
this.productTank.tankMode = StandardTank.TankMode.OUTPUT;
|
||||
this.productTank = new StandardTank(Constants.PROCESSOR_TANK_CAPACITY, false, true);
|
||||
this.tankManager = new TankManager(this, productTank);
|
||||
}
|
||||
|
||||
@@ -138,7 +136,7 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
}
|
||||
|
||||
FluidStack resultFluid = currentRecipe.getFluidOutput();
|
||||
productTank.fill(resultFluid, true);
|
||||
productTank.fillInternal(resultFluid, true);
|
||||
|
||||
if (currentRecipe.getRemnants() != null && worldObj.rand.nextFloat() < currentRecipe.getRemnantsChance()) {
|
||||
ItemStack remnant = currentRecipe.getRemnants().copy();
|
||||
@@ -186,7 +184,7 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
hasRecipe = currentRecipe != null;
|
||||
if (hasRecipe) {
|
||||
FluidStack resultFluid = currentRecipe.getFluidOutput();
|
||||
canFill = productTank.canFill(resultFluid);
|
||||
canFill = productTank.fillInternal(resultFluid, false) == resultFluid.amount;
|
||||
|
||||
if (currentRecipe.getRemnants() != null) {
|
||||
canAdd = inventory.addRemnant(currentRecipe.getRemnants(), false);
|
||||
@@ -208,43 +206,12 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
return new TankRenderInfo(productTank);
|
||||
}
|
||||
|
||||
/* ILIQUIDCONTAINER IMPLEMENTATION */
|
||||
@Nonnull
|
||||
@Override
|
||||
public TankManager getTankManager() {
|
||||
return tankManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
return tankManager.fill(from, resource, doFill);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) {
|
||||
return tankManager.drain(from, maxDrain, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
}
|
||||
|
||||
/* ISocketable */
|
||||
@Override
|
||||
public int getSocketCount() {
|
||||
@@ -289,6 +256,25 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve
|
||||
return CircuitSocketType.MACHINE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getGui(EntityPlayer player, int data) {
|
||||
return new GuiSqueezer(player.inventory, this);
|
||||
|
||||
@@ -18,10 +18,9 @@ import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.common.capabilities.Capability;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.api.recipes.IStillRecipe;
|
||||
@@ -30,7 +29,6 @@ import forestry.core.errors.EnumErrorCode;
|
||||
import forestry.core.fluids.FluidHelper;
|
||||
import forestry.core.fluids.TankManager;
|
||||
import forestry.core.fluids.tanks.FilteredTank;
|
||||
import forestry.core.fluids.tanks.StandardTank;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.DataOutputStreamForestry;
|
||||
import forestry.core.render.TankRenderInfo;
|
||||
@@ -41,7 +39,7 @@ import forestry.factory.gui.GuiStill;
|
||||
import forestry.factory.inventory.InventoryStill;
|
||||
import forestry.factory.recipes.StillRecipeManager;
|
||||
|
||||
public class TileStill extends TilePowered implements ISidedInventory, ILiquidTankTile, IFluidHandler {
|
||||
public class TileStill extends TilePowered implements ISidedInventory, ILiquidTankTile {
|
||||
private static final int ENERGY_PER_RECIPE_TIME = 200;
|
||||
|
||||
private final FilteredTank resourceTank;
|
||||
@@ -54,10 +52,12 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
public TileStill() {
|
||||
super("still", 1100, 8000);
|
||||
setInternalInventory(new InventoryStill(this));
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, StillRecipeManager.recipeFluidInputs);
|
||||
resourceTank.tankMode = StandardTank.TankMode.INPUT;
|
||||
productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, StillRecipeManager.recipeFluidOutputs);
|
||||
productTank.tankMode = StandardTank.TankMode.OUTPUT;
|
||||
resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, true, false);
|
||||
resourceTank.setFilters(StillRecipeManager.recipeFluidInputs);
|
||||
|
||||
productTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, false, true);
|
||||
productTank.setFilters(StillRecipeManager.recipeFluidOutputs);
|
||||
|
||||
tankManager = new TankManager(this, resourceTank, productTank);
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
|
||||
FluidStack fluidStack = productTank.getFluid();
|
||||
if (fluidStack != null) {
|
||||
FluidHelper.fillContainers(tankManager, this, InventoryStill.SLOT_RESOURCE, InventoryStill.SLOT_PRODUCT, fluidStack.getFluid());
|
||||
FluidHelper.fillContainers(tankManager, this, InventoryStill.SLOT_RESOURCE, InventoryStill.SLOT_PRODUCT, fluidStack.getFluid(), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -119,7 +119,7 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
FluidStack output = currentRecipe.getOutput();
|
||||
|
||||
FluidStack product = new FluidStack(output, output.amount * cycles);
|
||||
productTank.fill(product, true);
|
||||
productTank.fillInternal(product, true);
|
||||
|
||||
bufferedLiquid = null;
|
||||
|
||||
@@ -147,12 +147,14 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
boolean hasLiquidResource = true;
|
||||
|
||||
if (hasRecipe) {
|
||||
hasTankSpace = productTank.canFill(currentRecipe.getOutput());
|
||||
FluidStack fluidStack = currentRecipe.getOutput();
|
||||
hasTankSpace = productTank.fillInternal(fluidStack, false) == fluidStack.amount;
|
||||
if (bufferedLiquid == null) {
|
||||
int cycles = currentRecipe.getCyclesPerUnit();
|
||||
FluidStack input = currentRecipe.getInput();
|
||||
int drainAmount = cycles * input.amount;
|
||||
hasLiquidResource = resourceTank.canDrain(drainAmount);
|
||||
FluidStack drained = resourceTank.drain(drainAmount, false);
|
||||
hasLiquidResource = drained != null && drained.amount == drainAmount;
|
||||
if (hasLiquidResource) {
|
||||
bufferedLiquid = new FluidStack(input, drainAmount);
|
||||
resourceTank.drain(drainAmount, true);
|
||||
@@ -178,32 +180,6 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
return new TankRenderInfo(productTank);
|
||||
}
|
||||
|
||||
/* IFluidHandler */
|
||||
@Override
|
||||
public int fill(EnumFacing from, FluidStack resource, boolean doFill) {
|
||||
return tankManager.fill(from, resource, doFill);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) {
|
||||
return tankManager.drain(from, resource, doDrain);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain(EnumFacing from, int quantityMax, boolean doEmpty) {
|
||||
return tankManager.drain(from, quantityMax, doEmpty);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canFill(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canFill(from, fluid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDrain(EnumFacing from, Fluid fluid) {
|
||||
return tankManager.canDrain(from, fluid);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TankManager getTankManager() {
|
||||
@@ -211,8 +187,22 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo[] getTankInfo(EnumFacing from) {
|
||||
return tankManager.getTankInfo(from);
|
||||
public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return true;
|
||||
}
|
||||
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
|
||||
if (super.hasCapability(capability, facing)) {
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
|
||||
return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(tankManager);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user