Farm upgrades. Fix some power display bugs. Fix CME in Crafter.

This commit is contained in:
tterrag1098 committed 2014-06-19 14:05:29 -04:00
1 parent cfd32a7ef8
commit 78109e2b7d
6 files changed
+44 -30

No files matched your search

@@ -15,6 +15,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.terraingen.BiomeEvent.GetGrassColor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type;
@@ -211,7 +212,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
public int getEnergyStoredScaled(int scale) {
// NB: called on the client so can't use the power provider
return VecmathUtil.clamp(Math.round(scale * (storedEnergy / capacitorType.capacitor.getMaxEnergyStored())), 0, scale);
return VecmathUtil.clamp(Math.round(scale * (storedEnergy / getCapacitor().getMaxEnergyStored())), 0, scale);
}
public float getEnergyStored() {
@@ -242,7 +243,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi
}
public float getPowerUsePerTick() {
return capacitorType.capacitor.getMaxEnergyExtracted();
return getCapacitor().getMaxEnergyExtracted();
}
// RF Power