Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 06:53:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Such Block, much textures.

Browse source 
Just a big ol' pile of texture changes.
This commit is contained in:
Kryppers 2023-03-23 21:38:43 +00:00
parent 61dc173311
commit 130737b140
83 changed files with 623 additions and 1245 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/simibubi/create/AllBlocks.java
View file

@ -692,6 +692,7 @@ public class AllBlocks {
.properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK))
.transform(pickaxeOnly()) .transform(pickaxeOnly())
.blockstate(new BasinGenerator()::generate) .blockstate(new BasinGenerator()::generate)
.addLayer(() -> RenderType::cutoutMipped)
.onRegister(movementBehaviour(new BasinMovementBehaviour())) .onRegister(movementBehaviour(new BasinMovementBehaviour()))
.item() .item()
.transform(customItemModel("_", "block")) .transform(customItemModel("_", "block"))

2
src/main/java/com/simibubi/create/AllSpriteShifts.java
View file

@ -81,7 +81,7 @@ public class AllSpriteShifts {
public static final SpriteShiftEntry BELT = get("block/belt", "block/belt_scroll"), public static final SpriteShiftEntry BELT = get("block/belt", "block/belt_scroll"),
BELT_OFFSET = get("block/belt_offset", "block/belt_scroll"), BELT_OFFSET = get("block/belt_offset", "block/belt_scroll"),
BELT_DIAGONAL = get("block/belt_diagonal", "block/belt_diagonal_scroll"), BELT_DIAGONAL = get("block/belt_diagonal", "block/belt_diagonal_scroll"),
ANDESIDE_BELT_CASING = get("block/brass_casing_belt", "block/andesite_casing_belt"), ANDESIDE_BELT_CASING = get("block/belt/brass_belt_casing", "block/belt/andesite_belt_casing"),
CRAFTER_THINGIES = get("block/crafter_thingies", "block/crafter_thingies"); CRAFTER_THINGIES = get("block/crafter_thingies", "block/crafter_thingies");
static { static {

90
src/main/resources/assets/create/models/block/basin/block.json
View file

@ -2,75 +2,45 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"1": "create:block/basin_side",
"12": "create:block/basin", "12": "create:block/basin",
"particle": "create:block/basin" "particle": "create:block/basin"
}, },
"elements": [ "elements": [
{ {
"name": "Side1", "name": "Basin",
"from": [0, 2, 0], "from": [0, 2, 0],
"to": [2, 16, 16], "to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
"faces": { "faces": {
"north": {"uv": [14, 0, 16, 14], "texture": "#1"}, "north": {"uv": [0, 0, 8, 7], "texture": "#12"},
"east": {"uv": [0, 0, 16, 14], "texture": "#1"}, "east": {"uv": [0, 0, 8, 7], "texture": "#12"},
"south": {"uv": [0, 0, 2, 14], "texture": "#1"}, "south": {"uv": [0, 0, 8, 7], "texture": "#12"},
"west": {"uv": [0, 0, 16, 14], "texture": "#1"}, "west": {"uv": [0, 0, 8, 7], "texture": "#12"},
"up": {"uv": [0, 0, 2, 16], "texture": "#12"}, "up": {"uv": [0, 8, 8, 16], "texture": "#12"},
"down": {"uv": [0, 0, 2, 16], "texture": "#12"} "down": {"uv": [0, 8, 8, 16], "texture": "#12"}
} }
}, },
{ {
"name": "BasinBottom", "name": "Basin Interior",
"from": [2, 16, 2],
"to": [14, 2, 14],
"faces": {
"north": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#12"},
"east": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#12"},
"south": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#12"},
"west": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#12"},
"up": {"uv": [9, 9, 15, 15], "rotation": 90, "texture": "#12"}
}
},
{
"name": "Basin Base",
"from": [2, 0, 2], "from": [2, 0, 2],
"to": [14, 2, 14], "to": [14, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 25, 8]},
"faces": { "faces": {
"north": {"uv": [2, 14, 14, 16], "texture": "#1"}, "north": {"uv": [1, 7, 7, 8], "texture": "#12"},
"east": {"uv": [2, 14, 14, 16], "texture": "#1"}, "east": {"uv": [1, 7, 7, 8], "texture": "#12"},
"south": {"uv": [2, 14, 14, 16], "texture": "#1"}, "south": {"uv": [1, 7, 7, 8], "texture": "#12"},
"west": {"uv": [2, 14, 14, 16], "texture": "#1"}, "west": {"uv": [1, 7, 7, 8], "texture": "#12"},
"up": {"uv": [2, 2, 14, 14], "texture": "#12"}, "down": {"uv": [9, 9, 15, 15], "texture": "#12"}
"down": {"uv": [2, 2, 14, 14], "texture": "#12"}
}
},
{
"name": "Side4",
"from": [2, 2, 0],
"to": [14, 16, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
"faces": {
"north": {"uv": [2, 0, 14, 14], "texture": "#1"},
"south": {"uv": [2, 0, 14, 14], "texture": "#1"},
"up": {"uv": [2, 0, 14, 2], "texture": "#12"},
"down": {"uv": [2, 14, 14, 16], "texture": "#12"}
}
},
{
"name": "Side2",
"from": [2, 2, 14],
"to": [14, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
"faces": {
"north": {"uv": [2, 0, 14, 14], "texture": "#1"},
"south": {"uv": [2, 0, 14, 14], "texture": "#1"},
"up": {"uv": [2, 14, 14, 16], "texture": "#12"},
"down": {"uv": [2, 0, 14, 2], "texture": "#12"}
}
},
{
"name": "Side3",
"from": [14, 2, 0],
"to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 40, 8]},
"faces": {
"north": {"uv": [0, 0, 2, 14], "texture": "#1"},
"east": {"uv": [0, 0, 16, 14], "texture": "#1"},
"south": {"uv": [14, 0, 16, 14], "texture": "#1"},
"west": {"uv": [0, 0, 16, 14], "texture": "#1"},
"up": {"uv": [14, 0, 16, 16], "texture": "#12"},
"down": {"uv": [14, 0, 16, 16], "texture": "#12"}
} }
} }
], ],
@ -78,7 +48,11 @@
{ {
"name": "Basin", "name": "Basin",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"children": [0, 1, 2, 3, 4] "color": 0,
} "children": []
},
0,
1,
2
] ]
} }

258
src/main/resources/assets/create/models/block/basin/block_directional.json
View file

@ -2,212 +2,93 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"1": "create:block/basin_side", "1": "create:block/basin",
"2": "create:block/basin_canal", "2": "create:block/basin_canal"
"12": "create:block/basin",
"particle": "create:block/basin"
}, },
"elements": [ "elements": [
{ {
"name": "Side1", "name": "Basin",
"from": [14, 2, 0], "from": [0, 2, 0],
"to": [16, 16, 16], "to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0, 2, 14], "texture": "#1"}, "north": {"uv": [0, 0, 8, 7], "texture": "#1"},
"east": {"uv": [0, 0, 16, 14], "texture": "#1"}, "east": {"uv": [0, 0, 8, 7], "texture": "#1"},
"south": {"uv": [14, 0, 16, 14], "texture": "#1"}, "south": {"uv": [0, 0, 8, 7], "texture": "#1"},
"west": {"uv": [0, 0, 16, 14], "texture": "#1"}, "west": {"uv": [0, 0, 8, 7], "texture": "#1"},
"up": {"uv": [0, 0, 2, 16], "rotation": 180, "texture": "#12"}, "up": {"uv": [0, 8, 8, 16], "texture": "#1"},
"down": {"uv": [0, 0, 2, 16], "rotation": 180, "texture": "#12"} "down": {"uv": [0, 8, 8, 16], "texture": "#1"}
} }
}, },
{ {
"name": "BasinBottom", "name": "Basin Interior",
"from": [2, 16, 2],
"to": [14, 2, 14],
"faces": {
"north": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#1"},
"east": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#1"},
"south": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#1"},
"west": {"uv": [9, 0, 15, 7], "rotation": 180, "texture": "#1"},
"up": {"uv": [9, 9, 15, 15], "rotation": 90, "texture": "#1"}
}
},
{
"name": "Basin Base",
"from": [2, 0, 2], "from": [2, 0, 2],
"to": [14, 2, 14], "to": [14, 2, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 25, 8]},
"faces": { "faces": {
"north": {"uv": [2, 14, 14, 16], "texture": "#1"}, "north": {"uv": [1, 7, 7, 8], "texture": "#1"},
"east": {"uv": [2, 14, 14, 16], "texture": "#1"}, "east": {"uv": [1, 7, 7, 8], "texture": "#1"},
"south": {"uv": [2, 14, 14, 16], "texture": "#1"}, "south": {"uv": [1, 7, 7, 8], "texture": "#1"},
"west": {"uv": [2, 14, 14, 16], "texture": "#1"}, "west": {"uv": [1, 7, 7, 8], "texture": "#1"},
"up": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#12"}, "down": {"uv": [9, 9, 15, 15], "texture": "#1"}
"down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#12"}
}
},
{
"name": "Side4",
"from": [2, 2, 14],
"to": [14, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
"faces": {
"north": {"uv": [2, 0, 14, 14], "texture": "#1"},
"south": {"uv": [2, 0, 14, 14], "texture": "#1"},
"up": {"uv": [2, 0, 14, 2], "rotation": 180, "texture": "#12"},
"down": {"uv": [2, 14, 14, 16], "rotation": 180, "texture": "#12"}
}
},
{
"name": "Side2",
"from": [2, 2, 0],
"to": [14, 16, 2],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 24, 8]},
"faces": {
"north": {"uv": [2, 0, 14, 14], "texture": "#1"},
"south": {"uv": [2, 0, 14, 14], "texture": "#1"},
"up": {"uv": [2, 14, 14, 16], "rotation": 180, "texture": "#12"},
"down": {"uv": [2, 0, 14, 2], "rotation": 180, "texture": "#12"}
}
},
{
"name": "Side3",
"from": [0, 2, 0],
"to": [2, 16, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 40, 8]},
"faces": {
"north": {"uv": [14, 0, 16, 14], "texture": "#1"},
"east": {"uv": [0, 0, 16, 14], "texture": "#1"},
"south": {"uv": [0, 0, 2, 14], "texture": "#1"},
"west": {"uv": [0, 0, 16, 14], "texture": "#1"},
"up": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#12"},
"down": {"uv": [14, 0, 16, 16], "rotation": 180, "texture": "#12"}
}
},
{
"from": [12, 0, 14],
"to": [13, 2, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 8]},
"faces": {
"north": {"uv": [14, 10, 16, 11], "rotation": 90, "texture": "#2"},
"east": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#2"},
"south": {"uv": [0, 0, 10, 2], "texture": "#2"},
"west": {"uv": [14, 10, 16, 12], "texture": "#2"},
"up": {"uv": [14, 10, 15, 12], "texture": "#2"},
"down": {"uv": [15, 10, 16, 12], "rotation": 180, "texture": "#2"}
} }
}, },
{ {
"from": [3, 0, 14], "from": [3, 0, 14],
"to": [4, 2, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [-4, 8, 8]},
"faces": {
"north": {"uv": [14, 10, 16, 11], "rotation": 90, "texture": "#2"},
"east": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#2"},
"south": {"uv": [0, 0, 10, 2], "texture": "#2"},
"west": {"uv": [14, 10, 16, 12], "texture": "#2"},
"up": {"uv": [14, 10, 15, 12], "texture": "#2"},
"down": {"uv": [15, 10, 16, 12], "rotation": 180, "texture": "#2"}
}
},
{
"from": [4, 0, 14],
"to": [12, 1, 17],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 9]},
"faces": {
"north": {"uv": [8, 14, 9, 15], "rotation": 90, "texture": "#2"},
"east": {"uv": [14, 10, 16, 12], "rotation": 90, "texture": "#2"},
"south": {"uv": [7, 15, 15, 16], "texture": "#2"},
"west": {"uv": [14, 10, 16, 12], "texture": "#2"},
"up": {"uv": [11, 10, 12, 11], "texture": "#2"},
"down": {"uv": [7, 13, 15, 16], "rotation": 180, "texture": "#2"}
}
},
{
"from": [12, 0, 16],
"to": [13, 10, 17], "to": [13, 10, 17],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 8, 9]},
"faces": { "faces": {
"north": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"}, "east": {"uv": [13, 10, 10, 0], "rotation": 180, "texture": "#2"},
"east": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"}, "south": {"uv": [0, 0, 10, 10], "texture": "#2"},
"south": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"}, "west": {"uv": [10, 10, 13, 0], "rotation": 180, "texture": "#2"},
"west": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"}, "up": {"uv": [0, 10, 10, 13], "texture": "#2"},
"up": {"uv": [6, 12, 7, 13], "rotation": 180, "texture": "#2"}, "down": {"uv": [13, 0, 16, 10], "rotation": 90, "texture": "#2"}
"down": {"uv": [15, 12, 16, 13], "rotation": 180, "texture": "#2"}
}
},
{
"from": [4, 9, 16],
"to": [12, 10, 17],
"rotation": {"angle": 0, "axis": "y", "origin": [4, 8, 9]},
"faces": {
"north": {"uv": [8, 9, 16, 10], "texture": "#2"},
"south": {"uv": [8, 9, 16, 10], "texture": "#2"},
"up": {"uv": [8, 9, 16, 10], "rotation": 180, "texture": "#2"}
}
},
{
"from": [3, 0, 16],
"to": [4, 10, 17],
"rotation": {"angle": 0, "axis": "y", "origin": [-4, 8, 9]},
"faces": {
"north": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"},
"east": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"},
"south": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"},
"west": {"uv": [6, 12, 16, 13], "rotation": 90, "texture": "#2"},
"up": {"uv": [6, 12, 7, 13], "rotation": 180, "texture": "#2"},
"down": {"uv": [15, 12, 16, 13], "rotation": 180, "texture": "#2"}
}
},
{
"from": [5, 1, 13],
"to": [11, 2, 22],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 9, 17]},
"faces": {
"north": {"uv": [9, 7, 15, 8], "texture": "#2"},
"east": {"uv": [0, 0, 9, 1], "texture": "#2"},
"south": {"uv": [9, 7, 15, 8], "texture": "#2"},
"west": {"uv": [0, 0, 9, 1], "texture": "#2"},
"up": {"uv": [1, 0, 7, 9], "rotation": 180, "texture": "#2"},
"down": {"uv": [1, 0, 7, 9], "texture": "#2"}
}
},
{
"from": [5, 8, 13],
"to": [11, 9, 22],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 9, 17]},
"faces": {
"north": {"uv": [9, 0, 15, 1], "texture": "#2"},
"east": {"uv": [0, 0, 9, 1], "texture": "#2"},
"south": {"uv": [9, 0, 15, 1], "texture": "#2"},
"west": {"uv": [0, 0, 9, 1], "texture": "#2"},
"up": {"uv": [1, 0, 7, 9], "texture": "#2"},
"down": {"uv": [1, 0, 7, 9], "rotation": 180, "texture": "#2"}
}
},
{
"from": [5, 2, 14],
"to": [11, 8, 20],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 9, 17]},
"faces": {
"north": {"uv": [9, 1, 15, 7], "texture": "#2"},
"south": {"uv": [9, 1, 15, 7], "texture": "#2"}
} }
}, },
{ {
"from": [4, 1, 13], "from": [4, 1, 13],
"to": [5, 9, 22], "to": [12, 9, 22],
"rotation": {"angle": 22.5, "axis": "x", "origin": [1, 9, 17]}, "rotation": {"angle": 22.5, "axis": "x", "origin": [1, 9, 17]},
"faces": { "faces": {
"north": {"uv": [15, 0, 16, 8], "texture": "#2"}, "north": {"uv": [1, 1, 9, 9], "texture": "#2"},
"east": {"uv": [0, 0, 8, 9], "rotation": 90, "texture": "#2"}, "east": {"uv": [1, 8, 9, 16], "rotation": 90, "texture": "#2"},
"south": {"uv": [8, 0, 9, 8], "texture": "#2"}, "south": {"uv": [1, 1, 9, 9], "texture": "#2"},
"west": {"uv": [0, 0, 8, 9], "rotation": 270, "texture": "#2"}, "west": {"uv": [9, 8, 1, 16], "rotation": 270, "texture": "#2"},
"up": {"uv": [0, 0, 1, 9], "texture": "#2"}, "up": {"uv": [1, 8, 9, 16], "texture": "#2"},
"down": {"uv": [0, 0, 1, 9], "rotation": 180, "texture": "#2"} "down": {"uv": [1, 8, 9, 16], "rotation": 180, "texture": "#2"}
} }
}, },
{ {
"from": [11, 1, 13], "from": [5, 2, 22],
"to": [12, 9, 22], "to": [11, 8, 21],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 9, 17]}, "rotation": {"angle": 22.5, "axis": "x", "origin": [1, 9, 17]},
"faces": { "faces": {
"north": {"uv": [8, 0, 9, 8], "texture": "#2"}, "east": {"uv": [15, 1, 16, 9], "texture": "#2"},
"east": {"uv": [0, 0, 8, 9], "rotation": 90, "texture": "#2"}, "south": {"uv": [10, 10, 16, 16], "texture": "#2"},
"south": {"uv": [15, 0, 16, 8], "texture": "#2"}, "west": {"uv": [15, 1, 16, 9], "texture": "#2"},
"west": {"uv": [0, 0, 8, 9], "rotation": 90, "texture": "#2"}, "up": {"uv": [15, 1, 16, 9], "rotation": 90, "texture": "#2"},
"up": {"uv": [0, 0, 1, 9], "texture": "#2"}, "down": {"uv": [15, 1, 16, 9], "rotation": 90, "texture": "#2"}
"down": {"uv": [0, 0, 1, 9], "rotation": 180, "texture": "#2"} }
},
{
"from": [5, 3.64387, 12.73569],
"to": [11, 9.64387, 11.73569],
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 6.64387, 12.23569]},
"faces": {
"north": {"uv": [10, 10, 16, 16], "rotation": 180, "texture": "#2"},
"east": {"uv": [15, 1, 16, 9], "rotation": 180, "texture": "#2"},
"west": {"uv": [15, 1, 16, 9], "rotation": 180, "texture": "#2"},
"up": {"uv": [15, 1, 16, 9], "rotation": 90, "texture": "#2"},
"down": {"uv": [15, 1, 16, 9], "rotation": 90, "texture": "#2"}
} }
} }
], ],
@ -215,23 +96,14 @@
{ {
"name": "Basins", "name": "Basins",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"children": [ "color": 0,
{ "children": [0, 1, 2]
"name": "Basin top",
"origin": [8, 8, 8],
"children": [0, 1, 2, 3, 4]
}
]
}, },
{ {
"name": "Canal", "name": "Spoutput",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"children": [ "color": 0,
{ "children": [3, 4, 5, 6]
"name": "Frame",
"origin": [8, 8, 8],
"children": [5, 6, 7, 8, 9, 10]
}, 11, 12, 13, 14, 15]
} }
] ]
} }

2
src/main/resources/assets/create/models/block/bearing/block.json
View file

@ -24,7 +24,7 @@
"from": [ 0, 0, 0 ], "from": [ 0, 0, 0 ],
"to": [ 2, 12, 16 ], "to": [ 2, 12, 16 ],
"faces": { "faces": {
"north": { "texture": "#bearing_side", "uv": [ 13, 4, 16, 16 ] }, "north": { "texture": "#bearing_side", "uv": [ 14, 4, 16, 16 ] },
"east": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] }, "east": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] },
"south": { "texture": "#bearing_side", "uv": [ 0, 4, 2, 16 ] }, "south": { "texture": "#bearing_side", "uv": [ 0, 4, 2, 16 ] },
"west": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] }, "west": { "texture": "#bearing_side", "uv": [ 0, 4, 16, 16 ] },

2
src/main/resources/assets/create/models/block/belt_funnel/block_extended.json
View file

@ -82,7 +82,7 @@
{ {
"name": "Back", "name": "Back",
"from": [2.05, -2, 14], "from": [2.05, -2, 14],
"to": [13.95, 13.95, 18], "to": [13.95, 13.95, 18.1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]},
"faces": { "faces": {
"north": {"uv": [4, 0, 16, 16], "texture": "#redstone"}, "north": {"uv": [4, 0, 16, 16], "texture": "#redstone"},

2
src/main/resources/assets/create/models/block/belt_funnel/block_pulling.json
View file

@ -12,7 +12,7 @@
{ {
"name": "Back", "name": "Back",
"from": [2.05, -2, 14], "from": [2.05, -2, 14],
"to": [13.95, 13.95, 18], "to": [13.95, 13.95, 18.1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]},
"faces": { "faces": {
"north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"}, "north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"},

2
src/main/resources/assets/create/models/block/belt_funnel/block_pushing.json
View file

@ -12,7 +12,7 @@
{ {
"name": "Back", "name": "Back",
"from": [2.05, -2, 14], "from": [2.05, -2, 14],
"to": [13.95, 13.95, 18], "to": [13.95, 13.95, 18.1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]},
"faces": { "faces": {
"north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"}, "north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"},

2
src/main/resources/assets/create/models/block/belt_funnel/block_retracted.json
View file

@ -58,7 +58,7 @@
{ {
"name": "Back", "name": "Back",
"from": [2.05, -2, 12], "from": [2.05, -2, 12],
"to": [13.95, 13.95, 18], "to": [13.95, 13.95, 18.1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]},
"faces": { "faces": {
"north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"}, "north": {"uv": [0, 0, 6, 8], "rotation": 180, "texture": "#base"},

123
src/main/resources/assets/create/models/block/chute/block.json
View file

@ -2,120 +2,63 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"13": "create:block/chute", "2": "create:block/chute",
"particle": "block/hopper_outside" "3": "create:block/chute_hole",
"particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{
"from": [3, 8, 1],
"to": [13, 16, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, -3]},
"faces": {
"north": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
"south": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
"up": {"uv": [1, 0, 6, 1], "texture": "#13"},
"down": {"uv": [1, 6, 6, 7], "texture": "#13"}
}
},
{
"from": [3, 8, 13],
"to": [13, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 19]},
"faces": {
"north": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
"south": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
"up": {"uv": [1, 0, 6, 1], "rotation": 180, "texture": "#13"},
"down": {"uv": [1, 6, 6, 7], "rotation": 180, "texture": "#13"}
}
},
{ {
"from": [1, 8, 1], "from": [1, 8, 1],
"to": [3, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 16, 9]},
"faces": {
"north": {"uv": [14.5, 0, 15.5, 4], "texture": "#13"},
"east": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
"south": {"uv": [8.5, 0, 9.5, 4], "texture": "#13"},
"west": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
"up": {"uv": [0, 0, 1, 7], "texture": "#13"},
"down": {"uv": [0, 0, 1, 7], "texture": "#13"}
}
},
{
"from": [13, 8, 1],
"to": [15, 16, 15], "to": [15, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 16, 7]},
"faces": { "faces": {
"north": {"uv": [8.5, 0, 9.5, 4], "texture": "#13"}, "north": {"uv": [8.5, 0, 15.5, 4], "texture": "#2"},
"east": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"}, "east": {"uv": [8.5, 0, 15.5, 4], "texture": "#2"},
"south": {"uv": [14.5, 0, 15.5, 4], "texture": "#13"}, "south": {"uv": [8.5, 0, 15.5, 4], "texture": "#2"},
"west": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"}, "west": {"uv": [8.5, 0, 15.5, 4], "texture": "#2"},
"up": {"uv": [0, 0, 1, 7], "rotation": 180, "texture": "#13"}, "up": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#2"},
"down": {"uv": [0, 0, 1, 7], "rotation": 180, "texture": "#13"} "down": {"uv": [0.5, 8.5, 7.5, 15.5], "texture": "#2"}
}
},
{
"from": [13, 0, 2],
"to": [14, 8, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]},
"faces": {
"north": {"uv": [9, 4, 9.5, 8], "texture": "#13"},
"east": {"uv": [9, 4, 15, 8], "texture": "#13"},
"south": {"uv": [14.5, 4, 15, 8], "texture": "#13"},
"west": {"uv": [9, 4, 15, 8], "texture": "#13"},
"down": {"uv": [9, 7.5, 15, 8], "rotation": 90, "texture": "#13"}
} }
}, },
{ {
"from": [2, 0, 2], "from": [2, 0, 2],
"to": [3, 8, 14], "to": [14, 8, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]},
"faces": { "faces": {
"north": {"uv": [14.5, 4, 15, 8], "texture": "#13"}, "north": {"uv": [9, 4, 15, 8], "texture": "#2"},
"east": {"uv": [9, 4, 15, 8], "texture": "#13"}, "east": {"uv": [9, 4, 15, 8], "texture": "#2"},
"south": {"uv": [9, 4, 9.5, 8], "texture": "#13"}, "south": {"uv": [9, 4, 15, 8], "texture": "#2"},
"west": {"uv": [9, 4, 15, 8], "texture": "#13"}, "west": {"uv": [9, 4, 15, 8], "texture": "#2"},
"down": {"uv": [9, 7.5, 15, 8], "rotation": 90, "texture": "#13"} "down": {"uv": [9, 9, 15, 15], "texture": "#2"}
} }
}, },
{ {
"from": [3, 0, 13], "from": [3, 0, 13],
"to": [13, 8, 14], "to": [13, 2, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 20]},
"faces": { "faces": {
"north": {"uv": [9.5, 4, 14.5, 8], "texture": "#13"}, "north": {"uv": [9.5, 7, 14.5, 8], "texture": "#2"},
"south": {"uv": [9.5, 4, 14.5, 8], "texture": "#13"}, "east": {"uv": [9.5, 7, 14.5, 8], "texture": "#2"},
"down": {"uv": [9.5, 7.5, 14.5, 8], "texture": "#13"} "south": {"uv": [9.5, 7, 14.5, 8], "texture": "#2"},
"west": {"uv": [9.5, 7, 14.5, 8], "texture": "#2"},
"up": {"uv": [3, 3, 13, 13], "texture": "#3"}
} }
}, },
{ {
"from": [3, 0, 2], "from": [3, 14, 13],
"to": [13, 8, 3], "to": [13, 16, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]},
"faces": { "faces": {
"north": {"uv": [9.5, 4, 14.5, 8], "texture": "#13"}, "north": {"uv": [9.5, 0, 14.5, 1], "texture": "#2"},
"south": {"uv": [9.5, 4, 14.5, 8], "texture": "#13"}, "east": {"uv": [9.5, 0, 14.5, 1], "texture": "#2"},
"down": {"uv": [9.5, 7.5, 14.5, 8], "texture": "#13"} "south": {"uv": [9.5, 0, 14.5, 1], "texture": "#2"},
} "west": {"uv": [9.5, 0, 14.5, 1], "texture": "#2"},
}, "down": {"uv": [3, 3, 13, 13], "texture": "#3"}
{
"from": [3, 13, 3],
"to": [13, 14, 13],
"faces": {
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"},
"down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"}
} }
} }
], ],
"groups": [ "groups": [
{ {
"name": "ChuteTop", "name": "New",
"origin": [9, 16, -7], "origin": [0, 0, 0],
"color": 0,
"children": [0, 1, 2, 3] "children": [0, 1, 2, 3]
}, }
{ ]
"name": "ChuteBase",
"origin": [8, 8, -7],
"children": [4, 5, 6, 7]
}, 8]
} }

52
src/main/resources/assets/create/models/block/chute/block_diagonal.json
View file

@ -2,55 +2,43 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"0": "create:block/chute", "3": "create:block/chute_large",
"1": "create:block/chute_diagonal", "4": "create:block/chute",
"particle": "block/hopper_inside" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {
"from": [1.1, -11, 2], "from": [1.1, -12, 2],
"to": [14.9, 0, 16], "to": [14.9, 0, 16],
"rotation": {"angle": 45, "axis": "x", "origin": [8, 0, 16]}, "rotation": {"angle": 45, "axis": "x", "origin": [8, 0, 16]},
"faces": { "faces": {
"north": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "north": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#3"},
"east": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "east": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#3"},
"south": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "south": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#3"},
"west": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "west": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#3"},
"up": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"}, "up": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#4"},
"down": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"} "down": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#4"}
} }
}, },
{ {
"from": [4, -16, -2], "from": [4, -16, -1],
"to": [12, -4.4, 0], "to": [12, -5.4, 0],
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]}, "rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
"faces": { "faces": {
"east": {"uv": [6, 8.5, 7, 14.5], "texture": "#1"}, "east": {"uv": [6.5, 9.5, 7, 15], "texture": "#3"},
"south": {"uv": [2, 8.5, 6, 14.5], "texture": "#1"}, "south": {"uv": [2, 9.5, 6, 15], "texture": "#3"},
"west": {"uv": [1, 8.5, 2, 14.5], "texture": "#1"}, "west": {"uv": [1, 9.5, 1.5, 15], "texture": "#3"}
"down": {"uv": [0, 0, 8, 2], "rotation": 180, "texture": "#1"}
}
},
{
"from": [2.1, -16, -7],
"to": [13.9, -4.4, -2],
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
"faces": {
"east": {"uv": [9, 1, 11.5, 7], "texture": "#1"},
"south": {"uv": [9, 1, 15, 7], "texture": "#1"},
"west": {"uv": [12.5, 1, 15, 7], "texture": "#1"},
"down": {"uv": [9, 12.5, 15, 15], "rotation": 180, "texture": "#0"}
} }
}, },
{ {
"from": [2.1, -16, -13], "from": [2.1, -16, -13],
"to": [13.9, -4.4, -7], "to": [13.9, -5.4, -1],
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]}, "rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
"faces": { "faces": {
"north": {"uv": [9, 1, 15, 7], "texture": "#1"}, "north": {"uv": [9, 1.5, 15, 7], "texture": "#3"},
"east": {"uv": [11.5, 1, 15, 7], "texture": "#1"}, "east": {"uv": [9, 1.5, 15, 7], "texture": "#3"},
"west": {"uv": [9, 1, 12.5, 7], "texture": "#1"}, "south": {"uv": [9, 1.5, 15, 7], "texture": "#3"},
"down": {"uv": [9, 9, 15, 12], "rotation": 180, "texture": "#0"} "west": {"uv": [9, 1.5, 15, 7], "texture": "#3"}
} }
} }
] ]

155
src/main/resources/assets/create/models/block/chute/block_diagonal_intersection.json
View file

@ -2,120 +2,81 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"0": "create:block/chute", "3": "create:block/chute",
"1": "create:block/chute_diagonal", "4": "create:block/chute_large",
"particle": "block/hopper_inside" "5": "create:block/chute_hole",
"particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {
"from": [1.1, -11, 2], "from": [0, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#particle"},
"east": {"uv": [0, 0, 16, 16], "texture": "#particle"},
"south": {"uv": [0, 0, 16, 16], "texture": "#particle"},
"west": {"uv": [0, 0, 16, 16], "texture": "#particle"},
"up": {"uv": [0, 0, 8, 8], "texture": "#4"},
"down": {"uv": [0, 0, 8, 8], "texture": "#4"}
}
},
{
"from": [3, 14, 13],
"to": [13, 16, 3],
"faces": {
"north": {"uv": [9.5, 0, 14.5, 1], "texture": "#3"},
"east": {"uv": [9.5, 0, 14.5, 1], "texture": "#3"},
"south": {"uv": [9.5, 0, 14.5, 1], "texture": "#3"},
"west": {"uv": [9.5, 0, 14.5, 1], "texture": "#3"},
"down": {"uv": [3, 3, 13, 13], "texture": "#5"}
}
},
{
"from": [4, -16, -1],
"to": [12, -5.2, 0],
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
"faces": {
"east": {"uv": [6.5, 9.5, 7, 15], "texture": "#4"},
"south": {"uv": [2, 9.5, 6, 15], "texture": "#4"},
"west": {"uv": [1, 9.5, 1.5, 15], "texture": "#4"}
}
},
{
"from": [1.1, -11.8, 2],
"to": [14.9, 0, 16], "to": [14.9, 0, 16],
"rotation": {"angle": 45, "axis": "x", "origin": [8, 0, 16]}, "rotation": {"angle": 45, "axis": "x", "origin": [8, 0, 16]},
"faces": { "faces": {
"north": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "north": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#4"},
"east": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "east": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#4"},
"south": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "south": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#4"},
"west": {"uv": [8.5, 8.5, 15.5, 14], "texture": "#1"}, "west": {"uv": [8.5, 9.5, 15.5, 15], "texture": "#4"},
"up": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"}, "down": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#3"}
"down": {"uv": [8.5, 8.5, 15.5, 15.5], "rotation": 180, "texture": "#0"}
}
},
{
"from": [4, -16, -2],
"to": [12, -4.4, 0],
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
"faces": {
"east": {"uv": [6, 8.5, 7, 14.5], "texture": "#1"},
"south": {"uv": [2, 8.5, 6, 14.5], "texture": "#1"},
"west": {"uv": [1, 8.5, 2, 14.5], "texture": "#1"},
"down": {"uv": [0, 0, 8, 2], "rotation": 180, "texture": "#1"}
}
},
{
"from": [2.1, -16, -7],
"to": [13.9, -4.4, -2],
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
"faces": {
"east": {"uv": [9, 1, 11.5, 7], "texture": "#1"},
"south": {"uv": [9, 1, 15, 7], "texture": "#1"},
"west": {"uv": [12.5, 1, 15, 7], "texture": "#1"},
"down": {"uv": [9, 12.5, 15, 15], "rotation": 180, "texture": "#0"}
} }
}, },
{ {
"from": [2.1, -16, -13], "from": [2.1, -16, -13],
"to": [13.9, -4.4, -7], "to": [13.9, -5.2, -1],
"rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]}, "rotation": {"angle": 45, "axis": "x", "origin": [8, -16, 0]},
"faces": { "faces": {
"north": {"uv": [9, 1, 15, 7], "texture": "#1"}, "north": {"uv": [9, 1.5, 15, 7], "texture": "#4"},
"east": {"uv": [11.5, 1, 15, 7], "texture": "#1"}, "east": {"uv": [9, 1.5, 15, 7], "texture": "#4"},
"west": {"uv": [9, 1, 12.5, 7], "texture": "#1"}, "south": {"uv": [9, 1.5, 15, 7], "texture": "#4"},
"down": {"uv": [9, 9, 15, 12], "rotation": 180, "texture": "#0"} "west": {"uv": [9, 1.5, 15, 7], "texture": "#4"}
}
},
{
"from": [0, 0, 0],
"to": [3, 16, 16],
"faces": {
"north": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
"east": {"uv": [8, 0, 16, 8], "texture": "#0"},
"south": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
"west": {"uv": [0, 0, 8, 8], "texture": "#1"},
"up": {"uv": [8, 8, 9.5, 16], "texture": "#0"},
"down": {"uv": [14.5, 8, 16, 16], "rotation": 180, "texture": "#0"}
}
},
{
"from": [13, 0, 0],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
"east": {"uv": [0, 0, 8, 8], "texture": "#1"},
"south": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
"west": {"uv": [8, 0, 16, 8], "texture": "#0"},
"up": {"uv": [8, 8, 9.5, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [14.5, 8, 16, 16], "texture": "#0"}
}
},
{
"from": [3, 0, 0],
"to": [13, 16, 3],
"faces": {
"north": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"},
"east": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
"south": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"},
"west": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"},
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [3, 0, 13],
"to": [13, 16, 16],
"faces": {
"north": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"},
"east": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
"south": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"},
"west": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"}
}
},
{
"from": [3, 8, 3],
"to": [13, 14, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [11, -6, 11]},
"faces": {
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"},
"down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"}
} }
} }
], ],
"groups": [0, 1, 2, 3, "groups": [
{ {
"name": "intersection", "name": "group",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"children": [4, 5, 6, 7, 8] "color": 0,
"children": [0, 1]
},
{
"name": "group",
"origin": [8, -16, 0],
"color": 0,
"children": [2, 3, 4]
} }
] ]
} }

73
src/main/resources/assets/create/models/block/chute/block_intersection.json
View file

@ -1,67 +1,54 @@
{ {
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/chute", "3": "create:block/industrial_iron_block",
"1": "create:block/chute_diagonal", "4": "create:block/chute_large",
"particle": "block/hopper_inside" "5": "create:block/chute",
"6": "create:block/chute_hole",
"particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [3, 16, 16],
"faces": {
"north": {"uv": [6.5, 0, 8, 8], "texture": "#1"},
"east": {"uv": [8, 0, 16, 8], "texture": "#0"},
"south": {"uv": [0, 0, 1.5, 8], "texture": "#1"},
"west": {"uv": [0, 0, 8, 8], "texture": "#1"},
"up": {"uv": [8, 8, 9.5, 16], "texture": "#0"},
"down": {"uv": [14.5, 8, 16, 16], "rotation": 180, "texture": "#0"}
}
},
{
"from": [13, 0, 0],
"to": [16, 16, 16], "to": [16, 16, 16],
"faces": { "faces": {
"north": {"uv": [0, 0, 1.5, 8], "texture": "#1"}, "north": {"uv": [0, 0, 16, 16], "texture": "#3"},
"east": {"uv": [0, 0, 8, 8], "texture": "#1"}, "east": {"uv": [0, 0, 16, 16], "texture": "#3"},
"south": {"uv": [6.5, 0, 8, 8], "texture": "#1"}, "south": {"uv": [0, 0, 16, 16], "texture": "#3"},
"west": {"uv": [8, 0, 16, 8], "texture": "#0"}, "west": {"uv": [0, 0, 16, 16], "texture": "#3"},
"up": {"uv": [8, 8, 9.5, 16], "rotation": 180, "texture": "#0"}, "up": {"uv": [0, 0, 8, 8], "texture": "#4"},
"down": {"uv": [14.5, 8, 16, 16], "texture": "#0"} "down": {"uv": [0, 0, 8, 8], "texture": "#4"}
} }
}, },
{ {
"from": [3, 0, 0], "from": [3, 14, 13],
"to": [13, 16, 3], "to": [13, 16, 3],
"faces": { "faces": {
"north": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"}, "north": {"uv": [9.5, 0, 14.5, 1], "texture": "#5"},
"east": {"uv": [6.5, 0, 8, 8], "texture": "#1"}, "east": {"uv": [9.5, 0, 14.5, 1], "texture": "#5"},
"south": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"}, "south": {"uv": [9.5, 0, 14.5, 1], "texture": "#5"},
"west": {"uv": [0, 0, 1.5, 8], "texture": "#1"}, "west": {"uv": [9.5, 0, 14.5, 1], "texture": "#5"},
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"}, "down": {"uv": [3, 3, 13, 13], "texture": "#6"}
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"}
} }
}, },
{ {
"from": [3, 0, 13], "from": [3, 0, 13],
"to": [13, 16, 16], "to": [13, 2, 3],
"faces": { "faces": {
"north": {"uv": [9.5, 0, 14.5, 8], "texture": "#0"}, "north": {"uv": [9.5, 7, 14.5, 8], "texture": "#5"},
"east": {"uv": [0, 0, 1.5, 8], "texture": "#1"}, "east": {"uv": [9.5, 7, 14.5, 8], "texture": "#5"},
"south": {"uv": [1.5, 0, 6.5, 8], "texture": "#1"}, "south": {"uv": [9.5, 7, 14.5, 8], "texture": "#5"},
"west": {"uv": [6.5, 0, 8, 8], "texture": "#1"}, "west": {"uv": [9.5, 7, 14.5, 8], "texture": "#5"},
"up": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 90, "texture": "#0"}, "up": {"uv": [3, 3, 13, 13], "texture": "#6"}
"down": {"uv": [14.5, 9.5, 16, 14.5], "rotation": 270, "texture": "#0"}
} }
}, }
],
"groups": [
{ {
"from": [3, 8, 3], "name": "group",
"to": [13, 14, 13], "origin": [8, 8, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [11, -6, 11]}, "color": 0,
"faces": { "children": [0, 1, 2]
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"},
"down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#0"}
}
} }
] ]
} }

289
src/main/resources/assets/create/models/block/chute/block_windowed.json
View file

@ -2,248 +2,113 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"13": "create:block/chute", "3": "create:block/chute",
"particle": "block/hopper_outside" "4": "create:block/chute_hole",
"particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {
"from": [13, 13, 1], "from": [2, 0, 2],
"to": [15, 16, 15], "to": [14, 16, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 16, 9]},
"faces": { "faces": {
"north": {"uv": [8.5, 0, 9.5, 1.5], "texture": "#13"}, "north": {"uv": [1, 0, 7, 8], "texture": "#3"},
"east": {"uv": [8.5, 0, 15.5, 1.5], "texture": "#13"}, "east": {"uv": [1, 0, 7, 8], "texture": "#3"},
"south": {"uv": [14.5, 0, 15.5, 1.5], "texture": "#13"}, "south": {"uv": [1, 0, 7, 8], "texture": "#3"},
"west": {"uv": [8.5, 0, 15.5, 1.5], "texture": "#13"}, "west": {"uv": [1, 0, 7, 8], "texture": "#3"},
"up": {"uv": [6, 0, 7, 7], "texture": "#13"}, "down": {"uv": [9, 9, 15, 15], "texture": "#3"}
"down": {"uv": [6, 0, 7, 7], "texture": "#13"}
} }
}, },
{ {
"from": [3, 13, 13], "from": [13, 0, 3],
"to": [13, 16, 15], "to": [3, 16, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 16, 9]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [9.5, 0, 14.5, 1.5], "texture": "#13"}, "north": {"uv": [1.5, 0, 6.5, 8], "texture": "#3"},
"south": {"uv": [9.5, 0, 14.5, 1.5], "texture": "#13"}, "east": {"uv": [1.5, 0, 6.5, 8], "texture": "#3"},
"up": {"uv": [1, 6, 6, 7], "texture": "#13"}, "south": {"uv": [1.5, 0, 6.5, 8], "texture": "#3"},
"down": {"uv": [1, 6, 6, 7], "texture": "#13"} "west": {"uv": [1.5, 0, 6.5, 8], "texture": "#3"}
}
},
{
"from": [12, 8, 13],
"to": [13, 13, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 9]},
"faces": {
"north": {"uv": [9.5, 1.5, 10, 4], "texture": "#13"},
"east": {"uv": [9, 0, 16, 4], "texture": "#13"},
"south": {"uv": [14, 1.5, 14.5, 4], "texture": "#13"},
"west": {"uv": [13, 1.5, 14, 4], "texture": "#13"},
"down": {"uv": [5.5, 0, 6, 1], "texture": "#13"}
} }
}, },
{ {
"from": [12, 8, 1], "from": [12, 8, 1],
"to": [13, 13, 3], "to": [15, 16, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 7]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [9.5, 1.5, 10, 4], "texture": "#13"}, "north": {"uv": [0.5, 0, 2, 4], "texture": "#3"},
"east": {"uv": [16, 0, 9, 4], "texture": "#13"}, "east": {"uv": [6, 0, 7.5, 4], "texture": "#3"},
"south": {"uv": [10, 1.5, 9.5, 4], "texture": "#13"}, "south": {"uv": [7.5, 0, 8.5, 4], "rotation": 180, "texture": "#3"},
"west": {"uv": [14, 1.5, 13, 4], "texture": "#13"}, "west": {"uv": [8.5, 0, 7.5, 4], "rotation": 180, "texture": "#3"},
"down": {"uv": [5.5, 1, 6, 0], "texture": "#13"} "up": {"uv": [0.5, 8.5, 2, 10], "rotation": 90, "texture": "#3"},
} "down": {"uv": [0.5, 14, 2, 15.5], "rotation": 270, "texture": "#3"}
},
{
"from": [13, 8, 12],
"to": [15, 13, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 9]},
"faces": {
"north": {"uv": [10, 1.5, 11, 4], "texture": "#13"},
"east": {"uv": [8.5, 1.5, 10, 4], "texture": "#13"},
"south": {"uv": [14.5, 1.5, 15.5, 4], "texture": "#13"},
"west": {"uv": [14, 1.5, 15.5, 4], "texture": "#13"},
"up": {"uv": [1, 6, 6, 7], "texture": "#13"},
"down": {"uv": [6, 0, 7, 1.5], "texture": "#13"}
}
},
{
"from": [13, 8, 1],
"to": [15, 13, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 7]},
"faces": {
"north": {"uv": [8.5, 1.5, 9.5, 4], "texture": "#13"},
"east": {"uv": [14, 1.5, 15.5, 4], "texture": "#13"},
"south": {"uv": [13, 1.5, 14, 4], "texture": "#13"},
"west": {"uv": [15.5, 1.5, 14, 4], "texture": "#13"},
"up": {"uv": [1, 7, 6, 6], "texture": "#13"},
"down": {"uv": [6, 1.5, 7, 0], "texture": "#13"}
}
},
{
"from": [1, 13, 1],
"to": [3, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 16, 7]},
"faces": {
"north": {"uv": [14.5, 0, 15.5, 1.5], "texture": "#13"},
"east": {"uv": [8.5, 0, 15.5, 1.5], "texture": "#13"},
"south": {"uv": [8.5, 0, 9.5, 1.5], "texture": "#13"},
"west": {"uv": [8.5, 0, 15.5, 1.5], "texture": "#13"},
"up": {"uv": [6, 0, 7, 7], "rotation": 180, "texture": "#13"},
"down": {"uv": [6, 0, 7, 7], "rotation": 180, "texture": "#13"}
}
},
{
"from": [3, 13, 1],
"to": [13, 16, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 16, 7]},
"faces": {
"north": {"uv": [9.5, 0, 14.5, 1.5], "texture": "#13"},
"south": {"uv": [9.5, 0, 14.5, 1.5], "texture": "#13"},
"up": {"uv": [1, 6, 6, 7], "rotation": 180, "texture": "#13"},
"down": {"uv": [1, 6, 6, 7], "rotation": 180, "texture": "#13"}
}
},
{
"from": [3, 8, 1],
"to": [4, 13, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 7]},
"faces": {
"north": {"uv": [14, 1.5, 14.5, 4], "texture": "#13"},
"east": {"uv": [13, 1.5, 14, 4], "texture": "#13"},
"south": {"uv": [9.5, 1.5, 10, 4], "texture": "#13"},
"west": {"uv": [9, 0, 16, 4], "texture": "#13"},
"down": {"uv": [5.5, 0, 6, 1], "rotation": 180, "texture": "#13"}
}
},
{
"from": [3, 8, 13],
"to": [4, 13, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 9]},
"faces": {
"north": {"uv": [10, 1.5, 9.5, 4], "texture": "#13"},
"east": {"uv": [14, 1.5, 13, 4], "texture": "#13"},
"south": {"uv": [9.5, 1.5, 10, 4], "texture": "#13"},
"west": {"uv": [16, 0, 9, 4], "texture": "#13"},
"down": {"uv": [5.5, 1, 6, 0], "rotation": 180, "texture": "#13"}
} }
}, },
{ {
"from": [1, 8, 1], "from": [1, 8, 1],
"to": [3, 13, 4], "to": [4, 16, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 7]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [14.5, 1.5, 15.5, 4], "texture": "#13"}, "north": {"uv": [6, 0, 7.5, 4], "texture": "#3"},
"east": {"uv": [14, 1.5, 15.5, 4], "texture": "#13"}, "east": {"uv": [7.5, 0, 8.5, 4], "rotation": 180, "texture": "#3"},
"south": {"uv": [10, 1.5, 11, 4], "texture": "#13"}, "south": {"uv": [8.5, 0, 7.5, 4], "rotation": 180, "texture": "#3"},
"west": {"uv": [8.5, 1.5, 10, 4], "texture": "#13"}, "west": {"uv": [0.5, 0, 2, 4], "texture": "#3"},
"up": {"uv": [1, 6, 6, 7], "rotation": 180, "texture": "#13"}, "up": {"uv": [0.5, 8.5, 2, 10], "texture": "#3"},
"down": {"uv": [6, 0, 7, 1.5], "rotation": 180, "texture": "#13"} "down": {"uv": [0.5, 14, 2, 15.5], "texture": "#3"}
} }
}, },
{ {
"from": [1, 8, 12], "from": [1, 8, 12],
"to": [3, 13, 15], "to": [4, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 9]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [13, 1.5, 14, 4], "texture": "#13"}, "north": {"uv": [7.5, 0, 8.5, 4], "rotation": 180, "texture": "#3"},
"east": {"uv": [15.5, 1.5, 14, 4], "texture": "#13"}, "east": {"uv": [8.5, 0, 7.5, 4], "rotation": 180, "texture": "#3"},
"south": {"uv": [8.5, 1.5, 9.5, 4], "texture": "#13"}, "south": {"uv": [0.5, 0, 2, 4], "texture": "#3"},
"west": {"uv": [14, 1.5, 15.5, 4], "texture": "#13"}, "west": {"uv": [6, 0, 7.5, 4], "texture": "#3"},
"up": {"uv": [1, 7, 6, 6], "rotation": 180, "texture": "#13"}, "up": {"uv": [0.5, 8.5, 2, 10], "rotation": 270, "texture": "#3"},
"down": {"uv": [6, 1.5, 7, 0], "rotation": 180, "texture": "#13"} "down": {"uv": [0.5, 14, 2, 15.5], "rotation": 90, "texture": "#3"}
} }
}, },
{ {
"from": [13, 0, 2], "from": [12, 8, 12],
"to": [14, 8, 14], "to": [15, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [0, 9.5, 0.5, 13.5], "texture": "#13"}, "north": {"uv": [8.5, 0, 7.5, 4], "rotation": 180, "texture": "#3"},
"east": {"uv": [0, 9.5, 6, 13.5], "texture": "#13"}, "east": {"uv": [0.5, 0, 2, 4], "texture": "#3"},
"south": {"uv": [5.5, 9.5, 6, 13.5], "texture": "#13"}, "south": {"uv": [6, 0, 7.5, 4], "texture": "#3"},
"west": {"uv": [0, 9.5, 6, 13.5], "texture": "#13"}, "west": {"uv": [7.5, 0, 8.5, 4], "rotation": 180, "texture": "#3"},
"down": {"uv": [9, 7.5, 15, 8], "rotation": 90, "texture": "#13"} "up": {"uv": [0.5, 8.5, 2, 10], "rotation": 180, "texture": "#3"},
"down": {"uv": [0.5, 14, 2, 15.5], "rotation": 180, "texture": "#3"}
} }
}, },
{ {
"from": [2, 0, 2], "from": [4, 13, 1],
"to": [3, 8, 14], "to": [12, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [5.5, 9.5, 6, 13.5], "texture": "#13"}, "north": {"uv": [2, 0, 6, 1.5], "texture": "#3"},
"east": {"uv": [0, 9.5, 6, 13.5], "texture": "#13"}, "south": {"uv": [2, 0, 6, 1.5], "texture": "#3"},
"south": {"uv": [0, 9.5, 0.5, 13.5], "texture": "#13"}, "up": {"uv": [1.5, 8.5, 6.5, 15.5], "texture": "#3"},
"west": {"uv": [0, 9.5, 6, 13.5], "texture": "#13"}, "down": {"uv": [1.5, 8.5, 6.5, 15.5], "texture": "#3"}
"down": {"uv": [9, 7.5, 15, 8], "rotation": 90, "texture": "#13"}
} }
}, },
{ {
"from": [3, 0, 13], "from": [1, 13, 4],
"to": [13, 8, 14], "to": [15, 16, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 20]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": { "faces": {
"north": {"uv": [0.5, 9.5, 5.5, 13.5], "texture": "#13"}, "east": {"uv": [2, 0, 6, 1.5], "texture": "#3"},
"south": {"uv": [0.5, 9.5, 5.5, 13.5], "texture": "#13"}, "west": {"uv": [2, 0, 6, 1.5], "texture": "#3"},
"down": {"uv": [9.5, 7.5, 14.5, 8], "texture": "#13"} "up": {"uv": [1.5, 8.5, 6.5, 15.5], "rotation": 270, "texture": "#3"},
"down": {"uv": [1.5, 8.5, 6.5, 15.5], "rotation": 90, "texture": "#3"}
} }
}, },
{ {
"from": [3, 0, 2], "from": [3, 2, 3],
"to": [13, 8, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]},
"faces": {
"north": {"uv": [0.5, 9.5, 5.5, 13.5], "texture": "#13"},
"south": {"uv": [0.5, 9.5, 5.5, 13.5], "texture": "#13"},
"down": {"uv": [9.5, 7.5, 14.5, 8], "texture": "#13"}
}
},
{
"from": [2, 8, 2],
"to": [14, 13, 3],
"faces": {
"north": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"east": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"south": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"west": {"uv": [0, 7, 6, 9.5], "texture": "#13"}
}
},
{
"from": [13, 8, 2],
"to": [14, 13, 14],
"faces": {
"north": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"east": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"south": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"west": {"uv": [0, 7, 6, 9.5], "texture": "#13"}
}
},
{
"from": [2, 8, 13],
"to": [14, 13, 14],
"faces": {
"north": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"east": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"south": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"west": {"uv": [0, 7, 6, 9.5], "texture": "#13"}
}
},
{
"from": [2, 8, 2],
"to": [3, 13, 14],
"faces": {
"north": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"east": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"south": {"uv": [0, 7, 6, 9.5], "texture": "#13"},
"west": {"uv": [0, 7, 6, 9.5], "texture": "#13"}
}
},
{
"from": [3, 13, 3],
"to": [13, 14, 13], "to": [13, 14, 13],
"faces": { "faces": {
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"}, "up": {"uv": [3, 3, 13, 13], "texture": "#4"},
"down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"} "down": {"uv": [3, 3, 13, 13], "texture": "#4"}
} }
} }
], ],
@ -286,18 +151,10 @@
}, },
"groups": [ "groups": [
{ {
"name": "ChuteTop", "name": "New",
"origin": [9, 16, -7], "origin": [0, 0, 0],
"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] "color": 0,
}, "children": [0, 1, 2, 3, 4, 5, 6, 7, 8]
{ }
"name": "ChuteBase", ]
"origin": [8, 8, -7],
"children": [12, 13, 14, 15]
},
{
"name": "windows",
"origin": [8, 8, 8],
"children": [16, 17, 18, 19]
}, 20]
} }

