From d6b36d73f724593dc9dfd0df45e748093ec525be Mon Sep 17 00:00:00 2001 From: Yandols ZeonX Date: Thu, 9 May 2019 17:11:04 +0800 Subject: [PATCH] Changed the internal name of Composite Glass from 'altglass' to 'compositeglass'. [ZCM/CA] --- .../blockstates/altglass.json | 5 --- .../blockstates/altglass_pane.json | 40 ------------------ .../blockstates/compositeglass.json | 5 +++ .../blockstates/compositeglass_pane.json | 40 ++++++++++++++++++ .../models/block/altglass_pane_post.json | 7 --- .../models/block/altglass_pane_side.json | 7 --- .../models/block/altglass_pane_side_alt.json | 7 --- .../{altglass.json => compositeglass.json} | 2 +- ...e.json => compositeglass_pane_noside.json} | 2 +- ...on => compositeglass_pane_noside_alt.json} | 2 +- .../block/compositeglass_pane_post.json | 7 +++ .../block/compositeglass_pane_side.json | 7 +++ .../block/compositeglass_pane_side_alt.json | 7 +++ .../models/item/altglass.json | 3 -- .../models/item/compositeglass.json | 3 ++ ...ass_pane.json => compositeglass_pane.json} | 2 +- .../{altglass.png => compositeglass.png} | Bin ...glass_pane.png => compositeglass_pane.png} | Bin ...ide.png => compositeglass_pane_noside.png} | Bin ...png => compositeglass_pane_noside_alt.png} | Bin ..._post.png => compositeglass_pane_post.png} | Bin ..._side.png => compositeglass_pane_side.png} | Bin ...t.png => compositeglass_pane_side_alt.png} | Bin ...ne_top.png => compositeglass_pane_top.png} | Bin 24 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass.json delete mode 100644 mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass_pane.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass_pane.json delete mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_post.json delete mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side.json delete mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side_alt.json rename mods/zcm-ca/assets/zcm_comalterlite/models/block/{altglass.json => compositeglass.json} (51%) rename mods/zcm-ca/assets/zcm_comalterlite/models/block/{altglass_pane_noside.json => compositeglass_pane_noside.json} (52%) rename mods/zcm-ca/assets/zcm_comalterlite/models/block/{altglass_pane_noside_alt.json => compositeglass_pane_noside_alt.json} (54%) create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_post.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side_alt.json delete mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/item/altglass.json create mode 100644 mods/zcm-ca/assets/zcm_comalterlite/models/item/compositeglass.json rename mods/zcm-ca/assets/zcm_comalterlite/models/item/{altglass_pane.json => compositeglass_pane.json} (50%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass.png => compositeglass.png} (100%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass_pane.png => compositeglass_pane.png} (100%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass_pane_noside.png => compositeglass_pane_noside.png} (100%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass_pane_noside_alt.png => compositeglass_pane_noside_alt.png} (100%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass_pane_post.png => compositeglass_pane_post.png} (100%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass_pane_side.png => compositeglass_pane_side.png} (100%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass_pane_side_alt.png => compositeglass_pane_side_alt.png} (100%) rename mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/{altglass_pane_top.png => compositeglass_pane_top.png} (100%) diff --git a/mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass.json b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass.json deleted file mode 100644 index 99ae8d9..0000000 --- a/mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "zcm_comalterlite:altglass"} - } -} \ No newline at end of file diff --git a/mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass_pane.json b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass_pane.json deleted file mode 100644 index 9a66dda..0000000 --- a/mods/zcm-ca/assets/zcm_comalterlite/blockstates/altglass_pane.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "multipart": [ - { - "when": {"subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_post"} - }, - { - "when": {"north": true, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_side"} - }, - { - "when": {"east": true, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_side", "y": 90} - }, - { - "when": {"south": true, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_side_alt"} - }, - { - "when": {"west": true, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_side_alt", "y": 90} - }, - { - "when": {"north": false, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_noside"} - }, - { - "when": {"east": false, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_noside_alt"} - }, - { - "when": {"south": false, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_noside_alt", "y": 90} - }, - { - "when": {"west": false, "subtype": "subtype0"}, - "apply": {"model": "zcm_comalterlite:altglass_pane_noside", "y": 270} - } - ] -} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass.json b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass.json new file mode 100644 index 0000000..992c17b --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": {"model": "zcm_comalterlite:compositeglass"} + } +} \ No newline at end of file diff --git a/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass_pane.json b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass_pane.json new file mode 100644 index 0000000..2064cc3 --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/blockstates/compositeglass_pane.json @@ -0,0 +1,40 @@ +{ + "multipart": [ + { + "when": {"subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_post"} + }, + { + "when": {"north": true, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_side"} + }, + { + "when": {"east": true, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_side", "y": 90} + }, + { + "when": {"south": true, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_side_alt"} + }, + { + "when": {"west": true, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_side_alt", "y": 90} + }, + { + "when": {"north": false, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_noside"} + }, + { + "when": {"east": false, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_noside_alt"} + }, + { + "when": {"south": false, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_noside_alt", "y": 90} + }, + { + "when": {"west": false, "subtype": "subtype0"}, + "apply": {"model": "zcm_comalterlite:compositeglass_pane_noside", "y": 270} + } + ] +} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_post.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_post.json deleted file mode 100644 index 1a739aa..0000000 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/pane_post", - "textures": { - "edge": "zcm_comalterlite:blocks/altglass_pane_top", - "pane": "zcm_comalterlite:blocks/altglass" - } -} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side.json deleted file mode 100644 index fef2bd6..0000000 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/pane_side", - "textures": { - "edge": "zcm_comalterlite:blocks/altglass_pane_top", - "pane": "zcm_comalterlite:blocks/altglass" - } -} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side_alt.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side_alt.json deleted file mode 100644 index 638f16c..0000000 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/pane_side_alt", - "textures": { - "edge": "zcm_comalterlite:blocks/altglass_pane_top", - "pane": "zcm_comalterlite:blocks/altglass" - } -} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass.json similarity index 51% rename from mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass.json rename to mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass.json index 8504607..f639bb5 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "zcm_comalterlite:blocks/altglass" + "all": "zcm_comalterlite:blocks/compositeglass" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_noside.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_noside.json similarity index 52% rename from mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_noside.json rename to mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_noside.json index 0366d4e..78ca7e4 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_noside.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_noside.json @@ -1,6 +1,6 @@ { "parent": "block/pane_noside", "textures": { - "pane": "zcm_comalterlite:blocks/altglass" + "pane": "zcm_comalterlite:blocks/compositeglass" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_noside_alt.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_noside_alt.json similarity index 54% rename from mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_noside_alt.json rename to mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_noside_alt.json index c979ad0..2e44822 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/block/altglass_pane_noside_alt.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_noside_alt.json @@ -1,6 +1,6 @@ { "parent": "block/pane_noside_alt", "textures": { - "pane": "zcm_comalterlite:blocks/altglass" + "pane": "zcm_comalterlite:blocks/compositeglass" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_post.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_post.json new file mode 100644 index 0000000..59907e0 --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "block/pane_post", + "textures": { + "edge": "zcm_comalterlite:blocks/compositeglass_pane_top", + "pane": "zcm_comalterlite:blocks/compositeglass" + } +} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side.json new file mode 100644 index 0000000..0665193 --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/pane_side", + "textures": { + "edge": "zcm_comalterlite:blocks/compositeglass_pane_top", + "pane": "zcm_comalterlite:blocks/compositeglass" + } +} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side_alt.json b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side_alt.json new file mode 100644 index 0000000..5d291de --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/block/compositeglass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "block/pane_side_alt", + "textures": { + "edge": "zcm_comalterlite:blocks/compositeglass_pane_top", + "pane": "zcm_comalterlite:blocks/compositeglass" + } +} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/altglass.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/altglass.json deleted file mode 100644 index 76bfab8..0000000 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/altglass.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "zcm_comalterlite:block/altglass" -} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositeglass.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositeglass.json new file mode 100644 index 0000000..79881f6 --- /dev/null +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositeglass.json @@ -0,0 +1,3 @@ +{ + "parent": "zcm_comalterlite:block/compositeglass" +} diff --git a/mods/zcm-ca/assets/zcm_comalterlite/models/item/altglass_pane.json b/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositeglass_pane.json similarity index 50% rename from mods/zcm-ca/assets/zcm_comalterlite/models/item/altglass_pane.json rename to mods/zcm-ca/assets/zcm_comalterlite/models/item/compositeglass_pane.json index bd2e1d2..151a77b 100644 --- a/mods/zcm-ca/assets/zcm_comalterlite/models/item/altglass_pane.json +++ b/mods/zcm-ca/assets/zcm_comalterlite/models/item/compositeglass_pane.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "zcm_comalterlite:blocks/altglass" + "layer0": "zcm_comalterlite:blocks/compositeglass" } } diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_noside.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_noside.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_noside.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_noside.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_noside_alt.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_noside_alt.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_noside_alt.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_noside_alt.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_post.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_post.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_post.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_post.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_side.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_side.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_side.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_side.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_side_alt.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_side_alt.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_side_alt.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_side_alt.png diff --git a/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_top.png b/mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top.png similarity index 100% rename from mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/altglass_pane_top.png rename to mods/zcm-ca/assets/zcm_comalterlite/textures/blocks/compositeglass_pane_top.png