diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json index 1911382be..23425a21e 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json +++ b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json @@ -1,179 +1,115 @@ { "__createdBy": "canitzp", - "ambientocclusion": false, + "ambientocclusion": true, "textures": { "particle": "actuallyadditions:blocks/models/modelLaserRelay", "laserRelay": "actuallyadditions:blocks/models/modelLaserRelay" }, "elements": [ { - "from": [4,0,4], - "to": [12,1,12], + "from": [2,0,3], + "to": [14,1,13], "faces": { "up": { - "uv": [0,0,8,8], + "uv": [0,0,12,10], "texture": "#laserRelay" }, "down": { - "uv": [0,0,8,8], + "uv": [0,0,12,10], "texture": "#laserRelay" }, "west": { - "uv": [0,0,8,1], + "uv": [0,0,10,1], "texture": "#laserRelay" }, "east": { - "uv": [0,0,8,1], + "uv": [0,0,10,1], "texture": "#laserRelay" }, "north": { - "uv": [0,0,8,1], + "uv": [0,0,12,1], "texture": "#laserRelay" }, "south": { - "uv": [0,0,8,1], + "uv": [0,0,12,1], + "texture": "#laserRelay" + } + } + }, + { + "from": [3,0,2], + "to": [13,1,3], + "faces": { + "up": { + "uv": [0,0,10,1], + "texture": "#laserRelay" + }, + "down": { + "uv": [0,0,10,1], + "texture": "#laserRelay" + }, + "west": { + "uv": [0,0,1,1], + "texture": "#laserRelay" + }, + "east": { + "uv": [0,0,1,1], + "texture": "#laserRelay" + }, + "north": { + "uv": [0,0,10,1], + "texture": "#laserRelay" + }, + "south": { + "uv": [0.0,0.0,10.0,1.0], + "texture": "#laserRelay" + } + } + }, + { + "from": [3,0,13], + "to": [13,1,14], + "faces": { + "up": { + "uv": [0,0,10,1], + "texture": "#laserRelay" + }, + "down": { + "uv": [0,0,10,1], + "texture": "#laserRelay" + }, + "west": { + "uv": [0,0,1,1], + "texture": "#laserRelay" + }, + "east": { + "uv": [0,0,1,1], + "texture": "#laserRelay" + }, + "north": { + "texture": "#laserRelay" + }, + "south": { + "uv": [0,0,10,1], "texture": "#laserRelay" } } }, { "from": [4,1,3], - "to": [12,4,4], + "to": [12,2,13], "faces": { "up": { - "uv": [0,0,8,1], + "uv": [0,0,8,10], "texture": "#laserRelay" }, "down": { - "uv": [0,0,8,1], "texture": "#laserRelay" }, "west": { - "uv": [0,0,1,3], "texture": "#laserRelay" }, "east": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,1,12], - "to": [12,4,13], - "faces": { - "up": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,11,12], - "to": [12,14,13], - "faces": { - "up": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,11,3], - "to": [12,14,4], - "faces": { - "up": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,4,2], - "to": [12,5,3], - "faces": { - "up": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,1], "texture": "#laserRelay" }, "north": { @@ -187,195 +123,277 @@ } }, { - "from": [4,10,2], - "to": [12,11,3], + "from": [3,1,3], + "to": [4,2,13], "faces": { "up": { - "uv": [0,0,8,1], + "uv": [0,0,1,10], "texture": "#laserRelay" }, "down": { - "uv": [0,0,8,1], "texture": "#laserRelay" }, "west": { - "uv": [0,0,1,1], + "uv": [0,0,10,1], "texture": "#laserRelay" }, "east": { - "uv": [0,0,1,1], "texture": "#laserRelay" }, "north": { - "uv": [0,0,8,1], + "uv": [0,0,1,1], "texture": "#laserRelay" }, "south": { - "uv": [0,0,8,1], + "uv": [0,0,1,1], "texture": "#laserRelay" } } }, { - "from": [4,10,13], - "to": [12,11,14], + "from": [12,1,3], + "to": [13,2,13], "faces": { "up": { - "uv": [0,0,8,1], + "uv": [0,0,1,10], "texture": "#laserRelay" }, "down": { - "uv": [0,0,8,1], "texture": "#laserRelay" }, "west": { - "uv": [0,0,1,1], "texture": "#laserRelay" }, "east": { - "uv": [0,0,1,1], + "uv": [0,0,10,1], "texture": "#laserRelay" }, "north": { - "uv": [0,0,8,1], + "uv": [0,0,1,1], "texture": "#laserRelay" }, "south": { - "uv": [0,0,8,1], + "uv": [0,0,1,1], "texture": "#laserRelay" } } }, { - "from": [4,4,13], - "to": [12,5,14], + "from": [4,2,4], + "to": [12,3,12], "faces": { "up": { - "uv": [0,0,8,1], + "uv": [2.5,12.5,8,16], "texture": "#laserRelay" }, "down": { - "uv": [0,0,8,1], "texture": "#laserRelay" }, "west": { - "uv": [0,0,1,1], + "uv": [0,12.5,8,13.5], "texture": "#laserRelay" }, "east": { - "uv": [0,0,1,1], + "uv": [0,12.5,8,13.5], "texture": "#laserRelay" }, "north": { - "uv": [0,0,8,1], + "uv": [0,12.5,8,13.5], "texture": "#laserRelay" }, "south": { - "uv": [0,0,8,1], + "uv": [0,12.5,8,13.5], "texture": "#laserRelay" } } }, { - "from": [5.5,1,5.5], - "to": [10.5,3,10.5], + "from": [6,3,6], + "to": [7,5,7], "faces": { "up": { - "uv": [13.5,13.5,16,16], + "uv": [15,15,16,16], "texture": "#laserRelay" }, "down": { - "uv": [0.0,0.0,5.0,5.0], - "texture": "missingtexture" + "uv": [6.0,9.0,7.0,10.0], + "texture": "#laserRelay" }, "west": { - "uv": [0,0,5,2], + "uv": [15,14,16,16], "texture": "#laserRelay" }, "east": { - "uv": [0,0,5,2], + "uv": [15,14,16,16], "texture": "#laserRelay" }, "north": { - "uv": [0,0,5,2], + "uv": [15,14,16,16], "texture": "#laserRelay" }, "south": { - "uv": [0,0,5,2], + "uv": [15,14,16,16], + "texture": "#laserRelay" + } + } + }, + { + "from": [9,3,9], + "to": [10,5,10], + "faces": { + "up": { + "uv": [15,15,16,16], + "texture": "#laserRelay" + }, + "down": { + "uv": [9.0,6.0,10.0,7.0], + "texture": "#laserRelay" + }, + "west": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "east": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "north": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "south": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + } + } + }, + { + "from": [6,3,9], + "to": [7,5,10], + "faces": { + "up": { + "uv": [15,15,16,16], + "texture": "#laserRelay" + }, + "down": { + "uv": [6.0,6.0,7.0,7.0], + "texture": "#laserRelay" + }, + "west": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "east": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "north": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "south": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + } + } + }, + { + "from": [9,3,6], + "to": [10,5,7], + "faces": { + "up": { + "uv": [15,15,16,16], + "texture": "#laserRelay" + }, + "down": { + "uv": [9.0,9.0,10.0,10.0], + "texture": "#laserRelay" + }, + "west": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "east": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "north": { + "uv": [15,14,16,16], + "texture": "#laserRelay" + }, + "south": { + "uv": [15,14,16,16], "texture": "#laserRelay" } } }, { "from": [7,3,7], - "to": [9,14,9], + "to": [9,6,9], "faces": { "up": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" + "texture": "#laserRelay" }, "down": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" + "texture": "#laserRelay" }, "west": { - "uv": [14,2,16,7.5], + "uv": [0,0,2,3], "texture": "#laserRelay" }, "east": { - "uv": [14,2,16,7.5], + "uv": [0,0,2,3], "texture": "#laserRelay" }, "north": { - "uv": [14,2,16,7.5], + "uv": [0,0,2,3], "texture": "#laserRelay" }, "south": { - "uv": [14,2,16,7.5], + "uv": [0,0,2,3], "texture": "#laserRelay" } } }, { - "from": [4,14,4], - "to": [12,15,12], - "faces": { - "up": { - "uv": [1,12,5,15], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,8,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [6.5,6.5,6.5], - "to": [9.5,9.5,9.5], + "from": [7,6,7], + "to": [9,10,9], "faces": { "up": { "uv": [14,0,16,2], "texture": "#laserRelay" }, "down": { - "uv": [14,0,16,2], + "texture": "#laserRelay" + }, + "west": { + "uv": [14,0,16,4], + "texture": "#laserRelay" + }, + "east": { + "uv": [14,0,16,4], + "texture": "#laserRelay" + }, + "north": { + "uv": [14,0,16,4], + "texture": "#laserRelay" + }, + "south": { + "uv": [14,0,16,4], + "texture": "#laserRelay" + } + } + }, + { + "from": [6,7,7], + "to": [10,9,9], + "faces": { + "up": { + "uv": [12,0,16,2], + "texture": "#laserRelay" + }, + "down": { + "uv": [12,0,16,2], "texture": "#laserRelay" }, "west": { @@ -386,6 +404,36 @@ "uv": [14,0,16,2], "texture": "#laserRelay" }, + "north": { + "uv": [12,0,16,2], + "texture": "#laserRelay" + }, + "south": { + "uv": [12,0,16,2], + "texture": "#laserRelay" + } + } + }, + { + "from": [7,7,6], + "to": [9,9,10], + "faces": { + "up": { + "uv": [14,0,16,4], + "texture": "#laserRelay" + }, + "down": { + "uv": [14,0,16,4], + "texture": "#laserRelay" + }, + "west": { + "uv": [12,0,16,2], + "texture": "#laserRelay" + }, + "east": { + "uv": [12,0,16,2], + "texture": "#laserRelay" + }, "north": { "uv": [14,0,16,2], "texture": "#laserRelay" @@ -395,486 +443,6 @@ "texture": "#laserRelay" } } - }, - { - "from": [4,5,2], - "to": [5,10,3], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } - }, - { - "from": [11,5,2], - "to": [12,10,3], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } - }, - { - "from": [11,5,13], - "to": [12,10,14], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,5,13], - "to": [5,10,14], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } - }, - { - "from": [3,1,4], - "to": [4,4,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [12,1,4], - "to": [13,4,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [12,11,4], - "to": [13,14,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [3,11,4], - "to": [4,14,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,3], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,3], - "texture": "#laserRelay" - } - } - }, - { - "from": [2,4,4], - "to": [3,5,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [2,10,4], - "to": [3,11,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [13,10,4], - "to": [14,11,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [13,4,4], - "to": [14,5,12], - "faces": { - "up": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "down": { - "uv": [0,0,1,8], - "texture": "#laserRelay" - }, - "west": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [2,5,4], - "to": [3,10,5], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } - }, - { - "from": [2,5,11], - "to": [3,10,12], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } - }, - { - "from": [13,5,11], - "to": [14,10,12], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } - }, - { - "from": [13,5,4], - "to": [14,10,5], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,1,5], - "texture": "#laserRelay" - } - } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelay.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelay.png index 3e9140c00..5135405f6 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelay.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelay.png differ