From 80641176d3f4665801506f38505b3b40db177a93 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 7 Feb 2019 16:49:23 +0200 Subject: [PATCH] Updated item models for cloud fences and banisters --- .../unicopia/blockstates/cloud_banister.json | 10 +-- .../block/cloud_banister_inventory.json | 33 +++++++++ .../models/block/cloud_banister_post.json | 20 ++++++ ...banister.json => cloud_banister_side.json} | 0 .../models/block/cloud_fence_inventory.json | 71 +++++++++++++++++-- .../unicopia/models/item/cloud_banister.json | 2 +- 6 files changed, 126 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json create mode 100644 src/main/resources/assets/unicopia/models/block/cloud_banister_post.json rename src/main/resources/assets/unicopia/models/block/{cloud_banister.json => cloud_banister_side.json} (100%) diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_banister.json b/src/main/resources/assets/unicopia/blockstates/cloud_banister.json index 8bb88bfc..0b389a64 100644 --- a/src/main/resources/assets/unicopia/blockstates/cloud_banister.json +++ b/src/main/resources/assets/unicopia/blockstates/cloud_banister.json @@ -1,18 +1,18 @@ { "multipart": [ { "when": { "north": "false", "south": "false", "east": "false", "west": "false" }, - "apply": { "model": "unicopia:cloud_banister" }}, + "apply": { "model": "unicopia:cloud_banister_post" }}, { "when": { "north": "true" }, - "apply": { "model": "unicopia:cloud_banister", "uvlock": true } + "apply": { "model": "unicopia:cloud_banister_side", "uvlock": true } }, { "when": { "east": "true" }, - "apply": { "model": "unicopia:cloud_banister", "y": 90, "uvlock": true } + "apply": { "model": "unicopia:cloud_banister_side", "y": 90, "uvlock": true } }, { "when": { "south": "true" }, - "apply": { "model": "unicopia:cloud_banister", "y": 180, "uvlock": true } + "apply": { "model": "unicopia:cloud_banister_side", "y": 180, "uvlock": true } }, { "when": { "west": "true" }, - "apply": { "model": "unicopia:cloud_banister", "y": 270, "uvlock": true } + "apply": { "model": "unicopia:cloud_banister_side", "y": 270, "uvlock": true } } ] } diff --git a/src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json b/src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json new file mode 100644 index 00000000..03828b1d --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/cloud_banister_inventory.json @@ -0,0 +1,33 @@ +{ "parent": "block/block", + "display": { + "gui": { + "rotation": [ 30, 135, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "fixed": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + } + }, + "ambientocclusion": false, + "textures": { + "texture": "unicopia:blocks/cloud_normal", + "particle": "unicopia:blocks/cloud_normal" + }, + "elements": [ + { "from": [ 6, 4, 0 ], + "to": [ 10, 8, 16 ], + "faces": { + "down": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "north": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture" }, + "south": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 4, 4 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 4, 4 ], "texture": "#texture" } + }, + "__comment": "Left post" + } + ] +} diff --git a/src/main/resources/assets/unicopia/models/block/cloud_banister_post.json b/src/main/resources/assets/unicopia/models/block/cloud_banister_post.json new file mode 100644 index 00000000..3a37eeae --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/cloud_banister_post.json @@ -0,0 +1,20 @@ +{ + "textures": { + "texture": "unicopia:blocks/cloud_enchanted_top", + "particle": "unicopia:blocks/cloud_enchanted_top" + }, + "elements": [ + { "from": [ 5, 0, 5 ], + "to": [ 11, 2, 11 ], + "faces": { + "down": { "uv": [ 5, 0, 11, 11 ], "texture": "#texture" }, + "up": { "uv": [ 5, 0, 11, 11 ], "texture": "#texture" }, + "north": { "uv": [ 5, 0, 11, 2 ], "texture": "#texture" }, + "south": { "uv": [ 5, 0, 11, 2 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 11, 2 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 11, 2 ], "texture": "#texture" } + }, + "__comment": "top bar" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_banister.json b/src/main/resources/assets/unicopia/models/block/cloud_banister_side.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/cloud_banister.json rename to src/main/resources/assets/unicopia/models/block/cloud_banister_side.json diff --git a/src/main/resources/assets/unicopia/models/block/cloud_fence_inventory.json b/src/main/resources/assets/unicopia/models/block/cloud_fence_inventory.json index 3fd20a2e..a9e05ed7 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_fence_inventory.json +++ b/src/main/resources/assets/unicopia/models/block/cloud_fence_inventory.json @@ -1,6 +1,69 @@ -{ - "parent": "block/fence_inventory", +{ "parent": "block/block", + "display": { + "gui": { + "rotation": [ 30, 135, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "fixed": { + "rotation": [ 0, 90, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + } + }, + "ambientocclusion": false, "textures": { - "texture": "unicopia:blocks/cloud_normal" - } + "texture": "unicopia:blocks/cloud_normal", + "particle": "unicopia:blocks/cloud_normal" + }, + "elements": [ + { "from": [ 6, 0, 0 ], + "to": [ 10, 16, 4 ], + "faces": { + "down": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 6, 0, 10, 4 ], "texture": "#texture" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 4, 16 ], "texture": "#texture" } + }, + "__comment": "Left post" + }, + { "from": [ 6, 0, 12 ], + "to": [ 10, 16, 16 ], + "faces": { + "down": { "uv": [ 6, 12, 10, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 6, 12, 10, 16 ], "texture": "#texture" }, + "north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 12, 0, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 12, 0, 16, 16 ], "texture": "#texture" } + }, + "__comment": "Right post" + }, + { "from": [ 6, 10, -2 ], + "to": [ 10, 15, 18 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" }, + "north": { "uv": [ 7, 1, 9, 3 ], "texture": "#texture" }, + "south": { "uv": [ 7, 1, 9, 3 ], "texture": "#texture" }, + "west": { "uv": [ 0, 1, 16, 3 ], "texture": "#texture" }, + "east": { "uv": [ 0, 1, 16, 3 ], "texture": "#texture" } + }, + "__comment": "Top bar" + }, + { "from": [ 7, 6, -2 ], + "to": [ 9, 9, 18 ], + "faces": { + "down": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" }, + "up": { "uv": [ 7, 0, 9, 16 ], "texture": "#texture" }, + "north": { "uv": [ 7, 9, 9, 11 ], "texture": "#texture" }, + "south": { "uv": [ 7, 9, 9, 11 ], "texture": "#texture" }, + "west": { "uv": [ 0, 9, 16, 11 ], "texture": "#texture" }, + "east": { "uv": [ 0, 9, 16, 11 ], "texture": "#texture" } + }, + "__comment": "Lower bar" + } + ] } diff --git a/src/main/resources/assets/unicopia/models/item/cloud_banister.json b/src/main/resources/assets/unicopia/models/item/cloud_banister.json index 5dc939ca..3a80ac90 100644 --- a/src/main/resources/assets/unicopia/models/item/cloud_banister.json +++ b/src/main/resources/assets/unicopia/models/item/cloud_banister.json @@ -1,3 +1,3 @@ { - "parent": "unicopia:block/cloud_banister" + "parent": "unicopia:block/cloud_banister_inventory" }