lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Almost ready for final 1.2.0 push

Browse source
This commit is contained in:
WayofTime 2014-10-13 10:33:43 -04:00
parent 4a1f13d988
commit 3d6d7bcdd6
12 changed files with 136 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

24
1.7.10/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java
View file

@ -65,6 +65,7 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
protected FluidStack fluidOutput;
protected FluidStack fluidInput;
private int progress;
private int hasChanged = 0;
private int lockdownDuration;
@ -91,6 +92,11 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
this.lockdownDuration = 0;
}
public int getRSPowerOutput()
{
return 5;
}
@Override
public void readFromNBT(NBTTagCompound par1NBTTagCompound)
{
@ -545,6 +551,21 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
if (!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0)
{
//TODO
{
Block block = worldObj.getBlock(xCoord+1, yCoord, zCoord);
block.onNeighborBlockChange(worldObj, xCoord+1, yCoord, zCoord, block);
block = worldObj.getBlock(xCoord-1, yCoord, zCoord);
block.onNeighborBlockChange(worldObj, xCoord-1, yCoord, zCoord, block);
block = worldObj.getBlock(xCoord, yCoord+1, zCoord);
block.onNeighborBlockChange(worldObj, xCoord, yCoord+1, zCoord, block);
block = worldObj.getBlock(xCoord, yCoord-1, zCoord);
block.onNeighborBlockChange(worldObj, xCoord, yCoord-1, zCoord, block);
block = worldObj.getBlock(xCoord, yCoord, zCoord+1);
block.onNeighborBlockChange(worldObj, xCoord, yCoord, zCoord+1, block);
block = worldObj.getBlock(xCoord, yCoord, zCoord-1);
block.onNeighborBlockChange(worldObj, xCoord, yCoord, zCoord-1, block);
}
int syphonMax = (int) (20 * this.dislocationMultiplier);
int fluidInputted = 0;
int fluidOutputted = 0;
@ -648,6 +669,7 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
fluid.amount = fluid.amount - liquidDrained;
progress += liquidDrained;
//getStackInSlot(0).setItemDamage(getStackInSlot(0).getItemDamage() + liquidDrained);
if (worldTime % 4 == 0)
@ -733,7 +755,7 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
//int currentEssence=playerTag.getInteger("currentEssence");
if (fluid != null && fluid.amount >= 1)
{
{
int liquidDrained = Math.min((int) (upgradeLevel >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount);
if (liquidDrained > (item.getMaxEssence() * this.orbCapacityMultiplier - currentEssence))