More

2026-10-26 14:24:22 +00:00 · 2016-07-23 20:51:45 -05:00
1 parent 8a13a03016
commit 9f0c710479
@@ -132,8 +132,6 @@ public final class ModelHandler {

        /** ItemBlocks **/
        registerStandardBlocks();
-        registerMushrooms();
-        registerFlowers();
        registerPavement();
        registerStairs();
        registerSlabs();
@@ -291,6 +289,11 @@ public final class ModelHandler {
        registerBlockStandardPath(ModBlocks.corporeaInterceptor);
        registerBlockStandardPath(ModBlocks.corporeaRetainer);
        registerBlockVariant(ModBlocks.dirtPath);
+        registerBlockCustomPathMetas(ModBlocks.doubleFlower1, 8, i -> "double_flower_" + EnumDyeColor.byMetadata(i).getName());
+        Item item = Item.getItemFromBlock(ModBlocks.doubleFlower2); // todo make this look pretty :(
+        for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) {
+            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/double_flower_" + color.getName(), "inventory"));
+        }
        registerBlockStandardPath(ModBlocks.distributor);
        registerBlockStandardPath(ModBlocks.elfGlass);
        registerBlockStandardPath(ModBlocks.enchantedSoil);
@@ -298,6 +301,7 @@ public final class ModelHandler {
        registerBlockStandardPath(ModBlocks.enderEye);
        registerBlockStandardPath(ModBlocks.felPumpkin);
        registerBlockStandardPath(ModBlocks.floatingSpecialFlower);
+        registerBlockCustomPathMetas(ModBlocks.flower, EnumDyeColor.values().length, i -> "flower_" + EnumDyeColor.byMetadata(i).getName());
        registerBlockVariant(ModBlocks.forestEye);
        registerBlockStandardPath(ModBlocks.ghostRail);
        registerBlockStandardPath(ModBlocks.incensePlate);
@@ -306,6 +310,7 @@ public final class ModelHandler {
        registerBlockStandardPath(ModBlocks.manaDetector);
        registerBlockStandardPath(ModBlocks.manaGlass);
        registerBlockStandardPath(ModBlocks.manaVoid);
+        registerBlockCustomPathMetas(ModBlocks.mushroom, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName());
        registerBlockStandardPath(ModBlocks.prism);
        registerBlockStandardPath(ModBlocks.pistonRelay);
        registerBlockStandardPath(ModBlocks.pump);
@@ -320,13 +325,14 @@ public final class ModelHandler {
        registerBlockVariant(ModBlocks.runeAltar);
        registerBlockStandardPath(ModBlocks.shimmerrock);
        registerBlockStandardPath(ModBlocks.shimmerwoodPlanks);
+        registerBlockCustomPathMetas(ModBlocks.shinyFlower, EnumDyeColor.values().length, i -> "glimmering_flower_" + EnumDyeColor.byMetadata(i).getName());
        registerBlockVariant(ModBlocks.sparkChanger, "powered=false");
        registerBlockVariant(ModBlocks.spawnerClaw);
        registerBlockStandardPath(ModBlocks.specialFlower);
        registerBlockVariant(ModBlocks.starfield, "powered=false");
        registerBlockVariant(ModBlocks.terraPlate);
        registerBlockVariant(ModBlocks.tinyPlanet);
-        registerBlockStandardPath(ModBlocks.tinyPotato);
+        registerBlockVariant(ModBlocks.tinyPotato, "facing=north");
        registerBlockStandardPath(ModBlocks.turntable);

        // Register all metas to variant inventory, so the smartmodel can take over from there. See MiscellaneousIcons
@@ -669,42 +675,6 @@ public final class ModelHandler {
        ModelLoader.setCustomStateMapper(ModBlocks.hourglass, new StateMap.Builder().ignore(BotaniaStateProps.POWERED).build());
    }

-    private static void registerMushrooms() {
-        Item item = Item.getItemFromBlock(ModBlocks.mushroom);
-        for (EnumDyeColor color : EnumDyeColor.values()) {
-            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.mushroom).toString();
-            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName()));
-        }
-    }
-
-    private static void registerFlowers() {
-        Item item = Item.getItemFromBlock(ModBlocks.flower);
-        for (EnumDyeColor color : EnumDyeColor.values()) {
-            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.flower).toString();
-            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName()));
-        }
-
-        item = Item.getItemFromBlock(ModBlocks.shinyFlower);
-        for (EnumDyeColor color : EnumDyeColor.values()) {
-            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.shinyFlower).toString();
-            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, "inventory_" + color.getName()));
-        }
-
-        item = Item.getItemFromBlock(ModBlocks.doubleFlower1);
-        for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1.getAllowedValues()) {
-            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.doubleFlower1).toString();
-            String variant = "inventory_" + color.getName();
-            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata(), new ModelResourceLocation(name, variant));
-        }
-
-        item = Item.getItemFromBlock(ModBlocks.doubleFlower2);
-        for (EnumDyeColor color : BotaniaStateProps.DOUBLEFLOWER_VARIANT_2.getAllowedValues()) {
-            String name = ForgeRegistries.BLOCKS.getKey(ModBlocks.doubleFlower2).toString();
-            String variant = "inventory_" + color.getName();
-            ModelLoader.setCustomModelResourceLocation(item, color.getMetadata() - 8, new ModelResourceLocation(name, variant));
-        }
-    }
-
    private static void registerPavement() {
        Item item = Item.getItemFromBlock(ModFluffBlocks.pavement);
        String name = ForgeRegistries.BLOCKS.getKey(ModFluffBlocks.pavement).toString();
@@ -893,7 +863,7 @@ public final class ModelHandler {

    // Registers the ItemBlock to models/item/<registryname>#inventory
    private static void registerBlockStandardPath(Block b) {
-        registerItemModel(Item.getItemFromBlock(b));
+        registerBlockVariant(b, "inventory");
    }

    // Registers the ItemBlock to a custom path in models/item/itemblock/
@@ -19,47 +19,6 @@
    "df_variant=pink,half=lower": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }],
    "df_variant=pink,half=upper": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }],
    "df_variant=gray,half=lower": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }],
-    "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }],
-
-    "inventory_white": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower0Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_orange": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower1Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_magenta": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower2Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_light_blue": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower3Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_yellow": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower4Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_lime": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower5Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_pink": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower6Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_gray": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower7Tall1" },
-      "transform": "forge:default-item"
-    }]
+    "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }]
  }
 }
@@ -19,47 +19,6 @@
    "df_variant=red,half=lower": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }],
    "df_variant=red,half=upper": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }],
    "df_variant=black,half=lower": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }],
-    "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }],
-
-    "inventory_silver": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower8Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_cyan": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower9Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_purple": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower10Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_blue": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower11Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_brown": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower12Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_green": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower13Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_red": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower14Tall1" },
-      "transform": "forge:default-item"
-    }],
-    "inventory_black": [{
-      "model": "builtin/generated",
-      "textures": { "layer0": "botania:blocks/flower15Tall1" },
-      "transform": "forge:default-item"
-    }]
+    "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }]
  }
 }
@@ -1,43 +1,20 @@
 {
-  "forge_marker": 1,
-  "defaults": {
-    "model": "minecraft:cross"
-  },
  "variants": {
-    "color": {
-      "white": { "textures": { "cross": "botania:blocks/flower0" } },
-      "orange": { "textures": { "cross": "botania:blocks/flower1" } },
-      "magenta": { "textures": { "cross": "botania:blocks/flower2" } },
-      "light_blue": { "textures": { "cross": "botania:blocks/flower3" } },
-      "yellow": { "textures": { "cross": "botania:blocks/flower4" } },
-      "lime": { "textures": { "cross": "botania:blocks/flower5" } },
-      "pink": { "textures": { "cross": "botania:blocks/flower6" } },
-      "gray": { "textures": { "cross": "botania:blocks/flower7" } },
-      "silver": { "textures": { "cross": "botania:blocks/flower8" } },
-      "cyan": { "textures": { "cross": "botania:blocks/flower9" } },
-      "purple": { "textures": { "cross": "botania:blocks/flower10" } },
-      "blue": { "textures": { "cross": "botania:blocks/flower11" } },
-      "brown": { "textures": { "cross": "botania:blocks/flower12" } },
-      "green": { "textures": { "cross": "botania:blocks/flower13" } },
-      "red": { "textures": { "cross": "botania:blocks/flower14" } },
-      "black": { "textures": { "cross": "botania:blocks/flower15" } }
-    },
-    
-    "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower0" } }],
-    "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower1" } }],
-    "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower2" } }],
-    "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower3" } }],
-    "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower4" } }],
-    "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower5" } }],
-    "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower6" } }],
-    "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower7" } }],
-    "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower8" } }],
-    "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower9" } }],
-    "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower10" } }],
-    "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower11" } }],
-    "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower12" } }],
-    "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower13" } }],
-    "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower14" } }],
-    "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flower15" } }]
+    "color=white": { "model": "botania:flower_white" },
+    "color=orange": { "model": "botania:flower_orange" },
+    "color=magenta": { "model": "botania:flower_magenta" },
+    "color=light_blue": { "model": "botania:flower_light_blue" },
+    "color=yellow": { "model": "botania:flower_yellow" },
+    "color=lime": { "model": "botania:flower_lime" },
+    "color=pink": { "model": "botania:flower_pink" },
+    "color=gray": { "model": "botania:flower_gray" },
+    "color=silver": { "model": "botania:flower_silver" },
+    "color=cyan": { "model": "botania:flower_cyan" },
+    "color=purple": { "model": "botania:flower_purple" },
+    "color=blue": { "model": "botania:flower_blue" },
+    "color=brown": { "model": "botania:flower_brown" },
+    "color=green": { "model": "botania:flower_green" },
+    "color=red": { "model": "botania:flower_red" },
+    "color=black": { "model": "botania:flower_black" }
  }
 }
@@ -1,43 +1,20 @@
 {
-  "forge_marker": 1,
-  "defaults": {
-    "model": "minecraft:cross"
-  },
  "variants": {
-    "color": {
-      "white": { "textures": { "cross": "botania:blocks/mushroom0" } },
-      "orange": { "textures": { "cross": "botania:blocks/mushroom1" } },
-      "magenta": { "textures": { "cross": "botania:blocks/mushroom2" } },
-      "light_blue": { "textures": { "cross": "botania:blocks/mushroom3" } },
-      "yellow": { "textures": { "cross": "botania:blocks/mushroom4" } },
-      "lime": { "textures": { "cross": "botania:blocks/mushroom5" } },
-      "pink": { "textures": { "cross": "botania:blocks/mushroom6" } },
-      "gray": { "textures": { "cross": "botania:blocks/mushroom7" } },
-      "silver": { "textures": { "cross": "botania:blocks/mushroom8" } },
-      "cyan": { "textures": { "cross": "botania:blocks/mushroom9" } },
-      "purple": { "textures": { "cross": "botania:blocks/mushroom10" } },
-      "blue": { "textures": { "cross": "botania:blocks/mushroom11" } },
-      "brown": { "textures": { "cross": "botania:blocks/mushroom12" } },
-      "green": { "textures": { "cross": "botania:blocks/mushroom13" } },
-      "red": { "textures": { "cross": "botania:blocks/mushroom14" } },
-      "black": { "textures": { "cross": "botania:blocks/mushroom15" } }
-    },
-
-    "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom0" } }],
-    "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom1" } }],
-    "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom2" } }],
-    "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom3" } }],
-    "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom4" } }],
-    "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom5" } }],
-    "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom6" } }],
-    "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom7" } }],
-    "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom8" } }],
-    "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom9" } }],
-    "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom10" } }],
-    "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom11" } }],
-    "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom12" } }],
-    "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom13" } }],
-    "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom14" } }],
-    "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/mushroom15" } }]
+    "color=white": { "model": "botania:mushroom_white" },
+    "color=orange": { "model": "botania:mushroom_orange" },
+    "color=magenta": { "model": "botania:mushroom_magenta" },
+    "color=light_blue": { "model": "botania:mushroom_light_blue" },
+    "color=yellow": { "model": "botania:mushroom_yellow" },
+    "color=lime": { "model": "botania:mushroom_lime" },
+    "color=pink": { "model": "botania:mushroom_pink" },
+    "color=gray": { "model": "botania:mushroom_gray" },
+    "color=silver": { "model": "botania:mushroom_silver" },
+    "color=cyan": { "model": "botania:mushroom_cyan" },
+    "color=purple": { "model": "botania:mushroom_purple" },
+    "color=blue": { "model": "botania:mushroom_blue" },
+    "color=brown": { "model": "botania:mushroom_brown" },
+    "color=green": { "model": "botania:mushroom_green" },
+    "color=red": { "model": "botania:mushroom_red" },
+    "color=black": { "model": "botania:mushroom_black" }
  }
 }