9
src/main/resources/assets/create/models/block/content_observer/block.json
View file

@ -6,6 +6,7 @@
"8": "create:block/content_observer", "8": "create:block/content_observer",
"9": "create:block/content_observer_inner", "9": "create:block/content_observer_inner",
"10": "create:block/filtered_detector_top", "10": "create:block/filtered_detector_top",
"particle": "create:block/filtered_detector_top",
"end": "create:block/filtered_detector_front" "end": "create:block/filtered_detector_front"
}, },
"elements": [ "elements": [
@ -50,10 +51,10 @@
"from": [0, 14, 0], "from": [0, 14, 0],
"to": [16, 16, 16], "to": [16, 16, 16],
"faces": { "faces": {
"north": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, "north": {"uv": [3.875, 0, 6, 0.25], "texture": "#7"},
"east": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, "east": {"uv": [3.875, 0, 6, 0.25], "texture": "#7"},
"south": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, "south": {"uv": [3.875, 0, 6, 0.25], "texture": "#7"},
"west": {"uv": [0, 6, 2.125, 6.25], "texture": "#7"}, "west": {"uv": [3.875, 0, 6, 0.25], "texture": "#7"},
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#10"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#10"},
"down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#7"} "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#7"}
} }

2
src/main/resources/assets/create/models/block/funnel/block_horizontal.json
View file

@ -38,7 +38,7 @@
{ {
"name": "Back", "name": "Back",
"from": [2.05, 2, 14], "from": [2.05, 2, 14],
"to": [13.95, 13.95, 18], "to": [13.95, 13.95, 18.1],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, -8.1, 6]},
"faces": { "faces": {
"north": {"uv": [0, 0, 6, 6], "texture": "#base"}, "north": {"uv": [0, 0, 6, 6], "texture": "#base"},

2
src/main/resources/assets/create/models/block/funnel/item.json
View file

@ -98,7 +98,6 @@
"faces": { "faces": {
"east": {"uv": [7.5, 15, 9, 16], "rotation": 90, "texture": "#base"}, "east": {"uv": [7.5, 15, 9, 16], "rotation": 90, "texture": "#base"},
"south": {"uv": [7.5, 8, 9, 8.5], "rotation": 90, "texture": "#base"}, "south": {"uv": [7.5, 8, 9, 8.5], "rotation": 90, "texture": "#base"},
"west": {"uv": [7, 14.5, 8, 16], "texture": "#missing"},
"up": {"uv": [16, 14, 15, 16], "texture": "#block"}, "up": {"uv": [16, 14, 15, 16], "texture": "#block"},
"down": {"uv": [0, 14, 1, 16], "rotation": 180, "texture": "#block"} "down": {"uv": [0, 14, 1, 16], "rotation": 180, "texture": "#block"}
} }
@ -109,7 +108,6 @@
"to": [1, -2, 16.05], "to": [1, -2, 16.05],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 6]},
"faces": { "faces": {
"east": {"uv": [8, 14.5, 7, 16], "texture": "#missing"},
"south": {"uv": [7.5, 15.5, 9, 16], "rotation": 90, "texture": "#base"}, "south": {"uv": [7.5, 15.5, 9, 16], "rotation": 90, "texture": "#base"},
"west": {"uv": [7.5, 8, 9, 9], "rotation": 90, "texture": "#base"}, "west": {"uv": [7.5, 8, 9, 9], "rotation": 90, "texture": "#base"},
"up": {"uv": [1, 14, 0, 16], "texture": "#block"}, "up": {"uv": [1, 14, 0, 16], "texture": "#block"},

124
src/main/resources/assets/create/models/block/mechanical_mixer/head.json
View file

@ -3,125 +3,39 @@
"parent": "block/block", "parent": "block/block",
"ambientocclusion": false, "ambientocclusion": false,
"textures": { "textures": {
"6": "create:block/mixer_head", "6": "create:block/mixer_head"
"mechanical_press_pole": "create:block/mechanical_press_pole"
}, },
"elements": [ "elements": [
{ {
"name": "MixerCenter", "name": "MixerCenter",
"from": [7, -4.5, 7], "from": [7, -4, 7],
"to": [9, 7.5, 9], "to": [9, 8, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": { "faces": {
"north": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "north": {"uv": [12, 0, 14, 12], "texture": "#6"},
"east": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "east": {"uv": [12, 0, 14, 12], "texture": "#6"},
"south": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "south": {"uv": [12, 0, 14, 12], "texture": "#6"},
"west": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "west": {"uv": [12, 0, 14, 12], "texture": "#6"},
"down": {"uv": [0, 12, 2, 14], "texture": "#6"} "down": {"uv": [12, 12, 14, 14], "texture": "#6"}
} }
}, },
{ {
"name": "mixerbottom1", "name": "Mixer wire 1",
"from": [2.5, -4, 7], "from": [2.5, -4, 8],
"to": [13.5, -2, 9], "to": [13.5, 6, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": { "faces": {
"north": {"uv": [0, 14, 11, 16], "texture": "#6"}, "north": {"uv": [0, 0, 11, 10], "texture": "#6"},
"east": {"uv": [2, 8, 4, 10], "texture": "#6"}, "south": {"uv": [0, 0, 11, 10], "texture": "#6"}
"south": {"uv": [0, 14, 11, 16], "texture": "#6"},
"west": {"uv": [2, 0, 4, 2], "texture": "#6"},
"up": {"uv": [0, 12, 11, 14], "texture": "#6"},
"down": {"uv": [0, 10, 11, 12], "texture": "#6"}
} }
}, },
{ {
"name": "mixerbottom2", "name": "Mixer wire 2",
"from": [7, -4, 2.5], "from": [8, -4, 2.5],
"to": [9, -2, 13.5], "to": [8, 6, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]},
"faces": { "faces": {
"north": {"uv": [2, 8, 4, 10], "texture": "#6"}, "east": {"uv": [0, 0, 11, 10], "texture": "#6"},
"east": {"uv": [0, 14, 11, 16], "texture": "#6"}, "west": {"uv": [0, 0, 11, 10], "texture": "#6"}
"south": {"uv": [2, 8, 4, 10], "texture": "#6"},
"west": {"uv": [0, 14, 11, 16], "texture": "#6"},
"up": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#6"},
"down": {"uv": [0, 10, 11, 12], "rotation": 90, "texture": "#6"}
}
},
{
"name": "mixerside4",
"from": [11.5, -2, 7],
"to": [13.5, 4, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
"east": {"uv": [2, 2, 4, 8], "texture": "#6"},
"south": {"uv": [0, 2, 2, 8], "texture": "#6"},
"west": {"uv": [4, 0, 6, 6], "texture": "#6"}
}
},
{
"name": "mixerside3",
"from": [2.5, -2, 7],
"to": [4.5, 4, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [0, 2, 2, 8], "texture": "#6"},
"east": {"uv": [4, 0, 6, 6], "texture": "#6"},
"south": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
"west": {"uv": [2, 2, 4, 8], "texture": "#6"}
}
},
{
"name": "mixerside2",
"from": [7, -2, 2.5],
"to": [9, 4, 4.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [2, 2, 4, 8], "texture": "#6"},
"east": {"uv": [0, 2, 2, 8], "texture": "#6"},
"south": {"uv": [4, 0, 6, 6], "texture": "#6"},
"west": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"}
}
},
{
"name": "mixerside1",
"from": [7, -2, 11.5],
"to": [9, 4, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [4, 0, 6, 6], "texture": "#6"},
"east": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
"south": {"uv": [2, 2, 4, 8], "texture": "#6"},
"west": {"uv": [0, 2, 2, 8], "texture": "#6"}
}
},
{
"name": "mixertop1",
"from": [7, 4, 2.5],
"to": [9, 6, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [2, 0, 4, 2], "texture": "#6"},
"east": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"south": {"uv": [2, 0, 4, 2], "texture": "#6"},
"west": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"up": {"uv": [0, 10, 11, 12], "rotation": 90, "texture": "#6"},
"down": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#6"}
}
},
{
"name": "mixertop2",
"from": [2.5, 4, 7],
"to": [13.5, 6, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"east": {"uv": [2, 0, 4, 2], "texture": "#6"},
"south": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"west": {"uv": [2, 0, 4, 2], "texture": "#6"},
"up": {"uv": [0, 10, 11, 12], "texture": "#6"},
"down": {"uv": [0, 12, 11, 14], "texture": "#6"}
} }
} }
] ]

155
src/main/resources/assets/create/models/block/mechanical_mixer/item.json
View file

@ -7,10 +7,11 @@
"2": "block/spruce_log_top", "2": "block/spruce_log_top",
"4": "create:block/mixer_base_side", "4": "create:block/mixer_base_side",
"6": "create:block/mixer_head", "6": "create:block/mixer_head",
"7": "create:block/waterwheel_metal",
"11": "create:block/mechanical_press_top", "11": "create:block/mechanical_press_top",
"particle": "create:block/mixer_base_side",
"1_2": "create:block/cogwheel", "1_2": "create:block/cogwheel",
"mechanical_press_pole": "create:block/mechanical_press_pole", "mechanical_press_pole": "create:block/mechanical_press_pole"
"particle": "create:block/mixer_base_side"
}, },
"elements": [ "elements": [
{ {
@ -33,121 +34,37 @@
"south": {"uv": [0, 6, 16, 10], "texture": "#4"} "south": {"uv": [0, 6, 16, 10], "texture": "#4"}
} }
}, },
{
"name": "Mixer wire 1",
"from": [2.5, -4, 8],
"to": [13.5, 6, 8],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 1.25, 8]},
"faces": {
"north": {"uv": [0, 0, 11, 10], "texture": "#6"},
"south": {"uv": [0, 0, 11, 10], "texture": "#6"}
}
},
{ {
"name": "MixerCenter", "name": "MixerCenter",
"from": [7, -4.5, 7], "from": [7, -4, 7],
"to": [9, 7.5, 9], "to": [9, 8, 9],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]}, "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 1.25, 8]},
"faces": { "faces": {
"north": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "north": {"uv": [12, 0, 14, 12], "texture": "#6"},
"east": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "east": {"uv": [12, 0, 14, 12], "texture": "#6"},
"south": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "south": {"uv": [12, 0, 14, 12], "texture": "#6"},
"west": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"}, "west": {"uv": [12, 0, 14, 12], "texture": "#6"},
"down": {"uv": [0, 12, 2, 14], "texture": "#6"} "down": {"uv": [12, 12, 14, 14], "texture": "#6"}
} }
}, },
{ {
"name": "mixerbottom1", "name": "Mixer wire 2",
"from": [2.5, -4, 7], "from": [8, -4, 2.5],
"to": [13.5, -2, 9], "to": [8, 6, 13.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]}, "rotation": {"angle": 22.5, "axis": "y", "origin": [8, 1.25, 8]},
"faces": { "faces": {
"north": {"uv": [0, 14, 11, 16], "texture": "#6"}, "east": {"uv": [0, 0, 11, 10], "texture": "#6"},
"east": {"uv": [2, 8, 4, 10], "texture": "#6"}, "west": {"uv": [0, 0, 11, 10], "texture": "#6"}
"south": {"uv": [0, 14, 11, 16], "texture": "#6"},
"west": {"uv": [2, 0, 4, 2], "texture": "#6"},
"up": {"uv": [0, 12, 11, 14], "texture": "#6"},
"down": {"uv": [0, 10, 11, 12], "texture": "#6"}
}
},
{
"name": "mixerbottom2",
"from": [7, -4, 2.5],
"to": [9, -2, 13.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [2, 8, 4, 10], "texture": "#6"},
"east": {"uv": [0, 14, 11, 16], "texture": "#6"},
"south": {"uv": [2, 8, 4, 10], "texture": "#6"},
"west": {"uv": [0, 14, 11, 16], "texture": "#6"},
"up": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#6"},
"down": {"uv": [0, 10, 11, 12], "rotation": 90, "texture": "#6"}
}
},
{
"name": "mixerside4",
"from": [11.5, -2, 7],
"to": [13.5, 4, 9],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
"east": {"uv": [2, 2, 4, 8], "texture": "#6"},
"south": {"uv": [0, 2, 2, 8], "texture": "#6"},
"west": {"uv": [4, 0, 6, 6], "texture": "#6"}
}
},
{
"name": "mixerside3",
"from": [2.5, -2, 7],
"to": [4.5, 4, 9],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [0, 2, 2, 8], "texture": "#6"},
"east": {"uv": [4, 0, 6, 6], "texture": "#6"},
"south": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
"west": {"uv": [2, 2, 4, 8], "texture": "#6"}
}
},
{
"name": "mixerside2",
"from": [7, -2, 2.5],
"to": [9, 4, 4.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [2, 2, 4, 8], "texture": "#6"},
"east": {"uv": [0, 2, 2, 8], "texture": "#6"},
"south": {"uv": [4, 0, 6, 6], "texture": "#6"},
"west": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"}
}
},
{
"name": "mixerside1",
"from": [7, -2, 11.5],
"to": [9, 4, 13.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [4, 0, 6, 6], "texture": "#6"},
"east": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
"south": {"uv": [2, 2, 4, 8], "texture": "#6"},
"west": {"uv": [0, 2, 2, 8], "texture": "#6"}
}
},
{
"name": "mixertop1",
"from": [7, 4, 2.5],
"to": [9, 6, 13.5],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [2, 0, 4, 2], "texture": "#6"},
"east": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"south": {"uv": [2, 0, 4, 2], "texture": "#6"},
"west": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"up": {"uv": [0, 10, 11, 12], "rotation": 90, "texture": "#6"},
"down": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#6"}
}
},
{
"name": "mixertop2",
"from": [2.5, 4, 7],
"to": [13.5, 6, 9],
"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
"faces": {
"north": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"east": {"uv": [2, 0, 4, 2], "texture": "#6"},
"south": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
"west": {"uv": [2, 0, 4, 2], "texture": "#6"},
"up": {"uv": [0, 10, 11, 12], "texture": "#6"},
"down": {"uv": [0, 12, 11, 14], "texture": "#6"}
} }
}, },
{ {
@ -157,12 +74,12 @@
"shade": false, "shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]},
"faces": { "faces": {
"north": {"uv": [10, 6, 16, 8], "texture": "#6"}, "north": {"uv": [10, 6, 16, 8], "texture": "#7"},
"east": {"uv": [10, 6, 16, 8], "texture": "#6"}, "east": {"uv": [10, 6, 16, 8], "texture": "#7"},
"south": {"uv": [10, 6, 16, 8], "texture": "#6"}, "south": {"uv": [10, 6, 16, 8], "texture": "#7"},
"west": {"uv": [10, 6, 16, 8], "texture": "#6"}, "west": {"uv": [10, 6, 16, 8], "texture": "#7"},
"up": {"uv": [10, 0, 16, 6], "texture": "#6"}, "up": {"uv": [10, 0, 16, 6], "texture": "#6"},
"down": {"uv": [10, 0, 16, 6], "texture": "#6"} "down": {"uv": [10, 0, 16, 6], "texture": "#7"}
} }
}, },
{ {
@ -417,13 +334,13 @@
"name": "mixerhead", "name": "mixerhead",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0, "color": 0,
"children": [2, 3, 4, 5, 6, 7, 8, 9, 10] "children": [2, 3, 4]
}, },
{ {
"name": "mechanical_press_head", "name": "mechanical_press_head",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0, "color": 0,
"children": [11, 12, 13, 14, 15, 16, 17] "children": [5, 6, 7, 8, 9, 10, 11]
}, },
{ {
"name": "mixer_base", "name": "mixer_base",
@ -434,7 +351,7 @@
"name": "mixerbase", "name": "mixerbase",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0, "color": 0,
"children": [18, 19, 20, 21] "children": [12, 13, 14, 15]
} }
] ]
} }
@ -444,7 +361,7 @@
"name": "cogwheel_shaftless", "name": "cogwheel_shaftless",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0, "color": 0,
"children": [22, 23, 24, 25, 26, 27] "children": [16, 17, 18, 19, 20, 21]
} }
] ]
} }

