Fixed IC2 support (still may crash without), begin adding Tesla support

This commit is contained in:
aidancbrady committed 2016-07-01 11:05:02 -04:00
1 parent e2a93b5de1
commit 53353cd050
27 files changed
+256 -300

No files matched your search

@@ -235,14 +235,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
if(canReceive(theItem))
{
double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem);
double toReceive = Math.min(energy*general.FROM_TE, energyNeeded);
double toReceive = Math.min(energy*general.FROM_RF, energyNeeded);
if(!simulate)
{
setEnergy(theItem, getEnergy(theItem) + toReceive);
}
return (int)Math.round(toReceive*general.TO_TE);
return (int)Math.round(toReceive*general.TO_RF);
}
return 0;
@@ -254,14 +254,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
if(canSend(theItem))
{
double energyRemaining = getEnergy(theItem);
double toSend = Math.min((energy*general.FROM_TE), energyRemaining);
double toSend = Math.min((energy*general.FROM_RF), energyRemaining);
if(!simulate)
{
setEnergy(theItem, getEnergy(theItem) - toSend);
}
return (int)Math.round(toSend*general.TO_TE);
return (int)Math.round(toSend*general.TO_RF);
}
return 0;
@@ -270,13 +270,13 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
@Override
public int getEnergyStored(ItemStack theItem)
{
return (int)(getEnergy(theItem)*general.TO_TE);
return (int)(getEnergy(theItem)*general.TO_RF);
}
@Override
public int getMaxEnergyStored(ItemStack theItem)
{
return (int)(getMaxEnergy(theItem)*general.TO_TE);
return (int)(getMaxEnergy(theItem)*general.TO_RF);
}
@Override