From 11b9d50f08b0e77ea86be27caac33cd0b7eb0a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Thu, 30 Jan 2014 15:34:48 +0100
Subject: [PATCH] removed usages of client side only methods from wireless
 network logic (screw the Vec3 class, seriously), fixes #107

---
 li/cil/oc/util/WirelessNetwork.scala | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/li/cil/oc/util/WirelessNetwork.scala b/li/cil/oc/util/WirelessNetwork.scala
index baf1a1e6e..669396533 100644
--- a/li/cil/oc/util/WirelessNetwork.scala
+++ b/li/cil/oc/util/WirelessNetwork.scala
@@ -3,6 +3,7 @@ package li.cil.oc.util
 import li.cil.oc.Settings
 import li.cil.oc.server.component.WirelessNetworkCard
 import net.minecraft.block.Block
+import net.minecraft.util.Vec3
 import net.minecraftforge.event.ForgeSubscribe
 import net.minecraftforge.event.world.WorldEvent
 import scala.collection.mutable
@@ -61,7 +62,9 @@ object WirelessNetwork {
           filter(_ != card).
           map(zipWithDistance(card)).
           filter(_._2 <= range * range).
-          map { case (c, distance) => (c, Math.sqrt(distance)) }.
+          map {
+          case (c, distance) => (c, Math.sqrt(distance))
+        }.
           filter(isUnobstructed(card))
       case _ => Iterable.empty[(WirelessNetworkCard, Double)] // Should not be possible.
     }
@@ -96,7 +99,7 @@ object WirelessNetwork {
       val target = pool.getVecFromPool(card.owner.xCoord, card.owner.yCoord, card.owner.zCoord)
 
       // Vector from reference card (sender) to this one (receiver).
-      val delta = origin.subtract(target)
+      val delta = subtract(target, origin)
       val v = delta.normalize()
 
       // Get the vectors that are orthogonal to the direction vector.
@@ -107,8 +110,8 @@ object WirelessNetwork {
       else {
         pool.getVecFromPool(0, 1, 0)
       }
-      val side = v.crossProduct(up)
-      val top = v.crossProduct(side)
+      val side = crossProduct(v, up)
+      val top = crossProduct(v, side)
 
       // Accumulated obstructions and number of samples.
       //val delta = v.lengthVector
@@ -141,4 +144,8 @@ object WirelessNetwork {
     }
     else true
   }
+
+  private def subtract(v1: Vec3, v2: Vec3) = v1.myVec3LocalPool.getVecFromPool(v1.xCoord - v2.xCoord, v1.yCoord - v2.yCoord, v1.zCoord - v2.zCoord)
+
+  private def crossProduct(v1: Vec3, v2: Vec3) = v1.myVec3LocalPool.getVecFromPool(v1.yCoord * v2.zCoord - v1.zCoord * v2.yCoord, v1.zCoord * v2.xCoord - v1.xCoord * v2.zCoord, v1.xCoord * v2.yCoord - v1.yCoord * v2.xCoord)
 }