2
src/main/resources/assets/create/models/block/mechanical_mixer/pole.json
View file

@ -3,7 +3,7 @@
"parent": "block/block", "parent": "block/block",
"ambientocclusion": false, "ambientocclusion": false,
"textures": { "textures": {
"6": "create:block/mixer_head", "6": "create:block/waterwheel_metal",
"mechanical_press_pole": "create:block/mechanical_press_pole" "mechanical_press_pole": "create:block/mechanical_press_pole"
}, },
"elements": [ "elements": [

2
src/main/resources/assets/create/models/block/metal_girder/block_bottom.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder/block_cross.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder/block_pole.json
View file

@ -3,7 +3,7 @@
"textures": { "textures": {
"1": "create:block/girder_pole", "1": "create:block/girder_pole",
"2": "create:block/girder_pole_side", "2": "create:block/girder_pole_side",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder/block_top.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder/block_x.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder/block_z.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

4
src/main/resources/assets/create/models/block/metal_girder/item.json
View file

@ -1,9 +1,9 @@
{ {
"parent": "block/block",
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder/segment_middle.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder/segment_top.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder_encased_shaft/block.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder_encased_shaft/block_bottom.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

2
src/main/resources/assets/create/models/block/metal_girder_encased_shaft/block_top.json
View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"textures": { "textures": {
"0": "create:block/girder", "0": "create:block/girder",
"particle": "create:block/chute_block" "particle": "create:block/industrial_iron_block"
}, },
"elements": [ "elements": [
{ {

104
src/main/resources/assets/create/models/block/rotation_speed_controller/block.json
View file

@ -7,7 +7,7 @@
"5": "create:block/rotation_speed_controller_top", "5": "create:block/rotation_speed_controller_top",
"6": "create:block/brass_block", "6": "create:block/brass_block",
"7": "create:block/funnel/brass_funnel_neutral", "7": "create:block/funnel/brass_funnel_neutral",
"particle": "create:block/brass_gearbox" "particle": "create:block/brass_block"
}, },
"elements": [ "elements": [
{ {
@ -27,12 +27,12 @@
"to": [5, 14, 16], "to": [5, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]},
"faces": { "faces": {
"north": {"uv": [6, 6, 11, 0], "texture": "#0"}, "north": {"uv": [13.5, 13, 16, 10], "texture": "#7"},
"east": {"uv": [0, 10, 16, 16], "texture": "#4"}, "east": {"uv": [0, 10, 16, 16], "texture": "#4"},
"south": {"uv": [0, 0, 5, 6], "texture": "#0"}, "south": {"uv": [0, 0, 5, 6], "texture": "#0"},
"west": {"uv": [0, 0, 8, 3], "texture": "#7"}, "west": {"uv": [8, 10, 16, 13], "texture": "#7"},
"up": {"uv": [0, 0, 5, 16], "texture": "#5"}, "up": {"uv": [0, 0, 5, 16], "texture": "#5"},
"down": {"uv": [0, 0, 5, 16], "texture": "#6"} "down": {"uv": [8, 13, 16, 13.5], "rotation": 90, "texture": "#7"}
} }
}, },
{ {
@ -52,8 +52,8 @@
"to": [16, 14, 16], "to": [16, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0, 5, 6], "texture": "#0"}, "north": {"uv": [8, 10, 10.5, 13], "texture": "#7"},
"east": {"uv": [0, 0, 8, 3], "texture": "#7"}, "east": {"uv": [8, 10, 16, 13], "texture": "#7"},
"south": {"uv": [6, 6, 11, 0], "texture": "#0"}, "south": {"uv": [6, 6, 11, 0], "texture": "#0"},
"west": {"uv": [0, 10, 16, 16], "texture": "#4"}, "west": {"uv": [0, 10, 16, 16], "texture": "#4"},
"up": {"uv": [11, 0, 16, 16], "texture": "#5"}, "up": {"uv": [11, 0, 16, 16], "texture": "#5"},
@ -65,7 +65,7 @@
"to": [11, 14, 16], "to": [11, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [18, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [18, 18, 8]},
"faces": { "faces": {
"north": {"uv": [5, 0, 6, 3], "texture": "#0"}, "north": {"uv": [10.5, 10, 11, 11.5], "texture": "#7"},
"south": {"uv": [5, 6, 6, 3], "texture": "#0"}, "south": {"uv": [5, 6, 6, 3], "texture": "#0"},
"west": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#5"}, "west": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#5"},
"up": {"uv": [11, 0, 10, 16], "texture": "#5"}, "up": {"uv": [11, 0, 10, 16], "texture": "#5"},
@ -77,12 +77,100 @@
"to": [6, 14, 16], "to": [6, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [-2, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [-2, 18, 8]},
"faces": { "faces": {
"north": {"uv": [5, 6, 6, 3], "texture": "#0"}, "north": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"east": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#5"}, "east": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#5"},
"south": {"uv": [5, 0, 6, 3], "texture": "#0"}, "south": {"uv": [5, 0, 6, 3], "texture": "#0"},
"up": {"uv": [6, 0, 5, 16], "texture": "#5"}, "up": {"uv": [6, 0, 5, 16], "texture": "#5"},
"down": {"uv": [16, 0, 15, 16], "texture": "#6"} "down": {"uv": [16, 0, 15, 16], "texture": "#6"}
} }
},
{
"from": [0, 0, 0],
"to": [16, 4, 16],
"faces": {
"north": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"east": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"south": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"west": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"up": {"uv": [0, 0, 1, 1], "texture": "#6"},
"down": {"uv": [0, 0, 16, 16], "texture": "#6"}
}
},
{
"from": [0, 8, 0],
"to": [5, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]},
"faces": {
"north": {"uv": [16, 13, 13.5, 10], "rotation": 180, "texture": "#7"},
"east": {"uv": [15, 10, 16, 11], "texture": "#6"},
"south": {"uv": [8, 10, 10.5, 13], "texture": "#7"},
"west": {"uv": [8, 10, 16, 13], "texture": "#7"},
"up": {"uv": [0, 0, 5, 16], "texture": "#5"},
"down": {"uv": [8, 13, 16, 13.5], "rotation": 90, "texture": "#7"}
}
},
{
"from": [1, 4, 1],
"to": [15, 12, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]},
"faces": {
"north": {"uv": [1, 0, 15, 8], "texture": "#0"},
"east": {"uv": [1, 8, 15, 16], "texture": "#0"},
"south": {"uv": [1, 0, 15, 8], "texture": "#0"},
"west": {"uv": [1, 8, 15, 16], "texture": "#0"},
"up": {"uv": [1, 1, 15, 15], "texture": "#5"}
}
},
{
"from": [11, 8, 0],
"to": [16, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]},
"faces": {
"north": {"uv": [8, 10, 10.5, 13], "texture": "#7"},
"east": {"uv": [8, 10, 16, 13], "texture": "#7"},
"south": {"uv": [16, 13, 13.5, 10], "rotation": 180, "texture": "#7"},
"west": {"uv": [15, 10, 16, 11], "texture": "#6"},
"up": {"uv": [11, 0, 16, 16], "texture": "#5"},
"down": {"uv": [8, 13, 16, 13.5], "rotation": 90, "texture": "#7"}
}
},
{
"from": [10, 11, 0],
"to": [11, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [18, 18, 8]},
"faces": {
"north": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"south": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"west": {"uv": [11, 0, 14, 16], "rotation": 90, "texture": "#5"},
"up": {"uv": [10, 0, 11, 16], "texture": "#5"},
"down": {"uv": [15, 0, 16, 16], "texture": "#7"}
}
},
{
"from": [5, 11, 0],
"to": [6, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [-2, 18, 8]},
"faces": {
"north": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"east": {"uv": [5, 0, 2, 16], "rotation": 90, "texture": "#5"},
"south": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"up": {"uv": [5, 0, 6, 16], "texture": "#5"},
"down": {"uv": [16, 0, 15, 16], "texture": "#7"}
}
}
],
"groups": [
0,
1,
2,
3,
4,
5,
{
"name": "block",
"origin": [8, 8, 8],
"color": 0,
"children": [6, 7, 8, 9, 10, 11]
} }
] ]
} }

18
src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json
View file

@ -5,7 +5,7 @@
"2": "create:block/brass_casing", "2": "create:block/brass_casing",
"4": "create:block/brass_block", "4": "create:block/brass_block",
"5": "create:block/rotation_speed_controller_bracket", "5": "create:block/rotation_speed_controller_bracket",
"6": "create:block/rotation_speed_controller", "7": "create:block/funnel/brass_funnel_neutral",
"particle": "create:block/brass_block" "particle": "create:block/brass_block"
}, },
"elements": [ "elements": [
@ -186,11 +186,11 @@
"to": [15, 3, 15], "to": [15, 3, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]},
"faces": { "faces": {
"north": {"uv": [0, 10, 14, 15], "texture": "#5"}, "north": {"uv": [8, 1.5, 10.5, 8], "rotation": 90, "texture": "#7"},
"east": {"uv": [11, 1, 16, 6], "texture": "#6"}, "east": {"uv": [8, 10, 10.5, 12.5], "texture": "#7"},
"south": {"uv": [0, 10, 14, 15], "texture": "#5"}, "south": {"uv": [0, 10, 14, 15], "texture": "#5"},
"west": {"uv": [11, 1, 16, 6], "texture": "#6"}, "west": {"uv": [13.5, 10, 16, 12.5], "texture": "#7"},
"up": {"uv": [10, 1, 15, 15], "rotation": 90, "texture": "#2"} "up": {"uv": [16, 1, 15, 15], "rotation": 90, "texture": "#2"}
} }
}, },
{ {
@ -199,10 +199,10 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]},
"faces": { "faces": {
"north": {"uv": [14, 10, 0, 15], "texture": "#5"}, "north": {"uv": [14, 10, 0, 15], "texture": "#5"},
"east": {"uv": [11, 1, 16, 6], "texture": "#6"}, "east": {"uv": [13.5, 10, 16, 12.5], "texture": "#7"},
"south": {"uv": [0, 10, 14, 15], "texture": "#5"}, "south": {"uv": [8, 1.5, 10.5, 8], "rotation": 90, "texture": "#7"},
"west": {"uv": [11, 1, 16, 6], "texture": "#6"}, "west": {"uv": [8, 10, 10.5, 12.5], "texture": "#7"},
"up": {"uv": [15, 1, 10, 15], "rotation": 90, "texture": "#2"} "up": {"uv": [16, 1, 15, 15], "rotation": 90, "texture": "#2"}
} }
} }
] ]

54
src/main/resources/assets/create/models/block/rotation_speed_controller/item.json
View file

