diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 735678755..b447e4783 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -479,7 +479,7 @@ f385988cb6fa9c48b5d59a6942ec50ed2b60c8bf assets/create/blockstates/stockpile_swi e815bfd854c2653f10828bb11950f7fb991d7efc assets/create/blockstates/stressometer.json 8b0c2c7ac72529565b3339aa8df7565858100afa assets/create/blockstates/tiled_glass.json a2454400b1cf9889f70aebdc89c52a1be25f543c assets/create/blockstates/tiled_glass_pane.json -180ab07fdae2bedcf66005c572c8e5c220e6bba2 assets/create/blockstates/track.json +6b0d3d57ad6bf79b573d51b9cd2c559f9432cede assets/create/blockstates/track.json aa08785f906d41933e0dd1086ea7b08f5b93aa24 assets/create/blockstates/track_station.json 29af21c8d82891139d48d69f0393f612f2b6f8f1 assets/create/blockstates/tuff_pillar.json a8094531617e27a545c4815ab2062bf0ffca3633 assets/create/blockstates/turntable.json diff --git a/src/generated/resources/assets/create/blockstates/track.json b/src/generated/resources/assets/create/blockstates/track.json index 7f63f475f..2f8583958 100644 --- a/src/generated/resources/assets/create/blockstates/track.json +++ b/src/generated/resources/assets/create/blockstates/track.json @@ -10,10 +10,11 @@ "model": "create:block/track/x_ortho" }, "shape=pd,turn=false": { - "model": "create:block/track/pos_diag" + "model": "create:block/track/diag" }, "shape=nd,turn=false": { - "model": "create:block/track/neg_diag" + "model": "create:block/track/diag", + "y": 90 }, "shape=an,turn=false": { "model": "create:block/track/ascending", @@ -40,10 +41,11 @@ "model": "create:block/track/x_ortho" }, "shape=pd,turn=true": { - "model": "create:block/track/pos_diag" + "model": "create:block/track/diag" }, "shape=nd,turn=true": { - "model": "create:block/track/neg_diag" + "model": "create:block/track/diag", + "y": 90 }, "shape=an,turn=true": { "model": "create:block/track/ascending", diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java index e1226d720..6f02b121f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackBlock.java @@ -64,8 +64,8 @@ public class TrackBlock extends Block implements EntityBlock, IWrenchable, ITrac NONE("", Vec3.ZERO), ZO("z_ortho", new Vec3(0, 0, 1)), XO("x_ortho", new Vec3(1, 0, 0)), - PD("pos_diag", new Vec3(1, 0, 1)), - ND("neg_diag", new Vec3(-1, 0, 1)), + PD("diag", new Vec3(1, 0, 1)), + ND("diag", 90, new Vec3(-1, 0, 1), new Vec3(0, 1, 0)), AN("ascending", 180, new Vec3(0, 1, -1), new Vec3(0, 1, 1)), AS("ascending", 0, new Vec3(0, 1, 1), new Vec3(0, 1, -1)), AE("ascending", 270, new Vec3(1, 1, 0), new Vec3(-1, 1, 0)), @@ -175,13 +175,13 @@ public class TrackBlock extends Block implements EntityBlock, IWrenchable, ITrac public PushReaction getPistonPushReaction(BlockState pState) { return PushReaction.BLOCK; } - + @Override public void onPlace(BlockState pState, Level pLevel, BlockPos pPos, BlockState pOldState, boolean pIsMoving) { if (pOldState.getBlock() == this && pState.setValue(HAS_TURN, true) == pOldState.setValue(HAS_TURN, true)) return; LevelTickAccess blockTicks = pLevel.getBlockTicks(); - if (!blockTicks.hasScheduledTick(pPos, this)) + if (!blockTicks.hasScheduledTick(pPos, this)) pLevel.scheduleTick(pPos, this, 1); } @@ -226,7 +226,7 @@ public class TrackBlock extends Block implements EntityBlock, IWrenchable, ITrac if (!entry.getValue() .isInside(pos)) continue; - if (world.getBlockEntity(entry.getKey()) instanceof StationTileEntity station) + if (world.getBlockEntity(entry.getKey())instanceof StationTileEntity station) station.trackClicked(player, this, state, pos); } return InteractionResult.SUCCESS; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackInstance.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackInstance.java index 83710e190..e1409b852 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackInstance.java @@ -116,8 +116,8 @@ public class TrackInstance extends BlockEntityInstance { Vec3 rightPrevious = null; for (BezierConnection.Segment segment : bc) { - Vec3 left = segment.position.add(segment.normal.scale(.97f)); - Vec3 right = segment.position.subtract(segment.normal.scale(.97f)); + Vec3 left = segment.position.add(segment.normal.scale(.965f)); + Vec3 right = segment.position.subtract(segment.normal.scale(.965f)); if (leftPrevious != null) { var modelIndex = segment.index - 1; @@ -153,7 +153,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 / 1024f, 0) + .translate(0, -2 / 16f + (segment.index % 2 == 0 ? 1 : -1) / 2048f - 1 / 512f, 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 e01de35ee..c0100ab49 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 @@ -53,8 +53,8 @@ public class TrackRenderer extends SafeTileEntityRenderer { Vec3 previous2 = null; for (BezierConnection.Segment segment : bc) { - Vec3 rail1 = segment.position.add(segment.normal.scale(.97f)); - Vec3 rail2 = segment.position.subtract(segment.normal.scale(.97f)); + Vec3 rail1 = segment.position.add(segment.normal.scale(.965f)); + Vec3 rail2 = segment.position.subtract(segment.normal.scale(.965f)); if (previous1 != null) { { 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 009c53cd6..7e03b7ec5 100644 --- a/src/main/resources/assets/create/models/block/track/ascending.json +++ b/src/main/resources/assets/create/models/block/track/ascending.json @@ -3,7 +3,7 @@ "flip-v": true, "model": "create:models/block/track/ascending.obj", "textures": { - "0": "create:block/track", + "0": "create:block/standard_track", "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 new file mode 100644 index 000000000..28a2a45f4 --- /dev/null +++ b/src/main/resources/assets/create/models/block/track/ascending.mtl @@ -0,0 +1,4 @@ +# Made in Blockbench 4.1.4 +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 bf8a0dbb0..169f94ee7 100644 --- a/src/main/resources/assets/create/models/block/track/ascending.obj +++ b/src/main/resources/assets/create/models/block/track/ascending.obj @@ -1,253 +1,399 @@ -# Made in Blockbench 4.1.1 -mtllib track.mtl +# Made in Blockbench 4.1.4 +mtllib ascending.mtl -o cube4 -v 1.625 1.3129126073623882 0.9160533905932737 -v 1.625 0.2964466094067261 -0.10041260736238833 -v 1.625 1.3129126073623882 0.9160533905932737 -v 1.625 0.2964466094067261 -0.10041260736238833 -v -0.625 0.2964466094067261 -0.10041260736238833 -v -0.625 1.3129126073623882 0.9160533905932737 -v -0.625 0.2964466094067261 -0.10041260736238833 -v -0.625 1.3129126073623882 0.9160533905932737 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vn 0 0.7071067811865475 -0.7071067811865476 -vn 0 -0.7071067811865475 0.7071067811865476 -usemtl m_0 -f 6/4/1 1/3/1 2/2/1 5/1/1 -f 7/8/2 4/7/2 3/6/2 8/5/2 -o cube5 -v 1.625 1.1361359120657513 1.0928300858899105 -v 1.625 0.11966991411008931 0.07636408793424859 -v 1.625 1.1361359120657513 1.0928300858899105 -v 1.625 0.11966991411008931 0.07636408793424859 -v -0.625 0.11966991411008931 0.07636408793424859 -v -0.625 1.1361359120657513 1.0928300858899105 -v -0.625 0.11966991411008931 0.07636408793424859 -v -0.625 1.1361359120657513 1.0928300858899105 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vn 0 0.7071067811865475 -0.7071067811865476 -vn 0 -0.7071067811865475 0.7071067811865476 -usemtl m_0 -f 14/12/3 9/11/3 10/10/3 13/9/3 -f 15/16/4 12/15/4 11/14/4 16/13/4 o cube1 -v 1.56875 1.3129126073623882 0.9160533905932737 -v 1.56875 0.2964466094067261 -0.10041260736238833 -v 1.56875 1.1361359120657513 1.0928300858899105 -v 1.56875 0.11966991411008931 0.07636408793424859 -v 1.36875 0.2964466094067261 -0.10041260736238833 -v 1.36875 1.3129126073623882 0.9160533905932737 -v 1.36875 0.11966991411008931 0.07636408793424859 -v 1.36875 1.1361359120657513 1.0928300858899105 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 +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 +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 -1 0 0 -usemtl m_0 -f 20/20/5 23/19/5 21/18/5 18/17/5 -f 19/24/6 20/23/6 18/22/6 17/21/6 -f 24/28/7 19/27/7 17/26/7 22/25/7 -f 23/32/8 24/31/8 22/30/8 21/29/8 +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 o cube2 -v -0.36875 1.3129126073623882 0.9160533905932737 -v -0.36875 0.2964466094067261 -0.10041260736238833 -v -0.36875 1.1361359120657513 1.0928300858899105 -v -0.36875 0.11966991411008931 0.07636408793424859 -v -0.5687500000000001 0.2964466094067261 -0.10041260736238833 -v -0.5687500000000001 1.3129126073623882 0.9160533905932737 -v -0.5687500000000001 0.11966991411008931 0.07636408793424859 -v -0.5687500000000001 1.1361359120657513 1.0928300858899105 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 +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 +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 -1 0 0 -usemtl m_0 -f 28/36/9 31/35/9 29/34/9 26/33/9 -f 27/40/10 28/39/10 26/38/10 25/37/10 -f 32/44/11 27/43/11 25/42/11 30/41/11 -f 31/48/12 32/47/12 30/46/12 29/45/12 +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 o cube3 -v 1.8718750000000002 1.0720543600207204 0.9801349426383046 -v 1.8718750000000002 0.8952776647240837 0.8033582473416677 -v 1.8718750000000002 0.8908582473416677 1.1613310553173575 -v 1.8718750000000002 0.7140815520450309 0.9845543600207205 -v -0.871875 0.8952776647240837 0.8033582473416677 -v -0.871875 1.0720543600207204 0.9801349426383046 -v -0.871875 0.7140815520450309 0.9845543600207205 -v -0.871875 0.8908582473416677 1.1613310553173575 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 +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 +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.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 +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 1 0 0 vn 0 0.7071067811865476 0.7071067811865475 vn -1 0 0 vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 -usemtl m_0 -f 36/52/13 39/51/13 37/50/13 34/49/13 -f 35/56/14 36/55/14 34/54/14 33/53/14 -f 40/60/15 35/59/15 33/58/15 38/57/15 -f 39/64/16 40/63/16 38/62/16 37/61/16 -f 38/68/17 33/67/17 34/66/17 37/65/17 -f 39/72/18 36/71/18 35/70/18 40/69/18 +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 +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 +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 +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 +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 -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 o cube6 -v 1.8718750000000002 0.4091417526583322 0.31722233527591637 -v 1.8718750000000002 0.23236505736169533 0.14044563997927945 -v 1.8718750000000002 0.2279456399792794 0.49841844795496915 -v 1.8718750000000002 0.05116894468264255 0.3216417526583323 -v -0.871875 0.23236505736169533 0.14044563997927945 -v -0.871875 0.4091417526583322 0.31722233527591637 -v -0.871875 0.05116894468264255 0.3216417526583323 -v -0.871875 0.2279456399792794 0.49841844795496915 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 +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 +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.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 +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 1 0 0 vn 0 0.7071067811865476 0.7071067811865475 vn -1 0 0 vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 -usemtl m_0 -f 44/76/19 47/75/19 45/74/19 42/73/19 -f 43/80/20 44/79/20 42/78/20 41/77/20 -f 48/84/21 43/83/21 41/82/21 46/81/21 -f 47/88/22 48/87/22 46/86/22 45/85/22 -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 -o cube7 -v 1.8718750000000002 0.7405980563395264 0.6486786389571104 -v 1.8718750000000002 0.5638213610428895 0.47190194366047356 -v 1.8718750000000002 0.5594019436604736 0.8298747516361632 -v 1.8718750000000002 0.3826252483638367 0.6530980563395263 -v -0.871875 0.5638213610428895 0.47190194366047356 -v -0.871875 0.7405980563395264 0.6486786389571104 -v -0.871875 0.3826252483638367 0.6530980563395263 -v -0.871875 0.5594019436604736 0.8298747516361632 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 +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 +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 +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 +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 +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 +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 +vt 0.6875 0.875 +vt 0.78125 0.875 +vt 0.78125 0.75 +vt 0.6875 0.75 +vt 0 0.625 +vt 0.71875 0.625 +vt 0.71875 0.5 +vt 0 0.5 +vt 0.6875 0.875 +vt 0.78125 0.875 +vt 0.78125 0.75 +vt 0.6875 0.75 +vt 0 0.625 +vt 0.71875 0.625 +vt 0.71875 0.5 +vt 0 0.5 vn 0 -0.7071067811865476 -0.7071067811865475 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 +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 vn 0 0.7071067811865475 -0.7071067811865476 vn 0 -0.7071067811865475 0.7071067811865476 -usemtl m_0 -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 54/116/29 49/115/29 50/114/29 53/113/29 -f 55/120/30 52/119/30 51/118/30 56/117/30 \ No newline at end of file +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 +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 +vt 0.78125 0.875 +vt 0.6875 0.875 +vt 0.6875 0.75 +vt 0.78125 0.75 +vt 0.71875 0.625 +vt 0 0.625 +vt 0 0.5 +vt 0.71875 0.5 +vt 0.78125 0.875 +vt 0.6875 0.875 +vt 0.6875 0.75 +vt 0.78125 0.75 +vt 0.71875 0.625 +vt 0 0.625 +vt 0 0.5 +vt 0.71875 0.5 +vn 0 -0.7071067811865476 -0.7071067811865475 +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 +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 +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 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 f67003b5c..52d439abc 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 @@ -1,96 +1,166 @@ { "credit": "Made with Blockbench", - "texture_size": [128, 128], + "texture_size": [32, 32], "textures": { - "0": "create:block/track", - "particle": "create:block/track" + "1_0": "create:block/standard_track" }, "elements": [ - { - "name": "cube4", - "from": [-2, 21.9, 5.5], - "to": [34, 21.9, 28.5], - "rotation": {"angle": -45, "axis": "x", "origin": [16, 18.4, 17]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"} - } - }, - { - "name": "cube5", - "from": [-2, 17.9, 5.5], - "to": [34, 17.9, 28.5], - "rotation": {"angle": -45, "axis": "x", "origin": [16, 18.4, 17]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"} - } - }, { "name": "cube1", - "from": [29.9, 17.9, 5.5], - "to": [33.1, 21.9, 28.5], - "rotation": {"angle": -45, "axis": "x", "origin": [16, 18.4, 17]}, + "from": [16, 10.6, 22.1], + "to": [37.95, 14.7, 26.1], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "north": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "east": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "south": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "west": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"} + "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"} } }, { "name": "cube2", - "from": [-1.1, 17.9, 5.5], - "to": [2.1, 21.9, 28.5], - "rotation": {"angle": -45, "axis": "x", "origin": [16, 18.4, 17]}, + "from": [16, 10.6, 14.6], + "to": [37.95, 14.7, 18.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "north": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "east": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "south": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "west": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"} + "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"} } }, { "name": "cube3", - "from": [-5.95, 14.35, 22.5], - "to": [37.95, 18.45, 26.5], - "rotation": {"angle": -45, "axis": "x", "origin": [16, 18.4, 17]}, + "from": [-5.95, 10.6, 22.1], + "to": [16, 14.7, 26.1], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} + "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": "cube5", + "from": [16, 10.6, 29.6], + "to": [37.95, 14.7, 33.6], + "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"} + } + }, + { + "name": "cube4", + "from": [-5.95, 10.6, 29.6], + "to": [16, 14.7, 33.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "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": "cube6", - "from": [-5.95, 14.35, 7.5], - "to": [37.95, 18.45, 11.5], - "rotation": {"angle": -45, "axis": "x", "origin": [16, 18.4, 17]}, + "from": [-5.95, 10.6, 14.6], + "to": [16, 14.7, 18.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} + "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, 14.35, 15], - "to": [37.95, 18.45, 19], - "rotation": {"angle": -45, "axis": "x", "origin": [16, 18.4, 17]}, + "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": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} + "up": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1_0"}, + "down": {"uv": [0, 10, 11.5, 12], "rotation": 270, "texture": "#1_0"} } + }, + { + "name": "rail2", + "from": [29.45, 18.05, 12.6], + "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"} + } + }, + { + "name": "rail3", + "from": [29.9, 13.7, 12.6], + "to": [33, 18.1, 35.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "north": {"uv": [11, 2, 12.5, 4], "texture": "#1_0"}, + "east": {"uv": [0, 6, 11.5, 8], "texture": "#1_0"}, + "south": {"uv": [11, 2, 12.5, 4], "texture": "#1_0"}, + "west": {"uv": [0, 6, 11.5, 8], "texture": "#1_0"} + } + }, + { + "name": "rail4", + "from": [-1.45, 18.05, 12.6], + "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"} + } + }, + { + "name": "rail5", + "from": [-1, 13.7, 12.6], + "to": [2.1, 18.1, 35.6], + "rotation": {"angle": -45, "axis": "x", "origin": [16, 8, 16]}, + "faces": { + "north": {"uv": [12.5, 2, 11, 4], "texture": "#1_0"}, + "east": {"uv": [11.5, 6, 0, 8], "texture": "#1_0"}, + "south": {"uv": [12.5, 2, 11, 4], "texture": "#1_0"}, + "west": {"uv": [11.5, 6, 0, 8], "texture": "#1_0"} + } + }, + { + "name": "rail6", + "from": [-1.55, 13.65, 12.6], + "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"} + } + } + ], + "groups": [ + { + "name": "diag_template", + "origin": [8, 8, 8], + "color": 0, + "children": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "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/pos_diag.json b/src/main/resources/assets/create/models/block/track/diag.json similarity index 62% rename from src/main/resources/assets/create/models/block/track/pos_diag.json rename to src/main/resources/assets/create/models/block/track/diag.json index 9e2159d6f..7c21eb717 100644 --- a/src/main/resources/assets/create/models/block/track/pos_diag.json +++ b/src/main/resources/assets/create/models/block/track/diag.json @@ -1,9 +1,9 @@ { "loader": "forge:obj", "flip-v": true, - "model": "create:models/block/track/pos_diag.obj", + "model": "create:models/block/track/diag.obj", "textures": { - "0": "create:block/track", + "0": "create:block/standard_track", "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 new file mode 100644 index 000000000..5ddbcfba0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/track/diag.mtl @@ -0,0 +1,4 @@ +# Made in Blockbench 4.1.4 +newmtl m_1 +map_Kd #0 +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 new file mode 100644 index 000000000..70d890907 --- /dev/null +++ b/src/main/resources/assets/create/models/block/track/diag.obj @@ -0,0 +1,399 @@ +# Made in Blockbench 4.1.4 +mtllib diag.mtl + +o cube1 +v 1.5584504630886133 0.12812500000000004 -0.3816737677919766 +v 1.3816737677919764 0.12812500000000004 -0.5584504630886136 +v 1.5584504630886133 -0.128125 -0.3816737677919766 +v 1.3816737677919764 -0.128125 -0.5584504630886136 +v 0.41161165235168157 0.12812500000000004 0.41161165235168157 +v 0.5883883476483185 0.12812500000000004 0.5883883476483185 +v 0.41161165235168157 -0.128125 0.41161165235168157 +v 0.5883883476483185 -0.128125 0.5883883476483185 +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 +o cube2 +v 1.2269941594074192 0.12812500000000004 -0.7131300714731708 +v 1.0502174641107824 0.12812500000000004 -0.8899067667698075 +v 1.2269941594074192 -0.128125 -0.7131300714731708 +v 1.0502174641107824 -0.128125 -0.8899067667698075 +v 0.0801553486704874 0.12812500000000004 0.08015534867048746 +v 0.25693204396712427 0.12812500000000004 0.2569320439671243 +v 0.0801553486704874 -0.128125 0.08015534867048746 +v 0.25693204396712427 -0.128125 0.2569320439671243 +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 +o cube3 +v 0.5883883476483185 0.12812500000000004 0.5883883476483185 +v 0.41161165235168157 0.12812500000000004 0.41161165235168157 +v 0.5883883476483185 -0.128125 0.5883883476483185 +v 0.41161165235168157 -0.128125 0.41161165235168157 +v -0.5584504630886131 0.12812500000000004 1.3816737677919766 +v -0.38167376779197626 0.12812500000000004 1.5584504630886133 +v -0.5584504630886131 -0.128125 1.3816737677919766 +v -0.38167376779197626 -0.128125 1.5584504630886133 +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 +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 +o cube6 +v 0.25693204396712427 0.12812500000000004 0.2569320439671243 +v 0.0801553486704874 0.12812500000000004 0.08015534867048746 +v 0.25693204396712427 -0.128125 0.2569320439671243 +v 0.0801553486704874 -0.128125 0.08015534867048746 +v -0.8899067667698073 0.12812500000000004 1.0502174641107824 +v -0.7131300714731705 0.12812500000000004 1.2269941594074192 +v -0.8899067667698073 -0.128125 1.0502174641107824 +v -0.7131300714731705 -0.128125 1.2269941594074192 +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 +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 +o rail1 +v 1.7838407495918251 0.06562500000000004 0.2326252483638368 +v 0.7673747516361631 0.06562500000000004 -0.7838407495918251 +v 1.7838407495918251 0.0625 0.2326252483638368 +v 0.7673747516361631 0.0625 -0.7838407495918251 +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 +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 +o rail2 +v 1.7794213322094095 0.34062499999999996 0.2370446657462525 +v 0.7629553342537474 0.34062499999999996 -0.7794213322094095 +v 1.7794213322094095 0.3375 0.2370446657462525 +v 0.7629553342537474 0.3375 -0.7794213322094095 +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 +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 +o rail3 +v 1.7595339539885377 0.34062499999999996 0.2569320439671242 +v 0.7430679560328757 0.34062499999999996 -0.7595339539885377 +v 1.7595339539885377 0.06562500000000004 0.2569320439671242 +v 0.7430679560328757 0.06562500000000004 -0.7595339539885377 +v 0.606066017177982 0.34062499999999996 -0.6225320151336442 +v 1.6225320151336442 0.34062499999999996 0.39393398282201786 +v 0.606066017177982 0.06562500000000004 -0.6225320151336442 +v 1.6225320151336442 0.06562500000000004 0.39393398282201786 +vt 0.6875 0.875 +vt 0.78125 0.875 +vt 0.78125 0.75 +vt 0.6875 0.75 +vt 0 0.625 +vt 0.71875 0.625 +vt 0.71875 0.5 +vt 0 0.5 +vt 0.6875 0.875 +vt 0.78125 0.875 +vt 0.78125 0.75 +vt 0.6875 0.75 +vt 0 0.625 +vt 0.71875 0.625 +vt 0.71875 0.5 +vt 0 0.5 +vn -0.7071067811865476 0 -0.7071067811865475 +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 +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 +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 +o rail5 +v 0.39393398282201797 0.34062499999999996 1.6225320151336442 +v -0.6225320151336442 0.34062499999999996 0.6060660171779821 +v 0.39393398282201797 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 +v -0.7595339539885377 0.06562500000000004 0.7430679560328758 +v 0.2569320439671243 0.06562500000000004 1.7595339539885377 +vt 0.78125 0.875 +vt 0.6875 0.875 +vt 0.6875 0.75 +vt 0.78125 0.75 +vt 0.71875 0.625 +vt 0 0.625 +vt 0 0.5 +vt 0.71875 0.5 +vt 0.78125 0.875 +vt 0.6875 0.875 +vt 0.6875 0.75 +vt 0.78125 0.75 +vt 0.71875 0.625 +vt 0 0.625 +vt 0 0.5 +vt 0.71875 0.5 +vn -0.7071067811865476 0 -0.7071067811865475 +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 +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.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 +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 +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 +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 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 new file mode 100644 index 000000000..ab3ec894e --- /dev/null +++ b/src/main/resources/assets/create/models/block/track/diag_template.json @@ -0,0 +1,160 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "1": "create:block/standard_track", + "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" + }, + "elements": [ + { + "name": "cube1", + "from": [16, 5.95, 14], + "to": [37.95, 10.05, 18], + "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"} + } + }, + { + "name": "cube2", + "from": [16, 5.95, 6.5], + "to": [37.95, 10.05, 10.5], + "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"} + } + }, + { + "name": "cube3", + "from": [-5.95, 5.95, 14], + "to": [16, 10.05, 18], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "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": [16, 5.95, 21.5], + "to": [37.95, 10.05, 25.5], + "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"} + } + }, + { + "name": "cube4", + "from": [-5.95, 5.95, 21.5], + "to": [16, 10.05, 25.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "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": "cube6", + "from": [-5.95, 5.95, 6.5], + "to": [16, 10.05, 10.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "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": "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"} + } + }, + { + "name": "rail2", + "from": [29.45, 13.4, 4.5], + "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"} + } + }, + { + "name": "rail3", + "from": [29.9, 9.05, 4.5], + "to": [33, 13.45, 27.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "north": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "east": {"uv": [0, 6, 11.5, 8], "texture": "#1"}, + "south": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "west": {"uv": [0, 6, 11.5, 8], "texture": "#1"} + } + }, + { + "name": "rail4", + "from": [-1.45, 13.4, 4.5], + "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"} + } + }, + { + "name": "rail5", + "from": [-1, 9.05, 4.5], + "to": [2.1, 13.45, 27.5], + "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, + "faces": { + "north": {"uv": [12.5, 2, 11, 4], "texture": "#1"}, + "east": {"uv": [11.5, 6, 0, 8], "texture": "#1"}, + "south": {"uv": [12.5, 2, 11, 4], "texture": "#1"}, + "west": {"uv": [11.5, 6, 0, 8], "texture": "#1"} + } + }, + { + "name": "rail6", + "from": [-1.55, 9, 4.5], + "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"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "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/item.json b/src/main/resources/assets/create/models/block/track/item.json deleted file mode 100644 index 70775d41b..000000000 --- a/src/main/resources/assets/create/models/block/track/item.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "create:block/track", - "particle": "create:block/track" - }, - "elements": [ - { - "name": "cube1", - "from": [0, 0.5, 19.75], - "to": [16, 4.5, 22], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [0.125, 7.375, 2.125, 7.875], "texture": "#0"}, - "east": {"uv": [6.5, 7.375, 6.75, 7.875], "texture": "#0"}, - "south": {"uv": [0.125, 7.375, 2.125, 7.875], "texture": "#0"}, - "west": {"uv": [6.5, 7.375, 6.75, 7.875], "texture": "#0"} - } - }, - { - "name": "cube2", - "from": [0, 0.5, -6.25], - "to": [16, 4.5, -4], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [0.125, 7.375, 2.125, 7.875], "texture": "#0"}, - "east": {"uv": [6.5, 7.375, 6.75, 7.875], "texture": "#0"}, - "south": {"uv": [0.125, 7.375, 2.125, 7.875], "texture": "#0"}, - "west": {"uv": [6.5, 7.375, 6.75, 7.875], "texture": "#0"} - } - }, - { - "name": "cube3", - "from": [2, -3.05, -10.95], - "to": [6, 1.05, 26.95], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "east": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "south": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "west": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube4", - "from": [0, 4.5, -6.9], - "to": [16, 4.5, 22.9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube5", - "from": [0, 0.5, -6.9], - "to": [16, 0.5, 22.9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube6", - "from": [10, -3.05, -10.95], - "to": [14, 1.05, 26.95], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "east": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "south": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "west": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "rotation": 270, "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [52.67, 16.36, -64.58], - "translation": [4, -1, 0.75], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [52.67, 16.36, -64.58], - "translation": [4, -1, 0.75], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [3, 82, 30], - "translation": [2, 2.75, 0.25], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [3, 82, 30], - "translation": [2, 2.75, 0.25], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 4.25, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "translation": [0.25, 2.75, 0], - "scale": [0.49, 0.49, 0.49] - }, - "head": { - "translation": [0, 16.75, 0] - }, - "fixed": { - "rotation": [-90, 45, 0], - "translation": [0, 0, -4], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/neg_diag.json b/src/main/resources/assets/create/models/block/track/neg_diag.json deleted file mode 100644 index cfd7363b9..000000000 --- a/src/main/resources/assets/create/models/block/track/neg_diag.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "loader": "forge:obj", - "flip-v": true, - "model": "create:models/block/track/neg_diag.obj", - "textures": { - "0": "create:block/track", - "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/neg_diag.obj b/src/main/resources/assets/create/models/block/track/neg_diag.obj deleted file mode 100644 index e899782fa..000000000 --- a/src/main/resources/assets/create/models/block/track/neg_diag.obj +++ /dev/null @@ -1,253 +0,0 @@ -# Made in Blockbench 4.1.1 -mtllib track.mtl - -o cube4 -v 1.803728127812697 0.34375 0.7872621298570349 -v 0.21273787014296497 0.34375 -0.8037281278126969 -v 1.803728127812697 0.34375 0.7872621298570349 -v 0.21273787014296497 0.34375 -0.8037281278126969 -v -0.8037281278126971 0.34375 0.21273787014296508 -v 0.787262129857035 0.34375 1.8037281278126969 -v -0.8037281278126971 0.34375 0.21273787014296508 -v 0.787262129857035 0.34375 1.8037281278126969 -vt 0 0.6875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vt 0 0.8671875 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 6/4/1 1/3/1 2/2/1 5/1/1 -f 7/8/2 4/7/2 3/6/2 8/5/2 -o cube5 -v 1.803728127812697 0.09375 0.7872621298570349 -v 0.21273787014296497 0.09375 -0.8037281278126969 -v 1.803728127812697 0.09375 0.7872621298570349 -v 0.21273787014296497 0.09375 -0.8037281278126969 -v -0.8037281278126971 0.09375 0.21273787014296508 -v 0.787262129857035 0.09375 1.8037281278126969 -v -0.8037281278126971 0.09375 0.21273787014296508 -v 0.787262129857035 0.09375 1.8037281278126969 -vt 0 0.6875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vt 0 0.8671875 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 14/12/3 9/11/3 10/10/3 13/9/3 -f 15/16/4 12/15/4 11/14/4 16/13/4 -o cube1 -v 1.7639533713709539 0.34375 0.7474873734152916 -v 1.6225320151336442 0.34375 0.606066017177982 -v 1.7639533713709539 0.09375 0.7474873734152916 -v 1.6225320151336442 0.09375 0.606066017177982 -v 0.6060660171779821 0.34375 1.6225320151336442 -v 0.7474873734152917 0.34375 1.7639533713709536 -v 0.6060660171779821 0.09375 1.6225320151336442 -v 0.7474873734152917 0.09375 1.7639533713709536 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -usemtl m_0 -f 20/20/5 23/19/5 21/18/5 18/17/5 -f 19/24/6 20/23/6 18/22/6 17/21/6 -f 24/28/7 19/27/7 17/26/7 22/25/7 -f 23/32/8 24/31/8 22/30/8 21/29/8 -o cube2 -v 0.39393398282201786 0.34375 -0.6225320151336442 -v 0.2525126265847083 0.34375 -0.7639533713709536 -v 0.39393398282201786 0.09375 -0.6225320151336442 -v 0.2525126265847083 0.09375 -0.7639533713709536 -v -0.7639533713709539 0.34375 0.2525126265847084 -v -0.6225320151336442 0.34375 0.39393398282201786 -v -0.7639533713709539 0.09375 0.2525126265847084 -v -0.6225320151336442 0.09375 0.39393398282201786 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -usemtl m_0 -f 28/36/9 31/35/9 29/34/9 26/33/9 -f 27/40/10 28/39/10 26/38/10 25/37/10 -f 32/44/11 27/43/11 25/42/11 30/41/11 -f 31/48/12 32/47/12 30/46/12 29/45/12 -o cube3 -v 1.2269941594074194 0.12812500000000004 1.7131300714731708 -v -0.7131300714731705 0.12812500000000004 -0.22699415940741896 -v 1.2269941594074194 -0.128125 1.7131300714731708 -v -0.7131300714731705 -0.128125 -0.22699415940741896 -v -0.8899067667698075 0.12812500000000004 -0.050217464110782206 -v 1.0502174641107827 0.12812500000000004 1.8899067667698075 -v -0.8899067667698075 -0.128125 -0.050217464110782206 -v 1.0502174641107827 -0.128125 1.8899067667698075 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0 0.96875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vt 0 0.921875 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 36/52/13 39/51/13 37/50/13 34/49/13 -f 35/56/14 36/55/14 34/54/14 33/53/14 -f 40/60/15 35/59/15 33/58/15 38/57/15 -f 39/64/16 40/63/16 38/62/16 37/61/16 -f 38/68/17 33/67/17 34/66/17 37/65/17 -f 39/72/18 36/71/18 35/70/18 40/69/18 -o cube6 -v 1.8899067667698075 0.12812500000000004 1.0502174641107824 -v -0.05021746411078243 0.12812500000000004 -0.8899067667698073 -v 1.8899067667698075 -0.128125 1.0502174641107824 -v -0.05021746411078243 -0.128125 -0.8899067667698073 -v -0.2269941594074193 0.12812500000000004 -0.7131300714731705 -v 1.7131300714731708 0.12812500000000004 1.2269941594074192 -v -0.2269941594074193 -0.128125 -0.7131300714731705 -v 1.7131300714731708 -0.128125 1.2269941594074192 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0 0.96875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vt 0 0.921875 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 44/76/19 47/75/19 45/74/19 42/73/19 -f 43/80/20 44/79/20 42/78/20 41/77/20 -f 48/84/21 43/83/21 41/82/21 46/81/21 -f 47/88/22 48/87/22 46/86/22 45/85/22 -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 -o cube7 -v 1.5584504630886136 0.12812500000000004 1.3816737677919764 -v -0.3816737677919766 0.12812500000000004 -0.5584504630886131 -v 1.5584504630886136 -0.128125 1.3816737677919764 -v -0.3816737677919766 -0.128125 -0.5584504630886131 -v -0.5584504630886133 0.12812500000000004 -0.38167376779197626 -v 1.3816737677919766 0.12812500000000004 1.5584504630886133 -v -0.5584504630886133 -0.128125 -0.38167376779197626 -v 1.3816737677919766 -0.128125 1.5584504630886133 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0 0.96875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vt 0 0.921875 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -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 54/116/29 49/115/29 50/114/29 53/113/29 -f 55/120/30 52/119/30 51/118/30 56/117/30 \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/neg_diag_template.json b/src/main/resources/assets/create/models/block/track/neg_diag_template.json deleted file mode 100644 index 5baac8570..000000000 --- a/src/main/resources/assets/create/models/block/track/neg_diag_template.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [128, 128], - "textures": { - "0": "create:block/track", - "particle": "create:block/track" - }, - "elements": [ - { - "name": "cube4", - "from": [4.5, 13.5, -2], - "to": [27.5, 13.5, 34], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 10, 16]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 5], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube5", - "from": [4.5, 9.5, -2], - "to": [27.5, 9.5, 34], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 10, 16]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 5], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube1", - "from": [4.5, 9.5, 29.9], - "to": [27.5, 13.5, 33.1], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 10, 16]}, - "faces": { - "north": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "east": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "south": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "west": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"} - } - }, - { - "name": "cube2", - "from": [4.5, 9.5, -1.1], - "to": [27.5, 13.5, 2.1], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 10, 16]}, - "faces": { - "north": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "east": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "south": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "west": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"} - } - }, - { - "name": "cube3", - "from": [6.5, 5.95, -5.95], - "to": [10.5, 10.05, 37.95], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 10, 16]}, - "faces": { - "north": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "east": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "south": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "west": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube6", - "from": [21.5, 5.95, -5.95], - "to": [25.5, 10.05, 37.95], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 10, 16]}, - "faces": { - "north": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "east": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "south": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "west": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube7", - "from": [14, 5.95, -5.95], - "to": [18, 10.05, 37.95], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 10, 16]}, - "faces": { - "north": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "east": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "south": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "west": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "rotation": 270, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/pos_diag.obj b/src/main/resources/assets/create/models/block/track/pos_diag.obj deleted file mode 100644 index f64e3b110..000000000 --- a/src/main/resources/assets/create/models/block/track/pos_diag.obj +++ /dev/null @@ -1,253 +0,0 @@ -# Made in Blockbench 4.1.1 -mtllib track.mtl - -o cube4 -v 1.8037281278126969 0.34375 0.21273787014296497 -v 0.7872621298570349 0.34375 -0.8037281278126971 -v 1.8037281278126969 0.34375 0.21273787014296497 -v 0.7872621298570349 0.34375 -0.8037281278126971 -v -0.8037281278126969 0.34375 0.787262129857035 -v 0.21273787014296508 0.34375 1.803728127812697 -v -0.8037281278126969 0.34375 0.787262129857035 -v 0.21273787014296508 0.34375 1.803728127812697 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 6/4/1 1/3/1 2/2/1 5/1/1 -f 7/8/2 4/7/2 3/6/2 8/5/2 -o cube5 -v 1.8037281278126969 0.09375 0.21273787014296497 -v 0.7872621298570349 0.09375 -0.8037281278126971 -v 1.8037281278126969 0.09375 0.21273787014296497 -v 0.7872621298570349 0.09375 -0.8037281278126971 -v -0.8037281278126969 0.09375 0.787262129857035 -v 0.21273787014296508 0.09375 1.803728127812697 -v -0.8037281278126969 0.09375 0.787262129857035 -v 0.21273787014296508 0.09375 1.803728127812697 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.6875 -vt 0 0.6875 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 14/12/3 9/11/3 10/10/3 13/9/3 -f 15/16/4 12/15/4 11/14/4 16/13/4 -o cube1 -v 1.7639533713709536 0.34375 0.2525126265847083 -v 0.7474873734152916 0.34375 -0.7639533713709539 -v 1.7639533713709536 0.09375 0.2525126265847083 -v 0.7474873734152916 0.09375 -0.7639533713709539 -v 0.606066017177982 0.34375 -0.6225320151336442 -v 1.6225320151336442 0.34375 0.39393398282201786 -v 0.606066017177982 0.09375 -0.6225320151336442 -v 1.6225320151336442 0.09375 0.39393398282201786 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -usemtl m_0 -f 20/20/5 23/19/5 21/18/5 18/17/5 -f 19/24/6 20/23/6 18/22/6 17/21/6 -f 24/28/7 19/27/7 17/26/7 22/25/7 -f 23/32/8 24/31/8 22/30/8 21/29/8 -o cube2 -v 0.39393398282201786 0.34375 1.6225320151336442 -v -0.6225320151336442 0.34375 0.6060660171779821 -v 0.39393398282201786 0.09375 1.6225320151336442 -v -0.6225320151336442 0.09375 0.6060660171779821 -v -0.7639533713709536 0.34375 0.7474873734152917 -v 0.2525126265847084 0.34375 1.7639533713709539 -v -0.7639533713709536 0.09375 0.7474873734152917 -v 0.2525126265847084 0.09375 1.7639533713709539 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0.015625 0.5390625 -vt 0.1953125 0.5390625 -vt 0.1953125 0.5078125 -vt 0.015625 0.5078125 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -usemtl m_0 -f 28/36/9 31/35/9 29/34/9 26/33/9 -f 27/40/10 28/39/10 26/38/10 25/37/10 -f 32/44/11 27/43/11 25/42/11 30/41/11 -f 31/48/12 32/47/12 30/46/12 29/45/12 -o cube3 -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.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.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 36/52/13 39/51/13 37/50/13 34/49/13 -f 35/56/14 36/55/14 34/54/14 33/53/14 -f 40/60/15 35/59/15 33/58/15 38/57/15 -f 39/64/16 40/63/16 38/62/16 37/61/16 -f 38/68/17 33/67/17 34/66/17 37/65/17 -f 39/72/18 36/71/18 35/70/18 40/69/18 -o cube6 -v 1.2269941594074192 0.12812500000000004 -0.7131300714731708 -v 1.0502174641107824 0.12812500000000004 -0.8899067667698075 -v 1.2269941594074192 -0.128125 -0.7131300714731708 -v 1.0502174641107824 -0.128125 -0.8899067667698075 -v -0.8899067667698073 0.12812500000000004 1.0502174641107824 -v -0.7131300714731705 0.12812500000000004 1.2269941594074192 -v -0.8899067667698073 -0.128125 1.0502174641107824 -v -0.7131300714731705 -0.128125 1.2269941594074192 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 44/76/19 47/75/19 45/74/19 42/73/19 -f 43/80/20 44/79/20 42/78/20 41/77/20 -f 48/84/21 43/83/21 41/82/21 46/81/21 -f 47/88/22 48/87/22 46/86/22 45/85/22 -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 -o cube7 -v 1.5584504630886133 0.12812500000000004 -0.3816737677919766 -v 1.3816737677919764 0.12812500000000004 -0.5584504630886136 -v 1.5584504630886133 -0.128125 -0.3816737677919766 -v 1.3816737677919764 -0.128125 -0.5584504630886136 -v -0.5584504630886131 0.12812500000000004 1.3816737677919766 -v -0.38167376779197626 0.12812500000000004 1.5584504630886133 -v -0.5584504630886131 -0.128125 1.3816737677919766 -v -0.38167376779197626 -0.128125 1.5584504630886133 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vn -0.7071067811865476 0 -0.7071067811865475 -vn 0.7071067811865475 0 -0.7071067811865476 -vn 0.7071067811865476 0 0.7071067811865475 -vn -0.7071067811865475 0 0.7071067811865476 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -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 54/116/29 49/115/29 50/114/29 53/113/29 -f 55/120/30 52/119/30 51/118/30 56/117/30 \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/pos_diag_template.json b/src/main/resources/assets/create/models/block/track/pos_diag_template.json deleted file mode 100644 index 39af01232..000000000 --- a/src/main/resources/assets/create/models/block/track/pos_diag_template.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [128, 128], - "textures": { - "0": "create:block/track", - "particle": "create:block/track" - }, - "elements": [ - { - "name": "cube4", - "from": [-2, 13.5, 4.5], - "to": [34, 13.5, 27.5], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 11.5, 16]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"} - } - }, - { - "name": "cube5", - "from": [-2, 9.5, 4.5], - "to": [34, 9.5, 27.5], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 11.5, 16]}, - "faces": { - "up": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 5], "texture": "#0"} - } - }, - { - "name": "cube1", - "from": [29.9, 9.5, 4.5], - "to": [33.1, 13.5, 27.5], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 11.5, 16]}, - "faces": { - "north": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "east": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "south": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "west": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"} - } - }, - { - "name": "cube2", - "from": [-1.1, 9.5, 4.5], - "to": [2.1, 13.5, 27.5], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 11.5, 16]}, - "faces": { - "north": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "east": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"}, - "south": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "west": {"uv": [0.25, 7.375, 3.125, 7.875], "texture": "#0"} - } - }, - { - "name": "cube3", - "from": [-5.95, 5.95, 21.5], - "to": [37.95, 10.05, 25.5], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, - "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} - } - }, - { - "name": "cube6", - "from": [-5.95, 5.95, 6.5], - "to": [37.95, 10.05, 10.5], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, - "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} - } - }, - { - "name": "cube7", - "from": [-5.95, 5.95, 14], - "to": [37.95, 10.05, 18], - "rotation": {"angle": 45, "axis": "y", "origin": [16, 8, 16]}, - "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} - } - } - ] -} \ 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 cb6184e15..ff8a0abe4 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 @@ -1,38 +1,50 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/track", - "particle": "create:block/track" + "1": "create:block/standard_track", + "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ { - "name": "cube2", - "from": [-1.6, 0.5, 0], - "to": [1.6, 4.5, 8], + "name": "tie1", + "from": [-2.1, 0, 0], + "to": [2.1, 0.05, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [6.5, 7.375, 6.75, 7.875], "texture": "#0"}, - "east": {"uv": [0.375, 7.375, 1.375, 7.875], "texture": "#0"}, - "south": {"uv": [6.5, 7.375, 6.75, 7.875], "texture": "#0"}, - "west": {"uv": [0.375, 7.375, 1.375, 7.875], "texture": "#0"} + "up": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} } }, { - "name": "cube4", - "from": [-2.25, 4.5, 0], - "to": [2.25, 4.5, 8], + "name": "tie2", + "from": [-2, 4.4, 0], + "to": [2, 4.45, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [3.25, 2.125, 3.75, 3.125], "texture": "#0"}, - "down": {"uv": [3.25, 2.125, 3.75, 3.125], "texture": "#0"} + "up": {"uv": [6, 10, 2, 8], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} } }, { - "name": "cube5", - "from": [-2.25, 0.5, 0], - "to": [2.25, 0.5, 8], + "name": "tie3", + "from": [-1.55, 0.05, 0], + "to": [1.55, 4.45, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [3.25, 2.125, 3.75, 3.125], "texture": "#0"}, - "down": {"uv": [3.25, 2.125, 3.75, 3.125], "texture": "#0"} + "north": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "east": {"uv": [0, 6, 4, 8], "texture": "#1"}, + "south": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "west": {"uv": [0, 6, 4, 8], "texture": "#1"} } } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2] + } ] } \ No newline at end of file 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 7150dd316..d08aa4800 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 @@ -1,41 +1,50 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/track", - "particle": "create:block/track" + "1": "create:block/standard_track", + "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ { - "name": "cube2", - "from": [-1.6, 0.5, 0], - "to": [1.6, 4.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "name": "tie1", + "from": [-2.1, 0, 0], + "to": [2.1, 0.05, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [6.75, 7.375, 6.5, 7.875], "texture": "#0"}, - "east": {"uv": [1.875, 7.375, 0.875, 7.875], "texture": "#0"}, - "south": {"uv": [6.75, 7.375, 6.5, 7.875], "texture": "#0"}, - "west": {"uv": [1.875, 7.375, 0.875, 7.875], "texture": "#0"} + "up": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} } }, { - "name": "cube4", - "from": [-2.25, 4.5, 0], - "to": [2.25, 4.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "name": "tie2", + "from": [-2, 4.4, 0], + "to": [2, 4.45, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [3.75, 2.125, 3.25, 3.125], "texture": "#0"}, - "down": {"uv": [3.75, 2.125, 3.25, 3.125], "texture": "#0"} + "up": {"uv": [6, 8, 2, 10], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 10, 4, 12], "rotation": 90, "texture": "#1"} } }, { - "name": "cube5", - "from": [-2.25, 0.5, 0], - "to": [2.25, 0.5, 8], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, + "name": "tie3", + "from": [-1.55, 0.05, 0], + "to": [1.55, 4.45, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "up": {"uv": [3.75, 2.125, 3.25, 3.125], "texture": "#0"}, - "down": {"uv": [3.75, 2.125, 3.25, 3.125], "texture": "#0"} + "north": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "east": {"uv": [0, 6, 4, 8], "texture": "#1"}, + "south": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "west": {"uv": [0, 6, 4, 8], "texture": "#1"} } } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2] + } ] } \ No newline at end of file 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 a6bff83bb..9331ade35 100644 --- a/src/main/resources/assets/create/models/block/track/tie.json +++ b/src/main/resources/assets/create/models/block/track/tie.json @@ -1,22 +1,44 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/track", - "particle": "create:block/track" + "1": "create:block/standard_track", + "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" }, "elements": [ { - "name": "cube6", + "name": "cube1", "from": [-13.95, -3.05, 2], - "to": [29.95, 1.05, 6], + "to": [8, 1.05, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} + "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": "cube3", + "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"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/track.png b/src/main/resources/assets/create/models/block/track/track.png deleted file mode 100644 index d9aed3768..000000000 Binary files a/src/main/resources/assets/create/models/block/track/track.png and /dev/null differ 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 105959853..0cc49ca1c 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,9 +1,134 @@ { - "loader": "forge:obj", - "flip-v": true, - "model": "create:models/block/track/x_ortho.obj", + "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/track", + "1": "create:block/standard_track", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" - } + }, + "elements": [ + { + "name": "cube1", + "from": [10, -2.05, -13.95], + "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"} + } + }, + { + "name": "cube2", + "from": [2, -2.05, -13.95], + "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"} + } + }, + { + "name": "cube3", + "from": [10, -2.05, 8], + "to": [14, 2.05, 29.95], + "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": "cube4", + "from": [2, -2.05, 8], + "to": [6, 2.05, 29.95], + "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": "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"} + } + }, + { + "name": "tie2", + "from": [0, 5.4, -9.45], + "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"} + } + }, + { + "name": "tie3", + "from": [0, 1.05, -9], + "to": [16, 5.45, -5.9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 6, 8, 8], "texture": "#1"}, + "east": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "south": {"uv": [0, 6, 8, 8], "texture": "#1"}, + "west": {"uv": [11, 2, 12.5, 4], "texture": "#1"} + } + }, + { + "name": "tie4", + "from": [0, 5.4, 21.45], + "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"} + } + }, + { + "name": "tie5", + "from": [0, 1.05, 21.9], + "to": [16, 5.45, 25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [8, 6, 0, 8], "texture": "#1"}, + "east": {"uv": [12.5, 2, 11, 4], "texture": "#1"}, + "south": {"uv": [8, 6, 0, 8], "texture": "#1"}, + "west": {"uv": [12.5, 2, 11, 4], "texture": "#1"} + } + }, + { + "name": "tie6", + "from": [0, 1, 21.35], + "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"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/x_ortho.obj b/src/main/resources/assets/create/models/block/track/x_ortho.obj deleted file mode 100644 index 5fbd40880..000000000 --- a/src/main/resources/assets/create/models/block/track/x_ortho.obj +++ /dev/null @@ -1,255 +0,0 @@ -# Made in Blockbench 4.1.1 -mtllib track.mtl - -o cube1 -v 1 0.34375 1.56875 -v 1 0.34375 1.36875 -v 1 0.09375 1.56875 -v 1 0.09375 1.36875 -v 0 0.34375 1.36875 -v 0 0.34375 1.56875 -v 0 0.09375 1.36875 -v 0 0.09375 1.56875 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -usemtl m_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 7/16/4 8/15/4 6/14/4 5/13/4 -o cube2 -v 1 0.34375 -0.36875 -v 1 0.34375 -0.5687500000000001 -v 1 0.09375 -0.36875 -v 1 0.09375 -0.5687500000000001 -v 0 0.34375 -0.5687500000000001 -v 0 0.34375 -0.36875 -v 0 0.09375 -0.5687500000000001 -v 0 0.09375 -0.36875 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -usemtl m_0 -f 12/20/5 15/19/5 13/18/5 10/17/5 -f 11/24/6 12/23/6 10/22/6 9/21/6 -f 16/28/7 11/27/7 9/26/7 14/25/7 -f 15/32/8 16/31/8 14/30/8 13/29/8 -o cube3 -v 0.375 0.12812500000000004 1.8718750000000002 -v 0.375 0.12812500000000004 -0.8718750000000002 -v 0.375 -0.128125 1.8718750000000002 -v 0.375 -0.128125 -0.8718750000000002 -v 0.125 0.12812500000000004 -0.8718750000000002 -v 0.125 0.12812500000000004 1.8718750000000002 -v 0.125 -0.128125 -0.8718750000000002 -v 0.125 -0.128125 1.8718750000000002 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0 0.96875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vt 0 0.921875 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 20/36/9 23/35/9 21/34/9 18/33/9 -f 19/40/10 20/39/10 18/38/10 17/37/10 -f 24/44/11 19/43/11 17/42/11 22/41/11 -f 23/48/12 24/47/12 22/46/12 21/45/12 -f 22/52/13 17/51/13 18/50/13 21/49/13 -f 23/56/14 20/55/14 19/54/14 24/53/14 -o cube4 -v 1 0.34375 1.625 -v 1 0.34375 -0.625 -v 1 0.34375 1.625 -v 1 0.34375 -0.625 -v 0 0.34375 -0.625 -v 0 0.34375 1.625 -v 0 0.34375 -0.625 -v 0 0.34375 1.625 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 0.7421875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0 0.7421875 -vt 0 0.8671875 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 28/60/15 31/59/15 29/58/15 26/57/15 -f 27/64/16 28/63/16 26/62/16 25/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 -o cube5 -v 1 0.09375 1.625 -v 1 0.09375 -0.625 -v 1 0.09375 1.625 -v 1 0.09375 -0.625 -v 0 0.09375 -0.625 -v 0 0.09375 1.625 -v 0 0.09375 -0.625 -v 0 0.09375 1.625 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 0.7421875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0 0.7421875 -vt 0 0.8671875 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 36/84/21 39/83/21 37/82/21 34/81/21 -f 35/88/22 36/87/22 34/86/22 33/85/22 -f 40/92/23 35/91/23 33/90/23 38/89/23 -f 39/96/24 40/95/24 38/94/24 37/93/24 -f 38/100/25 33/99/25 34/98/25 37/97/25 -f 39/104/26 36/103/26 35/102/26 40/101/26 -o cube6 -v 0.875 0.12812500000000004 1.8718750000000002 -v 0.875 0.12812500000000004 -0.8718750000000002 -v 0.875 -0.128125 1.8718750000000002 -v 0.875 -0.128125 -0.8718750000000002 -v 0.625 0.12812500000000004 -0.8718750000000002 -v 0.625 0.12812500000000004 1.8718750000000002 -v 0.625 -0.128125 -0.8718750000000002 -v 0.625 -0.128125 1.8718750000000002 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0 0.96875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vt 0 0.921875 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 44/108/27 47/107/27 45/106/27 42/105/27 -f 43/112/28 44/111/28 42/110/28 41/109/28 -f 48/116/29 43/115/29 41/114/29 46/113/29 -f 47/120/30 48/119/30 46/118/30 45/117/30 -f 46/124/31 41/123/31 42/122/31 45/121/31 -f 47/128/32 44/127/32 43/126/32 48/125/32 \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/x_ortho_template.json b/src/main/resources/assets/create/models/block/track/x_ortho_template.json deleted file mode 100644 index 6607d5999..000000000 --- a/src/main/resources/assets/create/models/block/track/x_ortho_template.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "create:block/track", - "particle": "create:block/track" - }, - "elements": [ - { - "name": "cube1", - "from": [8, 9.5, 29.9], - "to": [24, 13.5, 33.1], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "east": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "south": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "west": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube2", - "from": [8, 9.5, -1.1], - "to": [24, 13.5, 2.1], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "east": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "south": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "west": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube3", - "from": [10, 5.95, -5.95], - "to": [14, 10.05, 37.95], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "east": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "south": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "west": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube4", - "from": [8, 13.5, -2], - "to": [24, 13.5, 34], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube5", - "from": [8, 9.5, -2], - "to": [24, 9.5, 34], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 4.125], "rotation": 270, "texture": "#0"} - } - }, - { - "name": "cube6", - "from": [18, 5.95, -5.95], - "to": [22, 10.05, 37.95], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 10.33333, 16]}, - "faces": { - "north": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "east": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "south": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "west": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "rotation": 270, "texture": "#0"} - } - } - ] -} \ 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 fe3dcba89..bfbc59929 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,9 +1,134 @@ { - "loader": "forge:obj", - "flip-v": true, - "model": "create:models/block/track/z_ortho.obj", + "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/track", + "1": "create:block/standard_track", "particle": "create:block/palettes/stone_types/polished/andesite_cut_polished" - } + }, + "elements": [ + { + "name": "cube1", + "from": [8, -2.05, 10], + "to": [29.95, 2.05, 14], + "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"} + } + }, + { + "name": "cube2", + "from": [8, -2.05, 2], + "to": [29.95, 2.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"} + } + }, + { + "name": "cube3", + "from": [-13.95, -2.05, 10], + "to": [8, 2.05, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "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": "cube4", + "from": [-13.95, -2.05, 2], + "to": [8, 2.05, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "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": "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"} + } + }, + { + "name": "tie2", + "from": [21.45, 5.4, 0], + "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"} + } + }, + { + "name": "tie3", + "from": [21.9, 1.05, 0], + "to": [25, 5.45, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "east": {"uv": [0, 6, 8, 8], "texture": "#1"}, + "south": {"uv": [11, 2, 12.5, 4], "texture": "#1"}, + "west": {"uv": [0, 6, 8, 8], "texture": "#1"} + } + }, + { + "name": "tie4", + "from": [-9.45, 5.4, 0], + "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"} + } + }, + { + "name": "tie5", + "from": [-9, 1.05, 0], + "to": [-5.9, 5.45, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [12.5, 2, 11, 4], "texture": "#1"}, + "east": {"uv": [8, 6, 0, 8], "texture": "#1"}, + "south": {"uv": [12.5, 2, 11, 4], "texture": "#1"}, + "west": {"uv": [8, 6, 0, 8], "texture": "#1"} + } + }, + { + "name": "tie6", + "from": [-9.55, 1, 0], + "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"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/z_ortho.obj b/src/main/resources/assets/create/models/block/track/z_ortho.obj deleted file mode 100644 index 3a9185bb9..000000000 --- a/src/main/resources/assets/create/models/block/track/z_ortho.obj +++ /dev/null @@ -1,255 +0,0 @@ -# Made in Blockbench 4.1.1 -mtllib track.mtl - -o cube1 -v 1.56875 0.34375 1 -v 1.56875 0.34375 0 -v 1.56875 0.09375 1 -v 1.56875 0.09375 0 -v 1.36875 0.34375 0 -v 1.36875 0.34375 1 -v 1.36875 0.09375 0 -v 1.36875 0.09375 1 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -usemtl m_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 7/16/4 8/15/4 6/14/4 5/13/4 -o cube2 -v -0.36875 0.34375 1 -v -0.36875 0.34375 0 -v -0.36875 0.09375 1 -v -0.36875 0.09375 0 -v -0.56875 0.34375 0 -v -0.56875 0.34375 1 -v -0.56875 0.09375 0 -v -0.56875 0.09375 1 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vt 0.40625 0.5390625 -vt 0.4296875 0.5390625 -vt 0.4296875 0.5078125 -vt 0.40625 0.5078125 -vt 0 0.5390625 -vt 0.125 0.5390625 -vt 0.125 0.5078125 -vt 0 0.5078125 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -usemtl m_0 -f 12/20/5 15/19/5 13/18/5 10/17/5 -f 11/24/6 12/23/6 10/22/6 9/21/6 -f 16/28/7 11/27/7 9/26/7 14/25/7 -f 15/32/8 16/31/8 14/30/8 13/29/8 -o cube3 -v 1.8718750000000002 0.12812500000000004 0.875 -v 1.8718750000000002 0.12812500000000004 0.625 -v 1.8718750000000002 -0.128125 0.875 -v 1.8718750000000002 -0.128125 0.625 -v -0.871875 0.12812500000000004 0.625 -v -0.871875 0.12812500000000004 0.875 -v -0.871875 -0.128125 0.625 -v -0.871875 -0.128125 0.875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 20/36/9 23/35/9 21/34/9 18/33/9 -f 19/40/10 20/39/10 18/38/10 17/37/10 -f 24/44/11 19/43/11 17/42/11 22/41/11 -f 23/48/12 24/47/12 22/46/12 21/45/12 -f 22/52/13 17/51/13 18/50/13 21/49/13 -f 23/56/14 20/55/14 19/54/14 24/53/14 -o cube4 -v 1.625 0.34375 1 -v 1.625 0.34375 0 -v 1.625 0.34375 1 -v 1.625 0.34375 0 -v -0.625 0.34375 0 -v -0.625 0.34375 1 -v -0.625 0.34375 0 -v -0.625 0.34375 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0 0.7421875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0 0.7421875 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 28/60/15 31/59/15 29/58/15 26/57/15 -f 27/64/16 28/63/16 26/62/16 25/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 -o cube5 -v 1.625 0.09375 1 -v 1.625 0.09375 0 -v 1.625 0.09375 1 -v 1.625 0.09375 0 -v -0.625 0.09375 0 -v -0.625 0.09375 1 -v -0.625 0.09375 0 -v -0.625 0.09375 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 1 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0 0.7421875 -vt 0 0.8671875 -vt 0.234375 0.8671875 -vt 0.234375 0.7421875 -vt 0 0.7421875 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 36/84/21 39/83/21 37/82/21 34/81/21 -f 35/88/22 36/87/22 34/86/22 33/85/22 -f 40/92/23 35/91/23 33/90/23 38/89/23 -f 39/96/24 40/95/24 38/94/24 37/93/24 -f 38/100/25 33/99/25 34/98/25 37/97/25 -f 39/104/26 36/103/26 35/102/26 40/101/26 -o cube6 -v 1.8718750000000002 0.12812500000000004 0.375 -v 1.8718750000000002 0.12812500000000004 0.125 -v 1.8718750000000002 -0.128125 0.375 -v 1.8718750000000002 -0.128125 0.125 -v -0.871875 0.12812500000000004 0.125 -v -0.871875 0.12812500000000004 0.375 -v -0.871875 -0.128125 0.125 -v -0.871875 -0.128125 0.375 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 0.9609375 -vt 0.296875 0.9609375 -vt 0.296875 0.9296875 -vt 0 0.9296875 -vt 0.3046875 0.9609375 -vt 0.3359375 0.9609375 -vt 0.3359375 0.9296875 -vt 0.3046875 0.9296875 -vt 0 1 -vt 0.296875 1 -vt 0.296875 0.96875 -vt 0 0.96875 -vt 0 0.921875 -vt 0.296875 0.921875 -vt 0.296875 0.890625 -vt 0 0.890625 -vn 0 0 -1 -vn 1 0 0 -vn 0 0 1 -vn -1 0 0 -vn 0 1 0 -vn 0 -1 0 -usemtl m_0 -f 44/108/27 47/107/27 45/106/27 42/105/27 -f 43/112/28 44/111/28 42/110/28 41/109/28 -f 48/116/29 43/115/29 41/114/29 46/113/29 -f 47/120/30 48/119/30 46/118/30 45/117/30 -f 46/124/31 41/123/31 42/122/31 45/121/31 -f 47/128/32 44/127/32 43/126/32 48/125/32 \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/z_ortho_template.json b/src/main/resources/assets/create/models/block/track/z_ortho_template.json deleted file mode 100644 index c015a5b02..000000000 --- a/src/main/resources/assets/create/models/block/track/z_ortho_template.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "create:block/track", - "particle": "create:block/track" - }, - "elements": [ - { - "name": "cube1", - "from": [29.9, 9.5, 8], - "to": [33.1, 13.5, 24], - "faces": { - "north": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "east": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "south": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "west": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "texture": "#0"} - } - }, - { - "name": "cube2", - "from": [-1.1, 9.5, 8], - "to": [2.1, 13.5, 24], - "faces": { - "north": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "east": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "south": {"uv": [6.5, 7.375, 6.875, 7.875], "texture": "#0"}, - "west": {"uv": [0, 7.375, 2, 7.875], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "texture": "#0"} - } - }, - { - "name": "cube3", - "from": [-5.95, 5.95, 18], - "to": [37.95, 10.05, 22], - "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} - } - }, - { - "name": "cube4", - "from": [-2, 13.5, 8], - "to": [34, 13.5, 24], - "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [0, 2.125, 3.75, 4.125], "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 4.125], "texture": "#0"} - } - }, - { - "name": "cube5", - "from": [-2, 9.5, 8], - "to": [34, 9.5, 24], - "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [0, 2.125, 3.75, 4.125], "texture": "#0"}, - "down": {"uv": [0, 2.125, 3.75, 4.125], "texture": "#0"} - } - }, - { - "name": "cube6", - "from": [-5.95, 5.95, 10], - "to": [37.95, 10.05, 14], - "faces": { - "north": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "east": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "south": {"uv": [0, 0.625, 4.75, 1.125], "texture": "#0"}, - "west": {"uv": [4.875, 0.625, 5.375, 1.125], "texture": "#0"}, - "up": {"uv": [0, 0, 4.75, 0.5], "texture": "#0"}, - "down": {"uv": [0, 1.25, 4.75, 1.75], "texture": "#0"} - } - } - ] -} \ 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 new file mode 100644 index 000000000..26069a056 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/standard_track.png differ