From 051e7ffc1f918fd63a6f1cbdaf840f7810e158b4 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 8 Feb 2022 04:34:22 +0100 Subject: [PATCH] Mipped Sleepers - Distant tracks are now a lot easier on the eyes --- .../trains/track/StandardBogeyBlock.java | 2 +- .../logistics/trains/track/TrackInstance.java | 7 +- .../logistics/trains/track/TrackRenderer.java | 26 +- .../create/models/block/track/ascending.json | 2 + .../create/models/block/track/ascending.mtl | 2 + .../create/models/block/track/ascending.obj | 526 ++++++++++-------- .../block/track/ascending_template.json | 94 +++- .../create/models/block/track/diag.json | 2 + .../assets/create/models/block/track/diag.mtl | 2 + .../assets/create/models/block/track/diag.obj | 456 ++++++++------- .../models/block/track/diag_template.json | 91 ++- .../models/block/track/segment_left.json | 8 +- .../models/block/track/segment_right.json | 8 +- .../assets/create/models/block/track/tie.json | 27 +- .../create/models/block/track/x_ortho.json | 48 +- .../create/models/block/track/z_ortho.json | 48 +- .../create/textures/block/standard_track.png | Bin 990 -> 996 bytes .../textures/block/standard_track_mip.png | Bin 0 -> 297 bytes .../assets/create/textures/item/track.png | Bin 283 -> 283 bytes 19 files changed, 813 insertions(+), 536 deletions(-) create mode 100644 src/main/resources/assets/create/textures/block/standard_track_mip.png diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java index 8aeca3c55..3f69c2f8f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/StandardBogeyBlock.java @@ -101,7 +101,7 @@ public class StandardBogeyBlock extends Block implements IBogeyBlock, ITE { .nudge((int) bc.tePositions.getFirst() .asLong()); - var mat = materialManager.defaultSolid() + var mat = materialManager.cutout(RenderType.cutoutMipped()) .material(Materials.TRANSFORMED); int segCount = bc.getSegmentCount(); @@ -136,7 +137,7 @@ public class TrackInstance extends BlockEntityInstance { .rotateYRadians(angles.y) .rotateXRadians(angles.x) .rotateZRadians(angles.z) - .translate(-1 / 2f, -2 / 16f - 1 / 1024f, 0); + .translate(-1 / 2f, -2 / 16f - 1 / 256f, 0); tiesLightPos[modelIndex] = new BlockPos(railMiddle).offset(tePosition); } @@ -153,7 +154,7 @@ public class TrackInstance extends BlockEntityInstance { .rotateYRadians(angles.y) .rotateXRadians(angles.x) .rotateZRadians(angles.z) - .translate(0, -2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 512f, 0) + .translate(0, -2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 256f, 0) .scale(1, 1, (float) diff.length() * 2.1f); (first ? leftLightPos : rightLightPos)[modelIndex] = new BlockPos(prevI).offset(tePosition); } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java index 122c19de8..5e62f2cb3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java @@ -35,7 +35,7 @@ public class TrackRenderer extends SafeTileEntityRenderer { if (Backend.isOn()) return; - VertexConsumer vb = buffer.getBuffer(RenderType.solid()); + VertexConsumer vb = buffer.getBuffer(RenderType.cutoutMipped()); te.connections.forEach(map -> map.values() .forEach(bc -> renderBezierTurn(bc, ms, vb))); } @@ -82,9 +82,10 @@ public class TrackRenderer extends SafeTileEntityRenderer { .rotateYRadians(angles.y) .rotateXRadians(angles.x) .rotateZRadians(angles.z) - .translate(-1 / 2f, -2 / 16f - 1 / 1024f, 0); + .translate(-1 / 2f, -2 / 16f - 1 / 256f, 0); - sbb.light(centralLight); + sbb.disableDiffuseMult() + .light(centralLight); sbb.renderInto(ms, vb); } @@ -103,11 +104,12 @@ public class TrackRenderer extends SafeTileEntityRenderer { .rotateYRadians(angles.y) .rotateXRadians(angles.x) .rotateZRadians(angles.z) - .translate(0, -2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 1024f, 0) + .translate(0, -2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 256f, 0) .scale(1, 1, (float) diff.length() * 2.1f); - sbb.light(LevelRenderer.getLightColor(Minecraft.getInstance().level, - new BlockPos(prevI).offset(tePosition))); + sbb.disableDiffuseMult() + .light(LevelRenderer.getLightColor(Minecraft.getInstance().level, + new BlockPos(prevI).offset(tePosition))); sbb.renderInto(ms, vb); } } @@ -163,10 +165,11 @@ public class TrackRenderer extends SafeTileEntityRenderer { .rotateXRadians(angles.x) .rotateZRadians(angles.z) .translate(0, 2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 1024f, 0) - .rotateZ(top ? 0 : 180) + .rotateZ(top ? 0 : 0) .scale(1, 1, (float) diff.length() * l); - sbb2.light(centralLight); + sbb2.disableDiffuseMult() + .light(centralLight); sbb2.renderInto(ms, vb); } @@ -178,8 +181,8 @@ public class TrackRenderer extends SafeTileEntityRenderer { Vec3 diff = railI.subtract(prevI); Vec3 angles = getModelAngles(normal, diff); - SuperByteBuffer sbb2 = CachedBufferer.partial(AllBlockPartials.GIRDER_SEGMENT_2, - Blocks.AIR.defaultBlockState()); + SuperByteBuffer sbb2 = + CachedBufferer.partial(AllBlockPartials.GIRDER_SEGMENT_2, Blocks.AIR.defaultBlockState()); sbb2.translate(prevI) .rotateYRadians(angles.y) @@ -188,7 +191,8 @@ public class TrackRenderer extends SafeTileEntityRenderer { .translate(0, 2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 1024f, 0) .scale(1, 1, (float) diff.length() * l); - sbb2.light(centralLight); + sbb2.disableDiffuseMult() + .light(centralLight); sbb2.renderInto(ms, vb); } } diff --git a/src/main/resources/assets/create/models/block/track/ascending.json b/src/main/resources/assets/create/models/block/track/ascending.json index 7e03b7ec5..b5232533a 100644 --- a/src/main/resources/assets/create/models/block/track/ascending.json +++ b/src/main/resources/assets/create/models/block/track/ascending.json @@ -1,9 +1,11 @@ { "loader": "forge:obj", + "ambientocclusion": false, "flip-v": true, "model": "create:models/block/track/ascending.obj", "textures": { "0": "create:block/standard_track", + "1": "create:block/standard_track_mip", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/ascending.mtl b/src/main/resources/assets/create/models/block/track/ascending.mtl index 28a2a45f4..327d876ee 100644 --- a/src/main/resources/assets/create/models/block/track/ascending.mtl +++ b/src/main/resources/assets/create/models/block/track/ascending.mtl @@ -1,4 +1,6 @@ # Made in Blockbench 4.1.4 +newmtl m_2 +map_Kd #1 newmtl m_1_0 map_Kd #0 newmtl none \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/ascending.obj b/src/main/resources/assets/create/models/block/track/ascending.obj index 169f94ee7..da12b332f 100644 --- a/src/main/resources/assets/create/models/block/track/ascending.obj +++ b/src/main/resources/assets/create/models/block/track/ascending.obj @@ -2,94 +2,70 @@ mtllib ascending.mtl o cube1 -v 1.8718750000000002 0.742462120245875 0.6502601910021413 -v 1.8718750000000002 0.5656854249492381 0.4734834957055044 -v 1.8718750000000002 0.5612660075668222 0.8314563036811942 -v 1.8718750000000002 0.38448931227018524 0.6546796083845573 -v 0.5 0.5656854249492381 0.4734834957055044 -v 0.5 0.742462120245875 0.6502601910021413 -v 0.5 0.38448931227018524 0.6546796083845573 -v 0.5 0.5612660075668222 0.8314563036811942 +v 1.8718750000000002 0.7424621202458751 0.6502601910021413 +v 1.8718750000000002 0.5656854249492382 0.47348349570550435 +v 1.8718750000000002 0.5612660075668223 0.8314563036811942 +v 1.8718750000000002 0.38448931227018535 0.6546796083845572 +v 0.5 0.5656854249492382 0.47348349570550435 +v 0.5 0.7424621202458751 0.6502601910021413 +v 0.5 0.38448931227018535 0.6546796083845572 +v 0.5 0.5612660075668223 0.8314563036811942 vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 vt 0 0.75 -vt 0 1 -vt 0.6875 1 -vt 0.6875 0.875 -vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 vt 0.6875 0.625 vt 0 0.625 vn 0 -0.7071067811865476 -0.7071067811865475 -vn 1 0 0 vn 0 0.7071067811865476 0.7071067811865475 -vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 f 4/4/1 7/3/1 5/2/1 2/1/1 -f 3/8/2 4/7/2 2/6/2 1/5/2 -f 8/12/3 3/11/3 1/10/3 6/9/3 -f 6/16/4 1/15/4 2/14/4 5/13/4 -f 7/20/5 4/19/5 3/18/5 8/17/5 +f 8/8/2 3/7/2 1/6/2 6/5/2 +f 7/12/3 4/11/3 3/10/3 8/9/3 o cube2 -v 1.8718750000000002 0.4110058165646808 0.31880388732094717 -v 1.8718750000000002 0.23422912126804388 0.14202719202431024 -v 1.8718750000000002 0.229809703885628 0.5 -v 1.8718750000000002 0.053033008588991015 0.32322330470336313 -v 0.5 0.23422912126804388 0.14202719202431024 -v 0.5 0.4110058165646808 0.31880388732094717 -v 0.5 0.053033008588991015 0.32322330470336313 -v 0.5 0.229809703885628 0.5 +v 1.8718750000000002 0.4110058165646809 0.3188038873209471 +v 1.8718750000000002 0.23422912126804393 0.1420271920243102 +v 1.8718750000000002 0.22980970388562805 0.5 +v 1.8718750000000002 0.0530330085889911 0.323223304703363 +v 0.5 0.23422912126804393 0.1420271920243102 +v 0.5 0.4110058165646809 0.3188038873209471 +v 0.5 0.0530330085889911 0.323223304703363 +v 0.5 0.22980970388562805 0.5 vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 vt 0 0.75 -vt 0 1 -vt 0.6875 1 -vt 0.6875 0.875 -vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 vt 0.6875 0.625 vt 0 0.625 vn 0 -0.7071067811865476 -0.7071067811865475 -vn 1 0 0 vn 0 0.7071067811865476 0.7071067811865475 -vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 12/24/6 15/23/6 13/22/6 10/21/6 -f 11/28/7 12/27/7 10/26/7 9/25/7 -f 16/32/8 11/31/8 9/30/8 14/29/8 -f 14/36/9 9/35/9 10/34/9 13/33/9 -f 15/40/10 12/39/10 11/38/10 16/37/10 +f 12/16/4 15/15/4 13/14/4 10/13/4 +f 16/20/5 11/19/5 9/18/5 14/17/5 +f 15/24/6 12/23/6 11/22/6 16/21/6 o cube3 -v 0.5 0.742462120245875 0.6502601910021413 -v 0.5 0.5656854249492381 0.4734834957055044 -v 0.5 0.5612660075668222 0.8314563036811942 -v 0.5 0.38448931227018524 0.6546796083845573 -v -0.871875 0.5656854249492381 0.4734834957055044 -v -0.871875 0.742462120245875 0.6502601910021413 -v -0.871875 0.38448931227018524 0.6546796083845573 -v -0.871875 0.5612660075668222 0.8314563036811942 +v 0.5 0.7424621202458751 0.6502601910021413 +v 0.5 0.5656854249492382 0.47348349570550435 +v 0.5 0.5612660075668223 0.8314563036811942 +v 0.5 0.38448931227018535 0.6546796083845572 +v -0.871875 0.5656854249492382 0.47348349570550435 +v -0.871875 0.7424621202458751 0.6502601910021413 +v -0.871875 0.38448931227018535 0.6546796083845572 +v -0.871875 0.5612660075668223 0.8314563036811942 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 @@ -98,78 +74,54 @@ vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 1 -vt 0.6875 1 vt 0.6875 0.625 vt 0 0.625 vt 0 0.75 vt 0.6875 0.75 vn 0 -0.7071067811865476 -0.7071067811865475 vn 0 0.7071067811865476 0.7071067811865475 -vn -1 0 0 -vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 20/44/11 23/43/11 21/42/11 18/41/11 -f 24/48/12 19/47/12 17/46/12 22/45/12 -f 23/52/13 24/51/13 22/50/13 21/49/13 -f 22/56/14 17/55/14 18/54/14 21/53/14 -f 23/60/15 20/59/15 19/58/15 24/57/15 +f 20/28/7 23/27/7 21/26/7 18/25/7 +f 24/32/8 19/31/8 17/30/8 22/29/8 +f 23/36/9 20/35/9 19/34/9 24/33/9 o cube5 -v 1.8718750000000002 1.0739184239270692 0.9817164946833354 -v 1.8718750000000002 0.8971417286304324 0.8049397993866986 -v 1.8718750000000002 0.8927223112480164 1.1629126073623883 -v 1.8718750000000002 0.7159456159513795 0.9861359120657515 -v 0.5 0.8971417286304324 0.8049397993866986 -v 0.5 1.0739184239270692 0.9817164946833354 -v 0.5 0.7159456159513795 0.9861359120657515 -v 0.5 0.8927223112480164 1.1629126073623883 +v 1.8718750000000002 1.0739184239270694 0.9817164946833354 +v 1.8718750000000002 0.8971417286304324 0.8049397993866985 +v 1.8718750000000002 0.8927223112480165 1.1629126073623883 +v 1.8718750000000002 0.7159456159513795 0.9861359120657514 +v 0.5 0.8971417286304324 0.8049397993866985 +v 0.5 1.0739184239270694 0.9817164946833354 +v 0.5 0.7159456159513795 0.9861359120657514 +v 0.5 0.8927223112480165 1.1629126073623883 vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 vt 0 0.75 -vt 0 1 -vt 0.6875 1 -vt 0.6875 0.875 -vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 vt 0.6875 0.625 vt 0 0.625 vn 0 -0.7071067811865476 -0.7071067811865475 -vn 1 0 0 vn 0 0.7071067811865476 0.7071067811865475 -vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 28/64/16 31/63/16 29/62/16 26/61/16 -f 27/68/17 28/67/17 26/66/17 25/65/17 -f 32/72/18 27/71/18 25/70/18 30/69/18 -f 30/76/19 25/75/19 26/74/19 29/73/19 -f 31/80/20 28/79/20 27/78/20 32/77/20 +f 28/40/10 31/39/10 29/38/10 26/37/10 +f 32/44/11 27/43/11 25/42/11 30/41/11 +f 31/48/12 28/47/12 27/46/12 32/45/12 o cube4 -v 0.5 1.0739184239270692 0.9817164946833354 -v 0.5 0.8971417286304324 0.8049397993866986 -v 0.5 0.8927223112480164 1.1629126073623883 -v 0.5 0.7159456159513795 0.9861359120657515 -v -0.871875 0.8971417286304324 0.8049397993866986 -v -0.871875 1.0739184239270692 0.9817164946833354 -v -0.871875 0.7159456159513795 0.9861359120657515 -v -0.871875 0.8927223112480164 1.1629126073623883 +v 0.5 1.0739184239270694 0.9817164946833354 +v 0.5 0.8971417286304324 0.8049397993866985 +v 0.5 0.8927223112480165 1.1629126073623883 +v 0.5 0.7159456159513795 0.9861359120657514 +v -0.871875 0.8971417286304324 0.8049397993866985 +v -0.871875 1.0739184239270694 0.9817164946833354 +v -0.871875 0.7159456159513795 0.9861359120657514 +v -0.871875 0.8927223112480165 1.1629126073623883 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 @@ -178,38 +130,26 @@ vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 1 -vt 0.6875 1 vt 0.6875 0.625 vt 0 0.625 vt 0 0.75 vt 0.6875 0.75 vn 0 -0.7071067811865476 -0.7071067811865475 vn 0 0.7071067811865476 0.7071067811865475 -vn -1 0 0 -vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 36/84/21 39/83/21 37/82/21 34/81/21 -f 40/88/22 35/87/22 33/86/22 38/85/22 -f 39/92/23 40/91/23 38/90/23 37/89/23 -f 38/96/24 33/95/24 34/94/24 37/93/24 -f 39/100/25 36/99/25 35/98/25 40/97/25 +f 36/52/13 39/51/13 37/50/13 34/49/13 +f 40/56/14 35/55/14 33/54/14 38/53/14 +f 39/60/15 36/59/15 35/58/15 40/57/15 o cube6 -v 0.5 0.4110058165646808 0.31880388732094717 -v 0.5 0.23422912126804388 0.14202719202431024 -v 0.5 0.229809703885628 0.5 -v 0.5 0.053033008588991015 0.32322330470336313 -v -0.871875 0.23422912126804388 0.14202719202431024 -v -0.871875 0.4110058165646808 0.31880388732094717 -v -0.871875 0.053033008588991015 0.32322330470336313 -v -0.871875 0.229809703885628 0.5 +v 0.5 0.4110058165646809 0.3188038873209471 +v 0.5 0.23422912126804393 0.1420271920243102 +v 0.5 0.22980970388562805 0.5 +v 0.5 0.0530330085889911 0.323223304703363 +v -0.871875 0.23422912126804393 0.1420271920243102 +v -0.871875 0.4110058165646809 0.3188038873209471 +v -0.871875 0.0530330085889911 0.323223304703363 +v -0.871875 0.22980970388562805 0.5 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 @@ -218,82 +158,202 @@ vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 1 -vt 0.6875 1 vt 0.6875 0.625 vt 0 0.625 vt 0 0.75 vt 0.6875 0.75 vn 0 -0.7071067811865476 -0.7071067811865475 vn 0 0.7071067811865476 0.7071067811865475 -vn -1 0 0 -vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 44/104/26 47/103/26 45/102/26 42/101/26 -f 48/108/27 43/107/27 41/106/27 46/105/27 -f 47/112/28 48/111/28 46/110/28 45/109/28 -f 46/116/29 41/115/29 42/114/29 45/113/29 -f 47/120/30 44/119/30 43/118/30 48/117/30 +f 44/64/16 47/63/16 45/62/16 42/61/16 +f 48/68/17 43/67/17 41/66/17 46/65/17 +f 47/72/18 44/71/18 43/70/18 48/69/18 +o cube7 +v 0.5 0.4993941642129993 0.40719223496926554 +v 0.5 0.14584077361972547 0.05363884437599176 +v 0.5 0.31819805153394654 0.5883883476483184 +v 0.5 -0.03535533905932736 0.2348349570550446 +v -0.871875 0.14584077361972547 0.05363884437599176 +v -0.871875 0.4993941642129993 0.40719223496926554 +v -0.871875 -0.03535533905932736 0.2348349570550446 +v -0.871875 0.31819805153394654 0.5883883476483184 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0.6875 0.46875 +vt 0 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vn -1 0 0 +vn 0 0.7071067811865475 -0.7071067811865476 +usemtl m_2 +f 55/76/19 56/75/19 54/74/19 53/73/19 +f 54/80/20 49/79/20 50/78/20 53/77/20 +o cube8 +v 0.5 0.8308504678941935 0.7386485386504598 +v 0.5 0.47729707730091975 0.3850951480571859 +v 0.5 0.6496543552151406 0.9198446513295127 +v 0.5 0.2961009646218669 0.5662912607362388 +v -0.871875 0.47729707730091975 0.3850951480571859 +v -0.871875 0.8308504678941935 0.7386485386504598 +v -0.871875 0.2961009646218669 0.5662912607362388 +v -0.871875 0.6496543552151406 0.9198446513295127 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0.6875 0.46875 +vt 0 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vn -1 0 0 +vn 0 0.7071067811865475 -0.7071067811865476 +usemtl m_2 +f 63/84/21 64/83/21 62/82/21 61/81/21 +f 62/88/22 57/87/22 58/86/22 61/85/22 +o cube9 +v 0.5 1.1623067715753876 1.0701048423316537 +v 0.5 0.8087533809821139 0.71655145173838 +v 0.5 0.9811106588963348 1.2513009550107066 +v 0.5 0.627557268303061 0.8977475644174329 +v -0.871875 0.8087533809821139 0.71655145173838 +v -0.871875 1.1623067715753876 1.0701048423316537 +v -0.871875 0.627557268303061 0.8977475644174329 +v -0.871875 0.9811106588963348 1.2513009550107066 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0.6875 0.46875 +vt 0 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vn -1 0 0 +vn 0 0.7071067811865475 -0.7071067811865476 +usemtl m_2 +f 71/92/23 72/91/23 70/90/23 69/89/23 +f 70/96/24 65/95/24 66/94/24 69/93/24 +o cube10 +v 1.8718750000000002 0.4993941642129993 0.40719223496926554 +v 1.8718750000000002 0.14584077361972547 0.05363884437599176 +v 1.8718750000000002 0.31819805153394654 0.5883883476483184 +v 1.8718750000000002 -0.03535533905932736 0.2348349570550446 +v 0.5 0.14584077361972547 0.05363884437599176 +v 0.5 0.4993941642129993 0.40719223496926554 +v 0.5 -0.03535533905932736 0.2348349570550446 +v 0.5 0.31819805153394654 0.5883883476483184 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vt 0.6875 0.46875 +vt 0 0.46875 +vn 1 0 0 +vn 0 0.7071067811865475 -0.7071067811865476 +usemtl m_2 +f 75/100/25 76/99/25 74/98/25 73/97/25 +f 78/104/26 73/103/26 74/102/26 77/101/26 +o cube11 +v 1.8718750000000002 0.8308504678941935 0.7386485386504598 +v 1.8718750000000002 0.47729707730091975 0.3850951480571859 +v 1.8718750000000002 0.6496543552151406 0.9198446513295127 +v 1.8718750000000002 0.2961009646218669 0.5662912607362388 +v 0.5 0.47729707730091975 0.3850951480571859 +v 0.5 0.8308504678941935 0.7386485386504598 +v 0.5 0.2961009646218669 0.5662912607362388 +v 0.5 0.6496543552151406 0.9198446513295127 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vt 0.6875 0.46875 +vt 0 0.46875 +vn 1 0 0 +vn 0 0.7071067811865475 -0.7071067811865476 +usemtl m_2 +f 83/108/27 84/107/27 82/106/27 81/105/27 +f 86/112/28 81/111/28 82/110/28 85/109/28 +o cube12 +v 1.8718750000000002 1.1623067715753876 1.0701048423316537 +v 1.8718750000000002 0.8087533809821139 0.71655145173838 +v 1.8718750000000002 0.9811106588963348 1.2513009550107066 +v 1.8718750000000002 0.627557268303061 0.8977475644174329 +v 0.5 0.8087533809821139 0.71655145173838 +v 0.5 1.1623067715753876 1.0701048423316537 +v 0.5 0.627557268303061 0.8977475644174329 +v 0.5 0.9811106588963348 1.2513009550107066 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vt 0.6875 0.46875 +vt 0 0.46875 +vn 1 0 0 +vn 0 0.7071067811865475 -0.7071067811865476 +usemtl m_2 +f 91/116/29 92/115/29 90/114/29 89/113/29 +f 94/120/30 89/119/30 90/118/30 93/117/30 o rail1 -v 1.5968749999999998 1.1181125977512283 1.114299016155813 -v 1.5968749999999998 0.10164659979556617 0.097833018200151 -v 1.5968749999999998 1.1159028890600204 1.1165087248470211 -v 1.5968749999999998 0.09943689110435822 0.10004272689135901 -v 1.334375 0.10164659979556617 0.097833018200151 -v 1.334375 1.1181125977512283 1.114299016155813 -v 1.334375 0.09943689110435822 0.10004272689135901 -v 1.334375 1.1159028890600204 1.1165087248470211 -vt 0.71875 0.375 -vt 0.71875 0.25 -vt 0 0.25 -vt 0 0.375 -vt 0.71875 0.375 -vt 0.71875 0.25 -vt 0 0.25 -vt 0 0.375 +v 1.5968749999999998 1.1181125977512285 1.114299016155813 +v 1.5968749999999998 0.10164659979556628 0.09783301820015089 +v 1.5968749999999998 1.1159028890600204 1.116508724847021 +v 1.5968749999999998 0.09943689110435827 0.10004272689135896 +v 1.334375 0.10164659979556628 0.09783301820015089 +v 1.334375 1.1181125977512285 1.114299016155813 +v 1.334375 0.09943689110435827 0.10004272689135896 +v 1.334375 1.1159028890600204 1.116508724847021 +vt 0.71875 0.46875 +vt 0.71875 0.34375 +vt 0 0.34375 +vt 0 0.46875 +vt 0.71875 0.46875 +vt 0.71875 0.34375 +vt 0 0.34375 +vt 0 0.46875 vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 54/124/31 49/123/31 50/122/31 53/121/31 -f 55/128/32 52/127/32 51/126/32 56/125/32 +f 102/124/31 97/123/31 98/122/31 101/121/31 +f 103/128/32 100/127/32 99/126/32 104/125/32 o rail2 -v 1.5906250000000002 1.3125669625775287 0.9198446513295127 -v 1.5906250000000002 0.2961009646218666 -0.09662134662614941 -v 1.5906250000000002 1.3103572538863208 0.9220543600207206 -v 1.5906250000000002 0.2938912559306586 -0.09441163793494145 -v 1.340625 0.2961009646218666 -0.09662134662614941 -v 1.340625 1.3125669625775287 0.9198446513295127 -v 1.340625 0.2938912559306586 -0.09441163793494145 -v 1.340625 1.3103572538863208 0.9220543600207206 -vt 0.71875 0.5 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.5 -vt 0.71875 0.375 -vt 0.71875 0.25 -vt 0 0.25 -vt 0 0.375 +v 1.5906250000000002 1.3125669625775285 0.9198446513295129 +v 1.5906250000000002 0.2961009646218663 -0.09662134662614907 +v 1.5906250000000002 1.3103572538863204 0.9220543600207209 +v 1.5906250000000002 0.2938912559306583 -0.09441163793494112 +v 1.340625 0.2961009646218663 -0.09662134662614907 +v 1.340625 1.3125669625775285 0.9198446513295129 +v 1.340625 0.2938912559306583 -0.09441163793494112 +v 1.340625 1.3103572538863204 0.9220543600207209 +vt 0.71875 0.28125 +vt 0.71875 0.15625 +vt 0 0.15625 +vt 0 0.28125 +vt 0.71875 0.46875 +vt 0.71875 0.34375 +vt 0 0.34375 +vt 0 0.46875 vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 62/132/33 57/131/33 58/130/33 61/129/33 -f 63/136/34 60/135/34 59/134/34 64/133/34 +f 110/132/33 105/131/33 106/130/33 109/129/33 +f 111/136/34 108/135/34 107/134/34 112/133/34 o rail3 -v 1.5625 1.3125669625775287 0.9198446513295127 -v 1.5625 0.2961009646218666 -0.09662134662614941 -v 1.5625 1.1181125977512283 1.114299016155813 -v 1.5625 0.10164659979556617 0.097833018200151 -v 1.36875 0.2961009646218666 -0.09662134662614941 -v 1.36875 1.3125669625775287 0.9198446513295127 -v 1.36875 0.10164659979556617 0.097833018200151 -v 1.36875 1.1181125977512283 1.114299016155813 +v 1.5625 1.3125669625775285 0.9198446513295129 +v 1.5625 0.2961009646218663 -0.09662134662614907 +v 1.5625 1.1181125977512285 1.114299016155813 +v 1.5625 0.10164659979556628 0.09783301820015089 +v 1.36875 0.2961009646218663 -0.09662134662614907 +v 1.36875 1.3125669625775285 0.9198446513295129 +v 1.36875 0.10164659979556628 0.09783301820015089 +v 1.36875 1.1181125977512285 1.114299016155813 vt 0.6875 0.875 vt 0.78125 0.875 vt 0.78125 0.75 @@ -315,41 +375,41 @@ vn 1 0 0 vn 0 0.7071067811865476 0.7071067811865475 vn -1 0 0 usemtl m_1_0 -f 68/140/35 71/139/35 69/138/35 66/137/35 -f 67/144/36 68/143/36 66/142/36 65/141/36 -f 72/148/37 67/147/37 65/146/37 70/145/37 -f 71/152/38 72/151/38 70/150/38 69/149/38 +f 116/140/35 119/139/35 117/138/35 114/137/35 +f 115/144/36 116/143/36 114/142/36 113/141/36 +f 120/148/37 115/147/37 113/146/37 118/145/37 +f 119/152/38 120/151/38 118/150/38 117/149/38 o rail4 -v -0.34062499999999996 1.3125669625775287 0.9198446513295127 -v -0.34062499999999996 0.2961009646218666 -0.09662134662614941 -v -0.34062499999999996 1.3103572538863208 0.9220543600207206 -v -0.34062499999999996 0.2938912559306586 -0.09441163793494145 -v -0.590625 0.2961009646218666 -0.09662134662614941 -v -0.590625 1.3125669625775287 0.9198446513295127 -v -0.590625 0.2938912559306586 -0.09441163793494145 -v -0.590625 1.3103572538863208 0.9220543600207206 -vt 0.71875 0.375 -vt 0.71875 0.5 -vt 0 0.5 -vt 0 0.375 -vt 0.71875 0.25 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.25 +v -0.34062499999999996 1.3125669625775285 0.9198446513295129 +v -0.34062499999999996 0.2961009646218663 -0.09662134662614907 +v -0.34062499999999996 1.3103572538863204 0.9220543600207209 +v -0.34062499999999996 0.2938912559306583 -0.09441163793494112 +v -0.590625 0.2961009646218663 -0.09662134662614907 +v -0.590625 1.3125669625775285 0.9198446513295129 +v -0.590625 0.2938912559306583 -0.09441163793494112 +v -0.590625 1.3103572538863204 0.9220543600207209 +vt 0.71875 0.15625 +vt 0.71875 0.28125 +vt 0 0.28125 +vt 0 0.15625 +vt 0.71875 0.34375 +vt 0.71875 0.46875 +vt 0 0.46875 +vt 0 0.34375 vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 78/156/39 73/155/39 74/154/39 77/153/39 -f 79/160/40 76/159/40 75/158/40 80/157/40 +f 126/156/39 121/155/39 122/154/39 125/153/39 +f 127/160/40 124/159/40 123/158/40 128/157/40 o rail5 -v -0.36875 1.3125669625775287 0.9198446513295127 -v -0.36875 0.2961009646218666 -0.09662134662614941 -v -0.36875 1.1181125977512283 1.114299016155813 -v -0.36875 0.10164659979556617 0.097833018200151 -v -0.5625 0.2961009646218666 -0.09662134662614941 -v -0.5625 1.3125669625775287 0.9198446513295127 -v -0.5625 0.10164659979556617 0.097833018200151 -v -0.5625 1.1181125977512283 1.114299016155813 +v -0.36875 1.3125669625775285 0.9198446513295129 +v -0.36875 0.2961009646218663 -0.09662134662614907 +v -0.36875 1.1181125977512285 1.114299016155813 +v -0.36875 0.10164659979556628 0.09783301820015089 +v -0.5625 0.2961009646218663 -0.09662134662614907 +v -0.5625 1.3125669625775285 0.9198446513295129 +v -0.5625 0.10164659979556628 0.09783301820015089 +v -0.5625 1.1181125977512285 1.114299016155813 vt 0.78125 0.875 vt 0.6875 0.875 vt 0.6875 0.75 @@ -371,29 +431,29 @@ vn 1 0 0 vn 0 0.7071067811865476 0.7071067811865475 vn -1 0 0 usemtl m_1_0 -f 84/164/41 87/163/41 85/162/41 82/161/41 -f 83/168/42 84/167/42 82/166/42 81/165/42 -f 88/172/43 83/171/43 81/170/43 86/169/43 -f 87/176/44 88/175/44 86/174/44 85/173/44 +f 132/164/41 135/163/41 133/162/41 130/161/41 +f 131/168/42 132/167/42 130/166/42 129/165/42 +f 136/172/43 131/171/43 129/170/43 134/169/43 +f 135/176/44 136/175/44 134/174/44 133/173/44 o rail6 -v -0.334375 1.1181125977512283 1.114299016155813 -v -0.334375 0.10164659979556617 0.097833018200151 -v -0.334375 1.1159028890600204 1.1165087248470211 -v -0.334375 0.09943689110435822 0.10004272689135901 -v -0.596875 0.10164659979556617 0.097833018200151 -v -0.596875 1.1181125977512283 1.114299016155813 -v -0.596875 0.09943689110435822 0.10004272689135901 -v -0.596875 1.1159028890600204 1.1165087248470211 -vt 0.71875 0.25 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.25 -vt 0.71875 0.25 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.25 +v -0.334375 1.1181125977512285 1.114299016155813 +v -0.334375 0.10164659979556628 0.09783301820015089 +v -0.334375 1.1159028890600204 1.116508724847021 +v -0.334375 0.09943689110435827 0.10004272689135896 +v -0.596875 0.10164659979556628 0.09783301820015089 +v -0.596875 1.1181125977512285 1.114299016155813 +v -0.596875 0.09943689110435827 0.10004272689135896 +v -0.596875 1.1159028890600204 1.116508724847021 +vt 0.71875 0.34375 +vt 0.71875 0.46875 +vt 0 0.46875 +vt 0 0.34375 +vt 0.71875 0.34375 +vt 0.71875 0.46875 +vt 0 0.46875 +vt 0 0.34375 vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 usemtl m_1_0 -f 94/180/45 89/179/45 90/178/45 93/177/45 -f 95/184/46 92/183/46 91/182/46 96/181/46 \ No newline at end of file +f 142/180/45 137/179/45 138/178/45 141/177/45 +f 143/184/46 140/183/46 139/182/46 144/181/46 \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/ascending_template.json b/src/main/resources/assets/create/models/block/track/ascending_template.json index 52d439abc..d4f482935 100644 --- a/src/main/resources/assets/create/models/block/track/ascending_template.json +++ b/src/main/resources/assets/create/models/block/track/ascending_template.json @@ -2,7 +2,9 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "1_0": "create:block/standard_track" + "2": "create:block/standard_track_mip", + "1_0": "create:block/standard_track", + "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ { @@ -12,9 +14,7 @@ "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1_0"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1_0"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1_0"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1_0"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1_0"} } }, @@ -25,9 +25,7 @@ "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1_0"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1_0"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1_0"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1_0"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1_0"} } }, @@ -39,8 +37,6 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1_0"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1_0"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1_0"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1_0"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1_0"} } }, @@ -51,9 +47,7 @@ "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1_0"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1_0"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1_0"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1_0"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1_0"} } }, @@ -65,8 +59,6 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1_0"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1_0"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1_0"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1_0"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1_0"} } }, @@ -78,19 +70,77 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1_0"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1_0"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1_0"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1_0"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1_0"} } }, + { + "name": "cube7", + "from": [-5.95, 10.6, 12.6], + "to": [16, 14.7, 20.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "west": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "cube8", + "from": [-5.95, 10.6, 20.1], + "to": [16, 14.7, 28.1], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "west": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "cube9", + "from": [-5.95, 10.6, 27.6], + "to": [16, 14.7, 35.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "west": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "cube10", + "from": [16, 10.6, 12.6], + "to": [37.95, 14.7, 20.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "east": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "texture": "#2"} + } + }, + { + "name": "cube11", + "from": [16, 10.6, 20.1], + "to": [37.95, 14.7, 28.1], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "east": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "texture": "#2"} + } + }, + { + "name": "cube12", + "from": [16, 10.6, 27.6], + "to": [37.95, 14.7, 35.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "east": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "texture": "#2"} + } + }, { "name": "rail1", "from": [29.35, 13.65, 12.6], "to": [33.55, 13.7, 35.6], "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1_0"}, - "down": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1_0"} + "up": {"uv": [0, 8.5, 11.5, 10.5], "rotation": 270, "texture": "#1_0"}, + "down": {"uv": [0, 8.5, 11.5, 10.5], "rotation": 270, "texture": "#1_0"} } }, { @@ -99,8 +149,8 @@ "to": [33.45, 18.1, 35.6], "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 8, 11.5, 10], "rotation": 270, "texture": "#1_0"}, - "down": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1_0"} + "up": {"uv": [0, 11.5, 11.5, 13.5], "rotation": 270, "texture": "#1_0"}, + "down": {"uv": [0, 8.5, 11.5, 10.5], "rotation": 270, "texture": "#1_0"} } }, { @@ -121,8 +171,8 @@ "to": [2.55, 18.1, 35.6], "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 10, 11.5, 8], "rotation": 270, "texture": "#1_0"}, - "down": {"uv": [0, 12, 11.5, 10], "rotation": 270, "texture": "#1_0"} + "up": {"uv": [0, 13.5, 11.5, 11.5], "rotation": 270, "texture": "#1_0"}, + "down": {"uv": [0, 10.5, 11.5, 8.5], "rotation": 270, "texture": "#1_0"} } }, { @@ -143,8 +193,8 @@ "to": [2.65, 13.7, 35.6], "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 12, 11.5, 10], "rotation": 270, "texture": "#1_0"}, - "down": {"uv": [0, 12, 11.5, 10], "rotation": 270, "texture": "#1_0"} + "up": {"uv": [0, 10.5, 11.5, 8.5], "rotation": 270, "texture": "#1_0"}, + "down": {"uv": [0, 10.5, 11.5, 8.5], "rotation": 270, "texture": "#1_0"} } } ], @@ -158,7 +208,7 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] } ] } diff --git a/src/main/resources/assets/create/models/block/track/diag.json b/src/main/resources/assets/create/models/block/track/diag.json index 7c21eb717..cd16063f5 100644 --- a/src/main/resources/assets/create/models/block/track/diag.json +++ b/src/main/resources/assets/create/models/block/track/diag.json @@ -1,9 +1,11 @@ { "loader": "forge:obj", + "ambientocclusion": false, "flip-v": true, "model": "create:models/block/track/diag.obj", "textures": { "0": "create:block/standard_track", + "1": "create:block/standard_track_mip", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" } } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/diag.mtl b/src/main/resources/assets/create/models/block/track/diag.mtl index 5ddbcfba0..f117ad543 100644 --- a/src/main/resources/assets/create/models/block/track/diag.mtl +++ b/src/main/resources/assets/create/models/block/track/diag.mtl @@ -1,4 +1,6 @@ # Made in Blockbench 4.1.4 newmtl m_1 map_Kd #0 +newmtl m_2 +map_Kd #1 newmtl none \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/diag.obj b/src/main/resources/assets/create/models/block/track/diag.obj index 70d890907..ca0336edb 100644 --- a/src/main/resources/assets/create/models/block/track/diag.obj +++ b/src/main/resources/assets/create/models/block/track/diag.obj @@ -14,33 +14,21 @@ vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 vt 0 0.75 -vt 0 1 -vt 0.6875 1 -vt 0.6875 0.875 -vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 vt 0.6875 0.625 vt 0 0.625 vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 vn 0.7071067811865476 0 0.7071067811865475 -vn 0 1 0 vn 0 -1 0 usemtl m_1 f 4/4/1 7/3/1 5/2/1 2/1/1 -f 3/8/2 4/7/2 2/6/2 1/5/2 -f 8/12/3 3/11/3 1/10/3 6/9/3 -f 6/16/4 1/15/4 2/14/4 5/13/4 -f 7/20/5 4/19/5 3/18/5 8/17/5 +f 8/8/2 3/7/2 1/6/2 6/5/2 +f 7/12/3 4/11/3 3/10/3 8/9/3 o cube2 v 1.2269941594074192 0.12812500000000004 -0.7131300714731708 v 1.0502174641107824 0.12812500000000004 -0.8899067667698075 @@ -54,33 +42,21 @@ vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 vt 0 0.875 vt 0.6875 0.875 vt 0.6875 0.75 vt 0 0.75 -vt 0 1 -vt 0.6875 1 -vt 0.6875 0.875 -vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 vt 0.6875 0.625 vt 0 0.625 vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 vn 0.7071067811865476 0 0.7071067811865475 -vn 0 1 0 vn 0 -1 0 usemtl m_1 -f 12/24/6 15/23/6 13/22/6 10/21/6 -f 11/28/7 12/27/7 10/26/7 9/25/7 -f 16/32/8 11/31/8 9/30/8 14/29/8 -f 14/36/9 9/35/9 10/34/9 13/33/9 -f 15/40/10 12/39/10 11/38/10 16/37/10 +f 12/16/4 15/15/4 13/14/4 10/13/4 +f 16/20/5 11/19/5 9/18/5 14/17/5 +f 15/24/6 12/23/6 11/22/6 16/21/6 o cube3 v 0.5883883476483185 0.12812500000000004 0.5883883476483185 v 0.41161165235168157 0.12812500000000004 0.41161165235168157 @@ -98,29 +74,73 @@ vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 1 -vt 0.6875 1 vt 0.6875 0.625 vt 0 0.625 vt 0 0.75 vt 0.6875 0.75 vn -0.7071067811865476 0 -0.7071067811865475 vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 vn 0 -1 0 usemtl m_1 -f 20/44/11 23/43/11 21/42/11 18/41/11 -f 24/48/12 19/47/12 17/46/12 22/45/12 -f 23/52/13 24/51/13 22/50/13 21/49/13 -f 22/56/14 17/55/14 18/54/14 21/53/14 -f 23/60/15 20/59/15 19/58/15 24/57/15 +f 20/28/7 23/27/7 21/26/7 18/25/7 +f 24/32/8 19/31/8 17/30/8 22/29/8 +f 23/36/9 20/35/9 19/34/9 24/33/9 +o cube5 +v 1.8899067667698075 0.12812500000000004 -0.05021746411078254 +v 1.7131300714731708 0.12812500000000004 -0.2269941594074194 +v 1.8899067667698075 -0.128125 -0.05021746411078254 +v 1.7131300714731708 -0.128125 -0.2269941594074194 +v 0.7430679560328757 0.12812500000000004 0.7430679560328757 +v 0.9198446513295127 0.12812500000000004 0.9198446513295125 +v 0.7430679560328757 -0.128125 0.7430679560328757 +v 0.9198446513295127 -0.128125 0.9198446513295125 +vt 0.6875 0.875 +vt 0 0.875 +vt 0 0.75 +vt 0.6875 0.75 +vt 0 0.875 +vt 0.6875 0.875 +vt 0.6875 0.75 +vt 0 0.75 +vt 0 0.75 +vt 0.6875 0.75 +vt 0.6875 0.625 +vt 0 0.625 +vn -0.7071067811865476 0 -0.7071067811865475 +vn 0.7071067811865476 0 0.7071067811865475 +vn 0 -1 0 +usemtl m_1 +f 28/40/10 31/39/10 29/38/10 26/37/10 +f 32/44/11 27/43/11 25/42/11 30/41/11 +f 31/48/12 28/47/12 27/46/12 32/45/12 +o cube4 +v 0.9198446513295127 0.12812500000000004 0.9198446513295125 +v 0.7430679560328757 0.12812500000000004 0.7430679560328757 +v 0.9198446513295127 -0.128125 0.9198446513295125 +v 0.7430679560328757 -0.128125 0.7430679560328757 +v -0.22699415940741896 0.12812500000000004 1.7131300714731705 +v -0.050217464110782206 0.12812500000000004 1.8899067667698075 +v -0.22699415940741896 -0.128125 1.7131300714731705 +v -0.050217464110782206 -0.128125 1.8899067667698075 +vt 0 0.875 +vt 0.6875 0.875 +vt 0.6875 0.75 +vt 0 0.75 +vt 0.6875 0.875 +vt 0 0.875 +vt 0 0.75 +vt 0.6875 0.75 +vt 0.6875 0.625 +vt 0 0.625 +vt 0 0.75 +vt 0.6875 0.75 +vn -0.7071067811865476 0 -0.7071067811865475 +vn 0.7071067811865476 0 0.7071067811865475 +vn 0 -1 0 +usemtl m_1 +f 36/52/13 39/51/13 37/50/13 34/49/13 +f 40/56/14 35/55/14 33/54/14 38/53/14 +f 39/60/15 36/59/15 35/58/15 40/57/15 o cube6 v 0.25693204396712427 0.12812500000000004 0.2569320439671243 v 0.0801553486704874 0.12812500000000004 0.08015534867048746 @@ -138,29 +158,17 @@ vt 0.6875 0.875 vt 0 0.875 vt 0 0.75 vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 1 -vt 0.6875 1 vt 0.6875 0.625 vt 0 0.625 vt 0 0.75 vt 0.6875 0.75 vn -0.7071067811865476 0 -0.7071067811865475 vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 vn 0 -1 0 usemtl m_1 -f 28/64/16 31/63/16 29/62/16 26/61/16 -f 32/68/17 27/67/17 25/66/17 30/65/17 -f 31/72/18 32/71/18 30/70/18 29/69/18 -f 30/76/19 25/75/19 26/74/19 29/73/19 -f 31/80/20 28/79/20 27/78/20 32/77/20 +f 44/64/16 47/63/16 45/62/16 42/61/16 +f 48/68/17 43/67/17 41/66/17 46/65/17 +f 47/72/18 44/71/18 43/70/18 48/69/18 o rail1 v 1.7838407495918251 0.06562500000000004 0.2326252483638368 v 0.7673747516361631 0.06562500000000004 -0.7838407495918251 @@ -170,19 +178,19 @@ v 0.5817592215746946 0.06562500000000004 -0.5982252195303568 v 1.5982252195303568 0.06562500000000004 0.4182407784253054 v 0.5817592215746946 0.0625 -0.5982252195303568 v 1.5982252195303568 0.0625 0.4182407784253054 -vt 0.71875 0.375 -vt 0.71875 0.25 -vt 0 0.25 -vt 0 0.375 -vt 0.71875 0.375 -vt 0.71875 0.25 -vt 0 0.25 -vt 0 0.375 +vt 0.71875 0.46875 +vt 0.71875 0.34375 +vt 0 0.34375 +vt 0 0.46875 +vt 0.71875 0.46875 +vt 0.71875 0.34375 +vt 0 0.34375 +vt 0 0.46875 vn 0 1 0 vn 0 -1 0 usemtl m_1 -f 38/84/21 33/83/21 34/82/21 37/81/21 -f 39/88/22 36/87/22 35/86/22 40/85/22 +f 54/76/19 49/75/19 50/74/19 53/73/19 +f 55/80/20 52/79/20 51/78/20 56/77/20 o rail2 v 1.7794213322094095 0.34062499999999996 0.2370446657462525 v 0.7629553342537474 0.34062499999999996 -0.7794213322094095 @@ -192,19 +200,19 @@ v 0.5861786389571104 0.34062499999999996 -0.6026446369127725 v 1.6026446369127725 0.34062499999999996 0.41382136104288947 v 0.5861786389571104 0.3375 -0.6026446369127725 v 1.6026446369127725 0.3375 0.41382136104288947 -vt 0.71875 0.5 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.5 -vt 0.71875 0.375 -vt 0.71875 0.25 -vt 0 0.25 -vt 0 0.375 +vt 0.71875 0.28125 +vt 0.71875 0.15625 +vt 0 0.15625 +vt 0 0.28125 +vt 0.71875 0.46875 +vt 0.71875 0.34375 +vt 0 0.34375 +vt 0 0.46875 vn 0 1 0 vn 0 -1 0 usemtl m_1 -f 46/92/23 41/91/23 42/90/23 45/89/23 -f 47/96/24 44/95/24 43/94/24 48/93/24 +f 62/84/21 57/83/21 58/82/21 61/81/21 +f 63/88/22 60/87/22 59/86/22 64/85/22 o rail3 v 1.7595339539885377 0.34062499999999996 0.2569320439671242 v 0.7430679560328757 0.34062499999999996 -0.7595339539885377 @@ -235,36 +243,36 @@ vn 0.7071067811865475 0 -0.7071067811865476 vn 0.7071067811865476 0 0.7071067811865475 vn -0.7071067811865475 0 0.7071067811865476 usemtl m_1 -f 52/100/25 55/99/25 53/98/25 50/97/25 -f 51/104/26 52/103/26 50/102/26 49/101/26 -f 56/108/27 51/107/27 49/106/27 54/105/27 -f 55/112/28 56/111/28 54/110/28 53/109/28 +f 68/92/23 71/91/23 69/90/23 66/89/23 +f 67/96/24 68/95/24 66/94/24 65/93/24 +f 72/100/25 67/99/25 65/98/25 70/97/25 +f 71/104/26 72/103/26 70/102/26 69/101/26 o rail4 -v 0.41382136104288947 0.34062499999999996 1.6026446369127727 -v -0.6026446369127725 0.34062499999999996 0.5861786389571106 -v 0.41382136104288947 0.3375 1.6026446369127727 -v -0.6026446369127725 0.3375 0.5861786389571106 -v -0.7794213322094095 0.34062499999999996 0.7629553342537475 -v 0.2370446657462526 0.34062499999999996 1.7794213322094095 -v -0.7794213322094095 0.3375 0.7629553342537475 -v 0.2370446657462526 0.3375 1.7794213322094095 -vt 0.71875 0.375 -vt 0.71875 0.5 -vt 0 0.5 -vt 0 0.375 -vt 0.71875 0.25 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.25 +v 0.4138213610428896 0.34062499999999996 1.6026446369127725 +v -0.6026446369127725 0.34062499999999996 0.5861786389571105 +v 0.4138213610428896 0.3375 1.6026446369127725 +v -0.6026446369127725 0.3375 0.5861786389571105 +v -0.7794213322094095 0.34062499999999996 0.7629553342537474 +v 0.23704466574625271 0.34062499999999996 1.7794213322094095 +v -0.7794213322094095 0.3375 0.7629553342537474 +v 0.23704466574625271 0.3375 1.7794213322094095 +vt 0.71875 0.15625 +vt 0.71875 0.28125 +vt 0 0.28125 +vt 0 0.15625 +vt 0.71875 0.34375 +vt 0.71875 0.46875 +vt 0 0.46875 +vt 0 0.34375 vn 0 1 0 vn 0 -1 0 usemtl m_1 -f 62/116/29 57/115/29 58/114/29 61/113/29 -f 63/120/30 60/119/30 59/118/30 64/117/30 +f 78/108/27 73/107/27 74/106/27 77/105/27 +f 79/112/28 76/111/28 75/110/28 80/109/28 o rail5 -v 0.39393398282201797 0.34062499999999996 1.6225320151336442 +v 0.39393398282201786 0.34062499999999996 1.6225320151336442 v -0.6225320151336442 0.34062499999999996 0.6060660171779821 -v 0.39393398282201797 0.06562500000000004 1.6225320151336442 +v 0.39393398282201786 0.06562500000000004 1.6225320151336442 v -0.6225320151336442 0.06562500000000004 0.6060660171779821 v -0.7595339539885377 0.34062499999999996 0.7430679560328758 v 0.2569320439671243 0.34062499999999996 1.7595339539885377 @@ -291,109 +299,161 @@ vn 0.7071067811865475 0 -0.7071067811865476 vn 0.7071067811865476 0 0.7071067811865475 vn -0.7071067811865475 0 0.7071067811865476 usemtl m_1 -f 68/124/31 71/123/31 69/122/31 66/121/31 -f 67/128/32 68/127/32 66/126/32 65/125/32 -f 72/132/33 67/131/33 65/130/33 70/129/33 -f 71/136/34 72/135/34 70/134/34 69/133/34 +f 84/116/29 87/115/29 85/114/29 82/113/29 +f 83/120/30 84/119/30 82/118/30 81/117/30 +f 88/124/31 83/123/31 81/122/31 86/121/31 +f 87/128/32 88/127/32 86/126/32 85/125/32 o rail6 -v 0.4182407784253054 0.06562500000000004 1.5982252195303568 -v -0.5982252195303568 0.06562500000000004 0.5817592215746946 -v 0.4182407784253054 0.0625 1.5982252195303568 -v -0.5982252195303568 0.0625 0.5817592215746946 +v 0.4182407784253055 0.06562500000000004 1.5982252195303568 +v -0.5982252195303566 0.06562500000000004 0.5817592215746946 +v 0.4182407784253055 0.0625 1.5982252195303568 +v -0.5982252195303566 0.0625 0.5817592215746946 v -0.7838407495918251 0.06562500000000004 0.7673747516361634 v 0.2326252483638368 0.06562500000000004 1.7838407495918256 v -0.7838407495918251 0.0625 0.7673747516361634 v 0.2326252483638368 0.0625 1.7838407495918256 -vt 0.71875 0.25 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.25 -vt 0.71875 0.25 -vt 0.71875 0.375 -vt 0 0.375 -vt 0 0.25 +vt 0.71875 0.34375 +vt 0.71875 0.46875 +vt 0 0.46875 +vt 0 0.34375 +vt 0.71875 0.34375 +vt 0.71875 0.46875 +vt 0 0.46875 +vt 0 0.34375 vn 0 1 0 vn 0 -1 0 usemtl m_1 -f 78/140/35 73/139/35 74/138/35 77/137/35 -f 79/144/36 76/143/36 75/142/36 80/141/36 -o cube4 -v 0.9198446513295127 0.12812500000000004 0.9198446513295125 -v 0.7430679560328757 0.12812500000000004 0.7430679560328757 -v 0.9198446513295127 -0.128125 0.9198446513295125 -v 0.7430679560328757 -0.128125 0.7430679560328757 -v -0.22699415940741896 0.12812500000000004 1.7131300714731705 -v -0.050217464110782206 0.12812500000000004 1.8899067667698075 -v -0.22699415940741896 -0.128125 1.7131300714731705 -v -0.050217464110782206 -0.128125 1.8899067667698075 -vt 0 0.875 -vt 0.6875 0.875 -vt 0.6875 0.75 -vt 0 0.75 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 0.75 -vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 1 -vt 0.6875 1 -vt 0.6875 0.625 -vt 0 0.625 -vt 0 0.75 -vt 0.6875 0.75 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865476 0 0.7071067811865475 +f 94/132/33 89/131/33 90/130/33 93/129/33 +f 95/136/34 92/135/34 91/134/34 96/133/34 +o cube7 +v 0.3453203916154427 0.12812500000000004 0.34532039161544276 +v -0.00823299897783103 0.12812500000000004 -0.00823299897783103 +v 0.3453203916154427 -0.128125 0.34532039161544276 +v -0.00823299897783103 -0.128125 -0.00823299897783103 +v -0.9782951144181258 0.12812500000000004 0.9618291164624639 +v -0.624741723824852 0.12812500000000004 1.3153825070557377 +v -0.9782951144181258 -0.128125 0.9618291164624639 +v -0.624741723824852 -0.128125 1.3153825070557377 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0.6875 0.46875 +vt 0 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 vn -0.7071067811865475 0 0.7071067811865476 vn 0 1 0 -vn 0 -1 0 -usemtl m_1 -f 84/148/37 87/147/37 85/146/37 82/145/37 -f 88/152/38 83/151/38 81/150/38 86/149/38 -f 87/156/39 88/155/39 86/154/39 85/153/39 -f 86/160/40 81/159/40 82/158/40 85/157/40 -f 87/164/41 84/163/41 83/162/41 88/161/41 -o cube5 -v 1.8899067667698075 0.12812500000000004 -0.05021746411078254 -v 1.7131300714731708 0.12812500000000004 -0.2269941594074194 -v 1.8899067667698075 -0.128125 -0.05021746411078254 -v 1.7131300714731708 -0.128125 -0.2269941594074194 -v 0.7430679560328757 0.12812500000000004 0.7430679560328757 -v 0.9198446513295127 0.12812500000000004 0.9198446513295125 -v 0.7430679560328757 -0.128125 0.7430679560328757 -v 0.9198446513295127 -0.128125 0.9198446513295125 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 0.75 -vt 0.6875 0.75 -vt 0.6875 1 -vt 0.8125 1 -vt 0.8125 0.875 -vt 0.6875 0.875 -vt 0 0.875 -vt 0.6875 0.875 -vt 0.6875 0.75 -vt 0 0.75 -vt 0 1 -vt 0.6875 1 -vt 0.6875 0.875 -vt 0 0.875 -vt 0 0.75 -vt 0.6875 0.75 -vt 0.6875 0.625 -vt 0 0.625 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 +usemtl m_2 +f 103/140/35 104/139/35 102/138/35 101/137/35 +f 102/144/36 97/143/36 98/142/36 101/141/36 +o cube8 +v 0.6767766952966369 0.12812500000000004 0.6767766952966369 +v 0.32322330470336313 0.12812500000000004 0.32322330470336313 +v 0.6767766952966369 -0.128125 0.6767766952966369 +v 0.32322330470336313 -0.128125 0.32322330470336313 +v -0.6468388107369316 0.12812500000000004 1.293285420143658 +v -0.2932854201436579 0.12812500000000004 1.6468388107369318 +v -0.6468388107369316 -0.128125 1.293285420143658 +v -0.2932854201436579 -0.128125 1.6468388107369318 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0.6875 0.46875 +vt 0 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vn -0.7071067811865475 0 0.7071067811865476 vn 0 1 0 -vn 0 -1 0 -usemtl m_1 -f 92/168/42 95/167/42 93/166/42 90/165/42 -f 91/172/43 92/171/43 90/170/43 89/169/43 -f 96/176/44 91/175/44 89/174/44 94/173/44 -f 94/180/45 89/179/45 90/178/45 93/177/45 -f 95/184/46 92/183/46 91/182/46 96/181/46 \ No newline at end of file +usemtl m_2 +f 111/148/37 112/147/37 110/146/37 109/145/37 +f 110/152/38 105/151/38 106/150/38 109/149/38 +o cube9 +v 1.0082329989778311 0.12812500000000004 1.0082329989778311 +v 0.6546796083845573 0.12812500000000004 0.6546796083845572 +v 1.0082329989778311 -0.128125 1.0082329989778311 +v 0.6546796083845573 -0.128125 0.6546796083845572 +v -0.31538250705573745 0.12812500000000004 1.6247417238248523 +v 0.03817088353753628 0.12812500000000004 1.978295114418126 +v -0.31538250705573745 -0.128125 1.6247417238248523 +v 0.03817088353753628 -0.128125 1.978295114418126 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0.6875 0.46875 +vt 0 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vn -0.7071067811865475 0 0.7071067811865476 +vn 0 1 0 +usemtl m_2 +f 119/156/39 120/155/39 118/154/39 117/153/39 +f 118/160/40 113/159/40 114/158/40 117/157/40 +o cube12 +v 1.978295114418126 0.12812500000000004 0.03817088353753595 +v 1.6247417238248523 0.12812500000000004 -0.3153825070557379 +v 1.978295114418126 -0.128125 0.03817088353753595 +v 1.6247417238248523 -0.128125 -0.3153825070557379 +v 0.6546796083845573 0.12812500000000004 0.6546796083845572 +v 1.0082329989778311 0.12812500000000004 1.0082329989778311 +v 0.6546796083845573 -0.128125 0.6546796083845572 +v 1.0082329989778311 -0.128125 1.0082329989778311 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vt 0.6875 0.46875 +vt 0 0.46875 +vn 0.7071067811865475 0 -0.7071067811865476 +vn 0 1 0 +usemtl m_2 +f 123/164/41 124/163/41 122/162/41 121/161/41 +f 126/168/42 121/167/42 122/166/42 125/165/42 +o cube11 +v 1.6468388107369318 0.12812500000000004 -0.2932854201436582 +v 1.293285420143658 0.12812500000000004 -0.6468388107369321 +v 1.6468388107369318 -0.128125 -0.2932854201436582 +v 1.293285420143658 -0.128125 -0.6468388107369321 +v 0.32322330470336313 0.12812500000000004 0.32322330470336313 +v 0.6767766952966369 0.12812500000000004 0.6767766952966369 +v 0.32322330470336313 -0.128125 0.32322330470336313 +v 0.6767766952966369 -0.128125 0.6767766952966369 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vt 0.6875 0.46875 +vt 0 0.46875 +vn 0.7071067811865475 0 -0.7071067811865476 +vn 0 1 0 +usemtl m_2 +f 131/172/43 132/171/43 130/170/43 129/169/43 +f 134/176/44 129/175/44 130/174/44 133/173/44 +o cube10 +v 1.3153825070557377 0.12812500000000004 -0.6247417238248523 +v 0.9618291164624639 0.12812500000000004 -0.9782951144181262 +v 1.3153825070557377 -0.128125 -0.6247417238248523 +v 0.9618291164624639 -0.128125 -0.9782951144181262 +v -0.00823299897783103 0.12812500000000004 -0.00823299897783103 +v 0.3453203916154427 0.12812500000000004 0.34532039161544276 +v -0.00823299897783103 -0.128125 -0.00823299897783103 +v 0.3453203916154427 -0.128125 0.34532039161544276 +vt 0.6875 0.46875 +vt 0.6875 0.71875 +vt 0.8125 0.71875 +vt 0.8125 0.46875 +vt 0 0.71875 +vt 0.6875 0.71875 +vt 0.6875 0.46875 +vt 0 0.46875 +vn 0.7071067811865475 0 -0.7071067811865476 +vn 0 1 0 +usemtl m_2 +f 139/180/45 140/179/45 138/178/45 137/177/45 +f 142/184/46 137/183/46 138/182/46 141/181/46 \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/diag_template.json b/src/main/resources/assets/create/models/block/track/diag_template.json index ab3ec894e..fcef2d4fb 100644 --- a/src/main/resources/assets/create/models/block/track/diag_template.json +++ b/src/main/resources/assets/create/models/block/track/diag_template.json @@ -3,6 +3,7 @@ "texture_size": [32, 32], "textures": { "1": "create:block/standard_track", + "2": "create:block/standard_track_mip", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ @@ -13,9 +14,7 @@ "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1"} } }, @@ -26,9 +25,7 @@ "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1"} } }, @@ -40,8 +37,6 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1"} } }, @@ -52,9 +47,7 @@ "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1"} } }, @@ -66,8 +59,6 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1"} } }, @@ -79,19 +70,77 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1"} } }, + { + "name": "cube7", + "from": [-5.95, 5.95, 4.5], + "to": [16, 10.05, 12.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "west": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "cube8", + "from": [-5.95, 5.95, 12], + "to": [16, 10.05, 20], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "west": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "cube9", + "from": [-5.95, 5.95, 19.5], + "to": [16, 10.05, 27.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "west": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "cube10", + "from": [16, 5.95, 4.5], + "to": [37.95, 10.05, 12.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "east": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "texture": "#2"} + } + }, + { + "name": "cube11", + "from": [16, 5.95, 12], + "to": [37.95, 10.05, 20], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "east": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "texture": "#2"} + } + }, + { + "name": "cube12", + "from": [16, 5.95, 19.5], + "to": [37.95, 10.05, 27.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "east": {"uv": [11, 4.5, 13, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 4.5, 11, 8.5], "texture": "#2"} + } + }, { "name": "rail1", "from": [29.35, 9, 4.5], "to": [33.55, 9.05, 27.5], "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 8.5, 11.5, 10.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 8.5, 11.5, 10.5], "rotation": 270, "texture": "#1"} } }, { @@ -100,8 +149,8 @@ "to": [33.45, 13.45, 27.5], "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 8, 11.5, 10], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 11.5, 11.5, 13.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 8.5, 11.5, 10.5], "rotation": 270, "texture": "#1"} } }, { @@ -122,8 +171,8 @@ "to": [2.55, 13.45, 27.5], "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 10, 11.5, 8], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 12, 11.5, 10], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 13.5, 11.5, 11.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 10.5, 11.5, 8.5], "rotation": 270, "texture": "#1"} } }, { @@ -144,8 +193,8 @@ "to": [2.65, 9.05, 27.5], "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, "faces": { - "up": {"uv": [0, 12, 11.5, 10], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 12, 11.5, 10], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 10.5, 11.5, 8.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 10.5, 11.5, 8.5], "rotation": 270, "texture": "#1"} } } ], @@ -154,7 +203,7 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/segment_left.json b/src/main/resources/assets/create/models/block/track/segment_left.json index ff8a0abe4..9de716ae5 100644 --- a/src/main/resources/assets/create/models/block/track/segment_left.json +++ b/src/main/resources/assets/create/models/block/track/segment_left.json @@ -12,8 +12,8 @@ "to": [2.1, 0.05, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} + "up": {"uv": [0, 8.5, 4, 10.5], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 8.5, 4, 10.5], "rotation": 90, "texture": "#1"} } }, { @@ -22,8 +22,8 @@ "to": [2, 4.45, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [6, 10, 2, 8], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} + "up": {"uv": [7.5, 13.5, 3.5, 11.5], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 8.5, 4, 10.5], "rotation": 90, "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/track/segment_right.json b/src/main/resources/assets/create/models/block/track/segment_right.json index d08aa4800..166821106 100644 --- a/src/main/resources/assets/create/models/block/track/segment_right.json +++ b/src/main/resources/assets/create/models/block/track/segment_right.json @@ -12,8 +12,8 @@ "to": [2.1, 0.05, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} + "up": {"uv": [0, 8.5, 4, 10.5], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 8.5, 4, 10.5], "rotation": 90, "texture": "#1"} } }, { @@ -22,8 +22,8 @@ "to": [2, 4.45, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [6, 8, 2, 10], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} + "up": {"uv": [7.5, 11.5, 3.5, 13.5], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 8.5, 4, 10.5], "rotation": 90, "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/track/tie.json b/src/main/resources/assets/create/models/block/track/tie.json index 9331ade35..dd469183c 100644 --- a/src/main/resources/assets/create/models/block/track/tie.json +++ b/src/main/resources/assets/create/models/block/track/tie.json @@ -3,6 +3,7 @@ "texture_size": [32, 32], "textures": { "1": "create:block/standard_track", + "2": "create:block/standard_track_mip", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ @@ -14,21 +15,37 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1"} } }, + { + "name": "cube2", + "from": [-13.95, -3.05, -1.75], + "to": [8, 1.05, 9.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "west": {"uv": [11, 3.75, 13, 9.25], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 3.75, 11, 9.25], "rotation": 180, "texture": "#2"} + } + }, { "name": "cube3", + "from": [8, -3.05, -1.75], + "to": [29.95, 1.05, 9.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [11, 3.75, 13, 9.25], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 3.75, 11, 9.25], "texture": "#2"} + } + }, + { + "name": "cube2", "from": [8, -3.05, 2], "to": [29.95, 1.05, 6], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1"} } } @@ -38,7 +55,7 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [0, 1] + "children": [0, 1, 2, 3] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/x_ortho.json b/src/main/resources/assets/create/models/block/track/x_ortho.json index 0cc49ca1c..9c98ed84f 100644 --- a/src/main/resources/assets/create/models/block/track/x_ortho.json +++ b/src/main/resources/assets/create/models/block/track/x_ortho.json @@ -1,8 +1,10 @@ { "credit": "Made with Blockbench", + "ambientocclusion": false, "texture_size": [32, 32], "textures": { "1": "create:block/standard_track", + "2": "create:block/standard_track_mip", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ @@ -12,10 +14,8 @@ "to": [14, 2.05, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [11, 0, 13, 2], "texture": "#1"}, "east": {"uv": [0, 2, 11, 4], "texture": "#1"}, "west": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 90, "texture": "#1"} } }, @@ -25,10 +25,8 @@ "to": [6, 2.05, 8], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [11, 0, 13, 2], "texture": "#1"}, "east": {"uv": [0, 2, 11, 4], "texture": "#1"}, "west": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 270, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 90, "texture": "#1"} } }, @@ -39,9 +37,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "east": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "south": {"uv": [11, 0, 13, 2], "texture": "#1"}, "west": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 270, "texture": "#1"} } }, @@ -52,20 +48,38 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "east": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "south": {"uv": [11, 0, 13, 2], "texture": "#1"}, "west": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 270, "texture": "#1"} } }, + { + "name": "cube5", + "from": [0, -2.05, 8], + "to": [16, 2.05, 29.95], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "south": {"uv": [11, 0.5, 13.05, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 0.5, 10.975, 8.5], "rotation": 90, "texture": "#2"} + } + }, + { + "name": "cube6", + "from": [0, -2.05, -13.95], + "to": [16, 2.05, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11, 0.5, 13.05, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 0.5, 10.975, 8.5], "rotation": 270, "texture": "#2"} + } + }, { "name": "tie1", "from": [0, 1, -9.55], "to": [16, 1.05, -5.35], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 10, 8, 12], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 10, 8, 12], "texture": "#1"} + "up": {"uv": [0, 8.5, 8, 10.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 8.5, 8, 10.5], "texture": "#1"} } }, { @@ -74,8 +88,8 @@ "to": [16, 5.45, -5.45], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 8, 8, 10], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 10, 8, 12], "texture": "#1"} + "up": {"uv": [0, 11.5, 8, 13.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 8.5, 8, 10.5], "texture": "#1"} } }, { @@ -96,8 +110,8 @@ "to": [16, 5.45, 25.45], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 10, 8, 8], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 12, 8, 10], "texture": "#1"} + "up": {"uv": [0, 13.5, 8, 11.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 10.5, 8, 8.5], "texture": "#1"} } }, { @@ -118,8 +132,8 @@ "to": [16, 1.05, 25.55], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 12, 8, 10], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 12, 8, 10], "texture": "#1"} + "up": {"uv": [0, 10.5, 8, 8.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 10.5, 8, 8.5], "texture": "#1"} } } ], @@ -128,7 +142,7 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/z_ortho.json b/src/main/resources/assets/create/models/block/track/z_ortho.json index bfbc59929..c0f4deed2 100644 --- a/src/main/resources/assets/create/models/block/track/z_ortho.json +++ b/src/main/resources/assets/create/models/block/track/z_ortho.json @@ -1,8 +1,10 @@ { "credit": "Made with Blockbench", + "ambientocclusion": false, "texture_size": [32, 32], "textures": { "1": "create:block/standard_track", + "2": "create:block/standard_track_mip", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ @@ -13,9 +15,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1"} } }, @@ -26,9 +26,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "east": {"uv": [11, 0, 13, 2], "texture": "#1"}, "south": {"uv": [0, 2, 11, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "texture": "#1"} } }, @@ -40,8 +38,6 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1"} } }, @@ -53,19 +49,37 @@ "faces": { "north": {"uv": [0, 2, 11, 4], "texture": "#1"}, "south": {"uv": [11, 2, 0, 4], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 2], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#1"}, "down": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#1"} } }, + { + "name": "cube5", + "from": [-13.95, -2.05, 0], + "to": [8, 2.05, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "west": {"uv": [11, 0.5, 13.05, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 0.5, 10.975, 8.5], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "cube6", + "from": [8, -2.05, 0], + "to": [29.95, 2.05, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "east": {"uv": [11, 0.5, 13.05, 8.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [0, 0.5, 10.975, 8.5], "texture": "#2"} + } + }, { "name": "tie1", "from": [21.35, 1, 0], "to": [25.55, 1.05, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 10, 8, 12], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 10, 8, 12], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 8.5, 8, 10.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 8.5, 8, 10.5], "rotation": 270, "texture": "#1"} } }, { @@ -74,8 +88,8 @@ "to": [25.45, 5.45, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 8, 8, 10], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 10, 8, 12], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 11.5, 8, 13.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 8.5, 8, 10.5], "rotation": 270, "texture": "#1"} } }, { @@ -96,8 +110,8 @@ "to": [-5.45, 5.45, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 10, 8, 8], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 12, 8, 10], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 13.5, 8, 11.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 10.5, 8, 8.5], "rotation": 270, "texture": "#1"} } }, { @@ -118,8 +132,8 @@ "to": [-5.35, 1.05, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [0, 12, 8, 10], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 12, 8, 10], "rotation": 270, "texture": "#1"} + "up": {"uv": [0, 10.5, 8, 8.5], "rotation": 270, "texture": "#1"}, + "down": {"uv": [0, 10.5, 8, 8.5], "rotation": 270, "texture": "#1"} } } ], @@ -128,7 +142,7 @@ "name": "group", "origin": [0, 0, 0], "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/standard_track.png b/src/main/resources/assets/create/textures/block/standard_track.png index 2e1000c07716b507be3b33d20b9c420d2c3c3af5..807b9e54a3d329bd3adc67c8f9ba86394de8cd88 100644 GIT binary patch delta 924 zcmV;N17rN&2jmBkR)2X(L_t(oN9C7aNYhai$IoxhZO+oow55a=MGo>Il!AhMkRXD3 z>8*z%f_eyzpohYcAdB8adI$;YB_Vq0Nhm3d#Oz5kDj2?uQCOz7%{AS>yzP6pGw*)> z_R}KSLm#-@d(J)Qo^yZa-pi&93_K8ScR4Y^V3b&1T1rwV6n~{~c#&eUBsDZt)67hm z{DB!cud=hjLtby4^bZ8)q%E)G_s>#$dxs_k9a?{XpTOe4<#I}Arn1s0gR6XaJxFDx zRx00hAgdvo^NmSeQ`-qCheAu_@l;Seo+P`yG@bMUb$4GkOu!Nd%;$n2cr2EZ4Z-2a zKt`LJk5KIvcYju!fprLm#vl<8k0)er#JWm=BvpdpmBbjQ!yyv{*udA>8LFztB>H0^ zNd0|xjlV#)mmna@;qy(?bfo9!1YG<05wDjFb8;ds4G6L-bc0bO?@HXn|~on#4TjAFVoBM$$|-35XdMv zz@pd@2M2t>^gif$3~H(?X!j16?9I^HFI^QFpoU;E7L#N2?#hg_QOyC{@t8r)r$$G~ zxjDUFglOdBMBy(0M>RP2(BbrQa5VtK_DIxjx8-DjpwHh#359 zp+UwRbbn}&y?eIH1BiL(AfpE;7uz{(Wm2~uHtY-%|J9oTIEG1L&DFqk< zmKoNoz(#Mcmmdxen379jBM0-0C}&sxnKg1o(>4D_x?Q*{TZk7O?Ii&j{(bi z3i$z+FJHJ=Fag9?Zo%58p2@e#_rs4+b>8e3QRmG&#XW=_SFWw>su-L;dtR8mBpXgJ y9LfJ@^tasV>A8^|{t*k2V0Kg__8&YfeiZ|^7)QsBa`{aF0000%BMt delta 918 zcmV;H18Mx^2i^yeR)2FzL_t(oN5z&+Xj4HD$LFO@lP20EwKcYgRTLYr2We4Iu!kau zpcijmJb3URRlEsG@ld^%;z5d3FBZg$ryeXy#ZvXu8c`wi5`t2jCNW>8`LxgcH<`G3 zzPwa0%@3B{nVs30-PyN^GBfi?b-C=sM58HUIi1c^ES92pe1C&7nLPFNbx|-FCx0L) z=4B4_xyj?{75;%hSlIG9et(EYN3SVD(4b6DPpMcOIGr}(%s3o25nSfen^|f%x03zf z@v?>}?0YA410&~!9E+vN?e3s#Hcu9dxtMf<#>a2#CSVE#B9$Nrp2-wMLvT1UkkP`C zB=ziam9-^Uhksyb3=#p^Y)D7|AW&$Pz(hCl-D0alb z0bek!4|*Ph?ye3xwBIRuBb3qWH&qN!L$Hy_h%tJXqvWhtbHH{yW>E8$#YM91EUuR% zTKK$N`vl-92j?C-++GeY2VmG9iCQde6&WDti}%ZlQE*^_BaU<5zAoxLbnwfb_cdf!|s65rzfLaJ~yJK^9Avg0*nF64C`fJ zqqWz{k7wr%6H#tmx*$$qL+81)74HC$=UB(+`N>Q^n>9}0?8zaKfU2rg$ZZNGW45%2 z-e``|vjIkr5KvAJ9aZsS{f%0D#nj@$MERU{zJD~Q@5hLJ6+g!h#tB?JGhDK45Kre8 zj1&0cTdpLqySrEP>!DTA1J(i7L#JmW&jZLuJcGswOg?;|rhaD0zQZCE+A&~ROD#XZ z@{KE3jT0Ci7%ZPa{hBk?Hr0Ok^^@o8KE-e-wNe13XpSEddxs*m>V&FoN^{U*9bmSY zDu2H95DyVPp-kbIP~ZWPWov6oWh^5A%!oh_G`r9Wk z6qdW}S#xpv)gG=V(Fr9g5`5ciTXNY~9MiKA=2_SI#*guri}m{+dy`}GQqC4DzcR$m WGHAMT;w~T1Mg~t;KbLh*2~7Z%hj9b| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/item/track.png b/src/main/resources/assets/create/textures/item/track.png index ad4696de5ba4ca88b0809c5b1364a2f9f9848d01..be7929f76c934d802e0fd2cb9bad35ec9d2d13b8 100644 GIT binary patch delta 61 zcmV-D0K)&90-FMmNhRC6tBHw;VPRoQH6({vKikN@v$M0*)YOMyKSV@C0001nsrD?9 TZX*i8000ib0l1NC?U9>+R_q%+ delta 61 zcmV-D0K)&90-FMmNhP$0Zi$JBVPRoQH6({vKissRv$M0*)YOMyKSV@C0002%NMC=E TZX*i9000ic0Tn1pfRUSkB4!wy