Redirected old liquid api references.
This commit is contained in:
parent
d3d4473d82
commit
e24e663fbd
5 changed files with 10 additions and 5 deletions
buildcraft_client/net/minecraft/src/buildcraft/factory
common/net/minecraft/src/buildcraft
core
energy
factory
transport
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue