tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix IC2 charging

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-08 16:10:52 -05:00
parent 8289af18fd
commit ce629e218c
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/mekanism/client/sound/Sound.java
View file

@ -3,7 +3,6 @@ package mekanism.client.sound;
import java.net.URL; import java.net.URL;
import mekanism.client.MekanismClient; import mekanism.client.MekanismClient;
import mekanism.common.Mekanism;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;

2
common/mekanism/common/util/ChargeUtils.java
View file

@ -83,7 +83,7 @@ public final class ChargeUtils
} }
else if(Mekanism.hooks.IC2Loaded && storer.inventory[slotID].getItem() instanceof IElectricItem) else if(Mekanism.hooks.IC2Loaded && storer.inventory[slotID].getItem() instanceof IElectricItem)
{ {
double sent = ElectricItem.manager.charge(storer.inventory[slotID], (int)(storer.getEnergy()*Mekanism.TO_IC2), 3, true, false)*Mekanism.FROM_IC2; double sent = ElectricItem.manager.charge(storer.inventory[slotID], (int)(storer.getEnergy()*Mekanism.TO_IC2), 4, true, false)*Mekanism.FROM_IC2;
storer.setEnergy(storer.getEnergy() - sent); storer.setEnergy(storer.getEnergy() - sent);
} }
else if(storer.inventory[slotID].getItem() instanceof IEnergyContainerItem) else if(storer.inventory[slotID].getItem() instanceof IEnergyContainerItem)