diff --git a/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java b/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java index 9cfd84a..c9bfc01 100644 --- a/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java +++ b/src/main/java/fr/adrien1106/reframed/client/ReFramedClient.java @@ -100,11 +100,19 @@ public class ReFramedClient implements ClientModInitializer { // --------------------- junction_t HELPER.addReFramedModel("wall_low_t" , HELPER.auto(ReFramed.id("block/wall/junction/low_t"))); HELPER.addReFramedModel("wall_tall_t" , HELPER.auto(ReFramed.id("block/wall/junction/tall_t"))); + HELPER.addReFramedModel("wall_tall_low_c_t" , HELPER.auto(ReFramed.id("block/wall/junction/tall_low_c_t"))); + HELPER.addReFramedModel("wall_tall_i_low_t" , HELPER.auto(ReFramed.id("block/wall/junction/tall_i_low_t"))); + HELPER.addReFramedModel("wall_low_i_tall_t" , HELPER.auto(ReFramed.id("block/wall/junction/low_i_tall_t"))); + HELPER.addReFramedModel("wall_low_tall_c_t" , HELPER.auto(ReFramed.id("block/wall/junction/low_tall_c_t"))); + HELPER.addReFramedModel("wall_low_c_tall_t" , HELPER.auto(ReFramed.id("block/wall/junction/low_c_tall_t"))); + HELPER.addReFramedModel("wall_tall_c_low_t" , HELPER.auto(ReFramed.id("block/wall/junction/tall_c_low_t"))); // --------------------- junction_x - HELPER.addReFramedModel("wall_junction_negative_x" , HELPER.auto(ReFramed.id("block/wall/junction/bottom_x"))); // (Axis only) - HELPER.addReFramedModel("wall_junction_both_x" , HELPER.auto(ReFramed.id("block/wall/junction/both_x"))); - HELPER.addReFramedModel("wall_junction_positive_x" , HELPER.auto(ReFramed.id("block/wall/junction/top_x"))); - HELPER.addReFramedModel("wall_junction_middle_x" , HELPER.auto(ReFramed.id("block/wall/junction/middle_x"))); + HELPER.addReFramedModel("wall_low_x" , HELPER.auto(ReFramed.id("block/wall/junction/low_x"))); + HELPER.addReFramedModel("wall_tall_x" , HELPER.auto(ReFramed.id("block/wall/junction/tall_x"))); + HELPER.addReFramedModel("wall_tall_i_low_i_x" , HELPER.auto(ReFramed.id("block/wall/junction/tall_i_low_i_x"))); + HELPER.addReFramedModel("wall_tall_low_t_x" , HELPER.auto(ReFramed.id("block/wall/junction/tall_low_t_x"))); + HELPER.addReFramedModel("wall_tall_c_low_c_x" , HELPER.auto(ReFramed.id("block/wall/junction/tall_c_low_c_x"))); + HELPER.addReFramedModel("wall_tall_t_low_x" , HELPER.auto(ReFramed.id("block/wall/junction/tall_t_low_x"))); //item model assignments (in lieu of models/item/___.json) diff --git a/src/main/java/fr/adrien1106/reframed/generator/block/Wall.java b/src/main/java/fr/adrien1106/reframed/generator/block/Wall.java index 49bfb2a..9b552fb 100644 --- a/src/main/java/fr/adrien1106/reframed/generator/block/Wall.java +++ b/src/main/java/fr/adrien1106/reframed/generator/block/Wall.java @@ -46,22 +46,33 @@ public class Wall implements RecipeSetter, TagGetter, BlockStateProvider { @Override public BlockStateSupplier getMultipart(Block block) { - Identifier side_low = ReFramed.id("wall_side_low_special"); - Identifier side_tall = ReFramed.id("wall_side_tall_special"); - Identifier pillar_low = ReFramed.id("wall_pillar_low_special"); - Identifier pillar_tall = ReFramed.id("wall_pillar_tall_special"); - Identifier pillar_none = ReFramed.id("wall_pillar_none_special"); - Identifier low_e = ReFramed.id("wall_low_e_special"); - Identifier tall_e = ReFramed.id("wall_tall_e_special"); - Identifier low_i = ReFramed.id("wall_low_i_special"); - Identifier tall_i = ReFramed.id("wall_tall_i_special"); - Identifier low_tall_i = ReFramed.id("wall_low_tall_i_special"); - Identifier low_c = ReFramed.id("wall_low_c_special"); - Identifier tall_c = ReFramed.id("wall_tall_c_special"); - Identifier low_tall_c = ReFramed.id("wall_low_tall_c_special"); - Identifier tall_low_c = ReFramed.id("wall_tall_low_c_special"); - Identifier low_t = ReFramed.id("wall_low_t_special"); - Identifier tall_t = ReFramed.id("wall_tall_t_special"); + Identifier + side_low = ReFramed.id("wall_side_low_special"), + side_tall = ReFramed.id("wall_side_tall_special"), + pillar_low = ReFramed.id("wall_pillar_low_special"), + pillar_tall = ReFramed.id("wall_pillar_tall_special"), + pillar_none = ReFramed.id("wall_pillar_none_special"), + low_e = ReFramed.id("wall_low_e_special"), + tall_e = ReFramed.id("wall_tall_e_special"), + low_i = ReFramed.id("wall_low_i_special"), + tall_i = ReFramed.id("wall_tall_i_special"), + low_tall_i = ReFramed.id("wall_low_tall_i_special"), + low_c = ReFramed.id("wall_low_c_special"), + tall_c = ReFramed.id("wall_tall_c_special"), + low_tall_c = ReFramed.id("wall_low_tall_c_special"), + tall_low_c = ReFramed.id("wall_tall_low_c_special"), + low_t = ReFramed.id("wall_low_t_special"), + tall_t = ReFramed.id("wall_tall_t_special"), + tall_low_c_t = ReFramed.id("wall_tall_low_c_t_special"), + tall_i_low_t = ReFramed.id("wall_tall_i_low_t_special"), + low_i_tall_t = ReFramed.id("wall_low_i_tall_t_special"), + low_tall_c_t = ReFramed.id("wall_low_tall_c_t_special"), + low_c_tall_t = ReFramed.id("wall_low_c_tall_t_special"), + tall_c_low_t = ReFramed.id("wall_tall_c_low_t_special"), + tall_i_low_i_x = ReFramed.id("wall_tall_i_low_i_x_special"), + tall_low_t_x = ReFramed.id("wall_tall_low_t_x_special"), + tall_c_low_c_x = ReFramed.id("wall_tall_c_low_c_x_special"), + tall_t_low_x = ReFramed.id("wall_tall_t_low_x_special"); return MultipartBlockStateSupplier.create(block) // PILLAR CORE .with(GBlockstate.when(UP, true), @@ -441,6 +452,337 @@ public class Wall implements RecipeSetter, TagGetter, BlockStateProvider { WEST_WALL_SHAPE, TALL, UP, false ), - GBlockstate.variant(tall_t, true, R0, R270)); + GBlockstate.variant(tall_t, true, R0, R270)) + // JUNCTION TALL LOW C T + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, NONE, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_low_c_t, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, NONE, + UP, false + ), + GBlockstate.variant(tall_low_c_t, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, NONE, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_low_c_t, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, NONE, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_low_c_t, true, R0, R270)) + // JUNCTION TALL I LOW T + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, NONE, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_i_low_t, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, NONE, + UP, false + ), + GBlockstate.variant(tall_i_low_t, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, NONE, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_i_low_t, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, NONE, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_i_low_t, true, R0, R270)) + // JUNCTION LOW I TALL T + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, NONE, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(low_i_tall_t, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, NONE, + UP, false + ), + GBlockstate.variant(low_i_tall_t, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, NONE, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(low_i_tall_t, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, NONE, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(low_i_tall_t, true, R0, R270)) + // JUNCTION LOW TALL C T + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, NONE, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(low_tall_c_t, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, NONE, + UP, false + ), + GBlockstate.variant(low_tall_c_t, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, NONE, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(low_tall_c_t, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, NONE, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(low_tall_c_t, true, R0, R270)) + // JUNCTION LOW C TALL T + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, NONE, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(low_c_tall_t, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, NONE, + UP, false + ), + GBlockstate.variant(low_c_tall_t, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, NONE, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(low_c_tall_t, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, NONE, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(low_c_tall_t, true, R0, R270)) + // JUNCTION TALL C LOW T + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, NONE, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_c_low_t, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, NONE, + UP, false + ), + GBlockstate.variant(tall_c_low_t, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, NONE, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_c_low_t, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, NONE, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_c_low_t, true, R0, R270)) + // JUNCTION X + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(ReFramed.id("wall_low_x_special"), true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(ReFramed.id("wall_tall_x_special"), true, R0, R0)) + // JUNCTION I X + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_i_low_i_x, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_i_low_i_x, true, R0, R90)) + // JUNCTION TALL LOW T X + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_low_t_x, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_low_t_x, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_low_t_x, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_low_t_x, true, R0, R270)) + // JUNCTION TALL C LOW C X + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_c_low_c_x, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_c_low_c_x, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_c_low_c_x, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_c_low_c_x, true, R0, R270)) + // JUNCTION TALL C LOW C X + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, LOW, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_t_low_x, true, R0, R0)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, LOW, + UP, false + ), + GBlockstate.variant(tall_t_low_x, true, R0, R90)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, LOW, + EAST_WALL_SHAPE, TALL, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_t_low_x, true, R0, R180)) + .with(GBlockstate.when( + NORTH_WALL_SHAPE, TALL, + EAST_WALL_SHAPE, LOW, + SOUTH_WALL_SHAPE, TALL, + WEST_WALL_SHAPE, TALL, + UP, false + ), + GBlockstate.variant(tall_t_low_x, true, R0, R270)); } } diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/low_c_tall_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/low_c_tall_t.json new file mode 100644 index 0000000..f600690 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/low_c_tall_t.json @@ -0,0 +1,66 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 14, 5], + "faces": { + "east": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 5], + "to": [11, 14, 11], + "faces": { + "south": {"uv": [8, 2, 11, 16], "texture": "#side"}, + "up": {"uv": [8, 5, 11, 11], "texture": "#top"}, + "down": {"uv": [8, 5, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 14, 5], + "to": [8, 16, 11], + "faces": { + "north": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "east": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "south": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "up": {"uv": [5, 5, 8, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 0, 5], + "to": [8, 14, 11], + "faces": { + "south": {"uv": [5, 2, 8, 16], "texture": "#side"}, + "down": {"uv": [5, 5, 8, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 14, 11], + "faces": { + "north": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 16, 11], + "faces": { + "north": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/low_i_tall_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/low_i_tall_t.json new file mode 100644 index 0000000..d867482 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/low_i_tall_t.json @@ -0,0 +1,65 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 16, 5], + "faces": { + "east": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top", "cullface": "up"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 8], + "to": [11, 14, 11], + "faces": { + "south": {"uv": [5, 2, 11, 16], "texture": "#side"}, + "up": {"uv": [5, 8, 11, 11], "texture": "#top"}, + "down": {"uv": [5, 5, 11, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 14, 5], + "to": [11, 16, 8], + "faces": { + "east": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "south": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "west": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "up": {"uv": [5, 5, 11, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 14, 8], + "faces": { + "down": {"uv": [5, 8, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 14, 11], + "faces": { + "north": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 14, 11], + "faces": { + "north": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/low_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/low_t.json index 541b380..22f7f21 100644 --- a/src/main/resources/assets/reframed/models/block/wall/junction/low_t.json +++ b/src/main/resources/assets/reframed/models/block/wall/junction/low_t.json @@ -15,21 +15,11 @@ "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} } }, - { - "from": [5, 0, 11], - "to": [11, 14, 12], - "faces": { - "east": {"uv": [4, 2, 5, 16], "texture": "#side"}, - "west": {"uv": [11, 2, 12, 16], "texture": "#side"}, - "up": {"uv": [5, 11, 11, 12], "texture": "#top"}, - "down": {"uv": [5, 4, 11, 5], "texture": "#bottom", "cullface": "down"} - } - }, { "from": [5, 0, 5], "to": [11, 14, 11], "faces": { - "east": {"uv": [5, 2, 11, 16], "texture": "#side"}, + "south": {"uv": [5, 2, 11, 16], "texture": "#side"}, "up": {"uv": [5, 5, 11, 11], "texture": "#top"}, "down": {"uv": [5, 5, 11, 11], "texture": "#bottom", "cullface": "down"} } @@ -43,6 +33,16 @@ "up": {"uv": [4, 5, 5, 11], "texture": "#top"}, "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} } + }, + { + "from": [11, 0, 5], + "to": [12, 14, 11], + "faces": { + "north": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/low_tall_c_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/low_tall_c_t.json new file mode 100644 index 0000000..9828e01 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/low_tall_c_t.json @@ -0,0 +1,88 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 16, 5], + "faces": { + "east": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top", "cullface": "up"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 8], + "to": [11, 14, 11], + "faces": { + "south": {"uv": [8, 2, 11, 16], "texture": "#side"}, + "up": {"uv": [8, 8, 11, 11], "texture": "#top"}, + "down": {"uv": [8, 5, 11, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 14, 5], + "to": [11, 16, 8], + "faces": { + "east": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "south": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [8, 5, 11, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 14, 8], + "to": [8, 16, 11], + "faces": { + "east": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "south": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "up": {"uv": [5, 8, 8, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 14, 5], + "to": [8, 16, 8], + "faces": { + "up": {"uv": [5, 5, 8, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 14, 8], + "faces": { + "down": {"uv": [5, 8, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 8], + "to": [8, 14, 11], + "faces": { + "south": {"uv": [5, 2, 8, 16], "texture": "#side"}, + "down": {"uv": [5, 5, 8, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 16, 11], + "faces": { + "north": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 14, 11], + "faces": { + "north": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/bottom_x.json b/src/main/resources/assets/reframed/models/block/wall/junction/low_x.json similarity index 100% rename from src/main/resources/assets/reframed/models/block/wall/junction/bottom_x.json rename to src/main/resources/assets/reframed/models/block/wall/junction/low_x.json diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_c_low_c_x.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_c_low_c_x.json new file mode 100644 index 0000000..4a960fb --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_c_low_c_x.json @@ -0,0 +1,96 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 16, 5], + "faces": { + "east": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top", "cullface": "up"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 11], + "to": [11, 14, 12], + "faces": { + "east": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "west": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [5, 11, 11, 12], "texture": "#top"}, + "down": {"uv": [5, 4, 11, 5], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 8], + "to": [8, 14, 11], + "faces": { + "up": {"uv": [5, 8, 8, 11], "texture": "#top"}, + "down": {"uv": [5, 5, 8, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 14, 8], + "to": [11, 16, 11], + "faces": { + "south": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "west": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [8, 8, 11, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 14, 5], + "to": [11, 16, 8], + "faces": { + "up": {"uv": [8, 5, 11, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 14, 5], + "to": [8, 16, 8], + "faces": { + "south": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "west": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "up": {"uv": [5, 5, 8, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 0, 5], + "to": [11, 14, 11], + "faces": { + "down": {"uv": [8, 5, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 5], + "to": [8, 14, 8], + "faces": { + "down": {"uv": [5, 8, 8, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 14, 11], + "faces": { + "north": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_c_low_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_c_low_t.json new file mode 100644 index 0000000..f4e82b7 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_c_low_t.json @@ -0,0 +1,88 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 16, 5], + "faces": { + "east": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top", "cullface": "up"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 8], + "to": [8, 14, 11], + "faces": { + "south": {"uv": [5, 2, 8, 16], "texture": "#side"}, + "up": {"uv": [5, 8, 8, 11], "texture": "#top"}, + "down": {"uv": [5, 5, 8, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 14, 5], + "to": [8, 16, 8], + "faces": { + "south": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "west": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "up": {"uv": [5, 5, 8, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 14, 8], + "to": [11, 16, 11], + "faces": { + "south": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "west": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [8, 8, 11, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 14, 5], + "to": [11, 16, 8], + "faces": { + "up": {"uv": [8, 5, 11, 8], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 14, 8], + "faces": { + "down": {"uv": [5, 8, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 8], + "to": [11, 14, 11], + "faces": { + "south": {"uv": [8, 2, 11, 16], "texture": "#side"}, + "down": {"uv": [8, 5, 11, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 14, 11], + "faces": { + "north": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_i_low_i_x.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_i_low_i_x.json new file mode 100644 index 0000000..5d382d5 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_i_low_i_x.json @@ -0,0 +1,65 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 14, 5], + "faces": { + "east": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 11], + "to": [11, 14, 12], + "faces": { + "east": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "west": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [5, 11, 11, 12], "texture": "#top"}, + "down": {"uv": [5, 4, 11, 5], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 14, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "south": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 14, 11], + "faces": { + "down": {"uv": [5, 5, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 16, 11], + "faces": { + "north": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_i_low_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_i_low_t.json new file mode 100644 index 0000000..e7949b3 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_i_low_t.json @@ -0,0 +1,56 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 14, 5], + "faces": { + "east": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 14, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "south": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 14, 11], + "faces": { + "south": {"uv": [5, 2, 11, 16], "texture": "#side"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 16, 11], + "faces": { + "north": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_low_c_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_low_c_t.json new file mode 100644 index 0000000..f47df56 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_low_c_t.json @@ -0,0 +1,66 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 14, 5], + "faces": { + "east": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 5], + "to": [8, 14, 11], + "faces": { + "south": {"uv": [5, 2, 8, 16], "texture": "#side"}, + "up": {"uv": [5, 5, 8, 11], "texture": "#top"}, + "down": {"uv": [5, 5, 8, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 14, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "south": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "west": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [8, 5, 11, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 0, 5], + "to": [11, 14, 11], + "faces": { + "south": {"uv": [8, 2, 11, 16], "texture": "#side"}, + "down": {"uv": [8, 5, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 14, 11], + "faces": { + "north": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_low_t_x.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_low_t_x.json new file mode 100644 index 0000000..f4ae770 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_low_t_x.json @@ -0,0 +1,74 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 14, 5], + "faces": { + "east": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 11], + "to": [11, 14, 12], + "faces": { + "east": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "west": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [5, 11, 11, 12], "texture": "#top"}, + "down": {"uv": [5, 4, 11, 5], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 5], + "to": [8, 14, 11], + "faces": { + "up": {"uv": [5, 5, 8, 11], "texture": "#top"}, + "down": {"uv": [5, 5, 8, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 14, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 0, 8, 2], "texture": "#side"}, + "south": {"uv": [8, 0, 11, 2], "texture": "#side"}, + "west": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [8, 5, 11, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 0, 5], + "to": [11, 14, 11], + "faces": { + "down": {"uv": [8, 5, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 14, 11], + "faces": { + "north": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_t.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_t.json index 889a4f3..6389879 100644 --- a/src/main/resources/assets/reframed/models/block/wall/junction/tall_t.json +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_t.json @@ -15,21 +15,11 @@ "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} } }, - { - "from": [5, 0, 11], - "to": [11, 16, 12], - "faces": { - "east": {"uv": [4, 0, 5, 16], "texture": "#side"}, - "west": {"uv": [11, 0, 12, 16], "texture": "#side"}, - "up": {"uv": [5, 11, 11, 12], "texture": "#top", "cullface": "up"}, - "down": {"uv": [5, 4, 11, 5], "texture": "#bottom", "cullface": "down"} - } - }, { "from": [5, 0, 5], "to": [11, 16, 11], "faces": { - "east": {"uv": [5, 0, 11, 16], "texture": "#side"}, + "south": {"uv": [5, 0, 11, 16], "texture": "#side"}, "up": {"uv": [5, 5, 11, 11], "texture": "#top", "cullface": "up"}, "down": {"uv": [5, 5, 11, 11], "texture": "#bottom", "cullface": "down"} } @@ -43,6 +33,16 @@ "up": {"uv": [4, 5, 5, 11], "texture": "#top", "cullface": "up"}, "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/tall_t_low_x.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_t_low_x.json new file mode 100644 index 0000000..38fdc54 --- /dev/null +++ b/src/main/resources/assets/reframed/models/block/wall/junction/tall_t_low_x.json @@ -0,0 +1,64 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [5, 0, 4], + "to": [11, 16, 5], + "faces": { + "east": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "west": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [5, 4, 11, 5], "texture": "#top", "cullface": "up"}, + "down": {"uv": [5, 11, 11, 12], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 0, 11], + "to": [11, 14, 12], + "faces": { + "east": {"uv": [4, 2, 5, 16], "texture": "#side"}, + "west": {"uv": [11, 2, 12, 16], "texture": "#side"}, + "up": {"uv": [5, 11, 11, 12], "texture": "#top"}, + "down": {"uv": [5, 4, 11, 5], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [5, 14, 5], + "to": [11, 16, 11], + "faces": { + "south": {"uv": [5, 0, 11, 2], "texture": "#side"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [5, 0, 5], + "to": [11, 14, 11], + "faces": { + "down": {"uv": [5, 5, 11, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [4, 0, 5], + "to": [5, 16, 11], + "faces": { + "north": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "south": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "up": {"uv": [4, 5, 5, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [4, 5, 5, 11], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [11, 0, 5], + "to": [12, 16, 11], + "faces": { + "north": {"uv": [4, 0, 5, 16], "texture": "#side"}, + "south": {"uv": [11, 0, 12, 16], "texture": "#side"}, + "up": {"uv": [11, 5, 12, 11], "texture": "#top", "cullface": "up"}, + "down": {"uv": [11, 5, 12, 11], "texture": "#bottom", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/reframed/models/block/wall/junction/both_x.json b/src/main/resources/assets/reframed/models/block/wall/junction/tall_x.json similarity index 100% rename from src/main/resources/assets/reframed/models/block/wall/junction/both_x.json rename to src/main/resources/assets/reframed/models/block/wall/junction/tall_x.json