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

doFill test fix

Browse Source
This commit is contained in:
mDiyo 2013-04-27 20:19:02 -07:00
parent 77904b70d4
commit a0b30fa851
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/tinker/tconstruct/TConstruct.java
View File

@ -28,7 +28,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry;
* @dependencies: IC2 API, EBXL API
*/
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.2.dev25", dependencies = "required-after:Forge@[7.7.1.659,)")
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.2.dev26", dependencies = "required-after:Forge@[7.7.1.659,)")
@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class)
public class TConstruct
{

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

@ -95,17 +95,20 @@ public class CastingBasinLogic extends InventoryLogic implements ILiquidTank, IT
{
liquid = resource.copy();
int capacity = getCapacity();
if (liquid.amount > capacity)
if (doFill)
{
liquid.amount = capacity;
if (liquid.amount > capacity)
{
liquid.amount = capacity;
}
if (liquid.amount == capacity)
{
castingDelay = LiquidCasting.instance.getCastingDelay(liquid, inventory[0]);
}
renderOffset = liquid.amount;
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
}
if (liquid.amount == capacity)
{
castingDelay = LiquidCasting.instance.getCastingDelay(liquid, inventory[0]);
}
renderOffset = liquid.amount;
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
return liquid.amount;
}
else

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

@ -95,17 +95,20 @@ public class CastingTableLogic extends InventoryLogic implements ILiquidTank, IT
{
liquid = resource.copy();
int capacity = getCapacity();
if (liquid.amount > capacity)
{
liquid.amount = capacity;
}
if (liquid.amount == capacity)
{
castingDelay = LiquidCasting.instance.getCastingDelay(liquid, inventory[0]);
}
renderOffset = liquid.amount;
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
if (doFill)
{
if (liquid.amount > capacity)
{
liquid.amount = capacity;
}
if (liquid.amount == capacity)
{
castingDelay = LiquidCasting.instance.getCastingDelay(liquid, inventory[0]);
}
renderOffset = liquid.amount;
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
}
return liquid.amount;
}
else