More model cleanup

src/main/java/vazkii/botania/client/core/handler/ModelHandler.java

@@ -114,6 +114,7 @@ import vazkii.botania.common.lib.LibMisc;
 import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.IntFunction;
 
 import static vazkii.botania.common.item.ModItems.*;
 
@@ -138,7 +139,6 @@ public final class ModelHandler {
         registerSlabs();
         registerWalls();
         registerPanes();
-        registerAltars();
         registerQuartzBlocks();
         registerLuminizers();
 
@@ -281,6 +281,8 @@ public final class ModelHandler {
     private static void registerStandardBlocks() {
         registerItemModel(ModBlocks.alchemyCatalyst);
         registerItemModel(ModBlocks.alfPortal);
+        // Off by one on purpose to exclude MOSSY
+        registerBlockAllMetaNames(ModBlocks.altar, AltarVariant.values().length - 1, i -> AltarVariant.values()[i].getName() + "_apothecary");
         registerItemModel(ModBlocks.bifrost);
         registerItemModel(ModBlocks.bifrostPerm);
         registerItemModel(ModBlocks.blazeBlock);
@@ -321,11 +323,11 @@ public final class ModelHandler {
         registerBlock(ModBlocks.runeAltar, "runic_altar");
         registerItemModel(ModBlocks.shimmerrock);
         registerItemModel(ModBlocks.shimmerwoodPlanks);
-        registerItemModel(ModBlocks.sparkChanger);
+        registerBlock(ModBlocks.sparkChanger, "spark_tinkerer");
         registerBlock(ModBlocks.spawnerClaw, "life_imbuer");
         registerItemModel(ModBlocks.specialFlower);
         registerItemModel(ModBlocks.starfield);
-        registerItemModel(ModBlocks.terraPlate);
+        registerBlock(ModBlocks.terraPlate, "terra_plate");
         registerItemModel(ModBlocks.tinyPlanet);
         registerItemModel(ModBlocks.tinyPotato);
         registerItemModel(ModBlocks.turntable);
@@ -335,7 +337,7 @@ public final class ModelHandler {
 
         // Item models which all use the same base model and recolored by render layer
         registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.manaBeacon), EnumDyeColor.values().length);
-        registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length);
+        registerBlockAllMeta(ModBlocks.petalBlock, EnumDyeColor.values().length, "petal_block");
         registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length);
 
         // Blocks which share models with their item, and have only one variant to switch over
@@ -822,15 +824,6 @@ public final class ModelHandler {
         registerItemModel(ModFluffBlocks.managlassPane);
     }
 
-    private static void registerAltars() {
-        Item item = Item.getItemFromBlock(ModBlocks.altar);
-        String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.altar).toString();
-        for (int i = 0; i < AltarVariant.values().length - 1; i++) { // Off by one on purpose to exclude MOSSY
-            String variantName = "variant=" + AltarVariant.values()[i].getName();
-            ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName));
-        }
-    }
-
     private static void registerQuartzBlocks() {
         for (Block b : Lists.newArrayList(ModFluffBlocks.blazeQuartz, ModFluffBlocks.darkQuartz, ModFluffBlocks.elfQuartz, ModFluffBlocks.lavenderQuartz, ModFluffBlocks.manaQuartz, ModFluffBlocks.redQuartz, ModFluffBlocks.sunnyQuartz)) {
             if (b == null) // Dark quartz disabled
@@ -884,9 +877,21 @@ public final class ModelHandler {
     }
 
     private static void registerBlock(Block b, String name) {
-        ModelLoader.setCustomModelResourceLocation(
-                Item.getItemFromBlock(b), 0,
-                new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + name, "inventory"));
+        registerBlockAllMeta(b, 1, name);
+    }
+
+    private static void registerBlockAllMeta(Block b, int maxExclusive, String name) {
+        registerBlockAllMetaNames(b, maxExclusive, i -> name);
+    }
+
+    private static void registerBlockAllMetaNames(Block b, int maxExclusive, IntFunction<String> metaToName) {
+        Item item = Item.getItemFromBlock(b);
+        for (int i = 0; i < maxExclusive; i++) {
+            ModelLoader.setCustomModelResourceLocation(
+                    item, i,
+                    new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToName.apply(i), "inventory")
+            );
+        }
     }
 
     private static void registerItemModel(Block b) {

src/main/resources/assets/botania/blockstates/agricarnation.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/agricarnation"
       }

src/main/resources/assets/botania/blockstates/agricarnationChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/agricarnationChibi"
       }

src/main/resources/assets/botania/blockstates/altar.json

@@ -1,211 +1,14 @@
 {
-  "__comment": "The texture is split apart to facilitate efficient use of the atlas. Sorry for the clutter!",
-  "forge_marker": 1,
-  "defaults": {
-    "model": "botania:altar"
-  },
   "variants": {
-    "variant": {
-      "default": { "textures": {
-        "gobletbaseside": "botania:model/altar/default/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/default/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/default/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/default/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/default/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/default/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/default/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/default/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/default/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/default/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/default/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/default/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/default/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/default/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/default/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/default/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/default/kelkWall",
-        "particle": "minecraft:blocks/cobblestone"
-      }},
-      "forest": { "textures": {
-        "gobletbaseside": "botania:model/altar/forest/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/forest/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/forest/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/forest/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/forest/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/forest/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/forest/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/forest/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/forest/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/forest/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/forest/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/forest/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/forest/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/forest/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/forest/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/forest/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/forest/kelkWall",
-        "particle": "botania:blocks/biomeStone0"
-      }},
-      "plains": { "textures": {
-        "gobletbaseside": "botania:model/altar/plains/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/plains/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/plains/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/plains/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/plains/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/plains/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/plains/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/plains/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/plains/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/plains/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/plains/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/plains/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/plains/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/plains/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/plains/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/plains/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/plains/kelkWall",
-        "particle": "botania:blocks/biomeStone1"
-      }},
-      "mountain": { "textures": {
-        "gobletbaseside": "botania:model/altar/mountain/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/mountain/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/mountain/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/mountain/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/mountain/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/mountain/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/mountain/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/mountain/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/mountain/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/mountain/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/mountain/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/mountain/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/mountain/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/mountain/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/mountain/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/mountain/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/mountain/kelkWall",
-        "particle": "botania:blocks/biomeStone2"
-      }},
-      "fungal": { "textures": {
-        "gobletbaseside": "botania:model/altar/fungal/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/fungal/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/fungal/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/fungal/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/fungal/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/fungal/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/fungal/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/fungal/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/fungal/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/fungal/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/fungal/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/fungal/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/fungal/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/fungal/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/fungal/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/fungal/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/fungal/kelkWall",
-        "particle": "botania:blocks/biomeStone3"
-      }},
-      "swamp": { "textures": {
-        "gobletbaseside": "botania:model/altar/swamp/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/swamp/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/swamp/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/swamp/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/swamp/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/swamp/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/swamp/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/swamp/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/swamp/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/swamp/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/swamp/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/swamp/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/swamp/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/swamp/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/swamp/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/swamp/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/swamp/kelkWall",
-        "particle": "botania:blocks/biomeStone4"
-      }},
-      "desert": { "textures": {
-        "gobletbaseside": "botania:model/altar/desert/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/desert/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/desert/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/desert/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/desert/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/desert/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/desert/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/desert/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/desert/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/desert/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/desert/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/desert/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/desert/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/desert/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/desert/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/desert/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/desert/kelkWall",
-        "particle": "botania:blocks/biomeStone5"
-      }},
-      "taiga": { "textures": {
-        "gobletbaseside": "botania:model/altar/taiga/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/taiga/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/taiga/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/taiga/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/taiga/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/taiga/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/taiga/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/taiga/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/taiga/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/taiga/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/taiga/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/taiga/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/taiga/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/taiga/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/taiga/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/taiga/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/taiga/kelkWall",
-        "particle": "botania:blocks/biomeStone6"
-      }},
-      "mesa": { "textures": {
-        "gobletbaseside": "botania:model/altar/mesa/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/mesa/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/mesa/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/mesa/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/mesa/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/mesa/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/mesa/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/mesa/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/mesa/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/mesa/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/mesa/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/mesa/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/mesa/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/mesa/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/mesa/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/mesa/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/mesa/kelkWall",
-        "particle": "botania:blocks/biomeStone7"
-      }},
-      "mossy": { "textures": {
-        "gobletbaseside": "botania:model/altar/mossy/gobletBase_sides",
-        "gobletbasetop": "botania:model/altar/mossy/gobletBase_top",
-        "gobletbasebottom": "botania:model/altar/mossy/gobletBase_bottom",
-        "gobletbase2side": "botania:model/altar/mossy/gobletBase2_sides",
-        "gobletbase2top": "botania:model/altar/mossy/gobletBase2_top",
-        "gobletbase2bottom": "botania:model/altar/mossy/gobletBase2_bottom",
-        "gobletbase3side": "botania:model/altar/mossy/gobletBase3_sides",
-        "gobletbase3top": "botania:model/altar/mossy/gobletBase3_top",
-        "gobletbase3bottom": "botania:model/altar/mossy/gobletBase3_bottom",
-        "gobletstandside": "botania:model/altar/mossy/gobletStand_sides",
-        "gobletstandtopbottom": "botania:model/altar/mossy/gobletStand_top_bottom",
-        "kelkbaseside": "botania:model/altar/mossy/kelkBase_sides",
-        "kelkbasetopbottom": "botania:model/altar/mossy/kelkBase_top_bottom",
-        "kelkbase2side": "botania:model/altar/mossy/kelkBase2_sides",
-        "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top",
-        "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom",
-        "kelkwall": "botania:model/altar/mossy/kelkWall",
-        "particle": "minecraft:blocks/cobblestone_mossy"
-      }}
-    }
+    "variant=default": { "model": "botania:default_apothecary" },
+    "variant=forest": { "model": "botania:forest_apothecary" },
+    "variant=plains": { "model": "botania:plains_apothecary" },
+    "variant=mountain": { "model": "botania:mountain_apothecary" },
+    "variant=fungal": { "model": "botania:fungal_apothecary" },
+    "variant=swamp": { "model": "botania:swamp_apothecary" },
+    "variant=desert": { "model": "botania:desert_apothecary" },
+    "variant=taiga": { "model": "botania:taiga_apothecary" },
+    "variant=mesa": { "model": "botania:mesa_apothecary" },
+    "variant=mossy": { "model": "botania:mossy_apothecary" }
   }
 }

src/main/resources/assets/botania/blockstates/arcanerose.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/arcanerose"
       }

src/main/resources/assets/botania/blockstates/bellethorn.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/bellethorn"
       }

src/main/resources/assets/botania/blockstates/bellethornChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/bellethornChibi"
       }

src/main/resources/assets/botania/blockstates/bergamute.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/bergamute"
       }

src/main/resources/assets/botania/blockstates/bubbell.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/bubbell"
       }

src/main/resources/assets/botania/blockstates/bubbellChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/bubbellChibi"
       }

src/main/resources/assets/botania/blockstates/clayconia.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/clayconia"
       }

src/main/resources/assets/botania/blockstates/clayconiaChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/clayconiaChibi"
       }

src/main/resources/assets/botania/blockstates/daffomill.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/daffomill"
       }

src/main/resources/assets/botania/blockstates/dandelifeon.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/dandelifeon"
       }

src/main/resources/assets/botania/blockstates/daybloom.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/daybloom"
       }

src/main/resources/assets/botania/blockstates/daybloomDecor.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/daybloomDecor"
       }

src/main/resources/assets/botania/blockstates/daybloomPrime.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/daybloomPrime"
       }

src/main/resources/assets/botania/blockstates/dreadthorn.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/dreadthorn"
       }

src/main/resources/assets/botania/blockstates/endoflame.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/endoflame"
       }

src/main/resources/assets/botania/blockstates/entropinnyum.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/entropinnyum"
       }

src/main/resources/assets/botania/blockstates/exoflame.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/exoflame"
       }

src/main/resources/assets/botania/blockstates/fallenKanade.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/fallenKanade"
       }

src/main/resources/assets/botania/blockstates/gourmaryllis.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/gourmaryllis"
       }

src/main/resources/assets/botania/blockstates/heiseiDream.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/heiseiDream"
       }

src/main/resources/assets/botania/blockstates/hopperhock.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/hopperhock"
       }

src/main/resources/assets/botania/blockstates/hopperhockChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/hopperhockChibi"
       }

src/main/resources/assets/botania/blockstates/hyacidus.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/hyacidus"
       }

src/main/resources/assets/botania/blockstates/hydroangeas.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/hydroangeas"
       }

src/main/resources/assets/botania/blockstates/hydroangeasDecor.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/hydroangeasDecor"
       }

src/main/resources/assets/botania/blockstates/jadedAmaranthus.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/jadedAmaranthus"
       }

src/main/resources/assets/botania/blockstates/jiyuulia.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/jiyuulia"
       }

src/main/resources/assets/botania/blockstates/kekimurus.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/kekimurus"
       }

src/main/resources/assets/botania/blockstates/loonium.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/loonium"
       }

src/main/resources/assets/botania/blockstates/manastar.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/manastar"
       }

src/main/resources/assets/botania/blockstates/marimorphosis.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/marimorphosis"
       }

src/main/resources/assets/botania/blockstates/marimorphosisChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/marimorphosisChibi"
       }

src/main/resources/assets/botania/blockstates/medumone.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/medumone"
       }

src/main/resources/assets/botania/blockstates/munchdew.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/munchdew"
       }

src/main/resources/assets/botania/blockstates/narslimmus.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/narslimmus"
       }

src/main/resources/assets/botania/blockstates/nightshade.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/nightshade"
       }

src/main/resources/assets/botania/blockstates/nightshadeDecor.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/nightshadeDecor"
       }

src/main/resources/assets/botania/blockstates/nightshadePrime.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/nightshadePrime"
       }

src/main/resources/assets/botania/blockstates/orechid.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/orechid"
       }

src/main/resources/assets/botania/blockstates/orechidIgnem.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/orechidIgnem"
       }

src/main/resources/assets/botania/blockstates/petalBlock.json

@@ -1,15 +1,7 @@
 {
-  "forge_marker": 1,
-  "defaults": {
-    "model": "botania:cube_all_tinted",
-    "textures": {
-      "all": "botania:blocks/petalBlock"
-    }
-  },
   "variants": {
-    "normal": [{}],
-    "inventory": [{
-      "transform": "forge:default-block"
-    }]
+    "normal": {
+      "model": "botania:petal_block"
+    }
   }
 }

src/main/resources/assets/botania/blockstates/pollidisiac.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/pollidisiac"
       }

src/main/resources/assets/botania/blockstates/puredaisy.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/puredaisy"
       }

src/main/resources/assets/botania/blockstates/rafflowsia.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/rafflowsia"
       }

src/main/resources/assets/botania/blockstates/rannuncarpus.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/rannuncarpus"
       }

src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/rannuncarpusChibi"
       }

src/main/resources/assets/botania/blockstates/solegnolia.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/solegnolia"
       }

src/main/resources/assets/botania/blockstates/solegnoliaChibi.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/solegnoliaChibi"
       }

src/main/resources/assets/botania/blockstates/sparkChanger.json

@@ -1,19 +1,6 @@
 {
-  "forge_marker": 1,
-  "defaults": {
-    "model": "botania:threehigh",
-    "textures": {
-      "bottom": "botania:blocks/sparkChanger0",
-      "top": "botania:blocks/sparkChanger1",
-      "side": "botania:blocks/sparkChanger2"
-    },
-    "transform": "forge:default-block"
-  },
   "variants": {
-    "powered": {
-      "true": {},
-      "false": {}
-    },
-    "inventory": [{}]
+    "powered=true":  { "model": "botania:spark_tinkerer" },
+    "powered=false": { "model": "botania:spark_tinkerer" }
   }
 }

src/main/resources/assets/botania/blockstates/spectranthemum.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/spectranthemum"
       }

src/main/resources/assets/botania/blockstates/spectrolus.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/spectrolus"
       }

src/main/resources/assets/botania/blockstates/tangleberrie.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/tangleberrie"
       }

src/main/resources/assets/botania/blockstates/terraPlate.json

@@ -1,16 +1,5 @@
 {
-  "forge_marker": 1,
-  "defaults": {
-    "model": "botania:threehigh",
-    "textures": {
-      "bottom": "botania:blocks/terraPlate0",
-      "top": "botania:blocks/terraPlate1",
-      "side": "botania:blocks/terraPlate2"
-    },
-    "transform": "forge:default-block"
-  },
   "variants": {
-    "normal": [{}],
-    "inventory": [{}]
+    "normal": { "model": "botania:terra_plate" }
   }
 }

src/main/resources/assets/botania/blockstates/thermalily.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/thermalily"
       }

src/main/resources/assets/botania/blockstates/tigerseye.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/tigerseye"
       }

src/main/resources/assets/botania/blockstates/vinculotus.json

@@ -2,7 +2,7 @@
   "forge_marker": 1,
   "variants": {
     "normal": [{
-      "model": "botania:cross_tinted",
+      "model": "botania:shapes/cross_tinted",
       "textures": {
         "cross": "botania:blocks/vinculotus"
       }

src/main/resources/assets/botania/models/block/default_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/default/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/default/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/default/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/default/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/default/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/default/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/default/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/default/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/default/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/default/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/default/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/default/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/default/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/default/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/default/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/default/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/default/kelkWall",
+    "particle": "minecraft:blocks/cobblestone"
+  }
+}

src/main/resources/assets/botania/models/block/desert_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/desert/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/desert/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/desert/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/desert/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/desert/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/desert/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/desert/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/desert/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/desert/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/desert/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/desert/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/desert/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/desert/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/desert/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/desert/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/desert/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/desert/kelkWall",
+    "particle": "botania:blocks/biomeStone5"
+  }
+}

src/main/resources/assets/botania/models/block/forest_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/forest/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/forest/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/forest/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/forest/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/forest/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/forest/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/forest/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/forest/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/forest/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/forest/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/forest/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/forest/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/forest/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/forest/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/forest/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/forest/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/forest/kelkWall",
+    "particle": "botania:blocks/biomeStone0"
+  }
+}

src/main/resources/assets/botania/models/block/fungal_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/fungal/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/fungal/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/fungal/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/fungal/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/fungal/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/fungal/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/fungal/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/fungal/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/fungal/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/fungal/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/fungal/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/fungal/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/fungal/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/fungal/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/fungal/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/fungal/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/fungal/kelkWall",
+    "particle": "botania:blocks/biomeStone3"
+  }
+}

src/main/resources/assets/botania/models/block/mesa_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/mesa/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/mesa/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/mesa/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/mesa/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/mesa/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/mesa/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/mesa/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/mesa/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/mesa/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/mesa/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/mesa/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/mesa/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/mesa/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/mesa/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/mesa/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/mesa/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/mesa/kelkWall",
+    "particle": "botania:blocks/biomeStone7"
+  }
+}

src/main/resources/assets/botania/models/block/mossy_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/mossy/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/mossy/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/mossy/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/mossy/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/mossy/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/mossy/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/mossy/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/mossy/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/mossy/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/mossy/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/mossy/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/mossy/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/mossy/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/mossy/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/mossy/kelkWall",
+    "particle": "minecraft:blocks/cobblestone_mossy"
+  }
+}

src/main/resources/assets/botania/models/block/mountain_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/mountain/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/mountain/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/mountain/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/mountain/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/mountain/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/mountain/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/mountain/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/mountain/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/mountain/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/mountain/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/mountain/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/mountain/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/mountain/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/mountain/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/mountain/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/mountain/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/mountain/kelkWall",
+    "particle": "botania:blocks/biomeStone2"
+  }
+}

src/main/resources/assets/botania/models/block/petalApothecary.json

@@ -1,47 +0,0 @@
-{
-  "textures": {
-    "particle": "#all"
-  },
-  "elements": [
-    {
-      "name": "Base 1",
-      "from": [ 0, 0, 0 ],
-      "to": [ 16, 1, 0 ],
-      "faces": {
-        "down": { "texture": "#all", "uv": [ 16, 0, 31, 15 ], "cullface": "down" },
-        "up": { "texture": "#all", "uv": [ 32, 0, 47, 15 ] },
-        "north": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] },
-        "south": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] },
-        "west": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] },
-        "east": { "texture": "#all", "uv": [ 3, 3, 13, 13 ] }
-      }
-    },
-    {
-      "name": "Base 2"
-    },
-    {
-      "name": "Base 3"
-    },
-    {
-      "name": "Column"
-    },
-    {
-      "name": "Cup Base 1"
-    },
-    {
-      "name": "Cup Base 2"
-    },
-    {
-      "name": "Cup North"
-    },
-    {
-      "name": "Cup South"
-    },
-    {
-      "name": "Cup West"
-    },
-    {
-      "name": "Cup East"
-    }
-  ]
-}

src/main/resources/assets/botania/models/block/petal_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "botania:block/shapes/cube_all_tinted",
+  "textures": {
+    "all": "botania:blocks/petalBlock"
+  }
+}

src/main/resources/assets/botania/models/block/plains_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/plains/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/plains/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/plains/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/plains/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/plains/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/plains/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/plains/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/plains/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/plains/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/plains/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/plains/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/plains/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/plains/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/plains/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/plains/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/plains/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/plains/kelkWall",
+    "particle": "botania:blocks/biomeStone1"
+  }
+}

src/main/resources/assets/botania/models/block/shapes/cube_all_tinted.json

@@ -1,4 +1,5 @@
 {
+  "parent": "minecraft:block/block",
   "textures": {
     "particle": "#all"
   },

src/main/resources/assets/botania/models/block/shapes/petal_apothecary.json

@@ -1,4 +1,5 @@
 {
+  "__comment": "The texture is split apart to facilitate efficient use of the atlas. Sorry for the clutter!",
   "parent": "minecraft:block/block",
   "display": {
     "gui": {

src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json

@@ -1,4 +1,5 @@
 {
+  "parent": "minecraft:block/block",
   "textures": {
     "particle": "#side"
   },

src/main/resources/assets/botania/models/block/spark_tinkerer.json

@@ -0,0 +1,8 @@
+{
+  "parent": "botania:block/shapes/three_high_bottom_top",
+  "textures": {
+    "bottom": "botania:blocks/sparkChanger0",
+    "top": "botania:blocks/sparkChanger1",
+    "side": "botania:blocks/sparkChanger2"
+  }
+}

src/main/resources/assets/botania/models/block/swamp_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/swamp/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/swamp/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/swamp/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/swamp/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/swamp/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/swamp/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/swamp/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/swamp/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/swamp/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/swamp/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/swamp/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/swamp/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/swamp/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/swamp/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/swamp/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/swamp/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/swamp/kelkWall",
+    "particle": "botania:blocks/biomeStone4"
+  }
+}

src/main/resources/assets/botania/models/block/taiga_apothecary.json

@@ -0,0 +1,23 @@
+{
+  "parent": "botania:block/shapes/petal_apothecary",
+  "textures": {
+    "gobletbaseside": "botania:model/altar/taiga/gobletBase_sides",
+    "gobletbasetop": "botania:model/altar/taiga/gobletBase_top",
+    "gobletbasebottom": "botania:model/altar/taiga/gobletBase_bottom",
+    "gobletbase2side": "botania:model/altar/taiga/gobletBase2_sides",
+    "gobletbase2top": "botania:model/altar/taiga/gobletBase2_top",
+    "gobletbase2bottom": "botania:model/altar/taiga/gobletBase2_bottom",
+    "gobletbase3side": "botania:model/altar/taiga/gobletBase3_sides",
+    "gobletbase3top": "botania:model/altar/taiga/gobletBase3_top",
+    "gobletbase3bottom": "botania:model/altar/taiga/gobletBase3_bottom",
+    "gobletstandside": "botania:model/altar/taiga/gobletStand_sides",
+    "gobletstandtopbottom": "botania:model/altar/taiga/gobletStand_top_bottom",
+    "kelkbaseside": "botania:model/altar/taiga/kelkBase_sides",
+    "kelkbasetopbottom": "botania:model/altar/taiga/kelkBase_top_bottom",
+    "kelkbase2side": "botania:model/altar/taiga/kelkBase2_sides",
+    "kelkbase2top": "botania:model/altar/taiga/kelkBase2_top",
+    "kelkbase2bottom": "botania:model/altar/taiga/kelkBase2_bottom",
+    "kelkwall": "botania:model/altar/taiga/kelkWall",
+    "particle": "botania:blocks/biomeStone6"
+  }
+}

src/main/resources/assets/botania/models/block/terra_plate.json

@@ -0,0 +1,8 @@
+{
+  "parent": "botania:block/shapes/three_high_bottom_top",
+  "textures": {
+    "bottom": "botania:blocks/terraPlate0",
+    "top": "botania:blocks/terraPlate1",
+    "side": "botania:blocks/terraPlate2"
+  }
+}

src/main/resources/assets/botania/models/block/wall_inventory_bottom_top.json

@@ -1,46 +0,0 @@
-{
-  "__comment": "Copy of minecraft:wall_inventory with separate bottom and top textures",
-  "parent": "block/block",
-  "display": {
-    "gui": {
-      "rotation": [ 30, 135, 0 ],
-      "translation": [ 0, 0, 0],
-      "scale":[ 0.625, 0.625, 0.625 ]
-    },
-    "fixed": {
-      "rotation": [ 0, 90, 0 ],
-      "translation": [ 0, 0, 0 ],
-      "scale": [ 0.5, 0.5, 0.5 ]
-    }
-  },
-  "ambientocclusion": false,
-  "textures": {
-    "particle": "#side"
-  },
-  "elements": [
-    {
-      "from": [ 4, 0, 4 ],
-      "to": [ 12, 16, 12 ],
-      "faces": {
-        "down":  { "uv": [ 4, 4, 12, 12 ], "texture": "#bottom", "cullface": "down" },
-        "up":    { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
-        "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
-        "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
-        "west":  { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
-        "east":  { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }
-      }
-    },
-    {
-      "from": [ 5, 0, 0 ],
-      "to": [ 11, 13, 16 ],
-      "faces": {
-        "down":  { "uv": [ 5, 0, 11, 16 ], "texture": "#bottom", "cullface": "down" },
-        "up":    { "uv": [ 5, 0, 11, 16 ], "texture": "#top" },
-        "north": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "north" },
-        "south": { "uv": [ 5, 3, 11, 16 ], "texture": "#side", "cullface": "south" },
-        "west":  { "uv": [ 0, 3, 16, 16 ], "texture": "#side" },
-        "east":  { "uv": [ 0, 3, 16, 16 ], "texture": "#side" }
-      }
-    }
-  ]
-}

src/main/resources/assets/botania/models/block/wall_post_bottom_top.json

@@ -1,20 +0,0 @@
-{
-  "__comment": "Copy of minecraft:wall_post with separate top and bottom textures",
-  "textures": {
-    "particle": "#side"
-  },
-  "elements": [
-    {
-      "from": [ 4, 0, 4 ],
-      "to": [ 12, 16, 12 ],
-      "faces": {
-        "down":  { "texture": "#bottom", "cullface": "down" },
-        "up":    { "texture": "#top", "cullface": "up"   },
-        "north": { "texture": "#side" },
-        "south": { "texture": "#side" },
-        "west":  { "texture": "#side" },
-        "east":  { "texture": "#side" }
-      }
-    }
-  ]
-}

src/main/resources/assets/botania/models/block/wall_side_bottom_top.json

@@ -1,19 +0,0 @@
-{
-  "__comment": "Copy of minecraft:wall_side with separate top and bottom textures",
-  "textures": {
-    "particle": "#side"
-  },
-  "elements": [
-    {
-      "from": [ 5, 0, 0 ],
-      "to": [ 11, 14, 8 ],
-      "faces": {
-        "down":  { "texture": "#bottom", "cullface": "down" },
-        "up":    { "texture": "#top" },
-        "north": { "texture": "#side", "cullface": "north" },
-        "west":  { "texture": "#side" },
-        "east":  { "texture": "#side" }
-      }
-    }
-  ]
-}

src/main/resources/assets/botania/models/item/itemblock/default_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/default_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/desert_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/desert_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/forest_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/forest_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/fungal_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/fungal_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/mesa_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/mesa_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/mountain_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/mountain_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/petal_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/petal_block"
+}

src/main/resources/assets/botania/models/item/itemblock/plains_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/plains_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/spark_tinkerer.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/spark_tinkerer"
+}

src/main/resources/assets/botania/models/item/itemblock/swamp_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/swamp_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/taiga_apothecary.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/taiga_apothecary"
+}

src/main/resources/assets/botania/models/item/itemblock/terra_plate.json

@@ -0,0 +1,3 @@
+{
+  "parent": "botania:block/terra_plate"
+}