From cb6682266d4d138d8098e4420199f0097b0b45c7 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 12 Jul 2016 17:35:24 -0400 Subject: [PATCH] Completely transition everything to use new fluid system, including Forge's UniversalBucket. No more old references! --- .../java/mekanism/client/ClientProxy.java | 3 - src/main/java/mekanism/common/Mekanism.java | 34 +---- .../java/mekanism/common/MekanismFluids.java | 49 ++++++++ .../java/mekanism/common/MekanismItems.java | 16 +-- .../mekanism/common/block/BlockBasic.java | 118 +++++++++--------- .../mekanism/common/block/BlockMachine.java | 96 +++++++------- .../container/ContainerChemicalWasher.java | 4 +- .../container/ContainerDynamicTank.java | 4 +- .../container/ContainerElectricPump.java | 5 +- .../container/ContainerFluidTank.java | 4 +- .../container/ContainerFluidicPlenisher.java | 4 +- .../ContainerRotaryCondensentrator.java | 4 +- ...ContainerThermalEvaporationController.java | 8 +- .../common/tile/TileEntityChemicalWasher.java | 4 +- .../common/tile/TileEntityElectricPump.java | 4 +- .../tile/TileEntityElectrolyticSeparator.java | 4 +- .../common/tile/TileEntityFluidTank.java | 2 +- .../tile/TileEntityFluidicPlenisher.java | 4 +- .../common/util/FluidContainerUtils.java | 71 +++++++++-- .../container/ContainerBioGenerator.java | 10 +- .../common/tile/TileEntityBioGenerator.java | 28 ++--- .../mekanism/models/item/BrineBucket.json | 7 -- .../models/item/HeavyWaterBucket.json | 7 -- .../mekanism/models/item/LithiumBucket.json | 7 -- .../mekanism/textures/items/BrineBucket.png | Bin 1502 -> 0 bytes .../textures/items/HeavyWaterBucket.png | Bin 1451 -> 0 bytes .../mekanism/textures/items/LithiumBucket.png | Bin 1374 -> 0 bytes 27 files changed, 262 insertions(+), 235 deletions(-) create mode 100644 src/main/java/mekanism/common/MekanismFluids.java delete mode 100644 src/main/resources/assets/mekanism/models/item/BrineBucket.json delete mode 100644 src/main/resources/assets/mekanism/models/item/HeavyWaterBucket.json delete mode 100644 src/main/resources/assets/mekanism/models/item/LithiumBucket.json delete mode 100644 src/main/resources/assets/mekanism/textures/items/BrineBucket.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/HeavyWaterBucket.png delete mode 100644 src/main/resources/assets/mekanism/textures/items/LithiumBucket.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 9bd2ff9da..fa0c5a8e4 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -400,9 +400,6 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.ElectrolyticCore); registerItemRender(MekanismItems.Sawdust); registerItemRender(MekanismItems.Salt); - registerItemRender(MekanismItems.BrineBucket); - registerItemRender(MekanismItems.LithiumBucket); - registerItemRender(MekanismItems.HeavyWaterBucket); registerItemRender(MekanismItems.Crystal); registerItemRender(MekanismItems.FreeRunners); registerItemRender(MekanismItems.ArmoredJetpack); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 81f9669bd..7120ed276 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -122,7 +122,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.client.event.ConfigChangedEvent; @@ -239,6 +238,10 @@ public class Mekanism public static Set flamethrowerActive = new HashSet(); public static Set activeVibrators = new HashSet(); + + static { + MekanismFluids.register(); + } /** * Adds all in-game crafting, smelting and machine recipes. @@ -1277,35 +1280,6 @@ public class Mekanism logger.info("Detected Tekkit in root directory - hello, fellow user!"); } - GasRegistry.register(new Gas("hydrogen", "mekanism:blocks/liquid/LiquidHydrogen")).registerFluid(); - GasRegistry.register(new Gas("oxygen", "mekanism:blocks/liquid/LiquidOxygen")).registerFluid(); - GasRegistry.register(new Gas("water", "mekanism:blocks/liquid/LiquidSteam")).registerFluid(); - GasRegistry.register(new Gas("chlorine", "mekanism:blocks/liquid/LiquidChlorine")).registerFluid(); - GasRegistry.register(new Gas("sulfurDioxideGas", "mekanism:blocks/liquid/LiquidSulfurDioxide")).registerFluid(); - GasRegistry.register(new Gas("sulfurTrioxideGas", "mekanism:blocks/liquid/LiquidSulfurTrioxide")).registerFluid(); - GasRegistry.register(new Gas("sulfuricAcid", "mekanism:blocks/liquid/LiquidSulfuricAcid")).registerFluid(); - GasRegistry.register(new Gas("hydrogenChloride", "mekanism:blocks/liquid/LiquidHydrogenChloride")).registerFluid(); - GasRegistry.register(new Gas("liquidOsmium", "mekanism:blocks/liquid/LiquidOsmium").setVisible(false)); - GasRegistry.register(new Gas("liquidStone", "mekanism:blocks/liquid/LiquidStone").setVisible(false)); - GasRegistry.register(new Gas("ethene", "mekanism:blocks/liquid/LiquidEthene").registerFluid()); - GasRegistry.register(new Gas("sodium", "mekanism:blocks/liquid/LiquidSodium").registerFluid()); - GasRegistry.register(new Gas("brine", "mekanism:blocks/liquid/LiquidBrine").registerFluid()); - GasRegistry.register(new Gas("deuterium", "mekanism:blocks/liquid/LiquidDeuterium")).registerFluid(); - GasRegistry.register(new Gas("tritium", "mekanism:blocks/liquid/LiquidTritium")).registerFluid(); - GasRegistry.register(new Gas("fusionFuelDT", "mekanism:blocks/liquid/LiquidDT")).registerFluid(); - GasRegistry.register(new Gas("lithium", "mekanism:blocks/liquid/LiquidLithium")).registerFluid(); - - FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"), new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"))); - FluidRegistry.registerFluid(new Fluid("steam", new ResourceLocation("mekanism:blocks/liquid/LiquidSteam"), new ResourceLocation("mekanism:blocks/liquid/LiquidSteam")).setGaseous(true)); - - for(Resource resource : Resource.values()) - { - String name = resource.getName(); - - OreGas clean = (OreGas)GasRegistry.register(new OreGas("clean" + name, "oregas." + name.toLowerCase()).setVisible(false)); - GasRegistry.register(new OreGas(name.toLowerCase(), "oregas." + name.toLowerCase()).setCleanGas(clean).setVisible(false)); - } - //Register blocks and items MekanismItems.register(); MekanismBlocks.register(); diff --git a/src/main/java/mekanism/common/MekanismFluids.java b/src/main/java/mekanism/common/MekanismFluids.java new file mode 100644 index 000000000..0a5de7783 --- /dev/null +++ b/src/main/java/mekanism/common/MekanismFluids.java @@ -0,0 +1,49 @@ +package mekanism.common; + +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.OreGas; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; + +public class MekanismFluids +{ + public static void register() + { + GasRegistry.register(new Gas("hydrogen", "mekanism:blocks/liquid/LiquidHydrogen")).registerFluid(); + GasRegistry.register(new Gas("oxygen", "mekanism:blocks/liquid/LiquidOxygen")).registerFluid(); + GasRegistry.register(new Gas("water", "mekanism:blocks/liquid/LiquidSteam")).registerFluid(); + GasRegistry.register(new Gas("chlorine", "mekanism:blocks/liquid/LiquidChlorine")).registerFluid(); + GasRegistry.register(new Gas("sulfurDioxideGas", "mekanism:blocks/liquid/LiquidSulfurDioxide")).registerFluid(); + GasRegistry.register(new Gas("sulfurTrioxideGas", "mekanism:blocks/liquid/LiquidSulfurTrioxide")).registerFluid(); + GasRegistry.register(new Gas("sulfuricAcid", "mekanism:blocks/liquid/LiquidSulfuricAcid")).registerFluid(); + GasRegistry.register(new Gas("hydrogenChloride", "mekanism:blocks/liquid/LiquidHydrogenChloride")).registerFluid(); + GasRegistry.register(new Gas("liquidOsmium", "mekanism:blocks/liquid/LiquidOsmium").setVisible(false)); + GasRegistry.register(new Gas("liquidStone", "mekanism:blocks/liquid/LiquidStone").setVisible(false)); + GasRegistry.register(new Gas("ethene", "mekanism:blocks/liquid/LiquidEthene").registerFluid()); + GasRegistry.register(new Gas("sodium", "mekanism:blocks/liquid/LiquidSodium").registerFluid()); + GasRegistry.register(new Gas("brine", "mekanism:blocks/liquid/LiquidBrine").registerFluid()); + GasRegistry.register(new Gas("deuterium", "mekanism:blocks/liquid/LiquidDeuterium")).registerFluid(); + GasRegistry.register(new Gas("tritium", "mekanism:blocks/liquid/LiquidTritium")).registerFluid(); + GasRegistry.register(new Gas("fusionFuelDT", "mekanism:blocks/liquid/LiquidDT")).registerFluid(); + GasRegistry.register(new Gas("lithium", "mekanism:blocks/liquid/LiquidLithium")).registerFluid(); + + FluidRegistry.registerFluid(new Fluid("heavyWater", new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"), new ResourceLocation("mekanism:blocks/liquid/LiquidHeavyWater"))); + FluidRegistry.registerFluid(new Fluid("steam", new ResourceLocation("mekanism:blocks/liquid/LiquidSteam"), new ResourceLocation("mekanism:blocks/liquid/LiquidSteam")).setGaseous(true)); + + for(Resource resource : Resource.values()) + { + String name = resource.getName(); + + OreGas clean = (OreGas)GasRegistry.register(new OreGas("clean" + name, "oregas." + name.toLowerCase()).setVisible(false)); + GasRegistry.register(new OreGas(name.toLowerCase(), "oregas." + name.toLowerCase()).setCleanGas(clean).setVisible(false)); + } + + FluidRegistry.enableUniversalBucket(); + + FluidRegistry.addBucketForFluid(FluidRegistry.getFluid("heavywater")); + FluidRegistry.addBucketForFluid(FluidRegistry.getFluid("brine")); + FluidRegistry.addBucketForFluid(FluidRegistry.getFluid("lithium")); + } +} diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index ed5cf8eae..05c9dacb8 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -14,7 +14,6 @@ import mekanism.common.item.ItemDirtyDust; import mekanism.common.item.ItemDust; import mekanism.common.item.ItemElectricBow; import mekanism.common.item.ItemEnergized; -import mekanism.common.item.ItemTierInstaller; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; @@ -31,16 +30,13 @@ import mekanism.common.item.ItemRobit; import mekanism.common.item.ItemScubaTank; import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemShard; +import mekanism.common.item.ItemTierInstaller; import mekanism.common.item.ItemUpgrade; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.multipart.ItemGlowPanel; import mekanism.common.multipart.ItemPartTransmitter; -import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @@ -61,9 +57,6 @@ public class MekanismItems public static final Item CompressedRedstone = new ItemMekanism(); public static final Item CompressedDiamond = new ItemMekanism(); public static final Item CompressedObsidian = new ItemMekanism(); - public static final Item BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET); - public static final Item LithiumBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET); - public static final Item HeavyWaterBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.BUCKET); public static final Item SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED); public static final Item EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY); public static final Item FilterUpgrade = new ItemUpgrade(Upgrade.FILTER); @@ -148,9 +141,6 @@ public class MekanismItems GameRegistry.register(init(ElectrolyticCore, "ElectrolyticCore")); GameRegistry.register(init(Sawdust, "Sawdust")); GameRegistry.register(init(Salt, "Salt")); - GameRegistry.register(init(BrineBucket, "BrineBucket")); - GameRegistry.register(init(LithiumBucket, "LithiumBucket")); - GameRegistry.register(init(HeavyWaterBucket, "HeavyWaterBucket")); GameRegistry.register(init(Crystal, "Crystal")); GameRegistry.register(init(FreeRunners, "FreeRunners")); GameRegistry.register(init(ArmoredJetpack, "ArmoredJetpack")); @@ -166,10 +156,6 @@ public class MekanismItems GameRegistry.register(init(TierInstaller, "TierInstaller")); GameRegistry.register(init(OtherDust, "OtherDust")); - FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET); - FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET); - FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("heavywater"), new ItemStack(HeavyWaterBucket), FluidContainerRegistry.EMPTY_BUCKET); - MinecraftForge.EVENT_BUS.register(GasMask); MinecraftForge.EVENT_BUS.register(FreeRunners); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 0bfa8d41a..ce2d8f89f 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -6,6 +6,7 @@ import java.util.Random; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.api.util.StackUtils; import mekanism.client.render.ctm.CTMBlockRenderContext; import mekanism.client.render.ctm.CTMData; import mekanism.client.render.ctm.ICTMBlock; @@ -35,6 +36,7 @@ import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationController; +import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; @@ -64,9 +66,9 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -573,85 +575,83 @@ public abstract class BlockBasic extends Block implements ICTMBlock public static boolean manageInventory(EntityPlayer player, TileEntityDynamicTank tileEntity, EnumHand hand, ItemStack itemStack) { - if(itemStack != null && tileEntity.structure != null) + if(tileEntity.structure == null) { - if(FluidContainerRegistry.isEmptyContainer(itemStack)) + return false; + } + + ItemStack copyStack = StackUtils.size(itemStack.copy(), 1); + + if(FluidContainerUtils.isFluidContainer(itemStack)) + { + IFluidHandler handler = FluidUtil.getFluidHandler(copyStack); + + if(FluidUtil.getFluidContained(copyStack) == null) { - if(tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount >= Fluid.BUCKET_VOLUME) + if(tileEntity.structure.fluidStored != null) { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(tileEntity.structure.fluidStored, itemStack); - - if(filled != null) + int filled = handler.fill(tileEntity.structure.fluidStored, !player.capabilities.isCreativeMode); + + if(filled > 0) { if(player.capabilities.isCreativeMode) { - tileEntity.structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - - if(tileEntity.structure.fluidStored.amount == 0) - { - tileEntity.structure.fluidStored = null; - } - - return true; - } - - if(itemStack.stackSize > 1) - { - if(player.inventory.addItemStackToInventory(filled)) - { - itemStack.stackSize--; - - tileEntity.structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - - if(tileEntity.structure.fluidStored.amount == 0) - { - tileEntity.structure.fluidStored = null; - } - - return true; - } + tileEntity.structure.fluidStored.amount -= filled; } else if(itemStack.stackSize == 1) { - player.setHeldItem(hand, filled); - - tileEntity.structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - - if(tileEntity.structure.fluidStored.amount == 0) - { - tileEntity.structure.fluidStored = null; - } - - return true; + tileEntity.structure.fluidStored.amount -= filled; + player.setHeldItem(hand, copyStack); } + else if(itemStack.stackSize > 1 && player.inventory.addItemStackToInventory(copyStack)) + { + tileEntity.structure.fluidStored.amount -= filled; + itemStack.stackSize--; + } + + if(tileEntity.structure.fluidStored.amount == 0) + { + tileEntity.structure.fluidStored = null; + } + + return true; } } } - else if(FluidContainerRegistry.isFilledContainer(itemStack)) - { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(itemStack); - int max = tileEntity.structure.volume*TankUpdateProtocol.FLUID_PER_TANK; - - if(tileEntity.structure.fluidStored == null || (tileEntity.structure.fluidStored.isFluidEqual(itemFluid) && (tileEntity.structure.fluidStored.amount+itemFluid.amount <= max))) + else { + FluidStack itemFluid = FluidUtil.getFluidContained(copyStack); + int stored = tileEntity.structure.fluidStored != null ? tileEntity.structure.fluidStored.amount : 0; + int needed = (tileEntity.structure.volume*TankUpdateProtocol.FLUID_PER_TANK)-stored; + + if(tileEntity.structure.fluidStored != null && !tileEntity.structure.fluidStored.isFluidEqual(itemFluid)) + { + return false; + } + + boolean filled = false; + FluidStack drained = handler.drain(needed, !player.capabilities.isCreativeMode); + + if(copyStack.stackSize == 0) + { + copyStack = null; + } + + if(drained != null) { - boolean filled = false; - if(player.capabilities.isCreativeMode) { filled = true; } else { - ItemStack containerItem = itemStack.getItem().getContainerItem(itemStack); - - if(containerItem != null) + if(copyStack != null) { if(itemStack.stackSize == 1) { - player.setHeldItem(hand, containerItem); + player.setHeldItem(hand, copyStack); filled = true; } else { - if(player.inventory.addItemStackToInventory(containerItem)) + if(player.inventory.addItemStackToInventory(copyStack)) { itemStack.stackSize--; @@ -670,15 +670,15 @@ public abstract class BlockBasic extends Block implements ICTMBlock filled = true; } } - + if(filled) { if(tileEntity.structure.fluidStored == null) { - tileEntity.structure.fluidStored = itemFluid; + tileEntity.structure.fluidStored = drained; } else { - tileEntity.structure.fluidStored.amount += itemFluid.amount; + tileEntity.structure.fluidStored.amount += drained.amount; } return true; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index c34b0a1ad..142682827 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -8,6 +8,7 @@ import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.api.util.StackUtils; import mekanism.client.render.ctm.CTMBlockRenderContext; import mekanism.client.render.ctm.CTMData; import mekanism.client.render.ctm.ICTMBlock; @@ -45,6 +46,7 @@ import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; @@ -80,9 +82,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import buildcraft.api.tools.IToolWrench; @@ -539,7 +542,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock { if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - if(stack != null && FluidContainerRegistry.isContainer(stack)) + if(stack != null && FluidContainerUtils.isFluidContainer(stack)) { if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity, hand, stack)) { @@ -732,73 +735,72 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock private boolean manageInventory(EntityPlayer player, TileEntityFluidTank tileEntity, EnumHand hand, ItemStack itemStack) { - if(itemStack != null) + ItemStack copyStack = StackUtils.size(itemStack.copy(), 1); + + if(FluidContainerUtils.isFluidContainer(itemStack)) { - if(FluidContainerRegistry.isEmptyContainer(itemStack)) + IFluidHandler handler = FluidUtil.getFluidHandler(copyStack); + + if(FluidUtil.getFluidContained(copyStack) == null) { - if(tileEntity.fluidTank.getFluid() != null && tileEntity.fluidTank.getFluid().amount >= Fluid.BUCKET_VOLUME) + if(tileEntity.fluidTank.getFluid() != null) { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(tileEntity.fluidTank.getFluid(), itemStack); - - if(filled != null) + int filled = handler.fill(tileEntity.fluidTank.getFluid(), !player.capabilities.isCreativeMode); + + if(filled > 0) { if(player.capabilities.isCreativeMode) { - tileEntity.fluidTank.drain(FluidContainerRegistry.getFluidForFilledItem(filled).amount, true); - - return true; - } - - if(itemStack.stackSize > 1) - { - if(player.inventory.addItemStackToInventory(filled)) - { - itemStack.stackSize--; - - tileEntity.fluidTank.drain(FluidContainerRegistry.getFluidForFilledItem(filled).amount, true); - } + tileEntity.fluidTank.drain(filled, true); } else if(itemStack.stackSize == 1) { - player.setHeldItem(hand, filled); - - tileEntity.fluidTank.drain(FluidContainerRegistry.getFluidForFilledItem(filled).amount, true); - - return true; + tileEntity.fluidTank.drain(filled, true); + player.setHeldItem(hand, copyStack); } + else if(itemStack.stackSize > 1 && player.inventory.addItemStackToInventory(copyStack)) + { + tileEntity.fluidTank.drain(filled, true); + itemStack.stackSize--; + } + + return true; } } } - else if(FluidContainerRegistry.isFilledContainer(itemStack)) - { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(itemStack); + else { + FluidStack itemFluid = FluidUtil.getFluidContained(copyStack); int needed = tileEntity.getCurrentNeeded(); - if((tileEntity.fluidTank.getFluid() == null && itemFluid.amount <= tileEntity.fluidTank.getCapacity()) || itemFluid.amount <= needed) + if(tileEntity.fluidTank.getFluid() != null && !tileEntity.fluidTank.getFluid().isFluidEqual(itemFluid)) + { + return false; + } + + boolean filled = false; + FluidStack drained = handler.drain(needed, !player.capabilities.isCreativeMode); + + if(copyStack.stackSize == 0) + { + copyStack = null; + } + + if(drained != null) { - if(tileEntity.fluidTank.getFluid() != null && !tileEntity.fluidTank.getFluid().isFluidEqual(itemFluid)) - { - return false; - } - - boolean filled = false; - if(player.capabilities.isCreativeMode) { filled = true; } else { - ItemStack containerItem = itemStack.getItem().getContainerItem(itemStack); - - if(containerItem != null) + if(copyStack != null) { if(itemStack.stackSize == 1) { - player.setHeldItem(hand, containerItem); + player.setHeldItem(hand, copyStack); filled = true; } else { - if(player.inventory.addItemStackToInventory(containerItem)) + if(player.inventory.addItemStackToInventory(copyStack)) { itemStack.stackSize--; @@ -817,16 +819,16 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock filled = true; } } - + if(filled) { - int toFill = Math.min(tileEntity.fluidTank.getCapacity()-tileEntity.fluidTank.getFluidAmount(), itemFluid.amount); + int toFill = Math.min(tileEntity.fluidTank.getCapacity()-tileEntity.fluidTank.getFluidAmount(), drained.amount); - tileEntity.fluidTank.fill(itemFluid, true); + tileEntity.fluidTank.fill(drained, true); - if(itemFluid.amount-toFill > 0) + if(drained.amount-toFill > 0) { - tileEntity.pushUp(PipeUtils.copy(itemFluid, itemFluid.amount-toFill), true); + tileEntity.pushUp(PipeUtils.copy(itemFluid, drained.amount-toFill), true); } return true; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index 041deeea2..3960c3424 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -11,8 +11,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidUtil; public class ContainerChemicalWasher extends Container { @@ -78,7 +78,7 @@ public class ContainerChemicalWasher extends Container return null; } } - else if(FluidContainerRegistry.isFilledContainer(slotStack) && FluidContainerRegistry.getFluidForFilledItem(slotStack).getFluid() == FluidRegistry.WATER) + else if(FluidUtil.getFluidContained(slotStack) != null && FluidUtil.getFluidContained(slotStack).getFluid() == FluidRegistry.WATER) { if(slotID != 0) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java index c801f04f3..3dc9027f0 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -2,12 +2,12 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.util.FluidContainerUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; public class ContainerDynamicTank extends Container { @@ -64,7 +64,7 @@ public class ContainerDynamicTank extends Container ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(FluidContainerRegistry.isEmptyContainer(slotStack) || FluidContainerRegistry.isFilledContainer(slotStack)) + if(FluidContainerUtils.isFluidContainer(slotStack)) { if(slotID != 0 && slotID != 1) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index 851728cef..8587beb6b 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -4,12 +4,13 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.ChargeUtils; +import mekanism.common.util.FluidContainerUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidUtil; public class ContainerElectricPump extends Container { @@ -83,7 +84,7 @@ public class ContainerElectricPump extends Container } } } - else if(FluidContainerRegistry.isEmptyContainer(slotStack)) + else if(FluidContainerUtils.isFluidContainer(slotStack) && FluidUtil.getFluidContained(slotStack) == null) { if(slotID != 0) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index 3c4027868..8ea779345 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -2,12 +2,12 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityFluidTank; +import mekanism.common.util.FluidContainerUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; public class ContainerFluidTank extends Container { @@ -64,7 +64,7 @@ public class ContainerFluidTank extends Container ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(FluidContainerRegistry.isEmptyContainer(slotStack) || FluidContainerRegistry.isFilledContainer(slotStack)) + if(FluidContainerUtils.isFluidContainer(slotStack)) { if(slotID != 0 && slotID != 1) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index 9510596fc..1bc9db952 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -9,7 +9,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidUtil; public class ContainerFluidicPlenisher extends Container { @@ -83,7 +83,7 @@ public class ContainerFluidicPlenisher extends Container } } } - else if(FluidContainerRegistry.isFilledContainer(slotStack)) + else if(FluidUtil.getFluidContained(slotStack) != null && FluidUtil.getFluidContained(slotStack).getFluid().canBePlacedInWorld()) { if(slotID != 0) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index d71553f84..a7f0708d2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -6,12 +6,12 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.ChargeUtils; +import mekanism.common.util.FluidContainerUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; public class ContainerRotaryCondensentrator extends Container { @@ -87,7 +87,7 @@ public class ContainerRotaryCondensentrator extends Container } } } - else if(FluidContainerRegistry.isEmptyContainer(slotStack) || FluidContainerRegistry.isFilledContainer(slotStack)) + else if(FluidContainerUtils.isFluidContainer(slotStack)) { if(slotID != 2 && slotID != 3) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java index 64df9f269..c5260eb72 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java @@ -2,13 +2,13 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityThermalEvaporationController; +import mekanism.common.util.FluidContainerUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidUtil; public class ContainerThermalEvaporationController extends Container { @@ -75,7 +75,7 @@ public class ContainerThermalEvaporationController extends Container return null; } } - else if(FluidContainerRegistry.isEmptyContainer(slotStack)) + else if(FluidContainerUtils.isFluidContainer(slotStack) && FluidUtil.getFluidContained(slotStack) == null) { if(slotID != 2) { @@ -92,7 +92,7 @@ public class ContainerThermalEvaporationController extends Container } } } - else if(FluidContainerRegistry.isFilledContainer(slotStack) && FluidContainerRegistry.getFluidForFilledItem(slotStack).getFluid() == FluidRegistry.WATER) + else if(tileEntity.hasRecipe(FluidUtil.getFluidContained(slotStack).getFluid())) { if(slotID != 0) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 9c7bfae06..db9ce4887 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -50,11 +50,11 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -458,7 +458,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple { if(slotID == 0) { - return FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluid() == FluidRegistry.WATER; + return FluidUtil.getFluidContained(itemstack) != null && FluidUtil.getFluidContained(itemstack).getFluid() == FluidRegistry.WATER; } else if(slotID == 2) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 9e7d16be6..68eb7042b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -44,11 +44,11 @@ import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -387,7 +387,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I } else if(slotID == 0) { - return FluidContainerRegistry.isEmptyContainer(itemstack); + return FluidContainerUtils.isFluidContainer(itemstack) && FluidUtil.getFluidContained(itemstack) == null; } else if(slotID == 2) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 9a95fa70f..8ff45acd8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -50,11 +50,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; @@ -317,7 +317,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } else if(slotID == 0) { - return FluidContainerRegistry.isEmptyContainer(itemstack); + return FluidUtil.getFluidContained(itemstack) == null; } else if(slotID == 1 || slotID == 2) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 3a2ff10bf..538e930f5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -234,7 +234,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(up.getTileEntity(worldObj) instanceof TileEntityFluidTank) { - IFluidHandler handler = CapabilityUtils.getCapability(up.getTileEntity(worldObj), CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.UP); + IFluidHandler handler = CapabilityUtils.getCapability(up.getTileEntity(worldObj), CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN); if(PipeUtils.canFill(handler, fluid)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index faf576a1a..0a5664592 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -40,11 +40,11 @@ import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; @@ -353,7 +353,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } else if(slotID == 0) { - return FluidContainerRegistry.isFilledContainer(itemstack); + return FluidUtil.getFluidContained(itemstack) != null && FluidUtil.getFluidContained(itemstack).getFluid().canBePlacedInWorld(); } else if(slotID == 2) { diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index cc565bb05..5e5b0b3f4 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -1,5 +1,6 @@ package mekanism.common.util; +import mekanism.api.util.StackUtils; import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -9,6 +10,7 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.items.ItemHandlerHelper; public final class FluidContainerUtils { @@ -70,13 +72,30 @@ public final class FluidContainerUtils { if(stack != null) { - int prev = stack.amount; + ItemStack inputCopy = StackUtils.size(inventory[inSlot].copy(), 1); - stack.amount -= insertFluid(stack, inventory[inSlot]); + int drained = insertFluid(stack, inputCopy); + + if(inventory[outSlot] != null && (!ItemHandlerHelper.canItemStacksStack(inventory[outSlot], inputCopy) || inventory[outSlot].stackSize == inventory[outSlot].getMaxStackSize())) + { + return stack; + } + + stack.amount -= drained; if(inventory[outSlot] == null) { - inventory[outSlot] = inventory[inSlot].copy(); + inventory[outSlot] = inputCopy; + } + else if(ItemHandlerHelper.canItemStacksStack(inventory[outSlot], inputCopy)) + { + inventory[outSlot].stackSize++; + } + + inventory[inSlot].stackSize--; + + if(inventory[inSlot].stackSize == 0) + { inventory[inSlot] = null; } @@ -104,8 +123,9 @@ public final class FluidContainerUtils public static FluidStack handleContainerItemEmpty(TileEntity tileEntity, ItemStack[] inventory, FluidStack stored, int needed, int inSlot, int outSlot, final FluidChecker checker) { final Fluid storedFinal = stored != null ? stored.getFluid() : null; + final ItemStack input = StackUtils.size(inventory[inSlot].copy(), 1); - FluidStack ret = extractFluid(needed, inventory[inSlot], new FluidChecker() { + FluidStack ret = extractFluid(needed, input, new FluidChecker() { @Override public boolean isValid(Fluid f) { @@ -113,6 +133,21 @@ public final class FluidContainerUtils } }); + ItemStack inputCopy = input.copy(); + + if(inputCopy.stackSize == 0) + { + inputCopy = null; + } + + if(FluidUtil.getFluidContained(inputCopy) == null && inputCopy != null) + { + if(inventory[outSlot] != null && (!ItemHandlerHelper.canItemStacksStack(inventory[outSlot], inputCopy) || inventory[outSlot].stackSize == inventory[outSlot].getMaxStackSize())) + { + return stored; + } + } + if(ret != null) { if(stored == null) @@ -128,15 +163,31 @@ public final class FluidContainerUtils tileEntity.markDirty(); } - if(FluidUtil.getFluidContained(inventory[inSlot]) == null || needed == 0) + if(FluidUtil.getFluidContained(inputCopy) == null || needed == 0) { - if(inventory[outSlot] == null) + if(inputCopy != null) { - inventory[outSlot] = inventory[inSlot].copy(); - inventory[inSlot] = null; - - tileEntity.markDirty(); + if(inventory[outSlot] == null) + { + inventory[outSlot] = inputCopy; + } + else if(ItemHandlerHelper.canItemStacksStack(inventory[outSlot], inputCopy)) + { + inventory[outSlot].stackSize++; + } } + + inventory[inSlot].stackSize--; + + if(inventory[inSlot].stackSize == 0) + { + inventory[inSlot] = null; + } + + tileEntity.markDirty(); + } + else { + inventory[inSlot] = inputCopy; } return stored; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index 159e3799b..5c06a01b0 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -8,8 +8,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidUtil; public class ContainerBioGenerator extends Container { @@ -144,13 +144,7 @@ public class ContainerBioGenerator extends Container { if(FluidRegistry.isFluidRegistered("bioethanol")) { - if(FluidContainerRegistry.getFluidForFilledItem(itemStack) != null) - { - if(FluidContainerRegistry.getFluidForFilledItem(itemStack).getFluid() == FluidRegistry.getFluid("bioethanol")) - { - return true; - } - } + return FluidUtil.getFluidContained(itemStack) != null && FluidUtil.getFluidContained(itemStack).getFluid() == FluidRegistry.getFluid("bioethanol"); } return false; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index c43673d82..37370ea33 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -18,11 +18,12 @@ 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.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandlerWrapper, ISustainedData @@ -45,26 +46,19 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui { ChargeUtils.charge(1, this); - FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); + FluidStack fluid = FluidUtil.getFluidContained(inventory[0]); if(fluid != null && FluidRegistry.isFluidRegistered("bioethanol")) { if(fluid.getFluid() == FluidRegistry.getFluid("bioethanol")) { - int fluidToAdd = fluid.amount; - - if(bioFuelSlot.fluidStored+fluidToAdd <= bioFuelSlot.MAX_FLUID) + IFluidHandler handler = FluidUtil.getFluidHandler(inventory[0]); + FluidStack drained = handler.drain(bioFuelSlot.MAX_FLUID-bioFuelSlot.fluidStored, true); + + if(drained != null) { - bioFuelSlot.setFluid(bioFuelSlot.fluidStored+fluidToAdd); - - if(inventory[0].getItem().getContainerItem(inventory[0]) != null) - { - inventory[0] = inventory[0].getItem().getContainerItem(inventory[0]); - } - else { - inventory[0].stackSize--; - } - + bioFuelSlot.fluidStored += drained.amount; + if(inventory[0].stackSize == 0) { inventory[0] = null; @@ -131,9 +125,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui else { if(FluidRegistry.isFluidRegistered("bioethanol")) { - if(FluidContainerRegistry.getFluidForFilledItem(itemstack) != null) + if(FluidUtil.getFluidContained(itemstack) != null) { - if(FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluid() == FluidRegistry.getFluid("bioethanol")) + if(FluidUtil.getFluidContained(itemstack).getFluid() == FluidRegistry.getFluid("bioethanol")) { return true; } diff --git a/src/main/resources/assets/mekanism/models/item/BrineBucket.json b/src/main/resources/assets/mekanism/models/item/BrineBucket.json deleted file mode 100644 index 7831c66a9..000000000 --- a/src/main/resources/assets/mekanism/models/item/BrineBucket.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "mekanism:item/standard_item", - "textures": { - "layer0": "mekanism:items/BrineBucket" - } -} - diff --git a/src/main/resources/assets/mekanism/models/item/HeavyWaterBucket.json b/src/main/resources/assets/mekanism/models/item/HeavyWaterBucket.json deleted file mode 100644 index e6b8ba57c..000000000 --- a/src/main/resources/assets/mekanism/models/item/HeavyWaterBucket.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "mekanism:item/standard_item", - "textures": { - "layer0": "mekanism:items/HeavyWaterBucket" - } -} - diff --git a/src/main/resources/assets/mekanism/models/item/LithiumBucket.json b/src/main/resources/assets/mekanism/models/item/LithiumBucket.json deleted file mode 100644 index 8a7c1fb11..000000000 --- a/src/main/resources/assets/mekanism/models/item/LithiumBucket.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "mekanism:item/standard_item", - "textures": { - "layer0": "mekanism:items/LithiumBucket" - } -} - diff --git a/src/main/resources/assets/mekanism/textures/items/BrineBucket.png b/src/main/resources/assets/mekanism/textures/items/BrineBucket.png deleted file mode 100644 index 0bc485addb1e4ec1662077c33b981e9873af4572..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1502 zcmV<41tI#0P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0004XNklf!38vkM95)u+HCc}XP z2QbvLz-569n8wxf{25dg#Tnkd|I8pP$jiXa!NlYe|Nnwr^Ww!9ux6MZ5Dhl~#M!xXC)f}hpM?xRfBa+6(U4~N{rfM2 zlq5fcbI@`I$G{~Fg@uJ6rEq`}2Jhaz0~-R8HE?u?D*`cK-YafCh9Zt)07wR8h=G9t zSi}DFdT_;W-=1WcvEnbB4`aZ+018=T=UsSU&v5hRO*lS#@gc+Q+qW4`o;(Q;K#(CA zE&vH$xNrgN3K09mi4(w>c?-lcK;CVT5DI|107VoF$5itP7E!cVK=ua670BT9br}rj zgXFQgVC&YcaJ?Ys;{))Nh^z>fq>;ryY*^|;7pI6107(FncMnxn#sB~S07*qoM6N<$ Eg7f6Zl>h($ diff --git a/src/main/resources/assets/mekanism/textures/items/HeavyWaterBucket.png b/src/main/resources/assets/mekanism/textures/items/HeavyWaterBucket.png deleted file mode 100644 index 02fe4b1d0c29f2c1b9cd9429538106bb9d005055..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1451 zcmV;c1yuTpP)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zlQT4VDV&f!!>az&8OF9 zv1n*l2GmrmRW?Z^9x$7~BOX5krHRE3S!gC6Q79CMs@A5emWAuOY(iK*pXZTb&{hW> zj}kN*4aVgcFd&djGMNm9Z%4ShJr*8LPVaGfu?xrfP#6{J2z0alc+XGg==b~Tn|%+L zVh62OOI={Vz;D~>bT~yen`L-38lhOU{1jEI1Pb}3D3!WvC+Z!@G?&XQ%H^`OXf~Um z1hguZN+3RAYZKVEO*391mOi|%Bp`x3=`dMdUl{*W{{x4LjUC=3)9e5M002ovPDHLk FV1l%Pxvl^J diff --git a/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png b/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png deleted file mode 100644 index aee99659355af71098b44c9f77cb1a9159c8c5d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1374 zcmbVMZA{!`950?AVc>Af%t6@bx~N0FYoBs2y^iBJ?!}#QKyH{36DNInfCkzgZP^`! z#jzpT;@sSfhJ?u$`QoC%glu7kD2$oO3{DL)7m3R*BQt~uEZa238GH^n^aI%koAi0> z@Avz^JpX@>R#(21la-%^VOUORw?BgB+~k{?fyTmnOB|Z=j6kiiN3AzvoCYzksPYgG z$y@`BKu&CHxe7}#%+w;))Ec$n3RX~ME0@Gr<8lNn z=A(DN7|ktcd#CgLz*~uL?ha>{pBl@q+BZ(s_Q?EV&c3ngNaT<^*L&;s*C*mOxLLM8Epy_Gr*OWbr}R_njUl!0bk5|l4RseWH;J2OMi0;R+jf~A ZH)GFtpXKJ2GDq@{7YbDR2g>UX{R4?$