From 65cd4d12301a12e3de109bb18e94644b77fb91b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sun, 26 Apr 2015 17:55:49 +0200
Subject: [PATCH] Adjustments for 1.8.

---
 .../assets/opencomputers/blockstates/waypoint.json  |   8 ++++++++
 .../assets/opencomputers/models/block/waypoint.json |   9 +++++++++
 .../opencomputers/models/item/hoverUpgrade1.json    |   6 ++++++
 .../opencomputers/models/item/hoverUpgrade2.json    |   6 ++++++
 .../assets/opencomputers/models/item/waypoint.json  |  10 ++++++++++
 .../assets/opencomputers/recipes/default.recipes    |   4 ++--
 .../blocks/{WaypointBack.png => waypoint_back.png}  | Bin
 .../{WaypointFront.png => waypoint_front.png}       | Bin
 .../blocks/{WaypointSide.png => waypoint_side.png}  | Bin
 .../blocks/{WaypointTop.png => waypoint_top.png}    | Bin
 .../items/{UpgradeHover0.png => hoverUpgrade1.png}  | Bin
 .../items/{UpgradeHover1.png => hoverUpgrade2.png}  | Bin
 .../cil/oc/server/component/UpgradeNavigation.scala |   2 +-
 13 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/assets/opencomputers/blockstates/waypoint.json
 create mode 100644 src/main/resources/assets/opencomputers/models/block/waypoint.json
 create mode 100644 src/main/resources/assets/opencomputers/models/item/hoverUpgrade1.json
 create mode 100644 src/main/resources/assets/opencomputers/models/item/hoverUpgrade2.json
 create mode 100644 src/main/resources/assets/opencomputers/models/item/waypoint.json
 rename src/main/resources/assets/opencomputers/textures/blocks/{WaypointBack.png => waypoint_back.png} (100%)
 rename src/main/resources/assets/opencomputers/textures/blocks/{WaypointFront.png => waypoint_front.png} (100%)
 rename src/main/resources/assets/opencomputers/textures/blocks/{WaypointSide.png => waypoint_side.png} (100%)
 rename src/main/resources/assets/opencomputers/textures/blocks/{WaypointTop.png => waypoint_top.png} (100%)
 rename src/main/resources/assets/opencomputers/textures/items/{UpgradeHover0.png => hoverUpgrade1.png} (100%)
 rename src/main/resources/assets/opencomputers/textures/items/{UpgradeHover1.png => hoverUpgrade2.png} (100%)

diff --git a/src/main/resources/assets/opencomputers/blockstates/waypoint.json b/src/main/resources/assets/opencomputers/blockstates/waypoint.json
new file mode 100644
index 000000000..36fc3da47
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/blockstates/waypoint.json
@@ -0,0 +1,8 @@
+{
+    "variants": {
+        "facing=north": { "model": "opencomputers:waypoint" },
+        "facing=south": { "model": "opencomputers:waypoint", "y": 180 },
+        "facing=west":  { "model": "opencomputers:waypoint", "y": 270 },
+        "facing=east":  { "model": "opencomputers:waypoint", "y": 90 }
+    }
+}
diff --git a/src/main/resources/assets/opencomputers/models/block/waypoint.json b/src/main/resources/assets/opencomputers/models/block/waypoint.json
new file mode 100644
index 000000000..c8459c9f0
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/models/block/waypoint.json
@@ -0,0 +1,9 @@
+{
+    "parent": "block/orientable",
+    "textures": {
+        "bottom": "opencomputers:blocks/generic_top",
+        "top": "opencomputers:blocks/waypoint_top",
+        "side": "opencomputers:blocks/waypoint_side",
+        "front": "opencomputers:blocks/waypoint_front"
+    }
+}
diff --git a/src/main/resources/assets/opencomputers/models/item/hoverUpgrade1.json b/src/main/resources/assets/opencomputers/models/item/hoverUpgrade1.json
new file mode 100644
index 000000000..f67bea2f8
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/models/item/hoverUpgrade1.json
@@ -0,0 +1,6 @@
+{
+    "parent": "opencomputers:item/flat",
+    "textures": {
+        "layer0": "opencomputers:items/hoverUpgrade1"
+    }
+}
diff --git a/src/main/resources/assets/opencomputers/models/item/hoverUpgrade2.json b/src/main/resources/assets/opencomputers/models/item/hoverUpgrade2.json
new file mode 100644
index 000000000..a3d1b804a
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/models/item/hoverUpgrade2.json
@@ -0,0 +1,6 @@
+{
+    "parent": "opencomputers:item/flat",
+    "textures": {
+        "layer0": "opencomputers:items/hoverUpgrade2"
+    }
+}
diff --git a/src/main/resources/assets/opencomputers/models/item/waypoint.json b/src/main/resources/assets/opencomputers/models/item/waypoint.json
new file mode 100644
index 000000000..04028da6e
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/models/item/waypoint.json
@@ -0,0 +1,10 @@
+{
+    "parent": "opencomputers:block/waypoint",
+    "display": {
+        "thirdperson": {
+            "rotation": [ 10, -45, 170 ],
+            "translation": [ 0, 1.5, -2.75 ],
+            "scale": [ 0.375, 0.375, 0.375 ]
+        }
+    }
+}
diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes
index f10736d57..51fc286bd 100644
--- a/src/main/resources/assets/opencomputers/recipes/default.recipes
+++ b/src/main/resources/assets/opencomputers/recipes/default.recipes
@@ -249,9 +249,9 @@ hoverUpgrade1 {
           [feather, "oc:materialCircuitBoardPrinted", feather]]
 }
 hoverUpgrade2 {
-  input: [[end_stone, "oc:circuitChip2", end_stone]
+  input: [[{block="minecraft:end_stone"}, "oc:circuitChip2", {block="minecraft:end_stone"}]
           [nuggetGold, ingotIron, nuggetGold]
-          [end_stone, "oc:materialCircuitBoardPrinted", end_stone]]
+          [{block="minecraft:end_stone"}, "oc:materialCircuitBoardPrinted", {block="minecraft:end_stone"}]]
 }
 inventoryUpgrade {
   input: [[plankWood, hopper, plankWood]
diff --git a/src/main/resources/assets/opencomputers/textures/blocks/WaypointBack.png b/src/main/resources/assets/opencomputers/textures/blocks/waypoint_back.png
similarity index 100%
rename from src/main/resources/assets/opencomputers/textures/blocks/WaypointBack.png
rename to src/main/resources/assets/opencomputers/textures/blocks/waypoint_back.png
diff --git a/src/main/resources/assets/opencomputers/textures/blocks/WaypointFront.png b/src/main/resources/assets/opencomputers/textures/blocks/waypoint_front.png
similarity index 100%
rename from src/main/resources/assets/opencomputers/textures/blocks/WaypointFront.png
rename to src/main/resources/assets/opencomputers/textures/blocks/waypoint_front.png
diff --git a/src/main/resources/assets/opencomputers/textures/blocks/WaypointSide.png b/src/main/resources/assets/opencomputers/textures/blocks/waypoint_side.png
similarity index 100%
rename from src/main/resources/assets/opencomputers/textures/blocks/WaypointSide.png
rename to src/main/resources/assets/opencomputers/textures/blocks/waypoint_side.png
diff --git a/src/main/resources/assets/opencomputers/textures/blocks/WaypointTop.png b/src/main/resources/assets/opencomputers/textures/blocks/waypoint_top.png
similarity index 100%
rename from src/main/resources/assets/opencomputers/textures/blocks/WaypointTop.png
rename to src/main/resources/assets/opencomputers/textures/blocks/waypoint_top.png
diff --git a/src/main/resources/assets/opencomputers/textures/items/UpgradeHover0.png b/src/main/resources/assets/opencomputers/textures/items/hoverUpgrade1.png
similarity index 100%
rename from src/main/resources/assets/opencomputers/textures/items/UpgradeHover0.png
rename to src/main/resources/assets/opencomputers/textures/items/hoverUpgrade1.png
diff --git a/src/main/resources/assets/opencomputers/textures/items/UpgradeHover1.png b/src/main/resources/assets/opencomputers/textures/items/hoverUpgrade2.png
similarity index 100%
rename from src/main/resources/assets/opencomputers/textures/items/UpgradeHover1.png
rename to src/main/resources/assets/opencomputers/textures/items/hoverUpgrade2.png
diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala b/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala
index 96a46116b..f957a8a00 100644
--- a/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala
+++ b/src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala
@@ -64,7 +64,7 @@ class UpgradeNavigation(val host: EnvironmentHost with Rotatable) extends prefab
     val waypoints = Waypoints.findWaypoints(position, range).
       filter(waypoint => waypoint.getDistanceSq(positionVec.xCoord, positionVec.yCoord, positionVec.zCoord) <= rangeSq)
     result(waypoints.map(waypoint => {
-      val delta = position.toVec3.subtract(waypoint.position.offset(waypoint.facing).toVec3)
+      val delta = waypoint.position.offset(waypoint.facing).toVec3.subtract(positionVec)
       Map(
         "position" -> Array(delta.xCoord, delta.yCoord, delta.zCoord),
         "redstone" -> waypoint.maxInput,