From 7cf14ed7fdd1ed80df458dee1297dfdb1f87961b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Tue, 26 Nov 2013 21:41:43 +0100
Subject: [PATCH] charger texture and fixed power distributor synchronization
 when the max failed as well as when there are multiple distributors in a
 network

---
 assets/opencomputers/textures/blocks/charger.png  | Bin 0 -> 761 bytes
 li/cil/oc/common/block/Charger.scala              |  12 +++++++++---
 li/cil/oc/server/component/PowerDistributor.scala |   9 +++++----
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 assets/opencomputers/textures/blocks/charger.png

diff --git a/assets/opencomputers/textures/blocks/charger.png b/assets/opencomputers/textures/blocks/charger.png
new file mode 100644
index 0000000000000000000000000000000000000000..913e2512bcf6f945c62182432654197c489db887
GIT binary patch
literal 761
zcmV<V0tWqwP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl2A-kMHv|x7#J7;000*k7c(<68X6iW
zCnru$PE1TpG&D3Hlpj)3QXCu{F)=YPFfag+030_QA0HnmC@27(07pkh0G0qy`%oa2
zAR8MSBO@bJR8&<}RZqH40384(CMF&{9sr~OARr({-bOVwH9|r{!^1s7)k0BGQAct|
zMsY?dDJfG^Qzo@09UUDdv?b@}O4Zdz78VvAT^+;2K0IGMR#sLkD=TLo9{?HvB5fif
zZXzUiBpo^(95@_JO-(=`AhNPLLYqRIA|gJMJ|d?gH(57qA|gn1M@#ifOSDTw)kHdt
zI!3KVC3z*@-bgw+Iw-p+A7&ppIyxtPCmv-U03QHBK|vcf8$UlkK0ZDqNF*k?CLcc^
z)zv~Hb0ao3HX^MeGcq$Isw7UiPDbWN0Ez%4uOvPnAJx@JM506|x+g+xLL_t~JUl!b
zSsP1BOHWTvA3Yx?OeQ2rBsn=bn;;-1B_+DLI!*3PNOMR~P*5TwA|$sYBqStCs!AI-
z8%wZD!^1o^Ry7`z9#Q*IDYz*pI(Vu8008|-L_t(|+7yrlZv;UIMj3WzR?pq7?(Xfi
zS9f=JcX$8a#}X2fm%I-GFsncUMr{oMMTr>2;qr)~C`MzL;FY^f2)~HC{o=3b1%P$M
z5r?LBF}iy47F9@51wK{$-wfk;)vQnf;PQR%V5`0Qb_~DpL6rc!>AszfiL=3#4@`%=
z6k1eT(z;%A)b@OOJQ7->jDl3^FgwtkyGQJKT_9yTpzHPDh5Bz`uGh6p%49Opk$7CY
zo=@Va>zu%5rKhvo>5O^mu))0Jz-CPJeJ;j)c!B*q!+>d=gQLX}H2Dt)nGUnbvS!<t
r?b{i<tPx-mt+qY@L6B+z@&XJ1@jfOK1GrGy00000NkvXXu0mjfCcF(g

literal 0
HcmV?d00001

diff --git a/li/cil/oc/common/block/Charger.scala b/li/cil/oc/common/block/Charger.scala
index f351af6f9..d6e889a59 100644
--- a/li/cil/oc/common/block/Charger.scala
+++ b/li/cil/oc/common/block/Charger.scala
@@ -13,16 +13,22 @@ import net.minecraftforge.common.ForgeDirection
 class Charger(val parent: SimpleDelegator) extends SimpleDelegate {
   val unlocalizedName = "Charger"
 
-  var icon: Icon = null
+  private val icons = Array.fill[Icon](6)(null)
 
   override def addInformation(player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) {
     tooltip.addAll(Tooltip.get(unlocalizedName))
   }
 
-  override def icon(side: ForgeDirection) = Some(icon)
+  override def icon(side: ForgeDirection) = Some(icons(side.ordinal()))
 
   override def registerIcons(iconRegister: IconRegister) = {
-    icon = iconRegister.registerIcon(Settings.resourceDomain + ":charger")
+    icons(ForgeDirection.DOWN.ordinal) = iconRegister.registerIcon(Settings.resourceDomain + ":case_top")
+    icons(ForgeDirection.UP.ordinal) = icons(ForgeDirection.DOWN.ordinal)
+
+    icons(ForgeDirection.NORTH.ordinal) = iconRegister.registerIcon(Settings.resourceDomain + ":charger")
+    icons(ForgeDirection.SOUTH.ordinal) = icons(ForgeDirection.NORTH.ordinal)
+    icons(ForgeDirection.WEST.ordinal) = icons(ForgeDirection.NORTH.ordinal)
+    icons(ForgeDirection.EAST.ordinal) = icons(ForgeDirection.NORTH.ordinal)
   }
 
   override def hasTileEntity = true
diff --git a/li/cil/oc/server/component/PowerDistributor.scala b/li/cil/oc/server/component/PowerDistributor.scala
index 39d265ea1..9bb4c320d 100644
--- a/li/cil/oc/server/component/PowerDistributor.scala
+++ b/li/cil/oc/server/component/PowerDistributor.scala
@@ -18,7 +18,7 @@ class PowerDistributor(val owner: PowerInformation) extends ManagedComponent {
 
   var globalBufferSize = 0.0
 
-  private var lastSentBuffer = 0.0
+  private var lastSentRatio = 0.0
 
   private val buffers = mutable.Set.empty[Connector]
 
@@ -170,7 +170,8 @@ class PowerDistributor(val owner: PowerInformation) extends ManagedComponent {
     // Only send updates if the state changed by more than 5%, more won't be
     // noticeable "from the outside" anyway. We send more frequent updates in
     // the gui/container of a block that needs it (like robots).
-    val shouldSend = (lastSentBuffer - sumBuffer).abs > globalBufferSize * (5.0 / 100.0)
+    val fillRatio = sumBuffer / sumBufferSize
+    val shouldSend = (lastSentRatio - fillRatio).abs > (5.0 / 100.0)
     for (distributor <- distributors) distributor.synchronized {
       distributor.dirty = false
       distributor.globalBuffer = sumBuffer
@@ -178,8 +179,8 @@ class PowerDistributor(val owner: PowerInformation) extends ManagedComponent {
       distributor.owner.globalBuffer = sumBuffer
       distributor.owner.globalBufferSize = sumBufferSize
       if (shouldSend) {
-        distributor.lastSentBuffer = sumBuffer
-        ServerPacketSender.sendPowerState(owner)
+        distributor.lastSentRatio = fillRatio
+        ServerPacketSender.sendPowerState(distributor.owner)
       }
     }
   }