From 63ec7f4dc769cff2e437fe573edcf16af1452f8b Mon Sep 17 00:00:00 2001 From: LordGrimmauld Date: Wed, 10 Jun 2020 20:42:23 +0200 Subject: [PATCH] reinforced rail: Tooltip and reworked model/hitbox to better fit minecarts --- src/generated/resources/.cache/cache | 4 +- .../create/blockstates/radial_chassis.json | 24 ++--- .../resources/assets/create/lang/en_us.json | 3 + .../tracks/ReinforcedRailBlock.java | 2 +- .../assets/create/lang/default/tooltips.json | 3 + .../models/block/reinforced_rail/block.json | 70 ++++++------- .../models/block/reinforced_rail/block_n.json | 82 ++++++++-------- .../models/block/reinforced_rail/block_s.json | 97 +++++++++--------- .../block/reinforced_rail/block_s_n.json | 98 +++++++++---------- 9 files changed, 194 insertions(+), 189 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index b43f7c15d..6839ce96b 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -273,7 +273,7 @@ b7829c2ef2c47188713f8cab21b2c9bc7f9c5b79 assets\create\blockstates\portable_stor e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets\create\blockstates\powered_toggle_latch.json 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets\create\blockstates\pulley_magnet.json 469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets\create\blockstates\pulse_repeater.json -89b63c6e5875da07226854651079bcea85439f5b assets\create\blockstates\radial_chassis.json +8d7e653bfd9846e684a0d3725595714a19201017 assets\create\blockstates\radial_chassis.json 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets\create\blockstates\redstone_contact.json c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets\create\blockstates\redstone_link.json 1eac804cba08aebb5f4646758ae1ef9b32e01365 assets\create\blockstates\reinforced_rail.json @@ -326,7 +326,7 @@ c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets\create\blockstates\weathered_lim 7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json 6bf74a9e1f74b41f53399c1f817942b01a010bf0 assets\create\lang\en_ud.json -fc67127f0ff7cbc1fb83ce1433bce4f72064985f assets\create\lang\en_us.json +7bb6dd61820e1b7a42310632c09c22daff870ac8 assets\create\lang\en_us.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index d60327a8a..9d00ea8b1 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -149,8 +149,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "true" + "sticky_north": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky" @@ -158,8 +158,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "true" + "sticky_north": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -168,8 +168,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "true" + "sticky_north": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -178,8 +178,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "false" + "sticky_north": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x" @@ -187,8 +187,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "false" + "sticky_north": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -197,8 +197,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "false" + "sticky_north": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 356e2516d..c4a31c888 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1037,6 +1037,9 @@ "block.create.basin.tooltip": "BASIN", "block.create.basin.tooltip.summary": "A handy _item_ _container_ used in processing with the _Mechanical_ _Mixer_ and the _Mechanical_ _Press_. Supports _Redstone_ _Comparators_.", + "block.create.reinforced_rail.tooltip": "REINFORCED RAIL", + "block.create.reinforced_rail.tooltip.summary": "A timber stabilized rail, _does_ _not_ _need_ _supports_.", + "block.create.mechanical_mixer.tooltip": "MECHANICAL MIXER", "block.create.mechanical_mixer.tooltip.summary": "A kinetic whisk for applying any shapeless crafting recipes to items beneath it. Requires constant _Rotational_ _Force_ and a _Basin_ placed below (with a gap in between).", "block.create.mechanical_mixer.tooltip.condition1": "When above Basin", diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java index 2f330f86c..d46461de5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java @@ -92,7 +92,7 @@ public class ReinforcedRailBlock extends AbstractRailBlock { @Nonnull public VoxelShape getShape(BlockState state, @Nonnull IBlockReader reader, @Nonnull BlockPos pos, ISelectionContext context) { boolean alongX = state.get(RAIL_SHAPE) == RailShape.EAST_WEST; - return VoxelShapes.or(super.getShape(state, reader, pos, context), VoxelShapes.or(makeCuboidShape(0, 0, 0, alongX ? 16 : 1, 12, alongX ? 1 : 16), makeCuboidShape(alongX ? 0 : 15, 0, alongX ? 15 : 0, 16, 12, 16))); + return VoxelShapes.or(makeCuboidShape(0, -2, 0, 16, 2, 16), VoxelShapes.or(makeCuboidShape(0, -2, 0, alongX ? 16 : -1, 12, alongX ? -1 : 16), makeCuboidShape(alongX ? 0 : 17, -2, alongX ? 17 : 0, 16, 12, 16))); } @Override diff --git a/src/main/resources/assets/create/lang/default/tooltips.json b/src/main/resources/assets/create/lang/default/tooltips.json index d04816b05..262ead1ba 100644 --- a/src/main/resources/assets/create/lang/default/tooltips.json +++ b/src/main/resources/assets/create/lang/default/tooltips.json @@ -212,6 +212,9 @@ "block.create.basin.tooltip": "BASIN", "block.create.basin.tooltip.summary": "A handy _item_ _container_ used in processing with the _Mechanical_ _Mixer_ and the _Mechanical_ _Press_. Supports _Redstone_ _Comparators_.", + "block.create.reinforced_rail.tooltip": "REINFORCED RAIL", + "block.create.reinforced_rail.tooltip.summary": "A timber stabilized rail, _does_ _not_ _need_ _supports_.", + "block.create.mechanical_mixer.tooltip": "MECHANICAL MIXER", "block.create.mechanical_mixer.tooltip.summary": "A kinetic whisk for applying any shapeless crafting recipes to items beneath it. Requires constant _Rotational_ _Force_ and a _Basin_ placed below (with a gap in between).", "block.create.mechanical_mixer.tooltip.condition1": "When above Basin", diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block.json b/src/main/resources/assets/create/models/block/reinforced_rail/block.json index 757f2b9c7..63746f266 100644 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block.json +++ b/src/main/resources/assets/create/models/block/reinforced_rail/block.json @@ -52,38 +52,52 @@ "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } } }, - { + { "name": "Cube", - "from": [ 0, 0, 0 ], + "from": [ -1, 0, 0 ], "to": [ 1, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", "from": [ 15, 0, 0 ], - "to": [ 16, 2, 16 ], + "to": [ 17, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", - "from": [ 15, 7, -2 ], - "to": [ 16, 9, 9 ], + "from": [ 16, 7, -2 ], + "to": [ 17, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } + } + }, + { + "name": "Cube", + "from": [ 16, 7, 7 ], + "to": [ 17, 9, 18 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, + "faces": { + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, @@ -92,44 +106,30 @@ }, { "name": "Cube", - "from": [ 15, 7, 7 ], - "to": [ 16, 9, 18 ], + "from": [ -1, 7, 7 ], + "to": [ 0, 9, 18 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } } }, { "name": "Cube", - "from": [ 0, 7, 7 ], - "to": [ 1, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 7, -2 ], - "to": [ 1, 9, 9 ], + "from": [ -1, 7, -2 ], + "to": [ 0, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } } } ] diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json index 2dea5c439..5454c0292 100644 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json +++ b/src/main/resources/assets/create/models/block/reinforced_rail/block_n.json @@ -52,38 +52,52 @@ "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } } }, - { + { "name": "Cube", - "from": [ 0, 0, 0 ], + "from": [ -1, 0, 0 ], "to": [ 1, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", "from": [ 15, 0, 0 ], - "to": [ 16, 2, 16 ], + "to": [ 17, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", - "from": [ 15, 7, -2 ], - "to": [ 16, 9, 9 ], + "from": [ 16, 7, -2 ], + "to": [ 17, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } + } + }, + { + "name": "Cube", + "from": [ 16, 7, 7 ], + "to": [ 17, 9, 18 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, + "faces": { + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, @@ -92,62 +106,48 @@ }, { "name": "Cube", - "from": [ 15, 7, 7 ], - "to": [ 16, 9, 18 ], + "from": [ -1, 7, 7 ], + "to": [ 0, 9, 18 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } } }, { "name": "Cube", - "from": [ 0, 7, 7 ], - "to": [ 1, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 7, -2 ], - "to": [ 1, 9, 9 ], + "from": [ -1, 7, -2 ], + "to": [ 0, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } } }, { "name": "connection_n", - "from": [ 0, 7, 0 ], - "to": [ 1, 9, 8 ], + "from": [ -1, 7, 0 ], + "to": [ 0, 9, 8 ], "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 7 ] } } }, { "name": "connection_n", - "from": [ 15, 7, 0 ], - "to": [ 16, 9, 8 ], + "from": [ 16, 7, 0 ], + "to": [ 17, 9, 8 ], "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json index 846559160..75f76f222 100644 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json +++ b/src/main/resources/assets/create/models/block/reinforced_rail/block_s.json @@ -4,7 +4,6 @@ "textures": { "oak_planks": "minecraft:block/oak_planks", "rail": "create:block/reinforced_rail_top", - "particle": "create:block/reinforced_rail_top" }, "display": { @@ -53,38 +52,52 @@ "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } } }, - { + { "name": "Cube", - "from": [ 0, 0, 0 ], + "from": [ -1, 0, 0 ], "to": [ 1, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", "from": [ 15, 0, 0 ], - "to": [ 16, 2, 16 ], + "to": [ 17, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", - "from": [ 15, 7, -2 ], - "to": [ 16, 9, 9 ], + "from": [ 16, 7, -2 ], + "to": [ 17, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } + } + }, + { + "name": "Cube", + "from": [ 16, 7, 7 ], + "to": [ 17, 9, 18 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, + "faces": { + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, @@ -93,62 +106,48 @@ }, { "name": "Cube", - "from": [ 15, 7, 7 ], - "to": [ 16, 9, 18 ], + "from": [ -1, 7, 7 ], + "to": [ 0, 9, 18 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } } }, { "name": "Cube", - "from": [ 0, 7, 7 ], - "to": [ 1, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 7, -2 ], - "to": [ 1, 9, 9 ], + "from": [ -1, 7, -2 ], + "to": [ 0, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } + } + }, + { + "name": "connection_s", + "from": [ -1, 7, 8 ], + "to": [ 0, 9, 16 ], + "faces": { "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 10, 1 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 8 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 4, 7 ] } } }, { "name": "connection_s", - "from": [ 0, 7, 8 ], - "to": [ 1, 9, 16 ], - "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } - } - }, - { - "name": "connection_s", - "from": [ 15, 7, 8 ], - "to": [ 16, 9, 16 ], + "from": [ 16, 7, 8 ], + "to": [ 17, 9, 16 ], "faces": { "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, diff --git a/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json b/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json index aaf4626eb..9d17be5be 100644 --- a/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json +++ b/src/main/resources/assets/create/models/block/reinforced_rail/block_s_n.json @@ -52,38 +52,52 @@ "down": { "texture": "#oak_planks", "uv": [ 1, 0, 16, 16 ] } } }, - { + { "name": "Cube", - "from": [ 0, 0, 0 ], + "from": [ -1, 0, 0 ], "to": [ 1, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", "from": [ 15, 0, 0 ], - "to": [ 16, 2, 16 ], + "to": [ 17, 2, 16 ], "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 16, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 16 ] } + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 16 ] } } }, { "name": "Cube", - "from": [ 15, 7, -2 ], - "to": [ 16, 9, 9 ], + "from": [ 16, 7, -2 ], + "to": [ 17, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 11 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } + } + }, + { + "name": "Cube", + "from": [ 16, 7, 7 ], + "to": [ 17, 9, 18 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, + "faces": { + "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 12, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, @@ -92,74 +106,60 @@ }, { "name": "Cube", - "from": [ 15, 7, 7 ], - "to": [ 16, 9, 18 ], + "from": [ -1, 7, 7 ], + "to": [ 0, 9, 18 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 11 ] }, "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } } }, { "name": "Cube", - "from": [ 0, 7, 7 ], - "to": [ 1, 9, 18 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } - } - }, - { - "name": "Cube", - "from": [ 0, 7, -2 ], - "to": [ 1, 9, 9 ], + "from": [ -1, 7, -2 ], + "to": [ 0, 9, 7 ], "rotation": { "origin": [ 8, 8, 8 ], "axis": "x", "angle": -45.0 }, "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 11 ] } + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 9 ] } } }, { "name": "connection_n", - "from": [ 0, 7, 0 ], - "to": [ 1, 9, 8 ], + "from": [ -1, 7, 0 ], + "to": [ 0, 9, 8 ], "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 9, 2 ] }, "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 5, 7 ] } } }, { "name": "connection_s", - "from": [ 0, 7, 8 ], - "to": [ 1, 9, 16 ], + "from": [ -1, 7, 8 ], + "to": [ 0, 9, 16 ], "faces": { - "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, + "east": { "texture": "#oak_planks", "uv": [ 0, 0, 11, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, - "west": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, - "up": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] }, - "down": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 8 ] } + "west": { "texture": "#oak_planks", "uv": [ 0, 0, 10, 1 ] }, + "up": { "texture": "#oak_planks", "uv": [ 0, 0, 2, 8 ] }, + "down": { "texture": "#oak_planks", "uv": [ 0, 0, 4, 7 ] } } }, { "name": "connection_s", - "from": [ 15, 7, 8 ], - "to": [ 16, 9, 16 ], + "from": [ 16, 7, 8 ], + "to": [ 17, 9, 16 ], "faces": { "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] }, "south": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, @@ -170,8 +170,8 @@ }, { "name": "connection_n", - "from": [ 15, 7, 0 ], - "to": [ 16, 9, 8 ], + "from": [ 16, 7, 0 ], + "to": [ 17, 9, 8 ], "faces": { "north": { "texture": "#oak_planks", "uv": [ 0, 0, 1, 2 ] }, "east": { "texture": "#oak_planks", "uv": [ 0, 0, 8, 2 ] },