From a9a0792d14d4b6c9bd6c687f2b5bf09291c9c5ec Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jul 2020 15:54:50 -0500 Subject: [PATCH] Datagenerate quartzes and panes --- .../models/block/bifrost_pane_noside.json | 6 + .../models/block/bifrost_pane_noside_alt.json | 6 + .../models/block/bifrost_pane_post.json | 7 ++ .../models/block/bifrost_pane_side.json | 7 ++ .../models/block/bifrost_pane_side_alt.json | 7 ++ .../botania/models/block/blaze_quartz.json | 8 ++ .../models/block/blaze_quartz_pillar.json | 4 +- .../models/block/chiseled_blaze_quartz.json | 4 +- .../models/block/chiseled_dark_quartz.json | 4 +- .../models/block/chiseled_elf_quartz.json | 4 +- .../block/chiseled_lavender_quartz.json | 4 +- .../models/block/chiseled_mana_quartz.json | 4 +- .../models/block/chiseled_red_quartz.json | 4 +- .../models/block/chiseled_sunny_quartz.json | 4 +- .../botania/models/block/dark_quartz.json | 8 ++ .../models/block/dark_quartz_pillar.json | 4 +- .../models/block/elf_glass_pane_noside.json | 6 + .../block/elf_glass_pane_noside_alt.json | 6 + .../models/block/elf_glass_pane_post.json | 7 ++ .../models/block/elf_glass_pane_side.json | 7 ++ .../models/block/elf_glass_pane_side_alt.json | 7 ++ .../botania/models/block/elf_quartz.json | 8 ++ .../models/block/elf_quartz_pillar.json | 4 +- .../botania/models/block/lavender_quartz.json | 8 ++ .../models/block/lavender_quartz_pillar.json | 4 +- .../models/block/mana_glass_pane_noside.json | 6 + .../block/mana_glass_pane_noside_alt.json | 6 + .../models/block/mana_glass_pane_post.json | 7 ++ .../models/block/mana_glass_pane_side.json | 7 ++ .../block/mana_glass_pane_side_alt.json | 7 ++ .../botania/models/block/mana_quartz.json | 8 ++ .../models/block/mana_quartz_pillar.json | 4 +- .../botania/models/block/red_quartz.json | 8 ++ .../models/block/red_quartz_pillar.json | 4 +- .../botania/models/block/sunny_quartz.json | 8 ++ .../models/block/sunny_quartz_pillar.json | 4 +- .../botania/data/BlockstateProvider.java | 110 +++++++++++------- .../models/block/bifrost_pane_noside.json | 7 -- .../models/block/bifrost_pane_noside_alt.json | 7 -- .../models/block/bifrost_pane_post.json | 7 -- .../models/block/bifrost_pane_side.json | 7 -- .../models/block/bifrost_pane_side_alt.json | 7 -- .../botania/models/block/blaze_quartz.json | 8 -- .../botania/models/block/dark_quartz.json | 8 -- .../models/block/elf_glass_pane_noside.json | 7 -- .../block/elf_glass_pane_noside_alt.json | 7 -- .../models/block/elf_glass_pane_post.json | 7 -- .../models/block/elf_glass_pane_side.json | 7 -- .../models/block/elf_glass_pane_side_alt.json | 7 -- .../botania/models/block/elf_quartz.json | 8 -- .../botania/models/block/lavender_quartz.json | 8 -- .../models/block/mana_glass_pane_noside.json | 7 -- .../block/mana_glass_pane_noside_alt.json | 7 -- .../models/block/mana_glass_pane_post.json | 7 -- .../models/block/mana_glass_pane_side.json | 7 -- .../block/mana_glass_pane_side_alt.json | 7 -- .../botania/models/block/mana_quartz.json | 8 -- .../botania/models/block/red_quartz.json | 8 -- .../botania/models/block/sunny_quartz.json | 8 -- .../botania/models/item/elf_glass_pane.json | 2 +- .../block/{elfglass.png => elf_glass.png} | Bin .../{elfglass_pane.png => elf_glass_pane.png} | Bin 62 files changed, 250 insertions(+), 234 deletions(-) create mode 100644 src/generated/resources/assets/botania/models/block/bifrost_pane_noside.json create mode 100644 src/generated/resources/assets/botania/models/block/bifrost_pane_noside_alt.json create mode 100644 src/generated/resources/assets/botania/models/block/bifrost_pane_post.json create mode 100644 src/generated/resources/assets/botania/models/block/bifrost_pane_side.json create mode 100644 src/generated/resources/assets/botania/models/block/bifrost_pane_side_alt.json create mode 100644 src/generated/resources/assets/botania/models/block/blaze_quartz.json rename src/{main => generated}/resources/assets/botania/models/block/blaze_quartz_pillar.json (73%) rename src/{main => generated}/resources/assets/botania/models/block/chiseled_blaze_quartz.json (74%) rename src/{main => generated}/resources/assets/botania/models/block/chiseled_dark_quartz.json (74%) rename src/{main => generated}/resources/assets/botania/models/block/chiseled_elf_quartz.json (73%) rename src/{main => generated}/resources/assets/botania/models/block/chiseled_lavender_quartz.json (75%) rename src/{main => generated}/resources/assets/botania/models/block/chiseled_mana_quartz.json (74%) rename src/{main => generated}/resources/assets/botania/models/block/chiseled_red_quartz.json (73%) rename src/{main => generated}/resources/assets/botania/models/block/chiseled_sunny_quartz.json (74%) create mode 100644 src/generated/resources/assets/botania/models/block/dark_quartz.json rename src/{main => generated}/resources/assets/botania/models/block/dark_quartz_pillar.json (73%) create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_pane_noside.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_pane_post.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_pane_side.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_glass_pane_side_alt.json create mode 100644 src/generated/resources/assets/botania/models/block/elf_quartz.json rename src/{main => generated}/resources/assets/botania/models/block/elf_quartz_pillar.json (73%) create mode 100644 src/generated/resources/assets/botania/models/block/lavender_quartz.json rename src/{main => generated}/resources/assets/botania/models/block/lavender_quartz_pillar.json (74%) create mode 100644 src/generated/resources/assets/botania/models/block/mana_glass_pane_noside.json create mode 100644 src/generated/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json create mode 100644 src/generated/resources/assets/botania/models/block/mana_glass_pane_post.json create mode 100644 src/generated/resources/assets/botania/models/block/mana_glass_pane_side.json create mode 100644 src/generated/resources/assets/botania/models/block/mana_glass_pane_side_alt.json create mode 100644 src/generated/resources/assets/botania/models/block/mana_quartz.json rename src/{main => generated}/resources/assets/botania/models/block/mana_quartz_pillar.json (73%) create mode 100644 src/generated/resources/assets/botania/models/block/red_quartz.json rename src/{main => generated}/resources/assets/botania/models/block/red_quartz_pillar.json (73%) create mode 100644 src/generated/resources/assets/botania/models/block/sunny_quartz.json rename src/{main => generated}/resources/assets/botania/models/block/sunny_quartz_pillar.json (73%) delete mode 100644 src/main/resources/assets/botania/models/block/bifrost_pane_noside.json delete mode 100644 src/main/resources/assets/botania/models/block/bifrost_pane_noside_alt.json delete mode 100644 src/main/resources/assets/botania/models/block/bifrost_pane_post.json delete mode 100644 src/main/resources/assets/botania/models/block/bifrost_pane_side.json delete mode 100644 src/main/resources/assets/botania/models/block/bifrost_pane_side_alt.json delete mode 100644 src/main/resources/assets/botania/models/block/blaze_quartz.json delete mode 100644 src/main/resources/assets/botania/models/block/dark_quartz.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_pane_noside.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_pane_post.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_pane_side.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_glass_pane_side_alt.json delete mode 100644 src/main/resources/assets/botania/models/block/elf_quartz.json delete mode 100644 src/main/resources/assets/botania/models/block/lavender_quartz.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_glass_pane_noside.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_glass_pane_post.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_glass_pane_side.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_glass_pane_side_alt.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_quartz.json delete mode 100644 src/main/resources/assets/botania/models/block/red_quartz.json delete mode 100644 src/main/resources/assets/botania/models/block/sunny_quartz.json rename src/main/resources/assets/botania/textures/block/{elfglass.png => elf_glass.png} (100%) rename src/main/resources/assets/botania/textures/block/{elfglass_pane.png => elf_glass_pane.png} (100%) diff --git a/src/generated/resources/assets/botania/models/block/bifrost_pane_noside.json b/src/generated/resources/assets/botania/models/block/bifrost_pane_noside.json new file mode 100644 index 000000000..9fd9d5d53 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bifrost_pane_noside.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside", + "textures": { + "pane": "botania:block/bifrost" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bifrost_pane_noside_alt.json b/src/generated/resources/assets/botania/models/block/bifrost_pane_noside_alt.json new file mode 100644 index 000000000..419622250 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bifrost_pane_noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside_alt", + "textures": { + "pane": "botania:block/bifrost" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bifrost_pane_post.json b/src/generated/resources/assets/botania/models/block/bifrost_pane_post.json new file mode 100644 index 000000000..bbb5cfbfb --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bifrost_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_post", + "textures": { + "pane": "botania:block/bifrost", + "edge": "botania:block/bifrost_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bifrost_pane_side.json b/src/generated/resources/assets/botania/models/block/bifrost_pane_side.json new file mode 100644 index 000000000..5410a2e52 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bifrost_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side", + "textures": { + "pane": "botania:block/bifrost", + "edge": "botania:block/bifrost_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bifrost_pane_side_alt.json b/src/generated/resources/assets/botania/models/block/bifrost_pane_side_alt.json new file mode 100644 index 000000000..4174a0cfe --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bifrost_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side_alt", + "textures": { + "pane": "botania:block/bifrost", + "edge": "botania:block/bifrost_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/blaze_quartz.json b/src/generated/resources/assets/botania/models/block/blaze_quartz.json new file mode 100644 index 000000000..a4da8f1f2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/blaze_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/blaze_quartz_side", + "bottom": "botania:block/blaze_quartz_bottom", + "top": "botania:block/blaze_quartz_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blaze_quartz_pillar.json b/src/generated/resources/assets/botania/models/block/blaze_quartz_pillar.json similarity index 73% rename from src/main/resources/assets/botania/models/block/blaze_quartz_pillar.json rename to src/generated/resources/assets/botania/models/block/blaze_quartz_pillar.json index b965a6bfd..d3a179099 100644 --- a/src/main/resources/assets/botania/models/block/blaze_quartz_pillar.json +++ b/src/generated/resources/assets/botania/models/block/blaze_quartz_pillar.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/blaze_quartz_pillar_side", "end": "botania:block/blaze_quartz_pillar_end" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_blaze_quartz.json b/src/generated/resources/assets/botania/models/block/chiseled_blaze_quartz.json similarity index 74% rename from src/main/resources/assets/botania/models/block/chiseled_blaze_quartz.json rename to src/generated/resources/assets/botania/models/block/chiseled_blaze_quartz.json index b7a57be59..b832f01a8 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_blaze_quartz.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_blaze_quartz.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/chiseled_blaze_quartz_side", "end": "botania:block/chiseled_blaze_quartz_end" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_dark_quartz.json b/src/generated/resources/assets/botania/models/block/chiseled_dark_quartz.json similarity index 74% rename from src/main/resources/assets/botania/models/block/chiseled_dark_quartz.json rename to src/generated/resources/assets/botania/models/block/chiseled_dark_quartz.json index fe9ad4917..c1441347e 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_dark_quartz.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_dark_quartz.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/chiseled_dark_quartz_side", "end": "botania:block/chiseled_dark_quartz_end" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_elf_quartz.json b/src/generated/resources/assets/botania/models/block/chiseled_elf_quartz.json similarity index 73% rename from src/main/resources/assets/botania/models/block/chiseled_elf_quartz.json rename to src/generated/resources/assets/botania/models/block/chiseled_elf_quartz.json index f30681495..f64b8f013 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_elf_quartz.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_elf_quartz.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/chiseled_elf_quartz_side", "end": "botania:block/chiseled_elf_quartz_end" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_lavender_quartz.json b/src/generated/resources/assets/botania/models/block/chiseled_lavender_quartz.json similarity index 75% rename from src/main/resources/assets/botania/models/block/chiseled_lavender_quartz.json rename to src/generated/resources/assets/botania/models/block/chiseled_lavender_quartz.json index e935c4808..32148a014 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_lavender_quartz.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_lavender_quartz.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/chiseled_lavender_quartz_side", "end": "botania:block/chiseled_lavender_quartz_end" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_mana_quartz.json b/src/generated/resources/assets/botania/models/block/chiseled_mana_quartz.json similarity index 74% rename from src/main/resources/assets/botania/models/block/chiseled_mana_quartz.json rename to src/generated/resources/assets/botania/models/block/chiseled_mana_quartz.json index 694a20863..643ec5280 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_mana_quartz.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_mana_quartz.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/chiseled_mana_quartz_side", "end": "botania:block/chiseled_mana_quartz_end" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_red_quartz.json b/src/generated/resources/assets/botania/models/block/chiseled_red_quartz.json similarity index 73% rename from src/main/resources/assets/botania/models/block/chiseled_red_quartz.json rename to src/generated/resources/assets/botania/models/block/chiseled_red_quartz.json index 8bb8bc730..d04eccb37 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_red_quartz.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_red_quartz.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/chiseled_red_quartz_side", "end": "botania:block/chiseled_red_quartz_end" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_sunny_quartz.json b/src/generated/resources/assets/botania/models/block/chiseled_sunny_quartz.json similarity index 74% rename from src/main/resources/assets/botania/models/block/chiseled_sunny_quartz.json rename to src/generated/resources/assets/botania/models/block/chiseled_sunny_quartz.json index b6f2b184d..16fa6fcf0 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_sunny_quartz.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_sunny_quartz.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/chiseled_sunny_quartz_side", "end": "botania:block/chiseled_sunny_quartz_end" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/dark_quartz.json b/src/generated/resources/assets/botania/models/block/dark_quartz.json new file mode 100644 index 000000000..29de3f4ba --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/dark_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/dark_quartz_side", + "bottom": "botania:block/dark_quartz_bottom", + "top": "botania:block/dark_quartz_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dark_quartz_pillar.json b/src/generated/resources/assets/botania/models/block/dark_quartz_pillar.json similarity index 73% rename from src/main/resources/assets/botania/models/block/dark_quartz_pillar.json rename to src/generated/resources/assets/botania/models/block/dark_quartz_pillar.json index 445e5c64d..41f3defd3 100644 --- a/src/main/resources/assets/botania/models/block/dark_quartz_pillar.json +++ b/src/generated/resources/assets/botania/models/block/dark_quartz_pillar.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/dark_quartz_pillar_side", "end": "botania:block/dark_quartz_pillar_end" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_pane_noside.json b/src/generated/resources/assets/botania/models/block/elf_glass_pane_noside.json new file mode 100644 index 000000000..ebd6218bb --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_pane_noside.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside", + "textures": { + "pane": "botania:block/elf_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json b/src/generated/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json new file mode 100644 index 000000000..9a302a559 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside_alt", + "textures": { + "pane": "botania:block/elf_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_pane_post.json b/src/generated/resources/assets/botania/models/block/elf_glass_pane_post.json new file mode 100644 index 000000000..70524818e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_post", + "textures": { + "pane": "botania:block/elf_glass", + "edge": "botania:block/elf_glass_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_pane_side.json b/src/generated/resources/assets/botania/models/block/elf_glass_pane_side.json new file mode 100644 index 000000000..98620e034 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side", + "textures": { + "pane": "botania:block/elf_glass", + "edge": "botania:block/elf_glass_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_glass_pane_side_alt.json b/src/generated/resources/assets/botania/models/block/elf_glass_pane_side_alt.json new file mode 100644 index 000000000..a3bab9fe6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side_alt", + "textures": { + "pane": "botania:block/elf_glass", + "edge": "botania:block/elf_glass_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/elf_quartz.json b/src/generated/resources/assets/botania/models/block/elf_quartz.json new file mode 100644 index 000000000..e511def15 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/elf_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/elf_quartz_side", + "bottom": "botania:block/elf_quartz_bottom", + "top": "botania:block/elf_quartz_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elf_quartz_pillar.json b/src/generated/resources/assets/botania/models/block/elf_quartz_pillar.json similarity index 73% rename from src/main/resources/assets/botania/models/block/elf_quartz_pillar.json rename to src/generated/resources/assets/botania/models/block/elf_quartz_pillar.json index e75c5a6b5..c5543a7b0 100644 --- a/src/main/resources/assets/botania/models/block/elf_quartz_pillar.json +++ b/src/generated/resources/assets/botania/models/block/elf_quartz_pillar.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/elf_quartz_pillar_side", "end": "botania:block/elf_quartz_pillar_end" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/lavender_quartz.json b/src/generated/resources/assets/botania/models/block/lavender_quartz.json new file mode 100644 index 000000000..b1871b700 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/lavender_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/lavender_quartz_side", + "bottom": "botania:block/lavender_quartz_bottom", + "top": "botania:block/lavender_quartz_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/lavender_quartz_pillar.json b/src/generated/resources/assets/botania/models/block/lavender_quartz_pillar.json similarity index 74% rename from src/main/resources/assets/botania/models/block/lavender_quartz_pillar.json rename to src/generated/resources/assets/botania/models/block/lavender_quartz_pillar.json index a6755cb0a..a7d388479 100644 --- a/src/main/resources/assets/botania/models/block/lavender_quartz_pillar.json +++ b/src/generated/resources/assets/botania/models/block/lavender_quartz_pillar.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/lavender_quartz_pillar_side", "end": "botania:block/lavender_quartz_pillar_end" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_glass_pane_noside.json b/src/generated/resources/assets/botania/models/block/mana_glass_pane_noside.json new file mode 100644 index 000000000..6765c06d0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_glass_pane_noside.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside", + "textures": { + "pane": "botania:block/mana_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json b/src/generated/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json new file mode 100644 index 000000000..e25a15bff --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_glass_pane_noside_alt", + "textures": { + "pane": "botania:block/mana_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_glass_pane_post.json b/src/generated/resources/assets/botania/models/block/mana_glass_pane_post.json new file mode 100644 index 000000000..050165636 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_glass_pane_post.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_post", + "textures": { + "pane": "botania:block/mana_glass", + "edge": "botania:block/mana_glass_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_glass_pane_side.json b/src/generated/resources/assets/botania/models/block/mana_glass_pane_side.json new file mode 100644 index 000000000..c2cb4f685 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_glass_pane_side.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side", + "textures": { + "pane": "botania:block/mana_glass", + "edge": "botania:block/mana_glass_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_glass_pane_side_alt.json b/src/generated/resources/assets/botania/models/block/mana_glass_pane_side_alt.json new file mode 100644 index 000000000..0d60851f2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_glass_pane_side_alt.json @@ -0,0 +1,7 @@ +{ + "parent": "block/template_glass_pane_side_alt", + "textures": { + "pane": "botania:block/mana_glass", + "edge": "botania:block/mana_glass_pane" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_quartz.json b/src/generated/resources/assets/botania/models/block/mana_quartz.json new file mode 100644 index 000000000..4780c4fe3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/mana_quartz_side", + "bottom": "botania:block/mana_quartz_bottom", + "top": "botania:block/mana_quartz_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_quartz_pillar.json b/src/generated/resources/assets/botania/models/block/mana_quartz_pillar.json similarity index 73% rename from src/main/resources/assets/botania/models/block/mana_quartz_pillar.json rename to src/generated/resources/assets/botania/models/block/mana_quartz_pillar.json index 03f05743c..42addaaf8 100644 --- a/src/main/resources/assets/botania/models/block/mana_quartz_pillar.json +++ b/src/generated/resources/assets/botania/models/block/mana_quartz_pillar.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/mana_quartz_pillar_side", "end": "botania:block/mana_quartz_pillar_end" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_quartz.json b/src/generated/resources/assets/botania/models/block/red_quartz.json new file mode 100644 index 000000000..6552e2830 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/red_quartz_side", + "bottom": "botania:block/red_quartz_bottom", + "top": "botania:block/red_quartz_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_quartz_pillar.json b/src/generated/resources/assets/botania/models/block/red_quartz_pillar.json similarity index 73% rename from src/main/resources/assets/botania/models/block/red_quartz_pillar.json rename to src/generated/resources/assets/botania/models/block/red_quartz_pillar.json index 1ccf5994d..d5b7e9503 100644 --- a/src/main/resources/assets/botania/models/block/red_quartz_pillar.json +++ b/src/generated/resources/assets/botania/models/block/red_quartz_pillar.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/red_quartz_pillar_side", "end": "botania:block/red_quartz_pillar_end" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/sunny_quartz.json b/src/generated/resources/assets/botania/models/block/sunny_quartz.json new file mode 100644 index 000000000..f6c135564 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/sunny_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/sunny_quartz_side", + "bottom": "botania:block/sunny_quartz_bottom", + "top": "botania:block/sunny_quartz_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/sunny_quartz_pillar.json b/src/generated/resources/assets/botania/models/block/sunny_quartz_pillar.json similarity index 73% rename from src/main/resources/assets/botania/models/block/sunny_quartz_pillar.json rename to src/generated/resources/assets/botania/models/block/sunny_quartz_pillar.json index 2d901683c..43fbd04fa 100644 --- a/src/main/resources/assets/botania/models/block/sunny_quartz_pillar.json +++ b/src/generated/resources/assets/botania/models/block/sunny_quartz_pillar.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", + "parent": "block/cube_column", "textures": { "side": "botania:block/sunny_quartz_pillar_side", "end": "botania:block/sunny_quartz_pillar_end" } -} +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 4dcd8d104..2e7b982d1 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -71,6 +71,7 @@ public class BlockstateProvider extends BlockStateProvider { manualModel(blocks, corporeaCrystalCube); manualModel(blocks, prism); manualModel(blocks, runeAltar); + manualModel(blocks, spawnerClaw); // Single blocks String elfGlassName = Registry.BLOCK.getKey(elfGlass).getPath(); @@ -159,34 +160,6 @@ public class BlockstateProvider extends BlockStateProvider { .texture("all", prefix("block/petal_block")); takeAll(blocks, b -> b instanceof BlockPetalBlock).forEach(b -> simpleBlock(b, petalBlockModel)); - takeAll(blocks, b -> b instanceof StairsBlock).forEach(b -> { - String name = Registry.BLOCK.getKey(b).getPath(); - String baseName = name.substring(0, name.length() - LibBlockNames.STAIR_SUFFIX.length()); - boolean quartz = name.contains("quartz"); - if (quartz) { - ResourceLocation side = prefix("block/" + baseName + "_side"); - ResourceLocation bottom = prefix("block/" + baseName + "_bottom"); - ResourceLocation top = prefix("block/" + baseName + "_top"); - stairsBlock((StairsBlock) b, side, bottom, top); - } else { - stairsBlock((StairsBlock) b, prefix("block/" + baseName)); - } - }); - - takeAll(blocks, b -> b instanceof SlabBlock).forEach(b -> { - String name = Registry.BLOCK.getKey(b).getPath(); - String baseName = name.substring(0, name.length() - LibBlockNames.SLAB_SUFFIX.length()); - boolean quartz = name.contains("quartz"); - if (quartz) { - ResourceLocation side = prefix("block/" + baseName + "_side"); - ResourceLocation bottom = prefix("block/" + baseName + "_bottom"); - ResourceLocation top = prefix("block/" + baseName + "_top"); - slabBlock((SlabBlock) b, prefix(baseName), side, bottom, top); - } else { - slabBlock((SlabBlock) b, prefix(baseName), prefix("block/" + baseName)); - } - }); - takeAll(blocks, b -> b instanceof BlockAltGrass).forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); ResourceLocation side = prefix("block/" + name + "_side"); @@ -235,6 +208,35 @@ public class BlockstateProvider extends BlockStateProvider { blocks.removeAll(Arrays.asList(base, cobble, cobbleWall, brick, chiseledBricks)); } + for (String variant : new String[] { "dark", "mana", "blaze", "lavender", "red", "elf", "sunny" }) { + ResourceLocation quartzId = prefix(variant + "_quartz"); + Block quartz = Registry.BLOCK.getValue(quartzId).get(); + simpleBlock(quartz, models().cubeBottomTop(quartzId.getPath(), + prefix("block/" + quartzId.getPath() + "_side"), + prefix("block/" + quartzId.getPath() + "_bottom"), + prefix("block/" + quartzId.getPath() + "_top"))); + + ResourceLocation pillarId = prefix(variant + "_quartz_pillar"); + Block pillar = Registry.BLOCK.getValue(pillarId).get(); + ModelFile pillarModel = models().cubeColumn(pillarId.getPath(), + prefix("block/" + pillarId.getPath() + "_side"), + prefix("block/" + pillarId.getPath() + "_end")); + getVariantBuilder(pillar) + .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).setModels(new ConfiguredModel(pillarModel, 90, 90, false)) + .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Y).setModels(new ConfiguredModel(pillarModel)) + .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Z).setModels(new ConfiguredModel(pillarModel, 90, 0, false)); + + ResourceLocation chiseledId = prefix("chiseled_" + variant + "_quartz"); + Block chiseled = Registry.BLOCK.getValue(chiseledId).get(); + simpleBlock(chiseled, models().cubeColumn(chiseledId.getPath(), + prefix("block/" + chiseledId.getPath() + "_side"), + prefix("block/" + chiseledId.getPath() + "_end"))); + + blocks.remove(quartz); + blocks.remove(pillar); + blocks.remove(chiseled); + } + takeAll(blocks, b -> b instanceof BlockBuriedPetals).forEach(b -> { DyeColor color = ((BlockBuriedPetals) b).color; ResourceLocation wool = new ResourceLocation("block/" + color.func_176610_l() + "_wool"); @@ -250,24 +252,44 @@ public class BlockstateProvider extends BlockStateProvider { simpleBlock(b, model); }); + takeAll(blocks, b -> b instanceof PaneBlock).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + ResourceLocation edge = prefix("block/" + name); + ResourceLocation pane = prefix("block/" + name.substring(0, name.length() - "_pane".length())); + paneBlock((PaneBlock) b, pane, edge); + }); + + takeAll(blocks, b -> b instanceof StairsBlock).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + String baseName = name.substring(0, name.length() - LibBlockNames.STAIR_SUFFIX.length()); + boolean quartz = name.contains("quartz"); + if (quartz) { + ResourceLocation side = prefix("block/" + baseName + "_side"); + ResourceLocation bottom = prefix("block/" + baseName + "_bottom"); + ResourceLocation top = prefix("block/" + baseName + "_top"); + stairsBlock((StairsBlock) b, side, bottom, top); + } else { + stairsBlock((StairsBlock) b, prefix("block/" + baseName)); + } + }); + + takeAll(blocks, b -> b instanceof SlabBlock).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + String baseName = name.substring(0, name.length() - LibBlockNames.SLAB_SUFFIX.length()); + boolean quartz = name.contains("quartz"); + if (quartz) { + ResourceLocation side = prefix("block/" + baseName + "_side"); + ResourceLocation bottom = prefix("block/" + baseName + "_bottom"); + ResourceLocation top = prefix("block/" + baseName + "_top"); + slabBlock((SlabBlock) b, prefix(baseName), side, bottom, top); + } else { + slabBlock((SlabBlock) b, prefix(baseName), prefix("block/" + baseName)); + } + }); + blocks.forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); - if (name.contains("quartz") && b instanceof RotatedPillarBlock) { - ModelFile file = models().getExistingFile(prefix("block/" + name)); - getVariantBuilder(b) - .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).setModels(new ConfiguredModel(file, 90, 90, false)) - .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Y).setModels(new ConfiguredModel(file)) - .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Z).setModels(new ConfiguredModel(file, 90, 0, false)); - } else if (b instanceof PaneBlock) { - ModelFile post = models().getExistingFile(prefix("block/" + name + "_post")); - ModelFile side = models().getExistingFile(prefix("block/" + name + "_side")); - ModelFile sideAlt = models().getExistingFile(prefix("block/" + name + "_side_alt")); - ModelFile noSide = models().getExistingFile(prefix("block/" + name + "_noside")); - ModelFile noSideAlt = models().getExistingFile(prefix("block/" + name + "_noside_alt")); - paneBlock((PaneBlock) b, post, side, sideAlt, noSide, noSideAlt); - } else { - simpleBlock(b, models().getExistingFile(prefix("block/" + name))); - } + simpleBlock(b, models().getExistingFile(prefix("block/" + name))); }); } diff --git a/src/main/resources/assets/botania/models/block/bifrost_pane_noside.json b/src/main/resources/assets/botania/models/block/bifrost_pane_noside.json deleted file mode 100644 index af5ab39e4..000000000 --- a/src/main/resources/assets/botania/models/block/bifrost_pane_noside.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_noside", - "textures": { - "edge": "botania:block/bifrost_pane", - "pane": "botania:block/bifrost" - } -} diff --git a/src/main/resources/assets/botania/models/block/bifrost_pane_noside_alt.json b/src/main/resources/assets/botania/models/block/bifrost_pane_noside_alt.json deleted file mode 100644 index 5bfdb3afa..000000000 --- a/src/main/resources/assets/botania/models/block/bifrost_pane_noside_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_noside_alt", - "textures": { - "edge": "botania:block/bifrost_pane", - "pane": "botania:block/bifrost" - } -} diff --git a/src/main/resources/assets/botania/models/block/bifrost_pane_post.json b/src/main/resources/assets/botania/models/block/bifrost_pane_post.json deleted file mode 100644 index c048f5681..000000000 --- a/src/main/resources/assets/botania/models/block/bifrost_pane_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_post", - "textures": { - "edge": "botania:block/bifrost_pane", - "pane": "botania:block/bifrost" - } -} diff --git a/src/main/resources/assets/botania/models/block/bifrost_pane_side.json b/src/main/resources/assets/botania/models/block/bifrost_pane_side.json deleted file mode 100644 index 7844f2c8a..000000000 --- a/src/main/resources/assets/botania/models/block/bifrost_pane_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_side", - "textures": { - "edge": "botania:block/bifrost_pane", - "pane": "botania:block/bifrost" - } -} diff --git a/src/main/resources/assets/botania/models/block/bifrost_pane_side_alt.json b/src/main/resources/assets/botania/models/block/bifrost_pane_side_alt.json deleted file mode 100644 index b2b8a8578..000000000 --- a/src/main/resources/assets/botania/models/block/bifrost_pane_side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_side_alt", - "textures": { - "edge": "botania:block/bifrost_pane", - "pane": "botania:block/bifrost" - } -} diff --git a/src/main/resources/assets/botania/models/block/blaze_quartz.json b/src/main/resources/assets/botania/models/block/blaze_quartz.json deleted file mode 100644 index 96d9e4d8d..000000000 --- a/src/main/resources/assets/botania/models/block/blaze_quartz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/blaze_quartz_bottom", - "top": "botania:block/blaze_quartz_top", - "side": "botania:block/blaze_quartz_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/dark_quartz.json b/src/main/resources/assets/botania/models/block/dark_quartz.json deleted file mode 100644 index 60b926a7f..000000000 --- a/src/main/resources/assets/botania/models/block/dark_quartz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/dark_quartz_bottom", - "top": "botania:block/dark_quartz_top", - "side": "botania:block/dark_quartz_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_pane_noside.json b/src/main/resources/assets/botania/models/block/elf_glass_pane_noside.json deleted file mode 100644 index 5394f7a88..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_pane_noside.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_noside", - "textures": { - "edge": "botania:block/elfglass_pane", - "pane": "botania:block/elfglass" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json b/src/main/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json deleted file mode 100644 index f6ede7440..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_pane_noside_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_noside_alt", - "textures": { - "edge": "botania:block/elfglass_pane", - "pane": "botania:block/elfglass" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_pane_post.json b/src/main/resources/assets/botania/models/block/elf_glass_pane_post.json deleted file mode 100644 index 61d1dabde..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_pane_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_post", - "textures": { - "edge": "botania:block/elfglass_pane", - "pane": "botania:block/elfglass" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_pane_side.json b/src/main/resources/assets/botania/models/block/elf_glass_pane_side.json deleted file mode 100644 index 6c1a96458..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_pane_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_side", - "textures": { - "edge": "botania:block/elfglass_pane", - "pane": "botania:block/elfglass" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_glass_pane_side_alt.json b/src/main/resources/assets/botania/models/block/elf_glass_pane_side_alt.json deleted file mode 100644 index 4ecd79801..000000000 --- a/src/main/resources/assets/botania/models/block/elf_glass_pane_side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_side_alt", - "textures": { - "edge": "botania:block/elfglass_pane", - "pane": "botania:block/elfglass" - } -} diff --git a/src/main/resources/assets/botania/models/block/elf_quartz.json b/src/main/resources/assets/botania/models/block/elf_quartz.json deleted file mode 100644 index a0fff74d4..000000000 --- a/src/main/resources/assets/botania/models/block/elf_quartz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/elf_quartz_bottom", - "top": "botania:block/elf_quartz_top", - "side": "botania:block/elf_quartz_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/lavender_quartz.json b/src/main/resources/assets/botania/models/block/lavender_quartz.json deleted file mode 100644 index 48defaf14..000000000 --- a/src/main/resources/assets/botania/models/block/lavender_quartz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/lavender_quartz_bottom", - "top": "botania:block/lavender_quartz_top", - "side": "botania:block/lavender_quartz_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/mana_glass_pane_noside.json b/src/main/resources/assets/botania/models/block/mana_glass_pane_noside.json deleted file mode 100644 index a52f5faf0..000000000 --- a/src/main/resources/assets/botania/models/block/mana_glass_pane_noside.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_noside", - "textures": { - "edge": "botania:block/mana_glass_pane", - "pane": "botania:block/mana_glass" - } -} diff --git a/src/main/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json b/src/main/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json deleted file mode 100644 index f0b861536..000000000 --- a/src/main/resources/assets/botania/models/block/mana_glass_pane_noside_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_noside_alt", - "textures": { - "edge": "botania:block/mana_glass_pane", - "pane": "botania:block/mana_glass" - } -} diff --git a/src/main/resources/assets/botania/models/block/mana_glass_pane_post.json b/src/main/resources/assets/botania/models/block/mana_glass_pane_post.json deleted file mode 100644 index 7e6757f65..000000000 --- a/src/main/resources/assets/botania/models/block/mana_glass_pane_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_post", - "textures": { - "edge": "botania:block/mana_glass_pane", - "pane": "botania:block/mana_glass" - } -} diff --git a/src/main/resources/assets/botania/models/block/mana_glass_pane_side.json b/src/main/resources/assets/botania/models/block/mana_glass_pane_side.json deleted file mode 100644 index 86127d247..000000000 --- a/src/main/resources/assets/botania/models/block/mana_glass_pane_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_side", - "textures": { - "edge": "botania:block/mana_glass_pane", - "pane": "botania:block/mana_glass" - } -} diff --git a/src/main/resources/assets/botania/models/block/mana_glass_pane_side_alt.json b/src/main/resources/assets/botania/models/block/mana_glass_pane_side_alt.json deleted file mode 100644 index 464cca1e1..000000000 --- a/src/main/resources/assets/botania/models/block/mana_glass_pane_side_alt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/template_glass_pane_side_alt", - "textures": { - "edge": "botania:block/mana_glass_pane", - "pane": "botania:block/mana_glass" - } -} diff --git a/src/main/resources/assets/botania/models/block/mana_quartz.json b/src/main/resources/assets/botania/models/block/mana_quartz.json deleted file mode 100644 index bc50fc5a4..000000000 --- a/src/main/resources/assets/botania/models/block/mana_quartz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/mana_quartz_bottom", - "top": "botania:block/mana_quartz_top", - "side": "botania:block/mana_quartz_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/red_quartz.json b/src/main/resources/assets/botania/models/block/red_quartz.json deleted file mode 100644 index 32b8bd7ec..000000000 --- a/src/main/resources/assets/botania/models/block/red_quartz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/red_quartz_bottom", - "top": "botania:block/red_quartz_top", - "side": "botania:block/red_quartz_side" - } -} diff --git a/src/main/resources/assets/botania/models/block/sunny_quartz.json b/src/main/resources/assets/botania/models/block/sunny_quartz.json deleted file mode 100644 index 33ebde77c..000000000 --- a/src/main/resources/assets/botania/models/block/sunny_quartz.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "botania:block/sunny_quartz_bottom", - "top": "botania:block/sunny_quartz_top", - "side": "botania:block/sunny_quartz_side" - } -} diff --git a/src/main/resources/assets/botania/models/item/elf_glass_pane.json b/src/main/resources/assets/botania/models/item/elf_glass_pane.json index 3219f449a..3df3838ef 100644 --- a/src/main/resources/assets/botania/models/item/elf_glass_pane.json +++ b/src/main/resources/assets/botania/models/item/elf_glass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:block/elfglass" + "layer0": "botania:block/elf_glass" } } diff --git a/src/main/resources/assets/botania/textures/block/elfglass.png b/src/main/resources/assets/botania/textures/block/elf_glass.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/elfglass.png rename to src/main/resources/assets/botania/textures/block/elf_glass.png diff --git a/src/main/resources/assets/botania/textures/block/elfglass_pane.png b/src/main/resources/assets/botania/textures/block/elf_glass_pane.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/elfglass_pane.png rename to src/main/resources/assets/botania/textures/block/elf_glass_pane.png