AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-25 14:05:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-06-25 13:35:59 +02:00
commit e5a6905a60
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
View File

@ -11,6 +11,8 @@ import net.minecraftforge.common.util.ForgeDirection
trait IndustrialCraft2 extends Common with IEnergySink { trait IndustrialCraft2 extends Common with IEnergySink {
var addedToPowerGrid = false var addedToPowerGrid = false
private var lastInjectedAmount = 0.0
private lazy val useIndustrialCraft2Power = isServer && !Settings.get.ignorePower && Mods.IndustrialCraft2.isAvailable private lazy val useIndustrialCraft2Power = isServer && !Settings.get.ignorePower && Mods.IndustrialCraft2.isAvailable
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
@ -36,8 +38,10 @@ trait IndustrialCraft2 extends Common with IEnergySink {
def acceptsEnergyFrom(emitter: net.minecraft.tileentity.TileEntity, direction: ForgeDirection) = canConnectPower(direction) def acceptsEnergyFrom(emitter: net.minecraft.tileentity.TileEntity, direction: ForgeDirection) = canConnectPower(direction)
@Optional.Method(modid = "IC2") @Optional.Method(modid = "IC2")
def injectEnergyUnits(directionFrom: ForgeDirection, amount: Double) = def injectEnergyUnits(directionFrom: ForgeDirection, amount: Double) = {
lastInjectedAmount = amount
amount - tryChangeBuffer(directionFrom, amount * Settings.ratioIC2) / Settings.ratioIC2 amount - tryChangeBuffer(directionFrom, amount * Settings.ratioIC2) / Settings.ratioIC2
}
@Optional.Method(modid = "IC2") @Optional.Method(modid = "IC2")
def getMaxSafeInput = Integer.MAX_VALUE def getMaxSafeInput = Integer.MAX_VALUE
@ -45,6 +49,17 @@ trait IndustrialCraft2 extends Common with IEnergySink {
@Optional.Method(modid = "IC2") @Optional.Method(modid = "IC2")
def demandedEnergyUnits = { def demandedEnergyUnits = {
if (Settings.get.ignorePower || isClient) 0 if (Settings.get.ignorePower || isClient) 0
else ForgeDirection.VALID_DIRECTIONS.map(side => globalBufferSize(side) - globalBuffer(side)).max / Settings.ratioIC2 else {
var force = false
val demand = ForgeDirection.VALID_DIRECTIONS.map(side => {
val size = globalBufferSize(side)
val value = globalBuffer(side)
val space = size - value
force = force || (space > size / 2)
space
}).max / Settings.ratioIC2
if (force || lastInjectedAmount <= 0 || demand >= lastInjectedAmount) demand
else 0
}
} }
} }

2
src/main/scala/li/cil/oc/server/PacketHandler.scala
View File

@ -129,7 +129,7 @@ object PacketHandler extends CommonPacketHandler {
def onPetVisibility(p: PacketParser) { def onPetVisibility(p: PacketParser) {
p.player match { p.player match {
case player: EntityPlayerMP if player != Minecraft.getMinecraft.thePlayer => case player: EntityPlayerMP =>
if (if (p.readBoolean()) { if (if (p.readBoolean()) {
PetVisibility.hidden.remove(player.getCommandSenderName) PetVisibility.hidden.remove(player.getCommandSenderName)
} }