@ -29,11 +29,11 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 4, 16], "to": [16, 4, 16],
"faces": { "faces": {
"north": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, "north": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"east": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, "east": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"south": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, "south": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"west": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, "west": {"uv": [14, 0, 16, 8], "rotation": 90, "texture": "#7"},
"up": {"uv": [0, 0, 16, 16], "texture": "#4"}, "up": {"uv": [0, 0, 1, 1], "texture": "#4"},
"down": {"uv": [0, 0, 16, 16], "texture": "#9"} "down": {"uv": [0, 0, 16, 16], "texture": "#9"}
} }
}, },
@ -42,12 +42,12 @@
"to": [5, 14, 16], "to": [5, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]},
"faces": { "faces": {
"north": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, "north": {"uv": [13.5, 13, 16, 10], "texture": "#7"},
"east": {"uv": [0, 10, 16, 16], "texture": "#4"}, "east": {"uv": [15, 10, 16, 11], "texture": "#4"},
"south": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, "south": {"uv": [8, 10, 10.5, 13], "texture": "#7"},
"west": {"uv": [0, 0, 8, 3], "texture": "#7"}, "west": {"uv": [8, 10, 16, 13], "texture": "#7"},
"up": {"uv": [0, 0, 5, 16], "texture": "#1_5"}, "up": {"uv": [0, 0, 5, 16], "texture": "#1_5"},
"down": {"uv": [0, 0, 5, 16], "texture": "#9"} "down": {"uv": [8, 13, 16, 13.5], "rotation": 90, "texture": "#7"}
} }
}, },
{ {
@ -55,10 +55,10 @@
"to": [15, 12, 15], "to": [15, 12, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]},
"faces": { "faces": {
"north": {"uv": [1, 4, 15, 12], "texture": "#4"}, "north": {"uv": [1, 0, 15, 8], "texture": "#1_0"},
"east": {"uv": [1, 4, 15, 12], "texture": "#1_0"}, "east": {"uv": [1, 8, 15, 16], "texture": "#1_0"},
"south": {"uv": [1, 4, 15, 12], "texture": "#4"}, "south": {"uv": [1, 0, 15, 8], "texture": "#1_0"},
"west": {"uv": [1, 4, 15, 12], "texture": "#1_0"}, "west": {"uv": [1, 8, 15, 16], "texture": "#1_0"},
"up": {"uv": [1, 1, 15, 15], "texture": "#1_5"} "up": {"uv": [1, 1, 15, 15], "texture": "#1_5"}
} }
}, },
@ -67,12 +67,12 @@
"to": [16, 14, 16], "to": [16, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]},
"faces": { "faces": {
"north": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, "north": {"uv": [8, 10, 10.5, 13], "texture": "#7"},
"east": {"uv": [0, 0, 8, 3], "texture": "#7"}, "east": {"uv": [8, 10, 16, 13], "texture": "#7"},
"south": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, "south": {"uv": [13.5, 13, 16, 10], "texture": "#7"},
"west": {"uv": [0, 10, 16, 16], "texture": "#4"}, "west": {"uv": [15, 10, 16, 11], "texture": "#4"},
"up": {"uv": [11, 0, 16, 16], "texture": "#1_5"}, "up": {"uv": [11, 0, 16, 16], "texture": "#1_5"},
"down": {"uv": [11, 0, 16, 16], "texture": "#9"} "down": {"uv": [8, 13, 16, 13.5], "rotation": 90, "texture": "#7"}
} }
}, },
{ {
@ -80,10 +80,10 @@
"to": [11, 14, 16], "to": [11, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [18, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [18, 18, 8]},
"faces": { "faces": {
"north": {"uv": [5, 0, 6, 3], "texture": "#1_0"}, "north": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"south": {"uv": [5, 6, 6, 3], "texture": "#1_0"}, "south": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"west": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#1_5"}, "west": {"uv": [11, 0, 14, 16], "rotation": 90, "texture": "#1_5"},
"up": {"uv": [11, 0, 10, 16], "texture": "#1_5"}, "up": {"uv": [10, 0, 11, 16], "texture": "#1_5"},
"down": {"uv": [15, 0, 16, 16], "texture": "#9"} "down": {"uv": [15, 0, 16, 16], "texture": "#9"}
} }
}, },
@ -92,10 +92,10 @@
"to": [6, 14, 16], "to": [6, 14, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [-2, 18, 8]}, "rotation": {"angle": 0, "axis": "y", "origin": [-2, 18, 8]},
"faces": { "faces": {
"north": {"uv": [5, 6, 6, 3], "texture": "#1_0"}, "north": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"east": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#1_5"}, "east": {"uv": [5, 0, 2, 16], "rotation": 90, "texture": "#1_5"},
"south": {"uv": [5, 0, 6, 3], "texture": "#1_0"}, "south": {"uv": [13, 11.5, 13.5, 10], "rotation": 180, "texture": "#7"},
"up": {"uv": [6, 0, 5, 16], "texture": "#1_5"}, "up": {"uv": [5, 0, 6, 16], "texture": "#1_5"},
"down": {"uv": [16, 0, 15, 16], "texture": "#9"} "down": {"uv": [16, 0, 15, 16], "texture": "#9"}
} }
} }

169
src/main/resources/assets/create/models/block/smart_chute/block.json
View file

@ -2,163 +2,54 @@
"credit": "Made with Blockbench", "credit": "Made with Blockbench",
"parent": "block/block", "parent": "block/block",
"textures": { "textures": {
"1": "create:block/chute_diagonal", "5": "create:block/chute_large",
"13": "create:block/chute", "7": "create:block/chute_smart",
"redstone": "create:block/funnel/brass_funnel_unpowered", "8": "create:block/funnel/funnel_open",
"particle": "create:block/funnel/brass_funnel_frame", "9": "create:block/chute_smart_top",
"frame": "create:block/funnel/brass_funnel_frame", "13": "create:block/chute"
"direction": "create:block/funnel/brass_funnel_neutral"
}, },
"elements": [ "elements": [
{
"from": [3, 9, 1],
"to": [13, 16, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, -3]},
"faces": {
"north": {"uv": [9.5, 0, 14.5, 3.5], "texture": "#13"},
"south": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
"up": {"uv": [1, 0, 6, 1], "texture": "#13"}
}
},
{
"from": [3, 9, 13],
"to": [13, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [5, 16, 19]},
"faces": {
"north": {"uv": [9.5, 0, 14.5, 4], "texture": "#13"},
"south": {"uv": [9.5, 0, 14.5, 3.5], "texture": "#13"},
"up": {"uv": [1, 0, 6, 1], "rotation": 180, "texture": "#13"}
}
},
{
"from": [1, 9, 1],
"to": [3, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 16, 9]},
"faces": {
"north": {"uv": [14.5, 0, 15.5, 3.5], "texture": "#13"},
"east": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
"south": {"uv": [8.5, 0, 9.5, 3.5], "texture": "#13"},
"west": {"uv": [8.5, 0, 15.5, 3.5], "texture": "#13"},
"up": {"uv": [0, 0, 1, 7], "texture": "#13"}
}
},
{
"from": [13, 9, 1],
"to": [15, 16, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [7, 16, 7]},
"faces": {
"north": {"uv": [8.5, 0, 9.5, 3.5], "texture": "#13"},
"east": {"uv": [8.5, 0, 15.5, 3.5], "texture": "#13"},
"south": {"uv": [14.5, 0, 15.5, 3.5], "texture": "#13"},
"west": {"uv": [8.5, 0, 15.5, 4], "texture": "#13"},
"up": {"uv": [0, 0, 1, 7], "rotation": 180, "texture": "#13"}
}
},
{ {
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 5, 16], "to": [16, 16, 16],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 11, 15]},
"faces": { "faces": {
"north": {"uv": [0, 5.5, 8, 8], "texture": "#1"}, "north": {"uv": [0, 0, 16, 16], "texture": "#7"},
"east": {"uv": [0, 5.5, 8, 8], "texture": "#1"}, "east": {"uv": [0, 0, 16, 16], "texture": "#7"},
"south": {"uv": [0, 5.5, 8, 8], "texture": "#1"}, "south": {"uv": [0, 0, 16, 16], "texture": "#7"},
"west": {"uv": [0, 5.5, 8, 8], "texture": "#1"}, "west": {"uv": [0, 0, 16, 16], "texture": "#7"},
"up": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#13"}, "up": {"uv": [0, 0, 16, 16], "texture": "#9"},
"down": {"uv": [8, 8, 16, 16], "rotation": 180, "texture": "#13"} "down": {"uv": [0, 0, 8, 8], "texture": "#5"}
} }
}, },
{ {
"from": [13, 1, 2], "from": [3, 14, 13],
"to": [14, 8, 14], "to": [13, 16, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]},
"faces": { "faces": {
"north": {"uv": [9, 4, 9.5, 7.5], "texture": "#13"}, "north": {"uv": [3, 1, 13, 3], "texture": "#9"},
"east": {"uv": [9, 4, 15, 7.5], "texture": "#13"}, "east": {"uv": [3, 1, 13, 3], "texture": "#9"},
"south": {"uv": [14.5, 4, 15, 7.5], "texture": "#13"}, "south": {"uv": [3, 1, 13, 3], "texture": "#9"},
"west": {"uv": [9, 4, 15, 8], "texture": "#13"}, "west": {"uv": [3, 1, 13, 3], "texture": "#9"},
"down": {"uv": [9, 7.5, 15, 8], "rotation": 90, "texture": "#13"} "down": {"uv": [3, 3, 13, 13], "texture": "#8"}
} }
}, },
{ {
"from": [2, 1, 2], "from": [3, 0, 13],
"to": [3, 8, 14], "to": [13, 2, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [9, 8, 9]},
"faces": { "faces": {
"north": {"uv": [14.5, 4, 15, 7.5], "texture": "#13"}, "north": {"uv": [9.5, 7, 14.5, 8], "texture": "#13"},
"east": {"uv": [9, 4, 15, 8], "texture": "#13"}, "east": {"uv": [9.5, 7, 14.5, 8], "texture": "#13"},
"south": {"uv": [9, 4, 9.5, 7.5], "texture": "#13"}, "south": {"uv": [9.5, 7, 14.5, 8], "texture": "#13"},
"west": {"uv": [9, 4, 15, 7.5], "texture": "#13"}, "west": {"uv": [9.5, 7, 14.5, 8], "texture": "#13"},
"down": {"uv": [9, 7.5, 15, 8], "rotation": 90, "texture": "#13"} "up": {"uv": [3, 3, 13, 13], "texture": "#8"}
}
},
{
"from": [3, 1, 13],
"to": [13, 8, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 20]},
"faces": {
"north": {"uv": [9.5, 4, 14.5, 8], "texture": "#13"},
"south": {"uv": [9.5, 4, 14.5, 7.5], "texture": "#13"},
"down": {"uv": [9.5, 7.5, 14.5, 8], "texture": "#13"}
}
},
{
"from": [3, 1, 2],
"to": [13, 8, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 9]},
"faces": {
"north": {"uv": [9.5, 4, 14.5, 7.5], "texture": "#13"},
"south": {"uv": [9.5, 4, 14.5, 8], "texture": "#13"},
"down": {"uv": [9.5, 7.5, 14.5, 8], "texture": "#13"}
}
},
{
"from": [3, 13, 3],
"to": [13, 14, 13],
"faces": {
"up": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"},
"down": {"uv": [9.5, 9.5, 14.5, 14.5], "texture": "#13"}
}
},
{
"from": [1, 7, 1],
"to": [15, 9, 15],
"rotation": {"angle": 0, "axis": "y", "origin": [21, 18, 9]},
"faces": {
"north": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"},
"east": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"},
"south": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"},
"west": {"uv": [1, 1, 3, 15], "rotation": 270, "texture": "#redstone"},
"down": {"uv": [1, 1, 15, 15], "texture": "#frame"}
}
},
{
"from": [0, 9, 0],
"to": [16, 15, 16],
"faces": {
"north": {"uv": [8, 13, 16, 16], "texture": "#direction"},
"east": {"uv": [8, 13, 16, 16], "texture": "#direction"},
"south": {"uv": [8, 13, 16, 16], "texture": "#direction"},
"west": {"uv": [8, 13, 16, 16], "texture": "#direction"},
"up": {"uv": [0, 0, 16, 16], "texture": "#frame"},
"down": {"uv": [0, 0, 16, 16], "texture": "#frame"}
} }
} }
], ],
"groups": [ "groups": [
{ {
"name": "ChuteTop", "name": "group",
"origin": [9, 16, -7], "origin": [8, 8, 8],
"color": 0, "color": 0,
"children": [0, 1, 2, 3, 4] "children": [0, 1, 2]
}, }
{
"name": "ChuteBase",
"origin": [8, 8, -7],
"color": 0,
"children": [5, 6, 7, 8]
},
9,
10,
11
] ]
} }

44
src/main/resources/assets/create/models/block/smart_fluid_pipe/block.json
View file