@@ -1,43 +1,20 @@
 {
-  "forge_marker": 1,
-  "defaults": {
-    "model": "minecraft:cross"
-  },
  "variants": {
-    "color": {
-      "white": { "textures": { "cross": "botania:blocks/flowerGlimmering0" } },
-      "orange": { "textures": { "cross": "botania:blocks/flowerGlimmering1" } },
-      "magenta": { "textures": { "cross": "botania:blocks/flowerGlimmering2" } },
-      "light_blue": { "textures": { "cross": "botania:blocks/flowerGlimmering3" } },
-      "yellow": { "textures": { "cross": "botania:blocks/flowerGlimmering4" } },
-      "lime": { "textures": { "cross": "botania:blocks/flowerGlimmering5" } },
-      "pink": { "textures": { "cross": "botania:blocks/flowerGlimmering6" } },
-      "gray": { "textures": { "cross": "botania:blocks/flowerGlimmering7" } },
-      "silver": { "textures": { "cross": "botania:blocks/flowerGlimmering8" } },
-      "cyan": { "textures": { "cross": "botania:blocks/flowerGlimmering9" } },
-      "purple": { "textures": { "cross": "botania:blocks/flowerGlimmering10" } },
-      "blue": { "textures": { "cross": "botania:blocks/flowerGlimmering11" } },
-      "brown": { "textures": { "cross": "botania:blocks/flowerGlimmering12" } },
-      "green": { "textures": { "cross": "botania:blocks/flowerGlimmering13" } },
-      "red": { "textures": { "cross": "botania:blocks/flowerGlimmering14" } },
-      "black": { "textures": { "cross": "botania:blocks/flowerGlimmering15" } }
-    },
-
-    "inventory_white": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering0" } }],
-    "inventory_orange": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering1" } }],
-    "inventory_magenta": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering2" } }],
-    "inventory_light_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering3" } }],
-    "inventory_yellow": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering4" } }],
-    "inventory_lime": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering5" } }],
-    "inventory_pink": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering6" } }],
-    "inventory_gray": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering7" } }],
-    "inventory_silver": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering8" } }],
-    "inventory_cyan": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering9" } }],
-    "inventory_purple": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering10" } }],
-    "inventory_blue": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering11" } }],
-    "inventory_brown": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering12" } }],
-    "inventory_green": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering13" } }],
-    "inventory_red": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering14" } }],
-    "inventory_black": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { "layer0": "botania:blocks/flowerGlimmering15" } }]
+    "color=white": { "model": "botania:glimmering_flower_white" },
+    "color=orange": { "model": "botania:glimmering_flower_orange" },
+    "color=magenta": { "model": "botania:glimmering_flower_magenta" },
+    "color=light_blue": { "model": "botania:glimmering_flower_light_blue" },
+    "color=yellow": { "model": "botania:glimmering_flower_yellow" },
+    "color=lime": { "model": "botania:glimmering_flower_lime" },
+    "color=pink": { "model": "botania:glimmering_flower_pink" },
+    "color=gray": { "model": "botania:glimmering_flower_gray" },
+    "color=silver": { "model": "botania:glimmering_flower_silver" },
+    "color=cyan": { "model": "botania:glimmering_flower_cyan" },
+    "color=purple": { "model": "botania:glimmering_flower_purple" },
+    "color=blue": { "model": "botania:glimmering_flower_blue" },
+    "color=brown": { "model": "botania:glimmering_flower_brown" },
+    "color=green": { "model": "botania:glimmering_flower_green" },
+    "color=red": { "model": "botania:glimmering_flower_red" },
+    "color=black": { "model": "botania:glimmering_flower_black" }
  }
 }
@@ -1,19 +1,8 @@
 {
-  "forge_marker": 1,
-  "defaults": {
-    "model": "botania:tiny_potato",
-    "textures": {
-      "all": "botania:model/tinyPotatoCopy"
-    },
-    "transform": "forge:default-block"
-  },
  "variants": {
-    "facing": {
-      "north": {},
-      "south": { "y": 180 },
-      "west": { "y": 270 },
-      "east": { "y": 90 }
-    },
-    "inventory": [{}]
+    "facing=north": { "model": "botania:tiny_potato" },
+    "facing=south": { "model": "botania:tiny_potato", "y": 180 },
+    "facing=west": { "model": "botania:tiny_potato", "y": 270 },
+    "facing=east": { "model": "botania:tiny_potato", "y": 90 }
  }
 }
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower15"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower11"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower12"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower9"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower7"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower13"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower3"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower5"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower2"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower6"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower10"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower14"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower8"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower0"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flower4"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering15"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering11"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering12"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering9"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering7"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering13"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering3"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering5"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering2"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering6"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering10"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering14"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering8"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering0"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/flowerGlimmering4"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom15"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom11"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom12"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom9"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom7"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom13"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom3"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom5"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom2"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom6"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom10"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom14"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom8"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom0"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "botania:blocks/mushroom4"
+  }
+}
@@ -1,6 +1,8 @@
 {
+  "parent": "minecraft:block/block",
  "textures": {
-    "particle": "minecraft:blocks/hardened_clay"
+    "all": "botania:model/tinyPotatoCopy",
+    "particle": "botania:model/tinyPotatoCopy"
  },
  "elements": [
    {
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower15Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower11Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower12Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower9Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower7Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower13Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower3Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower5Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower2Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower1Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower6Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower10Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower14Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower8Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower0Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower4Tall1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower15"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower11"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower12"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower9"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower7"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower13"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower3"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower5"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower2"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower6"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower10"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower14"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower8"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower0"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flower4"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering15"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering11"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering12"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering9"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering7"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering13"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering3"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering5"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering2"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering1"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering6"
+  }
+}
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "botania:blocks/flowerGlimmering10"
+  }
+}