From f1288aba3afd535cc987cfa204ac1ca2a660353a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 23 Mar 2019 22:36:33 -0500 Subject: [PATCH] Fix glass panes --- .../botania/blockstates/bifrost_pane.json | 29 ++++++++++ .../botania/blockstates/bifrostpermpane.json | 28 ---------- .../botania/blockstates/elf_glass_pane.json | 29 ++++++++++ .../botania/blockstates/elfglasspane.json | 28 ---------- .../botania/blockstates/mana_glass_pane.json | 53 ++++++++++--------- .../block/panes/bifrost_pane_noside.json | 7 +++ .../block/panes/bifrost_pane_noside_alt.json | 7 +++ .../models/block/panes/bifrost_pane_post.json | 7 +++ .../models/block/panes/bifrost_pane_side.json | 7 +++ .../block/panes/bifrost_pane_side_alt.json | 7 +++ .../block/panes/elf_glass_pane_noside.json | 7 +++ .../panes/elf_glass_pane_noside_alt.json | 7 +++ .../block/panes/elf_glass_pane_post.json | 7 +++ .../block/panes/elf_glass_pane_side.json | 7 +++ .../block/panes/elf_glass_pane_side_alt.json | 7 +++ .../block/panes/mana_glass_pane_noside.json | 7 +++ .../panes/mana_glass_pane_noside_alt.json | 7 +++ .../block/panes/mana_glass_pane_post.json | 7 +++ .../block/panes/mana_glass_pane_side.json | 7 +++ .../block/panes/mana_glass_pane_side_alt.json | 7 +++ .../botania/models/item/animated_torch.json | 2 +- ...alfglass_pane.json => elf_glass_pane.json} | 0 ...naglass_pane.json => mana_glass_pane.json} | 0 23 files changed, 191 insertions(+), 83 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/bifrost_pane.json delete mode 100644 src/main/resources/assets/botania/blockstates/bifrostpermpane.json create mode 100644 src/main/resources/assets/botania/blockstates/elf_glass_pane.json delete mode 100644 src/main/resources/assets/botania/blockstates/elfglasspane.json create mode 100644 src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside.json create mode 100644 src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside_alt.json create mode 100644 src/main/resources/assets/botania/models/block/panes/bifrost_pane_post.json create mode 100644 src/main/resources/assets/botania/models/block/panes/bifrost_pane_side.json create mode 100644 src/main/resources/assets/botania/models/block/panes/bifrost_pane_side_alt.json create mode 100644 src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside.json create mode 100644 src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside_alt.json create mode 100644 src/main/resources/assets/botania/models/block/panes/elf_glass_pane_post.json create mode 100644 src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side.json create mode 100644 src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side_alt.json create mode 100644 src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside.json create mode 100644 src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside_alt.json create mode 100644 src/main/resources/assets/botania/models/block/panes/mana_glass_pane_post.json create mode 100644 src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side.json create mode 100644 src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side_alt.json rename src/main/resources/assets/botania/models/item/{alfglass_pane.json => elf_glass_pane.json} (100%) rename src/main/resources/assets/botania/models/item/{managlass_pane.json => mana_glass_pane.json} (100%) diff --git a/src/main/resources/assets/botania/blockstates/bifrost_pane.json b/src/main/resources/assets/botania/blockstates/bifrost_pane.json new file mode 100644 index 000000000..c57a40c3c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bifrost_pane.json @@ -0,0 +1,29 @@ +{ + "multipart": [ + { "apply": { "model": "botania:block/panes/bifrost_pane_post" }}, + { "when": { "north": true }, + "apply": { "model": "botania:block/panes/bifrost_pane_side" } + }, + { "when": { "east": true }, + "apply": { "model": "botania:block/panes/bifrost_pane_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "botania:block/panes/bifrost_pane_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "botania:block/panes/bifrost_pane_side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "botania:block/panes/bifrost_pane_noside" } + }, + { "when": { "east": false }, + "apply": { "model": "botania:block/panes/bifrost_pane_noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "botania:block/panes/bifrost_pane_noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "botania:block/panes/bifrost_pane_noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/bifrostpermpane.json b/src/main/resources/assets/botania/blockstates/bifrostpermpane.json deleted file mode 100644 index 1cd8b15de..000000000 --- a/src/main/resources/assets/botania/blockstates/bifrostpermpane.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:pane_post", - "textures": { - "edge": "botania:blocks/bifrostpermpane", - "pane": "botania:blocks/bifrost" - } - }, - "variants": { - "north": { - "true": { "submodel": { "nside": { "model": "minecraft:pane_side" } } }, - "false": { "submodel": { "nside": { "model": "minecraft:pane_noside" } } } - }, - "south": { - "true": { "submodel": { "sside": { "model": "minecraft:pane_side_alt" } } }, - "false": { "submodel": { "sside": { "model": "minecraft:pane_noside_alt", "y": 90 } } } - }, - "west": { - "true": { "submodel": { "wside": { "model": "minecraft:pane_side_alt", "y": 90 } } }, - "false": { "submodel": { "wside": { "model": "minecraft:pane_noside", "y": 270 } } } - }, - "east": { - "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, - "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - } - } -} diff --git a/src/main/resources/assets/botania/blockstates/elf_glass_pane.json b/src/main/resources/assets/botania/blockstates/elf_glass_pane.json new file mode 100644 index 000000000..45b587be9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/elf_glass_pane.json @@ -0,0 +1,29 @@ +{ + "multipart": [ + { "apply": { "model": "botania:block/panes/elf_glass_pane_post" }}, + { "when": { "north": true }, + "apply": { "model": "botania:block/panes/elf_glass_pane_side" } + }, + { "when": { "east": true }, + "apply": { "model": "botania:block/panes/elf_glass_pane_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "botania:block/panes/elf_glass_pane_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "botania:block/panes/elf_glass_pane_side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "botania:block/panes/elf_glass_pane_noside" } + }, + { "when": { "east": false }, + "apply": { "model": "botania:block/panes/elf_glass_pane_noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "botania:block/panes/elf_glass_pane_noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "botania:block/panes/elf_glass_pane_noside", "y": 270 } + } + ] +} diff --git a/src/main/resources/assets/botania/blockstates/elfglasspane.json b/src/main/resources/assets/botania/blockstates/elfglasspane.json deleted file mode 100644 index b2cd97da2..000000000 --- a/src/main/resources/assets/botania/blockstates/elfglasspane.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:pane_post", - "textures": { - "edge": "botania:blocks/elfglasspane", - "pane": "botania:blocks/elfglass" - } - }, - "variants": { - "north": { - "true": { "submodel": { "nside": { "model": "minecraft:pane_side" } } }, - "false": { "submodel": { "nside": { "model": "minecraft:pane_noside" } } } - }, - "south": { - "true": { "submodel": { "sside": { "model": "minecraft:pane_side_alt" } } }, - "false": { "submodel": { "sside": { "model": "minecraft:pane_noside_alt", "y": 90 } } } - }, - "west": { - "true": { "submodel": { "wside": { "model": "minecraft:pane_side_alt", "y": 90 } } }, - "false": { "submodel": { "wside": { "model": "minecraft:pane_noside", "y": 270 } } } - }, - "east": { - "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, - "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - } - } -} diff --git a/src/main/resources/assets/botania/blockstates/mana_glass_pane.json b/src/main/resources/assets/botania/blockstates/mana_glass_pane.json index 7df53f21a..67db53ad0 100644 --- a/src/main/resources/assets/botania/blockstates/mana_glass_pane.json +++ b/src/main/resources/assets/botania/blockstates/mana_glass_pane.json @@ -1,28 +1,29 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:pane_post", - "textures": { - "edge": "botania:blocks/mana_glass_pane", - "pane": "botania:blocks/mana_glass" - } - }, - "variants": { - "north": { - "true": { "submodel": { "nside": { "model": "minecraft:pane_side" } } }, - "false": { "submodel": { "nside": { "model": "minecraft:pane_noside" } } } - }, - "south": { - "true": { "submodel": { "sside": { "model": "minecraft:pane_side_alt" } } }, - "false": { "submodel": { "sside": { "model": "minecraft:pane_noside_alt", "y": 90 } } } - }, - "west": { - "true": { "submodel": { "wside": { "model": "minecraft:pane_side_alt", "y": 90 } } }, - "false": { "submodel": { "wside": { "model": "minecraft:pane_noside", "y": 270 } } } - }, - "east": { - "true": { "submodel": { "eside": { "model": "minecraft:pane_side", "y": 90 } } }, - "false": { "submodel": { "eside": { "model": "minecraft:pane_noside_alt" } } } - } - } + "multipart": [ + { "apply": { "model": "botania:block/panes/mana_glass_pane_post" }}, + { "when": { "north": true }, + "apply": { "model": "botania:block/panes/mana_glass_pane_side" } + }, + { "when": { "east": true }, + "apply": { "model": "botania:block/panes/mana_glass_pane_side", "y": 90 } + }, + { "when": { "south": true }, + "apply": { "model": "botania:block/panes/mana_glass_pane_side_alt" } + }, + { "when": { "west": true }, + "apply": { "model": "botania:block/panes/mana_glass_pane_side_alt", "y": 90 } + }, + { "when": { "north": false }, + "apply": { "model": "botania:block/panes/mana_glass_pane_noside" } + }, + { "when": { "east": false }, + "apply": { "model": "botania:block/panes/mana_glass_pane_noside_alt" } + }, + { "when": { "south": false }, + "apply": { "model": "botania:block/panes/mana_glass_pane_noside_alt", "y": 90 } + }, + { "when": { "west": false }, + "apply": { "model": "botania:block/panes/mana_glass_pane_noside", "y": 270 } + } + ] } diff --git a/src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside.json b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside.json new file mode 100644 index 000000000..9e50b035e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside", + "textures": { + "edge": "botania:blocks/bifrostpermpane", + "pane": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside_alt.json b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside_alt.json new file mode 100644 index 000000000..22a5bcdb5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside_alt", + "textures": { + "edge": "botania:blocks/bifrostpermpane", + "pane": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/bifrost_pane_post.json b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_post.json new file mode 100644 index 000000000..bc6454ec2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_post", + "textures": { + "edge": "botania:blocks/bifrostpermpane", + "pane": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/bifrost_pane_side.json b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_side.json new file mode 100644 index 000000000..9ae1a144c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side", + "textures": { + "edge": "botania:blocks/bifrostpermpane", + "pane": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/bifrost_pane_side_alt.json b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_side_alt.json new file mode 100644 index 000000000..1cdb8d853 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/bifrost_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side_alt", + "textures": { + "edge": "botania:blocks/bifrostpermpane", + "pane": "botania:blocks/bifrost" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside.json b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside.json new file mode 100644 index 000000000..0fae5c4b6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside", + "textures": { + "edge": "botania:blocks/elfglasspane", + "pane": "botania:blocks/elfglass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside_alt.json b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside_alt.json new file mode 100644 index 000000000..1e0bde24d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside_alt", + "textures": { + "edge": "botania:blocks/elfglasspane", + "pane": "botania:blocks/elfglass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_post.json b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_post.json new file mode 100644 index 000000000..a0ea77f58 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_post", + "textures": { + "edge": "botania:blocks/elfglasspane", + "pane": "botania:blocks/elfglass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side.json b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side.json new file mode 100644 index 000000000..117168d96 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side", + "textures": { + "edge": "botania:blocks/elfglasspane", + "pane": "botania:blocks/elfglass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side_alt.json b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side_alt.json new file mode 100644 index 000000000..aa4721f9c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/elf_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side_alt", + "textures": { + "edge": "botania:blocks/elfglasspane", + "pane": "botania:blocks/elfglass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside.json b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside.json new file mode 100644 index 000000000..8bae1c9ac --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside", + "textures": { + "edge": "botania:blocks/mana_glass_pane", + "pane": "botania:blocks/mana_glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside_alt.json b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside_alt.json new file mode 100644 index 000000000..0b9e85c85 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_noside_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_noside_alt", + "textures": { + "edge": "botania:blocks/mana_glass_pane", + "pane": "botania:blocks/mana_glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_post.json b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_post.json new file mode 100644 index 000000000..ea56f8c94 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_post", + "textures": { + "edge": "botania:blocks/mana_glass_pane", + "pane": "botania:blocks/mana_glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side.json b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side.json new file mode 100644 index 000000000..b32a40d59 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side", + "textures": { + "edge": "botania:blocks/mana_glass_pane", + "pane": "botania:blocks/mana_glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side_alt.json b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side_alt.json new file mode 100644 index 000000000..683629f61 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/panes/mana_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_glass_pane_side_alt", + "textures": { + "edge": "botania:blocks/mana_glass_pane", + "pane": "botania:blocks/mana_glass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/animated_torch.json b/src/main/resources/assets/botania/models/item/animated_torch.json index f90763deb..13d77d098 100644 --- a/src/main/resources/assets/botania/models/item/animated_torch.json +++ b/src/main/resources/assets/botania/models/item/animated_torch.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "minecraft:block/redstone_torch_on", + "layer0": "minecraft:block/redstone_torch", "layer1": "botania:blocks/animated_torch_glimmer" } } diff --git a/src/main/resources/assets/botania/models/item/alfglass_pane.json b/src/main/resources/assets/botania/models/item/elf_glass_pane.json similarity index 100% rename from src/main/resources/assets/botania/models/item/alfglass_pane.json rename to src/main/resources/assets/botania/models/item/elf_glass_pane.json diff --git a/src/main/resources/assets/botania/models/item/managlass_pane.json b/src/main/resources/assets/botania/models/item/mana_glass_pane.json similarity index 100% rename from src/main/resources/assets/botania/models/item/managlass_pane.json rename to src/main/resources/assets/botania/models/item/mana_glass_pane.json