From 6f3b9f405652ad015a5a59e2099155407baee110 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jul 2020 10:56:49 -0500 Subject: [PATCH] Datagenerate apothecary block models --- .../botania/models/block/apothecary_default.json | 8 ++++++++ .../botania/models/block/apothecary_desert.json | 8 ++++++++ .../botania/models/block/apothecary_forest.json | 8 ++++++++ .../botania/models/block/apothecary_fungal.json | 8 ++++++++ .../botania/models/block/apothecary_mesa.json | 8 ++++++++ .../botania/models/block/apothecary_mossy.json | 8 ++++++++ .../botania/models/block/apothecary_mountain.json | 8 ++++++++ .../botania/models/block/apothecary_plains.json | 8 ++++++++ .../botania/models/block/apothecary_swamp.json | 8 ++++++++ .../botania/models/block/apothecary_taiga.json | 8 ++++++++ .../vazkii/botania/data/BlockstateProvider.java | 9 +++++++++ .../botania/models/block/apothecary_default.json | 10 ---------- .../botania/models/block/apothecary_desert.json | 10 ---------- .../botania/models/block/apothecary_forest.json | 10 ---------- .../botania/models/block/apothecary_fungal.json | 10 ---------- .../botania/models/block/apothecary_mesa.json | 10 ---------- .../botania/models/block/apothecary_mossy.json | 10 ---------- .../botania/models/block/apothecary_mountain.json | 10 ---------- .../botania/models/block/apothecary_plains.json | 10 ---------- .../botania/models/block/apothecary_swamp.json | 10 ---------- .../botania/models/block/apothecary_taiga.json | 10 ---------- .../models/block/shapes/petal_apothecary.json | 5 ++++- .../apothecary_default_goblet.png} | Bin .../apothecary_default_side.png} | Bin .../apothecary_default_top_bottom.png} | Bin .../apothecary_desert_goblet.png} | Bin .../apothecary_desert_side.png} | Bin .../apothecary_desert_top_bottom.png} | Bin .../apothecary_forest_goblet.png} | Bin .../apothecary_forest_side.png} | Bin .../apothecary_forest_top_bottom.png} | Bin .../apothecary_fungal_goblet.png} | Bin .../apothecary_fungal_side.png} | Bin .../apothecary_fungal_top_bottom.png} | Bin .../apothecary_mesa_goblet.png} | Bin .../apothecary_mesa_side.png} | Bin .../apothecary_mesa_top_bottom.png} | Bin .../apothecary_mossy_goblet.png} | Bin .../apothecary_mossy_side.png} | Bin .../apothecary_mossy_top_bottom.png} | Bin .../apothecary_mountain_goblet.png} | Bin .../apothecary_mountain_side.png} | Bin .../apothecary_mountain_top_bottom.png} | Bin .../apothecary_plains_goblet.png} | Bin .../apothecary_plains_side.png} | Bin .../apothecary_plains_top_bottom.png} | Bin .../apothecary_swamp_goblet.png} | Bin .../apothecary_swamp_side.png} | Bin .../apothecary_swamp_top_bottom.png} | Bin .../apothecary_taiga_goblet.png} | Bin .../apothecary_taiga_side.png} | Bin .../apothecary_taiga_top_bottom.png} | Bin 52 files changed, 93 insertions(+), 101 deletions(-) create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_default.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_desert.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_forest.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_fungal.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_mesa.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_mossy.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_mountain.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_plains.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_swamp.json create mode 100644 src/generated/resources/assets/botania/models/block/apothecary_taiga.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_default.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_desert.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_forest.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_fungal.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_mesa.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_mossy.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_mountain.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_plains.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_swamp.json delete mode 100644 src/main/resources/assets/botania/models/block/apothecary_taiga.json rename src/main/resources/assets/botania/textures/{model/apothecary/stone_goblet.png => block/apothecary_default_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/stone_side.png => block/apothecary_default_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/stone_top_bottom.png => block/apothecary_default_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/desert_goblet.png => block/apothecary_desert_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/desert_side.png => block/apothecary_desert_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/desert_top_bottom.png => block/apothecary_desert_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/forest_goblet.png => block/apothecary_forest_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/forest_side.png => block/apothecary_forest_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/forest_top_bottom.png => block/apothecary_forest_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/fungal_goblet.png => block/apothecary_fungal_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/fungal_side.png => block/apothecary_fungal_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/fungal_top_bottom.png => block/apothecary_fungal_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mesa_goblet.png => block/apothecary_mesa_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mesa_side.png => block/apothecary_mesa_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mesa_top_bottom.png => block/apothecary_mesa_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mossy_goblet.png => block/apothecary_mossy_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mossy_side.png => block/apothecary_mossy_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mossy_top_bottom.png => block/apothecary_mossy_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mountain_goblet.png => block/apothecary_mountain_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mountain_side.png => block/apothecary_mountain_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/mountain_top_bottom.png => block/apothecary_mountain_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/plains_goblet.png => block/apothecary_plains_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/plains_side.png => block/apothecary_plains_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/plains_top_bottom.png => block/apothecary_plains_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/swamp_goblet.png => block/apothecary_swamp_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/swamp_side.png => block/apothecary_swamp_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/swamp_top_bottom.png => block/apothecary_swamp_top_bottom.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/taiga_goblet.png => block/apothecary_taiga_goblet.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/taiga_side.png => block/apothecary_taiga_side.png} (100%) rename src/main/resources/assets/botania/textures/{model/apothecary/taiga_top_bottom.png => block/apothecary_taiga_top_bottom.png} (100%) diff --git a/src/generated/resources/assets/botania/models/block/apothecary_default.json b/src/generated/resources/assets/botania/models/block/apothecary_default.json new file mode 100644 index 000000000..ac86cb9ae --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_default.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_default_side", + "goblet": "botania:block/apothecary_default_goblet", + "top_bottom": "botania:block/apothecary_default_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_desert.json b/src/generated/resources/assets/botania/models/block/apothecary_desert.json new file mode 100644 index 000000000..63af495d5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_desert.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_desert_side", + "goblet": "botania:block/apothecary_desert_goblet", + "top_bottom": "botania:block/apothecary_desert_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_forest.json b/src/generated/resources/assets/botania/models/block/apothecary_forest.json new file mode 100644 index 000000000..caa18ac11 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_forest.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_forest_side", + "goblet": "botania:block/apothecary_forest_goblet", + "top_bottom": "botania:block/apothecary_forest_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_fungal.json b/src/generated/resources/assets/botania/models/block/apothecary_fungal.json new file mode 100644 index 000000000..f1a24c553 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_fungal.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_fungal_side", + "goblet": "botania:block/apothecary_fungal_goblet", + "top_bottom": "botania:block/apothecary_fungal_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_mesa.json b/src/generated/resources/assets/botania/models/block/apothecary_mesa.json new file mode 100644 index 000000000..31e822ea6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_mesa.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_mesa_side", + "goblet": "botania:block/apothecary_mesa_goblet", + "top_bottom": "botania:block/apothecary_mesa_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_mossy.json b/src/generated/resources/assets/botania/models/block/apothecary_mossy.json new file mode 100644 index 000000000..be89df3de --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_mossy.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_mossy_side", + "goblet": "botania:block/apothecary_mossy_goblet", + "top_bottom": "botania:block/apothecary_mossy_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_mountain.json b/src/generated/resources/assets/botania/models/block/apothecary_mountain.json new file mode 100644 index 000000000..acb2260fa --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_mountain.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_mountain_side", + "goblet": "botania:block/apothecary_mountain_goblet", + "top_bottom": "botania:block/apothecary_mountain_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_plains.json b/src/generated/resources/assets/botania/models/block/apothecary_plains.json new file mode 100644 index 000000000..6c31bda94 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_plains.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_plains_side", + "goblet": "botania:block/apothecary_plains_goblet", + "top_bottom": "botania:block/apothecary_plains_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_swamp.json b/src/generated/resources/assets/botania/models/block/apothecary_swamp.json new file mode 100644 index 000000000..9915d7828 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_swamp.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_swamp_side", + "goblet": "botania:block/apothecary_swamp_goblet", + "top_bottom": "botania:block/apothecary_swamp_top_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/apothecary_taiga.json b/src/generated/resources/assets/botania/models/block/apothecary_taiga.json new file mode 100644 index 000000000..c98d81bd9 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/apothecary_taiga.json @@ -0,0 +1,8 @@ +{ + "parent": "botania:block/shapes/petal_apothecary", + "textures": { + "side": "botania:block/apothecary_taiga_side", + "goblet": "botania:block/apothecary_taiga_goblet", + "top_bottom": "botania:block/apothecary_taiga_top_bottom" + } +} \ 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 2a2acc3be..40bc7bcc2 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -198,6 +198,15 @@ public class BlockstateProvider extends BlockStateProvider { particleOnly(b, wool); }); + takeAll(blocks, b -> b instanceof BlockAltar).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + ModelFile model = models().withExistingParent(name, prefix("block/shapes/petal_apothecary")) + .texture("side", prefix("block/" + name + "_side")) + .texture("goblet", prefix("block/" + name + "_goblet")) + .texture("top_bottom", prefix("block/" + name + "_top_bottom")); + simpleBlock(b, model); + }); + blocks.forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); if (name.contains("quartz") && b instanceof RotatedPillarBlock) { diff --git a/src/main/resources/assets/botania/models/block/apothecary_default.json b/src/main/resources/assets/botania/models/block/apothecary_default.json deleted file mode 100644 index 57e9474cd..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_default.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/stone_side", - "goblet": "botania:model/apothecary/stone_goblet", - "top_bottom": "botania:model/apothecary/stone_top_bottom", - "particle": "botania:model/apothecary/stone_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_desert.json b/src/main/resources/assets/botania/models/block/apothecary_desert.json deleted file mode 100644 index 1739be30e..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_desert.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/desert_side", - "goblet": "botania:model/apothecary/desert_goblet", - "top_bottom": "botania:model/apothecary/desert_top_bottom", - "particle": "botania:model/apothecary/desert_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_forest.json b/src/main/resources/assets/botania/models/block/apothecary_forest.json deleted file mode 100644 index 82cf2612b..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_forest.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/forest_side", - "goblet": "botania:model/apothecary/forest_goblet", - "top_bottom": "botania:model/apothecary/forest_top_bottom", - "particle": "botania:model/apothecary/forest_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_fungal.json b/src/main/resources/assets/botania/models/block/apothecary_fungal.json deleted file mode 100644 index 1d20c7e12..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_fungal.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/fungal_side", - "goblet": "botania:model/apothecary/fungal_goblet", - "top_bottom": "botania:model/apothecary/fungal_top_bottom", - "particle": "botania:model/apothecary/fungal_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_mesa.json b/src/main/resources/assets/botania/models/block/apothecary_mesa.json deleted file mode 100644 index f0453ec81..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_mesa.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/mesa_side", - "goblet": "botania:model/apothecary/mesa_goblet", - "top_bottom": "botania:model/apothecary/mesa_top_bottom", - "particle": "botania:model/apothecary/mesa_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_mossy.json b/src/main/resources/assets/botania/models/block/apothecary_mossy.json deleted file mode 100644 index a15a963a7..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_mossy.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/mossy_side", - "goblet": "botania:model/apothecary/mossy_goblet", - "top_bottom": "botania:model/apothecary/mossy_top_bottom", - "particle": "botania:model/apothecary/mossy_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_mountain.json b/src/main/resources/assets/botania/models/block/apothecary_mountain.json deleted file mode 100644 index f0e39848a..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_mountain.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/mountain_side", - "goblet": "botania:model/apothecary/mountain_goblet", - "top_bottom": "botania:model/apothecary/mountain_top_bottom", - "particle": "botania:model/apothecary/mountain_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_plains.json b/src/main/resources/assets/botania/models/block/apothecary_plains.json deleted file mode 100644 index 453e4e394..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_plains.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/plains_side", - "goblet": "botania:model/apothecary/plains_goblet", - "top_bottom": "botania:model/apothecary/plains_top_bottom", - "particle": "botania:model/apothecary/plains_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_swamp.json b/src/main/resources/assets/botania/models/block/apothecary_swamp.json deleted file mode 100644 index 814636676..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_swamp.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/swamp_side", - "goblet": "botania:model/apothecary/swamp_goblet", - "top_bottom": "botania:model/apothecary/swamp_top_bottom", - "particle": "botania:model/apothecary/swamp_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecary_taiga.json b/src/main/resources/assets/botania/models/block/apothecary_taiga.json deleted file mode 100644 index ed83f979a..000000000 --- a/src/main/resources/assets/botania/models/block/apothecary_taiga.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", - "parent": "botania:block/shapes/petal_apothecary", - "textures": { - "side": "botania:model/apothecary/taiga_side", - "goblet": "botania:model/apothecary/taiga_goblet", - "top_bottom": "botania:model/apothecary/taiga_top_bottom", - "particle": "botania:model/apothecary/taiga_top_bottom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json b/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json index 40f94312a..6dfb2f4c6 100644 --- a/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json +++ b/src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json @@ -1,6 +1,9 @@ { "Comment": "Designed by Wiiv with Cubik Studio - https://cubik.studio", "parent": "minecraft:block/block", + "textures": { + "particle": "#top_bottom" + }, "elements": [ { "comment": "baseBottom", @@ -114,4 +117,4 @@ "scale": [ 0.55, 0.55, 0.55 ] } } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/textures/model/apothecary/stone_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_default_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/stone_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_default_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/stone_side.png b/src/main/resources/assets/botania/textures/block/apothecary_default_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/stone_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_default_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/stone_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_default_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/stone_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_default_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/desert_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_desert_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/desert_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_desert_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/desert_side.png b/src/main/resources/assets/botania/textures/block/apothecary_desert_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/desert_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_desert_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/desert_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_desert_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/desert_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_desert_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/forest_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_forest_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/forest_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_forest_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/forest_side.png b/src/main/resources/assets/botania/textures/block/apothecary_forest_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/forest_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_forest_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/forest_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_forest_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/forest_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_forest_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/fungal_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_fungal_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/fungal_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_fungal_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/fungal_side.png b/src/main/resources/assets/botania/textures/block/apothecary_fungal_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/fungal_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_fungal_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/fungal_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_fungal_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/fungal_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_fungal_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mesa_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_mesa_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mesa_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_mesa_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mesa_side.png b/src/main/resources/assets/botania/textures/block/apothecary_mesa_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mesa_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_mesa_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mesa_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_mesa_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mesa_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_mesa_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mossy_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_mossy_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mossy_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_mossy_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mossy_side.png b/src/main/resources/assets/botania/textures/block/apothecary_mossy_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mossy_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_mossy_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mossy_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_mossy_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mossy_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_mossy_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mountain_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_mountain_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mountain_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_mountain_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mountain_side.png b/src/main/resources/assets/botania/textures/block/apothecary_mountain_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mountain_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_mountain_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/mountain_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_mountain_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/mountain_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_mountain_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/plains_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_plains_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/plains_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_plains_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/plains_side.png b/src/main/resources/assets/botania/textures/block/apothecary_plains_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/plains_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_plains_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/plains_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_plains_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/plains_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_plains_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/swamp_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_swamp_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/swamp_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_swamp_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/swamp_side.png b/src/main/resources/assets/botania/textures/block/apothecary_swamp_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/swamp_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_swamp_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/swamp_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_swamp_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/swamp_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_swamp_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/taiga_goblet.png b/src/main/resources/assets/botania/textures/block/apothecary_taiga_goblet.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/taiga_goblet.png rename to src/main/resources/assets/botania/textures/block/apothecary_taiga_goblet.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/taiga_side.png b/src/main/resources/assets/botania/textures/block/apothecary_taiga_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/taiga_side.png rename to src/main/resources/assets/botania/textures/block/apothecary_taiga_side.png diff --git a/src/main/resources/assets/botania/textures/model/apothecary/taiga_top_bottom.png b/src/main/resources/assets/botania/textures/block/apothecary_taiga_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/apothecary/taiga_top_bottom.png rename to src/main/resources/assets/botania/textures/block/apothecary_taiga_top_bottom.png