diff --git a/src/main/java/net/limit/cubliminal/CubliminalClient.java b/src/main/java/net/limit/cubliminal/CubliminalClient.java index 4a89fe6..3b29960 100644 --- a/src/main/java/net/limit/cubliminal/CubliminalClient.java +++ b/src/main/java/net/limit/cubliminal/CubliminalClient.java @@ -47,6 +47,7 @@ public void onInitializeClient() { CubliminalBlocks.FUSED_WALL_LIGHT_BULB, CubliminalBlocks.SMOKE_DETECTOR, CubliminalBlocks.VENTILATION_DUCT, + CubliminalBlocks.VENTILATION_PIPE, CubliminalBlocks.CHAIN_WALL, CubliminalBlocks.CHAIN_BLOCK, CubliminalBlocks.CHAIN_SLAB, diff --git a/src/main/java/net/limit/cubliminal/block/custom/VentilationPipeBlock.java b/src/main/java/net/limit/cubliminal/block/custom/VentilationPipeBlock.java index 2ed2149..5fd5a7e 100644 --- a/src/main/java/net/limit/cubliminal/block/custom/VentilationPipeBlock.java +++ b/src/main/java/net/limit/cubliminal/block/custom/VentilationPipeBlock.java @@ -29,7 +29,6 @@ public class VentilationPipeBlock extends Block implements Waterloggable { public static final BooleanProperty WEST; public static final BooleanProperty UP; public static final BooleanProperty DOWN; - public static final BooleanProperty WATERLOGGED; protected static final Map FACING_PROPERTIES; public VentilationPipeBlock(Settings settings) { @@ -50,7 +49,6 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { .with(EAST, this.connectsTo(world, blockPos, Direction.EAST)) .with(UP, this.connectsTo(world, blockPos, Direction.UP)) .with(DOWN, this.connectsTo(world, blockPos, Direction.DOWN)) - .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER) .with(FAN, random.nextDouble() < 0.1f); } @@ -67,10 +65,6 @@ protected boolean isShapeFullCube(BlockState state, BlockView world, BlockPos po return false; } - protected FluidState getFluidState(BlockState state) { - return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state); - } - protected BlockState rotate(BlockState state, BlockRotation rotation) { switch (rotation) { case CLOCKWISE_180 -> { @@ -104,16 +98,12 @@ protected BlockState mirror(BlockState state, BlockMirror mirror) { @Override protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { - if (state.get(WATERLOGGED)) { - tickView.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); - } - return state.with(FACING_PROPERTIES.get(direction), this.connectsTo(neighborState)); } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(NORTH, EAST, WEST, SOUTH, UP, DOWN, WATERLOGGED, FAN); + builder.add(NORTH, EAST, WEST, SOUTH, UP, DOWN, FAN); } static { @@ -123,7 +113,6 @@ protected void appendProperties(StateManager.Builder builder) WEST = ConnectingBlock.WEST; UP = ConnectingBlock.UP; DOWN = ConnectingBlock.DOWN; - WATERLOGGED = Properties.WATERLOGGED; FACING_PROPERTIES = ConnectingBlock.FACING_PROPERTIES; } } diff --git a/src/main/resources/assets/cubliminal/blockstates/damp_carpet_stairs.json b/src/main/resources/assets/cubliminal/blockstates/damp_carpet_stairs.json index 73bde96..9198e0a 100644 --- a/src/main/resources/assets/cubliminal/blockstates/damp_carpet_stairs.json +++ b/src/main/resources/assets/cubliminal/blockstates/damp_carpet_stairs.json @@ -2,7 +2,6 @@ "variants": { "facing=east,half=bottom,shape=inner_left": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { @@ -10,7 +9,6 @@ }, "facing=east,half=bottom,shape=outer_left": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { @@ -21,81 +19,66 @@ }, "facing=east,half=top,shape=inner_left": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { "model": "cubliminal:block/damp_carpet_stairs", - "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { "model": "cubliminal:block/damp_carpet_stairs", - "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { "model": "cubliminal:block/damp_carpet_stairs", - "uvlock": true, "x": 180, "y": 270 }, @@ -104,7 +87,6 @@ }, "facing=south,half=bottom,shape=inner_right": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { @@ -112,96 +94,79 @@ }, "facing=south,half=bottom,shape=outer_right": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { "model": "cubliminal:block/damp_carpet_stairs", - "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { "model": "cubliminal:block/damp_carpet_stairs", - "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { "model": "cubliminal:block/damp_carpet_stairs", - "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { "model": "cubliminal:block/damp_carpet_stairs_inner", - "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { "model": "cubliminal:block/damp_carpet_stairs_outer", - "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { "model": "cubliminal:block/damp_carpet_stairs", - "uvlock": true, "x": 180, "y": 180 } diff --git a/src/main/resources/assets/cubliminal/blockstates/ventilation_pipe.json b/src/main/resources/assets/cubliminal/blockstates/ventilation_pipe.json index 12d4c4b..3a4b11c 100644 --- a/src/main/resources/assets/cubliminal/blockstates/ventilation_pipe.json +++ b/src/main/resources/assets/cubliminal/blockstates/ventilation_pipe.json @@ -1,121 +1,153 @@ { - "variants": { - "north=false,south=false,east=false,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/straight" - }, - "north=true,south=false,east=false,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/straight" - }, - "north=false,south=true,east=false,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/straight", - "y": 180 - }, - "north=true,south=true,east=false,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/straight" - }, - "north=false,south=false,east=true,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/straight", - "y": 90 - }, - "north=false,south=false,east=false,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/straight", - "y": 270 - }, - "north=false,south=false,east=true,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/straight", - "y": 90 - }, - "north=true,south=false,east=false,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/corner" - }, - "north=false,south=true,east=true,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/corner", - "y": 180 - }, - "north=true,south=false,east=true,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/corner", - "y": 90 - }, - "north=false,south=true,east=false,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/corner", - "y": 270 - }, - "north=true,south=true,east=true,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/quad" - }, - "north=true,south=false,east=true,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/triple" - }, - "north=false,south=true,east=true,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/triple", - "y": 180 - }, - "north=true,south=true,east=false,west=true,fan=false": { - "model": "cubliminal:block/ventilation_pipe/triple", - "y": 270 - }, - "north=true,south=true,east=true,west=false,fan=false": { - "model": "cubliminal:block/ventilation_pipe/triple", - "y": 90 - }, - - "north=false,south=false,east=false,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/straight_fan" - }, - "north=true,south=false,east=false,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/straight_fan" - }, - "north=false,south=true,east=false,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/straight_fan", - "y": 180 - }, - "north=true,south=true,east=false,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/straight_fan" - }, - "north=false,south=false,east=true,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/straight_fan", - "y": 90 - }, - "north=false,south=false,east=false,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/straight_fan", - "y": 270 - }, - "north=false,south=false,east=true,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/straight_fan", - "y": 90 - }, - "north=true,south=false,east=false,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/corner_fan" - }, - "north=false,south=true,east=true,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/corner_fan", - "y": 180 - }, - "north=true,south=false,east=true,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/corner_fan", - "y": 90 - }, - "north=false,south=true,east=false,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/corner_fan", - "y": 270 - }, - "north=true,south=true,east=true,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/quad_fan" - }, - "north=true,south=false,east=true,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/triple_fan" - }, - "north=false,south=true,east=true,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/triple_fan", - "y": 180 - }, - "north=true,south=true,east=false,west=true,fan=true": { - "model": "cubliminal:block/ventilation_pipe/triple_fan", - "y": 270 - }, - "north=true,south=true,east=true,west=false,fan=true": { - "model": "cubliminal:block/ventilation_pipe/triple_fan", - "y": 90 + "multipart": [ + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/base" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/fan" + }, + "when": { + "fan": "true" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/open" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/open", + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/open", + "y": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/open", + "y": 270 + }, + "when": { + "west": "true" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/open", + "x": 270 + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/open", + "x": 90 + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/closed" + }, + "when": { + "north": "true", + "east": "false", + "south": "false", + "west": "false", + "down": "false", + "up": "false" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/closed", + "y": 90 + }, + "when": { + "north": "false", + "east": "true", + "south": "false", + "west": "false", + "down": "false", + "up": "false" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/closed", + "y": 180 + }, + "when": { + "north": "false", + "east": "false", + "south": "true", + "west": "false", + "down": "false", + "up": "false" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/closed", + "y": 270 + }, + "when": { + "north": "false", + "east": "false", + "south": "false", + "west": "true", + "down": "false", + "up": "false" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/closed", + "x": 90 + }, + "when": { + "north": "false", + "east": "false", + "south": "false", + "west": "false", + "down": "true", + "up": "false" + } + }, + { + "apply": { + "model": "cubliminal:block/ventilation_pipe/closed", + "x": 270 + }, + "when": { + "north": "false", + "east": "false", + "south": "false", + "west": "false", + "down": "false", + "up": "true" + } } - } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/cable_tray/box.json b/src/main/resources/assets/cubliminal/models/block/cable_tray/box.json index c420ad5..247950a 100644 --- a/src/main/resources/assets/cubliminal/models/block/cable_tray/box.json +++ b/src/main/resources/assets/cubliminal/models/block/cable_tray/box.json @@ -1,22 +1,23 @@ { + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", "parent": "block/block", - "texture_size": [32, 32], "textures": { - "0": "cubliminal:block/cable_tray_box", - "particle": "cubliminal:block/cable_tray_box" + "particle": "cubliminal:block/cable_tray/cable_tray", + "base": "cubliminal:block/cable_tray/cable_tray", + "grate": "cubliminal:block/cable_tray/cable_tray_box" }, "elements": [ { "from": [0, 10, 0], "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -2, 0]}, "faces": { - "north": {"uv": [8, 0, 16, 2], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 2, 16, 4], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 4, 16, 6], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 6, 16, 8], "texture": "#0", "cullface": "west"}, - "up": {"uv": [8, 8, 0, 0], "texture": "#0"}, - "down": {"uv": [8, 8, 0, 16], "texture": "#0"} + "north": {"uv": [0, 0, 16, 4], "texture": "#base", "cullface": "north"}, + "east": {"uv": [0, 4, 16, 8], "texture": "#base", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 12], "texture": "#base", "cullface": "south"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#base", "cullface": "west"}, + "up": {"uv": [16, 16, 0, 0], "texture": "#base"}, + "down": {"uv": [16, 0, 0, 16], "texture": "#grate"} } } ] diff --git a/src/main/resources/assets/cubliminal/models/block/cable_tray/corner.json b/src/main/resources/assets/cubliminal/models/block/cable_tray/corner.json index 08e343c..8a11eaf 100644 --- a/src/main/resources/assets/cubliminal/models/block/cable_tray/corner.json +++ b/src/main/resources/assets/cubliminal/models/block/cable_tray/corner.json @@ -1,139 +1,106 @@ { + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", "parent": "block/block", - "texture_size": [64, 64], "textures": { - "1": "cubliminal:block/cable_tray_corner", - "particle": "cubliminal:block/cable_tray_corner" + "particle": "cubliminal:block/cable_tray/cable_tray", + "base": "cubliminal:block/cable_tray/cable_tray", + "extra": "cubliminal:block/cable_tray/cable_tray_extra", + "cables": "cubliminal:block/cable_tray/cables_corner" }, "elements": [ { "from": [0, 12, 0], "to": [15, 14, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 0]}, "faces": { - "north": {"uv": [3.75, 4, 7.5, 4.5], "texture": "#1", "cullface": "north"}, - "east": {"uv": [3.75, 4.5, 7.5, 5], "texture": "#1"}, - "south": {"uv": [3.75, 5, 7.5, 5.5], "texture": "#1"}, - "west": {"uv": [3.75, 5.5, 7.5, 6], "texture": "#1", "cullface": "west"}, - "up": {"uv": [3.75, 3.75, 0, 0], "texture": "#1"}, - "down": {"uv": [3.75, 3.75, 0, 7.5], "texture": "#1"} + "north": {"uv": [1, 0, 16, 2], "texture": "#base", "cullface": "north"}, + "west": {"uv": [0, 12, 15, 14], "texture": "#base", "cullface": "west"}, + "up": {"uv": [0, 0, 15, 15], "texture": "#base"}, + "down": {"uv": [0, 1, 15, 16], "texture": "#cables"} } }, { "from": [0, 10, 0], "to": [1, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 10, 0]}, "faces": { - "north": {"uv": [7.5, 5.25, 7.75, 5.75], "texture": "#1", "cullface": "north"}, - "east": {"uv": [7.75, 0, 8, 0.5], "texture": "#1"}, - "south": {"uv": [0.25, 7.75, 0.5, 8.25], "texture": "#1"}, - "west": {"uv": [0.5, 7.75, 0.75, 8.25], "texture": "#1", "cullface": "west"}, - "up": {"uv": [7.75, 6, 7.5, 5.75], "texture": "#1"}, - "down": {"uv": [8, 0.5, 7.75, 0.75], "texture": "#1"} + "north": {"uv": [15, 2, 16, 4], "texture": "#base", "cullface": "north"}, + "east": {"uv": [14, 1, 15, 2], "texture": "#extra"}, + "south": {"uv": [1, 1, 2, 2], "texture": "#extra"}, + "west": {"uv": [0, 14, 1, 16], "texture": "#base", "cullface": "west"}, + "down": {"uv": [0, 15, 1, 16], "texture": "#base"} } }, { "from": [15, 10, 0], "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 10, 0]}, "faces": { - "north": {"uv": [3.5, 7.5, 3.75, 8.5], "texture": "#1", "cullface": "north"}, - "east": {"uv": [3.75, 0, 7.75, 1], "texture": "#1", "cullface": "east"}, - "south": {"uv": [7.25, 7.5, 7.5, 8.5], "texture": "#1", "cullface": "south"}, - "west": {"uv": [3.75, 1, 7.75, 2], "texture": "#1"}, - "up": {"uv": [4, 10, 3.75, 6], "texture": "#1"}, - "down": {"uv": [4.25, 6, 4, 10], "texture": "#1"} + "north": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, + "east": {"uv": [0, 4, 16, 8], "texture": "#base", "cullface": "east"}, + "south": {"uv": [15, 8, 16, 12], "texture": "#base", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 4], "texture": "#extra"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} } }, { "from": [0, 10, 15], "to": [15, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 10, 14]}, "faces": { - "north": {"uv": [3.75, 2, 7.5, 3], "texture": "#1"}, - "east": {"uv": [7.5, 7.5, 7.75, 8.5], "texture": "#1"}, - "south": {"uv": [3.75, 3, 7.5, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 7.75, 0.25, 8.75], "texture": "#1", "cullface": "west"}, - "up": {"uv": [8, 6.25, 4.25, 6], "texture": "#1"}, - "down": {"uv": [8, 6.25, 4.25, 6.5], "texture": "#1"} + "north": {"uv": [1, 0, 16, 4], "texture": "#extra"}, + "south": {"uv": [0, 8, 15, 12], "texture": "#base", "cullface": "south"}, + "west": {"uv": [15, 12, 16, 16], "texture": "#base", "cullface": "west"}, + "up": {"uv": [0, 15, 15, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 15, 1], "texture": "#base"} } }, { "from": [0, 11, 1], "to": [1, 12, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 10, 1]}, "faces": { - "north": {"uv": [0.75, 7.75, 1, 8], "texture": "#1"}, - "east": {"uv": [4.25, 6.5, 7.75, 6.75], "texture": "#1"}, - "south": {"uv": [7.75, 0.75, 8, 1], "texture": "#1"}, - "west": {"uv": [4.25, 6.75, 7.75, 7], "texture": "#1", "cullface": "west"}, - "up": {"uv": [4.5, 10.5, 4.25, 7], "texture": "#1"}, - "down": {"uv": [4.75, 7, 4.5, 10.5], "texture": "#1"} + "east": {"uv": [1, 1, 15, 2], "texture": "#extra"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#base", "cullface": "west"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#base"} } }, { "from": [1, 11, 0], "to": [15, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 10, 0]}, "faces": { - "north": {"uv": [4.75, 7, 8.25, 7.25], "texture": "#1", "cullface": "north"}, - "east": {"uv": [1, 7.75, 1.25, 8], "texture": "#1"}, - "south": {"uv": [4.75, 7.25, 8.25, 7.5], "texture": "#1"}, - "west": {"uv": [7.75, 1, 8, 1.25], "texture": "#1"}, - "up": {"uv": [3.5, 7.75, 0, 7.5], "texture": "#1"}, - "down": {"uv": [11, 2, 7.5, 2.25], "texture": "#1"} + "north": {"uv": [1, 2, 15, 3], "texture": "#base", "cullface": "north"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#extra"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} } }, { "from": [16.2, 12, 3], "to": [16.2, 16, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [16.2, 12, 3]}, "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "east": {"uv": [7.5, 2.25, 8, 3.25], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "west": {"uv": [7.5, 3.25, 8, 4.25], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#1"} + "east": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "east"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "east"} } }, { "from": [16.2, 12, 11], "to": [16.2, 16, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [16.2, 12, 11]}, "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "east": {"uv": [7.5, 4.25, 8, 5.25], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "west": {"uv": [4.75, 7.5, 5.25, 8.5], "texture": "#1"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#1"} + "east": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "east"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "east"} } }, { "from": [3, 12, 16.2], "to": [5, 16, 16.2], - "rotation": {"angle": 0, "axis": "y", "origin": [3, 12, 16.2]}, "faces": { - "north": {"uv": [5.25, 7.5, 5.75, 8.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "south": {"uv": [5.75, 7.5, 6.25, 8.5], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "up": {"uv": [0.5, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [0.5, 0, 0, 0], "texture": "#1"} + "north": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "south"}, + "south": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "south"} } }, { "from": [11, 12, 16.2], "to": [13, 16, 16.2], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 12, 16.2]}, "faces": { - "north": {"uv": [6.25, 7.5, 6.75, 8.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "south": {"uv": [6.75, 7.5, 7.25, 8.5], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 0, 1], "texture": "#1"}, - "up": {"uv": [0.5, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [0.5, 0, 0, 0], "texture": "#1"} + "north": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "south"}, + "south": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "south"} } } ] diff --git a/src/main/resources/assets/cubliminal/models/block/cable_tray/straight.json b/src/main/resources/assets/cubliminal/models/block/cable_tray/straight.json index 6a5dc62..2506251 100644 --- a/src/main/resources/assets/cubliminal/models/block/cable_tray/straight.json +++ b/src/main/resources/assets/cubliminal/models/block/cable_tray/straight.json @@ -1,139 +1,105 @@ { + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", "parent": "block/block", - "texture_size": [64, 64], "textures": { - "0": "cubliminal:block/cable_tray_straight", - "particle": "cubliminal:block/cable_tray_straight" + "particle": "cubliminal:block/cable_tray/cable_tray", + "base": "cubliminal:block/cable_tray/cable_tray", + "extra": "cubliminal:block/cable_tray/cable_tray_extra", + "cables": "cubliminal:block/cable_tray/cables_straight" }, "elements": [ { "from": [1, 12, 0], "to": [15, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 0]}, "faces": { - "north": {"uv": [0, 6.5, 3.5, 7], "texture": "#0", "cullface": "north"}, - "east": {"uv": [0, 6, 4, 6.5], "texture": "#0"}, - "south": {"uv": [3.5, 6.5, 7, 7], "texture": "#0", "cullface": "south"}, - "west": {"uv": [4, 6, 8, 6.5], "texture": "#0"}, - "up": {"uv": [3.5, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [7, 0, 3.5, 4], "texture": "#0"} + "north": {"uv": [1, 0, 15, 2], "texture": "#base", "cullface": "north"}, + "south": {"uv": [1, 8, 15, 10], "texture": "#base", "cullface": "south"}, + "up": {"uv": [1, 0, 15, 16], "texture": "#base"}, + "down": {"uv": [1, 0, 15, 16], "texture": "#cables"} } }, { "from": [0, 10, 0], "to": [1, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 0]}, "faces": { - "north": {"uv": [0.5, 7.5, 0.75, 8.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [0, 4, 4, 5], "texture": "#0"}, - "south": {"uv": [0.75, 7.5, 1, 8.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [4, 4, 8, 5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [3.75, 11, 3.5, 7], "texture": "#0"}, - "down": {"uv": [4, 7, 3.75, 11], "texture": "#0"} + "north": {"uv": [15, 0, 16, 4], "texture": "#base", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 4], "texture": "#extra"}, + "south": {"uv": [0, 8, 1, 12], "texture": "#base", "cullface": "south"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#base", "cullface": "west"}, + "up": {"uv": [0, 0, 1, 16], "texture": "#base"}, + "down": {"uv": [0, 0, 1, 16], "texture": "#base"} } }, { "from": [15, 10, 0], "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 0]}, "faces": { - "north": {"uv": [1, 7.5, 1.25, 8.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [0, 5, 4, 6], "texture": "#0", "cullface": "east"}, - "south": {"uv": [1.25, 7.5, 1.5, 8.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [4, 5, 8, 6], "texture": "#0"}, - "up": {"uv": [4.25, 11, 4, 7], "texture": "#0"}, - "down": {"uv": [4.5, 7, 4.25, 11], "texture": "#0"} + "north": {"uv": [0, 0, 1, 4], "texture": "#base", "cullface": "north"}, + "east": {"uv": [0, 4, 16, 8], "texture": "#base", "cullface": "east"}, + "south": {"uv": [15, 8, 16, 12], "texture": "#base", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 4], "texture": "#extra"}, + "up": {"uv": [15, 0, 16, 16], "texture": "#base"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#base"} } }, { "from": [1, 11, 0], "to": [15, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 0]}, "faces": { - "north": {"uv": [7, 0.5, 10.5, 0.75], "texture": "#0", "cullface": "north"}, - "east": {"uv": [2.5, 7.5, 2.75, 7.75], "texture": "#0"}, - "south": {"uv": [7, 0.75, 10.5, 1], "texture": "#0"}, - "west": {"uv": [2.75, 7.5, 3, 7.75], "texture": "#0"}, - "up": {"uv": [10.5, 1.25, 7, 1], "texture": "#0"}, - "down": {"uv": [10.5, 1.25, 7, 1.5], "texture": "#0"} + "north": {"uv": [1, 2, 15, 3], "texture": "#base", "cullface": "north"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#extra"}, + "down": {"uv": [1, 15, 15, 16], "texture": "#base"} } }, { "from": [1, 11, 15], "to": [15, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 11, 14]}, "faces": { - "north": {"uv": [7, 1.5, 10.5, 1.75], "texture": "#0"}, - "east": {"uv": [3, 7.5, 3.25, 7.75], "texture": "#0"}, - "south": {"uv": [7, 1.75, 10.5, 2], "texture": "#0", "cullface": "south"}, - "west": {"uv": [7.5, 3, 7.75, 3.25], "texture": "#0"}, - "up": {"uv": [10.5, 2.25, 7, 2], "texture": "#0"}, - "down": {"uv": [10.5, 2.25, 7, 2.5], "texture": "#0"} + "north": {"uv": [1, 1, 15, 2], "texture": "#extra"}, + "south": {"uv": [1, 10, 15, 11], "texture": "#base", "cullface": "south"}, + "down": {"uv": [1, 0, 15, 1], "texture": "#base"} } }, { "from": [1, 11, 7], "to": [15, 12, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [1, 10, 7]}, "faces": { - "north": {"uv": [7, 2.5, 10.5, 2.75], "texture": "#0"}, - "east": {"uv": [1.5, 7.5, 2, 7.75], "texture": "#0"}, - "south": {"uv": [7, 2.75, 10.5, 3], "texture": "#0"}, - "west": {"uv": [2, 7.5, 2.5, 7.75], "texture": "#0"}, - "up": {"uv": [3.5, 7.5, 0, 7], "texture": "#0"}, - "down": {"uv": [10.5, 0, 7, 0.5], "texture": "#0"} + "north": {"uv": [1, 1, 15, 2], "texture": "#extra"}, + "south": {"uv": [1, 1, 15, 2], "texture": "#extra"}, + "down": {"uv": [1, 7, 15, 9], "texture": "#base"} } }, { "from": [-0.2, 12, 3], "to": [-0.2, 16, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [-2.2, 12, 3]}, "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "east": {"uv": [7, 3, 7.5, 4], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "west": {"uv": [4.5, 7, 5, 8], "texture": "#0", "cullface": "west"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "west"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "west"} } }, { "from": [-0.2, 12, 11], "to": [-0.2, 16, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [-0.2, 12, 11]}, "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "east": {"uv": [5, 7, 5.5, 8], "texture": "#0"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "west": {"uv": [5.5, 7, 6, 8], "texture": "#0", "cullface": "west"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#0"} + "east": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "west"}, + "west": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "west"} } }, { "from": [16.2, 12, 3], "to": [16.2, 16, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [16.2, 12, 3]}, "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "east": {"uv": [6, 7, 6.5, 8], "texture": "#0", "cullface": "east"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "west": {"uv": [6.5, 7, 7, 8], "texture": "#0"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "east"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "east"} } }, { "from": [16.2, 12, 11], "to": [16.2, 16, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [14.2, 12, 11]}, "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "east": {"uv": [7, 6.5, 7.5, 7.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#0"}, - "west": {"uv": [0, 7.5, 0.5, 8.5], "texture": "#0"}, - "up": {"uv": [0, 0.5, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#0"} + "east": {"uv": [0, 4, 2, 8], "texture": "#extra", "cullface": "east"}, + "west": {"uv": [2, 4, 4, 8], "texture": "#extra", "cullface": "east"} } } ] diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs.json index c9b2e64..b25ab9a 100644 --- a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs.json +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs.json @@ -1,8 +1,9 @@ { - "parent": "minecraft:block/stairs", + "parent": "cubliminal:block/stairs/carpeted_stairs", "textures": { - "bottom": "cubliminal:block/damp_carpet", - "side": "cubliminal:block/damp_carpet", + "right": "cubliminal:block/yellow_carpeted_stairs_right", + "back": "cubliminal:block/yellow_carpeted_wall", + "left": "cubliminal:block/yellow_carpeted_stairs_left", "top": "cubliminal:block/damp_carpet" } } \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_inner.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_inner.json index 27fca36..f3aa516 100644 --- a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_inner.json +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_inner.json @@ -1,8 +1,10 @@ { - "parent": "minecraft:block/inner_stairs", + "parent": "cubliminal:block/stairs/carpeted_inner_stairs", "textures": { - "bottom": "cubliminal:block/damp_carpet", - "side": "cubliminal:block/damp_carpet", - "top": "cubliminal:block/damp_carpet" + "right": "cubliminal:block/yellow_carpeted_stairs_right", + "back": "cubliminal:block/yellow_carpeted_wall", + "left": "cubliminal:block/yellow_carpeted_stairs_left", + "top": "cubliminal:block/damp_carpet", + "bottom": "cubliminal:block/yellow_wallpaper" } } \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_outer.json b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_outer.json index 1844636..73829d1 100644 --- a/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_outer.json +++ b/src/main/resources/assets/cubliminal/models/block/damp_carpet_stairs_outer.json @@ -1,8 +1,9 @@ { - "parent": "minecraft:block/outer_stairs", + "parent": "cubliminal:block/stairs/carpeted_outer_stairs", "textures": { - "bottom": "cubliminal:block/damp_carpet", - "side": "cubliminal:block/damp_carpet", + "right": "cubliminal:block/yellow_carpeted_stairs_right", + "back": "cubliminal:block/yellow_carpeted_wall", + "left": "cubliminal:block/yellow_carpeted_stairs_left", "top": "cubliminal:block/damp_carpet" } } \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_inner_stairs.json b/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_inner_stairs.json new file mode 100644 index 0000000..2d04e7d --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_inner_stairs.json @@ -0,0 +1,43 @@ +{ + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", + "parent": "block/stairs", + "textures": { + "particle": "#top" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 8, 16, 16], "texture": "#right", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#back", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#back", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#left", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#top"}, + "down": {"uv": [16, 0, 0, 16], "rotation": 270, "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 8, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#right", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#back", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#back", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "rotation": 180, "texture": "#top"}, + "up": {"uv": [0, 8, 16, 16], "rotation": 90, "texture": "#top", "cullface": "up"} + } + }, + { + "from": [0, 8, 8], + "to": [8, 16, 16], + "faces": { + "north": {"uv": [0, 8, 8, 16], "rotation": 180, "texture": "#top"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#back", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#left", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 8], "rotation": 180, "texture": "#top", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_outer_stairs.json b/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_outer_stairs.json new file mode 100644 index 0000000..1101835 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_outer_stairs.json @@ -0,0 +1,33 @@ +{ + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", + "parent": "block/stairs", + "textures": { + "particle": "#top" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 16, 16, 8], "texture": "#top"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#right"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#left"}, + "west": {"uv": [0, 16, 16, 8], "texture": "#top", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#top"}, + "down": {"uv": [16, 0, 0, 16], "rotation": 270, "texture": "#back", "cullface": "down"} + } + }, + { + "from": [8, 8, 8], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 8, 8, 0], "texture": "#top"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#right", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#left", "cullface": "south"}, + "west": {"uv": [8, 8, 16, 0], "texture": "#top"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_stairs.json b/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_stairs.json new file mode 100644 index 0000000..875c34a --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/stairs/carpeted_stairs.json @@ -0,0 +1,31 @@ +{ + "parent": "block/stairs", + "textures": { + "particle": "#top" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 8, 16, 16], "texture": "#right", "cullface": "north"}, + "east": {"uv": [0, 8, 16, 16], "texture": "#back", "cullface": "east"}, + "south": {"uv": [0, 8, 16, 16], "texture": "#left", "cullface": "south"}, + "west": {"uv": [0, 16, 16, 8], "texture": "#top", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#top"}, + "down": {"uv": [16, 0, 0, 16], "rotation": 270, "texture": "#back", "cullface": "down"} + } + }, + { + "from": [8, 8, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#right", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#back", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#left", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 0], "texture": "#top"}, + "up": {"uv": [0, 0, 16, 8], "rotation": 90, "texture": "#top", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/base.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/base.json new file mode 100644 index 0000000..e2e65ab --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/base.json @@ -0,0 +1,22 @@ +{ + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", + "textures": { + "base": "cubliminal:block/ventilation_pipe/ventilation_pipe_base", + "particle": "cubliminal:block/ventilation_pipe/ventilation_pipe_quad" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#base", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#base", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#base", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#base", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#base", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#base", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/closed.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/closed.json new file mode 100644 index 0000000..75321a0 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/closed.json @@ -0,0 +1,16 @@ +{ + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", + "textures": { + "edge": "cubliminal:block/ventilation_pipe/ventilation_pipe_end" + }, + "elements": [ + { + "from": [-0.01, -0.01, -0.01], + "to": [16.01, 16.01, 16.01], + "faces": { + "south": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#edge", "cullface": "south"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/corner.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/corner.json index 5a30384..47d1aaf 100644 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/corner.json +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/corner.json @@ -1,72 +1,22 @@ { + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", "parent": "block/block", - "texture_size": [64, 64], "textures": { - "0": "cubliminal:block/ventilation_pipe_corner", - "particle": "cubliminal:block/ventilation_pipe_corner" + "1": "cubliminal:block/ventilation_pipe/ventilation_pipe_straight", + "2": "cubliminal:block/ventilation_pipe/ventilation_pipe_corner", + "particle": "cubliminal:block/ventilation_pipe/ventilation_pipe_straight" }, "elements": [ { "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [8, 6, 12, 6.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 6.5, 12, 7], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 7, 12, 7.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [7.5, 8, 11.5, 8.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 14, 2], - "faces": { - "north": {"uv": [1, 11, 1.5, 14], "texture": "#0", "cullface": "north"}, - "east": {"uv": [1.5, 11, 2, 14], "texture": "#0"}, - "south": {"uv": [2, 11, 2.5, 14], "texture": "#0"}, - "west": {"uv": [2.5, 11, 3, 14], "texture": "#0", "cullface": "west"}, - "up": {"uv": [5.5, 11.5, 5, 11], "texture": "#0"}, - "down": {"uv": [6, 11, 5.5, 11.5], "texture": "#0"} - } - }, - { - "from": [0, 14, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, - "faces": { - "north": {"uv": [8, 7.5, 12, 8], "texture": "#0", "cullface": "north"}, - "east": {"uv": [7.5, 8.5, 11.5, 9], "texture": "#0", "cullface": "east"}, - "south": {"uv": [7.5, 9, 11.5, 9.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [7.5, 9.5, 11.5, 10], "texture": "#0", "cullface": "west"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#0", "cullface": "up"}, - "down": {"uv": [8, 4, 4, 8], "texture": "#0"} - } - }, - { - "from": [0, 2, 14], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 14]}, - "faces": { - "north": {"uv": [0, 8, 4, 11], "texture": "#0"}, - "east": {"uv": [3, 11, 3.5, 14], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 0, 12, 3], "texture": "#0", "cullface": "south"}, - "west": {"uv": [3.5, 11, 4, 14], "texture": "#0", "cullface": "west"}, - "up": {"uv": [11.5, 10.5, 7.5, 10], "texture": "#0"}, - "down": {"uv": [11.5, 10.5, 7.5, 11], "texture": "#0"} - } - }, - { - "from": [14, 2, 0], - "to": [16, 14, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [1, 1, 0]}, "faces": { - "north": {"uv": [4, 11, 4.5, 14], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 3, 11.5, 6], "texture": "#0", "cullface": "east"}, - "south": {"uv": [4.5, 11, 5, 14], "texture": "#0"}, - "west": {"uv": [4, 8, 7.5, 11], "texture": "#0"}, - "up": {"uv": [0.5, 14.5, 0, 11], "texture": "#0"}, - "down": {"uv": [1, 11, 0.5, 14.5], "texture": "#0"} + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#2"} } } ] diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/corner_fan.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/corner_fan.json deleted file mode 100644 index a42d581..0000000 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/corner_fan.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "parent": "block/block", - "texture_size": [64, 64], - "textures": { - "0": "cubliminal:block/ventilation_pipe_corner_fan", - "particle": "cubliminal:block/ventilation_pipe_corner_fan" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [8, 6, 12, 6.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 6.5, 12, 7], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 7, 12, 7.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [7.5, 8, 11.5, 8.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 14, 2], - "faces": { - "north": {"uv": [1, 11, 1.5, 14], "texture": "#0", "cullface": "north"}, - "east": {"uv": [1.5, 11, 2, 14], "texture": "#0"}, - "south": {"uv": [2, 11, 2.5, 14], "texture": "#0"}, - "west": {"uv": [2.5, 11, 3, 14], "texture": "#0", "cullface": "west"}, - "up": {"uv": [5.5, 11.5, 5, 11], "texture": "#0"}, - "down": {"uv": [6, 11, 5.5, 11.5], "texture": "#0"} - } - }, - { - "from": [0, 14, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, - "faces": { - "north": {"uv": [8, 7.5, 12, 8], "texture": "#0", "cullface": "north"}, - "east": {"uv": [7.5, 8.5, 11.5, 9], "texture": "#0", "cullface": "east"}, - "south": {"uv": [7.5, 9, 11.5, 9.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [7.5, 9.5, 11.5, 10], "texture": "#0", "cullface": "west"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#0", "cullface": "up"}, - "down": {"uv": [8, 4, 4, 8], "texture": "#0"} - } - }, - { - "from": [0, 2, 14], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 14]}, - "faces": { - "north": {"uv": [0, 8, 4, 11], "texture": "#0"}, - "east": {"uv": [3, 11, 3.5, 14], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 0, 12, 3], "texture": "#0", "cullface": "south"}, - "west": {"uv": [3.5, 11, 4, 14], "texture": "#0", "cullface": "west"}, - "up": {"uv": [11.5, 10.5, 7.5, 10], "texture": "#0"}, - "down": {"uv": [11.5, 10.5, 7.5, 11], "texture": "#0"} - } - }, - { - "from": [14, 2, 0], - "to": [16, 14, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 0]}, - "faces": { - "north": {"uv": [4, 11, 4.5, 14], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 3, 11.5, 6], "texture": "#0", "cullface": "east"}, - "south": {"uv": [4.5, 11, 5, 14], "texture": "#0"}, - "west": {"uv": [4, 8, 7.5, 11], "texture": "#0"}, - "up": {"uv": [0.5, 14.5, 0, 11], "texture": "#0"}, - "down": {"uv": [1, 11, 0.5, 14.5], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/fan.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/fan.json new file mode 100644 index 0000000..da88729 --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/fan.json @@ -0,0 +1,22 @@ +{ + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", + "parent": "block/block", + "textures": { + "2": "cubliminal:block/ventilation_pipe/ventilation_pipe_vent" + }, + "elements": [ + { + "from": [2, -1, 3], + "to": [14, 0, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [1, -1, 0]}, + "faces": { + "north": {"uv": [2, 3, 14, 4], "texture": "#2", "cullface": "down"}, + "east": {"uv": [3, 12, 13, 13], "texture": "#2", "cullface": "down"}, + "south": {"uv": [2, 12, 14, 13], "texture": "#2", "cullface": "down"}, + "west": {"uv": [3, 3, 13, 4], "texture": "#2", "cullface": "down"}, + "down": {"uv": [2, 3, 14, 13], "texture": "#2", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/open.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/open.json new file mode 100644 index 0000000..2e9e74b --- /dev/null +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/open.json @@ -0,0 +1,21 @@ +{ + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", + "textures": { + "edge": "cubliminal:block/ventilation_pipe/ventilation_pipe_open", + "particle": "cubliminal:block/ventilation_pipe/ventilation_pipe_straight" + }, + "elements": [ + { + "from": [-0.01, -0.01, -0.01], + "to": [16.01, 16.01, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "east": {"uv": [0, 0, 16, 8], "rotation": 90, "texture": "#edge", "cullface": "east"}, + "west": {"uv": [0, 0, 16, 8], "rotation": 270, "texture": "#edge", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 8], "texture": "#edge", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 8], "rotation": 180, "texture": "#edge", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/quad.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/quad.json index a813723..13c4893 100644 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/quad.json +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/quad.json @@ -1,86 +1,19 @@ { + "format_version": "1.9.0", + "credit": "Made by Miffen Kop!", "parent": "block/block", - "texture_size": [64, 64], "textures": { - "1": "cubliminal:block/ventilation_pipe_quad", - "particle": "cubliminal:block/ventilation_pipe_quad" + "2": "cubliminal:block/ventilation_pipe/ventilation_pipe_quad", + "particle": "cubliminal:block/ventilation_pipe/ventilation_pipe_quad" }, "elements": [ { "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 8, 4, 8.5], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 0, 12, 0.5], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 0.5, 12, 1], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 1, 12, 1.5], "texture": "#1", "cullface": "west"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 3.5, 8.5, 6.5], "texture": "#1", "cullface": "north"}, - "east": {"uv": [4, 8, 4.5, 11], "texture": "#1"}, - "south": {"uv": [4.5, 8, 5, 11], "texture": "#1"}, - "west": {"uv": [5, 8, 5.5, 11], "texture": "#1", "cullface": "west"}, - "up": {"uv": [3.5, 9, 3, 8.5], "texture": "#1"}, - "down": {"uv": [4, 8.5, 3.5, 9], "texture": "#1"} - } - }, - { - "from": [14, 2, 0], - "to": [16, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 0]}, - "faces": { - "north": {"uv": [5.5, 8, 6, 11], "texture": "#1", "cullface": "north"}, - "east": {"uv": [6, 8, 6.5, 11], "texture": "#1", "cullface": "east"}, - "south": {"uv": [6.5, 8, 7, 11], "texture": "#1"}, - "west": {"uv": [8, 6.5, 8.5, 9.5], "texture": "#1"}, - "up": {"uv": [9, 4, 8.5, 3.5], "texture": "#1"}, - "down": {"uv": [9, 4, 8.5, 4.5], "texture": "#1"} - } - }, - { - "from": [0, 14, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, - "faces": { - "north": {"uv": [8, 1.5, 12, 2], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 2, 12, 2.5], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 2.5, 12, 3], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 3, 12, 3.5], "texture": "#1", "cullface": "west"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#1", "cullface": "up"}, - "down": {"uv": [8, 4, 4, 8], "texture": "#1"} - } - }, - { - "from": [0, 2, 14], - "to": [2, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 14]}, - "faces": { - "north": {"uv": [7, 8, 7.5, 11], "texture": "#1"}, - "east": {"uv": [7.5, 8, 8, 11], "texture": "#1"}, - "south": {"uv": [0, 8.5, 0.5, 11.5], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0.5, 8.5, 1, 11.5], "texture": "#1", "cullface": "west"}, - "up": {"uv": [9, 5, 8.5, 4.5], "texture": "#1"}, - "down": {"uv": [9, 5, 8.5, 5.5], "texture": "#1"} - } - }, - { - "from": [14, 2, 14], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 14]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [1, 8.5, 1.5, 11.5], "texture": "#1"}, - "east": {"uv": [1.5, 8.5, 2, 11.5], "texture": "#1", "cullface": "east"}, - "south": {"uv": [2, 8.5, 2.5, 11.5], "texture": "#1", "cullface": "south"}, - "west": {"uv": [2.5, 8.5, 3, 11.5], "texture": "#1"}, - "up": {"uv": [9, 6, 8.5, 5.5], "texture": "#1"}, - "down": {"uv": [9, 6, 8.5, 6.5], "texture": "#1"} + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#2"} } } ] diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/quad_fan.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/quad_fan.json deleted file mode 100644 index 4d89e9a..0000000 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/quad_fan.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "parent": "block/block", - "texture_size": [64, 64], - "textures": { - "1": "cubliminal:block/ventilation_pipe_quad_fan", - "particle": "cubliminal:block/ventilation_pipe_quad_fan" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 8, 4, 8.5], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 0, 12, 0.5], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 0.5, 12, 1], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 1, 12, 1.5], "texture": "#1", "cullface": "west"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#1"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 3.5, 8.5, 6.5], "texture": "#1", "cullface": "north"}, - "east": {"uv": [4, 8, 4.5, 11], "texture": "#1"}, - "south": {"uv": [4.5, 8, 5, 11], "texture": "#1"}, - "west": {"uv": [5, 8, 5.5, 11], "texture": "#1", "cullface": "west"}, - "up": {"uv": [3.5, 9, 3, 8.5], "texture": "#1"}, - "down": {"uv": [4, 8.5, 3.5, 9], "texture": "#1"} - } - }, - { - "from": [14, 2, 0], - "to": [16, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 0]}, - "faces": { - "north": {"uv": [5.5, 8, 6, 11], "texture": "#1", "cullface": "north"}, - "east": {"uv": [6, 8, 6.5, 11], "texture": "#1", "cullface": "east"}, - "south": {"uv": [6.5, 8, 7, 11], "texture": "#1"}, - "west": {"uv": [8, 6.5, 8.5, 9.5], "texture": "#1"}, - "up": {"uv": [9, 4, 8.5, 3.5], "texture": "#1"}, - "down": {"uv": [9, 4, 8.5, 4.5], "texture": "#1"} - } - }, - { - "from": [0, 14, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, - "faces": { - "north": {"uv": [8, 1.5, 12, 2], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 2, 12, 2.5], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 2.5, 12, 3], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 3, 12, 3.5], "texture": "#1", "cullface": "west"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#1", "cullface": "up"}, - "down": {"uv": [8, 4, 4, 8], "texture": "#1"} - } - }, - { - "from": [0, 2, 14], - "to": [2, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 14]}, - "faces": { - "north": {"uv": [7, 8, 7.5, 11], "texture": "#1"}, - "east": {"uv": [7.5, 8, 8, 11], "texture": "#1"}, - "south": {"uv": [0, 8.5, 0.5, 11.5], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0.5, 8.5, 1, 11.5], "texture": "#1", "cullface": "west"}, - "up": {"uv": [9, 5, 8.5, 4.5], "texture": "#1"}, - "down": {"uv": [9, 5, 8.5, 5.5], "texture": "#1"} - } - }, - { - "from": [14, 2, 14], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 14]}, - "faces": { - "north": {"uv": [1, 8.5, 1.5, 11.5], "texture": "#1"}, - "east": {"uv": [1.5, 8.5, 2, 11.5], "texture": "#1", "cullface": "east"}, - "south": {"uv": [2, 8.5, 2.5, 11.5], "texture": "#1", "cullface": "south"}, - "west": {"uv": [2.5, 8.5, 3, 11.5], "texture": "#1"}, - "up": {"uv": [9, 6, 8.5, 5.5], "texture": "#1"}, - "down": {"uv": [9, 6, 8.5, 6.5], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/straight.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/straight.json index cf3c5b4..f252cf8 100644 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/straight.json +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/straight.json @@ -1,60 +1,24 @@ { + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", "parent": "block/block", - "texture_size": [64, 64], "textures": { - "0": "cubliminal:block/ventilation_pipe_straight", - "particle": "cubliminal:block/ventilation_pipe_straight" + "0": "cubliminal:block/ventilation_pipe/ventilation_pipe_end", + "1": "cubliminal:block/ventilation_pipe/ventilation_pipe_straight", + "particle": "cubliminal:block/ventilation_pipe/ventilation_pipe_straight" }, "elements": [ { "from": [0, 0, 0], - "to": [14, 2, 16], - "faces": { - "north": {"uv": [8, 5.5, 11.5, 6], "texture": "#0", "cullface": "north"}, - "east": {"uv": [7, 3.5, 11, 4], "texture": "#0"}, - "south": {"uv": [8, 6, 11.5, 6.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 4, 12, 4.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [3.5, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [7, 0, 3.5, 4], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [1.5, 11, 2, 14.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [0, 4, 4, 7.5], "texture": "#0"}, - "south": {"uv": [2, 11, 2.5, 14.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [4, 4, 8, 7.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [0.5, 15, 0, 11], "texture": "#0", "cullface": "up"}, - "down": {"uv": [11.5, 0, 11, 4], "texture": "#0"} - } - }, - { - "from": [14, 0, 0], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 0]}, - "faces": { - "north": {"uv": [2.5, 11, 3, 14.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [7, 0, 11, 3.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [3, 11, 3.5, 14.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [0, 7.5, 4, 11], "texture": "#0"}, - "up": {"uv": [1, 15, 0.5, 11], "texture": "#0"}, - "down": {"uv": [1.5, 11, 1, 15], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [2, 14, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 14, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [1, 1, 0]}, "faces": { - "north": {"uv": [8, 6.5, 11.5, 7], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 4.5, 12, 5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 7, 11.5, 7.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 5, 12, 5.5], "texture": "#0"}, - "up": {"uv": [7.5, 11.5, 4, 7.5], "texture": "#0", "cullface": "up"}, - "down": {"uv": [11, 7.5, 7.5, 11.5], "texture": "#0"} + "north": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"} } } ] diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/straight_fan.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/straight_fan.json deleted file mode 100644 index 2fd1437..0000000 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/straight_fan.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "parent": "block/block", - "texture_size": [64, 64], - "textures": { - "0": "cubliminal:block/ventilation_pipe_straight_fan", - "particle": "cubliminal:block/ventilation_pipe_straight_fan" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [14, 2, 16], - "faces": { - "north": {"uv": [8, 5.5, 11.5, 6], "texture": "#0", "cullface": "north"}, - "east": {"uv": [7, 3.5, 11, 4], "texture": "#0"}, - "south": {"uv": [8, 6, 11.5, 6.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 4, 12, 4.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [3.5, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [7, 0, 3.5, 4], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [1.5, 11, 2, 14.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [0, 4, 4, 7.5], "texture": "#0"}, - "south": {"uv": [2, 11, 2.5, 14.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [4, 4, 8, 7.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [0.5, 15, 0, 11], "texture": "#0", "cullface": "up"}, - "down": {"uv": [11.5, 0, 11, 4], "texture": "#0"} - } - }, - { - "from": [14, 0, 0], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 0, 0]}, - "faces": { - "north": {"uv": [2.5, 11, 3, 14.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [7, 0, 11, 3.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [3, 11, 3.5, 14.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [0, 7.5, 4, 11], "texture": "#0"}, - "up": {"uv": [1, 15, 0.5, 11], "texture": "#0"}, - "down": {"uv": [1.5, 11, 1, 15], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [2, 14, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 14, 0]}, - "faces": { - "north": {"uv": [8, 6.5, 11.5, 7], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 4.5, 12, 5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 7, 11.5, 7.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 5, 12, 5.5], "texture": "#0"}, - "up": {"uv": [7.5, 11.5, 4, 7.5], "texture": "#0", "cullface": "up"}, - "down": {"uv": [11, 7.5, 7.5, 11.5], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/triple.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/triple.json index ae9fcc6..3bfff09 100644 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/triple.json +++ b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/triple.json @@ -1,73 +1,21 @@ { + "format_version": "1.21.11", + "credit": "Made by Miffen Kop!", "parent": "block/block", - "texture_size": [64, 64], "textures": { - "0": "cubliminal:block/ventilation_pipe_triple", - "particle": "cubliminal:block/ventilation_pipe_triple" + "2": "cubliminal:block/ventilation_pipe/ventilation_pipe_triple", + "3": "cubliminal:block/ventilation_pipe/ventilation_pipe_straight", + "particle": "cubliminal:block/ventilation_pipe/ventilation_pipe_triple" }, "elements": [ { "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [8, 3, 12, 3.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 3.5, 12, 4], "texture": "#0", "cullface": "east"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 4, 12, 4.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 7.5, 8.5, 10.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [4, 8.5, 4.5, 11.5], "texture": "#0"}, - "south": {"uv": [4.5, 8.5, 5, 11.5], "texture": "#0"}, - "west": {"uv": [5, 8.5, 5.5, 11.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [9.5, 8, 9, 7.5], "texture": "#0"}, - "down": {"uv": [9.5, 8, 9, 8.5], "texture": "#0"} - } - }, - { - "from": [14, 2, 0], - "to": [16, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 0]}, - "faces": { - "north": {"uv": [5.5, 8.5, 6, 11.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [6, 8.5, 6.5, 11.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [6.5, 8.5, 7, 11.5], "texture": "#0"}, - "west": {"uv": [7, 8.5, 7.5, 11.5], "texture": "#0"}, - "up": {"uv": [9.5, 9, 9, 8.5], "texture": "#0"}, - "down": {"uv": [9.5, 9, 9, 9.5], "texture": "#0"} - } - }, - { - "from": [0, 2, 14], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 14]}, - "faces": { - "north": {"uv": [0, 8, 4, 11], "texture": "#0"}, - "east": {"uv": [7.5, 8.5, 8, 11.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 0, 12, 3], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8.5, 7.5, 9, 10.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [12, 5, 8, 4.5], "texture": "#0"}, - "down": {"uv": [12, 5, 8, 5.5], "texture": "#0"} - } - }, - { - "from": [0, 14, 0], "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [8, 5.5, 12, 6], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 6, 12, 6.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 6.5, 12, 7], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 7, 12, 7.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#0", "cullface": "up"}, - "down": {"uv": [8, 4, 4, 8], "texture": "#0"} + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "down": {"uv": [0, 16, 16, 0], "texture": "#2"} } } ] diff --git a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/triple_fan.json b/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/triple_fan.json deleted file mode 100644 index 34c2a59..0000000 --- a/src/main/resources/assets/cubliminal/models/block/ventilation_pipe/triple_fan.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "parent": "block/block", - "texture_size": [64, 64], - "textures": { - "0": "cubliminal:block/ventilation_pipe_triple_fan", - "particle": "cubliminal:block/ventilation_pipe_triple_fan" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [8, 3, 12, 3.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 3.5, 12, 4], "texture": "#0", "cullface": "east"}, - "south": {"uv": [4, 8, 8, 8.5], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 4, 12, 4.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [4, 4, 0, 0], "texture": "#0"}, - "down": {"uv": [4, 4, 0, 8], "texture": "#0", "cullface": "down"} - } - }, - { - "from": [0, 2, 0], - "to": [2, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, - "faces": { - "north": {"uv": [8, 7.5, 8.5, 10.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [4, 8.5, 4.5, 11.5], "texture": "#0"}, - "south": {"uv": [4.5, 8.5, 5, 11.5], "texture": "#0"}, - "west": {"uv": [5, 8.5, 5.5, 11.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [9.5, 8, 9, 7.5], "texture": "#0"}, - "down": {"uv": [9.5, 8, 9, 8.5], "texture": "#0"} - } - }, - { - "from": [14, 2, 0], - "to": [16, 14, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 2, 0]}, - "faces": { - "north": {"uv": [5.5, 8.5, 6, 11.5], "texture": "#0", "cullface": "north"}, - "east": {"uv": [6, 8.5, 6.5, 11.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [6.5, 8.5, 7, 11.5], "texture": "#0"}, - "west": {"uv": [7, 8.5, 7.5, 11.5], "texture": "#0"}, - "up": {"uv": [9.5, 9, 9, 8.5], "texture": "#0"}, - "down": {"uv": [9.5, 9, 9, 9.5], "texture": "#0"} - } - }, - { - "from": [0, 2, 14], - "to": [16, 14, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 14]}, - "faces": { - "north": {"uv": [0, 8, 4, 11], "texture": "#0"}, - "east": {"uv": [7.5, 8.5, 8, 11.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 0, 12, 3], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8.5, 7.5, 9, 10.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [12, 5, 8, 4.5], "texture": "#0"}, - "down": {"uv": [12, 5, 8, 5.5], "texture": "#0"} - } - }, - { - "from": [0, 14, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, - "faces": { - "north": {"uv": [8, 5.5, 12, 6], "texture": "#0", "cullface": "north"}, - "east": {"uv": [8, 6, 12, 6.5], "texture": "#0", "cullface": "east"}, - "south": {"uv": [8, 6.5, 12, 7], "texture": "#0", "cullface": "south"}, - "west": {"uv": [8, 7, 12, 7.5], "texture": "#0", "cullface": "west"}, - "up": {"uv": [8, 4, 4, 0], "texture": "#0", "cullface": "up"}, - "down": {"uv": [8, 4, 4, 8], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/wooden_crate_closed.json b/src/main/resources/assets/cubliminal/models/block/wooden_crate_closed.json index 70bf385..75b3db4 100644 --- a/src/main/resources/assets/cubliminal/models/block/wooden_crate_closed.json +++ b/src/main/resources/assets/cubliminal/models/block/wooden_crate_closed.json @@ -1,6 +1,8 @@ { - "parent": "block/cube_all", + "parent": "block/cube_bottom_top", "textures": { - "all": "cubliminal:block/wooden_crate" + "side": "cubliminal:block/wooden_crate", + "bottom": "cubliminal:block/wooden_crate_top", + "top": "cubliminal:block/wooden_crate_top" } } \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/models/block/wooden_crate_open.json b/src/main/resources/assets/cubliminal/models/block/wooden_crate_open.json index 8e8963f..4291740 100644 --- a/src/main/resources/assets/cubliminal/models/block/wooden_crate_open.json +++ b/src/main/resources/assets/cubliminal/models/block/wooden_crate_open.json @@ -1,12 +1,8 @@ { - "parent": "block/cube", + "parent": "block/cube_bottom_top", "textures": { - "particle": "cubliminal:block/wooden_crate", - "down": "cubliminal:block/wooden_crate", - "up": "cubliminal:block/wooden_crate_opened", - "north": "cubliminal:block/wooden_crate", - "south": "cubliminal:block/wooden_crate", - "west": "cubliminal:block/wooden_crate", - "east": "cubliminal:block/wooden_crate" + "side": "cubliminal:block/wooden_crate", + "bottom": "cubliminal:block/wooden_crate_top", + "top": "cubliminal:block/wooden_crate_top_open" } } \ No newline at end of file diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray.png new file mode 100644 index 0000000..5396bf3 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray_box.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray_box.png new file mode 100644 index 0000000..fc77d93 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray_box.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray_extra.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray_extra.png new file mode 100644 index 0000000..0d6c2d9 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cable_tray_extra.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray/cables_corner.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cables_corner.png new file mode 100644 index 0000000..20443a6 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cables_corner.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray/cables_straight.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cables_straight.png new file mode 100644 index 0000000..73bdf41 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/cable_tray/cables_straight.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray_box.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray_box.png deleted file mode 100644 index 3977279..0000000 Binary files a/src/main/resources/assets/cubliminal/textures/block/cable_tray_box.png and /dev/null differ diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray_corner.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray_corner.png deleted file mode 100644 index 8ae31f5..0000000 Binary files a/src/main/resources/assets/cubliminal/textures/block/cable_tray_corner.png and /dev/null differ diff --git a/src/main/resources/assets/cubliminal/textures/block/cable_tray_straight.png b/src/main/resources/assets/cubliminal/textures/block/cable_tray_straight.png deleted file mode 100644 index 9cd8b56..0000000 Binary files a/src/main/resources/assets/cubliminal/textures/block/cable_tray_straight.png and /dev/null differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_base.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_base.png new file mode 100644 index 0000000..49fccee Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_base.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_close.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_close.png new file mode 100644 index 0000000..adbd1e2 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_close.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_corner.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_corner.png new file mode 100644 index 0000000..b6d260b Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_corner.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_end.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_end.png new file mode 100644 index 0000000..ae6b36e Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_end.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_inside.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_inside.png new file mode 100644 index 0000000..fc49b44 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_inside.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_open.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_open.png new file mode 100644 index 0000000..c511baa Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_open.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_quad.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_quad.png new file mode 100644 index 0000000..a7ecbdd Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_quad.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_straight.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_straight.png new file mode 100644 index 0000000..f9bb4d3 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_straight.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_triple.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_triple.png new file mode 100644 index 0000000..6e68335 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_triple.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_vent.png b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_vent.png new file mode 100644 index 0000000..5245f99 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/ventilation_pipe/ventilation_pipe_vent.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/wooden_crate.png b/src/main/resources/assets/cubliminal/textures/block/wooden_crate.png index 007cac4..e28fe98 100644 Binary files a/src/main/resources/assets/cubliminal/textures/block/wooden_crate.png and b/src/main/resources/assets/cubliminal/textures/block/wooden_crate.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/wooden_crate_opened.png b/src/main/resources/assets/cubliminal/textures/block/wooden_crate_opened.png deleted file mode 100644 index b8aba85..0000000 Binary files a/src/main/resources/assets/cubliminal/textures/block/wooden_crate_opened.png and /dev/null differ diff --git a/src/main/resources/assets/cubliminal/textures/block/wooden_crate_top.png b/src/main/resources/assets/cubliminal/textures/block/wooden_crate_top.png new file mode 100644 index 0000000..b43f923 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/wooden_crate_top.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/wooden_crate_top_open.png b/src/main/resources/assets/cubliminal/textures/block/wooden_crate_top_open.png new file mode 100644 index 0000000..1784a74 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/wooden_crate_top_open.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_stairs_left.png b/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_stairs_left.png new file mode 100644 index 0000000..101c0f8 Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_stairs_left.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_stairs_right.png b/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_stairs_right.png new file mode 100644 index 0000000..084eb2f Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_stairs_right.png differ diff --git a/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_wall.png b/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_wall.png new file mode 100644 index 0000000..9c64b7e Binary files /dev/null and b/src/main/resources/assets/cubliminal/textures/block/yellow_carpeted_wall.png differ diff --git a/src/main/resources/assets/cubliminal/textures/cubemap/manila_0.png b/src/main/resources/assets/cubliminal/textures/cubemap/manila_0.png index 0a4c7ef..62467fb 100644 Binary files a/src/main/resources/assets/cubliminal/textures/cubemap/manila_0.png and b/src/main/resources/assets/cubliminal/textures/cubemap/manila_0.png differ diff --git a/src/main/resources/assets/cubliminal/textures/cubemap/manila_1.png b/src/main/resources/assets/cubliminal/textures/cubemap/manila_1.png index 7a82111..47a0cc5 100644 Binary files a/src/main/resources/assets/cubliminal/textures/cubemap/manila_1.png and b/src/main/resources/assets/cubliminal/textures/cubemap/manila_1.png differ diff --git a/src/main/resources/assets/cubliminal/textures/cubemap/manila_2.png b/src/main/resources/assets/cubliminal/textures/cubemap/manila_2.png index 0a75b46..732bc81 100644 Binary files a/src/main/resources/assets/cubliminal/textures/cubemap/manila_2.png and b/src/main/resources/assets/cubliminal/textures/cubemap/manila_2.png differ diff --git a/src/main/resources/assets/cubliminal/textures/cubemap/manila_3.png b/src/main/resources/assets/cubliminal/textures/cubemap/manila_3.png index dbd2d42..6991af1 100644 Binary files a/src/main/resources/assets/cubliminal/textures/cubemap/manila_3.png and b/src/main/resources/assets/cubliminal/textures/cubemap/manila_3.png differ diff --git a/src/main/resources/assets/cubliminal/textures/cubemap/manila_4.png b/src/main/resources/assets/cubliminal/textures/cubemap/manila_4.png index 5fba0fc..56a94a3 100644 Binary files a/src/main/resources/assets/cubliminal/textures/cubemap/manila_4.png and b/src/main/resources/assets/cubliminal/textures/cubemap/manila_4.png differ diff --git a/src/main/resources/assets/cubliminal/textures/cubemap/manila_5.png b/src/main/resources/assets/cubliminal/textures/cubemap/manila_5.png index 699cee7..9deca96 100644 Binary files a/src/main/resources/assets/cubliminal/textures/cubemap/manila_5.png and b/src/main/resources/assets/cubliminal/textures/cubemap/manila_5.png differ