diff --git a/src/main/resources/assets/botania/models/block/agricarnation.json b/src/main/resources/assets/botania/models/block/agricarnation.json index be5a9fc51..cd554df4b 100644 --- a/src/main/resources/assets/botania/models/block/agricarnation.json +++ b/src/main/resources/assets/botania/models/block/agricarnation.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_agricarnation" } diff --git a/src/main/resources/assets/botania/models/block/agricarnation_chibi.json b/src/main/resources/assets/botania/models/block/agricarnation_chibi.json index 828008826..06feabc55 100644 --- a/src/main/resources/assets/botania/models/block/agricarnation_chibi.json +++ b/src/main/resources/assets/botania/models/block/agricarnation_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_agricarnation_chibi" } diff --git a/src/main/resources/assets/botania/models/block/bellethorn.json b/src/main/resources/assets/botania/models/block/bellethorn.json index 92741cc8f..ba699fd98 100644 --- a/src/main/resources/assets/botania/models/block/bellethorn.json +++ b/src/main/resources/assets/botania/models/block/bellethorn.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_bellethorne" } diff --git a/src/main/resources/assets/botania/models/block/bellethorn_chibi.json b/src/main/resources/assets/botania/models/block/bellethorn_chibi.json index 238b13c6f..1ae8e97d8 100644 --- a/src/main/resources/assets/botania/models/block/bellethorn_chibi.json +++ b/src/main/resources/assets/botania/models/block/bellethorn_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_bellethorne_chibi" } diff --git a/src/main/resources/assets/botania/models/block/bergamute.json b/src/main/resources/assets/botania/models/block/bergamute.json index 3f7f6f436..c4bd80455 100644 --- a/src/main/resources/assets/botania/models/block/bergamute.json +++ b/src/main/resources/assets/botania/models/block/bergamute.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_bergamute" } diff --git a/src/main/resources/assets/botania/models/block/black_double_flower.json b/src/main/resources/assets/botania/models/block/black_double_flower.json index 05e186587..575004c10 100644 --- a/src/main/resources/assets/botania/models/block/black_double_flower.json +++ b/src/main/resources/assets/botania/models/block/black_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower15tall0" } diff --git a/src/main/resources/assets/botania/models/block/black_double_flower_top.json b/src/main/resources/assets/botania/models/block/black_double_flower_top.json index 684a2bb05..00cbf4047 100644 --- a/src/main/resources/assets/botania/models/block/black_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/black_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower15tall1" } diff --git a/src/main/resources/assets/botania/models/block/black_mushroom.json b/src/main/resources/assets/botania/models/block/black_mushroom.json index 83db86449..524765b6c 100644 --- a/src/main/resources/assets/botania/models/block/black_mushroom.json +++ b/src/main/resources/assets/botania/models/block/black_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom15" } diff --git a/src/main/resources/assets/botania/models/block/black_mystical_flower.json b/src/main/resources/assets/botania/models/block/black_mystical_flower.json index 8f6db7d48..f83649dd9 100644 --- a/src/main/resources/assets/botania/models/block/black_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/black_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower15" } diff --git a/src/main/resources/assets/botania/models/block/black_shiny_flower.json b/src/main/resources/assets/botania/models/block/black_shiny_flower.json index df2669955..c779f59e8 100644 --- a/src/main/resources/assets/botania/models/block/black_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/black_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering15" } diff --git a/src/main/resources/assets/botania/models/block/blue_double_flower.json b/src/main/resources/assets/botania/models/block/blue_double_flower.json index 93b1cba80..5490569aa 100644 --- a/src/main/resources/assets/botania/models/block/blue_double_flower.json +++ b/src/main/resources/assets/botania/models/block/blue_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower11tall0" } diff --git a/src/main/resources/assets/botania/models/block/blue_double_flower_top.json b/src/main/resources/assets/botania/models/block/blue_double_flower_top.json index c209a00d9..a38ec5885 100644 --- a/src/main/resources/assets/botania/models/block/blue_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/blue_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower11tall1" } diff --git a/src/main/resources/assets/botania/models/block/blue_mushroom.json b/src/main/resources/assets/botania/models/block/blue_mushroom.json index b03f01ccf..d24e4313d 100644 --- a/src/main/resources/assets/botania/models/block/blue_mushroom.json +++ b/src/main/resources/assets/botania/models/block/blue_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom11" } diff --git a/src/main/resources/assets/botania/models/block/blue_mystical_flower.json b/src/main/resources/assets/botania/models/block/blue_mystical_flower.json index 606db28b9..e6c0202ea 100644 --- a/src/main/resources/assets/botania/models/block/blue_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/blue_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower11" } diff --git a/src/main/resources/assets/botania/models/block/blue_shiny_flower.json b/src/main/resources/assets/botania/models/block/blue_shiny_flower.json index 964a12658..b6195eb97 100644 --- a/src/main/resources/assets/botania/models/block/blue_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/blue_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering11" } diff --git a/src/main/resources/assets/botania/models/block/brown_double_flower.json b/src/main/resources/assets/botania/models/block/brown_double_flower.json index a65ba1cc3..ce0859320 100644 --- a/src/main/resources/assets/botania/models/block/brown_double_flower.json +++ b/src/main/resources/assets/botania/models/block/brown_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower12tall0" } diff --git a/src/main/resources/assets/botania/models/block/brown_double_flower_top.json b/src/main/resources/assets/botania/models/block/brown_double_flower_top.json index 1ed5d6f75..f7dd2f383 100644 --- a/src/main/resources/assets/botania/models/block/brown_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/brown_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower12tall1" } diff --git a/src/main/resources/assets/botania/models/block/brown_mushroom.json b/src/main/resources/assets/botania/models/block/brown_mushroom.json index 96598143c..c43c412db 100644 --- a/src/main/resources/assets/botania/models/block/brown_mushroom.json +++ b/src/main/resources/assets/botania/models/block/brown_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom12" } diff --git a/src/main/resources/assets/botania/models/block/brown_mystical_flower.json b/src/main/resources/assets/botania/models/block/brown_mystical_flower.json index 7fb9c446c..e5cb8520e 100644 --- a/src/main/resources/assets/botania/models/block/brown_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/brown_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower12" } diff --git a/src/main/resources/assets/botania/models/block/brown_shiny_flower.json b/src/main/resources/assets/botania/models/block/brown_shiny_flower.json index 8d0da04a3..7b587b359 100644 --- a/src/main/resources/assets/botania/models/block/brown_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/brown_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering12" } diff --git a/src/main/resources/assets/botania/models/block/bubbell.json b/src/main/resources/assets/botania/models/block/bubbell.json index 15812f477..d1f6cca5a 100644 --- a/src/main/resources/assets/botania/models/block/bubbell.json +++ b/src/main/resources/assets/botania/models/block/bubbell.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_bubbell" } diff --git a/src/main/resources/assets/botania/models/block/bubbell_chibi.json b/src/main/resources/assets/botania/models/block/bubbell_chibi.json index 0a2a6db24..962d3b438 100644 --- a/src/main/resources/assets/botania/models/block/bubbell_chibi.json +++ b/src/main/resources/assets/botania/models/block/bubbell_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_bubbell_chibi" } diff --git a/src/main/resources/assets/botania/models/block/clayconia.json b/src/main/resources/assets/botania/models/block/clayconia.json index 17ef72a68..9d008ebad 100644 --- a/src/main/resources/assets/botania/models/block/clayconia.json +++ b/src/main/resources/assets/botania/models/block/clayconia.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_clayconia" } diff --git a/src/main/resources/assets/botania/models/block/clayconia_chibi.json b/src/main/resources/assets/botania/models/block/clayconia_chibi.json index ddbd5eb87..6cc7ffa80 100644 --- a/src/main/resources/assets/botania/models/block/clayconia_chibi.json +++ b/src/main/resources/assets/botania/models/block/clayconia_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_clayconia_chibi" } diff --git a/src/main/resources/assets/botania/models/block/cyan_double_flower.json b/src/main/resources/assets/botania/models/block/cyan_double_flower.json index b3328d002..ff86596f7 100644 --- a/src/main/resources/assets/botania/models/block/cyan_double_flower.json +++ b/src/main/resources/assets/botania/models/block/cyan_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower9tall0" } diff --git a/src/main/resources/assets/botania/models/block/cyan_double_flower_top.json b/src/main/resources/assets/botania/models/block/cyan_double_flower_top.json index 655c39478..97740c27b 100644 --- a/src/main/resources/assets/botania/models/block/cyan_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/cyan_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower9tall1" } diff --git a/src/main/resources/assets/botania/models/block/cyan_mushroom.json b/src/main/resources/assets/botania/models/block/cyan_mushroom.json index 3b178cf73..11f229efe 100644 --- a/src/main/resources/assets/botania/models/block/cyan_mushroom.json +++ b/src/main/resources/assets/botania/models/block/cyan_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom9" } diff --git a/src/main/resources/assets/botania/models/block/cyan_mystical_flower.json b/src/main/resources/assets/botania/models/block/cyan_mystical_flower.json index 490adfb65..cee6bb380 100644 --- a/src/main/resources/assets/botania/models/block/cyan_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/cyan_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower9" } diff --git a/src/main/resources/assets/botania/models/block/cyan_shiny_flower.json b/src/main/resources/assets/botania/models/block/cyan_shiny_flower.json index 3bed8ff57..a7b039186 100644 --- a/src/main/resources/assets/botania/models/block/cyan_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/cyan_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering9" } diff --git a/src/main/resources/assets/botania/models/block/daffomill.json b/src/main/resources/assets/botania/models/block/daffomill.json index 9660c2d2e..7bbf56fbd 100644 --- a/src/main/resources/assets/botania/models/block/daffomill.json +++ b/src/main/resources/assets/botania/models/block/daffomill.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_daffomill" } diff --git a/src/main/resources/assets/botania/models/block/dandelifeon.json b/src/main/resources/assets/botania/models/block/dandelifeon.json index c0989d96b..e18955b81 100644 --- a/src/main/resources/assets/botania/models/block/dandelifeon.json +++ b/src/main/resources/assets/botania/models/block/dandelifeon.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_dandelifeon" } diff --git a/src/main/resources/assets/botania/models/block/dreadthorn.json b/src/main/resources/assets/botania/models/block/dreadthorn.json index 72741a345..9d7e52f2a 100644 --- a/src/main/resources/assets/botania/models/block/dreadthorn.json +++ b/src/main/resources/assets/botania/models/block/dreadthorn.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_dreadthorne" } diff --git a/src/main/resources/assets/botania/models/block/endoflame.json b/src/main/resources/assets/botania/models/block/endoflame.json index 0e9b81ec4..5edf89298 100644 --- a/src/main/resources/assets/botania/models/block/endoflame.json +++ b/src/main/resources/assets/botania/models/block/endoflame.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_endoflame" } diff --git a/src/main/resources/assets/botania/models/block/entropinnyum.json b/src/main/resources/assets/botania/models/block/entropinnyum.json index e36810a24..205f09d82 100644 --- a/src/main/resources/assets/botania/models/block/entropinnyum.json +++ b/src/main/resources/assets/botania/models/block/entropinnyum.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_entropinnyum" } diff --git a/src/main/resources/assets/botania/models/block/exoflame.json b/src/main/resources/assets/botania/models/block/exoflame.json index 2eea83b92..dfe3533f8 100644 --- a/src/main/resources/assets/botania/models/block/exoflame.json +++ b/src/main/resources/assets/botania/models/block/exoflame.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_exoflame" } diff --git a/src/main/resources/assets/botania/models/block/fallen_kanade.json b/src/main/resources/assets/botania/models/block/fallen_kanade.json index 99663622a..1f318b4b9 100644 --- a/src/main/resources/assets/botania/models/block/fallen_kanade.json +++ b/src/main/resources/assets/botania/models/block/fallen_kanade.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_fallen_kanade" } diff --git a/src/main/resources/assets/botania/models/block/gourmaryllis.json b/src/main/resources/assets/botania/models/block/gourmaryllis.json index cada19179..0938ad4b0 100644 --- a/src/main/resources/assets/botania/models/block/gourmaryllis.json +++ b/src/main/resources/assets/botania/models/block/gourmaryllis.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_gourmaryllis" } diff --git a/src/main/resources/assets/botania/models/block/gray_double_flower.json b/src/main/resources/assets/botania/models/block/gray_double_flower.json index 698bfb8e2..05622bccc 100644 --- a/src/main/resources/assets/botania/models/block/gray_double_flower.json +++ b/src/main/resources/assets/botania/models/block/gray_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower7tall0" } diff --git a/src/main/resources/assets/botania/models/block/gray_double_flower_top.json b/src/main/resources/assets/botania/models/block/gray_double_flower_top.json index 2cef22d1c..b351aaf34 100644 --- a/src/main/resources/assets/botania/models/block/gray_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/gray_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower7tall1" } diff --git a/src/main/resources/assets/botania/models/block/gray_mushroom.json b/src/main/resources/assets/botania/models/block/gray_mushroom.json index 8bf4cb909..bcdd46c6e 100644 --- a/src/main/resources/assets/botania/models/block/gray_mushroom.json +++ b/src/main/resources/assets/botania/models/block/gray_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom7" } diff --git a/src/main/resources/assets/botania/models/block/gray_mystical_flower.json b/src/main/resources/assets/botania/models/block/gray_mystical_flower.json index 383d6f942..58edd2fca 100644 --- a/src/main/resources/assets/botania/models/block/gray_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/gray_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower7" } diff --git a/src/main/resources/assets/botania/models/block/gray_shiny_flower.json b/src/main/resources/assets/botania/models/block/gray_shiny_flower.json index e8bac5d4c..817052ee5 100644 --- a/src/main/resources/assets/botania/models/block/gray_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/gray_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering7" } diff --git a/src/main/resources/assets/botania/models/block/green_double_flower.json b/src/main/resources/assets/botania/models/block/green_double_flower.json index 7482e2f82..a005cd775 100644 --- a/src/main/resources/assets/botania/models/block/green_double_flower.json +++ b/src/main/resources/assets/botania/models/block/green_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower13tall0" } diff --git a/src/main/resources/assets/botania/models/block/green_double_flower_top.json b/src/main/resources/assets/botania/models/block/green_double_flower_top.json index 05b5c427a..9210d2148 100644 --- a/src/main/resources/assets/botania/models/block/green_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/green_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower13tall1" } diff --git a/src/main/resources/assets/botania/models/block/green_mushroom.json b/src/main/resources/assets/botania/models/block/green_mushroom.json index 61902e1e6..bd6e65867 100644 --- a/src/main/resources/assets/botania/models/block/green_mushroom.json +++ b/src/main/resources/assets/botania/models/block/green_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom13" } diff --git a/src/main/resources/assets/botania/models/block/green_mystical_flower.json b/src/main/resources/assets/botania/models/block/green_mystical_flower.json index d31c3277a..2e0cd4dfc 100644 --- a/src/main/resources/assets/botania/models/block/green_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/green_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower13" } diff --git a/src/main/resources/assets/botania/models/block/green_shiny_flower.json b/src/main/resources/assets/botania/models/block/green_shiny_flower.json index 1f498a339..41cd7224c 100644 --- a/src/main/resources/assets/botania/models/block/green_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/green_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering13" } diff --git a/src/main/resources/assets/botania/models/block/heisei_dream.json b/src/main/resources/assets/botania/models/block/heisei_dream.json index 07c411001..8ac045390 100644 --- a/src/main/resources/assets/botania/models/block/heisei_dream.json +++ b/src/main/resources/assets/botania/models/block/heisei_dream.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_heisei_dream" } diff --git a/src/main/resources/assets/botania/models/block/hopperhock.json b/src/main/resources/assets/botania/models/block/hopperhock.json index 47209dfc0..8470606c3 100644 --- a/src/main/resources/assets/botania/models/block/hopperhock.json +++ b/src/main/resources/assets/botania/models/block/hopperhock.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_hopperhock" } diff --git a/src/main/resources/assets/botania/models/block/hopperhock_chibi.json b/src/main/resources/assets/botania/models/block/hopperhock_chibi.json index 54d61e76e..aab717fdb 100644 --- a/src/main/resources/assets/botania/models/block/hopperhock_chibi.json +++ b/src/main/resources/assets/botania/models/block/hopperhock_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_hopperhock_chibi" } diff --git a/src/main/resources/assets/botania/models/block/hyacidus.json b/src/main/resources/assets/botania/models/block/hyacidus.json index 4073adb71..3dc44e21c 100644 --- a/src/main/resources/assets/botania/models/block/hyacidus.json +++ b/src/main/resources/assets/botania/models/block/hyacidus.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_hyacidus" } diff --git a/src/main/resources/assets/botania/models/block/hydroangeas.json b/src/main/resources/assets/botania/models/block/hydroangeas.json index 3d6d8b38e..10557cc7d 100644 --- a/src/main/resources/assets/botania/models/block/hydroangeas.json +++ b/src/main/resources/assets/botania/models/block/hydroangeas.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_hydroangeas" } diff --git a/src/main/resources/assets/botania/models/block/jaded_amaranthus.json b/src/main/resources/assets/botania/models/block/jaded_amaranthus.json index f6b61c5c3..e9ef7cbb0 100644 --- a/src/main/resources/assets/botania/models/block/jaded_amaranthus.json +++ b/src/main/resources/assets/botania/models/block/jaded_amaranthus.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_jaded_amaranthus" } diff --git a/src/main/resources/assets/botania/models/block/jiyuulia.json b/src/main/resources/assets/botania/models/block/jiyuulia.json index c17f54ad4..4950ac3ac 100644 --- a/src/main/resources/assets/botania/models/block/jiyuulia.json +++ b/src/main/resources/assets/botania/models/block/jiyuulia.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_jiyuulia" } diff --git a/src/main/resources/assets/botania/models/block/kekimurus.json b/src/main/resources/assets/botania/models/block/kekimurus.json index a91c4f14c..f1fc6d924 100644 --- a/src/main/resources/assets/botania/models/block/kekimurus.json +++ b/src/main/resources/assets/botania/models/block/kekimurus.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_kekimurus" } diff --git a/src/main/resources/assets/botania/models/block/light_blue_double_flower.json b/src/main/resources/assets/botania/models/block/light_blue_double_flower.json index 2cb2a386e..7a2882ab7 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_double_flower.json +++ b/src/main/resources/assets/botania/models/block/light_blue_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower3tall0" } diff --git a/src/main/resources/assets/botania/models/block/light_blue_double_flower_top.json b/src/main/resources/assets/botania/models/block/light_blue_double_flower_top.json index b73fba876..83862c89c 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/light_blue_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower3tall1" } diff --git a/src/main/resources/assets/botania/models/block/light_blue_mushroom.json b/src/main/resources/assets/botania/models/block/light_blue_mushroom.json index 7e24306d5..f242ccf12 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_mushroom.json +++ b/src/main/resources/assets/botania/models/block/light_blue_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom3" } diff --git a/src/main/resources/assets/botania/models/block/light_blue_mystical_flower.json b/src/main/resources/assets/botania/models/block/light_blue_mystical_flower.json index 8c9c43d17..f21027f3e 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/light_blue_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower3" } diff --git a/src/main/resources/assets/botania/models/block/light_blue_shiny_flower.json b/src/main/resources/assets/botania/models/block/light_blue_shiny_flower.json index beeba6155..b8c733c8a 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/light_blue_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering3" } diff --git a/src/main/resources/assets/botania/models/block/light_gray_double_flower.json b/src/main/resources/assets/botania/models/block/light_gray_double_flower.json index adb5c8e72..92d027e8d 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_double_flower.json +++ b/src/main/resources/assets/botania/models/block/light_gray_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower8tall0" } diff --git a/src/main/resources/assets/botania/models/block/light_gray_double_flower_top.json b/src/main/resources/assets/botania/models/block/light_gray_double_flower_top.json index f316f7b3c..44e8bc39c 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/light_gray_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower8tall1" } diff --git a/src/main/resources/assets/botania/models/block/light_gray_mushroom.json b/src/main/resources/assets/botania/models/block/light_gray_mushroom.json index bed9879f9..2f19da463 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_mushroom.json +++ b/src/main/resources/assets/botania/models/block/light_gray_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom8" } diff --git a/src/main/resources/assets/botania/models/block/light_gray_mystical_flower.json b/src/main/resources/assets/botania/models/block/light_gray_mystical_flower.json index e0480423f..fc71fde19 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/light_gray_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower8" } diff --git a/src/main/resources/assets/botania/models/block/light_gray_shiny_flower.json b/src/main/resources/assets/botania/models/block/light_gray_shiny_flower.json index 2a38ee1c3..078d75752 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/light_gray_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering8" } diff --git a/src/main/resources/assets/botania/models/block/lime_double_flower.json b/src/main/resources/assets/botania/models/block/lime_double_flower.json index c29574a5e..5771ea54b 100644 --- a/src/main/resources/assets/botania/models/block/lime_double_flower.json +++ b/src/main/resources/assets/botania/models/block/lime_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower5tall0" } diff --git a/src/main/resources/assets/botania/models/block/lime_double_flower_top.json b/src/main/resources/assets/botania/models/block/lime_double_flower_top.json index 3ab1d64d8..4453220b8 100644 --- a/src/main/resources/assets/botania/models/block/lime_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/lime_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower5tall1" } diff --git a/src/main/resources/assets/botania/models/block/lime_mushroom.json b/src/main/resources/assets/botania/models/block/lime_mushroom.json index 8ea0de1fd..9af567056 100644 --- a/src/main/resources/assets/botania/models/block/lime_mushroom.json +++ b/src/main/resources/assets/botania/models/block/lime_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom5" } diff --git a/src/main/resources/assets/botania/models/block/lime_mystical_flower.json b/src/main/resources/assets/botania/models/block/lime_mystical_flower.json index bdd9ed5e8..05d922abc 100644 --- a/src/main/resources/assets/botania/models/block/lime_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/lime_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower5" } diff --git a/src/main/resources/assets/botania/models/block/lime_shiny_flower.json b/src/main/resources/assets/botania/models/block/lime_shiny_flower.json index 2e0dfdafc..d7b51c9a1 100644 --- a/src/main/resources/assets/botania/models/block/lime_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/lime_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering5" } diff --git a/src/main/resources/assets/botania/models/block/loonium.json b/src/main/resources/assets/botania/models/block/loonium.json index 7774baee0..f6c60219f 100644 --- a/src/main/resources/assets/botania/models/block/loonium.json +++ b/src/main/resources/assets/botania/models/block/loonium.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_loonium" } diff --git a/src/main/resources/assets/botania/models/block/magenta_double_flower.json b/src/main/resources/assets/botania/models/block/magenta_double_flower.json index fbf3d4d78..3c9d4699a 100644 --- a/src/main/resources/assets/botania/models/block/magenta_double_flower.json +++ b/src/main/resources/assets/botania/models/block/magenta_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower2tall0" } diff --git a/src/main/resources/assets/botania/models/block/magenta_double_flower_top.json b/src/main/resources/assets/botania/models/block/magenta_double_flower_top.json index dcb5bf4c4..d07a4f7e1 100644 --- a/src/main/resources/assets/botania/models/block/magenta_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/magenta_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower2tall1" } diff --git a/src/main/resources/assets/botania/models/block/magenta_mushroom.json b/src/main/resources/assets/botania/models/block/magenta_mushroom.json index f85ee9644..7605b6ed7 100644 --- a/src/main/resources/assets/botania/models/block/magenta_mushroom.json +++ b/src/main/resources/assets/botania/models/block/magenta_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom2" } diff --git a/src/main/resources/assets/botania/models/block/magenta_mystical_flower.json b/src/main/resources/assets/botania/models/block/magenta_mystical_flower.json index 371c0f36d..86b557caf 100644 --- a/src/main/resources/assets/botania/models/block/magenta_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/magenta_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower2" } diff --git a/src/main/resources/assets/botania/models/block/magenta_shiny_flower.json b/src/main/resources/assets/botania/models/block/magenta_shiny_flower.json index b02db640e..cb44a4133 100644 --- a/src/main/resources/assets/botania/models/block/magenta_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/magenta_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering2" } diff --git a/src/main/resources/assets/botania/models/block/manastar.json b/src/main/resources/assets/botania/models/block/manastar.json index a02faeeac..2f891f15b 100644 --- a/src/main/resources/assets/botania/models/block/manastar.json +++ b/src/main/resources/assets/botania/models/block/manastar.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_misc_manastar" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/models/block/marimorphosis.json b/src/main/resources/assets/botania/models/block/marimorphosis.json index ca81098aa..275f7fd5f 100644 --- a/src/main/resources/assets/botania/models/block/marimorphosis.json +++ b/src/main/resources/assets/botania/models/block/marimorphosis.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_marimorphosis" } diff --git a/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json b/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json index 5d9cf655b..d70a87a75 100644 --- a/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json +++ b/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_marimorphosis_chibi" } diff --git a/src/main/resources/assets/botania/models/block/medumone.json b/src/main/resources/assets/botania/models/block/medumone.json index b7afa51a3..96ce5bea9 100644 --- a/src/main/resources/assets/botania/models/block/medumone.json +++ b/src/main/resources/assets/botania/models/block/medumone.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_medumone" } diff --git a/src/main/resources/assets/botania/models/block/munchdew.json b/src/main/resources/assets/botania/models/block/munchdew.json index efd87ddca..a024b9570 100644 --- a/src/main/resources/assets/botania/models/block/munchdew.json +++ b/src/main/resources/assets/botania/models/block/munchdew.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_munchdew" } diff --git a/src/main/resources/assets/botania/models/block/narslimmus.json b/src/main/resources/assets/botania/models/block/narslimmus.json index 7f67d6eb7..da86a6725 100644 --- a/src/main/resources/assets/botania/models/block/narslimmus.json +++ b/src/main/resources/assets/botania/models/block/narslimmus.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_narslimmus" } diff --git a/src/main/resources/assets/botania/models/block/orange_double_flower.json b/src/main/resources/assets/botania/models/block/orange_double_flower.json index aa93dad1a..bfa299453 100644 --- a/src/main/resources/assets/botania/models/block/orange_double_flower.json +++ b/src/main/resources/assets/botania/models/block/orange_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower1tall0" } diff --git a/src/main/resources/assets/botania/models/block/orange_double_flower_top.json b/src/main/resources/assets/botania/models/block/orange_double_flower_top.json index 394d80306..2d9f97ca5 100644 --- a/src/main/resources/assets/botania/models/block/orange_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/orange_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower1tall1" } diff --git a/src/main/resources/assets/botania/models/block/orange_mushroom.json b/src/main/resources/assets/botania/models/block/orange_mushroom.json index 6d83c2143..bde9856ce 100644 --- a/src/main/resources/assets/botania/models/block/orange_mushroom.json +++ b/src/main/resources/assets/botania/models/block/orange_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom1" } diff --git a/src/main/resources/assets/botania/models/block/orange_mystical_flower.json b/src/main/resources/assets/botania/models/block/orange_mystical_flower.json index 08d13d14f..0401a8ac1 100644 --- a/src/main/resources/assets/botania/models/block/orange_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/orange_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower1" } diff --git a/src/main/resources/assets/botania/models/block/orange_shiny_flower.json b/src/main/resources/assets/botania/models/block/orange_shiny_flower.json index a4f11eec2..2cda8509e 100644 --- a/src/main/resources/assets/botania/models/block/orange_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/orange_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering1" } diff --git a/src/main/resources/assets/botania/models/block/orechid.json b/src/main/resources/assets/botania/models/block/orechid.json index 2eb8a6408..bac8e3613 100644 --- a/src/main/resources/assets/botania/models/block/orechid.json +++ b/src/main/resources/assets/botania/models/block/orechid.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_orechid" } diff --git a/src/main/resources/assets/botania/models/block/orechid_ignem.json b/src/main/resources/assets/botania/models/block/orechid_ignem.json index ca6550202..2924d587e 100644 --- a/src/main/resources/assets/botania/models/block/orechid_ignem.json +++ b/src/main/resources/assets/botania/models/block/orechid_ignem.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_orechid_ignem" } diff --git a/src/main/resources/assets/botania/models/block/pink_double_flower.json b/src/main/resources/assets/botania/models/block/pink_double_flower.json index 6304f0fd4..d221fd806 100644 --- a/src/main/resources/assets/botania/models/block/pink_double_flower.json +++ b/src/main/resources/assets/botania/models/block/pink_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower6tall0" } diff --git a/src/main/resources/assets/botania/models/block/pink_double_flower_top.json b/src/main/resources/assets/botania/models/block/pink_double_flower_top.json index 025b40077..0b6ed2820 100644 --- a/src/main/resources/assets/botania/models/block/pink_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/pink_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower6tall1" } diff --git a/src/main/resources/assets/botania/models/block/pink_mushroom.json b/src/main/resources/assets/botania/models/block/pink_mushroom.json index b83e44b1e..90efca2a6 100644 --- a/src/main/resources/assets/botania/models/block/pink_mushroom.json +++ b/src/main/resources/assets/botania/models/block/pink_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom6" } diff --git a/src/main/resources/assets/botania/models/block/pink_mystical_flower.json b/src/main/resources/assets/botania/models/block/pink_mystical_flower.json index 9fdd45d9c..783b573c6 100644 --- a/src/main/resources/assets/botania/models/block/pink_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/pink_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower6" } diff --git a/src/main/resources/assets/botania/models/block/pink_shiny_flower.json b/src/main/resources/assets/botania/models/block/pink_shiny_flower.json index cccb7a43a..477c9a65a 100644 --- a/src/main/resources/assets/botania/models/block/pink_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/pink_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering6" } diff --git a/src/main/resources/assets/botania/models/block/pollidisiac.json b/src/main/resources/assets/botania/models/block/pollidisiac.json index 6e4032449..438de6383 100644 --- a/src/main/resources/assets/botania/models/block/pollidisiac.json +++ b/src/main/resources/assets/botania/models/block/pollidisiac.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_pollidisiac" } diff --git a/src/main/resources/assets/botania/models/block/pure_daisy.json b/src/main/resources/assets/botania/models/block/pure_daisy.json index 80722fe51..9b1d3e163 100644 --- a/src/main/resources/assets/botania/models/block/pure_daisy.json +++ b/src/main/resources/assets/botania/models/block/pure_daisy.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_misc_pure_daisy" } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/models/block/purple_double_flower.json b/src/main/resources/assets/botania/models/block/purple_double_flower.json index 33860b4be..eb9d1b22d 100644 --- a/src/main/resources/assets/botania/models/block/purple_double_flower.json +++ b/src/main/resources/assets/botania/models/block/purple_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower10tall0" } diff --git a/src/main/resources/assets/botania/models/block/purple_double_flower_top.json b/src/main/resources/assets/botania/models/block/purple_double_flower_top.json index f40e5ebbf..af5bedc10 100644 --- a/src/main/resources/assets/botania/models/block/purple_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/purple_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower10tall1" } diff --git a/src/main/resources/assets/botania/models/block/purple_mushroom.json b/src/main/resources/assets/botania/models/block/purple_mushroom.json index 78dacd88b..790f97730 100644 --- a/src/main/resources/assets/botania/models/block/purple_mushroom.json +++ b/src/main/resources/assets/botania/models/block/purple_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom10" } diff --git a/src/main/resources/assets/botania/models/block/purple_mystical_flower.json b/src/main/resources/assets/botania/models/block/purple_mystical_flower.json index a0fecf850..d9d1c4d25 100644 --- a/src/main/resources/assets/botania/models/block/purple_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/purple_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower10" } diff --git a/src/main/resources/assets/botania/models/block/purple_shiny_flower.json b/src/main/resources/assets/botania/models/block/purple_shiny_flower.json index 37d58a6ec..eb8cc144e 100644 --- a/src/main/resources/assets/botania/models/block/purple_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/purple_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering10" } diff --git a/src/main/resources/assets/botania/models/block/rafflowsia.json b/src/main/resources/assets/botania/models/block/rafflowsia.json index 59bfa986e..27c52e937 100644 --- a/src/main/resources/assets/botania/models/block/rafflowsia.json +++ b/src/main/resources/assets/botania/models/block/rafflowsia.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_rafflowsia" } diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus.json b/src/main/resources/assets/botania/models/block/rannuncarpus.json index 00e6a4604..c915648fb 100644 --- a/src/main/resources/assets/botania/models/block/rannuncarpus.json +++ b/src/main/resources/assets/botania/models/block/rannuncarpus.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_rannuncarpus" } diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json b/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json index 2571135e5..54ad75554 100644 --- a/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json +++ b/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_rannuncarpus_chibi" } diff --git a/src/main/resources/assets/botania/models/block/red_double_flower.json b/src/main/resources/assets/botania/models/block/red_double_flower.json index 9fc397ecf..02c203abe 100644 --- a/src/main/resources/assets/botania/models/block/red_double_flower.json +++ b/src/main/resources/assets/botania/models/block/red_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower14tall0" } diff --git a/src/main/resources/assets/botania/models/block/red_double_flower_top.json b/src/main/resources/assets/botania/models/block/red_double_flower_top.json index ed602481f..32d4f1d87 100644 --- a/src/main/resources/assets/botania/models/block/red_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/red_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower14tall1" } diff --git a/src/main/resources/assets/botania/models/block/red_mushroom.json b/src/main/resources/assets/botania/models/block/red_mushroom.json index 9e5083ec3..263eab1ce 100644 --- a/src/main/resources/assets/botania/models/block/red_mushroom.json +++ b/src/main/resources/assets/botania/models/block/red_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom14" } diff --git a/src/main/resources/assets/botania/models/block/red_mystical_flower.json b/src/main/resources/assets/botania/models/block/red_mystical_flower.json index efe344439..0ecb93b16 100644 --- a/src/main/resources/assets/botania/models/block/red_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/red_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower14" } diff --git a/src/main/resources/assets/botania/models/block/red_shiny_flower.json b/src/main/resources/assets/botania/models/block/red_shiny_flower.json index 8c180934f..4f192fe5c 100644 --- a/src/main/resources/assets/botania/models/block/red_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/red_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering14" } diff --git a/src/main/resources/assets/botania/models/block/rosa_arcana.json b/src/main/resources/assets/botania/models/block/rosa_arcana.json index 711537100..2fa6d3e35 100644 --- a/src/main/resources/assets/botania/models/block/rosa_arcana.json +++ b/src/main/resources/assets/botania/models/block/rosa_arcana.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_arcane_rose" } diff --git a/src/main/resources/assets/botania/models/block/shapes/cross.json b/src/main/resources/assets/botania/models/block/shapes/cross.json new file mode 100644 index 000000000..0fecbe0bc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/shapes/cross.json @@ -0,0 +1,28 @@ +{ + "__comment": "Same as minecraft:block/cross, but with a proper parent defined so display transforms are set", + "parent": "minecraft:block/block", + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + }, + { "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + } + ] +} diff --git a/src/main/resources/assets/botania/models/block/shulk_me_not.json b/src/main/resources/assets/botania/models/block/shulk_me_not.json index 9dbb12aee..862f1488e 100644 --- a/src/main/resources/assets/botania/models/block/shulk_me_not.json +++ b/src/main/resources/assets/botania/models/block/shulk_me_not.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_shulk_me_not" } diff --git a/src/main/resources/assets/botania/models/block/solegnolia.json b/src/main/resources/assets/botania/models/block/solegnolia.json index 5ec70fc7b..f70d7f24d 100644 --- a/src/main/resources/assets/botania/models/block/solegnolia.json +++ b/src/main/resources/assets/botania/models/block/solegnolia.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_solegnolia" } diff --git a/src/main/resources/assets/botania/models/block/solegnolia_chibi.json b/src/main/resources/assets/botania/models/block/solegnolia_chibi.json index ab6a270dd..5d94d0c4c 100644 --- a/src/main/resources/assets/botania/models/block/solegnolia_chibi.json +++ b/src/main/resources/assets/botania/models/block/solegnolia_chibi.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_solegnolia_chibi" } diff --git a/src/main/resources/assets/botania/models/block/spectranthemum.json b/src/main/resources/assets/botania/models/block/spectranthemum.json index b88eeb0e0..bd8e9224d 100644 --- a/src/main/resources/assets/botania/models/block/spectranthemum.json +++ b/src/main/resources/assets/botania/models/block/spectranthemum.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_spectranthemum" } diff --git a/src/main/resources/assets/botania/models/block/spectrolus.json b/src/main/resources/assets/botania/models/block/spectrolus.json index a712ebd4a..ede31e5d3 100644 --- a/src/main/resources/assets/botania/models/block/spectrolus.json +++ b/src/main/resources/assets/botania/models/block/spectrolus.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_spectrolus" } diff --git a/src/main/resources/assets/botania/models/block/tangleberrie.json b/src/main/resources/assets/botania/models/block/tangleberrie.json index a30c22063..18ddd180b 100644 --- a/src/main/resources/assets/botania/models/block/tangleberrie.json +++ b/src/main/resources/assets/botania/models/block/tangleberrie.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_tangleberrie" } diff --git a/src/main/resources/assets/botania/models/block/thermalily.json b/src/main/resources/assets/botania/models/block/thermalily.json index 5d0547206..106324552 100644 --- a/src/main/resources/assets/botania/models/block/thermalily.json +++ b/src/main/resources/assets/botania/models/block/thermalily.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_gen_thermalily" } diff --git a/src/main/resources/assets/botania/models/block/tigerseye.json b/src/main/resources/assets/botania/models/block/tigerseye.json index 519319917..c9a8d97e0 100644 --- a/src/main/resources/assets/botania/models/block/tigerseye.json +++ b/src/main/resources/assets/botania/models/block/tigerseye.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_tigerseye" } diff --git a/src/main/resources/assets/botania/models/block/vinculotus.json b/src/main/resources/assets/botania/models/block/vinculotus.json index 94f34872c..92a7235c3 100644 --- a/src/main/resources/assets/botania/models/block/vinculotus.json +++ b/src/main/resources/assets/botania/models/block/vinculotus.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower_func_vinculotus" } diff --git a/src/main/resources/assets/botania/models/block/white_double_flower.json b/src/main/resources/assets/botania/models/block/white_double_flower.json index 8b98fea53..0b74cf287 100644 --- a/src/main/resources/assets/botania/models/block/white_double_flower.json +++ b/src/main/resources/assets/botania/models/block/white_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower0tall0" } diff --git a/src/main/resources/assets/botania/models/block/white_double_flower_top.json b/src/main/resources/assets/botania/models/block/white_double_flower_top.json index af86409e3..66ce426ca 100644 --- a/src/main/resources/assets/botania/models/block/white_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/white_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower0tall1" } diff --git a/src/main/resources/assets/botania/models/block/white_mushroom.json b/src/main/resources/assets/botania/models/block/white_mushroom.json index 81b9fe066..41f2f1232 100644 --- a/src/main/resources/assets/botania/models/block/white_mushroom.json +++ b/src/main/resources/assets/botania/models/block/white_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom0" } diff --git a/src/main/resources/assets/botania/models/block/white_mystical_flower.json b/src/main/resources/assets/botania/models/block/white_mystical_flower.json index b937f38a1..0b73b1fb5 100644 --- a/src/main/resources/assets/botania/models/block/white_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/white_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower0" } diff --git a/src/main/resources/assets/botania/models/block/white_shiny_flower.json b/src/main/resources/assets/botania/models/block/white_shiny_flower.json index d65365c10..4283b1b74 100644 --- a/src/main/resources/assets/botania/models/block/white_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/white_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering0" } diff --git a/src/main/resources/assets/botania/models/block/yellow_double_flower.json b/src/main/resources/assets/botania/models/block/yellow_double_flower.json index 7f94bf2ba..b01ab9a11 100644 --- a/src/main/resources/assets/botania/models/block/yellow_double_flower.json +++ b/src/main/resources/assets/botania/models/block/yellow_double_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower4tall0" } diff --git a/src/main/resources/assets/botania/models/block/yellow_double_flower_top.json b/src/main/resources/assets/botania/models/block/yellow_double_flower_top.json index 1f6bb1b32..ca30814ca 100644 --- a/src/main/resources/assets/botania/models/block/yellow_double_flower_top.json +++ b/src/main/resources/assets/botania/models/block/yellow_double_flower_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower4tall1" } diff --git a/src/main/resources/assets/botania/models/block/yellow_mushroom.json b/src/main/resources/assets/botania/models/block/yellow_mushroom.json index 72040ae19..f3d7828c3 100644 --- a/src/main/resources/assets/botania/models/block/yellow_mushroom.json +++ b/src/main/resources/assets/botania/models/block/yellow_mushroom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/mushroom4" } diff --git a/src/main/resources/assets/botania/models/block/yellow_mystical_flower.json b/src/main/resources/assets/botania/models/block/yellow_mystical_flower.json index ad368aa85..a858bb2c9 100644 --- a/src/main/resources/assets/botania/models/block/yellow_mystical_flower.json +++ b/src/main/resources/assets/botania/models/block/yellow_mystical_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flower4" } diff --git a/src/main/resources/assets/botania/models/block/yellow_shiny_flower.json b/src/main/resources/assets/botania/models/block/yellow_shiny_flower.json index abf379f74..6cff23af0 100644 --- a/src/main/resources/assets/botania/models/block/yellow_shiny_flower.json +++ b/src/main/resources/assets/botania/models/block/yellow_shiny_flower.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "botania:block/shapes/cross", "textures": { "cross": "botania:blocks/flowerglimmering4" }