From 9c0c058fc0e0870fcc39f706089d39a1acd4a456 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 15 May 2023 01:12:38 +0200 Subject: [PATCH] SeamsBad - Pushed surfaces around by fractions of a pixel to cover up misaligned geometry from mc's model rendering --- .../java/com/simibubi/create/AllShapes.java | 2 +- .../sequencer/SequencedGearshiftScreen.java | 2 +- .../belts/tunnel/BeltTunnelInstance.java | 2 +- .../belts/tunnel/BeltTunnelRenderer.java | 4 +- .../block/funnel/FunnelInstance.java | 2 +- .../block/funnel/FunnelRenderer.java | 4 +- .../create/models/block/bearing/block.json | 129 ++++++------- .../block/belt_funnel/block_extended.json | 6 +- .../block/belt_funnel/block_pulling.json | 4 +- .../block/belt_funnel/block_pushing.json | 4 +- .../block/belt_funnel/block_retracted.json | 6 +- .../create/models/block/belt_funnel/flap.json | 4 +- .../create/models/block/belt_tunnel/flap.json | 4 +- .../models/block/belt_tunnel/straight.json | 8 +- .../models/block/belt_tunnel/t_left.json | 12 +- .../models/block/belt_tunnel/t_right.json | 12 +- .../models/block/belt_tunnel/window.json | 8 +- .../models/block/controls/block_open.json | 2 +- .../models/block/controls/block_virtual.json | 2 +- .../models/block/deployer/horizontal.json | 16 +- .../models/block/deployer/vertical.json | 16 +- .../create/models/block/depot/block.json | 4 +- .../models/block/elevator_contact/block.json | 2 +- .../models/block/encased_fan/block.json | 12 +- .../block/fluid_tank/block_bottom_window.json | 32 ++-- .../fluid_tank/block_bottom_window_ne.json | 12 +- .../fluid_tank/block_bottom_window_nw.json | 12 +- .../fluid_tank/block_bottom_window_se.json | 12 +- .../fluid_tank/block_bottom_window_sw.json | 12 +- .../block/fluid_tank/block_middle_window.json | 33 ++-- .../fluid_tank/block_middle_window_ne.json | 13 +- .../fluid_tank/block_middle_window_nw.json | 13 +- .../fluid_tank/block_middle_window_se.json | 13 +- .../fluid_tank/block_middle_window_sw.json | 13 +- .../block/fluid_tank/block_single_window.json | 32 ++-- .../fluid_tank/block_single_window_ne.json | 12 +- .../fluid_tank/block_single_window_nw.json | 12 +- .../fluid_tank/block_single_window_se.json | 12 +- .../fluid_tank/block_single_window_sw.json | 12 +- .../block/fluid_tank/block_top_window.json | 32 ++-- .../block/fluid_tank/block_top_window_ne.json | 12 +- .../block/fluid_tank/block_top_window_nw.json | 12 +- .../block/fluid_tank/block_top_window_se.json | 12 +- .../block/fluid_tank/block_top_window_sw.json | 12 +- .../models/block/funnel/block_horizontal.json | 2 +- .../models/block/funnel/block_vertical.json | 24 +-- .../funnel/block_vertical_filterless.json | 24 +-- .../create/models/block/funnel/flap.json | 4 +- .../block/gantry_carriage/horizontal.json | 4 +- .../block/gantry_carriage/vertical.json | 4 +- .../create/models/block/gauge/base.json | 4 +- .../create/models/block/gauge/base_wall.json | 4 +- .../create/models/block/gearbox/block.json | 4 +- .../models/block/mechanical_drill/block.json | 4 +- .../models/block/mechanical_drill/head.json | 86 ++++----- .../mechanical_piston/extended/block.json | 8 +- .../extended/block_rotated.json | 8 +- .../block/mechanical_piston/moving/block.json | 11 +- .../moving/block_rotated.json | 11 +- .../block/mechanical_piston/normal/block.json | 20 +-- .../normal/block_rotated.json | 6 +- .../models/block/mechanical_press/block.json | 6 +- .../models/block/mechanical_press/head.json | 170 +++++++++--------- .../block/mechanical_saw/horizontal.json | 6 +- .../models/block/mechanical_saw/vertical.json | 140 +++++++-------- .../models/block/redstone_contact/block.json | 4 +- .../models/block/rope_pulley/block.json | 3 +- .../create/models/block/rope_pulley/item.json | 33 +++- .../block/rope_pulley/pulley_magnet.json | 28 ++- .../create/models/block/rope_pulley/rope.json | 4 +- .../models/block/rope_pulley/rope_half.json | 4 +- .../block/rope_pulley/rope_half_magnet.json | 28 ++- .../block/sequenced_gearshift/idle.json | 4 +- .../create/models/block/spout/block.json | 60 +++---- .../models/block/water_wheel/block.json | 11 +- .../textures/block/fluid_tank_window.png | Bin 168 -> 254 bytes .../create/textures/block/pulley_magnet.png | Bin 347 -> 331 bytes .../create/textures/block/pulley_rope.png | Bin 207 -> 161 bytes 78 files changed, 680 insertions(+), 641 deletions(-) diff --git a/src/main/java/com/simibubi/create/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java index 45220463a..2a24670af 100644 --- a/src/main/java/com/simibubi/create/AllShapes.java +++ b/src/main/java/com/simibubi/create/AllShapes.java @@ -249,7 +249,7 @@ public class AllShapes { BELT_COLLISION_MASK = cuboid(0, 0, 0, 16, 19, 16), SCHEMATICANNON_SHAPE = shape(1, 0, 1, 15, 8, 15).add(0.5, 8, 0.5, 15.5, 11, 15.5) .build(), - PULLEY_MAGNET = shape(3, 0, 3, 13, 2, 13).add(FOUR_VOXEL_POLE.get(UP)) + PULLEY_MAGNET = shape(3, 0, 3, 13, 3, 13).add(FOUR_VOXEL_POLE.get(UP)) .build(), SPOUT = shape(1, 2, 1, 15, 14, 15).add(2, 0, 2, 14, 16, 14) .build(), diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java index 6d703a69c..4c5d20620 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java @@ -150,7 +150,7 @@ public class SequencedGearshiftScreen extends AbstractSimiScreen { AllGuiTextures toDraw = AllGuiTextures.SEQUENCER_EMPTY; int yOffset = toDraw.height * row; - toDraw.render(ms, x, y + 14 + yOffset, this); + toDraw.render(ms, x, y + 16 + yOffset, this); } for (int row = 0; row < instructions.capacity(); row++) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java index 1bd4f6844..d1365b05a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BeltTunnelInstance.java @@ -47,7 +47,7 @@ public class BeltTunnelInstance extends BlockEntityInstance imple for (int segment = 0; segment <= 3; segment++) { float intensity = segment == 3 ? 1.5f : segment + 1; - float segmentOffset = -3 / 16f * segment; + float segmentOffset = -3.05f / 16f * segment + 0.075f / 16f; FlapData key = model.createInstance(); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java index c31ca61f0..c4e5dc43a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelRenderer.java @@ -49,7 +49,7 @@ public class FunnelRenderer extends SmartBlockEntityRenderer msr.centre() .rotateY(horizontalAngle) .unCentre(); - ms.translate(0, 0, -be.getFlapOffset()); + ms.translate(0.075f, 0, -be.getFlapOffset()); for (int segment = 0; segment <= 3; segment++) { ms.pushPose(); @@ -68,7 +68,7 @@ public class FunnelRenderer extends SmartBlockEntityRenderer .renderInto(ms, vb); ms.popPose(); - ms.translate(-3 / 16f, 0, 0); + ms.translate(-3.05f / 16f, 0, 0); } ms.popPose(); } diff --git a/src/main/resources/assets/create/models/block/bearing/block.json b/src/main/resources/assets/create/models/block/bearing/block.json index 15d53e03e..bcc3b8268 100644 --- a/src/main/resources/assets/create/models/block/bearing/block.json +++ b/src/main/resources/assets/create/models/block/bearing/block.json @@ -1,66 +1,67 @@ { - "textures": { - "particle": "#side", - "gearbox": "#back", - "bearing_side": "#side" - }, - "elements": [ - { - "name": "Side", - "from": [ 0, 0, 0 ], - "to": [ 2, 12, 16 ], - "faces": { - "north": { "texture": "#bearing_side", "uv": [ 14, 4, 16, 16 ] }, - "east": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] }, - "south": { "texture": "#bearing_side", "uv": [ 0, 4, 2, 16 ] }, - "west": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] }, - "up": { "texture": "#gearbox", "uv": [ 0, 0, 2, 16 ] }, - "down": { "texture": "#gearbox", "uv": [ 0, 0, 2, 16 ] } - } - }, - { - "name": "Side", - "from": [ 14, 0, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#bearing_side", "uv": [ 0, 4, 2, 16 ] }, - "east": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] }, - "south": { "texture": "#bearing_side", "uv": [ 14, 4, 16, 16 ] }, - "west": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] }, - "up": { "texture": "#gearbox", "uv": [ 14, 0, 16, 16 ] }, - "down": { "texture": "#gearbox", "uv": [ 14, 0, 16, 16 ] } - } - }, - { - "name": "Side", - "from": [ 2, 0, 0 ], - "to": [ 14, 12, 2 ], - "faces": { - "north": { "texture": "#bearing_side", "uv": [ 2, 4, 14, 16 ] }, - "south": { "texture": "#bearing_side", "uv": [ 2, 4, 14, 16 ] }, - "up": { "texture": "#gearbox", "uv": [ 2, 0, 14, 2 ] }, - "down": { "texture": "#gearbox", "uv": [ 2, 14, 14, 16 ] } - } - }, - { - "name": "Side", - "from": [ 2, 0, 14 ], - "to": [ 14, 12, 16 ], - "faces": { - "north": { "texture": "#bearing_side", "uv": [ 2, 4, 14, 16 ] }, - "south": { "texture": "#bearing_side", "uv": [ 2, 4, 14, 16 ] }, - "up": { "texture": "#gearbox", "uv": [ 2, 14, 14, 16 ] }, - "down": { "texture": "#gearbox", "uv": [ 2, 0, 14, 2 ] } - } - }, - { - "name": "Core", - "from": [ 2, 1, 2 ], - "to": [ 14, 12, 14 ], - "faces": { - "up": { "texture": "#gearbox", "uv": [ 2, 2, 14, 14 ] }, - "down": { "texture": "#gearbox", "uv": [ 2, 2, 14, 14 ] } - } - } - ] + "credit": "Made with Blockbench", + "textures": { + "gearbox": "#back", + "particle": "#side", + "bearing_side": "#side" + }, + "elements": [ + { + "name": "Side", + "from": [0, 0, 0], + "to": [2, 12, 16], + "faces": { + "north": {"uv": [14, 4, 16, 16], "texture": "#bearing_side"}, + "east": {"uv": [0, 4, 16, 16], "texture": "#bearing_side"}, + "south": {"uv": [0, 4, 2, 16], "texture": "#bearing_side"}, + "west": {"uv": [0, 4, 16, 16], "texture": "#bearing_side"}, + "up": {"uv": [0, 0, 2, 16], "texture": "#gearbox"}, + "down": {"uv": [0, 0, 2, 16], "texture": "#gearbox"} + } + }, + { + "name": "Side", + "from": [14, 0, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 4, 2, 16], "texture": "#bearing_side"}, + "east": {"uv": [0, 4, 16, 16], "texture": "#bearing_side"}, + "south": {"uv": [14, 4, 16, 16], "texture": "#bearing_side"}, + "west": {"uv": [0, 4, 16, 16], "texture": "#bearing_side"}, + "up": {"uv": [14, 0, 16, 16], "texture": "#gearbox"}, + "down": {"uv": [14, 0, 16, 16], "texture": "#gearbox"} + } + }, + { + "name": "Side", + "from": [2, 0, 0], + "to": [14, 12, 2], + "faces": { + "north": {"uv": [2, 4, 14, 16], "texture": "#bearing_side"}, + "south": {"uv": [2, 4, 14, 16], "texture": "#bearing_side"}, + "up": {"uv": [2, 0, 14, 2], "texture": "#gearbox"}, + "down": {"uv": [2, 14, 14, 16], "texture": "#gearbox"} + } + }, + { + "name": "Side", + "from": [2, 0, 14], + "to": [14, 12, 16], + "faces": { + "north": {"uv": [2, 4, 14, 16], "texture": "#bearing_side"}, + "south": {"uv": [2, 4, 14, 16], "texture": "#bearing_side"}, + "up": {"uv": [2, 14, 14, 16], "texture": "#gearbox"}, + "down": {"uv": [2, 0, 14, 2], "texture": "#gearbox"} + } + }, + { + "name": "Core", + "from": [2, 0.95, 2], + "to": [14, 12, 14], + "faces": { + "up": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#gearbox"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json index 5dafd92af..843792b2e 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_extended.json @@ -48,7 +48,7 @@ }, { "from": [1.95, -3, 6], - "to": [14.05, 10, 0], + "to": [14.05, 10.05, 0], "faces": { "east": {"uv": [13, 6, 16, 12.5], "rotation": 180, "texture": "#base"}, "west": {"uv": [13, 8.5, 16, 16], "texture": "#base"}, @@ -68,8 +68,8 @@ }, { "name": "MidExtension", - "from": [2, -2, 6], - "to": [14, 14, 10], + "from": [1.95, -2, 6], + "to": [14.05, 14.05, 10], "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "faces": { "north": {"uv": [0, 0, 8, 6], "rotation": 270, "texture": "#base"}, diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json index e6f21e1a3..722f587ae 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json @@ -73,8 +73,8 @@ }, { "name": "Internal", - "from": [1.95, -3, 19], - "to": [14.05, 10, 13], + "from": [1.9, -3, 19], + "to": [14.1, 10.05, 13], "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, "faces": { "east": {"uv": [13, 16, 16, 9.5], "rotation": 180, "texture": "#base"}, diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json index 3ff98968f..e641f0744 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json @@ -73,8 +73,8 @@ }, { "name": "Internal", - "from": [1.95, -3, 19], - "to": [14.05, 10, 13], + "from": [1.9, -3, 19], + "to": [14.1, 10.05, 13], "rotation": {"angle": -22.5, "axis": "x", "origin": [0, -3, 13]}, "faces": { "east": {"uv": [13, 6, 16, 12.5], "rotation": 180, "texture": "#base"}, diff --git a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json index 3a6426162..f4224ad87 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json @@ -48,7 +48,7 @@ }, { "from": [1.95, -3, 14], - "to": [14.05, 10, 8], + "to": [14.05, 10.05, 8], "faces": { "east": {"uv": [13, 16, 16, 9.5], "rotation": 180, "texture": "#base"}, "west": {"uv": [13, 12.5, 16, 6], "texture": "#base"}, @@ -93,8 +93,8 @@ } }, { - "from": [1, -2, 14], - "to": [15, 15, 15], + "from": [0.95, -2, 14], + "to": [15.05, 15.05, 15], "rotation": {"angle": 0, "axis": "y", "origin": [9, 6, 22]}, "faces": { "east": {"uv": [7, 7.5, 7.5, 16], "texture": "#back"}, diff --git a/src/main/resources/assets/create/models/block/belt_funnel/flap.json b/src/main/resources/assets/create/models/block/belt_funnel/flap.json index 5d4a2a5e7..f1bc4fab5 100644 --- a/src/main/resources/assets/create/models/block/belt_funnel/flap.json +++ b/src/main/resources/assets/create/models/block/belt_funnel/flap.json @@ -6,8 +6,8 @@ "elements": [ { "name": "F4", - "from": [11, -3, 9], - "to": [14, 10, 10], + "from": [10.975, -3, 8.95], + "to": [14.025, 10.05, 9.95], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#4"}, diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json index fe713b69a..153b32516 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/flap.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/flap.json @@ -6,8 +6,8 @@ "elements": [ { "name": "F4", - "from": [11, -3, 1], - "to": [14, 10, 2], + "from": [10.975, -3, 0.95], + "to": [14.025, 10.05, 1.95], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { "north": {"uv": [6, 8, 7.5, 14.5], "texture": "#4"}, diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json index d2e89a95b..e834fe71b 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/straight.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/straight.json @@ -22,8 +22,8 @@ }, { "name": "inner X", - "from": [0, -5, 14], - "to": [16, 16, 2], + "from": [0, -5, 14.05], + "to": [16, 16, 1.95], "faces": { "north": {"uv": [0, 0, 8, 10.5], "texture": "#tunnel"}, "south": {"uv": [0, 0, 8, 10.5], "texture": "#tunnel"} @@ -41,8 +41,8 @@ }, { "name": "inner rim", - "from": [0, 10, 0], - "to": [16, 12, 16], + "from": [0, 10.05, 0], + "to": [16, 12.05, 16], "faces": { "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json b/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json index f482eaf7c..14bdada30 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/t_left.json @@ -22,8 +22,8 @@ }, { "name": "inner X", - "from": [0, -5, 14], - "to": [16, 16, 2], + "from": [0, -5, 14.05], + "to": [16, 16, 1.95], "faces": { "north": {"uv": [0, 0, 8, 10.5], "texture": "#direction"}, "south": {"uv": [0, 0, 8, 10.5], "texture": "#tunnel"} @@ -31,8 +31,8 @@ }, { "name": "inner Z", - "from": [14, -5, 0], - "to": [2, 16, 16], + "from": [14.05, -5, 0], + "to": [1.95, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 24]}, "faces": { "east": {"uv": [0, 5.5, 8, 16], "rotation": 180, "texture": "#direction"}, @@ -41,8 +41,8 @@ }, { "name": "inner rim", - "from": [0, 10, 0], - "to": [16, 12, 16], + "from": [0, 10.05, 0], + "to": [16, 12.05, 16], "faces": { "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json b/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json index 7d7bbbba6..41367296f 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/t_right.json @@ -22,8 +22,8 @@ }, { "name": "inner X", - "from": [0, -5, 14], - "to": [16, 16, 2], + "from": [0, -5, 14.05], + "to": [16, 16, 1.95], "faces": { "north": {"uv": [0, 0, 8, 10.5], "texture": "#tunnel"}, "south": {"uv": [0, 5.5, 8, 16], "rotation": 180, "texture": "#direction"} @@ -31,8 +31,8 @@ }, { "name": "inner Z", - "from": [14, -5, 0], - "to": [2, 16, 16], + "from": [14.05, -5, 0], + "to": [1.95, 16, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 24]}, "faces": { "east": {"uv": [0, 5.5, 8, 16], "rotation": 180, "texture": "#direction"}, @@ -41,8 +41,8 @@ }, { "name": "inner rim", - "from": [0, 10, 0], - "to": [16, 12, 16], + "from": [0, 10.05, 0], + "to": [16, 12.05, 16], "faces": { "down": {"uv": [0, 0, 16, 16], "texture": "#frame"} } diff --git a/src/main/resources/assets/create/models/block/belt_tunnel/window.json b/src/main/resources/assets/create/models/block/belt_tunnel/window.json index ca4473a56..44adf6ce1 100644 --- a/src/main/resources/assets/create/models/block/belt_tunnel/window.json +++ b/src/main/resources/assets/create/models/block/belt_tunnel/window.json @@ -21,8 +21,8 @@ }, { "name": "inner X", - "from": [0, -5, 14], - "to": [16, 16, 2], + "from": [0, -5, 14.05], + "to": [16, 16, 1.95], "faces": { "north": {"uv": [8, 0, 16, 10.5], "texture": "#tunnel"}, "south": {"uv": [8, 0, 16, 10.5], "texture": "#tunnel"} @@ -40,8 +40,8 @@ }, { "name": "inner rim", - "from": [0, 10, 0], - "to": [16, 12, 16], + "from": [0, 10.05, 0], + "to": [16, 12.05, 16], "faces": { "down": {"uv": [0, 4, 8, 12], "texture": "#direction"} } diff --git a/src/main/resources/assets/create/models/block/controls/block_open.json b/src/main/resources/assets/create/models/block/controls/block_open.json index e217883f8..479cce174 100644 --- a/src/main/resources/assets/create/models/block/controls/block_open.json +++ b/src/main/resources/assets/create/models/block/controls/block_open.json @@ -42,7 +42,7 @@ }, { "from": [2, 5, 7], - "to": [14, 13, 15], + "to": [14, 13.05, 15], "faces": { "north": {"uv": [1, 14, 7, 10.05], "rotation": 180, "texture": "#4"}, "up": {"uv": [1, 13.5, 7, 9.55], "texture": "#4"}, diff --git a/src/main/resources/assets/create/models/block/controls/block_virtual.json b/src/main/resources/assets/create/models/block/controls/block_virtual.json index b22cbbd2f..1977a302f 100644 --- a/src/main/resources/assets/create/models/block/controls/block_virtual.json +++ b/src/main/resources/assets/create/models/block/controls/block_virtual.json @@ -75,7 +75,7 @@ }, { "from": [2, 5, 7], - "to": [14, 13, 15], + "to": [14, 13.05, 15], "faces": { "north": {"uv": [1, 14, 7, 10], "rotation": 180, "texture": "#4"}, "up": {"uv": [1, 13.5, 7, 9.5], "texture": "#4"}, diff --git a/src/main/resources/assets/create/models/block/deployer/horizontal.json b/src/main/resources/assets/create/models/block/deployer/horizontal.json index f1bf58939..4af517b80 100644 --- a/src/main/resources/assets/create/models/block/deployer/horizontal.json +++ b/src/main/resources/assets/create/models/block/deployer/horizontal.json @@ -18,17 +18,17 @@ "to": [16, 16, 2], "faces": { "north": {"uv": [0, 16, 16, 0], "rotation": 90, "texture": "#6"}, - "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#gearbox_top"}, + "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#5"}, "south": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#gearbox_top"}, - "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#gearbox_top"}, + "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#andesite_casing_short"}, "up": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#andesite_casing_short"}, "down": {"uv": [0, 14, 16, 16], "texture": "#andesite_casing_short"} } }, { "name": "Inner", - "from": [1, 2, 2], - "to": [15, 14, 12], + "from": [0.95, 2, 2], + "to": [15.05, 14, 12], "faces": { "north": {"uv": [0, 0, 12, 14], "rotation": 270, "texture": "#gearbox"}, "east": {"uv": [2, 4, 14, 14], "rotation": 270, "texture": "#gearbox"}, @@ -41,9 +41,9 @@ "from": [0, 0, 2], "to": [16, 2, 12], "faces": { - "east": {"uv": [16, 0, 14, 10], "rotation": 270, "texture": "#gearbox_top"}, + "east": {"uv": [0, 4, 2, 14], "rotation": 270, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 2], "texture": "#andesite_casing_short"}, - "west": {"uv": [14, 0, 16, 10], "rotation": 90, "texture": "#gearbox_top"}, + "west": {"uv": [14, 4, 16, 14], "rotation": 90, "texture": "#andesite_casing_short"}, "up": {"uv": [0, 0, 16, 10], "rotation": 180, "texture": "#gearbox_top"}, "down": {"uv": [0, 4, 16, 14], "texture": "#5"} } @@ -53,9 +53,9 @@ "from": [0, 14, 2], "to": [16, 16, 12], "faces": { - "east": {"uv": [14, 0, 16, 10], "rotation": 270, "texture": "#gearbox_top"}, + "east": {"uv": [14, 4, 16, 14], "rotation": 270, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#andesite_casing_short"}, - "west": {"uv": [16, 0, 14, 10], "rotation": 90, "texture": "#gearbox_top"}, + "west": {"uv": [0, 4, 2, 14], "rotation": 90, "texture": "#andesite_casing_short"}, "up": {"uv": [0, 4, 16, 14], "rotation": 180, "texture": "#5"}, "down": {"uv": [0, 0, 16, 10], "texture": "#gearbox_top"} } diff --git a/src/main/resources/assets/create/models/block/deployer/vertical.json b/src/main/resources/assets/create/models/block/deployer/vertical.json index d08683aca..e9322b7a4 100644 --- a/src/main/resources/assets/create/models/block/deployer/vertical.json +++ b/src/main/resources/assets/create/models/block/deployer/vertical.json @@ -21,14 +21,14 @@ "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#gearbox_top"}, "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#andesite_casing_short"}, - "up": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#gearbox_top"}, - "down": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"} + "up": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "down": {"uv": [0, 14, 16, 16], "texture": "#andesite_casing_short"} } }, { "name": "Inner", - "from": [2, 1, 2], - "to": [14, 15, 12], + "from": [2, 0.95, 2], + "to": [14, 15.05, 12], "faces": { "north": {"uv": [0, 0, 12, 14], "texture": "#gearbox"}, "south": {"uv": [2, 1, 14, 15], "texture": "#7"}, @@ -44,8 +44,8 @@ "east": {"uv": [0, 4, 16, 14], "rotation": 270, "texture": "#5"}, "south": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#andesite_casing_short"}, "west": {"uv": [0, 0, 16, 10], "rotation": 90, "texture": "#gearbox_top"}, - "up": {"uv": [16, 0, 14, 10], "rotation": 180, "texture": "#gearbox_top"}, - "down": {"uv": [14, 0, 16, 10], "texture": "#gearbox_top"} + "up": {"uv": [0, 4, 2, 14], "rotation": 180, "texture": "#andesite_casing_short"}, + "down": {"uv": [14, 4, 16, 14], "texture": "#andesite_casing_short"} } }, { @@ -56,8 +56,8 @@ "east": {"uv": [0, 0, 16, 10], "rotation": 270, "texture": "#gearbox_top"}, "south": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#andesite_casing_short"}, "west": {"uv": [0, 4, 16, 14], "rotation": 90, "texture": "#5"}, - "up": {"uv": [14, 2, 16, 12], "rotation": 180, "texture": "#gearbox_top"}, - "down": {"uv": [16, 0, 14, 10], "texture": "#gearbox_top"} + "up": {"uv": [14, 4, 16, 14], "rotation": 180, "texture": "#andesite_casing_short"}, + "down": {"uv": [0, 4, 2, 14], "texture": "#andesite_casing_short"} } } ], diff --git a/src/main/resources/assets/create/models/block/depot/block.json b/src/main/resources/assets/create/models/block/depot/block.json index 85bde5e9f..e95d7d785 100644 --- a/src/main/resources/assets/create/models/block/depot/block.json +++ b/src/main/resources/assets/create/models/block/depot/block.json @@ -22,8 +22,8 @@ } }, { - "from": [1, 11, 1], - "to": [15, 13, 15], + "from": [0.95, 11, 0.95], + "to": [15.05, 13, 15.05], "rotation": {"angle": 0, "axis": "y", "origin": [9, -2, 9]}, "faces": { "north": {"uv": [1, 14, 15, 16], "texture": "#2"}, diff --git a/src/main/resources/assets/create/models/block/elevator_contact/block.json b/src/main/resources/assets/create/models/block/elevator_contact/block.json index 6ced587e7..bc50e32f8 100644 --- a/src/main/resources/assets/create/models/block/elevator_contact/block.json +++ b/src/main/resources/assets/create/models/block/elevator_contact/block.json @@ -11,7 +11,7 @@ { "name": "Center", "from": [2, 0, 2], - "to": [14, 15, 14], + "to": [14, 15.05, 14], "faces": { "up": {"uv": [2, 2, 14, 14], "texture": "#0"}, "down": {"uv": [2, 2, 14, 14], "texture": "#3"} diff --git a/src/main/resources/assets/create/models/block/encased_fan/block.json b/src/main/resources/assets/create/models/block/encased_fan/block.json index f29406b6c..3a72c94e6 100644 --- a/src/main/resources/assets/create/models/block/encased_fan/block.json +++ b/src/main/resources/assets/create/models/block/encased_fan/block.json @@ -22,8 +22,8 @@ } }, { - "from": [1.9, 16, 1.9], - "to": [14.1, 0, 14.1], + "from": [1.95, 16, 1.95], + "to": [14.05, 0, 14.05], "faces": { "north": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"}, "east": {"uv": [2, 0, 14, 16], "rotation": 180, "texture": "#fan_side"}, @@ -32,16 +32,16 @@ } }, { - "from": [2, 1, 2], - "to": [14, 8, 14], + "from": [1.95, 0.95, 1.95], + "to": [14.05, 8.05, 14.05], "faces": { "up": {"uv": [2, 2, 14, 14], "texture": "#back"}, "down": {"uv": [2, 2, 14, 14], "texture": "#back"} } }, { - "from": [2, 15, 2], - "to": [14, 15, 14], + "from": [2, 14.95, 2], + "to": [14, 15.1, 14], "faces": { "up": {"uv": [2, 2, 14, 14], "texture": "#fan_casing"}, "down": {"uv": [2, 2, 14, 14], "texture": "#fan_casing"} diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json index 54b091e49..d255e487c 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window.json @@ -16,7 +16,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "north"}, + "east": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "north"}, "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"} } }, @@ -26,7 +26,7 @@ "to": [16, 16, 4], "faces": { "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "east"}, + "south": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "east"}, "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"} } }, @@ -37,7 +37,7 @@ "faces": { "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"}, "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "south"} + "west": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "south"} } }, { @@ -45,15 +45,15 @@ "from": [0, 4, 12], "to": [1, 16, 16], "faces": { - "north": {"uv": [12, 0, 13, 12], "texture": "#1", "cullface": "west"}, + "north": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "west"}, "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"}, "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"} } }, { "name": "Window", - "from": [4, 4, 1], - "to": [12, 16, 1], + "from": [4, 4, 0.95], + "to": [12, 16, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"}, @@ -62,8 +62,8 @@ }, { "name": "Window", - "from": [15, 4, 4], - "to": [15, 16, 12], + "from": [15.05, 4, 4], + "to": [15.05, 16, 12], "faces": { "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"}, "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"} @@ -71,8 +71,8 @@ }, { "name": "Window", - "from": [4, 4, 15], - "to": [12, 16, 15], + "from": [4, 4, 15.05], + "to": [12, 16, 15.05], "faces": { "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"}, "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"} @@ -80,8 +80,8 @@ }, { "name": "Window", - "from": [1, 4, 4], - "to": [1, 16, 12], + "from": [0.95, 4, 4], + "to": [0.95, 16, 12], "faces": { "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"}, "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"} @@ -95,7 +95,7 @@ "faces": { "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"}, "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "north"} + "west": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "north"} } }, { @@ -103,7 +103,7 @@ "from": [15, 4, 12], "to": [16, 16, 16], "faces": { - "north": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "east"}, + "north": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "east"}, "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"}, "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"} } @@ -114,7 +114,7 @@ "to": [4, 16, 16], "faces": { "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "south"}, + "east": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "south"}, "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"} } }, @@ -124,7 +124,7 @@ "to": [1, 16, 4], "faces": { "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [3, 0, 4, 12], "texture": "#1", "cullface": "west"}, + "south": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "west"}, "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"} } }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json index a78d38168..df535c9c1 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_ne.json @@ -15,14 +15,14 @@ "to": [16, 16, 12], "faces": { "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [12, 0, 13, 12], "texture": "#1"}, + "south": {"uv": [4, 0, 5, 12], "texture": "#1"}, "west": {"uv": [0, 0, 12, 12], "texture": "#1"} } }, { "name": "Window", - "from": [0, 4, 1], - "to": [4, 16, 1], + "from": [0, 4, 0.95], + "to": [4, 16, 0.95], "faces": { "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, "south": {"uv": [4, 4, 8, 16], "texture": "#3"} @@ -30,8 +30,8 @@ }, { "name": "Window", - "from": [15, 4, 12], - "to": [15, 16, 16], + "from": [15.05, 4, 12], + "to": [15.05, 16, 16], "faces": { "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, "west": {"uv": [0, 4, 4, 16], "texture": "#3"} @@ -44,7 +44,7 @@ "faces": { "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [3, 0, 4, 12], "texture": "#1"} + "west": {"uv": [11, 0, 12, 12], "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json index e538bd656..eaac7ff0e 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_nw.json @@ -15,14 +15,14 @@ "to": [12, 16, 1], "faces": { "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [12, 0, 13, 12], "texture": "#1"}, + "east": {"uv": [4, 0, 5, 12], "texture": "#1"}, "south": {"uv": [0, 0, 12, 12], "texture": "#1"} } }, { "name": "Window", - "from": [1, 4, 12], - "to": [1, 16, 16], + "from": [0.95, 4, 12], + "to": [0.95, 16, 16], "faces": { "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, "west": {"uv": [0, 4, 4, 16], "texture": "#3"} @@ -30,8 +30,8 @@ }, { "name": "Window", - "from": [12, 4, 1], - "to": [16, 16, 1], + "from": [12, 4, 0.95], + "to": [16, 16, 0.95], "faces": { "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, "south": {"uv": [0, 4, 4, 16], "texture": "#3"} @@ -43,7 +43,7 @@ "to": [1, 16, 12], "faces": { "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [3, 0, 4, 12], "texture": "#1"}, + "south": {"uv": [11, 0, 12, 12], "texture": "#1"}, "west": {"uv": [0, 0, 12, 12], "texture": "#1"} } }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json index d5d893146..b3772ef7a 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_se.json @@ -16,13 +16,13 @@ "faces": { "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [12, 0, 13, 12], "texture": "#1"} + "west": {"uv": [4, 0, 5, 12], "texture": "#1"} } }, { "name": "Window", - "from": [15, 4, 0], - "to": [15, 16, 4], + "from": [15.05, 4, 0], + "to": [15.05, 16, 4], "faces": { "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, "west": {"uv": [4, 4, 8, 16], "texture": "#3"} @@ -30,8 +30,8 @@ }, { "name": "Window", - "from": [0, 4, 15], - "to": [4, 16, 15], + "from": [0, 4, 15.05], + "to": [4, 16, 15.05], "faces": { "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, "south": {"uv": [4, 4, 8, 16], "texture": "#3"} @@ -42,7 +42,7 @@ "from": [15, 4, 4], "to": [16, 16, 16], "faces": { - "north": {"uv": [3, 0, 4, 12], "texture": "#1"}, + "north": {"uv": [11, 0, 12, 12], "texture": "#1"}, "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, "west": {"uv": [4, 0, 16, 12], "texture": "#1"} } diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json index 7d05e454f..d91e8a1e4 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_bottom_window_sw.json @@ -14,15 +14,15 @@ "from": [0, 4, 4], "to": [1, 16, 16], "faces": { - "north": {"uv": [12, 0, 13, 12], "texture": "#1"}, + "north": {"uv": [4, 0, 5, 12], "texture": "#1"}, "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, "west": {"uv": [4, 0, 16, 12], "texture": "#1"} } }, { "name": "Window", - "from": [12, 4, 15], - "to": [16, 16, 15], + "from": [12, 4, 15.05], + "to": [16, 16, 15.05], "faces": { "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, "south": {"uv": [0, 4, 4, 16], "texture": "#3"} @@ -30,8 +30,8 @@ }, { "name": "Window", - "from": [1, 4, 0], - "to": [1, 16, 4], + "from": [0.95, 4, 0], + "to": [0.95, 16, 4], "faces": { "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, "west": {"uv": [4, 4, 8, 16], "texture": "#3"} @@ -43,7 +43,7 @@ "to": [12, 16, 16], "faces": { "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [3, 0, 4, 12], "texture": "#1"}, + "east": {"uv": [11, 0, 12, 12], "texture": "#1"}, "south": {"uv": [0, 0, 12, 12], "texture": "#1"} } }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window.json b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window.json index 5f62b589c..c0b365f15 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window.json @@ -14,7 +14,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "north"}, + "east": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "north"}, "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"} } }, @@ -24,7 +24,7 @@ "to": [16, 16, 4], "faces": { "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "east"}, + "south": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "east"}, "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"} } }, @@ -35,7 +35,7 @@ "faces": { "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"}, "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "south"} + "west": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "south"} } }, { @@ -43,15 +43,15 @@ "from": [0, 0, 12], "to": [1, 16, 16], "faces": { - "north": {"uv": [12, 0, 13, 16], "texture": "#1", "cullface": "west"}, + "north": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "west"}, "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"}, "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"} } }, { "name": "Window", - "from": [4, 0, 1], - "to": [12, 16, 1], + "from": [4, 0, 0.95], + "to": [12, 16, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"}, @@ -60,8 +60,8 @@ }, { "name": "Window", - "from": [15, 0, 4], - "to": [15, 16, 12], + "from": [15.05, 0, 4], + "to": [15.05, 16, 12], "faces": { "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"}, "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"} @@ -69,8 +69,8 @@ }, { "name": "Window", - "from": [4, 0, 15], - "to": [12, 16, 15], + "from": [4, 0, 15.05], + "to": [12, 16, 15.05], "faces": { "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"}, "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"} @@ -78,8 +78,8 @@ }, { "name": "Window", - "from": [1, 0, 4], - "to": [1, 16, 12], + "from": [0.95, 0, 4], + "to": [0.95, 16, 12], "faces": { "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"}, "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"} @@ -93,7 +93,7 @@ "faces": { "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"}, "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "north"} + "west": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "north"} } }, { @@ -101,7 +101,7 @@ "from": [15, 0, 12], "to": [16, 16, 16], "faces": { - "north": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "east"}, + "north": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "east"}, "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"}, "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"} } @@ -112,7 +112,7 @@ "to": [4, 16, 16], "faces": { "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "south"}, + "east": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "south"}, "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"} } }, @@ -122,7 +122,7 @@ "to": [1, 16, 4], "faces": { "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [3, 0, 4, 16], "texture": "#1", "cullface": "west"}, + "south": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "west"}, "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"} } } @@ -131,6 +131,7 @@ { "name": "tank", "origin": [8, 8, -23], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] } ] diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_ne.json b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_ne.json index bca53a94d..351267630 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_ne.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_ne.json @@ -13,14 +13,14 @@ "to": [16, 16, 12], "faces": { "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [12, 0, 13, 16], "texture": "#1"}, + "south": {"uv": [4, 0, 5, 16], "texture": "#1"}, "west": {"uv": [0, 0, 12, 16], "texture": "#1"} } }, { "name": "Window", - "from": [0, 0, 1], - "to": [4, 16, 1], + "from": [0, 0, 0.95], + "to": [4, 16, 0.95], "faces": { "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, "south": {"uv": [12, 0, 16, 16], "texture": "#3"} @@ -28,8 +28,8 @@ }, { "name": "Window", - "from": [15, 0, 12], - "to": [15, 16, 16], + "from": [15.05, 0, 12], + "to": [15.05, 16, 16], "faces": { "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, "west": {"uv": [8, 0, 12, 16], "texture": "#3"} @@ -42,7 +42,7 @@ "faces": { "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [3, 0, 4, 16], "texture": "#1"} + "west": {"uv": [11, 0, 12, 16], "texture": "#1"} } } ], @@ -50,6 +50,7 @@ { "name": "tank", "origin": [8, 8, -23], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_nw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_nw.json index 56e4f161f..6ea7f319c 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_nw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_nw.json @@ -13,14 +13,14 @@ "to": [12, 16, 1], "faces": { "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [12, 0, 13, 16], "texture": "#1"}, + "east": {"uv": [4, 0, 5, 16], "texture": "#1"}, "south": {"uv": [0, 0, 12, 16], "texture": "#1"} } }, { "name": "Window", - "from": [1, 0, 12], - "to": [1, 16, 16], + "from": [0.95, 0, 12], + "to": [0.95, 16, 16], "faces": { "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, "west": {"uv": [8, 0, 12, 16], "texture": "#3"} @@ -28,8 +28,8 @@ }, { "name": "Window", - "from": [12, 0, 1], - "to": [16, 16, 1], + "from": [12, 0, 0.95], + "to": [16, 16, 0.95], "faces": { "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, "south": {"uv": [8, 0, 12, 16], "texture": "#3"} @@ -41,7 +41,7 @@ "to": [1, 16, 12], "faces": { "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, "west": {"uv": [0, 0, 12, 16], "texture": "#1"} } } @@ -50,6 +50,7 @@ { "name": "tank", "origin": [8, 8, -23], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_se.json b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_se.json index 2ae7111a1..763b55f82 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_se.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_se.json @@ -14,13 +14,13 @@ "faces": { "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [12, 0, 13, 16], "texture": "#1"} + "west": {"uv": [4, 0, 5, 16], "texture": "#1"} } }, { "name": "Window", - "from": [15, 0, 0], - "to": [15, 16, 4], + "from": [15.05, 0, 0], + "to": [15.05, 16, 4], "faces": { "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, "west": {"uv": [12, 0, 16, 16], "texture": "#3"} @@ -28,8 +28,8 @@ }, { "name": "Window", - "from": [0, 0, 15], - "to": [4, 16, 15], + "from": [0, 0, 15.05], + "to": [4, 16, 15.05], "faces": { "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, "south": {"uv": [12, 0, 16, 16], "texture": "#3"} @@ -40,7 +40,7 @@ "from": [15, 0, 4], "to": [16, 16, 16], "faces": { - "north": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "north": {"uv": [11, 0, 12, 16], "texture": "#1"}, "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, "west": {"uv": [4, 0, 16, 16], "texture": "#1"} } @@ -50,6 +50,7 @@ { "name": "tank", "origin": [8, 8, -23], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_sw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_sw.json index 44ff9e1a0..6ab4f02c6 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_sw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_middle_window_sw.json @@ -12,15 +12,15 @@ "from": [0, 0, 4], "to": [1, 16, 16], "faces": { - "north": {"uv": [12, 0, 13, 16], "texture": "#1"}, + "north": {"uv": [4, 0, 5, 16], "texture": "#1"}, "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, "west": {"uv": [4, 0, 16, 16], "texture": "#1"} } }, { "name": "Window", - "from": [12, 0, 15], - "to": [16, 16, 15], + "from": [12, 0, 15.05], + "to": [16, 16, 15.05], "faces": { "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, "south": {"uv": [8, 0, 12, 16], "texture": "#3"} @@ -28,8 +28,8 @@ }, { "name": "Window", - "from": [1, 0, 0], - "to": [1, 16, 4], + "from": [0.95, 0, 0], + "to": [0.95, 16, 4], "faces": { "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, "west": {"uv": [12, 0, 16, 16], "texture": "#3"} @@ -41,7 +41,7 @@ "to": [12, 16, 16], "faces": { "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [3, 0, 4, 16], "texture": "#1"}, + "east": {"uv": [11, 0, 12, 16], "texture": "#1"}, "south": {"uv": [0, 0, 12, 16], "texture": "#1"} } } @@ -50,6 +50,7 @@ { "name": "tank", "origin": [8, 8, -23], + "color": 0, "children": [0, 1, 2, 3] } ] diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json index 2d49277a9..e310b9c5e 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window.json @@ -30,7 +30,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "north"}, + "east": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "north"}, "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"} } }, @@ -40,7 +40,7 @@ "to": [16, 12, 4], "faces": { "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "east"}, + "south": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "east"}, "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"} } }, @@ -51,7 +51,7 @@ "faces": { "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"}, "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "south"} + "west": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "south"} } }, { @@ -59,15 +59,15 @@ "from": [0, 4, 12], "to": [1, 12, 16], "faces": { - "north": {"uv": [12, 4, 13, 12], "texture": "#1", "cullface": "west"}, + "north": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "west"}, "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"}, "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"} } }, { "name": "Window", - "from": [4, 4, 1], - "to": [12, 12, 1], + "from": [4, 4, 0.95], + "to": [12, 12, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"}, @@ -76,8 +76,8 @@ }, { "name": "Window", - "from": [15, 4, 4], - "to": [15, 12, 12], + "from": [15.05, 4, 4], + "to": [15.05, 12, 12], "faces": { "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"}, "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"} @@ -85,8 +85,8 @@ }, { "name": "Window", - "from": [4, 4, 15], - "to": [12, 12, 15], + "from": [4, 4, 15.05], + "to": [12, 12, 15.05], "faces": { "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"}, "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"} @@ -94,8 +94,8 @@ }, { "name": "Window", - "from": [1, 4, 4], - "to": [1, 12, 12], + "from": [0.95, 4, 4], + "to": [0.95, 12, 12], "faces": { "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"}, "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"} @@ -109,7 +109,7 @@ "faces": { "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"}, "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "north"} + "west": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "north"} } }, { @@ -117,7 +117,7 @@ "from": [15, 4, 12], "to": [16, 12, 16], "faces": { - "north": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "east"}, + "north": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "east"}, "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"}, "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"} } @@ -128,7 +128,7 @@ "to": [4, 12, 16], "faces": { "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "south"}, + "east": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "south"}, "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"} } }, @@ -138,7 +138,7 @@ "to": [1, 12, 4], "faces": { "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [3, 4, 4, 12], "texture": "#1", "cullface": "west"}, + "south": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "west"}, "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"} } }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json index 63f80f0ed..90c529e92 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_ne.json @@ -16,14 +16,14 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [12, 4, 13, 12], "texture": "#1"}, + "south": {"uv": [4, 4, 5, 12], "texture": "#1"}, "west": {"uv": [0, 4, 12, 12], "texture": "#1"} } }, { "name": "Window", - "from": [0, 4, 1], - "to": [4, 12, 1], + "from": [0, 4, 0.95], + "to": [4, 12, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [15, 4, 12], - "to": [15, 12, 16], + "from": [15.05, 4, 12], + "to": [15.05, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, @@ -48,7 +48,7 @@ "faces": { "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [3, 4, 4, 12], "texture": "#1"} + "west": {"uv": [11, 4, 12, 12], "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json index 7c09e1e5b..2aaba7d6b 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_nw.json @@ -16,14 +16,14 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [12, 4, 13, 12], "texture": "#1"}, + "east": {"uv": [4, 4, 5, 12], "texture": "#1"}, "south": {"uv": [0, 4, 12, 12], "texture": "#1"} } }, { "name": "Window", - "from": [1, 4, 12], - "to": [1, 12, 16], + "from": [0.95, 4, 12], + "to": [0.95, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [12, 4, 1], - "to": [16, 12, 1], + "from": [12, 4, 0.95], + "to": [16, 12, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, @@ -47,7 +47,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [3, 4, 4, 12], "texture": "#1"}, + "south": {"uv": [11, 4, 12, 12], "texture": "#1"}, "west": {"uv": [0, 4, 12, 12], "texture": "#1"} } }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json index 66c7fedee..0550d1248 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_se.json @@ -17,13 +17,13 @@ "faces": { "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [12, 4, 13, 12], "texture": "#1"} + "west": {"uv": [4, 4, 5, 12], "texture": "#1"} } }, { "name": "Window", - "from": [15, 4, 0], - "to": [15, 12, 4], + "from": [15.05, 4, 0], + "to": [15.05, 12, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [0, 4, 15], - "to": [4, 12, 15], + "from": [0, 4, 15.05], + "to": [4, 12, 15.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, @@ -46,7 +46,7 @@ "to": [16, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { - "north": {"uv": [3, 4, 4, 12], "texture": "#1"}, + "north": {"uv": [11, 4, 12, 12], "texture": "#1"}, "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, "west": {"uv": [4, 4, 16, 12], "texture": "#1"} } diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json index cb3f29c79..ec9958080 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_single_window_sw.json @@ -15,15 +15,15 @@ "to": [1, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { - "north": {"uv": [12, 4, 13, 12], "texture": "#1"}, + "north": {"uv": [4, 4, 5, 12], "texture": "#1"}, "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, "west": {"uv": [4, 4, 16, 12], "texture": "#1"} } }, { "name": "Window", - "from": [12, 4, 15], - "to": [16, 12, 15], + "from": [12, 4, 15.05], + "to": [16, 12, 15.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [1, 4, 0], - "to": [1, 12, 4], + "from": [0.95, 4, 0], + "to": [0.95, 12, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, @@ -47,7 +47,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [3, 4, 4, 12], "texture": "#1"}, + "east": {"uv": [11, 4, 12, 12], "texture": "#1"}, "south": {"uv": [0, 4, 12, 12], "texture": "#1"} } }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json index cd53f57ef..7b837cf08 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window.json @@ -30,7 +30,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "north"}, + "east": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "north"}, "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"} } }, @@ -40,7 +40,7 @@ "to": [16, 12, 4], "faces": { "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "east"}, + "south": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "east"}, "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"} } }, @@ -51,7 +51,7 @@ "faces": { "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"}, "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "south"} + "west": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "south"} } }, { @@ -59,15 +59,15 @@ "from": [0, 0, 12], "to": [1, 12, 16], "faces": { - "north": {"uv": [12, 4, 13, 16], "texture": "#1", "cullface": "west"}, + "north": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "west"}, "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"}, "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"} } }, { "name": "Window", - "from": [4, 0, 1], - "to": [12, 12, 1], + "from": [4, 0, 0.95], + "to": [12, 12, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"}, @@ -76,8 +76,8 @@ }, { "name": "Window", - "from": [15, 0, 4], - "to": [15, 12, 12], + "from": [15.05, 0, 4], + "to": [15.05, 12, 12], "faces": { "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"}, "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"} @@ -85,8 +85,8 @@ }, { "name": "Window", - "from": [4, 0, 15], - "to": [12, 12, 15], + "from": [4, 0, 15.05], + "to": [12, 12, 15.05], "faces": { "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"}, "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"} @@ -94,8 +94,8 @@ }, { "name": "Window", - "from": [1, 0, 4], - "to": [1, 12, 12], + "from": [0.95, 0, 4], + "to": [0.95, 12, 12], "faces": { "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"}, "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"} @@ -109,7 +109,7 @@ "faces": { "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"}, "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "north"} + "west": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "north"} } }, { @@ -117,7 +117,7 @@ "from": [15, 0, 12], "to": [16, 12, 16], "faces": { - "north": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "east"}, + "north": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "east"}, "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"}, "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"} } @@ -128,7 +128,7 @@ "to": [4, 12, 16], "faces": { "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "south"}, + "east": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "south"}, "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"} } }, @@ -138,7 +138,7 @@ "to": [1, 12, 4], "faces": { "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [3, 4, 4, 16], "texture": "#1", "cullface": "west"}, + "south": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "west"}, "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"} } } diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json index a09758c42..26791cb84 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_ne.json @@ -16,14 +16,14 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [12, 4, 13, 16], "texture": "#1"}, + "south": {"uv": [4, 4, 5, 16], "texture": "#1"}, "west": {"uv": [0, 4, 12, 16], "texture": "#1"} } }, { "name": "Window", - "from": [0, 0, 1], - "to": [4, 12, 1], + "from": [0, 0, 0.95], + "to": [4, 12, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [15, 0, 12], - "to": [15, 12, 16], + "from": [15.05, 0, 12], + "to": [15.05, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, @@ -48,7 +48,7 @@ "faces": { "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [3, 4, 4, 16], "texture": "#1"} + "west": {"uv": [11, 4, 12, 16], "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json index 5d8e03a2d..c00c753bc 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_nw.json @@ -16,14 +16,14 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [12, 4, 13, 16], "texture": "#1"}, + "east": {"uv": [4, 4, 5, 16], "texture": "#1"}, "south": {"uv": [0, 4, 12, 16], "texture": "#1"} } }, { "name": "Window", - "from": [1, 0, 12], - "to": [1, 12, 16], + "from": [0.95, 0, 12], + "to": [0.95, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [12, 0, 1], - "to": [16, 12, 1], + "from": [12, 0, 0.95], + "to": [16, 12, 0.95], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, @@ -47,7 +47,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [3, 4, 4, 16], "texture": "#1"}, + "south": {"uv": [11, 4, 12, 16], "texture": "#1"}, "west": {"uv": [0, 4, 12, 16], "texture": "#1"} } }, diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json index 6c9f541fa..85616d16e 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_se.json @@ -17,13 +17,13 @@ "faces": { "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [12, 4, 13, 16], "texture": "#1"} + "west": {"uv": [4, 4, 5, 16], "texture": "#1"} } }, { "name": "Window", - "from": [15, 0, 0], - "to": [15, 12, 4], + "from": [15.05, 0, 0], + "to": [15.05, 12, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [0, 0, 15], - "to": [4, 12, 15], + "from": [0, 0, 15.05], + "to": [4, 12, 15.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, @@ -46,7 +46,7 @@ "to": [16, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { - "north": {"uv": [3, 4, 4, 16], "texture": "#1"}, + "north": {"uv": [11, 4, 12, 16], "texture": "#1"}, "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, "west": {"uv": [4, 4, 16, 16], "texture": "#1"} } diff --git a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json index 77dbb3982..ed8c3da61 100644 --- a/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json +++ b/src/main/resources/assets/create/models/block/fluid_tank/block_top_window_sw.json @@ -15,15 +15,15 @@ "to": [1, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { - "north": {"uv": [12, 4, 13, 16], "texture": "#1"}, + "north": {"uv": [4, 4, 5, 16], "texture": "#1"}, "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, "west": {"uv": [4, 4, 16, 16], "texture": "#1"} } }, { "name": "Window", - "from": [12, 0, 15], - "to": [16, 12, 15], + "from": [12, 0, 15.05], + "to": [16, 12, 15.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, @@ -32,8 +32,8 @@ }, { "name": "Window", - "from": [1, 0, 0], - "to": [1, 12, 4], + "from": [0.95, 0, 0], + "to": [0.95, 12, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, @@ -47,7 +47,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, "faces": { "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [3, 4, 4, 16], "texture": "#1"}, + "east": {"uv": [11, 4, 12, 16], "texture": "#1"}, "south": {"uv": [0, 4, 12, 16], "texture": "#1"} } }, diff --git a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json index 1ebed7ae6..42a525dc0 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_horizontal.json +++ b/src/main/resources/assets/create/models/block/funnel/block_horizontal.json @@ -73,7 +73,7 @@ }, { "from": [1.9, 0, 18], - "to": [14.1, 10, 12], + "to": [14.1, 10.05, 12], "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0, 12]}, "faces": { "east": {"uv": [13, 6, 16, 11], "rotation": 180, "texture": "#base"}, diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical.json b/src/main/resources/assets/create/models/block/funnel/block_vertical.json index 00e28abdb..bee49ffc8 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical.json @@ -23,33 +23,33 @@ } }, { - "from": [1, 5, 2], - "to": [2, 10, 14], - "rotation": {"angle": 22.5, "axis": "z", "origin": [2, 10, 8]}, + "from": [0.95, 5, 2], + "to": [1.95, 10, 14], + "rotation": {"angle": 22.5, "axis": "z", "origin": [1.95, 10, 8]}, "faces": { "east": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { - "from": [14, 5, 2], - "to": [15, 10, 14], - "rotation": {"angle": -22.5, "axis": "z", "origin": [14, 10, 8]}, + "from": [14.05, 5, 2], + "to": [15.05, 10, 14], + "rotation": {"angle": -22.5, "axis": "z", "origin": [14.05, 10, 8]}, "faces": { "west": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { - "from": [2, 5, 14], - "to": [14, 10, 15], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 14]}, + "from": [2, 5, 14.05], + "to": [14, 10, 15.05], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 14.05]}, "faces": { "north": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { - "from": [2, 5, 1], - "to": [14, 10, 2], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 10, 2]}, + "from": [2, 5, 0.95], + "to": [14, 10, 1.95], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 10, 1.95]}, "faces": { "south": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } diff --git a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json index 613405f69..7a7592825 100644 --- a/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json +++ b/src/main/resources/assets/create/models/block/funnel/block_vertical_filterless.json @@ -23,33 +23,33 @@ } }, { - "from": [1, 5, 2], - "to": [2, 10, 14], - "rotation": {"angle": 22.5, "axis": "z", "origin": [2, 10, 8]}, + "from": [0.95, 5, 2], + "to": [1.95, 10, 14], + "rotation": {"angle": 22.5, "axis": "z", "origin": [1.95, 10, 8]}, "faces": { "east": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { - "from": [14, 5, 2], - "to": [15, 10, 14], - "rotation": {"angle": -22.5, "axis": "z", "origin": [14, 10, 8]}, + "from": [14.05, 5, 2], + "to": [15.05, 10, 14], + "rotation": {"angle": -22.5, "axis": "z", "origin": [14.05, 10, 8]}, "faces": { "west": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { - "from": [2, 5, 14], - "to": [14, 10, 15], - "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 14]}, + "from": [2, 5, 14.05], + "to": [14, 10, 15.05], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10, 14.05]}, "faces": { "north": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } }, { - "from": [2, 5, 1], - "to": [14, 10, 2], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 10, 2]}, + "from": [2, 5, 0.95], + "to": [14, 10, 1.95], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 10, 1.95]}, "faces": { "south": {"uv": [12, 0, 14.5, 6], "rotation": 90, "texture": "#base"} } diff --git a/src/main/resources/assets/create/models/block/funnel/flap.json b/src/main/resources/assets/create/models/block/funnel/flap.json index 3179cbdac..bbf33e38c 100644 --- a/src/main/resources/assets/create/models/block/funnel/flap.json +++ b/src/main/resources/assets/create/models/block/funnel/flap.json @@ -6,8 +6,8 @@ "elements": [ { "name": "F4", - "from": [11, 0, 9], - "to": [14, 10, 10], + "from": [10.975, 0, 9], + "to": [14.025, 10, 10], "rotation": {"angle": 0, "axis": "y", "origin": [-24.5, -7.5, 9]}, "faces": { "north": {"uv": [6, 9.5, 7.5, 14.5], "texture": "#4"}, diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json b/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json index 879831f7b..d45ac4f84 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/horizontal.json @@ -52,8 +52,8 @@ }, { "name": "Core", - "from": [1, 1, 2], - "to": [15, 15, 12], + "from": [0.95, 1, 2], + "to": [15.2, 15, 12], "faces": { "north": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#opening"}, "east": {"uv": [1, 4, 15, 14], "rotation": 270, "texture": "#opening"}, diff --git a/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json b/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json index c337440d7..00354d961 100644 --- a/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json +++ b/src/main/resources/assets/create/models/block/gantry_carriage/vertical.json @@ -52,8 +52,8 @@ }, { "name": "Core", - "from": [1, 1, 2], - "to": [15, 15, 12], + "from": [1, 0.95, 2], + "to": [15, 15.05, 12], "faces": { "north": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#opening"}, "east": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#opening"}, diff --git a/src/main/resources/assets/create/models/block/gauge/base.json b/src/main/resources/assets/create/models/block/gauge/base.json index 00db43e7e..6ea216f22 100644 --- a/src/main/resources/assets/create/models/block/gauge/base.json +++ b/src/main/resources/assets/create/models/block/gauge/base.json @@ -8,8 +8,8 @@ "elements": [ { "name": "GaugeBody", - "from": [2, 2, 1], - "to": [14, 14, 15], + "from": [1.95, 2, 0.95], + "to": [14.05, 14, 15.05], "faces": { "north": {"uv": [0, 10, 6, 16], "texture": "#2"}, "east": {"uv": [9, 10, 16, 16], "texture": "#2"}, diff --git a/src/main/resources/assets/create/models/block/gauge/base_wall.json b/src/main/resources/assets/create/models/block/gauge/base_wall.json index 32a8003ba..efd0a1be5 100644 --- a/src/main/resources/assets/create/models/block/gauge/base_wall.json +++ b/src/main/resources/assets/create/models/block/gauge/base_wall.json @@ -8,8 +8,8 @@ "elements": [ { "name": "GaugeBody", - "from": [2, 2, 1], - "to": [14, 14, 15], + "from": [2, 1.95, 0.95], + "to": [14, 14.05, 15.05], "faces": { "north": {"uv": [0, 10, 6, 16], "texture": "#2"}, "east": {"uv": [9, 10, 16, 16], "texture": "#2"}, diff --git a/src/main/resources/assets/create/models/block/gearbox/block.json b/src/main/resources/assets/create/models/block/gearbox/block.json index e3fe13736..0e67eb0a2 100644 --- a/src/main/resources/assets/create/models/block/gearbox/block.json +++ b/src/main/resources/assets/create/models/block/gearbox/block.json @@ -22,8 +22,8 @@ }, { "name": "Core", - "from": [1, 2, 1], - "to": [15, 14, 15], + "from": [0.95, 2, 0.95], + "to": [15.05, 14, 15.05], "faces": { "north": {"uv": [1, 2, 15, 14], "texture": "#1"}, "east": {"uv": [1, 2, 15, 14], "texture": "#1"}, diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/block.json b/src/main/resources/assets/create/models/block/mechanical_drill/block.json index 3308bbdd7..807965b16 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/block.json @@ -11,8 +11,8 @@ "elements": [ { "name": "Body", - "from": [2, 1, 2], - "to": [14, 9, 14], + "from": [2, 0.95, 2], + "to": [14, 9.05, 14], "faces": { "up": {"uv": [2, 2, 14, 14], "texture": "#4"}, "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#gearbox"} diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/head.json b/src/main/resources/assets/create/models/block/mechanical_drill/head.json index a29a6203f..23d80c50e 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/head.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/head.json @@ -27,25 +27,11 @@ "to": [11, 11, 12], "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "east": {"uv": [0, 0, 6, 3], "rotation": 270, "texture": "#10"}, + "east": {"uv": [1, 1, 7, 4], "rotation": 270, "texture": "#10"}, "south": {"uv": [5, 0, 11, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 3], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 0, 6, 3], "rotation": 180, "texture": "#10"}, - "down": {"uv": [0, 0, 6, 3], "texture": "#10"} - } - }, - { - "name": "Top", - "from": [6, 11, 9], - "to": [10, 13, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, - "east": {"uv": [0, 1, 4, 3], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, - "west": {"uv": [0, 1, 4, 3], "texture": "#10"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#10"} + "west": {"uv": [1, 1, 7, 4], "rotation": 90, "texture": "#10"}, + "up": {"uv": [1, 1, 7, 4], "rotation": 180, "texture": "#10"}, + "down": {"uv": [1, 1, 7, 4], "texture": "#10"} } }, { @@ -55,39 +41,53 @@ "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, - "east": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, - "west": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, + "east": {"uv": [0, 3, 4, 1], "rotation": 180, "texture": "#10"}, + "south": {"uv": [16, 4, 14, 0], "rotation": 90, "texture": "#10"}, + "west": {"uv": [4, 3, 0, 1], "rotation": 180, "texture": "#10"}, "up": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"} + "down": {"uv": [4, 4, 0, 0], "rotation": 90, "texture": "#10"} } }, { - "name": "Left", - "from": [3, 6, 9], - "to": [5, 10, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "up": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"}, - "down": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"} - } - }, - { - "name": "Right", + "name": "Bottom", "from": [11, 6, 9], "to": [13, 10, 13], "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "up": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"}, - "down": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"} + "north": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#10"}, + "east": {"uv": [4, 4, 0, 0], "texture": "#10"}, + "south": {"uv": [16, 4, 14, 0], "texture": "#10"}, + "west": {"uv": [0, 0, 4, 4], "rotation": 270, "texture": "#10"}, + "up": {"uv": [0, 3, 4, 1], "rotation": 90, "texture": "#10"}, + "down": {"uv": [4, 3, 0, 1], "rotation": 90, "texture": "#10"} + } + }, + { + "name": "Bottom", + "from": [6, 11, 9], + "to": [10, 13, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#10"}, + "east": {"uv": [4, 3, 0, 1], "texture": "#10"}, + "south": {"uv": [16, 4, 14, 0], "rotation": 270, "texture": "#10"}, + "west": {"uv": [0, 3, 4, 1], "texture": "#10"}, + "up": {"uv": [4, 4, 0, 0], "rotation": 270, "texture": "#10"}, + "down": {"uv": [0, 0, 4, 4], "rotation": 180, "texture": "#10"} + } + }, + { + "name": "Bottom", + "from": [3, 6, 9], + "to": [5, 10, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#10"}, + "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"}, + "south": {"uv": [16, 4, 14, 0], "rotation": 180, "texture": "#10"}, + "west": {"uv": [4, 4, 0, 0], "rotation": 180, "texture": "#10"}, + "up": {"uv": [4, 3, 0, 1], "rotation": 270, "texture": "#10"}, + "down": {"uv": [0, 3, 4, 1], "rotation": 270, "texture": "#10"} } }, { diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json index 2ddf55f1b..93116acf7 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block.json @@ -26,8 +26,8 @@ }, { "name": "Inner", - "from": [2, 2, 1], - "to": [14, 12, 15], + "from": [2, 2, 0.95], + "to": [14, 12, 15.05], "faces": { "north": {"uv": [2, 4, 14, 14], "texture": "#2"}, "south": {"uv": [2, 4, 14, 14], "texture": "#2"}, @@ -41,7 +41,7 @@ "faces": { "north": {"uv": [14, 4, 16, 14], "texture": "#0"}, "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, - "south": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 2, 14], "texture": "#0"}, "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, "up": {"uv": [0, 2, 16, 0], "rotation": 270, "texture": "#0"} } @@ -51,7 +51,7 @@ "from": [14, 2, 0], "to": [16, 12, 16], "faces": { - "north": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "north": {"uv": [0, 4, 2, 14], "texture": "#0"}, "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, "south": {"uv": [14, 4, 16, 14], "texture": "#0"}, "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json index afc0e3f79..ec769a464 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/extended/block_rotated.json @@ -26,8 +26,8 @@ }, { "name": "Inner", - "from": [1, 2, 2], - "to": [15, 12, 14], + "from": [0.95, 2, 2], + "to": [15.05, 12, 14], "faces": { "east": {"uv": [2, 4, 14, 14], "texture": "#2"}, "west": {"uv": [2, 4, 14, 14], "texture": "#2"}, @@ -42,7 +42,7 @@ "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, "east": {"uv": [14, 4, 16, 14], "texture": "#0"}, "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, - "west": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 14], "texture": "#0"}, "up": {"uv": [0, 2, 16, 0], "texture": "#0"} } }, @@ -52,7 +52,7 @@ "to": [16, 12, 16], "faces": { "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, - "east": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 2, 14], "texture": "#0"}, "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, "west": {"uv": [14, 4, 16, 14], "texture": "#0"}, "up": {"uv": [0, 0, 16, 2], "texture": "#0"} diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json index 25a49ee70..7c0328cb3 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block.json @@ -6,6 +6,7 @@ "1": "create:block/piston_bottom", "2": "create:block/gearbox", "3": "create:block/piston_inner", + "4": "create:block/andesite_casing", "particle": "create:block/andesite_casing_piston" }, "elements": [ @@ -18,14 +19,14 @@ "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { "name": "Inner", - "from": [2, 2, 1], - "to": [14, 12, 15], + "from": [2, 2, 0.95], + "to": [14, 12, 15.05], "faces": { "north": {"uv": [2, 4, 14, 14], "texture": "#2"}, "south": {"uv": [2, 4, 14, 14], "texture": "#2"}, @@ -40,7 +41,7 @@ "faces": { "north": {"uv": [14, 4, 16, 14], "texture": "#0"}, "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, - "south": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "south": {"uv": [0, 4, 2, 14], "texture": "#0"}, "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, "up": {"uv": [0, 2, 16, 0], "rotation": 270, "texture": "#0"} } @@ -50,7 +51,7 @@ "from": [14, 2, 0], "to": [16, 12, 16], "faces": { - "north": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "north": {"uv": [0, 4, 2, 14], "texture": "#0"}, "east": {"uv": [0, 4, 16, 14], "texture": "#0"}, "south": {"uv": [14, 4, 16, 14], "texture": "#0"}, "west": {"uv": [0, 4, 16, 14], "texture": "#0"}, diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json index 0a32c01ec..524cb6565 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/moving/block_rotated.json @@ -6,6 +6,7 @@ "1": "create:block/piston_bottom", "2": "create:block/gearbox", "3": "create:block/piston_inner", + "4": "create:block/andesite_casing", "particle": "create:block/andesite_casing_piston" }, "elements": [ @@ -18,14 +19,14 @@ "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { "name": "Inner", - "from": [1, 2, 2], - "to": [15, 12, 14], + "from": [0.95, 2, 2], + "to": [15.05, 12, 14], "faces": { "east": {"uv": [2, 4, 14, 14], "texture": "#2"}, "west": {"uv": [2, 4, 14, 14], "texture": "#2"}, @@ -40,7 +41,7 @@ "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, "east": {"uv": [14, 4, 16, 14], "texture": "#0"}, "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, - "west": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "west": {"uv": [0, 4, 2, 14], "texture": "#0"}, "up": {"uv": [0, 2, 16, 0], "texture": "#0"} } }, @@ -50,7 +51,7 @@ "to": [16, 12, 16], "faces": { "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, - "east": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 2, 14], "texture": "#0"}, "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, "west": {"uv": [14, 4, 16, 14], "texture": "#0"}, "up": {"uv": [0, 0, 16, 2], "texture": "#0"} diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json index d1196dda0..4770e4905 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block.json @@ -16,18 +16,18 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "north": {"uv": [0, 14, 16, 16], "texture": "#6"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#6"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#6"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#6"}, "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { "name": "Inner", - "from": [2, 2, 1], - "to": [14, 12, 15], + "from": [2, 2, 0.95], + "to": [14, 12, 15.05], "faces": { "north": {"uv": [2, 4, 14, 14], "texture": "#2"}, "south": {"uv": [2, 4, 14, 14], "texture": "#2"}, @@ -39,9 +39,9 @@ "from": [0, 2, 0], "to": [2, 12, 16], "faces": { - "north": {"uv": [14, 0, 16, 10], "texture": "#0"}, + "north": {"uv": [14, 4, 16, 14], "texture": "#6"}, "east": {"uv": [0, 4, 16, 14], "texture": "#6"}, - "south": {"uv": [0, 0, 2, 10], "texture": "#0"}, + "south": {"uv": [0, 4, 2, 14], "texture": "#6"}, "west": {"uv": [0, 4, 16, 14], "texture": "#6"} } }, @@ -50,9 +50,9 @@ "from": [14, 2, 0], "to": [16, 12, 16], "faces": { - "north": {"uv": [0, 0, 2, 10], "texture": "#0"}, + "north": {"uv": [0, 4, 2, 14], "texture": "#6"}, "east": {"uv": [0, 4, 16, 14], "texture": "#6"}, - "south": {"uv": [14, 0, 16, 10], "texture": "#0"}, + "south": {"uv": [14, 4, 16, 14], "texture": "#6"}, "west": {"uv": [0, 4, 16, 14], "texture": "#6"} } }, diff --git a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json index dfe772819..df92e91ce 100644 --- a/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json +++ b/src/main/resources/assets/create/models/block/mechanical_piston/normal/block_rotated.json @@ -24,8 +24,8 @@ }, { "name": "Inner", - "from": [1, 2, 2], - "to": [15, 12, 14], + "from": [0.95, 2, 2], + "to": [15.05, 12, 14], "faces": { "east": {"uv": [2, 4, 14, 14], "texture": "#2"}, "west": {"uv": [2, 4, 14, 14], "texture": "#2"} @@ -48,7 +48,7 @@ "to": [16, 12, 16], "faces": { "north": {"uv": [0, 4, 16, 14], "texture": "#0"}, - "east": {"uv": [16, 4, 14, 14], "texture": "#0"}, + "east": {"uv": [0, 4, 2, 14], "texture": "#0"}, "south": {"uv": [0, 4, 16, 14], "texture": "#0"}, "west": {"uv": [14, 4, 16, 14], "texture": "#0"} } diff --git a/src/main/resources/assets/create/models/block/mechanical_press/block.json b/src/main/resources/assets/create/models/block/mechanical_press/block.json index 113f7348d..be732fd86 100644 --- a/src/main/resources/assets/create/models/block/mechanical_press/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_press/block.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "textures": { "4": "create:block/mechanical_press_side", - "gearbox_top": "create:block/gearbox_top", "particle": "create:block/mechanical_press_side", + "gearbox_top": "create:block/gearbox_top", "gearbox": "create:block/gearbox", "mechanical_press_top": "create:block/mechanical_press_top", "mechanical_press_bottom": "create:block/mechanical_press_bottom" @@ -24,8 +24,8 @@ }, { "name": "Core", - "from": [2, 4, 1], - "to": [14, 14, 15], + "from": [2, 4, 0.95], + "to": [14, 14, 15.05], "faces": { "north": {"uv": [2, 2, 14, 12], "texture": "#gearbox"}, "south": {"uv": [2, 2, 14, 12], "texture": "#gearbox"}, diff --git a/src/main/resources/assets/create/models/block/mechanical_press/head.json b/src/main/resources/assets/create/models/block/mechanical_press/head.json index 2f38fe009..43b0ebca3 100644 --- a/src/main/resources/assets/create/models/block/mechanical_press/head.json +++ b/src/main/resources/assets/create/models/block/mechanical_press/head.json @@ -1,87 +1,87 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "mechanical_press_head": "create:block/mechanical_press_head", - "mechanical_press_pole": "create:block/mechanical_press_pole" - }, - "elements": [ - { - "name": "Pole1Core", - "from": [ 6, 4, 6 ], - "to": [ 10, 14, 10 ], - "faces": { - "east": { "texture": "#mechanical_press_pole", "uv": [ 6, 6, 10, 16 ] }, - "west": { "texture": "#mechanical_press_pole", "uv": [ 6, 6, 10, 16 ] } - } - }, - { - "name": "Pole2Core", - "from": [ 6, 14, 6 ], - "to": [ 10, 27, 10 ], - "faces": { - "east": { "texture": "#mechanical_press_pole", "uv": [ 6, 0, 10, 13 ] }, - "west": { "texture": "#mechanical_press_pole", "uv": [ 6, 0, 10, 13 ] }, - "up": { "texture": "#mechanical_press_pole", "uv": [ 11, 1, 15, 5 ], "rotation": 180 } - } - }, - { - "name": "Pole1Side", - "from": [ 5, 4, 5 ], - "to": [ 11, 14, 6 ], - "faces": { - "north": { "texture": "#mechanical_press_pole", "uv": [ 0, 6, 6, 16 ] }, - "east": { "texture": "#mechanical_press_pole", "uv": [ 0, 6, 1, 16 ] }, - "south": { "texture": "#mechanical_press_pole", "uv": [ 0, 6, 6, 16 ] }, - "west": { "texture": "#mechanical_press_pole", "uv": [ 5, 6, 6, 16 ] } - } - }, - { - "name": "Pole1Side", - "from": [ 5, 4, 10 ], - "to": [ 11, 14, 11 ], - "faces": { - "north": { "texture": "#mechanical_press_pole", "uv": [ 0, 6, 6, 16 ] }, - "east": { "texture": "#mechanical_press_pole", "uv": [ 0, 6, 1, 16 ] }, - "south": { "texture": "#mechanical_press_pole", "uv": [ 0, 6, 6, 16 ] }, - "west": { "texture": "#mechanical_press_pole", "uv": [ 5, 6, 6, 16 ] } - } - }, - { - "name": "Pole2Side", - "from": [ 5, 14, 10 ], - "to": [ 11, 27, 11 ], - "faces": { - "north": { "texture": "#mechanical_press_pole", "uv": [ 0, 0, 6, 13 ] }, - "east": { "texture": "#mechanical_press_pole", "uv": [ 0, 0, 1, 13 ] }, - "south": { "texture": "#mechanical_press_pole", "uv": [ 0, 0, 6, 13 ] }, - "west": { "texture": "#mechanical_press_pole", "uv": [ 5, 0, 6, 13 ] }, - "up": { "texture": "#mechanical_press_pole", "uv": [ 10, 0, 16, 1 ], "rotation": 180 } - } - }, - { - "name": "Pole2Side", - "from": [ 5, 14, 5 ], - "to": [ 11, 27, 6 ], - "faces": { - "north": { "texture": "#mechanical_press_pole", "uv": [ 0, 0, 6, 13 ] }, - "east": { "texture": "#mechanical_press_pole", "uv": [ 0, 0, 1, 13 ] }, - "south": { "texture": "#mechanical_press_pole", "uv": [ 0, 0, 6, 13 ] }, - "west": { "texture": "#mechanical_press_pole", "uv": [ 5, 0, 6, 13 ] }, - "up": { "texture": "#mechanical_press_pole", "uv": [ 10, 5, 16, 6 ], "rotation": 180 } - } - }, - { - "name": "Head", - "from": [ 3, 0, 3 ], - "to": [ 13, 4, 13 ], - "faces": { - "north": { "texture": "#mechanical_press_head", "uv": [ 1, 0, 11, 4 ] }, - "east": { "texture": "#mechanical_press_head", "uv": [ 1, 0, 11, 4 ] }, - "south": { "texture": "#mechanical_press_head", "uv": [ 1, 0, 11, 4 ] }, - "west": { "texture": "#mechanical_press_head", "uv": [ 1, 0, 11, 4 ] }, - "up": { "texture": "#mechanical_press_head", "uv": [ 1, 5, 11, 15 ], "rotation": 180 }, - "down": { "texture": "#mechanical_press_head", "uv": [ 1, 5, 11, 15 ], "rotation": 180 } - } - } - ] + "credit": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", + "textures": { + "mechanical_press_head": "create:block/mechanical_press_head", + "mechanical_press_pole": "create:block/mechanical_press_pole" + }, + "elements": [ + { + "name": "Pole1Core", + "from": [5.95, 4, 6], + "to": [10.05, 14, 10], + "faces": { + "east": {"uv": [6, 6, 10, 16], "texture": "#mechanical_press_pole"}, + "west": {"uv": [6, 6, 10, 16], "texture": "#mechanical_press_pole"} + } + }, + { + "name": "Pole2Core", + "from": [5.95, 14, 6], + "to": [10.05, 27, 10], + "faces": { + "east": {"uv": [6, 0, 10, 13], "texture": "#mechanical_press_pole"}, + "west": {"uv": [6, 0, 10, 13], "texture": "#mechanical_press_pole"}, + "up": {"uv": [11, 1, 15, 5], "rotation": 180, "texture": "#mechanical_press_pole"} + } + }, + { + "name": "Pole1Side", + "from": [5, 4, 5], + "to": [11, 14, 6], + "faces": { + "north": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"}, + "east": {"uv": [0, 6, 1, 16], "texture": "#mechanical_press_pole"}, + "south": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"}, + "west": {"uv": [5, 6, 6, 16], "texture": "#mechanical_press_pole"} + } + }, + { + "name": "Pole1Side", + "from": [5, 4, 10], + "to": [11, 14, 11], + "faces": { + "north": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"}, + "east": {"uv": [0, 6, 1, 16], "texture": "#mechanical_press_pole"}, + "south": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"}, + "west": {"uv": [5, 6, 6, 16], "texture": "#mechanical_press_pole"} + } + }, + { + "name": "Pole2Side", + "from": [5, 14, 10], + "to": [11, 27, 11], + "faces": { + "north": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"}, + "east": {"uv": [0, 0, 1, 13], "texture": "#mechanical_press_pole"}, + "south": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"}, + "west": {"uv": [5, 0, 6, 13], "texture": "#mechanical_press_pole"}, + "up": {"uv": [10, 0, 16, 1], "rotation": 180, "texture": "#mechanical_press_pole"} + } + }, + { + "name": "Pole2Side", + "from": [5, 14, 5], + "to": [11, 27, 6], + "faces": { + "north": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"}, + "east": {"uv": [0, 0, 1, 13], "texture": "#mechanical_press_pole"}, + "south": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"}, + "west": {"uv": [5, 0, 6, 13], "texture": "#mechanical_press_pole"}, + "up": {"uv": [10, 5, 16, 6], "rotation": 180, "texture": "#mechanical_press_pole"} + } + }, + { + "name": "Head", + "from": [3, 0, 3], + "to": [13, 4, 13], + "faces": { + "north": {"uv": [1, 0, 11, 4], "texture": "#mechanical_press_head"}, + "east": {"uv": [1, 0, 11, 4], "texture": "#mechanical_press_head"}, + "south": {"uv": [1, 0, 11, 4], "texture": "#mechanical_press_head"}, + "west": {"uv": [1, 0, 11, 4], "texture": "#mechanical_press_head"}, + "up": {"uv": [1, 5, 11, 15], "rotation": 180, "texture": "#mechanical_press_head"}, + "down": {"uv": [1, 5, 11, 15], "rotation": 180, "texture": "#mechanical_press_head"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_saw/horizontal.json b/src/main/resources/assets/create/models/block/mechanical_saw/horizontal.json index 339a64417..897fa0006 100644 --- a/src/main/resources/assets/create/models/block/mechanical_saw/horizontal.json +++ b/src/main/resources/assets/create/models/block/mechanical_saw/horizontal.json @@ -50,7 +50,7 @@ { "name": "Inner", "from": [0, 2, 2], - "to": [16, 14, 11], + "to": [16, 14, 11.025], "faces": { "east": {"uv": [2, 6, 14, 15], "rotation": 90, "texture": "#andesite_casing_short"}, "south": {"uv": [0, 2, 16, 14], "texture": "#slit"}, @@ -70,8 +70,8 @@ }, { "name": "Back", - "from": [2, 2, 1], - "to": [14, 14, 2], + "from": [2, 2, 0.95], + "to": [14, 14, 1.95], "faces": { "north": {"uv": [2, 2, 14, 14], "texture": "#gearbox"} } diff --git a/src/main/resources/assets/create/models/block/mechanical_saw/vertical.json b/src/main/resources/assets/create/models/block/mechanical_saw/vertical.json index f63bcea80..4d538d0a1 100644 --- a/src/main/resources/assets/create/models/block/mechanical_saw/vertical.json +++ b/src/main/resources/assets/create/models/block/mechanical_saw/vertical.json @@ -1,72 +1,72 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", - "textures": { - "gearbox_top": "create:block/gearbox_top", - "gearbox": "create:block/gearbox", - "andesite_casing_short": "create:block/andesite_casing_short", - "mechanical_saw_top": "create:block/mechanical_saw_top", - "particle": "create:block/mechanical_saw_top" - }, - "elements": [ - { - "name": "Bottom", - "from": [ 0, 0, 0 ], - "to": [ 16, 2, 16 ], - "faces": { - "north": { "texture": "#gearbox_top", "uv": [ 0, 14, 16, 16 ] }, - "east": { "texture": "#andesite_casing_short", "uv": [ 0, 14, 16, 16 ] }, - "south": { "texture": "#gearbox_top", "uv": [ 0, 14, 16, 16 ] }, - "west": { "texture": "#andesite_casing_short", "uv": [ 0, 14, 16, 16 ] }, - "up": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 16 ] }, - "down": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 16 ] } - } - }, - { - "name": "Inner", - "from": [ 2, 2, 1 ], - "to": [ 14, 12, 15 ], - "faces": { - "north": { "texture": "#gearbox", "uv": [ 2, 4, 14, 14 ] }, - "south": { "texture": "#gearbox", "uv": [ 2, 4, 14, 14 ] }, - "up": { "texture": "#mechanical_saw_top", "uv": [ 2, 1, 14, 15 ] }, - "down": { "texture": "#gearbox", "uv": [ 0, 0, 12, 14 ] } - } - }, - { - "name": "Side", - "from": [ 0, 2, 0 ], - "to": [ 2, 12, 16 ], - "faces": { - "north": { "texture": "#gearbox_top", "uv": [ 14, 0, 16, 10 ] }, - "east": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 10 ] }, - "south": { "texture": "#gearbox_top", "uv": [ 0, 0, 2, 10 ] }, - "west": { "texture": "#andesite_casing_short", "uv": [ 0, 4, 16, 14 ] }, - "up": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 2 ], "rotation": 270 } - } - }, - { - "name": "Side2", - "from": [ 14, 2, 0 ], - "to": [ 16, 12, 16 ], - "faces": { - "north": { "texture": "#gearbox_top", "uv": [ 0, 0, 2, 10 ] }, - "east": { "texture": "#andesite_casing_short", "uv": [ 0, 4, 16, 14 ] }, - "south": { "texture": "#gearbox_top", "uv": [ 14, 0, 16, 10 ] }, - "west": { "texture": "#gearbox_top", "uv": [ 0, 0, 16, 10 ] }, - "up": { "texture": "#gearbox_top", "uv": [ 0, 14, 16, 16 ], "rotation": 270 } - } - }, - { - "name": "Top", - "from": [ 0, 12, 2 ], - "to": [ 16, 13, 14 ], - "faces": { - "north": { "texture": "#mechanical_saw_top", "uv": [ 0, 13, 16, 14 ] }, - "east": { "texture": "#mechanical_saw_top", "uv": [ 0, 3, 1, 13 ], "rotation": 90 }, - "south": { "texture": "#mechanical_saw_top", "uv": [ 0, 2, 16, 3 ] }, - "west": { "texture": "#mechanical_saw_top", "uv": [ 15, 3, 16, 13 ], "rotation": 270 }, - "up": { "texture": "#mechanical_saw_top", "uv": [ 0, 2, 16, 14 ] } - } - } - ] + "credit": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)", + "textures": { + "gearbox_top": "create:block/gearbox_top", + "gearbox": "create:block/gearbox", + "andesite_casing_short": "create:block/andesite_casing_short", + "particle": "create:block/mechanical_saw_top", + "mechanical_saw_top": "create:block/mechanical_saw_top" + }, + "elements": [ + { + "name": "Bottom", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "texture": "#andesite_casing_short"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#andesite_casing_short"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#andesite_casing_short"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#gearbox_top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#gearbox_top"} + } + }, + { + "name": "Inner", + "from": [2, 2, 0.95], + "to": [14, 12, 15.05], + "faces": { + "north": {"uv": [2, 4, 14, 14], "texture": "#gearbox"}, + "south": {"uv": [2, 4, 14, 14], "texture": "#gearbox"}, + "up": {"uv": [2, 1, 14, 15], "texture": "#mechanical_saw_top"}, + "down": {"uv": [0, 0, 12, 14], "texture": "#gearbox"} + } + }, + { + "name": "Side", + "from": [0, 2, 0], + "to": [2, 12, 16], + "faces": { + "north": {"uv": [14, 4, 16, 14], "texture": "#andesite_casing_short"}, + "east": {"uv": [0, 0, 16, 10], "texture": "#gearbox_top"}, + "south": {"uv": [0, 4, 2, 14], "texture": "#andesite_casing_short"}, + "west": {"uv": [0, 4, 16, 14], "texture": "#andesite_casing_short"}, + "up": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#gearbox_top"} + } + }, + { + "name": "Side2", + "from": [14, 2, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 4, 2, 14], "texture": "#andesite_casing_short"}, + "east": {"uv": [0, 4, 16, 14], "texture": "#andesite_casing_short"}, + "south": {"uv": [14, 4, 16, 14], "texture": "#andesite_casing_short"}, + "west": {"uv": [0, 0, 16, 10], "texture": "#gearbox_top"}, + "up": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#gearbox_top"} + } + }, + { + "name": "Top", + "from": [0, 12, 1.95], + "to": [16, 13, 14.05], + "faces": { + "north": {"uv": [16, 2, 0, 3], "texture": "#mechanical_saw_top"}, + "east": {"uv": [0, 2, 1, 14], "rotation": 90, "texture": "#mechanical_saw_top"}, + "south": {"uv": [0, 13, 16, 14], "texture": "#mechanical_saw_top"}, + "west": {"uv": [15, 2, 16, 14], "rotation": 270, "texture": "#mechanical_saw_top"}, + "up": {"uv": [0, 2, 16, 14], "texture": "#mechanical_saw_top"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/redstone_contact/block.json b/src/main/resources/assets/create/models/block/redstone_contact/block.json index 274c963cd..5afcf430c 100644 --- a/src/main/resources/assets/create/models/block/redstone_contact/block.json +++ b/src/main/resources/assets/create/models/block/redstone_contact/block.json @@ -10,8 +10,8 @@ "elements": [ { "name": "Center", - "from": [2, 1, 2], - "to": [14, 15, 14], + "from": [2, 0.95, 2], + "to": [14, 15.05, 14], "faces": { "up": {"uv": [2, 2, 14, 14], "texture": "#0"}, "down": {"uv": [2, 2, 14, 14], "texture": "#3"} diff --git a/src/main/resources/assets/create/models/block/rope_pulley/block.json b/src/main/resources/assets/create/models/block/rope_pulley/block.json index 965644d1c..7215d4577 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/block.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/block.json @@ -4,6 +4,7 @@ "textures": { "3": "create:block/gearbox_top", "4": "create:block/gearbox", + "5": "create:block/andesite_casing", "6": "create:block/pulley_top", "particle": "create:block/pulley_rope" }, @@ -197,7 +198,7 @@ "east": {"uv": [2, 1, 14, 3], "rotation": 180, "texture": "#6"}, "west": {"uv": [2, 13, 14, 15], "texture": "#6"}, "up": {"uv": [2, 2, 14, 14], "rotation": 90, "texture": "#6"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 90, "texture": "#6"} + "down": {"uv": [2, 2, 14, 14], "rotation": 90, "texture": "#5"} } } ] diff --git a/src/main/resources/assets/create/models/block/rope_pulley/item.json b/src/main/resources/assets/create/models/block/rope_pulley/item.json index 35746dbbf..ed905e459 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/item.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/item.json @@ -8,6 +8,7 @@ "4": "create:block/gearbox", "5": "create:block/pulley_rope", "6": "create:block/pulley_magnet", + "7": "create:block/andesite_casing", "8": "create:block/pulley_top", "particle": "create:block/pulley_top" }, @@ -82,17 +83,31 @@ { "name": "magnet", "from": [3.1, 0, 3], - "to": [13.1, 2, 13], + "to": [13.1, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [24, 23, -8]}, "faces": { - "north": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "east": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "south": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "west": {"uv": [0, 10, 10, 12], "texture": "#6"}, + "north": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#6"}, "up": {"uv": [0, 0, 10, 10], "texture": "#6"}, "down": {"uv": [0, 0, 10, 10], "texture": "#6"} } }, + { + "name": "magnet", + "from": [5.1, 2, 5], + "to": [11.1, 4, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [24, 23, -8]}, + "faces": { + "north": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "east": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "south": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "west": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "up": {"uv": [2, 2, 8, 8], "texture": "#6"}, + "down": {"uv": [2, 2, 8, 8], "texture": "#6"} + } + }, { "name": "side", "from": [2, 2, 14], @@ -282,7 +297,7 @@ "east": {"uv": [2, 1, 14, 3], "rotation": 180, "texture": "#8"}, "west": {"uv": [2, 13, 14, 15], "texture": "#8"}, "up": {"uv": [2, 2, 14, 14], "rotation": 90, "texture": "#8"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 90, "texture": "#8"} + "down": {"uv": [2, 2, 14, 14], "rotation": 90, "texture": "#7"} } } ], @@ -331,9 +346,8 @@ "name": "rope_half_magnet", "origin": [8, 8, 8], "color": 0, - "children": [4, 5] + "children": [4, 5, 6] }, - 6, 7, 8, 9, @@ -347,6 +361,7 @@ 17, 18, 19, - 20 + 20, + 21 ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rope_pulley/pulley_magnet.json b/src/main/resources/assets/create/models/block/rope_pulley/pulley_magnet.json index 1b44d7f3e..e46edc899 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/pulley_magnet.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/pulley_magnet.json @@ -2,14 +2,15 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { + "1": "create:block/chute_large", "6": "create:block/pulley_magnet", "particle": "create:block/pulley_magnet" }, "elements": [ { "name": "rope", - "from": [6, 2, 6], - "to": [10, 16, 10], + "from": [5.95, 2, 5.95], + "to": [10.05, 16, 10.05], "rotation": {"angle": 0, "axis": "y", "origin": [7.75, 0, 8]}, "faces": { "north": {"uv": [12, 0, 16, 14], "texture": "#6"}, @@ -22,16 +23,29 @@ { "name": "magnet", "from": [3, 0, 3], - "to": [13, 2, 13], + "to": [13, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, "faces": { - "north": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "east": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "south": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "west": {"uv": [0, 10, 10, 12], "texture": "#6"}, + "north": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#6"}, "up": {"uv": [0, 0, 10, 10], "texture": "#6"}, "down": {"uv": [0, 0, 10, 10], "texture": "#6"} } + }, + { + "name": "magnet", + "from": [4.95, 3, 4.95], + "to": [11.05, 5, 11.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "east": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "south": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "west": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "up": {"uv": [10.5, 11, 13.5, 14], "texture": "#1"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rope_pulley/rope.json b/src/main/resources/assets/create/models/block/rope_pulley/rope.json index 832617702..8282ada64 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/rope.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/rope.json @@ -8,8 +8,8 @@ "elements": [ { "name": "rope", - "from": [6, 0, 6], - "to": [10, 16, 10], + "from": [5.95, 0, 5.95], + "to": [10.05, 16, 10.05], "rotation": {"angle": 0, "axis": "y", "origin": [7.75, 0, 8]}, "faces": { "north": {"uv": [0, 0, 4, 16], "texture": "#5"}, diff --git a/src/main/resources/assets/create/models/block/rope_pulley/rope_half.json b/src/main/resources/assets/create/models/block/rope_pulley/rope_half.json index 522789073..15f25a8ea 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/rope_half.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/rope_half.json @@ -8,8 +8,8 @@ "elements": [ { "name": "rope", - "from": [6, 0, 6], - "to": [10, 8, 10], + "from": [5.95, 0, 5.95], + "to": [10.05, 8, 10.05], "rotation": {"angle": 0, "axis": "y", "origin": [7.75, 0, 8]}, "faces": { "north": {"uv": [0, 8, 4, 16], "texture": "#5"}, diff --git a/src/main/resources/assets/create/models/block/rope_pulley/rope_half_magnet.json b/src/main/resources/assets/create/models/block/rope_pulley/rope_half_magnet.json index f3f8f43c2..cc6348990 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/rope_half_magnet.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/rope_half_magnet.json @@ -2,14 +2,15 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { + "1": "create:block/chute_large", "6": "create:block/pulley_magnet", "particle": "create:block/pulley_magnet" }, "elements": [ { "name": "rope", - "from": [6, 2, 6], - "to": [10, 8, 10], + "from": [5.95, 2, 5.95], + "to": [10.05, 8, 10.05], "rotation": {"angle": 0, "axis": "y", "origin": [7.75, 0, 8]}, "faces": { "north": {"uv": [12, 8, 16, 14], "texture": "#6"}, @@ -22,16 +23,29 @@ { "name": "magnet", "from": [3, 0, 3], - "to": [13, 2, 13], + "to": [13, 3, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, "faces": { - "north": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "east": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "south": {"uv": [0, 10, 10, 12], "texture": "#6"}, - "west": {"uv": [0, 10, 10, 12], "texture": "#6"}, + "north": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "east": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "south": {"uv": [0, 10, 10, 13], "texture": "#6"}, + "west": {"uv": [0, 10, 10, 13], "texture": "#6"}, "up": {"uv": [0, 0, 10, 10], "texture": "#6"}, "down": {"uv": [0, 0, 10, 10], "texture": "#6"} } + }, + { + "name": "magnet", + "from": [4.95, 3, 4.95], + "to": [11.05, 5, 11.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]}, + "faces": { + "north": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "east": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "south": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "west": {"uv": [0, 13, 6, 15], "texture": "#6"}, + "up": {"uv": [10.5, 11, 13.5, 14], "texture": "#1"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json b/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json index 90300e12b..2f7dc99a4 100644 --- a/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json +++ b/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json @@ -22,8 +22,8 @@ }, { "name": "Core", - "from": [1, 2, 1], - "to": [15, 14, 15], + "from": [1, 2, 0.95], + "to": [15, 14, 15.05], "faces": { "north": {"uv": [1, 2, 15, 14], "texture": "#1"}, "south": {"uv": [1, 2, 15, 14], "texture": "#1"} diff --git a/src/main/resources/assets/create/models/block/spout/block.json b/src/main/resources/assets/create/models/block/spout/block.json index 66ac7929e..6f42dc418 100644 --- a/src/main/resources/assets/create/models/block/spout/block.json +++ b/src/main/resources/assets/create/models/block/spout/block.json @@ -8,8 +8,8 @@ "elements": [ { "name": "Top 1", - "from": [2, 14, 2], - "to": [14, 16, 14], + "from": [1.95, 14, 1.95], + "to": [14.05, 16, 14.05], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, "faces": { "north": {"uv": [1, 0, 7, 1], "texture": "#0"}, @@ -62,54 +62,42 @@ }, { "name": "Window", - "from": [2, 4, 6], - "to": [2, 12, 10], - "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "east": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "texture": "#0"} - } - }, - { - "name": "Window", - "from": [6, 4, 2], - "to": [10, 12, 2], + "from": [6, 4, 1.95], + "to": [10, 12, 1.95], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"} + "south": {"uv": [9, 0, 11, 4], "texture": "#0"} } }, { "name": "Window", - "from": [14, 4, 6], - "to": [14, 12, 10], + "from": [14.05, 4, 6], + "to": [14.05, 12, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0], "texture": "#0"}, "east": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"} + "west": {"uv": [9, 0, 11, 4], "texture": "#0"} } }, { "name": "Window", - "from": [6, 4, 14], - "to": [10, 12, 14], + "from": [6, 4, 14.05], + "to": [10, 12, 14.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { "north": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [9, 0, 11, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "rotation": 90, "texture": "#0"} + "south": {"uv": [9, 0, 11, 4], "texture": "#0"} + } + }, + { + "name": "Window", + "from": [1.95, 4, 6], + "to": [1.95, 12, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [9, 0, 11, 4], "texture": "#0"}, + "west": {"uv": [9, 0, 11, 4], "texture": "#0"} } }, { diff --git a/src/main/resources/assets/create/models/block/water_wheel/block.json b/src/main/resources/assets/create/models/block/water_wheel/block.json index 804e14f7a..287821445 100644 --- a/src/main/resources/assets/create/models/block/water_wheel/block.json +++ b/src/main/resources/assets/create/models/block/water_wheel/block.json @@ -7,9 +7,8 @@ }, "elements": [ { - "from": [2, 1, 2], - "to": [14, 0, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [1.95, 1, 1.95], + "to": [14.05, 0, 14.05], "faces": { "north": {"uv": [2, 0, 14, 1], "rotation": 180, "texture": "#0"}, "east": {"uv": [0, 2, 1, 14], "rotation": 90, "texture": "#0"}, @@ -19,9 +18,8 @@ } }, { - "from": [2, 16, 2], - "to": [14, 15, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "from": [1.95, 16, 1.95], + "to": [14.05, 15, 14.05], "faces": { "north": {"uv": [2, 0, 14, 1], "texture": "#0"}, "east": {"uv": [15, 2, 16, 14], "rotation": 90, "texture": "#0"}, @@ -33,7 +31,6 @@ { "from": [2, 2, 2], "to": [14, 14, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]}, "faces": { "north": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#0"}, "east": {"uv": [6, 6, 10, 10], "rotation": 90, "texture": "#0"}, diff --git a/src/main/resources/assets/create/textures/block/fluid_tank_window.png b/src/main/resources/assets/create/textures/block/fluid_tank_window.png index 4fb70bbcca0dda18a112f59891857ebd3db49285..7b8574b13d04e956ba5dc077adf99d4ef661a1e3 100644 GIT binary patch delta 238 zcmZ3%_>XadL_G&H0|SGGE`KnPVk{1FcVbv~PUa<$!;&U>cv7h@-A}f%u7~m7) zI?v0s!p!<$qF?vHvlm{yTyf#%shq&-b=zMq&b?6_1yr@hR;~p|ahC-71^|E7 ZXZ$m^C7YQ-ZUc>G@O1TaS?83{1ORo1TG#*p delta 152 zcmeyzxPozlL_G^L0|Ud`yN`l^lw5#Mh%1o3@apA?3pd|vuI@f~wtC(6rO{r~g1nmC zoJ#HOIBq%>097!S1o;IsI6S+N2IN?Hx;TbZ+)CD%9XB)X&;f;W7c^H`FrQ%%T+tK4 z#GZx^prw85kH?(j9#r85lP9bN@+X1@g@Td_r6!BO=lh6Qj+A zr>E*w`^%*{io3YD*xNbz`}=!(c$5|vwzah_UApw_*|XMGcD6PSrY06ZtpW?Q@_>|3 zNswRge{{g`X#aj8pe$!Wy+>p*0|Vb-5N14{zaj-F+TiKp7@`sE+ZQQxSb@h`^;D8a z)T7_=W=4}sChY&>HjTHzyP^8m6Q(QMmT^sq5xUWHtk13dr_u$^g$%CN6D1@PL?dK3 zHYIY~$jW9pHf(2>`d$7eJ-E+)+ws27)mnBcd?n>Sna?UQMSNB*(KKROBE+q*M{m!e k{J86L`X^u6d-^Y%!&46aRbRI70Ug8O>FVdQ&MBb@0QV_)iU0rr delta 320 zcmV-G0l)ss0^0(RB!6{KOjJbx007O+&84NKhK7c4aByj9X<=buf>k_$R6BrEI$K*? zcuzTZPB?Z=H&j$qa7Z&yP*7|}GHXRKYDF??L@-TFO=(0iXhbkfOiX7(FJ?k6Nl8gZ zM@L3RMnptJLPA18K|wt|JvKHrH8nLfG&C|YGBGhRhR>~$0Dk}g0d!JMQvg8b*k%9# z0F+5YK~#9!OpXJB1VIc%Un;G&b^o)i?NT~p#Lkxs5NGf zo|%yYHp9WS$~i1ETj0>(t8X0v{&H!K;)eGO^nl`=1s;*b3=DjSL74G){)!Z!pq!_RV~E7%@KAHIiGEBl=o7`PZ1JYD@<);T3K0RTphCk+4q delta 191 zcmZ3;c%E^BL_G&H0|SGGE`KnPvI+1Bacv2=YYww*3bknrv2F;qstmBI@V6}Yvnca5 zFYqwVaWl$xHOz7~%5pKtbTQ0uG01Q>NO#sxchXOD(kq%~PyjT?&(p;*q~ey$(RR)Q z1`I44`>WUgelK;dVM3LOd(aMl*Q2`njxgN@xNAmVHJ0