mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Fixed IC2 support (still may crash without), begin adding Tesla support
This commit is contained in:
1 parent
e2a93b5de1
commit
53353cd050
27 files changed
+256
-300
No files matched your search
@@ -113,14 +113,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
|
||||
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;
|
||||
@@ -132,14 +132,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
|
||||
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;
|
||||
@@ -148,13 +148,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
|
||||
@Override
|
||||
public int getEnergyStored(ItemStack theItem)
|
||||
{
|
||||
return (int)Math.round(getEnergy(theItem)* general.TO_TE);
|
||||
return (int)Math.round(getEnergy(theItem)* general.TO_RF);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxEnergyStored(ItemStack theItem)
|
||||
{
|
||||
return (int)Math.round(getMaxEnergy(theItem)* general.TO_TE);
|
||||
return (int)Math.round(getMaxEnergy(theItem)* general.TO_RF);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user