@ -4,19 +4,30 @@
"textures": { "textures": {
"2": "create:block/smart_pipe_1", "2": "create:block/smart_pipe_1",
"3": "create:block/smart_pipe_2", "3": "create:block/smart_pipe_2",
"particle": "create:block/copper_plating" "particle": "create:block/smart_pipe_2"
}, },
"elements": [ "elements": [
{
"from": [4.05, 4.05, 12],
"to": [11.95, 11.95, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14]},
"faces": {
"east": {"uv": [6, 3, 10, 11], "texture": "#2"},
"west": {"uv": [6, 3, 10, 11], "texture": "#2"},
"up": {"uv": [6, 11, 10, 3], "rotation": 90, "texture": "#2"},
"down": {"uv": [10, 11, 6, 3], "rotation": 90, "texture": "#2"}
}
},
{ {
"from": [3, 3, 3], "from": [3, 3, 3],
"to": [13, 13, 13], "to": [13, 13, 13],
"faces": { "faces": {
"north": {"uv": [3, 3, 4, 13], "texture": "#2"}, "north": {"uv": [3, 3, 4, 4], "texture": "#2"},
"east": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#2"}, "east": {"uv": [3, 3, 13, 13], "texture": "#2"},
"south": {"uv": [3, 3, 4, 13], "texture": "#2"}, "south": {"uv": [3, 3, 4, 4], "texture": "#2"},
"west": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#2"}, "west": {"uv": [3, 3, 13, 13], "texture": "#2"},
"up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#2"}, "up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#2"},
"down": {"uv": [3, 3, 13, 13], "rotation": 90, "texture": "#2"} "down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#2"}
} }
}, },
{ {
@ -24,21 +35,10 @@
"to": [11.95, 11.95, 4], "to": [11.95, 11.95, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0]}, "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0]},
"faces": { "faces": {
"east": {"uv": [10, 3, 6, 11], "texture": "#2"}, "east": {"uv": [6, 3, 10, 11], "texture": "#2"},
"west": {"uv": [10, 3, 6, 11], "rotation": 180, "texture": "#2"}, "west": {"uv": [6, 3, 10, 11], "texture": "#2"},
"up": {"uv": [6, 11, 10, 3], "rotation": 90, "texture": "#2"}, "up": {"uv": [6, 11, 10, 3], "rotation": 90, "texture": "#2"},
"down": {"uv": [6, 11, 10, 3], "rotation": 270, "texture": "#2"} "down": {"uv": [10, 11, 6, 3], "rotation": 90, "texture": "#2"}
}
},
{
"from": [4.05, 4.05, 12],
"to": [11.95, 11.95, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14]},
"faces": {
"east": {"uv": [10, 3, 6, 11], "rotation": 180, "texture": "#2"},
"west": {"uv": [10, 3, 6, 11], "texture": "#2"},
"up": {"uv": [6, 11, 10, 3], "rotation": 270, "texture": "#2"},
"down": {"uv": [6, 11, 10, 3], "rotation": 90, "texture": "#2"}
} }
}, },
{ {
@ -61,8 +61,8 @@
"north": {"uv": [8, 8, 16, 16], "texture": "#3"}, "north": {"uv": [8, 8, 16, 16], "texture": "#3"},
"east": {"uv": [13, 0, 16, 8], "texture": "#3"}, "east": {"uv": [13, 0, 16, 8], "texture": "#3"},
"south": {"uv": [0, 8, 8, 16], "texture": "#3"}, "south": {"uv": [0, 8, 8, 16], "texture": "#3"},
"west": {"uv": [13, 0, 16, 8], "rotation": 180, "texture": "#3"}, "west": {"uv": [13, 8, 16, 0], "rotation": 180, "texture": "#3"},
"up": {"uv": [13, 0, 16, 8], "rotation": 270, "texture": "#3"}, "up": {"uv": [13, 8, 16, 0], "rotation": 270, "texture": "#3"},
"down": {"uv": [13, 0, 16, 8], "rotation": 90, "texture": "#3"} "down": {"uv": [13, 0, 16, 8], "rotation": 90, "texture": "#3"}
} }
} }

75
src/main/resources/assets/create/models/block/smart_fluid_pipe/item.json
View file

@ -4,44 +4,9 @@
"textures": { "textures": {
"1": "create:block/pipes", "1": "create:block/pipes",
"2": "create:block/smart_pipe_1", "2": "create:block/smart_pipe_1",
"3": "create:block/smart_pipe_2", "3": "create:block/smart_pipe_2"
"particle": "create:block/copper_plating"
}, },
"elements": [ "elements": [
{
"from": [3, 3, 3],
"to": [13, 13, 13],
"faces": {
"north": {"uv": [3, 3, 4, 13], "texture": "#2"},
"east": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#2"},
"south": {"uv": [3, 3, 4, 13], "texture": "#2"},
"west": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#2"},
"up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#2"},
"down": {"uv": [3, 3, 13, 13], "rotation": 90, "texture": "#2"}
}
},
{
"from": [4, 4, 0],
"to": [12, 12, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0]},
"faces": {
"east": {"uv": [0, 8, 4, 6], "rotation": 270, "texture": "#1"},
"west": {"uv": [0, 8, 4, 6], "rotation": 90, "texture": "#1"},
"up": {"uv": [0, 8, 4, 6], "rotation": 180, "texture": "#1"},
"down": {"uv": [0, 8, 4, 6], "rotation": 180, "texture": "#1"}
}
},
{
"from": [4, 4, 12],
"to": [12, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 16]},
"faces": {
"east": {"uv": [0, 6, 4, 8], "rotation": 270, "texture": "#1"},
"west": {"uv": [0, 6, 4, 8], "rotation": 90, "texture": "#1"},
"up": {"uv": [0, 6, 4, 8], "rotation": 180, "texture": "#1"},
"down": {"uv": [0, 6, 4, 8], "rotation": 180, "texture": "#1"}
}
},
{ {
"from": [3, 3, 0], "from": [3, 3, 0],
"to": [13, 13, 2], "to": [13, 13, 2],
@ -68,6 +33,40 @@
"down": {"uv": [4, 8.5, 9, 9.5], "texture": "#1"} "down": {"uv": [4, 8.5, 9, 9.5], "texture": "#1"}
} }
}, },
{
"from": [3, 3, 3],
"to": [13, 13, 13],
"faces": {
"north": {"uv": [3, 3, 4, 4], "texture": "#2"},
"east": {"uv": [3, 3, 13, 13], "texture": "#2"},
"south": {"uv": [3, 3, 4, 4], "texture": "#2"},
"west": {"uv": [3, 3, 13, 13], "texture": "#2"},
"up": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#2"},
"down": {"uv": [3, 3, 13, 13], "rotation": 270, "texture": "#2"}
}
},
{
"from": [4.05, 4.05, 0],
"to": [11.95, 11.95, 4],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0]},
"faces": {
"east": {"uv": [6, 3, 10, 11], "texture": "#2"},
"west": {"uv": [6, 3, 10, 11], "texture": "#2"},
"up": {"uv": [6, 11, 10, 3], "rotation": 90, "texture": "#2"},
"down": {"uv": [10, 11, 6, 3], "rotation": 90, "texture": "#2"}
}
},
{
"from": [4.05, 4.05, 12],
"to": [11.95, 11.95, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14]},
"faces": {
"east": {"uv": [6, 3, 10, 11], "texture": "#2"},
"west": {"uv": [6, 3, 10, 11], "texture": "#2"},
"up": {"uv": [6, 11, 10, 3], "rotation": 90, "texture": "#2"},
"down": {"uv": [10, 11, 6, 3], "rotation": 90, "texture": "#2"}
}
},
{ {
"from": [4.5, 5, 7.15], "from": [4.5, 5, 7.15],
"to": [11.5, 12, 13.15], "to": [11.5, 12, 13.15],
@ -88,8 +87,8 @@
"north": {"uv": [8, 8, 16, 16], "texture": "#3"}, "north": {"uv": [8, 8, 16, 16], "texture": "#3"},
"east": {"uv": [13, 0, 16, 8], "texture": "#3"}, "east": {"uv": [13, 0, 16, 8], "texture": "#3"},
"south": {"uv": [0, 8, 8, 16], "texture": "#3"}, "south": {"uv": [0, 8, 8, 16], "texture": "#3"},
"west": {"uv": [13, 0, 16, 8], "rotation": 180, "texture": "#3"}, "west": {"uv": [13, 8, 16, 0], "rotation": 180, "texture": "#3"},
"up": {"uv": [13, 0, 16, 8], "rotation": 270, "texture": "#3"}, "up": {"uv": [13, 8, 16, 0], "rotation": 270, "texture": "#3"},
"down": {"uv": [13, 0, 16, 8], "rotation": 90, "texture": "#3"} "down": {"uv": [13, 0, 16, 8], "rotation": 90, "texture": "#3"}
} }
} }

31
src/main/resources/assets/create/models/block/stockpile_switch.json
View file

@ -4,6 +4,7 @@
"textures": { "textures": {
"7": "create:block/filtered_detector_top", "7": "create:block/filtered_detector_top",
"8": "create:block/brass_casing_connected", "8": "create:block/brass_casing_connected",
"particle": "create:block/filtered_detector_top",
"indicator": "create:block/indicator/0", "indicator": "create:block/indicator/0",
"end": "create:block/filtered_detector_front" "end": "create:block/filtered_detector_front"
}, },
@ -13,10 +14,10 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 2, 16], "to": [16, 2, 16],
"faces": { "faces": {
"north": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, "north": {"uv": [1.875, 1.75, 4, 2], "texture": "#8"},
"east": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, "east": {"uv": [1.875, 1.75, 4, 2], "texture": "#8"},
"south": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, "south": {"uv": [1.875, 1.75, 4, 2], "texture": "#8"},
"west": {"uv": [0, 7.75, 2.125, 8], "texture": "#8"}, "west": {"uv": [1.875, 1.75, 4, 2], "texture": "#8"},
"up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"}, "up": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"},
"down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"} "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"}
} }
@ -26,10 +27,10 @@
"from": [0, 14, 0], "from": [0, 14, 0],
"to": [16, 16, 16], "to": [16, 16, 16],
"faces": { "faces": {
"north": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, "north": {"uv": [3.875, 0, 6, 0.25], "texture": "#8"},
"east": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, "east": {"uv": [3.875, 0, 6, 0.25], "texture": "#8"},
"south": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, "south": {"uv": [3.875, 0, 6, 0.25], "texture": "#8"},
"west": {"uv": [0, 6, 2.125, 6.25], "texture": "#8"}, "west": {"uv": [3.875, 0, 6, 0.25], "texture": "#8"},
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"},
"down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"} "down": {"uv": [0, 0, 2, 2], "rotation": 270, "texture": "#8"}
} }
@ -45,20 +46,6 @@
"west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"} "west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#8"}
} }
}, },
{
"name": "Center",
"from": [0.9, 2, 0.9],
"to": [15.1, 14, 15.1],
"color": 5,
"faces": {
"north": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"},
"east": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"},
"south": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"},
"west": {"uv": [12, 12.125, 13.625, 13.875], "rotation": 90, "texture": "#missing"},
"up": {"uv": [0, 0, 14, 14], "rotation": 90, "texture": "#missing"},
"down": {"uv": [0, 0, 14, 14], "rotation": 270, "texture": "#missing"}
}
},
{ {
"name": "Indicator", "name": "Indicator",
"from": [3.1, 3.1, -1.9], "from": [3.1, 3.1, -1.9],

BIN
src/main/resources/assets/create/textures/block/bars/brass_bars.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
src/main/resources/assets/create/textures/block/bars/brass_bars_edge.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
src/main/resources/assets/create/textures/block/basin.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 321 B

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
src/main/resources/assets/create/textures/block/basin_canal.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 267 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/main/resources/assets/create/textures/block/basin_side.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 354 B

BIN
src/main/resources/assets/create/textures/block/belt/andesite_belt_casing_diagonal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
src/main/resources/assets/create/textures/block/belt/andesite_belt_casing_horizontal.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
src/main/resources/assets/create/textures/block/belt/andesite_belt_casing_sideways.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
src/main/resources/assets/create/textures/block/brass_gearbox.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

BIN
src/main/resources/assets/create/textures/block/chute.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
src/main/resources/assets/create/textures/block/chute_block.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 266 B

BIN
src/main/resources/assets/create/textures/block/chute_diagonal.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 561 B

BIN
src/main/resources/assets/create/textures/block/chute_hole.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 380 B

BIN
src/main/resources/assets/create/textures/block/chute_large.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
src/main/resources/assets/create/textures/block/chute_smart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
src/main/resources/assets/create/textures/block/chute_smart_powered.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 638 B

BIN
src/main/resources/assets/create/textures/block/chute_smart_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/main/resources/assets/create/textures/block/clockwork_bearing_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 438 B

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/main/resources/assets/create/textures/block/content_observer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/main/resources/assets/create/textures/block/content_observer_inner.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/main/resources/assets/create/textures/block/content_observer_inner_powered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/main/resources/assets/create/textures/block/content_observer_powered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/main/resources/assets/create/textures/block/display_link_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/main/resources/assets/create/textures/block/display_link_side_powered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/main/resources/assets/create/textures/block/filtered_detector_top.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 2 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/brass_funnel_neutral.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 4 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/brass_funnel_powered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 2 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/brass_funnel_unpowered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/funnel_open.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 1 KiB

BIN
src/main/resources/assets/create/textures/block/industrial_iron_block.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 901 B

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
src/main/resources/assets/create/textures/block/industrial_iron_block_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
src/main/resources/assets/create/textures/block/mechanical_saw_top.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/main/resources/assets/create/textures/block/mixer_head.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 353 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/main/resources/assets/create/textures/block/railway_casing_side.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
src/main/resources/assets/create/textures/block/rotation_speed_controller.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/main/resources/assets/create/textures/block/rotation_speed_controller_bracket.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 318 B

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/main/resources/assets/create/textures/block/rotation_speed_controller_top.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 294 B

After

Width:  |  Height:  |  Size: 2 KiB

BIN
src/main/resources/assets/create/textures/block/scaffold/brass_scaffold.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_connected.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_inside.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 840 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/create/textures/block/scaffold/brass_scaffold_inside_connected.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 889 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/main/resources/assets/create/textures/block/smart_pipe_1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/main/resources/assets/create/textures/block/smart_pipe_2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 2 KiB

BIN
src/main/resources/assets/create/textures/block/waterwheel_metal.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB