Adjustments for 1.8.

This commit is contained in:
Florian Nücke 2015-04-26 17:55:49 +02:00
parent 6ee9e332e8
commit 65cd4d1230
13 changed files with 42 additions and 3 deletions

View File

@ -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 }
}
}

View File

@ -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"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "opencomputers:item/flat",
"textures": {
"layer0": "opencomputers:items/hoverUpgrade1"
}
}

View File

@ -0,0 +1,6 @@
{
"parent": "opencomputers:item/flat",
"textures": {
"layer0": "opencomputers:items/hoverUpgrade2"
}
}

View File

@ -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 ]
}
}
}

View File

@ -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]

View File

@ -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,