diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 55a0bbecb..c72d5cab0 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -93,6 +93,8 @@ public class FloatingFlowerModel implements IBakedModel { public List getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { if(state.getBlock() != ModBlocks.floatingSpecialFlower && !(state.getBlock() instanceof BlockFloatingFlower)) return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + if(true) // todo 1.13 + return ImmutableList.of(); IExtendedBlockState realState = (IExtendedBlockState) state; IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); ResourceLocation identifier; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 154e7e493..a9fe5bc34 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -104,7 +104,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable { @OnlyIn(Dist.CLIENT) @Override public void animateTick(IBlockState state, World world, BlockPos pos, Random rand) { - int hex = state.get(BotaniaStateProps.COLOR).colorValue; + int hex = color.colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; diff --git a/src/main/resources/assets/botania/blockstates/avatar.json b/src/main/resources/assets/botania/blockstates/avatar.json index cc89b20bf..b11801596 100644 --- a/src/main/resources/assets/botania/blockstates/avatar.json +++ b/src/main/resources/assets/botania/blockstates/avatar.json @@ -1,12 +1,5 @@ { - "forge_marker": 1, - "defaults": { - "model": "botania:block/dummy", - "textures": { - "particle": "botania:blocks/livingwood0" - } - }, "variants": { - "": [{}] + "": { "model": "botania:block/avatar" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/craftcrate.json b/src/main/resources/assets/botania/blockstates/crafty_crate.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/craftcrate.json rename to src/main/resources/assets/botania/blockstates/crafty_crate.json diff --git a/src/main/resources/assets/botania/blockstates/felpumpkin.json b/src/main/resources/assets/botania/blockstates/fel_pumpkin.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/felpumpkin.json rename to src/main/resources/assets/botania/blockstates/fel_pumpkin.json diff --git a/src/main/resources/assets/botania/blockstates/gaiaheadblock.json b/src/main/resources/assets/botania/blockstates/gaia_head.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/gaiaheadblock.json rename to src/main/resources/assets/botania/blockstates/gaia_head.json diff --git a/src/main/resources/assets/botania/blockstates/ghostrail.json b/src/main/resources/assets/botania/blockstates/ghost_rail.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/ghostrail.json rename to src/main/resources/assets/botania/blockstates/ghost_rail.json diff --git a/src/main/resources/assets/botania/blockstates/silver_petal_block.json b/src/main/resources/assets/botania/blockstates/light_gray_petal_block.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/silver_petal_block.json rename to src/main/resources/assets/botania/blockstates/light_gray_petal_block.json diff --git a/src/main/resources/assets/botania/blockstates/manabomb.json b/src/main/resources/assets/botania/blockstates/mana_bomb.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manabomb.json rename to src/main/resources/assets/botania/blockstates/mana_bomb.json diff --git a/src/main/resources/assets/botania/blockstates/manadetector.json b/src/main/resources/assets/botania/blockstates/mana_detector.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manadetector.json rename to src/main/resources/assets/botania/blockstates/mana_detector.json diff --git a/src/main/resources/assets/botania/blockstates/manaflame.json b/src/main/resources/assets/botania/blockstates/mana_flame.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manaflame.json rename to src/main/resources/assets/botania/blockstates/mana_flame.json diff --git a/src/main/resources/assets/botania/blockstates/managlass.json b/src/main/resources/assets/botania/blockstates/mana_glass.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/managlass.json rename to src/main/resources/assets/botania/blockstates/mana_glass.json diff --git a/src/main/resources/assets/botania/blockstates/manavoid.json b/src/main/resources/assets/botania/blockstates/mana_void.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manavoid.json rename to src/main/resources/assets/botania/blockstates/mana_void.json diff --git a/src/main/resources/assets/botania/blockstates/opencrate.json b/src/main/resources/assets/botania/blockstates/open_crate.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/opencrate.json rename to src/main/resources/assets/botania/blockstates/open_crate.json diff --git a/src/main/resources/assets/botania/blockstates/pistonrelay.json b/src/main/resources/assets/botania/blockstates/piston_relay.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pistonrelay.json rename to src/main/resources/assets/botania/blockstates/piston_relay.json diff --git a/src/main/resources/assets/botania/blockstates/runealtar.json b/src/main/resources/assets/botania/blockstates/runic_altar.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/runealtar.json rename to src/main/resources/assets/botania/blockstates/runic_altar.json diff --git a/src/main/resources/assets/botania/blockstates/solidvine.json b/src/main/resources/assets/botania/blockstates/solid_vine.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/solidvine.json rename to src/main/resources/assets/botania/blockstates/solid_vine.json diff --git a/src/main/resources/assets/botania/blockstates/sparkchanger.json b/src/main/resources/assets/botania/blockstates/spark_changer.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/sparkchanger.json rename to src/main/resources/assets/botania/blockstates/spark_changer.json diff --git a/src/main/resources/assets/botania/blockstates/spawnerclaw.json b/src/main/resources/assets/botania/blockstates/spawner_claw.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/spawnerclaw.json rename to src/main/resources/assets/botania/blockstates/spawner_claw.json diff --git a/src/main/resources/assets/botania/blockstates/terraplate.json b/src/main/resources/assets/botania/blockstates/terra_plate.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/terraplate.json rename to src/main/resources/assets/botania/blockstates/terra_plate.json diff --git a/src/main/resources/assets/botania/blockstates/waterbowl.json b/src/main/resources/assets/botania/blockstates/water_bowl.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/waterbowl.json rename to src/main/resources/assets/botania/blockstates/water_bowl.json diff --git a/src/main/resources/assets/botania/models/block/avatar.json b/src/main/resources/assets/botania/models/block/avatar.json new file mode 100644 index 000000000..8140c9b3c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/avatar.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:blocks/livingwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json b/src/main/resources/assets/botania/models/item/alfglass_pane.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json rename to src/main/resources/assets/botania/models/item/alfglass_pane.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/animatedtorch.json b/src/main/resources/assets/botania/models/item/animated_torch.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/animatedtorch.json rename to src/main/resources/assets/botania/models/item/animated_torch.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/avatar.json b/src/main/resources/assets/botania/models/item/avatar.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/avatar.json rename to src/main/resources/assets/botania/models/item/avatar.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/bellows.json b/src/main/resources/assets/botania/models/item/bellows.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/bellows.json rename to src/main/resources/assets/botania/models/item/bellows.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json b/src/main/resources/assets/botania/models/item/bifrost_pane.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/bifrost_pane.json rename to src/main/resources/assets/botania/models/item/bifrost_pane.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json b/src/main/resources/assets/botania/models/item/black_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json rename to src/main/resources/assets/botania/models/item/black_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_black.json b/src/main/resources/assets/botania/models/item/black_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_black.json rename to src/main/resources/assets/botania/models/item/black_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_black.json b/src/main/resources/assets/botania/models/item/black_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_black.json rename to src/main/resources/assets/botania/models/item/black_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json b/src/main/resources/assets/botania/models/item/black_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json rename to src/main/resources/assets/botania/models/item/black_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json b/src/main/resources/assets/botania/models/item/blue_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json rename to src/main/resources/assets/botania/models/item/blue_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_blue.json b/src/main/resources/assets/botania/models/item/blue_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_blue.json rename to src/main/resources/assets/botania/models/item/blue_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_blue.json b/src/main/resources/assets/botania/models/item/blue_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_blue.json rename to src/main/resources/assets/botania/models/item/blue_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json b/src/main/resources/assets/botania/models/item/blue_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json rename to src/main/resources/assets/botania/models/item/blue_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/brewery.json b/src/main/resources/assets/botania/models/item/brewery.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/brewery.json rename to src/main/resources/assets/botania/models/item/brewery.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json b/src/main/resources/assets/botania/models/item/brown_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json rename to src/main/resources/assets/botania/models/item/brown_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_brown.json b/src/main/resources/assets/botania/models/item/brown_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_brown.json rename to src/main/resources/assets/botania/models/item/brown_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_brown.json b/src/main/resources/assets/botania/models/item/brown_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_brown.json rename to src/main/resources/assets/botania/models/item/brown_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json b/src/main/resources/assets/botania/models/item/brown_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json rename to src/main/resources/assets/botania/models/item/brown_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/corporea_index.json b/src/main/resources/assets/botania/models/item/corporea_index.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/corporea_index.json rename to src/main/resources/assets/botania/models/item/corporea_index.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json b/src/main/resources/assets/botania/models/item/cyan_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json rename to src/main/resources/assets/botania/models/item/cyan_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_cyan.json b/src/main/resources/assets/botania/models/item/cyan_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_cyan.json rename to src/main/resources/assets/botania/models/item/cyan_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_cyan.json b/src/main/resources/assets/botania/models/item/cyan_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_cyan.json rename to src/main/resources/assets/botania/models/item/cyan_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json b/src/main/resources/assets/botania/models/item/cyan_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json rename to src/main/resources/assets/botania/models/item/cyan_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/dreamwood_wall.json b/src/main/resources/assets/botania/models/item/dreamwood_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/dreamwood_wall.json rename to src/main/resources/assets/botania/models/item/dreamwood_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json b/src/main/resources/assets/botania/models/item/ghost_rail.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json rename to src/main/resources/assets/botania/models/item/ghost_rail.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json b/src/main/resources/assets/botania/models/item/gray_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json rename to src/main/resources/assets/botania/models/item/gray_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_gray.json b/src/main/resources/assets/botania/models/item/gray_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_gray.json rename to src/main/resources/assets/botania/models/item/gray_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_gray.json b/src/main/resources/assets/botania/models/item/gray_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_gray.json rename to src/main/resources/assets/botania/models/item/gray_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json b/src/main/resources/assets/botania/models/item/gray_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json rename to src/main/resources/assets/botania/models/item/gray_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json b/src/main/resources/assets/botania/models/item/green_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json rename to src/main/resources/assets/botania/models/item/green_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_green.json b/src/main/resources/assets/botania/models/item/green_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_green.json rename to src/main/resources/assets/botania/models/item/green_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_green.json b/src/main/resources/assets/botania/models/item/green_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_green.json rename to src/main/resources/assets/botania/models/item/green_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json b/src/main/resources/assets/botania/models/item/green_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json rename to src/main/resources/assets/botania/models/item/green_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/hovering_hourglass.json b/src/main/resources/assets/botania/models/item/hovering_hourglass.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/hovering_hourglass.json rename to src/main/resources/assets/botania/models/item/hovering_hourglass.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json b/src/main/resources/assets/botania/models/item/light_blue_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json rename to src/main/resources/assets/botania/models/item/light_blue_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_light_blue.json b/src/main/resources/assets/botania/models/item/light_blue_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_light_blue.json rename to src/main/resources/assets/botania/models/item/light_blue_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_light_blue.json b/src/main/resources/assets/botania/models/item/light_blue_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_light_blue.json rename to src/main/resources/assets/botania/models/item/light_blue_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json b/src/main/resources/assets/botania/models/item/light_blue_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json rename to src/main/resources/assets/botania/models/item/light_blue_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json b/src/main/resources/assets/botania/models/item/light_gray_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json rename to src/main/resources/assets/botania/models/item/light_gray_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_silver.json b/src/main/resources/assets/botania/models/item/light_gray_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_silver.json rename to src/main/resources/assets/botania/models/item/light_gray_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_silver.json b/src/main/resources/assets/botania/models/item/light_gray_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_silver.json rename to src/main/resources/assets/botania/models/item/light_gray_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json b/src/main/resources/assets/botania/models/item/light_gray_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json rename to src/main/resources/assets/botania/models/item/light_gray_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json b/src/main/resources/assets/botania/models/item/lime_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json rename to src/main/resources/assets/botania/models/item/lime_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_lime.json b/src/main/resources/assets/botania/models/item/lime_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_lime.json rename to src/main/resources/assets/botania/models/item/lime_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_lime.json b/src/main/resources/assets/botania/models/item/lime_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_lime.json rename to src/main/resources/assets/botania/models/item/lime_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json b/src/main/resources/assets/botania/models/item/lime_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json rename to src/main/resources/assets/botania/models/item/lime_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/livingrock_wall.json b/src/main/resources/assets/botania/models/item/livingrock_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/livingrock_wall.json rename to src/main/resources/assets/botania/models/item/livingrock_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/livingwood_wall.json b/src/main/resources/assets/botania/models/item/livingwood_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/livingwood_wall.json rename to src/main/resources/assets/botania/models/item/livingwood_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json b/src/main/resources/assets/botania/models/item/magenta_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json rename to src/main/resources/assets/botania/models/item/magenta_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_magenta.json b/src/main/resources/assets/botania/models/item/magenta_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_magenta.json rename to src/main/resources/assets/botania/models/item/magenta_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_magenta.json b/src/main/resources/assets/botania/models/item/magenta_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_magenta.json rename to src/main/resources/assets/botania/models/item/magenta_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json b/src/main/resources/assets/botania/models/item/magenta_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json rename to src/main/resources/assets/botania/models/item/magenta_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json b/src/main/resources/assets/botania/models/item/managlass_pane.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json rename to src/main/resources/assets/botania/models/item/managlass_pane.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_desert_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_forest_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_fungal_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_mesa_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_mountain_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_plains_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_swamp_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json b/src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json rename to src/main/resources/assets/botania/models/item/metamorphic_taiga_cobblestone_wall.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json b/src/main/resources/assets/botania/models/item/orange_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json rename to src/main/resources/assets/botania/models/item/orange_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_orange.json b/src/main/resources/assets/botania/models/item/orange_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_orange.json rename to src/main/resources/assets/botania/models/item/orange_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_orange.json b/src/main/resources/assets/botania/models/item/orange_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_orange.json rename to src/main/resources/assets/botania/models/item/orange_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json b/src/main/resources/assets/botania/models/item/orange_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json rename to src/main/resources/assets/botania/models/item/orange_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json b/src/main/resources/assets/botania/models/item/pink_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json rename to src/main/resources/assets/botania/models/item/pink_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_pink.json b/src/main/resources/assets/botania/models/item/pink_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_pink.json rename to src/main/resources/assets/botania/models/item/pink_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_pink.json b/src/main/resources/assets/botania/models/item/pink_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_pink.json rename to src/main/resources/assets/botania/models/item/pink_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json b/src/main/resources/assets/botania/models/item/pink_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json rename to src/main/resources/assets/botania/models/item/pink_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json b/src/main/resources/assets/botania/models/item/purple_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json rename to src/main/resources/assets/botania/models/item/purple_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_purple.json b/src/main/resources/assets/botania/models/item/purple_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_purple.json rename to src/main/resources/assets/botania/models/item/purple_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_purple.json b/src/main/resources/assets/botania/models/item/purple_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_purple.json rename to src/main/resources/assets/botania/models/item/purple_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json b/src/main/resources/assets/botania/models/item/purple_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json rename to src/main/resources/assets/botania/models/item/purple_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json b/src/main/resources/assets/botania/models/item/red_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json rename to src/main/resources/assets/botania/models/item/red_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_red.json b/src/main/resources/assets/botania/models/item/red_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_red.json rename to src/main/resources/assets/botania/models/item/red_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_red.json b/src/main/resources/assets/botania/models/item/red_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_red.json rename to src/main/resources/assets/botania/models/item/red_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json b/src/main/resources/assets/botania/models/item/red_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json rename to src/main/resources/assets/botania/models/item/red_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/teru_teru_bozu.json b/src/main/resources/assets/botania/models/item/teru_teru_bozu.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/teru_teru_bozu.json rename to src/main/resources/assets/botania/models/item/teru_teru_bozu.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json b/src/main/resources/assets/botania/models/item/white_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json rename to src/main/resources/assets/botania/models/item/white_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_white.json b/src/main/resources/assets/botania/models/item/white_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_white.json rename to src/main/resources/assets/botania/models/item/white_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_white.json b/src/main/resources/assets/botania/models/item/white_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_white.json rename to src/main/resources/assets/botania/models/item/white_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json b/src/main/resources/assets/botania/models/item/white_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json rename to src/main/resources/assets/botania/models/item/white_shiny_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json b/src/main/resources/assets/botania/models/item/yellow_double_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json rename to src/main/resources/assets/botania/models/item/yellow_double_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/mushroom_yellow.json b/src/main/resources/assets/botania/models/item/yellow_mushroom.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/mushroom_yellow.json rename to src/main/resources/assets/botania/models/item/yellow_mushroom.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/flower_yellow.json b/src/main/resources/assets/botania/models/item/yellow_mystical_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/flower_yellow.json rename to src/main/resources/assets/botania/models/item/yellow_mystical_flower.json diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json b/src/main/resources/assets/botania/models/item/yellow_shiny_flower.json similarity index 100% rename from src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json rename to src/main/resources/assets/botania/models/item/yellow_shiny_flower.json