GloopMaster/TinkersConstruct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Casting Basin fix

Browse Source
This commit is contained in:
mDiyo 2013-04-27 20:33:21 -07:00
parent a0b30fa851
commit a50062b488
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mods/tinker/tconstruct/logic/CastingBasinLogic.java
View File

@ -5,7 +5,6 @@ import mods.tinker.common.InventoryLogic;
import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.TConstruct;
import mods.tinker.tconstruct.crafting.CastingRecipe; import mods.tinker.tconstruct.crafting.CastingRecipe;
import mods.tinker.tconstruct.crafting.LiquidBlockCasting; import mods.tinker.tconstruct.crafting.LiquidBlockCasting;
import mods.tinker.tconstruct.crafting.LiquidCasting;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;
@ -91,7 +90,7 @@ public class CastingBasinLogic extends InventoryLogic implements ILiquidTank, IT
if (liquid == null) if (liquid == null)
{ {
if (inventory[1] == null && LiquidCasting.instance.getCastingRecipe(resource, inventory[0]) != null) if (inventory[1] == null && LiquidBlockCasting.instance.getCastingRecipe(resource, inventory[0]) != null)
{ {
liquid = resource.copy(); liquid = resource.copy();
int capacity = getCapacity(); int capacity = getCapacity();
@ -104,7 +103,7 @@ public class CastingBasinLogic extends InventoryLogic implements ILiquidTank, IT
} }
if (liquid.amount == capacity) if (liquid.amount == capacity)
{ {
castingDelay = LiquidCasting.instance.getCastingDelay(liquid, inventory[0]); castingDelay = LiquidBlockCasting.instance.getCastingDelay(liquid, inventory[0]);
} }
renderOffset = liquid.amount; renderOffset = liquid.amount;
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
@ -126,7 +125,7 @@ public class CastingBasinLogic extends InventoryLogic implements ILiquidTank, IT
{ {
renderOffset = roomInTank; renderOffset = roomInTank;
liquid.amount = total; liquid.amount = total;
castingDelay = LiquidCasting.instance.getCastingDelay(liquid, inventory[0]); castingDelay = LiquidBlockCasting.instance.getCastingDelay(liquid, inventory[0]);
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
} }
return roomInTank; return roomInTank;

2
mods/tinker/tconstruct/logic/CastingTableLogic.java
View File

@ -135,8 +135,8 @@ public class CastingTableLogic extends InventoryLogic implements ILiquidTank, IT
{ {
if (doFill) if (doFill)
{ {
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
liquid.amount += resource.amount; liquid.amount += resource.amount;
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
} }
return resource.amount; return resource.amount;
} }