From e24e663fbdb84577622aadee780abf7b4075428a Mon Sep 17 00:00:00 2001 From: SirSengir Date: Wed, 11 Jul 2012 19:20:37 +0200 Subject: [PATCH] Redirected old liquid api references. --- .../net/minecraft/src/buildcraft/factory/GuiRefinery.java | 3 ++- .../minecraft/src/buildcraft/core/TriggerLiquidContainer.java | 3 ++- common/net/minecraft/src/buildcraft/energy/EngineIron.java | 3 ++- common/net/minecraft/src/buildcraft/factory/BlockRefinery.java | 3 ++- .../src/buildcraft/transport/TriggerPipeContents.java | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java b/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java index 68c989d0..f96315ab 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java @@ -13,6 +13,7 @@ import net.minecraft.src.InventoryPlayer; import net.minecraft.src.ItemStack; import net.minecraft.src.buildcraft.api.BuildCraftAPI; import net.minecraft.src.buildcraft.api.RefineryRecipe; +import net.minecraft.src.buildcraft.api.liquids.LiquidManager; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.GuiAdvancedInterface; import net.minecraft.src.buildcraft.core.utils.StringUtil; @@ -77,7 +78,7 @@ public class GuiRefinery extends GuiAdvancedInterface { slot = slots[position]; if (slot != null) { - int liquidId = BuildCraftAPI.getLiquidForFilledItem(mc.thePlayer.inventory.getItemStack()); + int liquidId = LiquidManager.getLiquidForFilledItem(mc.thePlayer.inventory.getItemStack()).itemID; container.setFilter(position, liquidId, 0); } diff --git a/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java b/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java index 931cc8d1..a7da5891 100644 --- a/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java +++ b/common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java @@ -15,6 +15,7 @@ import net.minecraft.src.buildcraft.api.ILiquidContainer; import net.minecraft.src.buildcraft.api.LiquidSlot; import net.minecraft.src.buildcraft.api.Trigger; import net.minecraft.src.buildcraft.api.TriggerParameter; +import net.minecraft.src.buildcraft.api.liquids.LiquidManager; public class TriggerLiquidContainer extends Trigger { @@ -73,7 +74,7 @@ public class TriggerLiquidContainer extends Trigger { int seachedLiquidId = 0; if (parameter != null && parameter.getItem() != null) - seachedLiquidId = BuildCraftAPI.getLiquidForFilledItem(parameter.getItem()); + seachedLiquidId = LiquidManager.getLiquidForFilledItem(parameter.getItem()).itemID; LiquidSlot[] liquids = container.getLiquidSlots(); diff --git a/common/net/minecraft/src/buildcraft/energy/EngineIron.java b/common/net/minecraft/src/buildcraft/energy/EngineIron.java index 6553800b..0981b8d3 100644 --- a/common/net/minecraft/src/buildcraft/energy/EngineIron.java +++ b/common/net/minecraft/src/buildcraft/energy/EngineIron.java @@ -17,6 +17,7 @@ import net.minecraft.src.buildcraft.api.BuildCraftAPI; import net.minecraft.src.buildcraft.api.IronEngineFuel; import net.minecraft.src.buildcraft.api.LiquidSlot; import net.minecraft.src.buildcraft.api.Orientations; +import net.minecraft.src.buildcraft.api.liquids.LiquidManager; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.core.Utils; @@ -123,7 +124,7 @@ public class EngineIron extends Engine { super.update(); if (itemInInventory != null) { - int liquidId = BuildCraftAPI.getLiquidForFilledItem(itemInInventory); + int liquidId = LiquidManager.getLiquidForFilledItem(itemInInventory).itemID; if (liquidId != 0) { if (fill(Orientations.Unknown, BuildCraftAPI.BUCKET_VOLUME, liquidId, false) == BuildCraftAPI.BUCKET_VOLUME) { diff --git a/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java b/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java index b3d4bb8e..4aeab666 100644 --- a/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java +++ b/common/net/minecraft/src/buildcraft/factory/BlockRefinery.java @@ -25,6 +25,7 @@ import net.minecraft.src.buildcraft.api.APIProxy; import net.minecraft.src.buildcraft.api.BuildCraftAPI; import net.minecraft.src.buildcraft.api.Orientations; import net.minecraft.src.buildcraft.api.Position; +import net.minecraft.src.buildcraft.api.liquids.LiquidManager; import net.minecraft.src.buildcraft.api.tools.IToolWrench; import net.minecraft.src.buildcraft.core.GuiIds; import net.minecraft.src.buildcraft.core.Utils; @@ -101,7 +102,7 @@ public class BlockRefinery extends BlockContainer { return true; } else { - int liquidId = BuildCraftAPI.getLiquidForFilledItem(entityplayer.getCurrentEquippedItem()); + int liquidId = LiquidManager.getLiquidForFilledItem(entityplayer.getCurrentEquippedItem()).itemID; if (liquidId != 0) { int qty = ((TileRefinery) world.getBlockTileEntity(i, j, k)).fill(Orientations.Unknown, diff --git a/common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java b/common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java index 667b55c2..1b26a93d 100644 --- a/common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java +++ b/common/net/minecraft/src/buildcraft/transport/TriggerPipeContents.java @@ -12,6 +12,7 @@ package net.minecraft.src.buildcraft.transport; import net.minecraft.src.buildcraft.api.BuildCraftAPI; import net.minecraft.src.buildcraft.api.Trigger; import net.minecraft.src.buildcraft.api.TriggerParameter; +import net.minecraft.src.buildcraft.api.liquids.LiquidManager; import net.minecraft.src.buildcraft.core.DefaultProps; import net.minecraft.src.buildcraft.transport.PipeTransportLiquids.LiquidBuffer; @@ -92,7 +93,7 @@ public class TriggerPipeContents extends Trigger implements ITriggerPipe { int seachedLiquidId = 0; if (parameter != null && parameter.getItem() != null) - seachedLiquidId = BuildCraftAPI.getLiquidForFilledItem(parameter.getItem()); + seachedLiquidId = LiquidManager.getLiquidForFilledItem(parameter.getItem()).itemID; if (kind == Kind.Empty) { for (LiquidBuffer b : transportLiquids.side)