From ef51fd2ff69800accc440ed4a73bef3a0fc7eb1e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 30 Jun 2020 11:40:30 -0500 Subject: [PATCH] Start refactoring blockstate provider Datagenerate alt grass block models Datagenerate mystical and shiny flower models Make buried petals not extend BlockModFlower Datagenerate double flower models --- .../models/block/black_double_flower.json | 6 + .../models/block/black_double_flower_top.json | 6 + .../models/block/black_mystical_flower.json} | 4 +- .../models/block/black_shiny_flower.json | 6 + .../models/block/blue_double_flower.json | 6 + .../models/block/blue_double_flower_top.json | 6 + .../models/block/blue_mystical_flower.json | 4 +- .../models/block/blue_shiny_flower.json} | 4 +- .../models/block/brown_double_flower.json | 6 + .../models/block/brown_double_flower_top.json | 6 + .../models/block/brown_mystical_flower.json | 4 +- .../models/block/brown_shiny_flower.json | 6 + .../models/block/cyan_double_flower.json | 6 + .../models/block/cyan_double_flower_top.json | 6 + .../models/block/cyan_mystical_flower.json | 4 +- .../models/block/cyan_shiny_flower.json} | 4 +- .../botania/models/block/dry_grass.json | 8 ++ .../botania/models/block/golden_grass.json | 8 ++ .../models/block/gray_double_flower.json | 6 + .../models/block/gray_double_flower_top.json | 6 + .../models/block/gray_mystical_flower.json | 4 +- .../models/block/gray_shiny_flower.json} | 4 +- .../models/block/green_double_flower.json | 6 + .../models/block/green_double_flower_top.json | 6 + .../models/block/green_mystical_flower.json | 4 +- .../models/block/green_shiny_flower.json | 6 + .../botania/models/block/infused_grass.json | 8 ++ .../block/light_blue_double_flower.json | 6 + .../block/light_blue_double_flower_top.json | 6 + .../block/light_blue_mystical_flower.json | 4 +- .../models/block/light_blue_shiny_flower.json | 4 +- .../block/light_gray_double_flower.json | 6 + .../block/light_gray_double_flower_top.json | 6 + .../block/light_gray_mystical_flower.json | 4 +- .../models/block/light_gray_shiny_flower.json | 4 +- .../models/block/lime_double_flower.json | 6 + .../models/block/lime_double_flower_top.json | 6 + .../models/block/lime_mystical_flower.json | 4 +- .../models/block/lime_shiny_flower.json | 6 + .../models/block/magenta_double_flower.json | 6 + .../block/magenta_double_flower_top.json | 6 + .../models/block/magenta_mystical_flower.json | 4 +- .../models/block/magenta_shiny_flower.json | 4 +- .../botania/models/block/mutated_grass.json | 8 ++ .../models/block/orange_double_flower.json | 6 + .../block/orange_double_flower_top.json | 6 + .../models/block/orange_mystical_flower.json | 4 +- .../models/block/orange_shiny_flower.json | 4 +- .../models/block/pink_double_flower.json | 6 + .../models/block/pink_double_flower_top.json | 6 + .../models/block/pink_mystical_flower.json | 4 +- .../models/block/pink_shiny_flower.json | 6 + .../models/block/purple_double_flower.json | 6 + .../block/purple_double_flower_top.json | 6 + .../models/block/purple_mystical_flower.json | 4 +- .../models/block/purple_shiny_flower.json | 4 +- .../models/block/red_double_flower.json | 6 + .../models/block/red_double_flower_top.json | 6 + .../models/block/red_mystical_flower.json | 4 +- .../models/block/red_shiny_flower.json} | 4 +- .../botania/models/block/scorched_grass.json | 8 ++ .../botania/models/block/vivid_grass.json | 8 ++ .../models/block/white_double_flower.json | 6 + .../models/block/white_double_flower_top.json | 6 + .../models/block/white_mystical_flower.json | 4 +- .../models/block/white_shiny_flower.json | 4 +- .../models/block/yellow_double_flower.json | 6 + .../block/yellow_double_flower_top.json | 6 + .../models/block/yellow_mystical_flower.json | 4 +- .../models/block/yellow_shiny_flower.json | 4 +- .../models/item/black_double_flower.json | 6 + .../models/item/black_mystical_flower.json | 6 + .../models/item/black_shiny_flower.json | 6 + .../models/item/blue_double_flower.json | 6 + .../models/item/blue_mystical_flower.json | 6 + .../models/item/blue_shiny_flower.json | 6 + .../models/item/brown_double_flower.json | 6 + .../models/item/brown_mystical_flower.json | 6 + .../models/item/brown_shiny_flower.json | 6 + .../models/item/cyan_double_flower.json | 6 + .../models/item/cyan_mystical_flower.json | 6 + .../models/item/cyan_shiny_flower.json | 6 + .../models/item/gray_double_flower.json | 6 + .../models/item/gray_mystical_flower.json | 6 + .../models/item/gray_shiny_flower.json | 6 + .../models/item/green_double_flower.json | 6 + .../models/item/green_mystical_flower.json | 6 + .../models/item/green_shiny_flower.json | 6 + .../models/item/light_blue_double_flower.json | 6 + .../item/light_blue_mystical_flower.json | 6 + .../models/item/light_blue_shiny_flower.json | 6 + .../models/item/light_gray_double_flower.json | 6 + .../item/light_gray_mystical_flower.json | 6 + .../models/item/light_gray_shiny_flower.json | 6 + .../models/item/lime_double_flower.json | 6 + .../models/item/lime_mystical_flower.json | 6 + .../models/item/lime_shiny_flower.json | 6 + .../models/item/magenta_double_flower.json | 6 + .../models/item/magenta_mystical_flower.json | 6 + .../models/item/magenta_shiny_flower.json | 6 + .../models/item/orange_double_flower.json | 6 + .../models/item/orange_mystical_flower.json | 6 + .../models/item/orange_shiny_flower.json | 6 + .../models/item/pink_double_flower.json | 6 + .../models/item/pink_mystical_flower.json | 6 + .../models/item/pink_shiny_flower.json | 6 + .../models/item/purple_double_flower.json | 6 + .../models/item/purple_mystical_flower.json | 6 + .../models/item/purple_shiny_flower.json | 6 + .../models/item/red_double_flower.json | 6 + .../models/item/red_mystical_flower.json | 6 + .../botania/models/item/red_shiny_flower.json | 6 + .../models/item/white_double_flower.json | 6 + .../models/item/white_mystical_flower.json | 6 + .../models/item/white_shiny_flower.json | 6 + .../models/item/yellow_double_flower.json | 6 + .../models/item/yellow_mystical_flower.json | 6 + .../models/item/yellow_shiny_flower.json | 6 + .../common/block/decor/BlockBuriedPetals.java | 38 ++++-- .../botania/data/BlockstateProvider.java | 127 ++++++++++++------ .../vazkii/botania/data/DataGenerators.java | 2 +- .../botania/data/ItemModelProvider.java | 9 +- .../models/block/blue_double_flower_top.json | 6 - .../models/block/blue_shiny_flower.json | 6 - .../models/block/brown_double_flower.json | 6 - .../models/block/brown_double_flower_top.json | 6 - .../models/block/brown_shiny_flower.json | 6 - .../models/block/cyan_double_flower.json | 6 - .../models/block/cyan_double_flower_top.json | 6 - .../models/block/cyan_shiny_flower.json | 6 - .../botania/models/block/dry_grass.json | 8 -- .../botania/models/block/golden_grass.json | 8 -- .../models/block/gray_double_flower.json | 6 - .../models/block/gray_double_flower_top.json | 6 - .../models/block/gray_shiny_flower.json | 6 - .../models/block/green_double_flower.json | 6 - .../models/block/green_double_flower_top.json | 6 - .../models/block/green_shiny_flower.json | 6 - .../botania/models/block/infused_grass.json | 8 -- .../models/block/islands/island_dry.json | 4 +- .../models/block/islands/island_golden.json | 4 +- .../models/block/islands/island_infused.json | 4 +- .../models/block/islands/island_mutated.json | 4 +- .../models/block/islands/island_scorched.json | 4 +- .../models/block/islands/island_vivid.json | 4 +- .../block/light_blue_double_flower.json | 6 - .../block/light_blue_double_flower_top.json | 6 - .../block/light_gray_double_flower.json | 6 - .../block/light_gray_double_flower_top.json | 6 - .../models/block/lime_double_flower.json | 6 - .../models/block/lime_double_flower_top.json | 6 - .../models/block/lime_shiny_flower.json | 6 - .../models/block/magenta_double_flower.json | 6 - .../block/magenta_double_flower_top.json | 6 - .../botania/models/block/mutated_grass.json | 8 -- .../models/block/orange_double_flower.json | 6 - .../block/orange_double_flower_top.json | 6 - .../models/block/pink_double_flower.json | 6 - .../models/block/pink_double_flower_top.json | 6 - .../models/block/pink_shiny_flower.json | 6 - .../models/block/purple_double_flower.json | 6 - .../block/purple_double_flower_top.json | 6 - .../models/block/red_double_flower.json | 6 - .../models/block/red_double_flower_top.json | 6 - .../models/block/red_shiny_flower.json | 6 - .../botania/models/block/scorched_grass.json | 8 -- .../botania/models/block/vivid_grass.json | 8 -- .../models/block/white_double_flower.json | 6 - .../models/block/white_double_flower_top.json | 6 - .../models/block/yellow_double_flower.json | 6 - .../block/yellow_double_flower_top.json | 6 - .../models/item/black_double_flower.json | 6 - .../models/item/black_mystical_flower.json | 6 - .../models/item/black_shiny_flower.json | 6 - .../models/item/blue_double_flower.json | 6 - .../models/item/blue_mystical_flower.json | 6 - .../models/item/blue_shiny_flower.json | 6 - .../models/item/brown_double_flower.json | 6 - .../models/item/brown_mystical_flower.json | 6 - .../models/item/brown_shiny_flower.json | 6 - .../models/item/cyan_double_flower.json | 6 - .../models/item/cyan_mystical_flower.json | 6 - .../models/item/cyan_shiny_flower.json | 6 - .../models/item/gray_double_flower.json | 6 - .../models/item/gray_mystical_flower.json | 6 - .../models/item/gray_shiny_flower.json | 6 - .../models/item/green_double_flower.json | 6 - .../models/item/green_mystical_flower.json | 6 - .../models/item/green_shiny_flower.json | 6 - .../models/item/light_blue_double_flower.json | 6 - .../item/light_blue_mystical_flower.json | 6 - .../models/item/light_blue_shiny_flower.json | 6 - .../models/item/light_gray_double_flower.json | 6 - .../item/light_gray_mystical_flower.json | 6 - .../models/item/light_gray_shiny_flower.json | 6 - .../models/item/lime_double_flower.json | 6 - .../models/item/lime_mystical_flower.json | 6 - .../models/item/lime_shiny_flower.json | 6 - .../models/item/magenta_double_flower.json | 6 - .../models/item/magenta_mystical_flower.json | 6 - .../models/item/magenta_shiny_flower.json | 6 - .../models/item/orange_double_flower.json | 6 - .../models/item/orange_mystical_flower.json | 6 - .../models/item/orange_shiny_flower.json | 6 - .../models/item/pink_double_flower.json | 6 - .../models/item/pink_mystical_flower.json | 6 - .../models/item/pink_shiny_flower.json | 6 - .../models/item/purple_double_flower.json | 6 - .../models/item/purple_mystical_flower.json | 6 - .../models/item/purple_shiny_flower.json | 6 - .../models/item/red_double_flower.json | 6 - .../models/item/red_mystical_flower.json | 6 - .../botania/models/item/red_shiny_flower.json | 6 - .../models/item/white_double_flower.json | 6 - .../models/item/white_mystical_flower.json | 6 - .../models/item/white_shiny_flower.json | 6 - .../models/item/yellow_double_flower.json | 6 - .../models/item/yellow_mystical_flower.json | 6 - .../models/item/yellow_shiny_flower.json | 6 - ...wer15tall0.png => black_double_flower.png} | Bin ...5tall1.png => black_double_flower_top.png} | Bin ...flower15.png => black_mystical_flower.png} | Bin ...limmering15.png => black_shiny_flower.png} | Bin ...ower11tall0.png => blue_double_flower.png} | Bin ...11tall1.png => blue_double_flower_top.png} | Bin ...{flower11.png => blue_mystical_flower.png} | Bin ...glimmering11.png => blue_shiny_flower.png} | Bin ...wer12tall0.png => brown_double_flower.png} | Bin ...2tall1.png => brown_double_flower_top.png} | Bin ...flower12.png => brown_mystical_flower.png} | Bin ...limmering12.png => brown_shiny_flower.png} | Bin ...lower9tall0.png => cyan_double_flower.png} | Bin ...r9tall1.png => cyan_double_flower_top.png} | Bin .../{flower9.png => cyan_mystical_flower.png} | Bin ...rglimmering9.png => cyan_shiny_flower.png} | Bin .../{altgrass1.png => dry_grass_side.png} | Bin .../{altgrass0.png => dry_grass_top.png} | Bin .../{altgrass3.png => golden_grass_side.png} | Bin .../{altgrass2.png => golden_grass_top.png} | Bin ...lower7tall0.png => gray_double_flower.png} | Bin ...r7tall1.png => gray_double_flower_top.png} | Bin .../{flower7.png => gray_mystical_flower.png} | Bin ...rglimmering7.png => gray_shiny_flower.png} | Bin ...wer13tall0.png => green_double_flower.png} | Bin ...3tall1.png => green_double_flower_top.png} | Bin ...flower13.png => green_mystical_flower.png} | Bin ...limmering13.png => green_shiny_flower.png} | Bin .../{altgrass9.png => infused_grass_side.png} | Bin .../{altgrass8.png => infused_grass_top.png} | Bin ...tall0.png => light_blue_double_flower.png} | Bin ...1.png => light_blue_double_flower_top.png} | Bin ...er3.png => light_blue_mystical_flower.png} | Bin ...ering3.png => light_blue_shiny_flower.png} | Bin ...tall0.png => light_gray_double_flower.png} | Bin ...1.png => light_gray_double_flower_top.png} | Bin ...er8.png => light_gray_mystical_flower.png} | Bin ...ering8.png => light_gray_shiny_flower.png} | Bin ...lower5tall0.png => lime_double_flower.png} | Bin ...r5tall1.png => lime_double_flower_top.png} | Bin .../{flower5.png => lime_mystical_flower.png} | Bin ...rglimmering5.png => lime_shiny_flower.png} | Bin ...er2tall0.png => magenta_double_flower.png} | Bin ...all1.png => magenta_double_flower_top.png} | Bin ...lower2.png => magenta_mystical_flower.png} | Bin ...immering2.png => magenta_shiny_flower.png} | Bin ...{altgrass11.png => mutated_grass_side.png} | Bin .../{altgrass10.png => mutated_grass_top.png} | Bin ...wer1tall0.png => orange_double_flower.png} | Bin ...tall1.png => orange_double_flower_top.png} | Bin ...flower1.png => orange_mystical_flower.png} | Bin ...limmering1.png => orange_shiny_flower.png} | Bin ...lower6tall0.png => pink_double_flower.png} | Bin ...r6tall1.png => pink_double_flower_top.png} | Bin .../{flower6.png => pink_mystical_flower.png} | Bin ...rglimmering6.png => pink_shiny_flower.png} | Bin ...er10tall0.png => purple_double_flower.png} | Bin ...tall1.png => purple_double_flower_top.png} | Bin ...lower10.png => purple_mystical_flower.png} | Bin ...immering10.png => purple_shiny_flower.png} | Bin ...lower14tall0.png => red_double_flower.png} | Bin ...r14tall1.png => red_double_flower_top.png} | Bin .../{flower14.png => red_mystical_flower.png} | Bin ...rglimmering14.png => red_shiny_flower.png} | Bin ...{altgrass7.png => scorched_grass_side.png} | Bin .../{altgrass6.png => scorched_grass_top.png} | Bin .../{altgrass5.png => vivid_grass_side.png} | Bin .../{altgrass4.png => vivid_grass_top.png} | Bin ...ower0tall0.png => white_double_flower.png} | Bin ...0tall1.png => white_double_flower_top.png} | Bin ...{flower0.png => white_mystical_flower.png} | Bin ...glimmering0.png => white_shiny_flower.png} | Bin ...wer4tall0.png => yellow_double_flower.png} | Bin ...tall1.png => yellow_double_flower_top.png} | Bin ...flower4.png => yellow_mystical_flower.png} | Bin ...limmering4.png => yellow_shiny_flower.png} | Bin 295 files changed, 745 insertions(+), 679 deletions(-) create mode 100644 src/generated/resources/assets/botania/models/block/black_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/black_double_flower_top.json rename src/{main/resources/assets/botania/models/block/black_shiny_flower.json => generated/resources/assets/botania/models/block/black_mystical_flower.json} (55%) create mode 100644 src/generated/resources/assets/botania/models/block/black_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/blue_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/blue_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/blue_mystical_flower.json (55%) rename src/{main/resources/assets/botania/models/block/black_double_flower_top.json => generated/resources/assets/botania/models/block/blue_shiny_flower.json} (57%) create mode 100644 src/generated/resources/assets/botania/models/block/brown_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/brown_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/brown_mystical_flower.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/brown_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/cyan_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/cyan_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/cyan_mystical_flower.json (55%) rename src/{main/resources/assets/botania/models/block/black_mystical_flower.json => generated/resources/assets/botania/models/block/cyan_shiny_flower.json} (57%) create mode 100644 src/generated/resources/assets/botania/models/block/dry_grass.json create mode 100644 src/generated/resources/assets/botania/models/block/golden_grass.json create mode 100644 src/generated/resources/assets/botania/models/block/gray_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/gray_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/gray_mystical_flower.json (55%) rename src/{main/resources/assets/botania/models/block/blue_double_flower.json => generated/resources/assets/botania/models/block/gray_shiny_flower.json} (57%) create mode 100644 src/generated/resources/assets/botania/models/block/green_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/green_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/green_mystical_flower.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/green_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/infused_grass.json create mode 100644 src/generated/resources/assets/botania/models/block/light_blue_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/light_blue_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/light_blue_mystical_flower.json (52%) rename src/{main => generated}/resources/assets/botania/models/block/light_blue_shiny_flower.json (54%) create mode 100644 src/generated/resources/assets/botania/models/block/light_gray_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/light_gray_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/light_gray_mystical_flower.json (52%) rename src/{main => generated}/resources/assets/botania/models/block/light_gray_shiny_flower.json (54%) create mode 100644 src/generated/resources/assets/botania/models/block/lime_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/lime_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/lime_mystical_flower.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/lime_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/magenta_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/magenta_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/magenta_mystical_flower.json (54%) rename src/{main => generated}/resources/assets/botania/models/block/magenta_shiny_flower.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/mutated_grass.json create mode 100644 src/generated/resources/assets/botania/models/block/orange_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/orange_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/orange_mystical_flower.json (54%) rename src/{main => generated}/resources/assets/botania/models/block/orange_shiny_flower.json (56%) create mode 100644 src/generated/resources/assets/botania/models/block/pink_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/pink_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/pink_mystical_flower.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/pink_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/purple_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/purple_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/purple_mystical_flower.json (54%) rename src/{main => generated}/resources/assets/botania/models/block/purple_shiny_flower.json (56%) create mode 100644 src/generated/resources/assets/botania/models/block/red_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/red_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/red_mystical_flower.json (56%) rename src/{main/resources/assets/botania/models/block/black_double_flower.json => generated/resources/assets/botania/models/block/red_shiny_flower.json} (57%) create mode 100644 src/generated/resources/assets/botania/models/block/scorched_grass.json create mode 100644 src/generated/resources/assets/botania/models/block/vivid_grass.json create mode 100644 src/generated/resources/assets/botania/models/block/white_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/white_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/white_mystical_flower.json (55%) rename src/{main => generated}/resources/assets/botania/models/block/white_shiny_flower.json (56%) create mode 100644 src/generated/resources/assets/botania/models/block/yellow_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/yellow_double_flower_top.json rename src/{main => generated}/resources/assets/botania/models/block/yellow_mystical_flower.json (54%) rename src/{main => generated}/resources/assets/botania/models/block/yellow_shiny_flower.json (56%) create mode 100644 src/generated/resources/assets/botania/models/item/black_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/black_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/black_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/blue_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/blue_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/blue_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/brown_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/brown_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/brown_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/cyan_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/cyan_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/cyan_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/gray_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/gray_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/gray_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/green_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/green_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/green_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/light_blue_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/light_blue_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/light_blue_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/light_gray_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/light_gray_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/light_gray_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/lime_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/lime_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/lime_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/magenta_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/magenta_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/magenta_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/orange_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/orange_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/orange_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/pink_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/pink_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/pink_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/purple_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/purple_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/purple_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/red_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/red_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/red_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/white_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/white_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/white_shiny_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/yellow_double_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/yellow_mystical_flower.json create mode 100644 src/generated/resources/assets/botania/models/item/yellow_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/blue_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/blue_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/brown_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/brown_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/brown_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/cyan_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/cyan_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/cyan_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/dry_grass.json delete mode 100644 src/main/resources/assets/botania/models/block/golden_grass.json delete mode 100644 src/main/resources/assets/botania/models/block/gray_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/gray_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/gray_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/green_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/green_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/green_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/infused_grass.json delete mode 100644 src/main/resources/assets/botania/models/block/light_blue_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/light_blue_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/light_gray_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/light_gray_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/lime_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/lime_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/lime_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/magenta_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/magenta_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/mutated_grass.json delete mode 100644 src/main/resources/assets/botania/models/block/orange_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/orange_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/pink_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/pink_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/pink_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/purple_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/purple_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/red_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/red_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/red_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/scorched_grass.json delete mode 100644 src/main/resources/assets/botania/models/block/vivid_grass.json delete mode 100644 src/main/resources/assets/botania/models/block/white_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/white_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/block/yellow_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/block/yellow_double_flower_top.json delete mode 100644 src/main/resources/assets/botania/models/item/black_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/black_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/black_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/blue_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/blue_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/blue_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/brown_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/brown_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/brown_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/cyan_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/cyan_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/cyan_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/gray_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/gray_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/gray_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/green_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/green_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/green_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/light_blue_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/light_blue_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/light_blue_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/light_gray_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/light_gray_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/light_gray_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/lime_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/lime_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/lime_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/magenta_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/magenta_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/magenta_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/orange_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/orange_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/orange_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/pink_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/pink_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/pink_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/purple_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/purple_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/purple_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/red_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/red_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/red_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/white_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/white_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/white_shiny_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/yellow_double_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/yellow_mystical_flower.json delete mode 100644 src/main/resources/assets/botania/models/item/yellow_shiny_flower.json rename src/main/resources/assets/botania/textures/block/{flower15tall0.png => black_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower15tall1.png => black_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower15.png => black_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering15.png => black_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower11tall0.png => blue_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower11tall1.png => blue_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower11.png => blue_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering11.png => blue_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower12tall0.png => brown_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower12tall1.png => brown_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower12.png => brown_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering12.png => brown_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower9tall0.png => cyan_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower9tall1.png => cyan_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower9.png => cyan_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering9.png => cyan_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass1.png => dry_grass_side.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass0.png => dry_grass_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass3.png => golden_grass_side.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass2.png => golden_grass_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower7tall0.png => gray_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower7tall1.png => gray_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower7.png => gray_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering7.png => gray_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower13tall0.png => green_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower13tall1.png => green_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower13.png => green_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering13.png => green_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass9.png => infused_grass_side.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass8.png => infused_grass_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower3tall0.png => light_blue_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower3tall1.png => light_blue_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower3.png => light_blue_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering3.png => light_blue_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower8tall0.png => light_gray_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower8tall1.png => light_gray_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower8.png => light_gray_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering8.png => light_gray_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower5tall0.png => lime_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower5tall1.png => lime_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower5.png => lime_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering5.png => lime_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower2tall0.png => magenta_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower2tall1.png => magenta_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower2.png => magenta_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering2.png => magenta_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass11.png => mutated_grass_side.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass10.png => mutated_grass_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower1tall0.png => orange_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower1tall1.png => orange_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower1.png => orange_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering1.png => orange_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower6tall0.png => pink_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower6tall1.png => pink_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower6.png => pink_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering6.png => pink_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower10tall0.png => purple_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower10tall1.png => purple_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower10.png => purple_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering10.png => purple_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower14tall0.png => red_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower14tall1.png => red_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower14.png => red_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering14.png => red_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass7.png => scorched_grass_side.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass6.png => scorched_grass_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass5.png => vivid_grass_side.png} (100%) rename src/main/resources/assets/botania/textures/block/{altgrass4.png => vivid_grass_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower0tall0.png => white_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower0tall1.png => white_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower0.png => white_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering0.png => white_shiny_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower4tall0.png => yellow_double_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower4tall1.png => yellow_double_flower_top.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower4.png => yellow_mystical_flower.png} (100%) rename src/main/resources/assets/botania/textures/block/{flowerglimmering4.png => yellow_shiny_flower.png} (100%) diff --git a/src/generated/resources/assets/botania/models/block/black_double_flower.json b/src/generated/resources/assets/botania/models/block/black_double_flower.json new file mode 100644 index 000000000..ac5c4d64f --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/black_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/black_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/black_double_flower_top.json b/src/generated/resources/assets/botania/models/block/black_double_flower_top.json new file mode 100644 index 000000000..b50d87841 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/black_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/black_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/black_shiny_flower.json b/src/generated/resources/assets/botania/models/block/black_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/black_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/black_mystical_flower.json index 0cefdc2f1..eee65e733 100644 --- a/src/main/resources/assets/botania/models/block/black_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/black_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering15" + "cross": "botania:block/black_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/black_shiny_flower.json b/src/generated/resources/assets/botania/models/block/black_shiny_flower.json new file mode 100644 index 000000000..b62a356f3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/black_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/black_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/blue_double_flower.json b/src/generated/resources/assets/botania/models/block/blue_double_flower.json new file mode 100644 index 000000000..b177b2df6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/blue_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/blue_double_flower_top.json b/src/generated/resources/assets/botania/models/block/blue_double_flower_top.json new file mode 100644 index 000000000..c4afd348e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/blue_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/blue_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blue_mystical_flower.json b/src/generated/resources/assets/botania/models/block/blue_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/blue_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/blue_mystical_flower.json index aab58c450..7b12a26fd 100644 --- a/src/main/resources/assets/botania/models/block/blue_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/blue_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower11" + "cross": "botania:block/blue_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/black_double_flower_top.json b/src/generated/resources/assets/botania/models/block/blue_shiny_flower.json similarity index 57% rename from src/main/resources/assets/botania/models/block/black_double_flower_top.json rename to src/generated/resources/assets/botania/models/block/blue_shiny_flower.json index 5bc2e1488..00cb44eff 100644 --- a/src/main/resources/assets/botania/models/block/black_double_flower_top.json +++ b/src/generated/resources/assets/botania/models/block/blue_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower15tall1" + "cross": "botania:block/blue_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/brown_double_flower.json b/src/generated/resources/assets/botania/models/block/brown_double_flower.json new file mode 100644 index 000000000..0d011bf1f --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/brown_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/brown_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/brown_double_flower_top.json b/src/generated/resources/assets/botania/models/block/brown_double_flower_top.json new file mode 100644 index 000000000..7accfb3dd --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/brown_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/brown_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/brown_mystical_flower.json b/src/generated/resources/assets/botania/models/block/brown_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/brown_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/brown_mystical_flower.json index 3a209d9bf..e22a96315 100644 --- a/src/main/resources/assets/botania/models/block/brown_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/brown_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower12" + "cross": "botania:block/brown_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/brown_shiny_flower.json b/src/generated/resources/assets/botania/models/block/brown_shiny_flower.json new file mode 100644 index 000000000..127d1fad2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/brown_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/brown_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/cyan_double_flower.json b/src/generated/resources/assets/botania/models/block/cyan_double_flower.json new file mode 100644 index 000000000..7ad78dee3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/cyan_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/cyan_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/cyan_double_flower_top.json b/src/generated/resources/assets/botania/models/block/cyan_double_flower_top.json new file mode 100644 index 000000000..b7604c947 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/cyan_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/cyan_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cyan_mystical_flower.json b/src/generated/resources/assets/botania/models/block/cyan_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/cyan_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/cyan_mystical_flower.json index fc8daa679..7558cf377 100644 --- a/src/main/resources/assets/botania/models/block/cyan_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/cyan_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower9" + "cross": "botania:block/cyan_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/black_mystical_flower.json b/src/generated/resources/assets/botania/models/block/cyan_shiny_flower.json similarity index 57% rename from src/main/resources/assets/botania/models/block/black_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/cyan_shiny_flower.json index 4ef00631c..376dd1155 100644 --- a/src/main/resources/assets/botania/models/block/black_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/cyan_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower15" + "cross": "botania:block/cyan_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/dry_grass.json b/src/generated/resources/assets/botania/models/block/dry_grass.json new file mode 100644 index 000000000..4e9a12acf --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/dry_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/dry_grass_side", + "bottom": "block/dirt", + "top": "botania:block/dry_grass_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/golden_grass.json b/src/generated/resources/assets/botania/models/block/golden_grass.json new file mode 100644 index 000000000..fa030d012 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/golden_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/golden_grass_side", + "bottom": "block/dirt", + "top": "botania:block/golden_grass_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gray_double_flower.json b/src/generated/resources/assets/botania/models/block/gray_double_flower.json new file mode 100644 index 000000000..c63a54fa0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/gray_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gray_double_flower_top.json b/src/generated/resources/assets/botania/models/block/gray_double_flower_top.json new file mode 100644 index 000000000..da9b18597 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gray_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/gray_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gray_mystical_flower.json b/src/generated/resources/assets/botania/models/block/gray_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/gray_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/gray_mystical_flower.json index 3e41f0258..4343090ed 100644 --- a/src/main/resources/assets/botania/models/block/gray_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/gray_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower7" + "cross": "botania:block/gray_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blue_double_flower.json b/src/generated/resources/assets/botania/models/block/gray_shiny_flower.json similarity index 57% rename from src/main/resources/assets/botania/models/block/blue_double_flower.json rename to src/generated/resources/assets/botania/models/block/gray_shiny_flower.json index 8c51bb9d1..8b3226085 100644 --- a/src/main/resources/assets/botania/models/block/blue_double_flower.json +++ b/src/generated/resources/assets/botania/models/block/gray_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower11tall0" + "cross": "botania:block/gray_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/green_double_flower.json b/src/generated/resources/assets/botania/models/block/green_double_flower.json new file mode 100644 index 000000000..7d33551b9 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/green_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/green_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/green_double_flower_top.json b/src/generated/resources/assets/botania/models/block/green_double_flower_top.json new file mode 100644 index 000000000..16fa78762 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/green_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/green_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/green_mystical_flower.json b/src/generated/resources/assets/botania/models/block/green_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/green_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/green_mystical_flower.json index e6aa6c39d..14e0db07d 100644 --- a/src/main/resources/assets/botania/models/block/green_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/green_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower13" + "cross": "botania:block/green_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/green_shiny_flower.json b/src/generated/resources/assets/botania/models/block/green_shiny_flower.json new file mode 100644 index 000000000..888552242 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/green_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/green_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/infused_grass.json b/src/generated/resources/assets/botania/models/block/infused_grass.json new file mode 100644 index 000000000..ac2c3f678 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/infused_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/infused_grass_side", + "bottom": "block/dirt", + "top": "botania:block/infused_grass_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_blue_double_flower.json b/src/generated/resources/assets/botania/models/block/light_blue_double_flower.json new file mode 100644 index 000000000..00260bd1c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/light_blue_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_blue_double_flower_top.json b/src/generated/resources/assets/botania/models/block/light_blue_double_flower_top.json new file mode 100644 index 000000000..3f3f2e255 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_blue_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/light_blue_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_blue_mystical_flower.json b/src/generated/resources/assets/botania/models/block/light_blue_mystical_flower.json similarity index 52% rename from src/main/resources/assets/botania/models/block/light_blue_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/light_blue_mystical_flower.json index dfdd16b24..58345fb6e 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/light_blue_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower3" + "cross": "botania:block/light_blue_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_blue_shiny_flower.json b/src/generated/resources/assets/botania/models/block/light_blue_shiny_flower.json similarity index 54% rename from src/main/resources/assets/botania/models/block/light_blue_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/light_blue_shiny_flower.json index ca9061624..4a60dd3f4 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/light_blue_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering3" + "cross": "botania:block/light_blue_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_gray_double_flower.json b/src/generated/resources/assets/botania/models/block/light_gray_double_flower.json new file mode 100644 index 000000000..49c4ec769 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/light_gray_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_gray_double_flower_top.json b/src/generated/resources/assets/botania/models/block/light_gray_double_flower_top.json new file mode 100644 index 000000000..64fc4e2ad --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_gray_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/light_gray_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_gray_mystical_flower.json b/src/generated/resources/assets/botania/models/block/light_gray_mystical_flower.json similarity index 52% rename from src/main/resources/assets/botania/models/block/light_gray_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/light_gray_mystical_flower.json index 2f69d7abe..09557af5c 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/light_gray_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower8" + "cross": "botania:block/light_gray_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_gray_shiny_flower.json b/src/generated/resources/assets/botania/models/block/light_gray_shiny_flower.json similarity index 54% rename from src/main/resources/assets/botania/models/block/light_gray_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/light_gray_shiny_flower.json index 8f68d839d..7391c67a0 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/light_gray_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering8" + "cross": "botania:block/light_gray_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/lime_double_flower.json b/src/generated/resources/assets/botania/models/block/lime_double_flower.json new file mode 100644 index 000000000..5a5dfcc9a --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/lime_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/lime_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/lime_double_flower_top.json b/src/generated/resources/assets/botania/models/block/lime_double_flower_top.json new file mode 100644 index 000000000..7af8ac724 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/lime_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/lime_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/lime_mystical_flower.json b/src/generated/resources/assets/botania/models/block/lime_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/lime_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/lime_mystical_flower.json index 5b169ea29..ececb602b 100644 --- a/src/main/resources/assets/botania/models/block/lime_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/lime_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower5" + "cross": "botania:block/lime_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/lime_shiny_flower.json b/src/generated/resources/assets/botania/models/block/lime_shiny_flower.json new file mode 100644 index 000000000..0a25d3d25 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/lime_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/lime_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/magenta_double_flower.json b/src/generated/resources/assets/botania/models/block/magenta_double_flower.json new file mode 100644 index 000000000..a45415193 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/magenta_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/magenta_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/magenta_double_flower_top.json b/src/generated/resources/assets/botania/models/block/magenta_double_flower_top.json new file mode 100644 index 000000000..d37cd5e85 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/magenta_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/magenta_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/magenta_mystical_flower.json b/src/generated/resources/assets/botania/models/block/magenta_mystical_flower.json similarity index 54% rename from src/main/resources/assets/botania/models/block/magenta_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/magenta_mystical_flower.json index 66fcc5cc8..568ce90ae 100644 --- a/src/main/resources/assets/botania/models/block/magenta_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/magenta_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower2" + "cross": "botania:block/magenta_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/magenta_shiny_flower.json b/src/generated/resources/assets/botania/models/block/magenta_shiny_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/magenta_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/magenta_shiny_flower.json index e3de49933..1b37a4332 100644 --- a/src/main/resources/assets/botania/models/block/magenta_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/magenta_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering2" + "cross": "botania:block/magenta_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mutated_grass.json b/src/generated/resources/assets/botania/models/block/mutated_grass.json new file mode 100644 index 000000000..ff2624087 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mutated_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/mutated_grass_side", + "bottom": "block/dirt", + "top": "botania:block/mutated_grass_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/orange_double_flower.json b/src/generated/resources/assets/botania/models/block/orange_double_flower.json new file mode 100644 index 000000000..1cbc8225f --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/orange_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/orange_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/orange_double_flower_top.json b/src/generated/resources/assets/botania/models/block/orange_double_flower_top.json new file mode 100644 index 000000000..b883fbb88 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/orange_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/orange_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/orange_mystical_flower.json b/src/generated/resources/assets/botania/models/block/orange_mystical_flower.json similarity index 54% rename from src/main/resources/assets/botania/models/block/orange_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/orange_mystical_flower.json index 5a0d3e12f..a2cb7e406 100644 --- a/src/main/resources/assets/botania/models/block/orange_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/orange_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower1" + "cross": "botania:block/orange_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/orange_shiny_flower.json b/src/generated/resources/assets/botania/models/block/orange_shiny_flower.json similarity index 56% rename from src/main/resources/assets/botania/models/block/orange_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/orange_shiny_flower.json index 77ea5df8c..7663a94ac 100644 --- a/src/main/resources/assets/botania/models/block/orange_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/orange_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering1" + "cross": "botania:block/orange_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/pink_double_flower.json b/src/generated/resources/assets/botania/models/block/pink_double_flower.json new file mode 100644 index 000000000..8263c937a --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/pink_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/pink_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/pink_double_flower_top.json b/src/generated/resources/assets/botania/models/block/pink_double_flower_top.json new file mode 100644 index 000000000..bbc1c6642 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/pink_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/pink_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pink_mystical_flower.json b/src/generated/resources/assets/botania/models/block/pink_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/pink_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/pink_mystical_flower.json index 090091fc1..471b49999 100644 --- a/src/main/resources/assets/botania/models/block/pink_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/pink_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower6" + "cross": "botania:block/pink_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/pink_shiny_flower.json b/src/generated/resources/assets/botania/models/block/pink_shiny_flower.json new file mode 100644 index 000000000..64933b539 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/pink_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/pink_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/purple_double_flower.json b/src/generated/resources/assets/botania/models/block/purple_double_flower.json new file mode 100644 index 000000000..c27a5a272 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/purple_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/purple_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/purple_double_flower_top.json b/src/generated/resources/assets/botania/models/block/purple_double_flower_top.json new file mode 100644 index 000000000..767cfa63b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/purple_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/purple_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/purple_mystical_flower.json b/src/generated/resources/assets/botania/models/block/purple_mystical_flower.json similarity index 54% rename from src/main/resources/assets/botania/models/block/purple_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/purple_mystical_flower.json index 941ae0a8e..43e9eae83 100644 --- a/src/main/resources/assets/botania/models/block/purple_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/purple_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower10" + "cross": "botania:block/purple_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/purple_shiny_flower.json b/src/generated/resources/assets/botania/models/block/purple_shiny_flower.json similarity index 56% rename from src/main/resources/assets/botania/models/block/purple_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/purple_shiny_flower.json index f835741aa..6adda155e 100644 --- a/src/main/resources/assets/botania/models/block/purple_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/purple_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering10" + "cross": "botania:block/purple_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_double_flower.json b/src/generated/resources/assets/botania/models/block/red_double_flower.json new file mode 100644 index 000000000..8fec63c34 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/red_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_double_flower_top.json b/src/generated/resources/assets/botania/models/block/red_double_flower_top.json new file mode 100644 index 000000000..44a08e971 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/red_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_mystical_flower.json b/src/generated/resources/assets/botania/models/block/red_mystical_flower.json similarity index 56% rename from src/main/resources/assets/botania/models/block/red_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/red_mystical_flower.json index 6940bbce2..540177cac 100644 --- a/src/main/resources/assets/botania/models/block/red_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/red_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower14" + "cross": "botania:block/red_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/black_double_flower.json b/src/generated/resources/assets/botania/models/block/red_shiny_flower.json similarity index 57% rename from src/main/resources/assets/botania/models/block/black_double_flower.json rename to src/generated/resources/assets/botania/models/block/red_shiny_flower.json index 0889412df..13b1b2079 100644 --- a/src/main/resources/assets/botania/models/block/black_double_flower.json +++ b/src/generated/resources/assets/botania/models/block/red_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower15tall0" + "cross": "botania:block/red_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/scorched_grass.json b/src/generated/resources/assets/botania/models/block/scorched_grass.json new file mode 100644 index 000000000..434e304de --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/scorched_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/scorched_grass_side", + "bottom": "block/dirt", + "top": "botania:block/scorched_grass_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/vivid_grass.json b/src/generated/resources/assets/botania/models/block/vivid_grass.json new file mode 100644 index 000000000..bafabc6b7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/vivid_grass.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "side": "botania:block/vivid_grass_side", + "bottom": "block/dirt", + "top": "botania:block/vivid_grass_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/white_double_flower.json b/src/generated/resources/assets/botania/models/block/white_double_flower.json new file mode 100644 index 000000000..9416884c2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/white_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/white_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/white_double_flower_top.json b/src/generated/resources/assets/botania/models/block/white_double_flower_top.json new file mode 100644 index 000000000..4b971c601 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/white_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/white_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/white_mystical_flower.json b/src/generated/resources/assets/botania/models/block/white_mystical_flower.json similarity index 55% rename from src/main/resources/assets/botania/models/block/white_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/white_mystical_flower.json index 6482176d3..1cbf76a31 100644 --- a/src/main/resources/assets/botania/models/block/white_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/white_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower0" + "cross": "botania:block/white_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/white_shiny_flower.json b/src/generated/resources/assets/botania/models/block/white_shiny_flower.json similarity index 56% rename from src/main/resources/assets/botania/models/block/white_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/white_shiny_flower.json index e7c5b94da..9bf768365 100644 --- a/src/main/resources/assets/botania/models/block/white_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/white_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering0" + "cross": "botania:block/white_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/yellow_double_flower.json b/src/generated/resources/assets/botania/models/block/yellow_double_flower.json new file mode 100644 index 000000000..c6a4c9c95 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/yellow_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/yellow_double_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/yellow_double_flower_top.json b/src/generated/resources/assets/botania/models/block/yellow_double_flower_top.json new file mode 100644 index 000000000..44cd8352c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/yellow_double_flower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "botania:block/yellow_double_flower_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/yellow_mystical_flower.json b/src/generated/resources/assets/botania/models/block/yellow_mystical_flower.json similarity index 54% rename from src/main/resources/assets/botania/models/block/yellow_mystical_flower.json rename to src/generated/resources/assets/botania/models/block/yellow_mystical_flower.json index 4f5034803..6ec407c71 100644 --- a/src/main/resources/assets/botania/models/block/yellow_mystical_flower.json +++ b/src/generated/resources/assets/botania/models/block/yellow_mystical_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower4" + "cross": "botania:block/yellow_mystical_flower" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/yellow_shiny_flower.json b/src/generated/resources/assets/botania/models/block/yellow_shiny_flower.json similarity index 56% rename from src/main/resources/assets/botania/models/block/yellow_shiny_flower.json rename to src/generated/resources/assets/botania/models/block/yellow_shiny_flower.json index 7a22f8bf0..5b9ac8f5a 100644 --- a/src/main/resources/assets/botania/models/block/yellow_shiny_flower.json +++ b/src/generated/resources/assets/botania/models/block/yellow_shiny_flower.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flowerglimmering4" + "cross": "botania:block/yellow_shiny_flower" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/black_double_flower.json b/src/generated/resources/assets/botania/models/item/black_double_flower.json new file mode 100644 index 000000000..57183f5bf --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/black_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/black_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/black_mystical_flower.json b/src/generated/resources/assets/botania/models/item/black_mystical_flower.json new file mode 100644 index 000000000..473564d7f --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/black_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/black_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/black_shiny_flower.json b/src/generated/resources/assets/botania/models/item/black_shiny_flower.json new file mode 100644 index 000000000..dd9612862 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/black_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/black_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/blue_double_flower.json b/src/generated/resources/assets/botania/models/item/blue_double_flower.json new file mode 100644 index 000000000..d586457fe --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/blue_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/blue_mystical_flower.json b/src/generated/resources/assets/botania/models/item/blue_mystical_flower.json new file mode 100644 index 000000000..e4168d861 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/blue_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/blue_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/blue_shiny_flower.json b/src/generated/resources/assets/botania/models/item/blue_shiny_flower.json new file mode 100644 index 000000000..a226a8064 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/blue_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/blue_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brown_double_flower.json b/src/generated/resources/assets/botania/models/item/brown_double_flower.json new file mode 100644 index 000000000..ada86506a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brown_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/brown_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brown_mystical_flower.json b/src/generated/resources/assets/botania/models/item/brown_mystical_flower.json new file mode 100644 index 000000000..44dcbcd54 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brown_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/brown_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brown_shiny_flower.json b/src/generated/resources/assets/botania/models/item/brown_shiny_flower.json new file mode 100644 index 000000000..cda926bb0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brown_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/brown_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/cyan_double_flower.json b/src/generated/resources/assets/botania/models/item/cyan_double_flower.json new file mode 100644 index 000000000..3ba21e595 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/cyan_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/cyan_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/cyan_mystical_flower.json b/src/generated/resources/assets/botania/models/item/cyan_mystical_flower.json new file mode 100644 index 000000000..57406f628 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/cyan_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/cyan_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/cyan_shiny_flower.json b/src/generated/resources/assets/botania/models/item/cyan_shiny_flower.json new file mode 100644 index 000000000..e8a470475 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/cyan_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/cyan_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/gray_double_flower.json b/src/generated/resources/assets/botania/models/item/gray_double_flower.json new file mode 100644 index 000000000..c79ba417c --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/gray_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/gray_mystical_flower.json b/src/generated/resources/assets/botania/models/item/gray_mystical_flower.json new file mode 100644 index 000000000..f10ddbaef --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/gray_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/gray_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/gray_shiny_flower.json b/src/generated/resources/assets/botania/models/item/gray_shiny_flower.json new file mode 100644 index 000000000..728a91f11 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/gray_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/gray_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/green_double_flower.json b/src/generated/resources/assets/botania/models/item/green_double_flower.json new file mode 100644 index 000000000..430bdd188 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/green_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/green_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/green_mystical_flower.json b/src/generated/resources/assets/botania/models/item/green_mystical_flower.json new file mode 100644 index 000000000..8e4e670e6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/green_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/green_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/green_shiny_flower.json b/src/generated/resources/assets/botania/models/item/green_shiny_flower.json new file mode 100644 index 000000000..17c6f89e3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/green_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/green_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_blue_double_flower.json b/src/generated/resources/assets/botania/models/item/light_blue_double_flower.json new file mode 100644 index 000000000..03c2c8f9d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_blue_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_blue_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_blue_mystical_flower.json b/src/generated/resources/assets/botania/models/item/light_blue_mystical_flower.json new file mode 100644 index 000000000..0bcce629e --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_blue_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_blue_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_blue_shiny_flower.json b/src/generated/resources/assets/botania/models/item/light_blue_shiny_flower.json new file mode 100644 index 000000000..3fb66940b --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_blue_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_blue_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_gray_double_flower.json b/src/generated/resources/assets/botania/models/item/light_gray_double_flower.json new file mode 100644 index 000000000..f714d59e1 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_gray_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_gray_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_gray_mystical_flower.json b/src/generated/resources/assets/botania/models/item/light_gray_mystical_flower.json new file mode 100644 index 000000000..7513e68fe --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_gray_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_gray_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_gray_shiny_flower.json b/src/generated/resources/assets/botania/models/item/light_gray_shiny_flower.json new file mode 100644 index 000000000..c5f9c718a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_gray_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_gray_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/lime_double_flower.json b/src/generated/resources/assets/botania/models/item/lime_double_flower.json new file mode 100644 index 000000000..fe1c84e70 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/lime_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/lime_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/lime_mystical_flower.json b/src/generated/resources/assets/botania/models/item/lime_mystical_flower.json new file mode 100644 index 000000000..55b011eef --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/lime_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/lime_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/lime_shiny_flower.json b/src/generated/resources/assets/botania/models/item/lime_shiny_flower.json new file mode 100644 index 000000000..7abd6dcd5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/lime_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/lime_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/magenta_double_flower.json b/src/generated/resources/assets/botania/models/item/magenta_double_flower.json new file mode 100644 index 000000000..764150d1d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/magenta_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/magenta_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/magenta_mystical_flower.json b/src/generated/resources/assets/botania/models/item/magenta_mystical_flower.json new file mode 100644 index 000000000..f27955df3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/magenta_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/magenta_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/magenta_shiny_flower.json b/src/generated/resources/assets/botania/models/item/magenta_shiny_flower.json new file mode 100644 index 000000000..c09d2d87f --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/magenta_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/magenta_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/orange_double_flower.json b/src/generated/resources/assets/botania/models/item/orange_double_flower.json new file mode 100644 index 000000000..dbd946a94 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/orange_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/orange_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/orange_mystical_flower.json b/src/generated/resources/assets/botania/models/item/orange_mystical_flower.json new file mode 100644 index 000000000..b2fa99b71 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/orange_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/orange_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/orange_shiny_flower.json b/src/generated/resources/assets/botania/models/item/orange_shiny_flower.json new file mode 100644 index 000000000..6ddff4221 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/orange_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/orange_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/pink_double_flower.json b/src/generated/resources/assets/botania/models/item/pink_double_flower.json new file mode 100644 index 000000000..8fbcbef3b --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/pink_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/pink_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/pink_mystical_flower.json b/src/generated/resources/assets/botania/models/item/pink_mystical_flower.json new file mode 100644 index 000000000..02decb6bd --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/pink_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/pink_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/pink_shiny_flower.json b/src/generated/resources/assets/botania/models/item/pink_shiny_flower.json new file mode 100644 index 000000000..a022302bf --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/pink_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/pink_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/purple_double_flower.json b/src/generated/resources/assets/botania/models/item/purple_double_flower.json new file mode 100644 index 000000000..eb4b36b2a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/purple_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/purple_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/purple_mystical_flower.json b/src/generated/resources/assets/botania/models/item/purple_mystical_flower.json new file mode 100644 index 000000000..09bff7f91 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/purple_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/purple_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/purple_shiny_flower.json b/src/generated/resources/assets/botania/models/item/purple_shiny_flower.json new file mode 100644 index 000000000..6ea1a251c --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/purple_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/purple_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/red_double_flower.json b/src/generated/resources/assets/botania/models/item/red_double_flower.json new file mode 100644 index 000000000..f7bf4151c --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/red_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/red_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/red_mystical_flower.json b/src/generated/resources/assets/botania/models/item/red_mystical_flower.json new file mode 100644 index 000000000..2596a0cd0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/red_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/red_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/red_shiny_flower.json b/src/generated/resources/assets/botania/models/item/red_shiny_flower.json new file mode 100644 index 000000000..21a715940 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/red_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/red_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/white_double_flower.json b/src/generated/resources/assets/botania/models/item/white_double_flower.json new file mode 100644 index 000000000..7ef5c090b --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/white_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/white_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/white_mystical_flower.json b/src/generated/resources/assets/botania/models/item/white_mystical_flower.json new file mode 100644 index 000000000..99063b0e3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/white_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/white_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/white_shiny_flower.json b/src/generated/resources/assets/botania/models/item/white_shiny_flower.json new file mode 100644 index 000000000..9ab8f3eec --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/white_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/white_shiny_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/yellow_double_flower.json b/src/generated/resources/assets/botania/models/item/yellow_double_flower.json new file mode 100644 index 000000000..a40da6d2b --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/yellow_double_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/yellow_double_flower_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/yellow_mystical_flower.json b/src/generated/resources/assets/botania/models/item/yellow_mystical_flower.json new file mode 100644 index 000000000..c498f57ac --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/yellow_mystical_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/yellow_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/yellow_shiny_flower.json b/src/generated/resources/assets/botania/models/item/yellow_shiny_flower.json new file mode 100644 index 000000000..23d761125 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/yellow_shiny_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/yellow_shiny_flower" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 08c872048..1df237020 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -8,38 +8,33 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.Block; -import net.minecraft.block.BlockRenderType; -import net.minecraft.block.BlockState; +import net.minecraft.block.*; import net.minecraft.item.DyeColor; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.block.BlockModFlower; +import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; import java.util.Random; -public class BlockBuriedPetals extends BlockModFlower { +public class BlockBuriedPetals extends BushBlock implements IGrowable { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 1.6, 16); - public BlockBuriedPetals(DyeColor color, Properties builder) { - super(color, builder); - } + private final DyeColor color; - @Nonnull - @Override - @OnlyIn(Dist.CLIENT) - public Block.OffsetType getOffsetType() { - return Block.OffsetType.NONE; + public BlockBuriedPetals(DyeColor color, Properties builder) { + super(builder); + this.color = color; } @Nonnull @@ -66,4 +61,21 @@ public class BlockBuriedPetals extends BlockModFlower { return BlockRenderType.INVISIBLE; } + @Override + public boolean canGrow(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, boolean fuckifiknow) { + return world.getBlockState(pos.up()).isAir(world, pos); + } + + @Override + public boolean canUseBonemeal(@Nonnull World world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull BlockState state) { + return canGrow(world, pos, state, false); + } + + @Override + public void grow(@Nonnull ServerWorld world, @Nonnull Random rand, @Nonnull BlockPos pos, @Nonnull BlockState state) { + Block block = ModBlocks.getDoubleFlower(color); + if (block instanceof DoublePlantBlock) { + ((DoublePlantBlock) block).placeAt(world, pos, 3); + } + } } diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 153153320..6b9731336 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -25,18 +25,19 @@ import net.minecraftforge.client.model.generators.ExistingFileHelper; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; -import vazkii.botania.common.block.BlockAltGrass; -import vazkii.botania.common.block.BlockSpecialFlower; -import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.*; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; +import vazkii.botania.common.block.decor.BlockShinyFlower; import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.Map; +import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; import java.util.stream.IntStream; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; @@ -54,19 +55,68 @@ public class BlockstateProvider extends BlockStateProvider { @Override protected void registerStatesAndModels() { - Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace())) - .forEach(b -> { - if (b == ModBlocks.craftCrate || b == ModBlocks.ghostRail - || b == ModBlocks.solidVines) { - return; - } + Set blocks = Registry.BLOCK.stream() + .filter(b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace())) + .collect(Collectors.toSet()); + // Manually written blockstates + models + blocks.remove(ModBlocks.craftCrate); + blocks.remove(ModBlocks.ghostRail); + blocks.remove(ModBlocks.solidVines); + // Single blocks + String elfGlassName = Registry.BLOCK.getKey(ModBlocks.elfGlass).getPath(); + ConfiguredModel[] elfGlassFiles = IntStream.rangeClosed(0, 3) + .mapToObj(i -> models().getExistingFile(prefix("block/" + elfGlassName + "_" + i))) + .map(ConfiguredModel::new).toArray(ConfiguredModel[]::new); + getVariantBuilder(ModBlocks.elfGlass).partialState().setModels(elfGlassFiles); + blocks.remove(ModBlocks.elfGlass); + + String plateName = Registry.BLOCK.getKey(ModBlocks.incensePlate).getPath(); + ModelFile plateFile = models().getExistingFile(prefix("block/" + plateName)); + horizontalBlock(ModBlocks.incensePlate, plateFile, 0); + blocks.remove(ModBlocks.incensePlate); + + // Block types + Predicate flowers = b -> b instanceof BlockSpecialFlower + || b instanceof BlockModMushroom + || b instanceof BlockModFlower; + takeAll(blocks, flowers).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + ModelFile model = models().withExistingParent(name, prefix("block/shapes/cross")) + .texture("cross", prefix("block/" + name)); + simpleBlock(b, model); + }); + + takeAll(blocks, ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall).forEach(b -> { + ModelFile file = models().getExistingFile(new ResourceLocation("block/soul_sand")); + getVariantBuilder(b).partialState().setModels(new ConfiguredModel(file)); + }); + + takeAll(blocks, b -> b instanceof BlockAltGrass).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + ResourceLocation side = prefix("block/" + name + "_side"); + ResourceLocation top = prefix("block/" + name + "_top"); + ModelFile model = models().cubeBottomTop(name, side, new ResourceLocation("block/dirt"), top); + getVariantBuilder(b).partialState().setModels(new ConfiguredModel(model), + new ConfiguredModel(model, 0, 90, false), + new ConfiguredModel(model, 0, 180, false), + new ConfiguredModel(model, 0, 270, false)); + }); + + takeAll(blocks, b -> b instanceof BlockRedString).forEach(this::redStringBlock); + + takeAll(blocks, b -> b instanceof BlockModDoubleFlower).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + ModelFile bottom = models().cross(name, prefix("block/" + name)); + ModelFile top = models().cross(name + "_top", prefix("block/" + name + "_top")); + getVariantBuilder(b) + .partialState().with(TallFlowerBlock.HALF, DoubleBlockHalf.LOWER).setModels(new ConfiguredModel(bottom)) + .partialState().with(TallFlowerBlock.HALF, DoubleBlockHalf.UPPER).setModels(new ConfiguredModel(top)); + }); + + blocks.forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); - if (b instanceof BlockSpecialFlower || b instanceof BlockModMushroom) { - ModelFile model = models().withExistingParent(name, prefix("block/shapes/cross")) - .texture("cross", prefix("block/" + name)); - simpleBlock(b, model); - } else if (name.contains("quartz") && b instanceof RotatedPillarBlock) { + if (name.contains("quartz") && b instanceof RotatedPillarBlock) { ModelFile file = models().getExistingFile(prefix("block/" + name)); getVariantBuilder(b) .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).setModels(new ConfiguredModel(file, 90, 90, false)) @@ -106,31 +156,9 @@ public class BlockstateProvider extends BlockStateProvider { ModelFile noSide = models().getExistingFile(prefix("block/" + name + "_noside")); ModelFile noSideAlt = models().getExistingFile(prefix("block/" + name + "_noside_alt")); paneBlock((PaneBlock) b, post, side, sideAlt, noSide, noSideAlt); - } else if (b instanceof TallFlowerBlock) { - ModelFile bottom = models().getExistingFile(prefix("block/" + name)); - ModelFile top = models().getExistingFile(prefix("block/" + name + "_top")); - getVariantBuilder(b) - .partialState().with(TallFlowerBlock.HALF, DoubleBlockHalf.LOWER).setModels(new ConfiguredModel(bottom)) - .partialState().with(TallFlowerBlock.HALF, DoubleBlockHalf.UPPER).setModels(new ConfiguredModel(top)); - } else if (b instanceof BlockAltGrass) { - ModelFile model = models().getExistingFile(prefix("block/" + name)); - getVariantBuilder(b).partialState().setModels(new ConfiguredModel(model), - new ConfiguredModel(model, 0, 90, false), - new ConfiguredModel(model, 0, 180, false), - new ConfiguredModel(model, 0, 270, false)); - } else if (b == ModBlocks.gaiaHead || b == ModBlocks.gaiaHeadWall) { - ModelFile file = models().getExistingFile(new ResourceLocation("block/soul_sand")); - getVariantBuilder(b).partialState().setModels(new ConfiguredModel(file)); } else if (b instanceof BlockPetalBlock) { ModelFile file = models().getExistingFile(prefix("block/petal_block")); getVariantBuilder(b).partialState().setModels(new ConfiguredModel(file)); - } else if (b instanceof BlockRedString) { - redStringBlock(b); - } else if (b == ModBlocks.elfGlass) { - ConfiguredModel[] files = IntStream.rangeClosed(0, 3) - .mapToObj(i -> models().getExistingFile(prefix("block/" + name + "_" + i))) - .map(ConfiguredModel::new).toArray(ConfiguredModel[]::new); - getVariantBuilder(b).partialState().setModels(files); } else if (b == ModBlocks.enderEye || b == ModBlocks.manaDetector) { ModelFile offFile = models().getExistingFile(prefix("block/" + name)); ModelFile onFile = models().getExistingFile(prefix("block/" + name + "_powered")); @@ -139,15 +167,34 @@ public class BlockstateProvider extends BlockStateProvider { } else if (b == ModBlocks.tinyPotato || b == ModBlocks.felPumpkin || b == ModBlocks.pump) { ModelFile file = models().getExistingFile(prefix("block/" + name)); horizontalBlock(b, file); - } else if (b == ModBlocks.incensePlate) { - ModelFile file = models().getExistingFile(prefix("block/" + name)); - horizontalBlock(b, file, 0); } else { simpleBlock(b, models().getExistingFile(prefix("block/" + name))); } }); } + @SafeVarargs + private static Iterable takeAll(Set src, T... items) { + List ret = Arrays.asList(items); + src.removeAll(ret); + return ret; + } + + private static Iterable takeAll(Set src, Predicate pred) { + List ret = new ArrayList<>(); + + Iterator iter = src.iterator(); + while (iter.hasNext()) { + T item = iter.next(); + if (pred.test(item)) { + iter.remove(); + ret.add(item); + } + } + + return ret; + } + private static final Map> DIRECTION_TO_WALL_SIDE = ImmutableMap.>builder() .put(Direction.NORTH, WallBlock.field_235613_c_) .put(Direction.EAST, WallBlock.field_235612_b_) diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index 2a1192ba1..b17dbd1e7 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -30,8 +30,8 @@ public class DataGenerators { evt.getGenerator().addProvider(new RuneProvider(evt.getGenerator())); } if (evt.includeClient()) { - evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); + evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); } } diff --git a/src/main/java/vazkii/botania/data/ItemModelProvider.java b/src/main/java/vazkii/botania/data/ItemModelProvider.java index 44d2bb324..08b4d8f6f 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -14,9 +14,12 @@ import net.minecraft.item.BlockItem; import net.minecraft.util.registry.Registry; import net.minecraftforge.client.model.generators.ExistingFileHelper; +import vazkii.botania.common.block.BlockModDoubleFlower; +import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockModMushroom; +import vazkii.botania.common.block.decor.BlockShinyFlower; import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.lib.LibMisc; @@ -37,10 +40,14 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator if (i instanceof BlockItem) { Block b = ((BlockItem) i).getBlock(); String name = Registry.ITEM.getKey(i).getPath(); - if (b instanceof BlockSpecialFlower || b instanceof BlockModMushroom) { + if (b instanceof BlockSpecialFlower || b instanceof BlockModMushroom + || b instanceof BlockModFlower + ) { withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name)); } else if (b instanceof BlockFloatingFlower || b instanceof BlockRedString) { withExistingParent(name, prefix("block/" + name)); + } else if (b instanceof BlockModDoubleFlower) { + withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name + "_top")); } } }); 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 deleted file mode 100644 index f400c2734..000000000 --- a/src/main/resources/assets/botania/models/block/blue_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower11tall1" - } -} 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 deleted file mode 100644 index 4aac73309..000000000 --- a/src/main/resources/assets/botania/models/block/blue_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 1672d5806..000000000 --- a/src/main/resources/assets/botania/models/block/brown_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 22cc21cd4..000000000 --- a/src/main/resources/assets/botania/models/block/brown_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower12tall1" - } -} 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 deleted file mode 100644 index cf4890566..000000000 --- a/src/main/resources/assets/botania/models/block/brown_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flowerglimmering12" - } -} 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 deleted file mode 100644 index 3852d8b92..000000000 --- a/src/main/resources/assets/botania/models/block/cyan_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index ab0863c6d..000000000 --- a/src/main/resources/assets/botania/models/block/cyan_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower9tall1" - } -} 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 deleted file mode 100644 index eca18dfc9..000000000 --- a/src/main/resources/assets/botania/models/block/cyan_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flowerglimmering9" - } -} diff --git a/src/main/resources/assets/botania/models/block/dry_grass.json b/src/main/resources/assets/botania/models/block/dry_grass.json deleted file mode 100644 index df5967bed..000000000 --- a/src/main/resources/assets/botania/models/block/dry_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "minecraft:block/dirt", - "top": "botania:block/altgrass0", - "side": "botania:block/altgrass1" - } -} diff --git a/src/main/resources/assets/botania/models/block/golden_grass.json b/src/main/resources/assets/botania/models/block/golden_grass.json deleted file mode 100644 index 29a616d68..000000000 --- a/src/main/resources/assets/botania/models/block/golden_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "minecraft:block/dirt", - "top": "botania:block/altgrass2", - "side": "botania:block/altgrass3" - } -} 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 deleted file mode 100644 index 33e196492..000000000 --- a/src/main/resources/assets/botania/models/block/gray_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 8ac648950..000000000 --- a/src/main/resources/assets/botania/models/block/gray_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower7tall1" - } -} 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 deleted file mode 100644 index 110118129..000000000 --- a/src/main/resources/assets/botania/models/block/gray_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 99bd2152f..000000000 --- a/src/main/resources/assets/botania/models/block/green_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 1b28ed6da..000000000 --- a/src/main/resources/assets/botania/models/block/green_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower13tall1" - } -} 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 deleted file mode 100644 index 3e76d2788..000000000 --- a/src/main/resources/assets/botania/models/block/green_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flowerglimmering13" - } -} diff --git a/src/main/resources/assets/botania/models/block/infused_grass.json b/src/main/resources/assets/botania/models/block/infused_grass.json deleted file mode 100644 index 3239806d6..000000000 --- a/src/main/resources/assets/botania/models/block/infused_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "minecraft:block/dirt", - "top": "botania:block/altgrass8", - "side": "botania:block/altgrass9" - } -} diff --git a/src/main/resources/assets/botania/models/block/islands/island_dry.json b/src/main/resources/assets/botania/models/block/islands/island_dry.json index 30d9588f4..28edc8dd1 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_dry.json +++ b/src/main/resources/assets/botania/models/block/islands/island_dry.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:block/altgrass0", - "side": "botania:block/altgrass1" + "top": "botania:block/dry_grass_top", + "side": "botania:block/dry_grass_side" } } diff --git a/src/main/resources/assets/botania/models/block/islands/island_golden.json b/src/main/resources/assets/botania/models/block/islands/island_golden.json index 4d771af9f..ff1cacffb 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_golden.json +++ b/src/main/resources/assets/botania/models/block/islands/island_golden.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:block/altgrass2", - "side": "botania:block/altgrass3" + "top": "botania:block/golden_grass_top", + "side": "botania:block/golden_grass_side" } } diff --git a/src/main/resources/assets/botania/models/block/islands/island_infused.json b/src/main/resources/assets/botania/models/block/islands/island_infused.json index 9c591dde7..661ad41c5 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_infused.json +++ b/src/main/resources/assets/botania/models/block/islands/island_infused.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:block/altgrass8", - "side": "botania:block/altgrass9" + "top": "botania:block/infused_grass_top", + "side": "botania:block/infused_grass_side" } } diff --git a/src/main/resources/assets/botania/models/block/islands/island_mutated.json b/src/main/resources/assets/botania/models/block/islands/island_mutated.json index d520d1d94..b7172c91e 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_mutated.json +++ b/src/main/resources/assets/botania/models/block/islands/island_mutated.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:block/altgrass10", - "side": "botania:block/altgrass11" + "top": "botania:block/mutated_grass_top", + "side": "botania:block/mutated_grass_side" } } diff --git a/src/main/resources/assets/botania/models/block/islands/island_scorched.json b/src/main/resources/assets/botania/models/block/islands/island_scorched.json index e59c952f5..52df361c3 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_scorched.json +++ b/src/main/resources/assets/botania/models/block/islands/island_scorched.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:block/altgrass6", - "side": "botania:block/altgrass7" + "top": "botania:block/scorched_grass_top", + "side": "botania:block/scorched_grass_side" } } diff --git a/src/main/resources/assets/botania/models/block/islands/island_vivid.json b/src/main/resources/assets/botania/models/block/islands/island_vivid.json index 3831c9138..09dcb9d90 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_vivid.json +++ b/src/main/resources/assets/botania/models/block/islands/island_vivid.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:block/altgrass4", - "side": "botania:block/altgrass5" + "top": "botania:block/vivid_grass_top", + "side": "botania:block/vivid_grass_side" } } 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 deleted file mode 100644 index 02ab47948..000000000 --- a/src/main/resources/assets/botania/models/block/light_blue_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 4f234380c..000000000 --- a/src/main/resources/assets/botania/models/block/light_blue_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower3tall1" - } -} 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 deleted file mode 100644 index 84311cc8d..000000000 --- a/src/main/resources/assets/botania/models/block/light_gray_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 88afe530d..000000000 --- a/src/main/resources/assets/botania/models/block/light_gray_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower8tall1" - } -} 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 deleted file mode 100644 index 25b585c49..000000000 --- a/src/main/resources/assets/botania/models/block/lime_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 7b46a0d47..000000000 --- a/src/main/resources/assets/botania/models/block/lime_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower5tall1" - } -} 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 deleted file mode 100644 index 8de2886f6..000000000 --- a/src/main/resources/assets/botania/models/block/lime_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flowerglimmering5" - } -} 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 deleted file mode 100644 index b9bf53874..000000000 --- a/src/main/resources/assets/botania/models/block/magenta_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index c0fdd6a11..000000000 --- a/src/main/resources/assets/botania/models/block/magenta_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower2tall1" - } -} diff --git a/src/main/resources/assets/botania/models/block/mutated_grass.json b/src/main/resources/assets/botania/models/block/mutated_grass.json deleted file mode 100644 index 4d5817797..000000000 --- a/src/main/resources/assets/botania/models/block/mutated_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "minecraft:block/dirt", - "top": "botania:block/altgrass10", - "side": "botania:block/altgrass11" - } -} 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 deleted file mode 100644 index ca2c8da44..000000000 --- a/src/main/resources/assets/botania/models/block/orange_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 65069ddb2..000000000 --- a/src/main/resources/assets/botania/models/block/orange_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower1tall1" - } -} 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 deleted file mode 100644 index c50b65dbc..000000000 --- a/src/main/resources/assets/botania/models/block/pink_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 34328fa58..000000000 --- a/src/main/resources/assets/botania/models/block/pink_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower6tall1" - } -} 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 deleted file mode 100644 index 76b0455ac..000000000 --- a/src/main/resources/assets/botania/models/block/pink_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flowerglimmering6" - } -} 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 deleted file mode 100644 index 4ea4c4388..000000000 --- a/src/main/resources/assets/botania/models/block/purple_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 2173229c3..000000000 --- a/src/main/resources/assets/botania/models/block/purple_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower10tall1" - } -} 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 deleted file mode 100644 index fb32bbf61..000000000 --- a/src/main/resources/assets/botania/models/block/red_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 26cc3add6..000000000 --- a/src/main/resources/assets/botania/models/block/red_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower14tall1" - } -} 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 deleted file mode 100644 index 7c538fdd8..000000000 --- a/src/main/resources/assets/botania/models/block/red_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flowerglimmering14" - } -} diff --git a/src/main/resources/assets/botania/models/block/scorched_grass.json b/src/main/resources/assets/botania/models/block/scorched_grass.json deleted file mode 100644 index 718ddb944..000000000 --- a/src/main/resources/assets/botania/models/block/scorched_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "minecraft:block/dirt", - "top": "botania:block/altgrass6", - "side": "botania:block/altgrass7" - } -} diff --git a/src/main/resources/assets/botania/models/block/vivid_grass.json b/src/main/resources/assets/botania/models/block/vivid_grass.json deleted file mode 100644 index 492f27b94..000000000 --- a/src/main/resources/assets/botania/models/block/vivid_grass.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "minecraft:block/dirt", - "top": "botania:block/altgrass4", - "side": "botania:block/altgrass5" - } -} 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 deleted file mode 100644 index 208e95f74..000000000 --- a/src/main/resources/assets/botania/models/block/white_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index bb7aa48f0..000000000 --- a/src/main/resources/assets/botania/models/block/white_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower0tall1" - } -} 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 deleted file mode 100644 index 50bb4a026..000000000 --- a/src/main/resources/assets/botania/models/block/yellow_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/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 deleted file mode 100644 index 401ed7a4b..000000000 --- a/src/main/resources/assets/botania/models/block/yellow_double_flower_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower4tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/black_double_flower.json b/src/main/resources/assets/botania/models/item/black_double_flower.json deleted file mode 100644 index 44a1d3760..000000000 --- a/src/main/resources/assets/botania/models/item/black_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower15tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/black_mystical_flower.json b/src/main/resources/assets/botania/models/item/black_mystical_flower.json deleted file mode 100644 index e37232d99..000000000 --- a/src/main/resources/assets/botania/models/item/black_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower15" - } -} diff --git a/src/main/resources/assets/botania/models/item/black_shiny_flower.json b/src/main/resources/assets/botania/models/item/black_shiny_flower.json deleted file mode 100644 index d456ff898..000000000 --- a/src/main/resources/assets/botania/models/item/black_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering15" - } -} diff --git a/src/main/resources/assets/botania/models/item/blue_double_flower.json b/src/main/resources/assets/botania/models/item/blue_double_flower.json deleted file mode 100644 index 6f559f929..000000000 --- a/src/main/resources/assets/botania/models/item/blue_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower11tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/blue_mystical_flower.json b/src/main/resources/assets/botania/models/item/blue_mystical_flower.json deleted file mode 100644 index 677213e2b..000000000 --- a/src/main/resources/assets/botania/models/item/blue_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower11" - } -} diff --git a/src/main/resources/assets/botania/models/item/blue_shiny_flower.json b/src/main/resources/assets/botania/models/item/blue_shiny_flower.json deleted file mode 100644 index 2429cd106..000000000 --- a/src/main/resources/assets/botania/models/item/blue_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering11" - } -} diff --git a/src/main/resources/assets/botania/models/item/brown_double_flower.json b/src/main/resources/assets/botania/models/item/brown_double_flower.json deleted file mode 100644 index f04469360..000000000 --- a/src/main/resources/assets/botania/models/item/brown_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower12tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/brown_mystical_flower.json b/src/main/resources/assets/botania/models/item/brown_mystical_flower.json deleted file mode 100644 index 52de022f6..000000000 --- a/src/main/resources/assets/botania/models/item/brown_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower12" - } -} diff --git a/src/main/resources/assets/botania/models/item/brown_shiny_flower.json b/src/main/resources/assets/botania/models/item/brown_shiny_flower.json deleted file mode 100644 index 82ad8715c..000000000 --- a/src/main/resources/assets/botania/models/item/brown_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering12" - } -} diff --git a/src/main/resources/assets/botania/models/item/cyan_double_flower.json b/src/main/resources/assets/botania/models/item/cyan_double_flower.json deleted file mode 100644 index 25c5ed395..000000000 --- a/src/main/resources/assets/botania/models/item/cyan_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower9tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/cyan_mystical_flower.json b/src/main/resources/assets/botania/models/item/cyan_mystical_flower.json deleted file mode 100644 index a3862f287..000000000 --- a/src/main/resources/assets/botania/models/item/cyan_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower9" - } -} diff --git a/src/main/resources/assets/botania/models/item/cyan_shiny_flower.json b/src/main/resources/assets/botania/models/item/cyan_shiny_flower.json deleted file mode 100644 index aade61667..000000000 --- a/src/main/resources/assets/botania/models/item/cyan_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering9" - } -} diff --git a/src/main/resources/assets/botania/models/item/gray_double_flower.json b/src/main/resources/assets/botania/models/item/gray_double_flower.json deleted file mode 100644 index 2bbb47213..000000000 --- a/src/main/resources/assets/botania/models/item/gray_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower7tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/gray_mystical_flower.json b/src/main/resources/assets/botania/models/item/gray_mystical_flower.json deleted file mode 100644 index ac758db18..000000000 --- a/src/main/resources/assets/botania/models/item/gray_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower7" - } -} diff --git a/src/main/resources/assets/botania/models/item/gray_shiny_flower.json b/src/main/resources/assets/botania/models/item/gray_shiny_flower.json deleted file mode 100644 index ae5d2176b..000000000 --- a/src/main/resources/assets/botania/models/item/gray_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering7" - } -} diff --git a/src/main/resources/assets/botania/models/item/green_double_flower.json b/src/main/resources/assets/botania/models/item/green_double_flower.json deleted file mode 100644 index d9621e77a..000000000 --- a/src/main/resources/assets/botania/models/item/green_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower13tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/green_mystical_flower.json b/src/main/resources/assets/botania/models/item/green_mystical_flower.json deleted file mode 100644 index 10899f9b8..000000000 --- a/src/main/resources/assets/botania/models/item/green_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower13" - } -} diff --git a/src/main/resources/assets/botania/models/item/green_shiny_flower.json b/src/main/resources/assets/botania/models/item/green_shiny_flower.json deleted file mode 100644 index 6b71d8d09..000000000 --- a/src/main/resources/assets/botania/models/item/green_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering13" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_blue_double_flower.json b/src/main/resources/assets/botania/models/item/light_blue_double_flower.json deleted file mode 100644 index 189f8f216..000000000 --- a/src/main/resources/assets/botania/models/item/light_blue_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower3tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_blue_mystical_flower.json b/src/main/resources/assets/botania/models/item/light_blue_mystical_flower.json deleted file mode 100644 index 9d04f7b48..000000000 --- a/src/main/resources/assets/botania/models/item/light_blue_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower3" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_blue_shiny_flower.json b/src/main/resources/assets/botania/models/item/light_blue_shiny_flower.json deleted file mode 100644 index b164a9a80..000000000 --- a/src/main/resources/assets/botania/models/item/light_blue_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering3" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_gray_double_flower.json b/src/main/resources/assets/botania/models/item/light_gray_double_flower.json deleted file mode 100644 index 8abd7fb5d..000000000 --- a/src/main/resources/assets/botania/models/item/light_gray_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower8tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_gray_mystical_flower.json b/src/main/resources/assets/botania/models/item/light_gray_mystical_flower.json deleted file mode 100644 index 19b5fab60..000000000 --- a/src/main/resources/assets/botania/models/item/light_gray_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower8" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_gray_shiny_flower.json b/src/main/resources/assets/botania/models/item/light_gray_shiny_flower.json deleted file mode 100644 index 7b5af48c8..000000000 --- a/src/main/resources/assets/botania/models/item/light_gray_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering8" - } -} diff --git a/src/main/resources/assets/botania/models/item/lime_double_flower.json b/src/main/resources/assets/botania/models/item/lime_double_flower.json deleted file mode 100644 index b18d59f5d..000000000 --- a/src/main/resources/assets/botania/models/item/lime_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower5tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/lime_mystical_flower.json b/src/main/resources/assets/botania/models/item/lime_mystical_flower.json deleted file mode 100644 index cd7368d9f..000000000 --- a/src/main/resources/assets/botania/models/item/lime_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower5" - } -} diff --git a/src/main/resources/assets/botania/models/item/lime_shiny_flower.json b/src/main/resources/assets/botania/models/item/lime_shiny_flower.json deleted file mode 100644 index 55a631c09..000000000 --- a/src/main/resources/assets/botania/models/item/lime_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering5" - } -} diff --git a/src/main/resources/assets/botania/models/item/magenta_double_flower.json b/src/main/resources/assets/botania/models/item/magenta_double_flower.json deleted file mode 100644 index b76e52c9c..000000000 --- a/src/main/resources/assets/botania/models/item/magenta_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower2tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/magenta_mystical_flower.json b/src/main/resources/assets/botania/models/item/magenta_mystical_flower.json deleted file mode 100644 index 685cb1288..000000000 --- a/src/main/resources/assets/botania/models/item/magenta_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower2" - } -} diff --git a/src/main/resources/assets/botania/models/item/magenta_shiny_flower.json b/src/main/resources/assets/botania/models/item/magenta_shiny_flower.json deleted file mode 100644 index 3165249ea..000000000 --- a/src/main/resources/assets/botania/models/item/magenta_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering2" - } -} diff --git a/src/main/resources/assets/botania/models/item/orange_double_flower.json b/src/main/resources/assets/botania/models/item/orange_double_flower.json deleted file mode 100644 index d4995bdb9..000000000 --- a/src/main/resources/assets/botania/models/item/orange_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower1tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/orange_mystical_flower.json b/src/main/resources/assets/botania/models/item/orange_mystical_flower.json deleted file mode 100644 index 7f6063fc3..000000000 --- a/src/main/resources/assets/botania/models/item/orange_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower1" - } -} diff --git a/src/main/resources/assets/botania/models/item/orange_shiny_flower.json b/src/main/resources/assets/botania/models/item/orange_shiny_flower.json deleted file mode 100644 index 94e5a1332..000000000 --- a/src/main/resources/assets/botania/models/item/orange_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering1" - } -} diff --git a/src/main/resources/assets/botania/models/item/pink_double_flower.json b/src/main/resources/assets/botania/models/item/pink_double_flower.json deleted file mode 100644 index b33e410c2..000000000 --- a/src/main/resources/assets/botania/models/item/pink_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower6tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/pink_mystical_flower.json b/src/main/resources/assets/botania/models/item/pink_mystical_flower.json deleted file mode 100644 index db2f1aba1..000000000 --- a/src/main/resources/assets/botania/models/item/pink_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower6" - } -} diff --git a/src/main/resources/assets/botania/models/item/pink_shiny_flower.json b/src/main/resources/assets/botania/models/item/pink_shiny_flower.json deleted file mode 100644 index eca45fac2..000000000 --- a/src/main/resources/assets/botania/models/item/pink_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering6" - } -} diff --git a/src/main/resources/assets/botania/models/item/purple_double_flower.json b/src/main/resources/assets/botania/models/item/purple_double_flower.json deleted file mode 100644 index 47688aacb..000000000 --- a/src/main/resources/assets/botania/models/item/purple_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower10tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/purple_mystical_flower.json b/src/main/resources/assets/botania/models/item/purple_mystical_flower.json deleted file mode 100644 index 49567550b..000000000 --- a/src/main/resources/assets/botania/models/item/purple_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower10" - } -} diff --git a/src/main/resources/assets/botania/models/item/purple_shiny_flower.json b/src/main/resources/assets/botania/models/item/purple_shiny_flower.json deleted file mode 100644 index a221e556c..000000000 --- a/src/main/resources/assets/botania/models/item/purple_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering10" - } -} diff --git a/src/main/resources/assets/botania/models/item/red_double_flower.json b/src/main/resources/assets/botania/models/item/red_double_flower.json deleted file mode 100644 index 8243b4213..000000000 --- a/src/main/resources/assets/botania/models/item/red_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower14tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/red_mystical_flower.json b/src/main/resources/assets/botania/models/item/red_mystical_flower.json deleted file mode 100644 index 3c040d211..000000000 --- a/src/main/resources/assets/botania/models/item/red_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower14" - } -} diff --git a/src/main/resources/assets/botania/models/item/red_shiny_flower.json b/src/main/resources/assets/botania/models/item/red_shiny_flower.json deleted file mode 100644 index 377387962..000000000 --- a/src/main/resources/assets/botania/models/item/red_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering14" - } -} diff --git a/src/main/resources/assets/botania/models/item/white_double_flower.json b/src/main/resources/assets/botania/models/item/white_double_flower.json deleted file mode 100644 index 615840dff..000000000 --- a/src/main/resources/assets/botania/models/item/white_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower0tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/white_mystical_flower.json b/src/main/resources/assets/botania/models/item/white_mystical_flower.json deleted file mode 100644 index b3b78b2d6..000000000 --- a/src/main/resources/assets/botania/models/item/white_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower0" - } -} diff --git a/src/main/resources/assets/botania/models/item/white_shiny_flower.json b/src/main/resources/assets/botania/models/item/white_shiny_flower.json deleted file mode 100644 index 5ee3f215b..000000000 --- a/src/main/resources/assets/botania/models/item/white_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering0" - } -} diff --git a/src/main/resources/assets/botania/models/item/yellow_double_flower.json b/src/main/resources/assets/botania/models/item/yellow_double_flower.json deleted file mode 100644 index 84a1ca2e9..000000000 --- a/src/main/resources/assets/botania/models/item/yellow_double_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower4tall1" - } -} diff --git a/src/main/resources/assets/botania/models/item/yellow_mystical_flower.json b/src/main/resources/assets/botania/models/item/yellow_mystical_flower.json deleted file mode 100644 index 13fb66543..000000000 --- a/src/main/resources/assets/botania/models/item/yellow_mystical_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flower4" - } -} diff --git a/src/main/resources/assets/botania/models/item/yellow_shiny_flower.json b/src/main/resources/assets/botania/models/item/yellow_shiny_flower.json deleted file mode 100644 index efadbcd30..000000000 --- a/src/main/resources/assets/botania/models/item/yellow_shiny_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/flowerglimmering4" - } -} diff --git a/src/main/resources/assets/botania/textures/block/flower15tall0.png b/src/main/resources/assets/botania/textures/block/black_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower15tall0.png rename to src/main/resources/assets/botania/textures/block/black_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower15tall1.png b/src/main/resources/assets/botania/textures/block/black_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower15tall1.png rename to src/main/resources/assets/botania/textures/block/black_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower15.png b/src/main/resources/assets/botania/textures/block/black_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower15.png rename to src/main/resources/assets/botania/textures/block/black_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering15.png b/src/main/resources/assets/botania/textures/block/black_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering15.png rename to src/main/resources/assets/botania/textures/block/black_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower11tall0.png b/src/main/resources/assets/botania/textures/block/blue_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower11tall0.png rename to src/main/resources/assets/botania/textures/block/blue_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower11tall1.png b/src/main/resources/assets/botania/textures/block/blue_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower11tall1.png rename to src/main/resources/assets/botania/textures/block/blue_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower11.png b/src/main/resources/assets/botania/textures/block/blue_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower11.png rename to src/main/resources/assets/botania/textures/block/blue_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering11.png b/src/main/resources/assets/botania/textures/block/blue_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering11.png rename to src/main/resources/assets/botania/textures/block/blue_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower12tall0.png b/src/main/resources/assets/botania/textures/block/brown_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower12tall0.png rename to src/main/resources/assets/botania/textures/block/brown_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower12tall1.png b/src/main/resources/assets/botania/textures/block/brown_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower12tall1.png rename to src/main/resources/assets/botania/textures/block/brown_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower12.png b/src/main/resources/assets/botania/textures/block/brown_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower12.png rename to src/main/resources/assets/botania/textures/block/brown_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering12.png b/src/main/resources/assets/botania/textures/block/brown_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering12.png rename to src/main/resources/assets/botania/textures/block/brown_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower9tall0.png b/src/main/resources/assets/botania/textures/block/cyan_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower9tall0.png rename to src/main/resources/assets/botania/textures/block/cyan_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower9tall1.png b/src/main/resources/assets/botania/textures/block/cyan_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower9tall1.png rename to src/main/resources/assets/botania/textures/block/cyan_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower9.png b/src/main/resources/assets/botania/textures/block/cyan_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower9.png rename to src/main/resources/assets/botania/textures/block/cyan_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering9.png b/src/main/resources/assets/botania/textures/block/cyan_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering9.png rename to src/main/resources/assets/botania/textures/block/cyan_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass1.png b/src/main/resources/assets/botania/textures/block/dry_grass_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass1.png rename to src/main/resources/assets/botania/textures/block/dry_grass_side.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass0.png b/src/main/resources/assets/botania/textures/block/dry_grass_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass0.png rename to src/main/resources/assets/botania/textures/block/dry_grass_top.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass3.png b/src/main/resources/assets/botania/textures/block/golden_grass_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass3.png rename to src/main/resources/assets/botania/textures/block/golden_grass_side.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass2.png b/src/main/resources/assets/botania/textures/block/golden_grass_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass2.png rename to src/main/resources/assets/botania/textures/block/golden_grass_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower7tall0.png b/src/main/resources/assets/botania/textures/block/gray_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower7tall0.png rename to src/main/resources/assets/botania/textures/block/gray_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower7tall1.png b/src/main/resources/assets/botania/textures/block/gray_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower7tall1.png rename to src/main/resources/assets/botania/textures/block/gray_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower7.png b/src/main/resources/assets/botania/textures/block/gray_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower7.png rename to src/main/resources/assets/botania/textures/block/gray_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering7.png b/src/main/resources/assets/botania/textures/block/gray_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering7.png rename to src/main/resources/assets/botania/textures/block/gray_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower13tall0.png b/src/main/resources/assets/botania/textures/block/green_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower13tall0.png rename to src/main/resources/assets/botania/textures/block/green_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower13tall1.png b/src/main/resources/assets/botania/textures/block/green_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower13tall1.png rename to src/main/resources/assets/botania/textures/block/green_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower13.png b/src/main/resources/assets/botania/textures/block/green_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower13.png rename to src/main/resources/assets/botania/textures/block/green_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering13.png b/src/main/resources/assets/botania/textures/block/green_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering13.png rename to src/main/resources/assets/botania/textures/block/green_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass9.png b/src/main/resources/assets/botania/textures/block/infused_grass_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass9.png rename to src/main/resources/assets/botania/textures/block/infused_grass_side.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass8.png b/src/main/resources/assets/botania/textures/block/infused_grass_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass8.png rename to src/main/resources/assets/botania/textures/block/infused_grass_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower3tall0.png b/src/main/resources/assets/botania/textures/block/light_blue_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower3tall0.png rename to src/main/resources/assets/botania/textures/block/light_blue_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower3tall1.png b/src/main/resources/assets/botania/textures/block/light_blue_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower3tall1.png rename to src/main/resources/assets/botania/textures/block/light_blue_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower3.png b/src/main/resources/assets/botania/textures/block/light_blue_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower3.png rename to src/main/resources/assets/botania/textures/block/light_blue_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering3.png b/src/main/resources/assets/botania/textures/block/light_blue_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering3.png rename to src/main/resources/assets/botania/textures/block/light_blue_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower8tall0.png b/src/main/resources/assets/botania/textures/block/light_gray_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower8tall0.png rename to src/main/resources/assets/botania/textures/block/light_gray_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower8tall1.png b/src/main/resources/assets/botania/textures/block/light_gray_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower8tall1.png rename to src/main/resources/assets/botania/textures/block/light_gray_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower8.png b/src/main/resources/assets/botania/textures/block/light_gray_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower8.png rename to src/main/resources/assets/botania/textures/block/light_gray_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering8.png b/src/main/resources/assets/botania/textures/block/light_gray_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering8.png rename to src/main/resources/assets/botania/textures/block/light_gray_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower5tall0.png b/src/main/resources/assets/botania/textures/block/lime_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower5tall0.png rename to src/main/resources/assets/botania/textures/block/lime_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower5tall1.png b/src/main/resources/assets/botania/textures/block/lime_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower5tall1.png rename to src/main/resources/assets/botania/textures/block/lime_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower5.png b/src/main/resources/assets/botania/textures/block/lime_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower5.png rename to src/main/resources/assets/botania/textures/block/lime_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering5.png b/src/main/resources/assets/botania/textures/block/lime_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering5.png rename to src/main/resources/assets/botania/textures/block/lime_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower2tall0.png b/src/main/resources/assets/botania/textures/block/magenta_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower2tall0.png rename to src/main/resources/assets/botania/textures/block/magenta_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower2tall1.png b/src/main/resources/assets/botania/textures/block/magenta_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower2tall1.png rename to src/main/resources/assets/botania/textures/block/magenta_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower2.png b/src/main/resources/assets/botania/textures/block/magenta_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower2.png rename to src/main/resources/assets/botania/textures/block/magenta_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering2.png b/src/main/resources/assets/botania/textures/block/magenta_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering2.png rename to src/main/resources/assets/botania/textures/block/magenta_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass11.png b/src/main/resources/assets/botania/textures/block/mutated_grass_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass11.png rename to src/main/resources/assets/botania/textures/block/mutated_grass_side.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass10.png b/src/main/resources/assets/botania/textures/block/mutated_grass_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass10.png rename to src/main/resources/assets/botania/textures/block/mutated_grass_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower1tall0.png b/src/main/resources/assets/botania/textures/block/orange_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower1tall0.png rename to src/main/resources/assets/botania/textures/block/orange_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower1tall1.png b/src/main/resources/assets/botania/textures/block/orange_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower1tall1.png rename to src/main/resources/assets/botania/textures/block/orange_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower1.png b/src/main/resources/assets/botania/textures/block/orange_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower1.png rename to src/main/resources/assets/botania/textures/block/orange_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering1.png b/src/main/resources/assets/botania/textures/block/orange_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering1.png rename to src/main/resources/assets/botania/textures/block/orange_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower6tall0.png b/src/main/resources/assets/botania/textures/block/pink_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower6tall0.png rename to src/main/resources/assets/botania/textures/block/pink_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower6tall1.png b/src/main/resources/assets/botania/textures/block/pink_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower6tall1.png rename to src/main/resources/assets/botania/textures/block/pink_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower6.png b/src/main/resources/assets/botania/textures/block/pink_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower6.png rename to src/main/resources/assets/botania/textures/block/pink_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering6.png b/src/main/resources/assets/botania/textures/block/pink_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering6.png rename to src/main/resources/assets/botania/textures/block/pink_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower10tall0.png b/src/main/resources/assets/botania/textures/block/purple_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower10tall0.png rename to src/main/resources/assets/botania/textures/block/purple_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower10tall1.png b/src/main/resources/assets/botania/textures/block/purple_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower10tall1.png rename to src/main/resources/assets/botania/textures/block/purple_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower10.png b/src/main/resources/assets/botania/textures/block/purple_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower10.png rename to src/main/resources/assets/botania/textures/block/purple_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering10.png b/src/main/resources/assets/botania/textures/block/purple_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering10.png rename to src/main/resources/assets/botania/textures/block/purple_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower14tall0.png b/src/main/resources/assets/botania/textures/block/red_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower14tall0.png rename to src/main/resources/assets/botania/textures/block/red_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower14tall1.png b/src/main/resources/assets/botania/textures/block/red_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower14tall1.png rename to src/main/resources/assets/botania/textures/block/red_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower14.png b/src/main/resources/assets/botania/textures/block/red_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower14.png rename to src/main/resources/assets/botania/textures/block/red_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering14.png b/src/main/resources/assets/botania/textures/block/red_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering14.png rename to src/main/resources/assets/botania/textures/block/red_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass7.png b/src/main/resources/assets/botania/textures/block/scorched_grass_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass7.png rename to src/main/resources/assets/botania/textures/block/scorched_grass_side.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass6.png b/src/main/resources/assets/botania/textures/block/scorched_grass_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass6.png rename to src/main/resources/assets/botania/textures/block/scorched_grass_top.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass5.png b/src/main/resources/assets/botania/textures/block/vivid_grass_side.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass5.png rename to src/main/resources/assets/botania/textures/block/vivid_grass_side.png diff --git a/src/main/resources/assets/botania/textures/block/altgrass4.png b/src/main/resources/assets/botania/textures/block/vivid_grass_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/altgrass4.png rename to src/main/resources/assets/botania/textures/block/vivid_grass_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower0tall0.png b/src/main/resources/assets/botania/textures/block/white_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower0tall0.png rename to src/main/resources/assets/botania/textures/block/white_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower0tall1.png b/src/main/resources/assets/botania/textures/block/white_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower0tall1.png rename to src/main/resources/assets/botania/textures/block/white_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower0.png b/src/main/resources/assets/botania/textures/block/white_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower0.png rename to src/main/resources/assets/botania/textures/block/white_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering0.png b/src/main/resources/assets/botania/textures/block/white_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering0.png rename to src/main/resources/assets/botania/textures/block/white_shiny_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower4tall0.png b/src/main/resources/assets/botania/textures/block/yellow_double_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower4tall0.png rename to src/main/resources/assets/botania/textures/block/yellow_double_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flower4tall1.png b/src/main/resources/assets/botania/textures/block/yellow_double_flower_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower4tall1.png rename to src/main/resources/assets/botania/textures/block/yellow_double_flower_top.png diff --git a/src/main/resources/assets/botania/textures/block/flower4.png b/src/main/resources/assets/botania/textures/block/yellow_mystical_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower4.png rename to src/main/resources/assets/botania/textures/block/yellow_mystical_flower.png diff --git a/src/main/resources/assets/botania/textures/block/flowerglimmering4.png b/src/main/resources/assets/botania/textures/block/yellow_shiny_flower.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flowerglimmering4.png rename to src/main/resources/assets/botania/textures/block/yellow_shiny_flower.png