Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed Tesla interacting with furnace ability

Browse source
This commit is contained in:
Calclavia 2013-08-12 20:16:56 +08:00
parent 0f66ba8360
commit 78e520727d
3 changed files with 11 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Modding-Library

@ -1 +1 @@
Subproject commit 48d87abf9bb204dffec63ebedaeffce0c998e29f
Subproject commit 2daa8afe620db836bba7673069cd2620b7539a1c

8
src/resonantinduction/battery/ItemCapacitor.java
View file

@ -29,16 +29,10 @@ public class ItemCapacitor extends ItemUniversalElectric
this.setMaxDamage(100);
}
@Override
public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
this.setElectricity(par1ItemStack, 0);
}
@Override
public float getTransfer(ItemStack itemStack)
{
return getMaxEnergyStored(itemStack) * 0.05F;
return this.getMaxEnergyStored(itemStack) * 0.05F;
}
@Override

67
src/resonantinduction/tesla/TileEntityTesla.java
View file

@ -94,6 +94,8 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
*/
if (this.isController())
{
this.produce();
// TODO: Fix client side issue. || this.worldObj.isRemote
if (((this.doTransfer) || this.worldObj.isRemote) && this.ticks % (5 + this.worldObj.rand.nextInt(2)) == 0 && this.getEnergyStored() > 0 && !this.worldObj.isBlockIndirectlyGettingPowered(this.xCoord, this.yCoord, this.zCoord))
{
@ -112,7 +114,7 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
if (dimWorld != null)
{
TileEntity transferTile = this.linked.getTileEntity(dimWorld);
if (transferTile instanceof TileEntityTesla && !transferTile.isInvalid())
{
this.transfer(((TileEntityTesla) transferTile), Math.min(this.getProvide(ForgeDirection.UNKNOWN), TRANSFER_CAP));
@ -238,63 +240,6 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
this.outputBlacklist.clear();
}
/**
* Draws power from furnace below it.
*
* @author Calclavia
*/
TileEntity tileEntity = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord - 1, this.zCoord);
if (tileEntity instanceof TileEntityFurnace && this.getRequest(ForgeDirection.DOWN) > 0)
{
TileEntityFurnace furnaceTile = (TileEntityFurnace) tileEntity;
if (furnaceTile.getStackInSlot(0) == null)
{
/**
* Steal power from furnace.
*/
boolean doBlockStateUpdate = furnaceTile.furnaceBurnTime > 0;
if (furnaceTile.furnaceBurnTime == 0)
{
int burnTime = TileEntityFurnace.getItemBurnTime(furnaceTile.getStackInSlot(1));
if (burnTime > 0)
{
furnaceTile.decrStackSize(1, 1);
furnaceTile.furnaceBurnTime = burnTime;
}
}
else
{
this.transfer(ResonantInduction.FURNACE_WATTAGE / 20, true);
}
if (doBlockStateUpdate != furnaceTile.furnaceBurnTime > 0)
{
BlockFurnace.updateFurnaceBlockState(furnaceTile.furnaceBurnTime > 0, furnaceTile.worldObj, furnaceTile.xCoord, furnaceTile.yCoord, furnaceTile.zCoord);
}
}
else if (this.getEnergyStored() > ResonantInduction.FURNACE_WATTAGE / 20 && furnaceTile.getStackInSlot(1) == null && FurnaceRecipes.smelting().getSmeltingResult(furnaceTile.getStackInSlot(0)) != null)
{
/**
* Inject power to furnace.
*/
boolean doBlockStateUpdate = furnaceTile.furnaceBurnTime > 0;
furnaceTile.furnaceBurnTime += 2;
this.transfer(-ResonantInduction.FURNACE_WATTAGE / 20, true);
if (doBlockStateUpdate != furnaceTile.furnaceBurnTime > 0)
{
BlockFurnace.updateFurnaceBlockState(furnaceTile.furnaceBurnTime > 0, furnaceTile.worldObj, furnaceTile.xCoord, furnaceTile.yCoord, furnaceTile.zCoord);
}
}
}
this.produce();
if (!this.worldObj.isRemote && this.getEnergyStored() > 0 != doPacketUpdate)
{
this.setPacket(2);
@ -407,6 +352,12 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
}
else
{
if (this.getEnergyStored() > 0)
{
transferEnergy += this.getEnergyStored();
this.setEnergyStored(0);
}
return this.getControllingTelsa().transfer(transferEnergy, doTransfer);
}
}