diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 7e7f632ad..cf0127d99 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -34,12 +34,12 @@ public class BlockLaserRelay extends BlockContainerBase{ //This took way too much fiddling around. I'm not good with numbers. private static final float F = 1/16F; - private static final AxisAlignedBB AABB_UP = new AxisAlignedBB(2*F, 0, 2*F, 1-2*F, 1-F, 1-2*F); - private static final AxisAlignedBB AABB_DOWN = new AxisAlignedBB(2*F, F, 2*F, 1-2*F, 1, 1-2*F); - private static final AxisAlignedBB AABB_NORTH = new AxisAlignedBB(2*F, F, F, 1-2*F, 1-F, 1); - private static final AxisAlignedBB AABB_EAST = new AxisAlignedBB(0, F, 2*F, 1-F, 1-F, 1-2*F); - private static final AxisAlignedBB AABB_SOUTH = new AxisAlignedBB(2*F, F, 0, 1-2*F, 1-F, 1-F); - private static final AxisAlignedBB AABB_WEST = new AxisAlignedBB(F, F, 2*F, 1, 1-F, 1-2*F); + private static final AxisAlignedBB AABB_UP = new AxisAlignedBB(2*F, 0, 2*F, 1-2*F, 10*F, 1-2*F); + private static final AxisAlignedBB AABB_DOWN = new AxisAlignedBB(2*F, 6*F, 2*F, 1-2*F, 1, 1-2*F); + private static final AxisAlignedBB AABB_NORTH = new AxisAlignedBB(2*F, 2*F, 6*F, 1-2*F, 1-2*F, 1); + private static final AxisAlignedBB AABB_EAST = new AxisAlignedBB(0, 2*F, 2*F, 1-6*F, 1-2*F, 1-2*F); + private static final AxisAlignedBB AABB_SOUTH = new AxisAlignedBB(2*F, 2*F, 0, 1-2*F, 1-2*F, 1-6*F); + private static final AxisAlignedBB AABB_WEST = new AxisAlignedBB(6*F, 2*F, 2*F, 1, 1-2*F, 1-2*F); private static final PropertyInteger META = PropertyInteger.create("meta", 0, 5); private final Type type; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java index b77a7316b..48c5a199d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java @@ -24,8 +24,8 @@ import net.minecraft.util.math.BlockPos; public class RenderLaserRelay extends TileEntitySpecialRenderer{ private static final float[] COLOR = new float[]{1F, 0F, 0F}; - private static final float[] COLOR_ITEM = new float[]{43F/255F, 158F/255F, 39/255F}; - private static final float[] COLOR_FLUIDS = new float[]{139F/255F, 94F/255F, 1F}; + private static final float[] COLOR_ITEM = new float[]{0F, 124F/255F, 16F/255F}; + private static final float[] COLOR_FLUIDS = new float[]{0F, 97F/255F, 198F/255F}; @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){ diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json index 3ad16948c..882150334 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json @@ -2,6 +2,9 @@ "forge_marker": 1, "defaults": { "model": "actuallyadditions:blockLaserRelay", + "textures": { + "particle": "actuallyadditions:blocks/models/modelLaserRelay" + }, "transform": "forge:default-block" }, "variants": { diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayAdvanced.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayAdvanced.json index 0234f4ce8..5a1e6f8f6 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayAdvanced.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayAdvanced.json @@ -1,7 +1,10 @@ { "forge_marker": 1, "defaults": { - "model": "actuallyadditions:blockLaserRelayAdvanced", + "model": "actuallyadditions:blockLaserRelay", + "textures": { + "particle": "actuallyadditions:blocks/models/modelLaserRelayAdvanced" + }, "transform": "forge:default-block" }, "variants": { diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayExtreme.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayExtreme.json index 477178697..4beaf3319 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayExtreme.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayExtreme.json @@ -1,7 +1,10 @@ { "forge_marker": 1, "defaults": { - "model": "actuallyadditions:blockLaserRelayExtreme", + "model": "actuallyadditions:blockLaserRelay", + "textures": { + "particle": "actuallyadditions:blocks/models/modelLaserRelayExtreme" + }, "transform": "forge:default-block" }, "variants": { diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayFluids.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayFluids.json index d2d27f351..406412e13 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayFluids.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayFluids.json @@ -1,7 +1,10 @@ { "forge_marker": 1, "defaults": { - "model": "actuallyadditions:blockLaserRelayFluids", + "model": "actuallyadditions:blockLaserRelay", + "textures": { + "particle": "actuallyadditions:blocks/models/modelLaserRelayFluids" + }, "transform": "forge:default-block" }, "variants": { diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItem.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItem.json index 122532146..368193170 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItem.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItem.json @@ -1,7 +1,10 @@ { "forge_marker": 1, "defaults": { - "model": "actuallyadditions:blockLaserRelayItem", + "model": "actuallyadditions:blockLaserRelay", + "textures": { + "particle": "actuallyadditions:blocks/models/modelLaserRelayItem" + }, "transform": "forge:default-block" }, "variants": { diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItemWhitelist.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItemWhitelist.json index 9993a6f0f..c0c8b68f4 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItemWhitelist.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelayItemWhitelist.json @@ -1,7 +1,10 @@ { "forge_marker": 1, "defaults": { - "model": "actuallyadditions:blockLaserRelayItemWhitelist", + "model": "actuallyadditions:blockLaserRelay", + "textures": { + "particle": "actuallyadditions:blocks/models/modelLaserRelayItemWhitelist" + }, "transform": "forge:default-block" }, "variants": { diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json index 23425a21e..469c823d9 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json +++ b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelay.json @@ -2,8 +2,7 @@ "__createdBy": "canitzp", "ambientocclusion": true, "textures": { - "particle": "actuallyadditions:blocks/models/modelLaserRelay", - "laserRelay": "actuallyadditions:blocks/models/modelLaserRelay" + "laserRelay": "#particle" }, "elements": [ { diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayAdvanced.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayAdvanced.json deleted file mode 100644 index 24a569026..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayAdvanced.json +++ /dev/null @@ -1,880 +0,0 @@ -{ - "__createdBy": "canitzp", - "ambientocclusion": false, - "textures": { - "particle": "actuallyadditions:blocks/models/modelLaserRelayAdvanced", - "laserRelay": "actuallyadditions:blocks/models/modelLaserRelayAdvanced" - }, - "elements": [ - { - "from": [4,0,4], - "to": [12,1,12], - "faces": { - "up": { - "uv": [0,0,8,8], - "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": [4,1,3], - "to": [12,4,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,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,2], - "to": [12,11,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,13], - "to": [12,11,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,4,13], - "to": [12,5,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [5.5,1,5.5], - "to": [10.5,3,10.5], - "faces": { - "up": { - "uv": [13.5,13.5,16,16], - "texture": "#laserRelay" - }, - "down": { - "uv": [0.0,0.0,5.0,5.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - } - } - }, - { - "from": [7,3,7], - "to": [9,14,9], - "faces": { - "up": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "west": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,2,16,7.5], - "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], - "faces": { - "up": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "down": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "west": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,0,16,2], - "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/models/block/blockLaserRelayExtreme.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayExtreme.json deleted file mode 100644 index 756ae2b41..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayExtreme.json +++ /dev/null @@ -1,880 +0,0 @@ -{ - "__createdBy": "canitzp", - "ambientocclusion": false, - "textures": { - "particle": "actuallyadditions:blocks/models/modelLaserRelayExtreme", - "laserRelay": "actuallyadditions:blocks/models/modelLaserRelayExtreme" - }, - "elements": [ - { - "from": [4,0,4], - "to": [12,1,12], - "faces": { - "up": { - "uv": [0,0,8,8], - "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": [4,1,3], - "to": [12,4,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,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,2], - "to": [12,11,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,13], - "to": [12,11,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,4,13], - "to": [12,5,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [5.5,1,5.5], - "to": [10.5,3,10.5], - "faces": { - "up": { - "uv": [13.5,13.5,16,16], - "texture": "#laserRelay" - }, - "down": { - "uv": [0.0,0.0,5.0,5.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - } - } - }, - { - "from": [7,3,7], - "to": [9,14,9], - "faces": { - "up": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "west": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,2,16,7.5], - "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], - "faces": { - "up": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "down": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "west": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,0,16,2], - "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/models/block/blockLaserRelayFluids.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayFluids.json deleted file mode 100644 index 115e77124..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayFluids.json +++ /dev/null @@ -1,880 +0,0 @@ -{ - "__createdBy": "canitzp", - "ambientocclusion": false, - "textures": { - "particle": "actuallyadditions:blocks/models/modelLaserRelayFluids", - "laserRelay": "actuallyadditions:blocks/models/modelLaserRelayFluids" - }, - "elements": [ - { - "from": [4,0,4], - "to": [12,1,12], - "faces": { - "up": { - "uv": [0,0,8,8], - "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": [4,1,3], - "to": [12,4,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,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,2], - "to": [12,11,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,13], - "to": [12,11,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,4,13], - "to": [12,5,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [5.5,1,5.5], - "to": [10.5,3,10.5], - "faces": { - "up": { - "uv": [13.5,13.5,16,16], - "texture": "#laserRelay" - }, - "down": { - "uv": [0.0,0.0,5.0,5.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - } - } - }, - { - "from": [7,3,7], - "to": [9,14,9], - "faces": { - "up": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "west": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,2,16,7.5], - "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], - "faces": { - "up": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "down": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "west": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,0,16,2], - "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/models/block/blockLaserRelayItem.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayItem.json deleted file mode 100644 index 0a39a5a03..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayItem.json +++ /dev/null @@ -1,880 +0,0 @@ -{ - "__createdBy": "canitzp", - "ambientocclusion": false, - "textures": { - "particle": "actuallyadditions:blocks/models/modelLaserRelayItem", - "laserRelay": "actuallyadditions:blocks/models/modelLaserRelayItem" - }, - "elements": [ - { - "from": [4,0,4], - "to": [12,1,12], - "faces": { - "up": { - "uv": [0,0,8,8], - "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": [4,1,3], - "to": [12,4,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,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,2], - "to": [12,11,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,13], - "to": [12,11,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,4,13], - "to": [12,5,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [5.5,1,5.5], - "to": [10.5,3,10.5], - "faces": { - "up": { - "uv": [13.5,13.5,16,16], - "texture": "#laserRelay" - }, - "down": { - "uv": [0.0,0.0,5.0,5.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - } - } - }, - { - "from": [7,3,7], - "to": [9,14,9], - "faces": { - "up": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "west": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,2,16,7.5], - "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], - "faces": { - "up": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "down": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "west": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,0,16,2], - "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/models/block/blockLaserRelayItemWhitelist.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayItemWhitelist.json deleted file mode 100644 index a2934f48b..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayItemWhitelist.json +++ /dev/null @@ -1,880 +0,0 @@ -{ - "__createdBy": "canitzp", - "ambientocclusion": false, - "textures": { - "particle": "actuallyadditions:blocks/models/modelLaserRelayItemWhitelist", - "laserRelay": "actuallyadditions:blocks/models/modelLaserRelayItemWhitelist" - }, - "elements": [ - { - "from": [4,0,4], - "to": [12,1,12], - "faces": { - "up": { - "uv": [0,0,8,8], - "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": [4,1,3], - "to": [12,4,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,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,2], - "to": [12,11,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,13], - "to": [12,11,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,4,13], - "to": [12,5,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [5.5,1,5.5], - "to": [10.5,3,10.5], - "faces": { - "up": { - "uv": [13.5,13.5,16,16], - "texture": "#laserRelay" - }, - "down": { - "uv": [0.0,0.0,5.0,5.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - } - } - }, - { - "from": [7,3,7], - "to": [9,14,9], - "faces": { - "up": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "west": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,2,16,7.5], - "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], - "faces": { - "up": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "down": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "west": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,0,16,2], - "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/models/block/blockLaserRelayWithWindow.json b/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayWithWindow.json deleted file mode 100644 index b933ad9c0..000000000 --- a/src/main/resources/assets/actuallyadditions/models/block/blockLaserRelayWithWindow.json +++ /dev/null @@ -1,999 +0,0 @@ -{ - "__createdwith": "opl's Model Creator", - "ambientocclusion": false, - "textures": { - "laserRelay": "actuallyadditions:blocks/models/modelLaserRelay" - }, - "elements": [ - { - "from": [4,0,4], - "to": [12,1,12], - "faces": { - "up": { - "uv": [0,0,8,8], - "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": [4,1,3], - "to": [12,4,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,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,2], - "to": [12,11,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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,10,13], - "to": [12,11,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [4,4,13], - "to": [12,5,14], - "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": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,8,1], - "texture": "#laserRelay" - } - } - }, - { - "from": [5.5,1,5.5], - "to": [10.5,3,10.5], - "faces": { - "up": { - "uv": [13.5,13.5,16,16], - "texture": "#laserRelay" - }, - "down": { - "uv": [0.0,0.0,5.0,5.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [0,0,5,2], - "texture": "#laserRelay" - } - } - }, - { - "from": [7,3,7], - "to": [9,14,9], - "faces": { - "up": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,2.0,2.0], - "texture": "missingtexture" - }, - "west": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,2,16,7.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,2,16,7.5], - "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], - "faces": { - "up": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "down": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "west": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "east": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "north": { - "uv": [14,0,16,2], - "texture": "#laserRelay" - }, - "south": { - "uv": [14,0,16,2], - "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": [5,5,2], - "to": [11,10,3], - "faces": { - "up": { - "uv": [0.0,0.0,6.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,6.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - }, - "east": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - }, - "north": { - "uv": [12.5,8,15.5,10.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [12.5,8,15.5,10.5], - "texture": "#laserRelay" - } - } - }, - { - "from": [5,5,13], - "to": [11,10,14], - "faces": { - "up": { - "uv": [0.0,0.0,6.0,1.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,6.0,1.0], - "texture": "missingtexture" - }, - "west": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - }, - "east": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - }, - "north": { - "uv": [12.5,8,15.5,10.5], - "texture": "#laserRelay" - }, - "south": { - "uv": [12.5,8,15.5,10.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" - } - } - }, - { - "from": [2,5,5], - "to": [3,10,11], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,6.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,6.0], - "texture": "missingtexture" - }, - "west": { - "uv": [12.5,8,15.5,10.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [12.5,8,15.5,10.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - }, - "south": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - } - } - }, - { - "from": [13,5,5], - "to": [14,10,11], - "faces": { - "up": { - "uv": [0.0,0.0,1.0,6.0], - "texture": "missingtexture" - }, - "down": { - "uv": [0.0,0.0,1.0,6.0], - "texture": "missingtexture" - }, - "west": { - "uv": [12.5,8,15.5,10.5], - "texture": "#laserRelay" - }, - "east": { - "uv": [12.5,8,15.5,10.5], - "texture": "#laserRelay" - }, - "north": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - }, - "south": { - "uv": [0.0,0.0,1.0,5.0], - "texture": "missingtexture" - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayAdvanced.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayAdvanced.png index d4388e8e0..0769b2ec6 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayAdvanced.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayAdvanced.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayExtreme.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayExtreme.png index 079149cea..7f172d085 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayExtreme.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayExtreme.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayFluids.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayFluids.png index 7dcb8e174..0a393ce6d 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayFluids.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayFluids.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItem.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItem.png index 1d1a654de..65e790f49 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItem.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItem.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItemWhitelist.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItemWhitelist.png index e9b6b2f5d..44ca83380 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItemWhitelist.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelLaserRelayItemWhitelist.png differ