From 0d3ffa2598d7c889bf93d6992f51d1b8a04552c3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 10:38:57 -0500 Subject: [PATCH] Final model splitting, on to code cleanup --- .../assets/botania/blockstates/altar.json | 20 +++++----- .../botania/blockstates/biomeStoneA.json | 32 +++++++-------- .../blockstates/biomeStoneA0SlabFull.json | 2 +- .../blockstates/biomeStoneA10SlabFull.json | 2 +- .../blockstates/biomeStoneA11SlabFull.json | 2 +- .../blockstates/biomeStoneA12SlabFull.json | 2 +- .../blockstates/biomeStoneA13SlabFull.json | 2 +- .../blockstates/biomeStoneA14SlabFull.json | 2 +- .../blockstates/biomeStoneA15SlabFull.json | 2 +- .../blockstates/biomeStoneA1SlabFull.json | 2 +- .../blockstates/biomeStoneA2SlabFull.json | 2 +- .../blockstates/biomeStoneA3SlabFull.json | 2 +- .../blockstates/biomeStoneA4SlabFull.json | 2 +- .../blockstates/biomeStoneA5SlabFull.json | 2 +- .../blockstates/biomeStoneA6SlabFull.json | 2 +- .../blockstates/biomeStoneA7SlabFull.json | 2 +- .../blockstates/biomeStoneA8SlabFull.json | 2 +- .../blockstates/biomeStoneA9SlabFull.json | 2 +- .../botania/blockstates/biomeStoneB.json | 37 ++++++++---------- .../blockstates/biomeStoneB0SlabFull.json | 6 +-- .../blockstates/biomeStoneB1SlabFull.json | 6 +-- .../blockstates/biomeStoneB2SlabFull.json | 6 +-- .../blockstates/biomeStoneB3SlabFull.json | 6 +-- .../blockstates/biomeStoneB4SlabFull.json | 6 +-- .../blockstates/biomeStoneB5SlabFull.json | 6 +-- .../blockstates/biomeStoneB6SlabFull.json | 6 +-- .../blockstates/biomeStoneB7SlabFull.json | 6 +-- .../botania/blockstates/customBrick.json | 39 ++++++++----------- .../assets/botania/blockstates/dreamwood.json | 17 +++----- .../blockstates/dreamwood0SlabFull.json | 6 +-- .../blockstates/dreamwood1SlabFull.json | 6 +-- .../assets/botania/blockstates/flower.json | 32 +++++++-------- .../assets/botania/blockstates/mushroom.json | 32 +++++++-------- .../assets/botania/blockstates/pavement.json | 19 +++------ .../blockstates/pavement0SlabFull.json | 6 +-- .../blockstates/pavement1SlabFull.json | 6 +-- .../blockstates/pavement2SlabFull.json | 6 +-- .../blockstates/pavement3SlabFull.json | 6 +-- .../blockstates/pavement4SlabFull.json | 6 +-- .../blockstates/pavement5SlabFull.json | 6 +-- .../blockstates/quartzSlabBlazeFull.json | 10 +---- .../blockstates/quartzSlabDarkFull.json | 10 +---- .../blockstates/quartzSlabElfFull.json | 10 +---- .../blockstates/quartzSlabLavenderFull.json | 10 +---- .../blockstates/quartzSlabManaFull.json | 10 +---- .../blockstates/quartzSlabRedFull.json | 10 +---- .../blockstates/quartzSlabSunnyFull.json | 10 +---- .../botania/blockstates/quartzTypeBlaze.json | 17 +++----- .../botania/blockstates/quartzTypeDark.json | 17 +++----- .../botania/blockstates/quartzTypeElf.json | 17 +++----- .../blockstates/quartzTypeLavender.json | 17 +++----- .../botania/blockstates/quartzTypeMana.json | 17 +++----- .../botania/blockstates/quartzTypeRed.json | 17 +++----- .../botania/blockstates/quartzTypeSunny.json | 17 +++----- .../botania/blockstates/shinyFlower.json | 32 +++++++-------- .../default_apothecary.json | 0 .../{ => apothecaries}/desert_apothecary.json | 0 .../{ => apothecaries}/forest_apothecary.json | 0 .../{ => apothecaries}/fungal_apothecary.json | 0 .../{ => apothecaries}/mesa_apothecary.json | 0 .../{ => apothecaries}/mossy_apothecary.json | 0 .../mountain_apothecary.json | 0 .../{ => apothecaries}/plains_apothecary.json | 0 .../{ => apothecaries}/swamp_apothecary.json | 0 .../{ => apothecaries}/taiga_apothecary.json | 0 .../models/block/bricks/azulejo_1.json | 6 +++ .../models/block/bricks/azulejo_10.json | 6 +++ .../models/block/bricks/azulejo_11.json | 6 +++ .../models/block/bricks/azulejo_12.json | 6 +++ .../models/block/bricks/azulejo_2.json | 6 +++ .../models/block/bricks/azulejo_3.json | 6 +++ .../models/block/bricks/azulejo_4.json | 6 +++ .../models/block/bricks/azulejo_5.json | 6 +++ .../models/block/bricks/azulejo_6.json | 6 +++ .../models/block/bricks/azulejo_7.json | 6 +++ .../models/block/bricks/azulejo_8.json | 6 +++ .../models/block/bricks/azulejo_9.json | 6 +++ .../models/block/bricks/frosty_brick.json | 6 +++ .../models/block/bricks/hellish_brick.json | 6 +++ .../models/block/bricks/roof_tile.json | 6 +++ .../models/block/bricks/soul_brick.json | 6 +++ .../botania/models/block/dreamwood.json | 6 +++ .../models/block/dreamwood_framed.json | 6 +++ .../models/block/dreamwood_glimmering.json | 6 +++ .../models/block/dreamwood_mossy_planks.json | 6 +++ .../block/dreamwood_pattern_framed.json | 6 +++ .../models/block/dreamwood_planks.json | 6 +++ .../block/metamorphic/desert_brick.json | 6 +++ .../metamorphic/desert_brick_chiseled.json | 6 +++ .../desert_cobble_stone.json | 0 .../block/{ => metamorphic}/desert_stone.json | 0 .../block/metamorphic/forest_brick.json | 6 +++ .../metamorphic/forest_brick_chiseled.json | 6 +++ .../forest_cobble_stone.json | 0 .../block/{ => metamorphic}/forest_stone.json | 0 .../block/metamorphic/fungal_brick.json | 6 +++ .../metamorphic/fungal_brick_chiseled.json | 6 +++ .../fungal_cobble_stone.json | 0 .../block/{ => metamorphic}/fungal_stone.json | 0 .../models/block/metamorphic/mesa_brick.json | 6 +++ .../metamorphic/mesa_brick_chiseled.json | 6 +++ .../{ => metamorphic}/mesa_cobble_stone.json | 0 .../block/{ => metamorphic}/mesa_stone.json | 0 .../block/metamorphic/mountain_brick.json | 6 +++ .../metamorphic/mountain_brick_chiseled.json | 6 +++ .../mountain_cobble_stone.json | 0 .../{ => metamorphic}/mountain_stone.json | 0 .../block/metamorphic/plains_brick.json | 6 +++ .../metamorphic/plains_brick_chiseled.json | 6 +++ .../plains_cobble_stone.json | 0 .../block/{ => metamorphic}/plains_stone.json | 0 .../models/block/metamorphic/swamp_brick.json | 6 +++ .../metamorphic/swamp_brick_chiseled.json | 6 +++ .../{ => metamorphic}/swamp_cobble_stone.json | 0 .../block/{ => metamorphic}/swamp_stone.json | 0 .../models/block/metamorphic/taiga_brick.json | 6 +++ .../metamorphic/taiga_brick_chiseled.json | 6 +++ .../{ => metamorphic}/taiga_cobble_stone.json | 0 .../block/{ => metamorphic}/taiga_stone.json | 0 .../models/block/pavement/black_pavement.json | 6 +++ .../models/block/pavement/blue_pavement.json | 6 +++ .../models/block/pavement/green_pavement.json | 6 +++ .../models/block/pavement/red_pavement.json | 6 +++ .../models/block/pavement/white_pavement.json | 6 +++ .../block/pavement/yellow_pavement.json | 6 +++ .../block/{ => plants}/flower_black.json | 0 .../block/{ => plants}/flower_blue.json | 0 .../block/{ => plants}/flower_brown.json | 0 .../block/{ => plants}/flower_cyan.json | 0 .../block/{ => plants}/flower_gray.json | 0 .../block/{ => plants}/flower_green.json | 0 .../block/{ => plants}/flower_light_blue.json | 0 .../block/{ => plants}/flower_lime.json | 0 .../block/{ => plants}/flower_magenta.json | 0 .../block/{ => plants}/flower_orange.json | 0 .../block/{ => plants}/flower_pink.json | 0 .../block/{ => plants}/flower_purple.json | 0 .../models/block/{ => plants}/flower_red.json | 0 .../block/{ => plants}/flower_silver.json | 0 .../block/{ => plants}/flower_white.json | 0 .../block/{ => plants}/flower_yellow.json | 0 .../{ => plants}/glimmering_flower_black.json | 0 .../{ => plants}/glimmering_flower_blue.json | 0 .../{ => plants}/glimmering_flower_brown.json | 0 .../{ => plants}/glimmering_flower_cyan.json | 0 .../{ => plants}/glimmering_flower_gray.json | 0 .../{ => plants}/glimmering_flower_green.json | 0 .../glimmering_flower_light_blue.json | 0 .../{ => plants}/glimmering_flower_lime.json | 0 .../glimmering_flower_magenta.json | 0 .../glimmering_flower_orange.json | 0 .../{ => plants}/glimmering_flower_pink.json | 0 .../glimmering_flower_purple.json | 0 .../{ => plants}/glimmering_flower_red.json | 0 .../glimmering_flower_silver.json | 0 .../{ => plants}/glimmering_flower_white.json | 0 .../glimmering_flower_yellow.json | 0 .../block/{ => plants}/mushroom_black.json | 0 .../block/{ => plants}/mushroom_blue.json | 0 .../block/{ => plants}/mushroom_brown.json | 0 .../block/{ => plants}/mushroom_cyan.json | 0 .../block/{ => plants}/mushroom_gray.json | 0 .../block/{ => plants}/mushroom_green.json | 0 .../{ => plants}/mushroom_light_blue.json | 0 .../block/{ => plants}/mushroom_lime.json | 0 .../block/{ => plants}/mushroom_magenta.json | 0 .../block/{ => plants}/mushroom_orange.json | 0 .../block/{ => plants}/mushroom_pink.json | 0 .../block/{ => plants}/mushroom_purple.json | 0 .../block/{ => plants}/mushroom_red.json | 0 .../block/{ => plants}/mushroom_silver.json | 0 .../block/{ => plants}/mushroom_white.json | 0 .../block/{ => plants}/mushroom_yellow.json | 0 .../models/block/quartz/blaze_quartz.json | 8 ++++ .../block/quartz/blaze_quartz_chiseled.json | 7 ++++ .../block/quartz/blaze_quartz_pillar.json | 7 ++++ .../models/block/quartz/dark_quartz.json | 8 ++++ .../block/quartz/dark_quartz_chiseled.json | 7 ++++ .../block/quartz/dark_quartz_pillar.json | 7 ++++ .../models/block/quartz/elf_quartz.json | 8 ++++ .../block/quartz/elf_quartz_chiseled.json | 7 ++++ .../block/quartz/elf_quartz_pillar.json | 7 ++++ .../models/block/quartz/lavender_quartz.json | 8 ++++ .../quartz/lavender_quartz_chiseled.json | 7 ++++ .../block/quartz/lavender_quartz_pillar.json | 7 ++++ .../models/block/quartz/mana_quartz.json | 8 ++++ .../block/quartz/mana_quartz_chiseled.json | 7 ++++ .../block/quartz/mana_quartz_pillar.json | 7 ++++ .../models/block/quartz/red_quartz.json | 8 ++++ .../block/quartz/red_quartz_chiseled.json | 7 ++++ .../block/quartz/red_quartz_pillar.json | 7 ++++ .../models/block/quartz/sunny_quartz.json | 8 ++++ .../block/quartz/sunny_quartz_chiseled.json | 7 ++++ .../block/quartz/sunny_quartz_pillar.json | 7 ++++ .../botania/models/block/shapes/note.txt | 2 - 195 files changed, 610 insertions(+), 387 deletions(-) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/default_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/desert_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/forest_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/fungal_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/mesa_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/mossy_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/mountain_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/plains_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/swamp_apothecary.json (100%) rename src/main/resources/assets/botania/models/block/{ => apothecaries}/taiga_apothecary.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_1.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_10.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_11.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_12.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_2.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_3.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_4.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_5.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_6.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_7.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_8.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/azulejo_9.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/frosty_brick.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/hellish_brick.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/roof_tile.json create mode 100644 src/main/resources/assets/botania/models/block/bricks/soul_brick.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_framed.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_glimmering.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json create mode 100644 src/main/resources/assets/botania/models/block/dreamwood_planks.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/desert_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/desert_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/forest_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/forest_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/fungal_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/fungal_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mesa_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mesa_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mountain_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/mountain_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/plains_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/plains_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/swamp_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/swamp_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json create mode 100644 src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json rename src/main/resources/assets/botania/models/block/{ => metamorphic}/taiga_cobble_stone.json (100%) rename src/main/resources/assets/botania/models/block/{ => metamorphic}/taiga_stone.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/pavement/black_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/blue_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/green_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/red_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/white_pavement.json create mode 100644 src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json rename src/main/resources/assets/botania/models/block/{ => plants}/flower_black.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_brown.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_cyan.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_gray.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_green.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_light_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_lime.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_magenta.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_orange.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_pink.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_purple.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_red.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_silver.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_white.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/flower_yellow.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_black.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_brown.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_cyan.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_gray.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_green.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_light_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_lime.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_magenta.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_orange.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_pink.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_purple.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_red.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_silver.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_white.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/glimmering_flower_yellow.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_black.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_brown.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_cyan.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_gray.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_green.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_light_blue.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_lime.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_magenta.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_orange.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_pink.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_purple.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_red.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_silver.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_white.json (100%) rename src/main/resources/assets/botania/models/block/{ => plants}/mushroom_yellow.json (100%) create mode 100644 src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/dark_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/elf_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/mana_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/red_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json create mode 100644 src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json delete mode 100644 src/main/resources/assets/botania/models/block/shapes/note.txt diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json index 8d6de2515..64dbd0d17 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -1,14 +1,14 @@ { "variants": { - "variant=default": { "model": "botania:default_apothecary" }, - "variant=forest": { "model": "botania:forest_apothecary" }, - "variant=plains": { "model": "botania:plains_apothecary" }, - "variant=mountain": { "model": "botania:mountain_apothecary" }, - "variant=fungal": { "model": "botania:fungal_apothecary" }, - "variant=swamp": { "model": "botania:swamp_apothecary" }, - "variant=desert": { "model": "botania:desert_apothecary" }, - "variant=taiga": { "model": "botania:taiga_apothecary" }, - "variant=mesa": { "model": "botania:mesa_apothecary" }, - "variant=mossy": { "model": "botania:mossy_apothecary" } + "variant=default": { "model": "botania:apothecaries/default_apothecary" }, + "variant=forest": { "model": "botania:apothecaries/forest_apothecary" }, + "variant=plains": { "model": "botania:apothecaries/plains_apothecary" }, + "variant=mountain": { "model": "botania:apothecaries/mountain_apothecary" }, + "variant=fungal": { "model": "botania:apothecaries/fungal_apothecary" }, + "variant=swamp": { "model": "botania:apothecaries/swamp_apothecary" }, + "variant=desert": { "model": "botania:apothecaries/desert_apothecary" }, + "variant=taiga": { "model": "botania:apothecaries/taiga_apothecary" }, + "variant=mesa": { "model": "botania:apothecaries/mesa_apothecary" }, + "variant=mossy": { "model": "botania:apothecaries/mossy_apothecary" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA.json b/src/main/resources/assets/botania/blockstates/biomeStoneA.json index c10307719..27622ac2a 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA.json @@ -1,20 +1,20 @@ { "variants": { - "variant=forest": { "model": "botania:forest_stone" }, - "variant=plains": { "model": "botania:plains_stone" }, - "variant=mountain": { "model": "botania:mountain_stone" }, - "variant=fungal": { "model": "botania:fungal_stone" }, - "variant=swamp": { "model": "botania:swamp_stone" }, - "variant=desert": { "model": "botania:desert_stone" }, - "variant=taiga": { "model": "botania:taiga_stone" }, - "variant=mesa": { "model": "botania:mesa_stone" }, - "variant=forest_cobble": { "model": "botania:forest_cobble_stone" }, - "variant=plains_cobble": { "model": "botania:plains_cobble_stone" }, - "variant=mountain_cobble": { "model": "botania:mountain_cobble_stone" }, - "variant=fungal_cobble": { "model": "botania:fungal_cobble_stone" }, - "variant=swamp_cobble": { "model": "botania:swamp_cobble_stone" }, - "variant=desert_cobble": { "model": "botania:desert_cobble_stone" }, - "variant=taiga_cobble": { "model": "botania:taiga_cobble_stone" }, - "variant=mesa_cobble": { "model": "botania:mesa_cobble_stone" } + "variant=forest": { "model": "botania:metamorphic/forest_stone" }, + "variant=plains": { "model": "botania:metamorphic/plains_stone" }, + "variant=mountain": { "model": "botania:metamorphic/mountain_stone" }, + "variant=fungal": { "model": "botania:metamorphic/fungal_stone" }, + "variant=swamp": { "model": "botania:metamorphic/swamp_stone" }, + "variant=desert": { "model": "botania:metamorphic/desert_stone" }, + "variant=taiga": { "model": "botania:metamorphic/taiga_stone" }, + "variant=mesa": { "model": "botania:metamorphic/mesa_stone" }, + "variant=forest_cobble": { "model": "botania:metamorphic/forest_cobble_stone" }, + "variant=plains_cobble": { "model": "botania:metamorphic/plains_cobble_stone" }, + "variant=mountain_cobble": { "model": "botania:metamorphic/mountain_cobble_stone" }, + "variant=fungal_cobble": { "model": "botania:metamorphic/fungal_cobble_stone" }, + "variant=swamp_cobble": { "model": "botania:metamorphic/swamp_cobble_stone" }, + "variant=desert_cobble": { "model": "botania:metamorphic/desert_cobble_stone" }, + "variant=taiga_cobble": { "model": "botania:metamorphic/taiga_cobble_stone" }, + "variant=mesa_cobble": { "model": "botania:metamorphic/mesa_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json index 789994f0f..0c58db25e 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:forest_stone" } + "normal": { "model": "botania:metamorphic/forest_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json index a7b695ca5..05719dcca 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mountain_cobble_stone" } + "normal": { "model": "botania:metamorphic/mountain_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json index a5f013dfe..27dbc8c9b 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:fungal_cobble_stone" } + "normal": { "model": "botania:metamorphic/fungal_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json index 979cce0ba..ace8e0d07 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:swamp_cobble_stone" } + "normal": { "model": "botania:metamorphic/swamp_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json index aff3bc828..2e3c1d7c3 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:desert_cobble_stone" } + "normal": { "model": "botania:metamorphic/desert_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json index a1827a0b5..e918af54b 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:taiga_cobble_stone" } + "normal": { "model": "botania:metamorphic/taiga_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json index 05f15a488..e21f0c3a2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mesa_cobble_stone" } + "normal": { "model": "botania:metamorphic/mesa_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json index 12df9e1be..7e5f4febf 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:plains_stone" } + "normal": { "model": "botania:metamorphic/plains_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json index e1e5402a2..31ca5de05 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mountain_stone" } + "normal": { "model": "botania:metamorphic/mountain_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json index 29c3ea890..91fe895a6 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:fungal_stone" } + "normal": { "model": "botania:metamorphic/fungal_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json index 71dfb7ef2..fd38dc075 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:swamp_stone" } + "normal": { "model": "botania:metamorphic/swamp_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json index 905561869..8d022ec80 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:desert_stone" } + "normal": { "model": "botania:metamorphic/desert_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json index 03bee51e9..cb4e3f9f0 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:taiga_stone" } + "normal": { "model": "botania:metamorphic/taiga_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json index 373fa8a7c..9482b4a70 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:mesa_stone" } + "normal": { "model": "botania:metamorphic/mesa_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json index a9b5213a2..2422f2551 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:forest_cobble_stone" } + "normal": { "model": "botania:metamorphic/forest_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json index f74a950bc..d9543cb48 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "botania:plains_cobble_stone" } + "normal": { "model": "botania:metamorphic/plains_cobble_stone" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB.json b/src/main/resources/assets/botania/blockstates/biomeStoneB.json index facaa9134..d0e0f3229 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB.json @@ -1,25 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant=forest": [{ "textures": { "all": "botania:blocks/biomeStone16" } }], - "variant=plains": [{ "textures": { "all": "botania:blocks/biomeStone17" } }], - "variant=mountain": [{ "textures": { "all": "botania:blocks/biomeStone18" } }], - "variant=fungal": [{ "textures": { "all": "botania:blocks/biomeStone19" } }], - "variant=swamp": [{ "textures": { "all": "botania:blocks/biomeStone20" } }], - "variant=desert": [{ "textures": { "all": "botania:blocks/biomeStone21" } }], - "variant=taiga": [{ "textures": { "all": "botania:blocks/biomeStone22" } }], - "variant=mesa": [{ "textures": { "all": "botania:blocks/biomeStone23" } }], - "variant=chiseled_forest": [{ "textures": { "all": "botania:blocks/biomeStone24" } }], - "variant=chiseled_plains": [{ "textures": { "all": "botania:blocks/biomeStone25" } }], - "variant=chiseled_mountain": [{ "textures": { "all": "botania:blocks/biomeStone26" } }], - "variant=chiseled_fungal": [{ "textures": { "all": "botania:blocks/biomeStone27" } }], - "variant=chiseled_swamp": [{ "textures": { "all": "botania:blocks/biomeStone28" } }], - "variant=chiseled_desert": [{ "textures": { "all": "botania:blocks/biomeStone29" } }], - "variant=chiseled_taiga": [{ "textures": { "all": "botania:blocks/biomeStone30" } }], - "variant=chiseled_mesa": [{ "textures": { "all": "botania:blocks/biomeStone31" } }] + "variant=forest": { "model": "botania:metamorphic/forest_brick" }, + "variant=plains": { "model": "botania:metamorphic/plains_brick" }, + "variant=mountain": { "model": "botania:metamorphic/mountain_brick" }, + "variant=fungal": { "model": "botania:metamorphic/fungal_brick" }, + "variant=swamp": { "model": "botania:metamorphic/swamp_brick" }, + "variant=desert": { "model": "botania:metamorphic/desert_brick" }, + "variant=taiga": { "model": "botania:metamorphic/taiga_brick" }, + "variant=mesa": { "model": "botania:metamorphic/mesa_brick" }, + "variant=chiseled_forest": { "model": "botania:metamorphic/forest_brick_chiseled" }, + "variant=chiseled_plains": { "model": "botania:metamorphic/plains_brick_chiseled" }, + "variant=chiseled_mountain": { "model": "botania:metamorphic/mountain_brick_chiseled" }, + "variant=chiseled_fungal": { "model": "botania:metamorphic/fungal_brick_chiseled" }, + "variant=chiseled_swamp": { "model": "botania:metamorphic/swamp_brick_chiseled" }, + "variant=chiseled_desert": { "model": "botania:metamorphic/desert_brick_chiseled" }, + "variant=chiseled_taiga": { "model": "botania:metamorphic/taiga_brick_chiseled" }, + "variant=chiseled_mesa": { "model": "botania:metamorphic/mesa_brick_chiseled" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json index a5236f6d8..ea96f2b4e 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone16" } - }] + "normal": { "model": "botania:metamorphic/forest_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json index 7612fa942..23fb25ad3 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone17" } - }] + "normal": { "model": "botania:metamorphic/plains_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json index 4902a6e0c..71e4fecc4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone18" } - }] + "normal": { "model": "botania:metamorphic/mountain_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json index ad81a7910..26ea9305a 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone19" } - }] + "normal": { "model": "botania:metamorphic/fungal_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json index 12a9d00da..f3cd0012d 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone20" } - }] + "normal": { "model": "botania:metamorphic/swamp_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json index 00399c361..d2c6efe9c 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone21" } - }] + "normal": { "model": "botania:metamorphic/desert_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json index cd9d3f0e9..bc2881dba 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone22" } - }] + "normal": { "model": "botania:metamorphic/taiga_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json index 9e7c19c2e..5c41e50f1 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/biomeStone23" } - }] + "normal": { "model": "botania:metamorphic/mesa_brick" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick.json b/src/main/resources/assets/botania/blockstates/customBrick.json index c8807f13f..41dd56852 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick.json +++ b/src/main/resources/assets/botania/blockstates/customBrick.json @@ -1,27 +1,20 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "hellish_brick": { "textures": { "all": "botania:blocks/customBrick0" } }, - "soul_brick": { "textures": { "all": "botania:blocks/customBrick1" } }, - "frosty_brick": { "textures": { "all": "botania:blocks/customBrick2" } }, - "roof_tile": { "textures": { "all": "botania:blocks/customBrick3" } }, - "azulejo_1": { "textures": { "all": "botania:blocks/customBrick4" } }, - "azulejo_2": { "textures": { "all": "botania:blocks/customBrick5" } }, - "azulejo_3": { "textures": { "all": "botania:blocks/customBrick6" } }, - "azulejo_4": { "textures": { "all": "botania:blocks/customBrick7" } }, - "azulejo_5": { "textures": { "all": "botania:blocks/customBrick8" } }, - "azulejo_6": { "textures": { "all": "botania:blocks/customBrick9" } }, - "azulejo_7": { "textures": { "all": "botania:blocks/customBrick10" } }, - "azulejo_8": { "textures": { "all": "botania:blocks/customBrick11" } }, - "azulejo_9": { "textures": { "all": "botania:blocks/customBrick12" } }, - "azulejo_10": { "textures": { "all": "botania:blocks/customBrick13" } }, - "azulejo_11": { "textures": { "all": "botania:blocks/customBrick14" } }, - "azulejo_12": { "textures": { "all": "botania:blocks/customBrick15" } } - } + "variant=hellish_brick": { "model": "botania:bricks/hellish_brick" }, + "variant=soul_brick": { "model": "botania:bricks/soul_brick" }, + "variant=frosty_brick": { "model": "botania:bricks/frosty_brick" }, + "variant=roof_tile": { "model": "botania:bricks/roof_tile" }, + "variant=azulejo_1": { "model": "botania:bricks/azulejo_1" }, + "variant=azulejo_2": { "model": "botania:bricks/azulejo_2" }, + "variant=azulejo_3": { "model": "botania:bricks/azulejo_3" }, + "variant=azulejo_4": { "model": "botania:bricks/azulejo_4" }, + "variant=azulejo_5": { "model": "botania:bricks/azulejo_5" }, + "variant=azulejo_6": { "model": "botania:bricks/azulejo_6" }, + "variant=azulejo_7": { "model": "botania:bricks/azulejo_7" }, + "variant=azulejo_8": { "model": "botania:bricks/azulejo_8" }, + "variant=azulejo_9": { "model": "botania:bricks/azulejo_9" }, + "variant=azulejo_10": { "model": "botania:bricks/azulejo_10" }, + "variant=azulejo_11": { "model": "botania:bricks/azulejo_11" }, + "variant=azulejo_12": { "model": "botania:bricks/azulejo_12" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood.json b/src/main/resources/assets/botania/blockstates/dreamwood.json index fb6d48d06..2c86462f8 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood.json @@ -1,15 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "variant=default": [{ "textures": { "all": "botania:blocks/dreamwood0" } }], - "variant=planks": [{ "textures": { "all": "botania:blocks/dreamwood1" } }], - "variant=mossy_planks": [{ "textures": { "all": "botania:blocks/dreamwood2" } }], - "variant=framed": [{ "textures": { "all": "botania:blocks/dreamwood3" } }], - "variant=pattern_framed": [{ "textures": { "all": "botania:blocks/dreamwood4" } }], - "variant=glimmering": [{ "textures": { "all": "botania:blocks/dreamwood5" } }] + "variant=default": { "model": "botania:dreamwood" }, + "variant=planks": { "model": "botania:dreamwood_planks" }, + "variant=mossy_planks": { "model": "botania:dreamwood_mossy_planks" }, + "variant=framed": { "model": "botania:dreamwood_framed" }, + "variant=pattern_framed": { "model": "botania:dreamwood_pattern_framed" }, + "variant=glimmering": { "model": "botania:dreamwood_glimmering" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json index 40e378188..796feb957 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/dreamwood0" } - }] + "normal": { "model": "botania:dreamwood" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json index 47873fc21..e1afb1a06 100644 --- a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/dreamwood1" } - }] + "normal": { "model": "botania:dreamwood_planks" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/flower.json b/src/main/resources/assets/botania/blockstates/flower.json index 6a386460e..a908efe68 100644 --- a/src/main/resources/assets/botania/blockstates/flower.json +++ b/src/main/resources/assets/botania/blockstates/flower.json @@ -1,20 +1,20 @@ { "variants": { - "color=white": { "model": "botania:flower_white" }, - "color=orange": { "model": "botania:flower_orange" }, - "color=magenta": { "model": "botania:flower_magenta" }, - "color=light_blue": { "model": "botania:flower_light_blue" }, - "color=yellow": { "model": "botania:flower_yellow" }, - "color=lime": { "model": "botania:flower_lime" }, - "color=pink": { "model": "botania:flower_pink" }, - "color=gray": { "model": "botania:flower_gray" }, - "color=silver": { "model": "botania:flower_silver" }, - "color=cyan": { "model": "botania:flower_cyan" }, - "color=purple": { "model": "botania:flower_purple" }, - "color=blue": { "model": "botania:flower_blue" }, - "color=brown": { "model": "botania:flower_brown" }, - "color=green": { "model": "botania:flower_green" }, - "color=red": { "model": "botania:flower_red" }, - "color=black": { "model": "botania:flower_black" } + "color=white": { "model": "botania:plants/flower_white" }, + "color=orange": { "model": "botania:plants/flower_orange" }, + "color=magenta": { "model": "botania:plants/flower_magenta" }, + "color=light_blue": { "model": "botania:plants/flower_light_blue" }, + "color=yellow": { "model": "botania:plants/flower_yellow" }, + "color=lime": { "model": "botania:plants/flower_lime" }, + "color=pink": { "model": "botania:plants/flower_pink" }, + "color=gray": { "model": "botania:plants/flower_gray" }, + "color=silver": { "model": "botania:plants/flower_silver" }, + "color=cyan": { "model": "botania:plants/flower_cyan" }, + "color=purple": { "model": "botania:plants/flower_purple" }, + "color=blue": { "model": "botania:plants/flower_blue" }, + "color=brown": { "model": "botania:plants/flower_brown" }, + "color=green": { "model": "botania:plants/flower_green" }, + "color=red": { "model": "botania:plants/flower_red" }, + "color=black": { "model": "botania:plants/flower_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/mushroom.json b/src/main/resources/assets/botania/blockstates/mushroom.json index 42d93df72..289615fc6 100644 --- a/src/main/resources/assets/botania/blockstates/mushroom.json +++ b/src/main/resources/assets/botania/blockstates/mushroom.json @@ -1,20 +1,20 @@ { "variants": { - "color=white": { "model": "botania:mushroom_white" }, - "color=orange": { "model": "botania:mushroom_orange" }, - "color=magenta": { "model": "botania:mushroom_magenta" }, - "color=light_blue": { "model": "botania:mushroom_light_blue" }, - "color=yellow": { "model": "botania:mushroom_yellow" }, - "color=lime": { "model": "botania:mushroom_lime" }, - "color=pink": { "model": "botania:mushroom_pink" }, - "color=gray": { "model": "botania:mushroom_gray" }, - "color=silver": { "model": "botania:mushroom_silver" }, - "color=cyan": { "model": "botania:mushroom_cyan" }, - "color=purple": { "model": "botania:mushroom_purple" }, - "color=blue": { "model": "botania:mushroom_blue" }, - "color=brown": { "model": "botania:mushroom_brown" }, - "color=green": { "model": "botania:mushroom_green" }, - "color=red": { "model": "botania:mushroom_red" }, - "color=black": { "model": "botania:mushroom_black" } + "color=white": { "model": "botania:plants/mushroom_white" }, + "color=orange": { "model": "botania:plants/mushroom_orange" }, + "color=magenta": { "model": "botania:plants/mushroom_magenta" }, + "color=light_blue": { "model": "botania:plants/mushroom_light_blue" }, + "color=yellow": { "model": "botania:plants/mushroom_yellow" }, + "color=lime": { "model": "botania:plants/mushroom_lime" }, + "color=pink": { "model": "botania:plants/mushroom_pink" }, + "color=gray": { "model": "botania:plants/mushroom_gray" }, + "color=silver": { "model": "botania:plants/mushroom_silver" }, + "color=cyan": { "model": "botania:plants/mushroom_cyan" }, + "color=purple": { "model": "botania:plants/mushroom_purple" }, + "color=blue": { "model": "botania:plants/mushroom_blue" }, + "color=brown": { "model": "botania:plants/mushroom_brown" }, + "color=green": { "model": "botania:plants/mushroom_green" }, + "color=red": { "model": "botania:plants/mushroom_red" }, + "color=black": { "model": "botania:plants/mushroom_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement.json b/src/main/resources/assets/botania/blockstates/pavement.json index ed2c481c1..bf31a00b9 100644 --- a/src/main/resources/assets/botania/blockstates/pavement.json +++ b/src/main/resources/assets/botania/blockstates/pavement.json @@ -1,17 +1,10 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, "variants": { - "color": { - "white": { "textures": { "all": "botania:blocks/pavement0" } }, - "black": { "textures": { "all": "botania:blocks/pavement1" } }, - "blue": { "textures": { "all": "botania:blocks/pavement2" } }, - "red": { "textures": { "all": "botania:blocks/pavement3"} }, - "yellow": { "textures": { "all": "botania:blocks/pavement4"} }, - "green": { "textures": { "all": "botania:blocks/pavement5" } } - } + "color=white": { "model": "botania:pavement/white_pavement" }, + "color=black": { "model": "botania:pavement/black_pavement" }, + "color=blue": { "model": "botania:pavement/blue_pavement" }, + "color=red": { "model": "botania:pavement/red_pavement" }, + "color=yellow": { "model": "botania:pavement/yellow_pavement" }, + "color=green": { "model": "botania:pavement/green_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json index dc17cad32..c0733d50d 100644 --- a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement0" } - }] + "normal": { "model": "botania:pavement/white_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json index a35d6bb36..75ac52b2d 100644 --- a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement1" } - }] + "normal": { "model": "botania:pavement/blue_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json index 60422e335..c0733d50d 100644 --- a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement2" } - }] + "normal": { "model": "botania:pavement/white_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json index a8fb061e5..37690e037 100644 --- a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement3" } - }] + "normal": { "model": "botania:pavement/red_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json index b3796d2e9..ffcf8d19c 100644 --- a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement4" } - }] + "normal": { "model": "botania:pavement/yellow_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json index bdbf59766..3694cd049 100644 --- a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json @@ -1,9 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/pavement5" } - }] + "normal": { "model": "botania:pavement/green_pavement" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json index 09b750c4e..ea9581d54 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockBlazeQuartz0", - "top": "botania:blocks/blockBlazeQuartz1", - "side": "botania:blocks/blockBlazeQuartz2" - } - }] + "normal": { "model": "botania:quartz/blaze_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json index 1b1039a18..94b46c0e7 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockDarkQuartz0", - "top": "botania:blocks/blockDarkQuartz1", - "side": "botania:blocks/blockDarkQuartz2" - } - }] + "normal": { "model": "botania:quartz/dark_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json index a7172cc7b..1a2f63077 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockElfQuartz0", - "top": "botania:blocks/blockElfQuartz1", - "side": "botania:blocks/blockElfQuartz2" - } - }] + "normal": { "model": "botania:quartz/elf_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json index b1a53a9e4..574eb70f6 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockLavenderQuartz0", - "top": "botania:blocks/blockLavenderQuartz1", - "side": "botania:blocks/blockLavenderQuartz2" - } - }] + "normal": { "model": "botania:quartz/lavender_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json index 721c03133..c7c9a15de 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockManaQuartz0", - "top": "botania:blocks/blockManaQuartz1", - "side": "botania:blocks/blockManaQuartz2" - } - }] + "normal": { "model": "botania:quartz/mana_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json index a360f41ff..965e2aeda 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockRedQuartz0", - "top": "botania:blocks/blockRedQuartz1", - "side": "botania:blocks/blockRedQuartz2" - } - }] + "normal": { "model": "botania:quartz/red_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json index 30a9b079a..e8211cfc3 100644 --- a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json +++ b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json @@ -1,13 +1,5 @@ { - "forge_marker": 1, "variants": { - "normal": [{ - "model": "minecraft:cube_bottom_top", - "textures": { - "bottom": "botania:blocks/blockSunnyQuartz0", - "top": "botania:blocks/blockSunnyQuartz1", - "side": "botania:blocks/blockSunnyQuartz2" - } - }] + "normal": { "model": "botania:quartz/sunny_quartz" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json b/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json index 30250402a..70c4e13aa 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockBlazeQuartz0", "top": "botania:blocks/blockBlazeQuartz1", "side": "botania:blocks/blockBlazeQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledBlazeQuartz1", "top": "botania:blocks/chiseledBlazeQuartz1", "side": "botania:blocks/chiseledBlazeQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarBlazeQuartz1", "top": "botania:blocks/pillarBlazeQuartz1", "side": "botania:blocks/pillarBlazeQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/blaze_quartz" }, + "variant=chiseled": { "model": "botania:quartz/blaze_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/blaze_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/blaze_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/blaze_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeDark.json b/src/main/resources/assets/botania/blockstates/quartzTypeDark.json index 381f8deb6..573bbf826 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeDark.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeDark.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockDarkQuartz0", "top": "botania:blocks/blockDarkQuartz1", "side": "botania:blocks/blockDarkQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledDarkQuartz1", "top": "botania:blocks/chiseledDarkQuartz1", "side": "botania:blocks/chiseledDarkQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarDarkQuartz1", "top": "botania:blocks/pillarDarkQuartz1", "side": "botania:blocks/pillarDarkQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/dark_quartz" }, + "variant=chiseled": { "model": "botania:quartz/dark_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/dark_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/dark_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/dark_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeElf.json b/src/main/resources/assets/botania/blockstates/quartzTypeElf.json index 836d0e572..f6420fac1 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeElf.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeElf.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockElfQuartz0", "top": "botania:blocks/blockElfQuartz1", "side": "botania:blocks/blockElfQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledElfQuartz1", "top": "botania:blocks/chiseledElfQuartz1", "side": "botania:blocks/chiseledElfQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarElfQuartz1", "top": "botania:blocks/pillarElfQuartz1", "side": "botania:blocks/pillarElfQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/elf_quartz" }, + "variant=chiseled": { "model": "botania:quartz/elf_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/elf_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/elf_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/elf_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json b/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json index c7588ddb6..17c644f85 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockLavenderQuartz0", "top": "botania:blocks/blockLavenderQuartz1", "side": "botania:blocks/blockLavenderQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledLavenderQuartz1", "top": "botania:blocks/chiseledLavenderQuartz1", "side": "botania:blocks/chiseledLavenderQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarLavenderQuartz1", "top": "botania:blocks/pillarLavenderQuartz1", "side": "botania:blocks/pillarLavenderQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/lavender_quartz" }, + "variant=chiseled": { "model": "botania:quartz/lavender_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/lavender_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/lavender_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/lavender_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeMana.json b/src/main/resources/assets/botania/blockstates/quartzTypeMana.json index b655625fb..9747264a3 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeMana.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeMana.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockManaQuartz0", "top": "botania:blocks/blockManaQuartz1", "side": "botania:blocks/blockManaQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledManaQuartz1", "top": "botania:blocks/chiseledManaQuartz1", "side": "botania:blocks/chiseledManaQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarManaQuartz1", "top": "botania:blocks/pillarManaQuartz1", "side": "botania:blocks/pillarManaQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/mana_quartz" }, + "variant=chiseled": { "model": "botania:quartz/mana_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/mana_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/mana_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/mana_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeRed.json b/src/main/resources/assets/botania/blockstates/quartzTypeRed.json index b7f12f67c..feb22538f 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeRed.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeRed.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockRedQuartz0", "top": "botania:blocks/blockRedQuartz1", "side": "botania:blocks/blockRedQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledRedQuartz1", "top": "botania:blocks/chiseledRedQuartz1", "side": "botania:blocks/chiseledRedQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarRedQuartz1", "top": "botania:blocks/pillarRedQuartz1", "side": "botania:blocks/pillarRedQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/red_quartz" }, + "variant=chiseled": { "model": "botania:quartz/red_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/red_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/red_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/red_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json b/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json index bed541082..ddcf27955 100644 --- a/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json +++ b/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json @@ -1,16 +1,9 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_bottom_top", - "transform": "forge:default-block" - }, "variants": { - "variant": { - "normal": { "textures": { "bottom": "botania:blocks/blockSunnyQuartz0", "top": "botania:blocks/blockSunnyQuartz1", "side": "botania:blocks/blockSunnyQuartz2" } }, - "chiseled": { "textures": { "bottom": "botania:blocks/chiseledSunnyQuartz1", "top": "botania:blocks/chiseledSunnyQuartz1", "side": "botania:blocks/chiseledSunnyQuartz0" } }, - "pillar_x": { "x": 90, "y": 90, "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } }, - "pillar_y": { "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } }, - "pillar_z": { "x": 90, "textures": { "bottom": "botania:blocks/pillarSunnyQuartz1", "top": "botania:blocks/pillarSunnyQuartz1", "side": "botania:blocks/pillarSunnyQuartz0" } } - } + "variant=normal": { "model": "botania:quartz/sunny_quartz" }, + "variant=chiseled": { "model": "botania:quartz/sunny_quartz_chiseled" }, + "variant=pillar_x": { "model": "botania:quartz/sunny_quartz_pillar", "x": 90, "y": 90 }, + "variant=pillar_y": { "model": "botania:quartz/sunny_quartz_pillar" }, + "variant=pillar_z": { "model": "botania:quartz/sunny_quartz_pillar", "x": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyFlower.json index 5317eb11b..9fefe3c99 100644 --- a/src/main/resources/assets/botania/blockstates/shinyFlower.json +++ b/src/main/resources/assets/botania/blockstates/shinyFlower.json @@ -1,20 +1,20 @@ { "variants": { - "color=white": { "model": "botania:glimmering_flower_white" }, - "color=orange": { "model": "botania:glimmering_flower_orange" }, - "color=magenta": { "model": "botania:glimmering_flower_magenta" }, - "color=light_blue": { "model": "botania:glimmering_flower_light_blue" }, - "color=yellow": { "model": "botania:glimmering_flower_yellow" }, - "color=lime": { "model": "botania:glimmering_flower_lime" }, - "color=pink": { "model": "botania:glimmering_flower_pink" }, - "color=gray": { "model": "botania:glimmering_flower_gray" }, - "color=silver": { "model": "botania:glimmering_flower_silver" }, - "color=cyan": { "model": "botania:glimmering_flower_cyan" }, - "color=purple": { "model": "botania:glimmering_flower_purple" }, - "color=blue": { "model": "botania:glimmering_flower_blue" }, - "color=brown": { "model": "botania:glimmering_flower_brown" }, - "color=green": { "model": "botania:glimmering_flower_green" }, - "color=red": { "model": "botania:glimmering_flower_red" }, - "color=black": { "model": "botania:glimmering_flower_black" } + "color=white": { "model": "botania:plants/glimmering_flower_white" }, + "color=orange": { "model": "botania:plants/glimmering_flower_orange" }, + "color=magenta": { "model": "botania:plants/glimmering_flower_magenta" }, + "color=light_blue": { "model": "botania:plants/glimmering_flower_light_blue" }, + "color=yellow": { "model": "botania:plants/glimmering_flower_yellow" }, + "color=lime": { "model": "botania:plants/glimmering_flower_lime" }, + "color=pink": { "model": "botania:plants/glimmering_flower_pink" }, + "color=gray": { "model": "botania:plants/glimmering_flower_gray" }, + "color=silver": { "model": "botania:plants/glimmering_flower_silver" }, + "color=cyan": { "model": "botania:plants/glimmering_flower_cyan" }, + "color=purple": { "model": "botania:plants/glimmering_flower_purple" }, + "color=blue": { "model": "botania:plants/glimmering_flower_blue" }, + "color=brown": { "model": "botania:plants/glimmering_flower_brown" }, + "color=green": { "model": "botania:plants/glimmering_flower_green" }, + "color=red": { "model": "botania:plants/glimmering_flower_red" }, + "color=black": { "model": "botania:plants/glimmering_flower_black" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/default_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/default_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/desert_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/forest_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/fungal_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/mesa_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/mossy_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mossy_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/mountain_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/plains_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/swamp_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/taiga_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_apothecary.json rename to src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json new file mode 100644 index 000000000..511d0e425 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json new file mode 100644 index 000000000..439ea85f9 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick13" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json new file mode 100644 index 000000000..f18481bf4 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick14" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json new file mode 100644 index 000000000..2273b3f22 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick15" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json new file mode 100644 index 000000000..fe49ac629 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json new file mode 100644 index 000000000..5a6c70382 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json new file mode 100644 index 000000000..1edd62f2b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json new file mode 100644 index 000000000..6895e3bf1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json new file mode 100644 index 000000000..fc3546919 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json new file mode 100644 index 000000000..ab8f0d42f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json new file mode 100644 index 000000000..361e8f412 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json new file mode 100644 index 000000000..bfd2a0fa0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick12" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json b/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json new file mode 100644 index 000000000..077d9da0b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json b/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json new file mode 100644 index 000000000..ed252dee1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/roof_tile.json b/src/main/resources/assets/botania/models/block/bricks/roof_tile.json new file mode 100644 index 000000000..4c6cc77d2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/roof_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/soul_brick.json b/src/main/resources/assets/botania/models/block/bricks/soul_brick.json new file mode 100644 index 000000000..84795a8d0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/bricks/soul_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/customBrick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood.json b/src/main/resources/assets/botania/models/block/dreamwood.json new file mode 100644 index 000000000..1d25e2f2b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_framed.json b/src/main/resources/assets/botania/models/block/dreamwood_framed.json new file mode 100644 index 000000000..9bf55e6fa --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_glimmering.json b/src/main/resources/assets/botania/models/block/dreamwood_glimmering.json new file mode 100644 index 000000000..ef67451a3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_glimmering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json b/src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json new file mode 100644 index 000000000..001f16c72 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_mossy_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json b/src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json new file mode 100644 index 000000000..58c91a044 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_pattern_framed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks.json b/src/main/resources/assets/botania/models/block/dreamwood_planks.json new file mode 100644 index 000000000..928789553 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/dreamwood_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/dreamwood1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json new file mode 100644 index 000000000..d3f6257f1 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone21" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json new file mode 100644 index 000000000..d72dc70c7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone29" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/desert_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/desert_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/desert_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json new file mode 100644 index 000000000..7dbbaf74c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone16" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json new file mode 100644 index 000000000..23e27a7e2 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone24" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/forest_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/forest_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/forest_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json new file mode 100644 index 000000000..69550fe61 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone19" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json new file mode 100644 index 000000000..3cc15bf6f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone27" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fungal_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/fungal_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/fungal_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json new file mode 100644 index 000000000..baaa34b53 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone23" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json new file mode 100644 index 000000000..4df5848c3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone31" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mesa_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/mesa_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mesa_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json new file mode 100644 index 000000000..e7ec9c31f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone18" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json new file mode 100644 index 000000000..b3b170ce0 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone26" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mountain_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/mountain_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mountain_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json new file mode 100644 index 000000000..12fb32f4a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone17" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json new file mode 100644 index 000000000..664cc97d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone25" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plains_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/plains_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/plains_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json new file mode 100644 index 000000000..c8a878f5e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone20" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json new file mode 100644 index 000000000..6fc624583 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone28" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/swamp_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/swamp_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/swamp_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json new file mode 100644 index 000000000..2e56f6e9b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone22" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json new file mode 100644 index 000000000..341449e07 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/biomeStone30" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/taiga_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_cobble_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json diff --git a/src/main/resources/assets/botania/models/block/taiga_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json similarity index 100% rename from src/main/resources/assets/botania/models/block/taiga_stone.json rename to src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json diff --git a/src/main/resources/assets/botania/models/block/pavement/black_pavement.json b/src/main/resources/assets/botania/models/block/pavement/black_pavement.json new file mode 100644 index 000000000..beaa676a5 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/black_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/blue_pavement.json b/src/main/resources/assets/botania/models/block/pavement/blue_pavement.json new file mode 100644 index 000000000..aa1c83e8e --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/blue_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/green_pavement.json b/src/main/resources/assets/botania/models/block/pavement/green_pavement.json new file mode 100644 index 000000000..4d1b4f975 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/green_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/red_pavement.json b/src/main/resources/assets/botania/models/block/pavement/red_pavement.json new file mode 100644 index 000000000..d96285ecd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/red_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/white_pavement.json b/src/main/resources/assets/botania/models/block/pavement/white_pavement.json new file mode 100644 index 000000000..f940e09bd --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/white_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json b/src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json new file mode 100644 index 000000000..317e9af1c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pavement/yellow_pavement.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "botania:blocks/pavement4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/flower_black.json b/src/main/resources/assets/botania/models/block/plants/flower_black.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_black.json rename to src/main/resources/assets/botania/models/block/plants/flower_black.json diff --git a/src/main/resources/assets/botania/models/block/flower_blue.json b/src/main/resources/assets/botania/models/block/plants/flower_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_blue.json rename to src/main/resources/assets/botania/models/block/plants/flower_blue.json diff --git a/src/main/resources/assets/botania/models/block/flower_brown.json b/src/main/resources/assets/botania/models/block/plants/flower_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_brown.json rename to src/main/resources/assets/botania/models/block/plants/flower_brown.json diff --git a/src/main/resources/assets/botania/models/block/flower_cyan.json b/src/main/resources/assets/botania/models/block/plants/flower_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_cyan.json rename to src/main/resources/assets/botania/models/block/plants/flower_cyan.json diff --git a/src/main/resources/assets/botania/models/block/flower_gray.json b/src/main/resources/assets/botania/models/block/plants/flower_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_gray.json rename to src/main/resources/assets/botania/models/block/plants/flower_gray.json diff --git a/src/main/resources/assets/botania/models/block/flower_green.json b/src/main/resources/assets/botania/models/block/plants/flower_green.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_green.json rename to src/main/resources/assets/botania/models/block/plants/flower_green.json diff --git a/src/main/resources/assets/botania/models/block/flower_light_blue.json b/src/main/resources/assets/botania/models/block/plants/flower_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_light_blue.json rename to src/main/resources/assets/botania/models/block/plants/flower_light_blue.json diff --git a/src/main/resources/assets/botania/models/block/flower_lime.json b/src/main/resources/assets/botania/models/block/plants/flower_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_lime.json rename to src/main/resources/assets/botania/models/block/plants/flower_lime.json diff --git a/src/main/resources/assets/botania/models/block/flower_magenta.json b/src/main/resources/assets/botania/models/block/plants/flower_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_magenta.json rename to src/main/resources/assets/botania/models/block/plants/flower_magenta.json diff --git a/src/main/resources/assets/botania/models/block/flower_orange.json b/src/main/resources/assets/botania/models/block/plants/flower_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_orange.json rename to src/main/resources/assets/botania/models/block/plants/flower_orange.json diff --git a/src/main/resources/assets/botania/models/block/flower_pink.json b/src/main/resources/assets/botania/models/block/plants/flower_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_pink.json rename to src/main/resources/assets/botania/models/block/plants/flower_pink.json diff --git a/src/main/resources/assets/botania/models/block/flower_purple.json b/src/main/resources/assets/botania/models/block/plants/flower_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_purple.json rename to src/main/resources/assets/botania/models/block/plants/flower_purple.json diff --git a/src/main/resources/assets/botania/models/block/flower_red.json b/src/main/resources/assets/botania/models/block/plants/flower_red.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_red.json rename to src/main/resources/assets/botania/models/block/plants/flower_red.json diff --git a/src/main/resources/assets/botania/models/block/flower_silver.json b/src/main/resources/assets/botania/models/block/plants/flower_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_silver.json rename to src/main/resources/assets/botania/models/block/plants/flower_silver.json diff --git a/src/main/resources/assets/botania/models/block/flower_white.json b/src/main/resources/assets/botania/models/block/plants/flower_white.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_white.json rename to src/main/resources/assets/botania/models/block/plants/flower_white.json diff --git a/src/main/resources/assets/botania/models/block/flower_yellow.json b/src/main/resources/assets/botania/models/block/plants/flower_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/block/flower_yellow.json rename to src/main/resources/assets/botania/models/block/plants/flower_yellow.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_black.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_black.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_blue.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_blue.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_brown.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_brown.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_cyan.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_gray.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_gray.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_green.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_green.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_light_blue.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_lime.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_lime.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_magenta.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_orange.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_orange.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_pink.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_pink.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_purple.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_purple.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_red.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_red.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_silver.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_silver.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_white.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_white.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json diff --git a/src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/block/glimmering_flower_yellow.json rename to src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_black.json b/src/main/resources/assets/botania/models/block/plants/mushroom_black.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_black.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_black.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_blue.json b/src/main/resources/assets/botania/models/block/plants/mushroom_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_blue.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_blue.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_brown.json b/src/main/resources/assets/botania/models/block/plants/mushroom_brown.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_brown.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_brown.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_cyan.json b/src/main/resources/assets/botania/models/block/plants/mushroom_cyan.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_cyan.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_cyan.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_gray.json b/src/main/resources/assets/botania/models/block/plants/mushroom_gray.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_gray.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_gray.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_green.json b/src/main/resources/assets/botania/models/block/plants/mushroom_green.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_green.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_green.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_light_blue.json b/src/main/resources/assets/botania/models/block/plants/mushroom_light_blue.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_light_blue.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_light_blue.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_lime.json b/src/main/resources/assets/botania/models/block/plants/mushroom_lime.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_lime.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_lime.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_magenta.json b/src/main/resources/assets/botania/models/block/plants/mushroom_magenta.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_magenta.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_magenta.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_orange.json b/src/main/resources/assets/botania/models/block/plants/mushroom_orange.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_orange.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_orange.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_pink.json b/src/main/resources/assets/botania/models/block/plants/mushroom_pink.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_pink.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_pink.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_purple.json b/src/main/resources/assets/botania/models/block/plants/mushroom_purple.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_purple.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_purple.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_red.json b/src/main/resources/assets/botania/models/block/plants/mushroom_red.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_red.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_red.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_silver.json b/src/main/resources/assets/botania/models/block/plants/mushroom_silver.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_silver.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_silver.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_white.json b/src/main/resources/assets/botania/models/block/plants/mushroom_white.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_white.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_white.json diff --git a/src/main/resources/assets/botania/models/block/mushroom_yellow.json b/src/main/resources/assets/botania/models/block/plants/mushroom_yellow.json similarity index 100% rename from src/main/resources/assets/botania/models/block/mushroom_yellow.json rename to src/main/resources/assets/botania/models/block/plants/mushroom_yellow.json diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json new file mode 100644 index 000000000..f44a954f6 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockBlazeQuartz0", + "top": "botania:blocks/blockBlazeQuartz1", + "side": "botania:blocks/blockBlazeQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json new file mode 100644 index 000000000..1532d2d11 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledBlazeQuartz0", + "end": "botania:blocks/chiseledBlazeQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json new file mode 100644 index 000000000..eb34dda3a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarBlazeQuartz0", + "end": "botania:blocks/pillarBlazeQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json new file mode 100644 index 000000000..e48195fab --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockDarkQuartz0", + "top": "botania:blocks/blockDarkQuartz1", + "side": "botania:blocks/blockDarkQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json new file mode 100644 index 000000000..7c1da5c3a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledDarkQuartz0", + "end": "botania:blocks/chiseledDarkQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json new file mode 100644 index 000000000..c610d0b25 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarDarkQuartz0", + "end": "botania:blocks/pillarDarkQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json new file mode 100644 index 000000000..d68e10781 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockElfQuartz0", + "top": "botania:blocks/blockElfQuartz1", + "side": "botania:blocks/blockElfQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json new file mode 100644 index 000000000..d2ba907cc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledElfQuartz0", + "end": "botania:blocks/chiseledElfQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json new file mode 100644 index 000000000..49ce41ac7 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarElfQuartz0", + "end": "botania:blocks/pillarElfQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json new file mode 100644 index 000000000..a15700d32 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockLavenderQuartz0", + "top": "botania:blocks/blockLavenderQuartz1", + "side": "botania:blocks/blockLavenderQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json new file mode 100644 index 000000000..743d29abb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledLavenderQuartz0", + "end": "botania:blocks/chiseledLavenderQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json new file mode 100644 index 000000000..a6baaf582 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarLavenderQuartz0", + "end": "botania:blocks/pillarLavenderQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json new file mode 100644 index 000000000..4d7592100 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockManaQuartz0", + "top": "botania:blocks/blockManaQuartz1", + "side": "botania:blocks/blockManaQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json new file mode 100644 index 000000000..365192d7d --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledManaQuartz0", + "end": "botania:blocks/chiseledManaQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json new file mode 100644 index 000000000..6ab1a24dc --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarManaQuartz0", + "end": "botania:blocks/pillarManaQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz.json new file mode 100644 index 000000000..6f8745719 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockRedQuartz0", + "top": "botania:blocks/blockRedQuartz1", + "side": "botania:blocks/blockRedQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json new file mode 100644 index 000000000..618377628 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledRedQuartz0", + "end": "botania:blocks/chiseledRedQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json new file mode 100644 index 000000000..eb722fa5c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarRedQuartz0", + "end": "botania:blocks/pillarRedQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json new file mode 100644 index 000000000..c4629562c --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "botania:blocks/blockSunnyQuartz0", + "top": "botania:blocks/blockSunnyQuartz1", + "side": "botania:blocks/blockSunnyQuartz2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json new file mode 100644 index 000000000..9dc208c8f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/chiseledSunnyQuartz0", + "end": "botania:blocks/chiseledSunnyQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json new file mode 100644 index 000000000..037c8054b --- /dev/null +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "botania:blocks/pillarSunnyQuartz0", + "end": "botania:blocks/pillarSunnyQuartz1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/note.txt b/src/main/resources/assets/botania/models/block/shapes/note.txt deleted file mode 100644 index 18061f888..000000000 --- a/src/main/resources/assets/botania/models/block/shapes/note.txt +++ /dev/null @@ -1,2 +0,0 @@ -This folder is for "abstract" models, that only define shapes and not textures. -Textured models for actual blocks goes in the root folder (one level up). \ No newline at end of file