From 019c9e17ed7e05ee5e34f0836ee29acaffcc9292 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 6 May 2020 00:08:23 +0200 Subject: [PATCH] We mojang now? MOAR BLOCKS --- .../unicopia/block/UBlocks.java | 2 + .../unicopia/client/URenderers.java | 2 +- .../minelittlepony/unicopia/item/UItems.java | 3 + .../unicopia/blockstates/cloud_stairs.json | 1 + .../blockstates/dense_cloud_stairs.json | 45 ++++++++ .../blockstates/enchanted_cloud_stairs.json | 45 ++++++++ .../resources/assets/unicopia/lang/en_us.json | 3 + .../models/block/cloud_inner_stairs.json | 93 ++++++++------- .../models/block/cloud_outer_stairs.json | 87 +++++++------- .../unicopia/models/block/cloud_stairs.json | 107 +++++++++--------- .../block/dense_cloud_inner_stairs.json | 5 + .../block/dense_cloud_outer_stairs.json | 5 + .../models/block/dense_cloud_stairs.json | 5 + .../block/enchanted_cloud_inner_stairs.json | 7 ++ .../block/enchanted_cloud_outer_stairs.json | 7 ++ .../models/block/enchanted_cloud_stairs.json | 7 ++ .../models/item/dense_cloud_stairs.json | 3 + .../models/item/enchanted_cloud_stairs.json | 3 + .../blocks/dense_cloud_stairs.json | 11 ++ .../blocks/enchanted_cloud_stairs.json | 11 ++ .../unicopia/recipes/dense_cloud_stairs.json | 14 +++ .../recipes/enchanted_cloud_stairs.json | 14 +++ 22 files changed, 346 insertions(+), 134 deletions(-) create mode 100644 src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json create mode 100644 src/main/resources/assets/unicopia/blockstates/enchanted_cloud_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_inner_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_outer_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/enchanted_cloud_outer_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/block/enchanted_cloud_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json create mode 100644 src/main/resources/assets/unicopia/models/item/enchanted_cloud_stairs.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json create mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/enchanted_cloud_stairs.json create mode 100644 src/main/resources/data/unicopia/recipes/dense_cloud_stairs.json create mode 100644 src/main/resources/data/unicopia/recipes/enchanted_cloud_stairs.json diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java index d826cc82..45f58d7b 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java @@ -36,6 +36,8 @@ public interface UBlocks { CloudBlock DENSE_CLOUD_PILLAR = register("dense_cloud_pillar", new PillarCloudBlock(GasState.DENSE)); CloudStairsBlock CLOUD_STAIRS = register("cloud_stairs", new CloudStairsBlock(CLOUD_BLOCK.getDefaultState(), GasState.NORMAL.configure().build())); + CloudStairsBlock ENCHANTED_CLOUD_STAIRS = register("enchanted_cloud_stairs", new CloudStairsBlock(ENCHANTED_CLOUD_BLOCK.getDefaultState(), GasState.ENCHANTED.configure().build())); + CloudStairsBlock DENSE_CLOUD_STAIRS = register("dense_cloud_stairs", new CloudStairsBlock(DENSE_CLOUD_BLOCK.getDefaultState(), GasState.DENSE.configure().build())); CloudSlabBlock CLOUD_SLAB = register("cloud_slab", new CloudSlabBlock(CLOUD_BLOCK.getDefaultState(), GasState.NORMAL.configure().build())); CloudSlabBlock ENCHANTED_CLOUD_SLAB = register("enchanted_cloud_slab", new CloudSlabBlock(ENCHANTED_CLOUD_BLOCK.getDefaultState(), GasState.ENCHANTED.configure().build())); diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java index 7d17851b..b5c42867 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java +++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java @@ -47,7 +47,7 @@ public interface URenderers { BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(), UBlocks.CLOUD_ANVIL, UBlocks.CLOUD_FARMLAND, UBlocks.CLOUD_BLOCK, UBlocks.CLOUD_SLAB, UBlocks.CLOUD_STAIRS, - UBlocks.ENCHANTED_CLOUD_BLOCK, UBlocks.ENCHANTED_CLOUD_SLAB, + UBlocks.ENCHANTED_CLOUD_BLOCK, UBlocks.ENCHANTED_CLOUD_SLAB, UBlocks.ENCHANTED_CLOUD_STAIRS, UBlocks.SLIME_DROP, UBlocks.SLIME_LAYER ); diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 7a3a7efe..8ed613e9 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -52,6 +52,9 @@ public interface UItems { Item DENSE_CLOUD_PILLAR = register("dense_cloud_pillar", new PredicatedBlockItem(UBlocks.DENSE_CLOUD_PILLAR, new Settings().group(ItemGroup.MATERIALS), PLAYER_PEGASUS)); Item CLOUD_STAIRS = register("cloud_stairs", new PredicatedBlockItem(UBlocks.CLOUD_STAIRS, new Settings().group(ItemGroup.BUILDING_BLOCKS), PLAYER_PEGASUS)); + Item ENCHANTED_CLOUD_STAIRS = register("enchanted_cloud_stairs", new PredicatedBlockItem(UBlocks.ENCHANTED_CLOUD_STAIRS, new Settings().group(ItemGroup.BUILDING_BLOCKS), PLAYER_PEGASUS)); + Item DENSE_CLOUD_STAIRS = register("dense_cloud_stairs", new PredicatedBlockItem(UBlocks.DENSE_CLOUD_STAIRS, new Settings().group(ItemGroup.BUILDING_BLOCKS), PLAYER_PEGASUS)); + Item CLOUD_FENCE = register("cloud_fence", new PredicatedBlockItem(UBlocks.CLOUD_FENCE, new Settings().group(ItemGroup.DECORATIONS), PLAYER_PEGASUS)); Item CLOUD_ANVIL = register("cloud_anvil", new PredicatedBlockItem(UBlocks.CLOUD_ANVIL, new Settings().group(ItemGroup.DECORATIONS), PLAYER_PEGASUS)); diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json index 572a1b2d..3ff98bcd 100644 --- a/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json +++ b/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json @@ -20,6 +20,7 @@ "facing=west,half=bottom,shape=inner_left": { "model": "unicopia:block/cloud_inner_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { "model": "unicopia:block/cloud_inner_stairs" }, "facing=north,half=bottom,shape=inner_left": { "model": "unicopia:block/cloud_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "unicopia:block/cloud_stairs", "x": 180, "uvlock": true }, "facing=west,half=top,shape=straight": { "model": "unicopia:block/cloud_stairs", "x": 180, "y": 180, "uvlock": true }, "facing=south,half=top,shape=straight": { "model": "unicopia:block/cloud_stairs", "x": 180, "y": 90, "uvlock": true }, diff --git a/src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json new file mode 100644 index 00000000..d4415747 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json @@ -0,0 +1,45 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "unicopia:block/dense_cloud_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "unicopia:block/dense_cloud_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "unicopia:block/dense_cloud_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "unicopia:block/dense_cloud_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs", "y": 180, "uvlock": true }, + + "facing=east,half=top,shape=straight": { "model": "unicopia:block/dense_cloud_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "unicopia:block/dense_cloud_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "unicopia:block/dense_cloud_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "unicopia:block/dense_cloud_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "unicopia:block/dense_cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "unicopia:block/dense_cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_stairs.json new file mode 100644 index 00000000..6fe0bda2 --- /dev/null +++ b/src/main/resources/assets/unicopia/blockstates/enchanted_cloud_stairs.json @@ -0,0 +1,45 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "y": 180, "uvlock": true }, + + "facing=east,half=top,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "unicopia:block/enchanted_cloud_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "unicopia:block/enchanted_cloud_outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "unicopia:block/enchanted_cloud_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index bd1a0f7b..8f11e974 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -10,6 +10,9 @@ "block.unicopia.enchanted_cloud_slab": "Enchanted Cloud Slab", "block.unicopia.cloud_stairs": "Cloud Stairs", + "block.unicopia.dense_cloud_stairs": "Dense Cloud Stairs", + "block.unicopia.enchanted_cloud_stairs": "Enchanted Cloud Stairs", + "block.unicopia.cloud_fence": "Cloud Fence", "block.unicopia.cloud_farmland": "Tilled Clouds", "block.unicopia.cloud_anvil": "Cloud Anvil", diff --git a/src/main/resources/assets/unicopia/models/block/cloud_inner_stairs.json b/src/main/resources/assets/unicopia/models/block/cloud_inner_stairs.json index 5866dbc8..2b1b2718 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_inner_stairs.json +++ b/src/main/resources/assets/unicopia/models/block/cloud_inner_stairs.json @@ -1,45 +1,50 @@ { - "textures": { - "bottom": "unicopia:blocks/cloud_block", - "top": "#bottom", - "side": "#bottom", - "particle": "#bottom" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 8, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" } - } - }, - { "from": [ 8, 8, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 8, 0, 16, 16 ], "texture": "#top", "cullface": "up" }, - "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "south" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "east" } - } - }, - { "from": [ 0, 8, 8 ], - "to": [ 8, 16, 16 ], - "faces": { - "up": { "uv": [ 0, 8, 8, 16 ], "texture": "#top", "cullface": "up" }, - "south": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "west" } - } - }, - { "from": [ 8, 16, 8 ], - "to": [ 0, 8, 0 ], - "faces": { - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#side" }, - "north": { "uv": [ 8, 0, 16, 8 ], "texture": "#side" } - } - } - ] -} + "textures": { + "bottom": "unicopia:blocks/cloud_block", + "top": "#bottom", + "particle": "#bottom", + "side": "#bottom", + "step": "#bottom" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [8, 8, 8], + "faces": { + "north": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "north"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#top"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 16], "texture": "#side", "cullface": "south"}, + "up": {"uv": [8, 0, 16, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [0, 0, 8, 16], "texture": "#bottom"} + } + }, + { + "from": [0, 0, 8], + "to": [8, 16, 16], + "faces": { + "south": {"uv": [0, 0, 8, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#bottom"} + } + }, + { + "from": [8, 16, 8], + "to": [0, 8, 0], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#side"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#side"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_outer_stairs.json b/src/main/resources/assets/unicopia/models/block/cloud_outer_stairs.json index f7faa858..284d73ee 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_outer_stairs.json +++ b/src/main/resources/assets/unicopia/models/block/cloud_outer_stairs.json @@ -1,42 +1,53 @@ { - "textures": { + "textures": { "bottom": "unicopia:blocks/cloud_block", "top": "#bottom", + "particle": "#bottom", "side": "#bottom", - "particle": "#bottom" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 8, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" } - } - }, - { "from": [ 8, 8, 8 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 8, 8, 16, 16 ], "texture": "#top", "cullface": "up" }, - "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#side" }, - "south": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 8, 0, 16, 8 ], "texture": "#side" }, - "east": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "east" } - } - }, - { "from": [ 0, 0, 0 ], - "to": [ 8, 8, 16 ], - "faces": { - "up": { "uv": [ 0, 0, 8, 16 ], "texture": "#top" } - } - }, - { "from": [ 8, 0, 0 ], - "to": [ 16, 8, 8 ], - "faces": { - "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#top" } - } - } - ] -} + "step": "#bottom" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 8], + "faces": { + "north": {"uv": [0, 8, 16, 16], "texture": "#step", "cullface": "north"}, + "east": {"uv": [8, 8, 16, 16], "texture": "#step", "cullface": "east"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 8], "texture": "#top"}, + "down": {"uv": [0, 8, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [8, 8, 8], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#side"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#side"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} + } + }, + { + "from": [8, 0, 8], + "to": [16, 8, 16], + "faces": { + "east": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "south"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [8, 0, 16, 8], "texture": "#bottom"} + } + }, + { + "from": [0, 0, 8], + "to": [8, 8, 16], + "faces": { + "south": {"uv": [0, 8, 8, 16], "texture": "#step"}, + "west": {"uv": [8, 8, 16, 16], "texture": "#step"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#bottom"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_stairs.json b/src/main/resources/assets/unicopia/models/block/cloud_stairs.json index 64568393..58f1730c 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_stairs.json +++ b/src/main/resources/assets/unicopia/models/block/cloud_stairs.json @@ -1,53 +1,58 @@ -{ "parent": "block/block", - "display": { - "gui": { - "rotation": [ 30, 135, 0 ], - "translation": [ 0, 0, 0], - "scale":[ 0.625, 0.625, 0.625 ] - }, - "head": { - "rotation": [ 0, -90, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 1, 1, 1 ] - }, - "thirdperson_lefthand": { - "rotation": [ 75, -135, 0 ], - "translation": [ 0, 2.5, 0], - "scale": [ 0.375, 0.375, 0.375 ] - } - }, - "textures": { - "bottom": "unicopia:blocks/cloud_block", - "top": "#bottom", - "side": "#bottom", - "particle": "#bottom" +{ + "parent": "block/block", + "textures": { + "bottom": "unicopia:blocks/cloud_block", + "particle": "#bottom", + "top": "#bottom", + "side": "#bottom", + "step": "#bottom" }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 16, 8, 16 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "west" }, - "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#side", "cullface": "east" } - } - }, - { "from": [ 0, 0, 0 ], - "to": [ 8, 8, 16 ], - "faces": { - "up": { "uv": [ 0, 0, 8, 16 ], "texture": "#top" } - } - }, - { "from": [ 8, 8, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "up": { "uv": [ 8, 0, 16, 16 ], "texture": "#top", "cullface": "up" }, - "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#side", "cullface": "north" }, - "south": { "uv": [ 8, 0, 16, 8 ], "texture": "#side", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#side" }, - "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#side", "cullface": "east" } - } - } - ] + "elements": [ + { + "name": "bottom", + "from": [0, 0, 0], + "to": [8, 8, 16], + "faces": { + "north": {"uv": [8, 8, 16, 16], "texture": "#step", "cullface": "north"}, + "south": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#step", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "name": "middle", + "from": [8, 8, 0], + "to": [16, 16, 16], + "faces": { + "west": {"uv": [0, 0, 16, 8], "texture": "#side"} + } + }, + { + "name": "top", + "from": [8, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 16], "texture": "#side", "cullface": "south"}, + "up": {"uv": [8, 0, 16, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [0, 0, 8, 16], "texture": "#bottom"} + } + } + ], + "display": { + "thirdperson_lefthand": { + "rotation": [75, -135, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "gui": { + "rotation": [30, 135, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, -90, 0] + } + } } diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_inner_stairs.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_inner_stairs.json new file mode 100644 index 00000000..36c712d8 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/dense_cloud_inner_stairs.json @@ -0,0 +1,5 @@ +{ "parent": "unicopia:block/cloud_inner_stairs", + "textures": { + "bottom": "unicopia:blocks/dense_cloud_block" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_outer_stairs.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_outer_stairs.json new file mode 100644 index 00000000..f5ea8c9a --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/dense_cloud_outer_stairs.json @@ -0,0 +1,5 @@ +{ "parent": "unicopia:block/cloud_outer_stairs", + "textures": { + "bottom": "unicopia:blocks/dense_cloud_block" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json new file mode 100644 index 00000000..054171b9 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json @@ -0,0 +1,5 @@ +{ "parent": "unicopia:block/cloud_stairs", + "textures": { + "bottom": "unicopia:blocks/dense_cloud_block" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs.json b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs.json new file mode 100644 index 00000000..a60ca8fe --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_inner_stairs.json @@ -0,0 +1,7 @@ +{ "parent": "unicopia:block/cloud_inner_stairs", + "textures": { + "bottom": "unicopia:blocks/enchanted_cloud_block", + "top": "unicopia:blocks/enchanted_cloud_block_top", + "step": "unicopia:blocks/enchanted_cloud_slab_side" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/enchanted_cloud_outer_stairs.json b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_outer_stairs.json new file mode 100644 index 00000000..4db1118e --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_outer_stairs.json @@ -0,0 +1,7 @@ +{ "parent": "unicopia:block/cloud_outer_stairs", + "textures": { + "bottom": "unicopia:blocks/enchanted_cloud_block", + "top": "unicopia:blocks/enchanted_cloud_block_top", + "step": "unicopia:blocks/enchanted_cloud_slab_side" + } +} diff --git a/src/main/resources/assets/unicopia/models/block/enchanted_cloud_stairs.json b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_stairs.json new file mode 100644 index 00000000..a115c9f3 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/enchanted_cloud_stairs.json @@ -0,0 +1,7 @@ +{ "parent": "unicopia:block/cloud_stairs", + "textures": { + "bottom": "unicopia:blocks/enchanted_cloud_block", + "top": "unicopia:blocks/enchanted_cloud_block_top", + "step": "unicopia:blocks/enchanted_cloud_slab_side" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json b/src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json new file mode 100644 index 00000000..2f6d2f1b --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/dense_cloud_stairs" +} diff --git a/src/main/resources/assets/unicopia/models/item/enchanted_cloud_stairs.json b/src/main/resources/assets/unicopia/models/item/enchanted_cloud_stairs.json new file mode 100644 index 00000000..bd5daabf --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/enchanted_cloud_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "unicopia:block/enchanted_cloud_stairs" +} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json new file mode 100644 index 00000000..fc87629a --- /dev/null +++ b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "unicopia:dense_cloud_stairs" } + ] + } + ] +} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/enchanted_cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/enchanted_cloud_stairs.json new file mode 100644 index 00000000..bef3bc7d --- /dev/null +++ b/src/main/resources/data/unicopia/loot_tables/blocks/enchanted_cloud_stairs.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { "type": "minecraft:item", "name": "unicopia:enchanted_cloud_stairs" } + ] + } + ] +} diff --git a/src/main/resources/data/unicopia/recipes/dense_cloud_stairs.json b/src/main/resources/data/unicopia/recipes/dense_cloud_stairs.json new file mode 100644 index 00000000..bbd10b4e --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/dense_cloud_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "# ", + "## ", + "###" + ], + "key": { + "#": [ + { "item": "unicopia:dense_cloud_block" } + ] + }, + "result": { "item": "unicopia:dense_cloud_stairs", "count": 4 } +} diff --git a/src/main/resources/data/unicopia/recipes/enchanted_cloud_stairs.json b/src/main/resources/data/unicopia/recipes/enchanted_cloud_stairs.json new file mode 100644 index 00000000..8346f7f3 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/enchanted_cloud_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "# ", + "## ", + "###" + ], + "key": { + "#": [ + { "item": "unicopia:enchanted_cloud_block" } + ] + }, + "result": { "item": "unicopia:enchanted_cloud_stairs", "count": 4 } +}