From 48c4cad2b5701080da5a3312a70daee200107bfe Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Jun 2020 16:18:02 -0500 Subject: [PATCH] Rename specialflower textures and generate their block/item models --- .../assets/botania/models/block/agricarnation.json | 6 ++++++ .../botania/models/block/agricarnation_chibi.json | 6 ++++++ .../assets/botania/models/block/bellethorn.json | 6 ++++++ .../botania/models/block/bellethorn_chibi.json | 6 ++++++ .../assets/botania/models/block/bergamute.json | 6 ++++++ .../assets/botania/models/block/bubbell.json | 4 ++-- .../assets/botania/models/block/bubbell_chibi.json | 6 ++++++ .../assets/botania/models/block/clayconia.json | 6 ++++++ .../botania/models/block/clayconia_chibi.json | 6 ++++++ .../assets/botania/models/block/daffomill.json | 6 ++++++ .../assets/botania/models/block/dandelifeon.json | 6 ++++++ .../assets/botania/models/block/dreadthorn.json | 6 ++++++ .../assets/botania/models/block/endoflame.json | 6 ++++++ .../assets/botania/models/block/entropinnyum.json | 6 ++++++ .../assets/botania/models/block/exoflame.json | 6 ++++++ .../assets/botania/models/block/fallen_kanade.json | 6 ++++++ .../assets/botania/models/block/gourmaryllis.json | 6 ++++++ .../assets/botania/models/block/heisei_dream.json | 6 ++++++ .../assets/botania/models/block/hopperhock.json | 6 ++++++ .../botania/models/block/hopperhock_chibi.json | 6 ++++++ .../assets/botania/models/block/hyacidus.json | 6 ++++++ .../assets/botania/models/block/hydroangeas.json | 6 ++++++ .../botania/models/block/jaded_amaranthus.json | 6 ++++++ .../assets/botania/models/block/jiyuulia.json | 6 ++++++ .../assets/botania/models/block/kekimurus.json | 6 ++++++ .../assets/botania/models/block/loonium.json | 4 ++-- .../assets/botania/models/block/manastar.json | 6 ++++++ .../assets/botania/models/block/marimorphosis.json | 6 ++++++ .../botania/models/block/marimorphosis_chibi.json | 6 ++++++ .../assets/botania/models/block/medumone.json | 6 ++++++ .../assets/botania/models/block/munchdew.json | 4 ++-- .../assets/botania/models/block/narslimmus.json | 6 ++++++ .../assets/botania/models/block/orechid.json | 4 ++-- .../assets/botania/models/block/orechid_ignem.json | 6 ++++++ .../assets/botania/models/block/pollidisiac.json | 6 ++++++ .../assets/botania/models/block/pure_daisy.json | 6 ++++++ .../assets/botania/models/block/rafflowsia.json | 6 ++++++ .../assets/botania/models/block/rannuncarpus.json | 6 ++++++ .../botania/models/block/rannuncarpus_chibi.json | 6 ++++++ .../assets/botania/models/block/rosa_arcana.json | 6 ++++++ .../assets/botania/models/block/shulk_me_not.json | 6 ++++++ .../assets/botania/models/block/solegnolia.json | 6 ++++++ .../botania/models/block/solegnolia_chibi.json | 6 ++++++ .../assets/botania/models/block/spectranthemum.json | 6 ++++++ .../assets/botania/models/block/spectrolus.json | 6 ++++++ .../assets/botania/models/block/tangleberrie.json | 6 ++++++ .../assets/botania/models/block/thermalily.json | 6 ++++++ .../assets/botania/models/block/tigerseye.json | 6 ++++++ .../assets/botania/models/block/vinculotus.json | 6 ++++++ .../assets/botania/models/item/agricarnation.json | 6 ++++++ .../botania/models/item/agricarnation_chibi.json | 6 ++++++ .../assets/botania/models/item/bellethorn.json | 6 ++++++ .../botania/models/item/bellethorn_chibi.json | 6 ++++++ .../assets/botania/models/item/bergamute.json | 6 ++++++ .../assets/botania/models/item/bubbell.json | 6 ++++++ .../assets/botania/models/item/bubbell_chibi.json | 6 ++++++ .../assets/botania/models/item/clayconia.json | 6 ++++++ .../assets/botania/models/item/clayconia_chibi.json | 6 ++++++ .../assets/botania/models/item/daffomill.json | 6 ++++++ .../assets/botania/models/item/dandelifeon.json | 6 ++++++ .../assets/botania/models/item/dreadthorn.json | 6 ++++++ .../assets/botania/models/item/endoflame.json | 6 ++++++ .../assets/botania/models/item/entropinnyum.json | 6 ++++++ .../assets/botania/models/item/exoflame.json | 6 ++++++ .../assets/botania/models/item/fallen_kanade.json | 6 ++++++ .../assets/botania/models/item/gourmaryllis.json | 6 ++++++ .../assets/botania/models/item/heisei_dream.json | 6 ++++++ .../assets/botania/models/item/hopperhock.json | 6 ++++++ .../botania/models/item/hopperhock_chibi.json | 6 ++++++ .../assets/botania/models/item/hyacidus.json | 6 ++++++ .../assets/botania/models/item/hydroangeas.json | 6 ++++++ .../botania/models/item/jaded_amaranthus.json | 6 ++++++ .../assets/botania/models/item/jiyuulia.json | 6 ++++++ .../assets/botania/models/item/kekimurus.json | 6 ++++++ .../assets/botania/models/item/loonium.json | 6 ++++++ .../assets/botania/models/item/manastar.json | 6 ++++++ .../assets/botania/models/item/marimorphosis.json | 6 ++++++ .../botania/models/item/marimorphosis_chibi.json | 6 ++++++ .../assets/botania/models/item/medumone.json | 6 ++++++ .../assets/botania/models/item/munchdew.json | 6 ++++++ .../assets/botania/models/item/narslimmus.json | 6 ++++++ .../assets/botania/models/item/orechid.json | 6 ++++++ .../assets/botania/models/item/orechid_ignem.json | 6 ++++++ .../assets/botania/models/item/pollidisiac.json | 6 ++++++ .../assets/botania/models/item/pure_daisy.json | 6 ++++++ .../assets/botania/models/item/rafflowsia.json | 6 ++++++ .../assets/botania/models/item/rannuncarpus.json | 6 ++++++ .../botania/models/item/rannuncarpus_chibi.json | 6 ++++++ .../assets/botania/models/item/rosa_arcana.json | 6 ++++++ .../assets/botania/models/item/shulk_me_not.json | 6 ++++++ .../assets/botania/models/item/solegnolia.json | 6 ++++++ .../botania/models/item/solegnolia_chibi.json | 6 ++++++ .../assets/botania/models/item/spectranthemum.json | 6 ++++++ .../assets/botania/models/item/spectrolus.json | 6 ++++++ .../assets/botania/models/item/tangleberrie.json | 6 ++++++ .../assets/botania/models/item/thermalily.json | 6 ++++++ .../assets/botania/models/item/tigerseye.json | 6 ++++++ .../assets/botania/models/item/vinculotus.json | 6 ++++++ .../vazkii/botania/data/BlockstateProvider.java | 7 ++++++- .../java/vazkii/botania/data/ItemModelProvider.java | 11 +++++++++-- .../assets/botania/models/block/agricarnation.json | 6 ------ .../botania/models/block/agricarnation_chibi.json | 6 ------ .../assets/botania/models/block/bellethorn.json | 6 ------ .../botania/models/block/bellethorn_chibi.json | 6 ------ .../assets/botania/models/block/bergamute.json | 6 ------ .../assets/botania/models/block/bubbell_chibi.json | 6 ------ .../assets/botania/models/block/clayconia.json | 6 ------ .../botania/models/block/clayconia_chibi.json | 6 ------ .../assets/botania/models/block/daffomill.json | 6 ------ .../assets/botania/models/block/dandelifeon.json | 6 ------ .../assets/botania/models/block/dreadthorn.json | 6 ------ .../assets/botania/models/block/endoflame.json | 6 ------ .../assets/botania/models/block/entropinnyum.json | 6 ------ .../assets/botania/models/block/exoflame.json | 6 ------ .../assets/botania/models/block/fallen_kanade.json | 6 ------ .../assets/botania/models/block/gourmaryllis.json | 6 ------ .../assets/botania/models/block/heisei_dream.json | 6 ------ .../assets/botania/models/block/hopperhock.json | 6 ------ .../botania/models/block/hopperhock_chibi.json | 6 ------ .../assets/botania/models/block/hyacidus.json | 6 ------ .../assets/botania/models/block/hydroangeas.json | 6 ------ .../botania/models/block/jaded_amaranthus.json | 6 ------ .../assets/botania/models/block/jiyuulia.json | 6 ------ .../assets/botania/models/block/kekimurus.json | 6 ------ .../assets/botania/models/block/manastar.json | 6 ------ .../assets/botania/models/block/marimorphosis.json | 6 ------ .../botania/models/block/marimorphosis_chibi.json | 6 ------ .../assets/botania/models/block/medumone.json | 6 ------ .../assets/botania/models/block/narslimmus.json | 6 ------ .../assets/botania/models/block/orechid_ignem.json | 6 ------ .../assets/botania/models/block/pollidisiac.json | 6 ------ .../assets/botania/models/block/pure_daisy.json | 6 ------ .../assets/botania/models/block/rafflowsia.json | 6 ------ .../assets/botania/models/block/rannuncarpus.json | 6 ------ .../botania/models/block/rannuncarpus_chibi.json | 6 ------ .../assets/botania/models/block/rosa_arcana.json | 6 ------ .../assets/botania/models/block/shulk_me_not.json | 6 ------ .../assets/botania/models/block/solegnolia.json | 6 ------ .../botania/models/block/solegnolia_chibi.json | 6 ------ .../assets/botania/models/block/spectranthemum.json | 6 ------ .../assets/botania/models/block/spectrolus.json | 6 ------ .../assets/botania/models/block/tangleberrie.json | 6 ------ .../assets/botania/models/block/thermalily.json | 6 ------ .../assets/botania/models/block/tigerseye.json | 6 ------ .../assets/botania/models/block/vinculotus.json | 6 ------ .../assets/botania/models/item/agricarnation.json | 6 ------ .../botania/models/item/agricarnation_chibi.json | 6 ------ .../assets/botania/models/item/bellethorn.json | 6 ------ .../botania/models/item/bellethorn_chibi.json | 6 ------ .../assets/botania/models/item/bergamute.json | 6 ------ .../assets/botania/models/item/bubbell.json | 6 ------ .../assets/botania/models/item/bubbell_chibi.json | 6 ------ .../assets/botania/models/item/clayconia.json | 6 ------ .../assets/botania/models/item/clayconia_chibi.json | 6 ------ .../assets/botania/models/item/daffomill.json | 6 ------ .../assets/botania/models/item/dandelifeon.json | 6 ------ .../assets/botania/models/item/dreadthorn.json | 6 ------ .../assets/botania/models/item/endoflame.json | 6 ------ .../assets/botania/models/item/entropinnyum.json | 6 ------ .../assets/botania/models/item/exoflame.json | 6 ------ .../assets/botania/models/item/fallen_kanade.json | 6 ------ .../assets/botania/models/item/gourmaryllis.json | 6 ------ .../assets/botania/models/item/heisei_dream.json | 6 ------ .../assets/botania/models/item/hopperhock.json | 6 ------ .../botania/models/item/hopperhock_chibi.json | 6 ------ .../assets/botania/models/item/hyacidus.json | 6 ------ .../assets/botania/models/item/hydroangeas.json | 6 ------ .../botania/models/item/jaded_amaranthus.json | 6 ------ .../assets/botania/models/item/jiyuulia.json | 6 ------ .../assets/botania/models/item/kekimurus.json | 6 ------ .../assets/botania/models/item/loonium.json | 6 ------ .../assets/botania/models/item/manastar.json | 6 ------ .../assets/botania/models/item/marimorphosis.json | 6 ------ .../botania/models/item/marimorphosis_chibi.json | 6 ------ .../assets/botania/models/item/medumone.json | 6 ------ .../assets/botania/models/item/munchdew.json | 6 ------ .../assets/botania/models/item/narslimmus.json | 6 ------ .../assets/botania/models/item/orechid.json | 6 ------ .../assets/botania/models/item/orechid_ignem.json | 6 ------ .../assets/botania/models/item/pollidisiac.json | 6 ------ .../assets/botania/models/item/pure_daisy.json | 6 ------ .../assets/botania/models/item/rafflowsia.json | 6 ------ .../assets/botania/models/item/rannuncarpus.json | 6 ------ .../botania/models/item/rannuncarpus_chibi.json | 6 ------ .../assets/botania/models/item/rosa_arcana.json | 6 ------ .../assets/botania/models/item/shulk_me_not.json | 6 ------ .../assets/botania/models/item/solegnolia.json | 6 ------ .../botania/models/item/solegnolia_chibi.json | 6 ------ .../assets/botania/models/item/spectranthemum.json | 6 ------ .../assets/botania/models/item/spectrolus.json | 6 ------ .../assets/botania/models/item/tangleberrie.json | 6 ------ .../assets/botania/models/item/thermalily.json | 6 ------ .../assets/botania/models/item/tigerseye.json | 6 ------ .../assets/botania/models/item/vinculotus.json | 6 ------ ...wer_func_agricarnation.png => agricarnation.png} | Bin ...icarnation_chibi.png => agricarnation_chibi.png} | Bin .../{flower_func_bellethorne.png => bellethorn.png} | Bin ...c_bellethorne_chibi.png => bellethorn_chibi.png} | Bin .../{flower_func_bergamute.png => bergamute.png} | Bin .../block/{flower_func_bubbell.png => bubbell.png} | Bin ...wer_func_bubbell_chibi.png => bubbell_chibi.png} | Bin .../{flower_func_clayconia.png => clayconia.png} | Bin ...func_clayconia_chibi.png => clayconia_chibi.png} | Bin .../{flower_func_daffomill.png => daffomill.png} | Bin .../{flower_gen_dandelifeon.png => dandelifeon.png} | Bin ...andelifeon.png.mcmeta => dandelifeon.png.mcmeta} | 0 .../{flower_func_dreadthorne.png => dreadthorn.png} | Bin .../{flower_gen_endoflame.png => endoflame.png} | Bin ...flower_gen_entropinnyum.png => entropinnyum.png} | Bin .../{flower_func_exoflame.png => exoflame.png} | Bin ...wer_func_fallen_kanade.png => fallen_kanade.png} | Bin ...flower_gen_gourmaryllis.png => gourmaryllis.png} | Bin ...lower_func_heisei_dream.png => heisei_dream.png} | Bin .../{flower_func_hopperhock.png => hopperhock.png} | Bin ...nc_hopperhock_chibi.png => hopperhock_chibi.png} | Bin .../{flower_func_hyacidus.png => hyacidus.png} | Bin .../{flower_gen_hydroangeas.png => hydroangeas.png} | Bin ..._hydroangeas_decor.png => hydroangeas_decor.png} | Bin ...nc_jaded_amaranthus.png => jaded_amaranthus.png} | Bin .../{flower_func_jiyuulia.png => jiyuulia.png} | Bin .../{flower_gen_kekimurus.png => kekimurus.png} | Bin .../block/{flower_func_loonium.png => loonium.png} | Bin .../{flower_misc_manastar.png => manastar.png} | Bin ...wer_func_marimorphosis.png => marimorphosis.png} | Bin ...imorphosis_chibi.png => marimorphosis_chibi.png} | Bin .../{flower_func_medumone.png => medumone.png} | Bin .../block/{flower_gen_munchdew.png => munchdew.png} | Bin .../{flower_gen_narslimmus.png => narslimmus.png} | Bin .../block/{flower_func_orechid.png => orechid.png} | Bin ...wer_func_orechid_ignem.png => orechid_ignem.png} | Bin ...{flower_func_pollidisiac.png => pollidisiac.png} | Bin .../{flower_misc_pure_daisy.png => pure_daisy.png} | Bin .../{flower_gen_rafflowsia.png => rafflowsia.png} | Bin ...lower_func_rannuncarpus.png => rannuncarpus.png} | Bin ...annuncarpus_chibi.png => rannuncarpus_chibi.png} | Bin .../{flower_gen_arcane_rose.png => rosa_arcana.png} | Bin ...flower_gen_shulk_me_not.png => shulk_me_not.png} | Bin .../{flower_func_solegnolia.png => solegnolia.png} | Bin ...nc_solegnolia_chibi.png => solegnolia_chibi.png} | Bin ...r_func_spectranthemum.png => spectranthemum.png} | Bin .../{flower_gen_spectrolus.png => spectrolus.png} | Bin ...lower_func_tangleberrie.png => tangleberrie.png} | Bin .../{flower_gen_thermalily.png => thermalily.png} | Bin .../{flower_func_tigerseye.png => tigerseye.png} | Bin .../{flower_func_vinculotus.png => vinculotus.png} | Bin 245 files changed, 587 insertions(+), 575 deletions(-) create mode 100644 src/generated/resources/assets/botania/models/block/agricarnation.json create mode 100644 src/generated/resources/assets/botania/models/block/agricarnation_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/bellethorn.json create mode 100644 src/generated/resources/assets/botania/models/block/bellethorn_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/bergamute.json rename src/{main => generated}/resources/assets/botania/models/block/bubbell.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/bubbell_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/clayconia.json create mode 100644 src/generated/resources/assets/botania/models/block/clayconia_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/daffomill.json create mode 100644 src/generated/resources/assets/botania/models/block/dandelifeon.json create mode 100644 src/generated/resources/assets/botania/models/block/dreadthorn.json create mode 100644 src/generated/resources/assets/botania/models/block/endoflame.json create mode 100644 src/generated/resources/assets/botania/models/block/entropinnyum.json create mode 100644 src/generated/resources/assets/botania/models/block/exoflame.json create mode 100644 src/generated/resources/assets/botania/models/block/fallen_kanade.json create mode 100644 src/generated/resources/assets/botania/models/block/gourmaryllis.json create mode 100644 src/generated/resources/assets/botania/models/block/heisei_dream.json create mode 100644 src/generated/resources/assets/botania/models/block/hopperhock.json create mode 100644 src/generated/resources/assets/botania/models/block/hopperhock_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/hyacidus.json create mode 100644 src/generated/resources/assets/botania/models/block/hydroangeas.json create mode 100644 src/generated/resources/assets/botania/models/block/jaded_amaranthus.json create mode 100644 src/generated/resources/assets/botania/models/block/jiyuulia.json create mode 100644 src/generated/resources/assets/botania/models/block/kekimurus.json rename src/{main => generated}/resources/assets/botania/models/block/loonium.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/manastar.json create mode 100644 src/generated/resources/assets/botania/models/block/marimorphosis.json create mode 100644 src/generated/resources/assets/botania/models/block/marimorphosis_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/medumone.json rename src/{main => generated}/resources/assets/botania/models/block/munchdew.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/narslimmus.json rename src/{main => generated}/resources/assets/botania/models/block/orechid.json (55%) create mode 100644 src/generated/resources/assets/botania/models/block/orechid_ignem.json create mode 100644 src/generated/resources/assets/botania/models/block/pollidisiac.json create mode 100644 src/generated/resources/assets/botania/models/block/pure_daisy.json create mode 100644 src/generated/resources/assets/botania/models/block/rafflowsia.json create mode 100644 src/generated/resources/assets/botania/models/block/rannuncarpus.json create mode 100644 src/generated/resources/assets/botania/models/block/rannuncarpus_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/rosa_arcana.json create mode 100644 src/generated/resources/assets/botania/models/block/shulk_me_not.json create mode 100644 src/generated/resources/assets/botania/models/block/solegnolia.json create mode 100644 src/generated/resources/assets/botania/models/block/solegnolia_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/spectranthemum.json create mode 100644 src/generated/resources/assets/botania/models/block/spectrolus.json create mode 100644 src/generated/resources/assets/botania/models/block/tangleberrie.json create mode 100644 src/generated/resources/assets/botania/models/block/thermalily.json create mode 100644 src/generated/resources/assets/botania/models/block/tigerseye.json create mode 100644 src/generated/resources/assets/botania/models/block/vinculotus.json create mode 100644 src/generated/resources/assets/botania/models/item/agricarnation.json create mode 100644 src/generated/resources/assets/botania/models/item/agricarnation_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/bellethorn.json create mode 100644 src/generated/resources/assets/botania/models/item/bellethorn_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/bergamute.json create mode 100644 src/generated/resources/assets/botania/models/item/bubbell.json create mode 100644 src/generated/resources/assets/botania/models/item/bubbell_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/clayconia.json create mode 100644 src/generated/resources/assets/botania/models/item/clayconia_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/daffomill.json create mode 100644 src/generated/resources/assets/botania/models/item/dandelifeon.json create mode 100644 src/generated/resources/assets/botania/models/item/dreadthorn.json create mode 100644 src/generated/resources/assets/botania/models/item/endoflame.json create mode 100644 src/generated/resources/assets/botania/models/item/entropinnyum.json create mode 100644 src/generated/resources/assets/botania/models/item/exoflame.json create mode 100644 src/generated/resources/assets/botania/models/item/fallen_kanade.json create mode 100644 src/generated/resources/assets/botania/models/item/gourmaryllis.json create mode 100644 src/generated/resources/assets/botania/models/item/heisei_dream.json create mode 100644 src/generated/resources/assets/botania/models/item/hopperhock.json create mode 100644 src/generated/resources/assets/botania/models/item/hopperhock_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/hyacidus.json create mode 100644 src/generated/resources/assets/botania/models/item/hydroangeas.json create mode 100644 src/generated/resources/assets/botania/models/item/jaded_amaranthus.json create mode 100644 src/generated/resources/assets/botania/models/item/jiyuulia.json create mode 100644 src/generated/resources/assets/botania/models/item/kekimurus.json create mode 100644 src/generated/resources/assets/botania/models/item/loonium.json create mode 100644 src/generated/resources/assets/botania/models/item/manastar.json create mode 100644 src/generated/resources/assets/botania/models/item/marimorphosis.json create mode 100644 src/generated/resources/assets/botania/models/item/marimorphosis_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/medumone.json create mode 100644 src/generated/resources/assets/botania/models/item/munchdew.json create mode 100644 src/generated/resources/assets/botania/models/item/narslimmus.json create mode 100644 src/generated/resources/assets/botania/models/item/orechid.json create mode 100644 src/generated/resources/assets/botania/models/item/orechid_ignem.json create mode 100644 src/generated/resources/assets/botania/models/item/pollidisiac.json create mode 100644 src/generated/resources/assets/botania/models/item/pure_daisy.json create mode 100644 src/generated/resources/assets/botania/models/item/rafflowsia.json create mode 100644 src/generated/resources/assets/botania/models/item/rannuncarpus.json create mode 100644 src/generated/resources/assets/botania/models/item/rannuncarpus_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/rosa_arcana.json create mode 100644 src/generated/resources/assets/botania/models/item/shulk_me_not.json create mode 100644 src/generated/resources/assets/botania/models/item/solegnolia.json create mode 100644 src/generated/resources/assets/botania/models/item/solegnolia_chibi.json create mode 100644 src/generated/resources/assets/botania/models/item/spectranthemum.json create mode 100644 src/generated/resources/assets/botania/models/item/spectrolus.json create mode 100644 src/generated/resources/assets/botania/models/item/tangleberrie.json create mode 100644 src/generated/resources/assets/botania/models/item/thermalily.json create mode 100644 src/generated/resources/assets/botania/models/item/tigerseye.json create mode 100644 src/generated/resources/assets/botania/models/item/vinculotus.json delete mode 100644 src/main/resources/assets/botania/models/block/agricarnation.json delete mode 100644 src/main/resources/assets/botania/models/block/agricarnation_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/bellethorn.json delete mode 100644 src/main/resources/assets/botania/models/block/bellethorn_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/bergamute.json delete mode 100644 src/main/resources/assets/botania/models/block/bubbell_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/clayconia.json delete mode 100644 src/main/resources/assets/botania/models/block/clayconia_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/daffomill.json delete mode 100644 src/main/resources/assets/botania/models/block/dandelifeon.json delete mode 100644 src/main/resources/assets/botania/models/block/dreadthorn.json delete mode 100644 src/main/resources/assets/botania/models/block/endoflame.json delete mode 100644 src/main/resources/assets/botania/models/block/entropinnyum.json delete mode 100644 src/main/resources/assets/botania/models/block/exoflame.json delete mode 100644 src/main/resources/assets/botania/models/block/fallen_kanade.json delete mode 100644 src/main/resources/assets/botania/models/block/gourmaryllis.json delete mode 100644 src/main/resources/assets/botania/models/block/heisei_dream.json delete mode 100644 src/main/resources/assets/botania/models/block/hopperhock.json delete mode 100644 src/main/resources/assets/botania/models/block/hopperhock_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/hyacidus.json delete mode 100644 src/main/resources/assets/botania/models/block/hydroangeas.json delete mode 100644 src/main/resources/assets/botania/models/block/jaded_amaranthus.json delete mode 100644 src/main/resources/assets/botania/models/block/jiyuulia.json delete mode 100644 src/main/resources/assets/botania/models/block/kekimurus.json delete mode 100644 src/main/resources/assets/botania/models/block/manastar.json delete mode 100644 src/main/resources/assets/botania/models/block/marimorphosis.json delete mode 100644 src/main/resources/assets/botania/models/block/marimorphosis_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/medumone.json delete mode 100644 src/main/resources/assets/botania/models/block/narslimmus.json delete mode 100644 src/main/resources/assets/botania/models/block/orechid_ignem.json delete mode 100644 src/main/resources/assets/botania/models/block/pollidisiac.json delete mode 100644 src/main/resources/assets/botania/models/block/pure_daisy.json delete mode 100644 src/main/resources/assets/botania/models/block/rafflowsia.json delete mode 100644 src/main/resources/assets/botania/models/block/rannuncarpus.json delete mode 100644 src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/rosa_arcana.json delete mode 100644 src/main/resources/assets/botania/models/block/shulk_me_not.json delete mode 100644 src/main/resources/assets/botania/models/block/solegnolia.json delete mode 100644 src/main/resources/assets/botania/models/block/solegnolia_chibi.json delete mode 100644 src/main/resources/assets/botania/models/block/spectranthemum.json delete mode 100644 src/main/resources/assets/botania/models/block/spectrolus.json delete mode 100644 src/main/resources/assets/botania/models/block/tangleberrie.json delete mode 100644 src/main/resources/assets/botania/models/block/thermalily.json delete mode 100644 src/main/resources/assets/botania/models/block/tigerseye.json delete mode 100644 src/main/resources/assets/botania/models/block/vinculotus.json delete mode 100644 src/main/resources/assets/botania/models/item/agricarnation.json delete mode 100644 src/main/resources/assets/botania/models/item/agricarnation_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/bellethorn.json delete mode 100644 src/main/resources/assets/botania/models/item/bellethorn_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/bergamute.json delete mode 100644 src/main/resources/assets/botania/models/item/bubbell.json delete mode 100644 src/main/resources/assets/botania/models/item/bubbell_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/clayconia.json delete mode 100644 src/main/resources/assets/botania/models/item/clayconia_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/daffomill.json delete mode 100644 src/main/resources/assets/botania/models/item/dandelifeon.json delete mode 100644 src/main/resources/assets/botania/models/item/dreadthorn.json delete mode 100644 src/main/resources/assets/botania/models/item/endoflame.json delete mode 100644 src/main/resources/assets/botania/models/item/entropinnyum.json delete mode 100644 src/main/resources/assets/botania/models/item/exoflame.json delete mode 100644 src/main/resources/assets/botania/models/item/fallen_kanade.json delete mode 100644 src/main/resources/assets/botania/models/item/gourmaryllis.json delete mode 100644 src/main/resources/assets/botania/models/item/heisei_dream.json delete mode 100644 src/main/resources/assets/botania/models/item/hopperhock.json delete mode 100644 src/main/resources/assets/botania/models/item/hopperhock_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/hyacidus.json delete mode 100644 src/main/resources/assets/botania/models/item/hydroangeas.json delete mode 100644 src/main/resources/assets/botania/models/item/jaded_amaranthus.json delete mode 100644 src/main/resources/assets/botania/models/item/jiyuulia.json delete mode 100644 src/main/resources/assets/botania/models/item/kekimurus.json delete mode 100644 src/main/resources/assets/botania/models/item/loonium.json delete mode 100644 src/main/resources/assets/botania/models/item/manastar.json delete mode 100644 src/main/resources/assets/botania/models/item/marimorphosis.json delete mode 100644 src/main/resources/assets/botania/models/item/marimorphosis_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/medumone.json delete mode 100644 src/main/resources/assets/botania/models/item/munchdew.json delete mode 100644 src/main/resources/assets/botania/models/item/narslimmus.json delete mode 100644 src/main/resources/assets/botania/models/item/orechid.json delete mode 100644 src/main/resources/assets/botania/models/item/orechid_ignem.json delete mode 100644 src/main/resources/assets/botania/models/item/pollidisiac.json delete mode 100644 src/main/resources/assets/botania/models/item/pure_daisy.json delete mode 100644 src/main/resources/assets/botania/models/item/rafflowsia.json delete mode 100644 src/main/resources/assets/botania/models/item/rannuncarpus.json delete mode 100644 src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/rosa_arcana.json delete mode 100644 src/main/resources/assets/botania/models/item/shulk_me_not.json delete mode 100644 src/main/resources/assets/botania/models/item/solegnolia.json delete mode 100644 src/main/resources/assets/botania/models/item/solegnolia_chibi.json delete mode 100644 src/main/resources/assets/botania/models/item/spectranthemum.json delete mode 100644 src/main/resources/assets/botania/models/item/spectrolus.json delete mode 100644 src/main/resources/assets/botania/models/item/tangleberrie.json delete mode 100644 src/main/resources/assets/botania/models/item/thermalily.json delete mode 100644 src/main/resources/assets/botania/models/item/tigerseye.json delete mode 100644 src/main/resources/assets/botania/models/item/vinculotus.json rename src/main/resources/assets/botania/textures/block/{flower_func_agricarnation.png => agricarnation.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_agricarnation_chibi.png => agricarnation_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_bellethorne.png => bellethorn.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_bellethorne_chibi.png => bellethorn_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_bergamute.png => bergamute.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_bubbell.png => bubbell.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_bubbell_chibi.png => bubbell_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_clayconia.png => clayconia.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_clayconia_chibi.png => clayconia_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_daffomill.png => daffomill.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_dandelifeon.png => dandelifeon.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_dandelifeon.png.mcmeta => dandelifeon.png.mcmeta} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_dreadthorne.png => dreadthorn.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_endoflame.png => endoflame.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_entropinnyum.png => entropinnyum.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_exoflame.png => exoflame.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_fallen_kanade.png => fallen_kanade.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_gourmaryllis.png => gourmaryllis.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_heisei_dream.png => heisei_dream.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_hopperhock.png => hopperhock.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_hopperhock_chibi.png => hopperhock_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_hyacidus.png => hyacidus.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_hydroangeas.png => hydroangeas.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_hydroangeas_decor.png => hydroangeas_decor.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_jaded_amaranthus.png => jaded_amaranthus.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_jiyuulia.png => jiyuulia.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_kekimurus.png => kekimurus.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_loonium.png => loonium.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_misc_manastar.png => manastar.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_marimorphosis.png => marimorphosis.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_marimorphosis_chibi.png => marimorphosis_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_medumone.png => medumone.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_munchdew.png => munchdew.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_narslimmus.png => narslimmus.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_orechid.png => orechid.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_orechid_ignem.png => orechid_ignem.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_pollidisiac.png => pollidisiac.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_misc_pure_daisy.png => pure_daisy.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_rafflowsia.png => rafflowsia.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_rannuncarpus.png => rannuncarpus.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_rannuncarpus_chibi.png => rannuncarpus_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_arcane_rose.png => rosa_arcana.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_shulk_me_not.png => shulk_me_not.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_solegnolia.png => solegnolia.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_solegnolia_chibi.png => solegnolia_chibi.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_spectranthemum.png => spectranthemum.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_spectrolus.png => spectrolus.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_tangleberrie.png => tangleberrie.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_gen_thermalily.png => thermalily.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_tigerseye.png => tigerseye.png} (100%) rename src/main/resources/assets/botania/textures/block/{flower_func_vinculotus.png => vinculotus.png} (100%) diff --git a/src/generated/resources/assets/botania/models/block/agricarnation.json b/src/generated/resources/assets/botania/models/block/agricarnation.json new file mode 100644 index 000000000..2460cd975 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/agricarnation.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/agricarnation" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/agricarnation_chibi.json b/src/generated/resources/assets/botania/models/block/agricarnation_chibi.json new file mode 100644 index 000000000..d56dc2f80 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/agricarnation_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/agricarnation_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bellethorn.json b/src/generated/resources/assets/botania/models/block/bellethorn.json new file mode 100644 index 000000000..631c89666 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bellethorn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/bellethorn" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bellethorn_chibi.json b/src/generated/resources/assets/botania/models/block/bellethorn_chibi.json new file mode 100644 index 000000000..614fe8882 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bellethorn_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/bellethorn_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bergamute.json b/src/generated/resources/assets/botania/models/block/bergamute.json new file mode 100644 index 000000000..d8eb61e85 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bergamute.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/bergamute" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bubbell.json b/src/generated/resources/assets/botania/models/block/bubbell.json similarity index 55% rename from src/main/resources/assets/botania/models/block/bubbell.json rename to src/generated/resources/assets/botania/models/block/bubbell.json index cb020af11..b25d65c64 100644 --- a/src/main/resources/assets/botania/models/block/bubbell.json +++ b/src/generated/resources/assets/botania/models/block/bubbell.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower_func_bubbell" + "cross": "botania:block/bubbell" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/bubbell_chibi.json b/src/generated/resources/assets/botania/models/block/bubbell_chibi.json new file mode 100644 index 000000000..16b0636d1 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/bubbell_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/bubbell_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/clayconia.json b/src/generated/resources/assets/botania/models/block/clayconia.json new file mode 100644 index 000000000..511a61dc2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/clayconia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/clayconia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/clayconia_chibi.json b/src/generated/resources/assets/botania/models/block/clayconia_chibi.json new file mode 100644 index 000000000..6deafddd6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/clayconia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/clayconia_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/daffomill.json b/src/generated/resources/assets/botania/models/block/daffomill.json new file mode 100644 index 000000000..96a15cdf0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/daffomill.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/daffomill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/dandelifeon.json b/src/generated/resources/assets/botania/models/block/dandelifeon.json new file mode 100644 index 000000000..ea116b843 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/dandelifeon.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/dandelifeon" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/dreadthorn.json b/src/generated/resources/assets/botania/models/block/dreadthorn.json new file mode 100644 index 000000000..025b5d020 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/dreadthorn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/dreadthorn" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/endoflame.json b/src/generated/resources/assets/botania/models/block/endoflame.json new file mode 100644 index 000000000..20325504f --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/endoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/endoflame" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/entropinnyum.json b/src/generated/resources/assets/botania/models/block/entropinnyum.json new file mode 100644 index 000000000..0f19fcb95 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/entropinnyum.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/entropinnyum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/exoflame.json b/src/generated/resources/assets/botania/models/block/exoflame.json new file mode 100644 index 000000000..9ac123367 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/exoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/exoflame" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/fallen_kanade.json b/src/generated/resources/assets/botania/models/block/fallen_kanade.json new file mode 100644 index 000000000..e2eb31a0b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/fallen_kanade.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/fallen_kanade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gourmaryllis.json b/src/generated/resources/assets/botania/models/block/gourmaryllis.json new file mode 100644 index 000000000..39a05dedf --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gourmaryllis.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/gourmaryllis" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/heisei_dream.json b/src/generated/resources/assets/botania/models/block/heisei_dream.json new file mode 100644 index 000000000..5b1fa720c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/heisei_dream.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/heisei_dream" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/hopperhock.json b/src/generated/resources/assets/botania/models/block/hopperhock.json new file mode 100644 index 000000000..0ff807328 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/hopperhock.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/hopperhock" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/hopperhock_chibi.json b/src/generated/resources/assets/botania/models/block/hopperhock_chibi.json new file mode 100644 index 000000000..8f9acc5a0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/hopperhock_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/hopperhock_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/hyacidus.json b/src/generated/resources/assets/botania/models/block/hyacidus.json new file mode 100644 index 000000000..6abaac7cc --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/hyacidus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/hyacidus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/hydroangeas.json b/src/generated/resources/assets/botania/models/block/hydroangeas.json new file mode 100644 index 000000000..37ec890a3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/hydroangeas.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/hydroangeas" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/jaded_amaranthus.json b/src/generated/resources/assets/botania/models/block/jaded_amaranthus.json new file mode 100644 index 000000000..cfb3d7917 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/jaded_amaranthus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/jaded_amaranthus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/jiyuulia.json b/src/generated/resources/assets/botania/models/block/jiyuulia.json new file mode 100644 index 000000000..3b25f519d --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/jiyuulia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/jiyuulia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/kekimurus.json b/src/generated/resources/assets/botania/models/block/kekimurus.json new file mode 100644 index 000000000..3b21f3c2e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/kekimurus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/kekimurus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/loonium.json b/src/generated/resources/assets/botania/models/block/loonium.json similarity index 55% rename from src/main/resources/assets/botania/models/block/loonium.json rename to src/generated/resources/assets/botania/models/block/loonium.json index cce0bec56..26f201e9b 100644 --- a/src/main/resources/assets/botania/models/block/loonium.json +++ b/src/generated/resources/assets/botania/models/block/loonium.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower_func_loonium" + "cross": "botania:block/loonium" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/manastar.json b/src/generated/resources/assets/botania/models/block/manastar.json new file mode 100644 index 000000000..403b06ac6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/manastar.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/manastar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/marimorphosis.json b/src/generated/resources/assets/botania/models/block/marimorphosis.json new file mode 100644 index 000000000..33961896c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/marimorphosis.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/marimorphosis" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/marimorphosis_chibi.json b/src/generated/resources/assets/botania/models/block/marimorphosis_chibi.json new file mode 100644 index 000000000..abd17b229 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/marimorphosis_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/marimorphosis_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/medumone.json b/src/generated/resources/assets/botania/models/block/medumone.json new file mode 100644 index 000000000..fab1e0821 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/medumone.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/medumone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/munchdew.json b/src/generated/resources/assets/botania/models/block/munchdew.json similarity index 55% rename from src/main/resources/assets/botania/models/block/munchdew.json rename to src/generated/resources/assets/botania/models/block/munchdew.json index 82aef8330..29252cf72 100644 --- a/src/main/resources/assets/botania/models/block/munchdew.json +++ b/src/generated/resources/assets/botania/models/block/munchdew.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower_gen_munchdew" + "cross": "botania:block/munchdew" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/narslimmus.json b/src/generated/resources/assets/botania/models/block/narslimmus.json new file mode 100644 index 000000000..fcc8edf45 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/narslimmus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/narslimmus" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/orechid.json b/src/generated/resources/assets/botania/models/block/orechid.json similarity index 55% rename from src/main/resources/assets/botania/models/block/orechid.json rename to src/generated/resources/assets/botania/models/block/orechid.json index 29a0ccb83..844bad969 100644 --- a/src/main/resources/assets/botania/models/block/orechid.json +++ b/src/generated/resources/assets/botania/models/block/orechid.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/flower_func_orechid" + "cross": "botania:block/orechid" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/orechid_ignem.json b/src/generated/resources/assets/botania/models/block/orechid_ignem.json new file mode 100644 index 000000000..fce92314e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/orechid_ignem.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/orechid_ignem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/pollidisiac.json b/src/generated/resources/assets/botania/models/block/pollidisiac.json new file mode 100644 index 000000000..b6416162c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/pollidisiac.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/pollidisiac" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/pure_daisy.json b/src/generated/resources/assets/botania/models/block/pure_daisy.json new file mode 100644 index 000000000..6f4c86c4d --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/pure_daisy.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/pure_daisy" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/rafflowsia.json b/src/generated/resources/assets/botania/models/block/rafflowsia.json new file mode 100644 index 000000000..518237b40 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/rafflowsia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/rafflowsia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/rannuncarpus.json b/src/generated/resources/assets/botania/models/block/rannuncarpus.json new file mode 100644 index 000000000..41685f8e6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/rannuncarpus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/rannuncarpus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/rannuncarpus_chibi.json b/src/generated/resources/assets/botania/models/block/rannuncarpus_chibi.json new file mode 100644 index 000000000..d50c8feae --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/rannuncarpus_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/rannuncarpus_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/rosa_arcana.json b/src/generated/resources/assets/botania/models/block/rosa_arcana.json new file mode 100644 index 000000000..b30cde152 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/rosa_arcana.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/rosa_arcana" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/shulk_me_not.json b/src/generated/resources/assets/botania/models/block/shulk_me_not.json new file mode 100644 index 000000000..dcecc5d95 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/shulk_me_not.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/shulk_me_not" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/solegnolia.json b/src/generated/resources/assets/botania/models/block/solegnolia.json new file mode 100644 index 000000000..8f83737ec --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/solegnolia.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/solegnolia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/solegnolia_chibi.json b/src/generated/resources/assets/botania/models/block/solegnolia_chibi.json new file mode 100644 index 000000000..881f1a5d8 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/solegnolia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/solegnolia_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/spectranthemum.json b/src/generated/resources/assets/botania/models/block/spectranthemum.json new file mode 100644 index 000000000..ac484801d --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/spectranthemum.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/spectranthemum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/spectrolus.json b/src/generated/resources/assets/botania/models/block/spectrolus.json new file mode 100644 index 000000000..989b5477e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/spectrolus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/spectrolus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/tangleberrie.json b/src/generated/resources/assets/botania/models/block/tangleberrie.json new file mode 100644 index 000000000..adb72062e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/tangleberrie.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/tangleberrie" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/thermalily.json b/src/generated/resources/assets/botania/models/block/thermalily.json new file mode 100644 index 000000000..12a455d59 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/thermalily.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/thermalily" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/tigerseye.json b/src/generated/resources/assets/botania/models/block/tigerseye.json new file mode 100644 index 000000000..120cbdf26 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/tigerseye.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/tigerseye" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/vinculotus.json b/src/generated/resources/assets/botania/models/block/vinculotus.json new file mode 100644 index 000000000..01b3d7a84 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/vinculotus.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:block/shapes/cross", + "textures": { + "cross": "botania:block/vinculotus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/agricarnation.json b/src/generated/resources/assets/botania/models/item/agricarnation.json new file mode 100644 index 000000000..59908cbac --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/agricarnation.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/agricarnation" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/agricarnation_chibi.json b/src/generated/resources/assets/botania/models/item/agricarnation_chibi.json new file mode 100644 index 000000000..fa7136b25 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/agricarnation_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/agricarnation_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/bellethorn.json b/src/generated/resources/assets/botania/models/item/bellethorn.json new file mode 100644 index 000000000..20487b11d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/bellethorn.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/bellethorn" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/bellethorn_chibi.json b/src/generated/resources/assets/botania/models/item/bellethorn_chibi.json new file mode 100644 index 000000000..040c1b12d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/bellethorn_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/bellethorn_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/bergamute.json b/src/generated/resources/assets/botania/models/item/bergamute.json new file mode 100644 index 000000000..e7c234291 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/bergamute.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/bergamute" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/bubbell.json b/src/generated/resources/assets/botania/models/item/bubbell.json new file mode 100644 index 000000000..94f137820 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/bubbell.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/bubbell" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/bubbell_chibi.json b/src/generated/resources/assets/botania/models/item/bubbell_chibi.json new file mode 100644 index 000000000..7c74c5241 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/bubbell_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/bubbell_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/clayconia.json b/src/generated/resources/assets/botania/models/item/clayconia.json new file mode 100644 index 000000000..11c2c8755 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/clayconia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/clayconia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/clayconia_chibi.json b/src/generated/resources/assets/botania/models/item/clayconia_chibi.json new file mode 100644 index 000000000..7207adaf6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/clayconia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/clayconia_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/daffomill.json b/src/generated/resources/assets/botania/models/item/daffomill.json new file mode 100644 index 000000000..e51e227c6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/daffomill.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/daffomill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/dandelifeon.json b/src/generated/resources/assets/botania/models/item/dandelifeon.json new file mode 100644 index 000000000..72e38e129 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/dandelifeon.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/dandelifeon" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/dreadthorn.json b/src/generated/resources/assets/botania/models/item/dreadthorn.json new file mode 100644 index 000000000..b0a9d5888 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/dreadthorn.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/dreadthorn" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/endoflame.json b/src/generated/resources/assets/botania/models/item/endoflame.json new file mode 100644 index 000000000..b479d4477 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/endoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/endoflame" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/entropinnyum.json b/src/generated/resources/assets/botania/models/item/entropinnyum.json new file mode 100644 index 000000000..00e645836 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/entropinnyum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/entropinnyum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/exoflame.json b/src/generated/resources/assets/botania/models/item/exoflame.json new file mode 100644 index 000000000..5e4d17711 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/exoflame.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/exoflame" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/fallen_kanade.json b/src/generated/resources/assets/botania/models/item/fallen_kanade.json new file mode 100644 index 000000000..18d28a3f1 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/fallen_kanade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/fallen_kanade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/gourmaryllis.json b/src/generated/resources/assets/botania/models/item/gourmaryllis.json new file mode 100644 index 000000000..b6466e8a0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/gourmaryllis.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/gourmaryllis" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/heisei_dream.json b/src/generated/resources/assets/botania/models/item/heisei_dream.json new file mode 100644 index 000000000..f0d5cbcb7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/heisei_dream.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/heisei_dream" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/hopperhock.json b/src/generated/resources/assets/botania/models/item/hopperhock.json new file mode 100644 index 000000000..eca7bb330 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/hopperhock.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/hopperhock" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/hopperhock_chibi.json b/src/generated/resources/assets/botania/models/item/hopperhock_chibi.json new file mode 100644 index 000000000..f18c3b53c --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/hopperhock_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/hopperhock_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/hyacidus.json b/src/generated/resources/assets/botania/models/item/hyacidus.json new file mode 100644 index 000000000..75c15408a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/hyacidus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/hyacidus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/hydroangeas.json b/src/generated/resources/assets/botania/models/item/hydroangeas.json new file mode 100644 index 000000000..fc652b06a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/hydroangeas.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/hydroangeas" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/jaded_amaranthus.json b/src/generated/resources/assets/botania/models/item/jaded_amaranthus.json new file mode 100644 index 000000000..029e18305 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/jaded_amaranthus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/jaded_amaranthus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/jiyuulia.json b/src/generated/resources/assets/botania/models/item/jiyuulia.json new file mode 100644 index 000000000..f9c91cd90 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/jiyuulia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/jiyuulia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/kekimurus.json b/src/generated/resources/assets/botania/models/item/kekimurus.json new file mode 100644 index 000000000..7c51b9a25 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/kekimurus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/kekimurus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/loonium.json b/src/generated/resources/assets/botania/models/item/loonium.json new file mode 100644 index 000000000..be93f1510 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/loonium.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/loonium" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/manastar.json b/src/generated/resources/assets/botania/models/item/manastar.json new file mode 100644 index 000000000..098894b84 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/manastar.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/manastar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/marimorphosis.json b/src/generated/resources/assets/botania/models/item/marimorphosis.json new file mode 100644 index 000000000..684c7d562 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/marimorphosis.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/marimorphosis" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/marimorphosis_chibi.json b/src/generated/resources/assets/botania/models/item/marimorphosis_chibi.json new file mode 100644 index 000000000..8ed9b62c8 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/marimorphosis_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/marimorphosis_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/medumone.json b/src/generated/resources/assets/botania/models/item/medumone.json new file mode 100644 index 000000000..9c89fdd15 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/medumone.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/medumone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/munchdew.json b/src/generated/resources/assets/botania/models/item/munchdew.json new file mode 100644 index 000000000..599f1db43 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/munchdew.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/munchdew" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/narslimmus.json b/src/generated/resources/assets/botania/models/item/narslimmus.json new file mode 100644 index 000000000..72239caca --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/narslimmus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/narslimmus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/orechid.json b/src/generated/resources/assets/botania/models/item/orechid.json new file mode 100644 index 000000000..00653bb4e --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/orechid.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/orechid" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/orechid_ignem.json b/src/generated/resources/assets/botania/models/item/orechid_ignem.json new file mode 100644 index 000000000..95474eb5f --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/orechid_ignem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/orechid_ignem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/pollidisiac.json b/src/generated/resources/assets/botania/models/item/pollidisiac.json new file mode 100644 index 000000000..6a7e9412c --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/pollidisiac.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/pollidisiac" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/pure_daisy.json b/src/generated/resources/assets/botania/models/item/pure_daisy.json new file mode 100644 index 000000000..d151252ed --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/pure_daisy.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/pure_daisy" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/rafflowsia.json b/src/generated/resources/assets/botania/models/item/rafflowsia.json new file mode 100644 index 000000000..1caf6cdb2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/rafflowsia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/rafflowsia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/rannuncarpus.json b/src/generated/resources/assets/botania/models/item/rannuncarpus.json new file mode 100644 index 000000000..bd0237266 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/rannuncarpus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/rannuncarpus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/rannuncarpus_chibi.json b/src/generated/resources/assets/botania/models/item/rannuncarpus_chibi.json new file mode 100644 index 000000000..a87dd56e3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/rannuncarpus_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/rannuncarpus_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/rosa_arcana.json b/src/generated/resources/assets/botania/models/item/rosa_arcana.json new file mode 100644 index 000000000..208bc458b --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/rosa_arcana.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/rosa_arcana" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/shulk_me_not.json b/src/generated/resources/assets/botania/models/item/shulk_me_not.json new file mode 100644 index 000000000..28f890c79 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/shulk_me_not.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/shulk_me_not" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/solegnolia.json b/src/generated/resources/assets/botania/models/item/solegnolia.json new file mode 100644 index 000000000..a5200740d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/solegnolia.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/solegnolia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/solegnolia_chibi.json b/src/generated/resources/assets/botania/models/item/solegnolia_chibi.json new file mode 100644 index 000000000..049242707 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/solegnolia_chibi.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/solegnolia_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/spectranthemum.json b/src/generated/resources/assets/botania/models/item/spectranthemum.json new file mode 100644 index 000000000..85499b47d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/spectranthemum.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/spectranthemum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/spectrolus.json b/src/generated/resources/assets/botania/models/item/spectrolus.json new file mode 100644 index 000000000..dd7e99b33 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/spectrolus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/spectrolus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/tangleberrie.json b/src/generated/resources/assets/botania/models/item/tangleberrie.json new file mode 100644 index 000000000..9d6810c24 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/tangleberrie.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/tangleberrie" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/thermalily.json b/src/generated/resources/assets/botania/models/item/thermalily.json new file mode 100644 index 000000000..38d708398 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/thermalily.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/thermalily" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/tigerseye.json b/src/generated/resources/assets/botania/models/item/tigerseye.json new file mode 100644 index 000000000..758c642bf --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/tigerseye.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/tigerseye" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/vinculotus.json b/src/generated/resources/assets/botania/models/item/vinculotus.json new file mode 100644 index 000000000..07f31fc27 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/vinculotus.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/vinculotus" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index f78fddb7e..4bde55ccd 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -26,6 +26,7 @@ import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import vazkii.botania.common.block.BlockAltGrass; +import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.string.BlockRedString; @@ -60,7 +61,11 @@ public class BlockstateProvider extends BlockStateProvider { } String name = Registry.BLOCK.getKey(b).getPath(); - if (name.contains("quartz") && b instanceof RotatedPillarBlock) { + if (b instanceof BlockSpecialFlower) { + ModelFile model = models().withExistingParent(name, prefix("block/shapes/cross")) + .texture("cross", prefix("block/" + name)); + simpleBlock(b, model); + } else if (name.contains("quartz") && b instanceof RotatedPillarBlock) { ModelFile file = models().getExistingFile(prefix("block/" + name)); getVariantBuilder(b) .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).setModels(new ConfiguredModel(file, 90, 90, false)) diff --git a/src/main/java/vazkii/botania/data/ItemModelProvider.java b/src/main/java/vazkii/botania/data/ItemModelProvider.java index 10c8c23da..f26083d68 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -8,11 +8,13 @@ */ package vazkii.botania.data; +import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; import net.minecraft.item.BlockItem; import net.minecraft.util.registry.Registry; import net.minecraftforge.client.model.generators.ExistingFileHelper; +import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.lib.LibMisc; @@ -30,9 +32,14 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator Registry.ITEM.stream().filter(i -> LibMisc.MOD_ID.equals(Registry.ITEM.getKey(i).getNamespace())) .forEach(i -> { // todo 1.15 expand to all item models that simply reference their parent - if (i instanceof BlockItem && ((BlockItem) i).getBlock() instanceof BlockFloatingFlower) { + if (i instanceof BlockItem) { + Block b = ((BlockItem) i).getBlock(); String name = Registry.ITEM.getKey(i).getPath(); - withExistingParent(name, prefix("block/" + name)); + if (b instanceof BlockSpecialFlower) { + withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name)); + } else if (b instanceof BlockFloatingFlower) { + withExistingParent(name, prefix("block/" + name)); + } } }); } diff --git a/src/main/resources/assets/botania/models/block/agricarnation.json b/src/main/resources/assets/botania/models/block/agricarnation.json deleted file mode 100644 index 845c40376..000000000 --- a/src/main/resources/assets/botania/models/block/agricarnation.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_agricarnation" - } -} diff --git a/src/main/resources/assets/botania/models/block/agricarnation_chibi.json b/src/main/resources/assets/botania/models/block/agricarnation_chibi.json deleted file mode 100644 index b79c0e21d..000000000 --- a/src/main/resources/assets/botania/models/block/agricarnation_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_agricarnation_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/bellethorn.json b/src/main/resources/assets/botania/models/block/bellethorn.json deleted file mode 100644 index 68e61a18a..000000000 --- a/src/main/resources/assets/botania/models/block/bellethorn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_bellethorne" - } -} diff --git a/src/main/resources/assets/botania/models/block/bellethorn_chibi.json b/src/main/resources/assets/botania/models/block/bellethorn_chibi.json deleted file mode 100644 index 30bb6e258..000000000 --- a/src/main/resources/assets/botania/models/block/bellethorn_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_bellethorne_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/bergamute.json b/src/main/resources/assets/botania/models/block/bergamute.json deleted file mode 100644 index 55a5c77ef..000000000 --- a/src/main/resources/assets/botania/models/block/bergamute.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_bergamute" - } -} diff --git a/src/main/resources/assets/botania/models/block/bubbell_chibi.json b/src/main/resources/assets/botania/models/block/bubbell_chibi.json deleted file mode 100644 index d417311cb..000000000 --- a/src/main/resources/assets/botania/models/block/bubbell_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_bubbell_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/clayconia.json b/src/main/resources/assets/botania/models/block/clayconia.json deleted file mode 100644 index 692706ec5..000000000 --- a/src/main/resources/assets/botania/models/block/clayconia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_clayconia" - } -} diff --git a/src/main/resources/assets/botania/models/block/clayconia_chibi.json b/src/main/resources/assets/botania/models/block/clayconia_chibi.json deleted file mode 100644 index 2f0cac046..000000000 --- a/src/main/resources/assets/botania/models/block/clayconia_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_clayconia_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/daffomill.json b/src/main/resources/assets/botania/models/block/daffomill.json deleted file mode 100644 index 914f28781..000000000 --- a/src/main/resources/assets/botania/models/block/daffomill.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_daffomill" - } -} diff --git a/src/main/resources/assets/botania/models/block/dandelifeon.json b/src/main/resources/assets/botania/models/block/dandelifeon.json deleted file mode 100644 index ccede3d6d..000000000 --- a/src/main/resources/assets/botania/models/block/dandelifeon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_dandelifeon" - } -} diff --git a/src/main/resources/assets/botania/models/block/dreadthorn.json b/src/main/resources/assets/botania/models/block/dreadthorn.json deleted file mode 100644 index 5272215e7..000000000 --- a/src/main/resources/assets/botania/models/block/dreadthorn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_dreadthorne" - } -} diff --git a/src/main/resources/assets/botania/models/block/endoflame.json b/src/main/resources/assets/botania/models/block/endoflame.json deleted file mode 100644 index 4bf8c7e34..000000000 --- a/src/main/resources/assets/botania/models/block/endoflame.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_endoflame" - } -} diff --git a/src/main/resources/assets/botania/models/block/entropinnyum.json b/src/main/resources/assets/botania/models/block/entropinnyum.json deleted file mode 100644 index 010c6eeb0..000000000 --- a/src/main/resources/assets/botania/models/block/entropinnyum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_entropinnyum" - } -} diff --git a/src/main/resources/assets/botania/models/block/exoflame.json b/src/main/resources/assets/botania/models/block/exoflame.json deleted file mode 100644 index 0e8a22108..000000000 --- a/src/main/resources/assets/botania/models/block/exoflame.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_exoflame" - } -} diff --git a/src/main/resources/assets/botania/models/block/fallen_kanade.json b/src/main/resources/assets/botania/models/block/fallen_kanade.json deleted file mode 100644 index 9da54196b..000000000 --- a/src/main/resources/assets/botania/models/block/fallen_kanade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_fallen_kanade" - } -} diff --git a/src/main/resources/assets/botania/models/block/gourmaryllis.json b/src/main/resources/assets/botania/models/block/gourmaryllis.json deleted file mode 100644 index 696e6b6fb..000000000 --- a/src/main/resources/assets/botania/models/block/gourmaryllis.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_gourmaryllis" - } -} diff --git a/src/main/resources/assets/botania/models/block/heisei_dream.json b/src/main/resources/assets/botania/models/block/heisei_dream.json deleted file mode 100644 index dfc1345f2..000000000 --- a/src/main/resources/assets/botania/models/block/heisei_dream.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_heisei_dream" - } -} diff --git a/src/main/resources/assets/botania/models/block/hopperhock.json b/src/main/resources/assets/botania/models/block/hopperhock.json deleted file mode 100644 index 7dfad96b1..000000000 --- a/src/main/resources/assets/botania/models/block/hopperhock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_hopperhock" - } -} diff --git a/src/main/resources/assets/botania/models/block/hopperhock_chibi.json b/src/main/resources/assets/botania/models/block/hopperhock_chibi.json deleted file mode 100644 index 91cdbc05f..000000000 --- a/src/main/resources/assets/botania/models/block/hopperhock_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_hopperhock_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/hyacidus.json b/src/main/resources/assets/botania/models/block/hyacidus.json deleted file mode 100644 index 996aebc60..000000000 --- a/src/main/resources/assets/botania/models/block/hyacidus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_hyacidus" - } -} diff --git a/src/main/resources/assets/botania/models/block/hydroangeas.json b/src/main/resources/assets/botania/models/block/hydroangeas.json deleted file mode 100644 index 04df4b979..000000000 --- a/src/main/resources/assets/botania/models/block/hydroangeas.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_hydroangeas" - } -} diff --git a/src/main/resources/assets/botania/models/block/jaded_amaranthus.json b/src/main/resources/assets/botania/models/block/jaded_amaranthus.json deleted file mode 100644 index 564e020b7..000000000 --- a/src/main/resources/assets/botania/models/block/jaded_amaranthus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_jaded_amaranthus" - } -} diff --git a/src/main/resources/assets/botania/models/block/jiyuulia.json b/src/main/resources/assets/botania/models/block/jiyuulia.json deleted file mode 100644 index 4cc5094a6..000000000 --- a/src/main/resources/assets/botania/models/block/jiyuulia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_jiyuulia" - } -} diff --git a/src/main/resources/assets/botania/models/block/kekimurus.json b/src/main/resources/assets/botania/models/block/kekimurus.json deleted file mode 100644 index 21923a267..000000000 --- a/src/main/resources/assets/botania/models/block/kekimurus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_kekimurus" - } -} diff --git a/src/main/resources/assets/botania/models/block/manastar.json b/src/main/resources/assets/botania/models/block/manastar.json deleted file mode 100644 index 1a7d03db1..000000000 --- a/src/main/resources/assets/botania/models/block/manastar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_misc_manastar" - } -} diff --git a/src/main/resources/assets/botania/models/block/marimorphosis.json b/src/main/resources/assets/botania/models/block/marimorphosis.json deleted file mode 100644 index b23102163..000000000 --- a/src/main/resources/assets/botania/models/block/marimorphosis.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_marimorphosis" - } -} diff --git a/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json b/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json deleted file mode 100644 index f2ad827f0..000000000 --- a/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_marimorphosis_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/medumone.json b/src/main/resources/assets/botania/models/block/medumone.json deleted file mode 100644 index fa9077c52..000000000 --- a/src/main/resources/assets/botania/models/block/medumone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_medumone" - } -} diff --git a/src/main/resources/assets/botania/models/block/narslimmus.json b/src/main/resources/assets/botania/models/block/narslimmus.json deleted file mode 100644 index c9e2ea3cc..000000000 --- a/src/main/resources/assets/botania/models/block/narslimmus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_narslimmus" - } -} diff --git a/src/main/resources/assets/botania/models/block/orechid_ignem.json b/src/main/resources/assets/botania/models/block/orechid_ignem.json deleted file mode 100644 index 5a298b0ee..000000000 --- a/src/main/resources/assets/botania/models/block/orechid_ignem.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_orechid_ignem" - } -} diff --git a/src/main/resources/assets/botania/models/block/pollidisiac.json b/src/main/resources/assets/botania/models/block/pollidisiac.json deleted file mode 100644 index c09ec4bba..000000000 --- a/src/main/resources/assets/botania/models/block/pollidisiac.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_pollidisiac" - } -} diff --git a/src/main/resources/assets/botania/models/block/pure_daisy.json b/src/main/resources/assets/botania/models/block/pure_daisy.json deleted file mode 100644 index e09967e4a..000000000 --- a/src/main/resources/assets/botania/models/block/pure_daisy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_misc_pure_daisy" - } -} diff --git a/src/main/resources/assets/botania/models/block/rafflowsia.json b/src/main/resources/assets/botania/models/block/rafflowsia.json deleted file mode 100644 index 467c737e6..000000000 --- a/src/main/resources/assets/botania/models/block/rafflowsia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_rafflowsia" - } -} diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus.json b/src/main/resources/assets/botania/models/block/rannuncarpus.json deleted file mode 100644 index 9d6f3234a..000000000 --- a/src/main/resources/assets/botania/models/block/rannuncarpus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_rannuncarpus" - } -} diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json b/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json deleted file mode 100644 index 4bebf7abb..000000000 --- a/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_rannuncarpus_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/rosa_arcana.json b/src/main/resources/assets/botania/models/block/rosa_arcana.json deleted file mode 100644 index f0f02a452..000000000 --- a/src/main/resources/assets/botania/models/block/rosa_arcana.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_arcane_rose" - } -} diff --git a/src/main/resources/assets/botania/models/block/shulk_me_not.json b/src/main/resources/assets/botania/models/block/shulk_me_not.json deleted file mode 100644 index 531106132..000000000 --- a/src/main/resources/assets/botania/models/block/shulk_me_not.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_shulk_me_not" - } -} diff --git a/src/main/resources/assets/botania/models/block/solegnolia.json b/src/main/resources/assets/botania/models/block/solegnolia.json deleted file mode 100644 index 71474bf6b..000000000 --- a/src/main/resources/assets/botania/models/block/solegnolia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_solegnolia" - } -} diff --git a/src/main/resources/assets/botania/models/block/solegnolia_chibi.json b/src/main/resources/assets/botania/models/block/solegnolia_chibi.json deleted file mode 100644 index ef4b5fd63..000000000 --- a/src/main/resources/assets/botania/models/block/solegnolia_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_solegnolia_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/block/spectranthemum.json b/src/main/resources/assets/botania/models/block/spectranthemum.json deleted file mode 100644 index c276cd81c..000000000 --- a/src/main/resources/assets/botania/models/block/spectranthemum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_spectranthemum" - } -} diff --git a/src/main/resources/assets/botania/models/block/spectrolus.json b/src/main/resources/assets/botania/models/block/spectrolus.json deleted file mode 100644 index 621d155f8..000000000 --- a/src/main/resources/assets/botania/models/block/spectrolus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_spectrolus" - } -} diff --git a/src/main/resources/assets/botania/models/block/tangleberrie.json b/src/main/resources/assets/botania/models/block/tangleberrie.json deleted file mode 100644 index a6b95d93c..000000000 --- a/src/main/resources/assets/botania/models/block/tangleberrie.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_tangleberrie" - } -} diff --git a/src/main/resources/assets/botania/models/block/thermalily.json b/src/main/resources/assets/botania/models/block/thermalily.json deleted file mode 100644 index c8e6b9d99..000000000 --- a/src/main/resources/assets/botania/models/block/thermalily.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_gen_thermalily" - } -} diff --git a/src/main/resources/assets/botania/models/block/tigerseye.json b/src/main/resources/assets/botania/models/block/tigerseye.json deleted file mode 100644 index 03dd81061..000000000 --- a/src/main/resources/assets/botania/models/block/tigerseye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_tigerseye" - } -} diff --git a/src/main/resources/assets/botania/models/block/vinculotus.json b/src/main/resources/assets/botania/models/block/vinculotus.json deleted file mode 100644 index 2a99ebeb2..000000000 --- a/src/main/resources/assets/botania/models/block/vinculotus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/cross", - "textures": { - "cross": "botania:block/flower_func_vinculotus" - } -} diff --git a/src/main/resources/assets/botania/models/item/agricarnation.json b/src/main/resources/assets/botania/models/item/agricarnation.json deleted file mode 100644 index 4dcc713df..000000000 --- a/src/main/resources/assets/botania/models/item/agricarnation.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_agricarnation" - } -} diff --git a/src/main/resources/assets/botania/models/item/agricarnation_chibi.json b/src/main/resources/assets/botania/models/item/agricarnation_chibi.json deleted file mode 100644 index 68632f494..000000000 --- a/src/main/resources/assets/botania/models/item/agricarnation_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_agricarnation_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/bellethorn.json b/src/main/resources/assets/botania/models/item/bellethorn.json deleted file mode 100644 index 15ad96563..000000000 --- a/src/main/resources/assets/botania/models/item/bellethorn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_bellethorne" - } -} diff --git a/src/main/resources/assets/botania/models/item/bellethorn_chibi.json b/src/main/resources/assets/botania/models/item/bellethorn_chibi.json deleted file mode 100644 index 274ef48e2..000000000 --- a/src/main/resources/assets/botania/models/item/bellethorn_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_bellethorne_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/bergamute.json b/src/main/resources/assets/botania/models/item/bergamute.json deleted file mode 100644 index 302ff9d17..000000000 --- a/src/main/resources/assets/botania/models/item/bergamute.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_bergamute" - } -} diff --git a/src/main/resources/assets/botania/models/item/bubbell.json b/src/main/resources/assets/botania/models/item/bubbell.json deleted file mode 100644 index f6395003f..000000000 --- a/src/main/resources/assets/botania/models/item/bubbell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_bubbell" - } -} diff --git a/src/main/resources/assets/botania/models/item/bubbell_chibi.json b/src/main/resources/assets/botania/models/item/bubbell_chibi.json deleted file mode 100644 index 3ab84d9fa..000000000 --- a/src/main/resources/assets/botania/models/item/bubbell_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_bubbell_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/clayconia.json b/src/main/resources/assets/botania/models/item/clayconia.json deleted file mode 100644 index d4b22ba5c..000000000 --- a/src/main/resources/assets/botania/models/item/clayconia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_clayconia" - } -} diff --git a/src/main/resources/assets/botania/models/item/clayconia_chibi.json b/src/main/resources/assets/botania/models/item/clayconia_chibi.json deleted file mode 100644 index e352e39d1..000000000 --- a/src/main/resources/assets/botania/models/item/clayconia_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_clayconia_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/daffomill.json b/src/main/resources/assets/botania/models/item/daffomill.json deleted file mode 100644 index 9bd5cea37..000000000 --- a/src/main/resources/assets/botania/models/item/daffomill.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_daffomill" - } -} diff --git a/src/main/resources/assets/botania/models/item/dandelifeon.json b/src/main/resources/assets/botania/models/item/dandelifeon.json deleted file mode 100644 index 21eda078b..000000000 --- a/src/main/resources/assets/botania/models/item/dandelifeon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_dandelifeon" - } -} diff --git a/src/main/resources/assets/botania/models/item/dreadthorn.json b/src/main/resources/assets/botania/models/item/dreadthorn.json deleted file mode 100644 index 86058a5c3..000000000 --- a/src/main/resources/assets/botania/models/item/dreadthorn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_dreadthorne" - } -} diff --git a/src/main/resources/assets/botania/models/item/endoflame.json b/src/main/resources/assets/botania/models/item/endoflame.json deleted file mode 100644 index 63040be1e..000000000 --- a/src/main/resources/assets/botania/models/item/endoflame.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_endoflame" - } -} diff --git a/src/main/resources/assets/botania/models/item/entropinnyum.json b/src/main/resources/assets/botania/models/item/entropinnyum.json deleted file mode 100644 index 9ac45b103..000000000 --- a/src/main/resources/assets/botania/models/item/entropinnyum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_entropinnyum" - } -} diff --git a/src/main/resources/assets/botania/models/item/exoflame.json b/src/main/resources/assets/botania/models/item/exoflame.json deleted file mode 100644 index ee2ddec5c..000000000 --- a/src/main/resources/assets/botania/models/item/exoflame.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_exoflame" - } -} diff --git a/src/main/resources/assets/botania/models/item/fallen_kanade.json b/src/main/resources/assets/botania/models/item/fallen_kanade.json deleted file mode 100644 index e2ecedf5c..000000000 --- a/src/main/resources/assets/botania/models/item/fallen_kanade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_fallen_kanade" - } -} diff --git a/src/main/resources/assets/botania/models/item/gourmaryllis.json b/src/main/resources/assets/botania/models/item/gourmaryllis.json deleted file mode 100644 index 6076cbfd7..000000000 --- a/src/main/resources/assets/botania/models/item/gourmaryllis.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_gourmaryllis" - } -} diff --git a/src/main/resources/assets/botania/models/item/heisei_dream.json b/src/main/resources/assets/botania/models/item/heisei_dream.json deleted file mode 100644 index dcc80abdc..000000000 --- a/src/main/resources/assets/botania/models/item/heisei_dream.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_heisei_dream" - } -} diff --git a/src/main/resources/assets/botania/models/item/hopperhock.json b/src/main/resources/assets/botania/models/item/hopperhock.json deleted file mode 100644 index e47e803c5..000000000 --- a/src/main/resources/assets/botania/models/item/hopperhock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_hopperhock" - } -} diff --git a/src/main/resources/assets/botania/models/item/hopperhock_chibi.json b/src/main/resources/assets/botania/models/item/hopperhock_chibi.json deleted file mode 100644 index ac29edca6..000000000 --- a/src/main/resources/assets/botania/models/item/hopperhock_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_hopperhock_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/hyacidus.json b/src/main/resources/assets/botania/models/item/hyacidus.json deleted file mode 100644 index 9543cb4e2..000000000 --- a/src/main/resources/assets/botania/models/item/hyacidus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_hyacidus" - } -} diff --git a/src/main/resources/assets/botania/models/item/hydroangeas.json b/src/main/resources/assets/botania/models/item/hydroangeas.json deleted file mode 100644 index 76423bf53..000000000 --- a/src/main/resources/assets/botania/models/item/hydroangeas.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_hydroangeas" - } -} diff --git a/src/main/resources/assets/botania/models/item/jaded_amaranthus.json b/src/main/resources/assets/botania/models/item/jaded_amaranthus.json deleted file mode 100644 index e3fd5bc1e..000000000 --- a/src/main/resources/assets/botania/models/item/jaded_amaranthus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_jaded_amaranthus" - } -} diff --git a/src/main/resources/assets/botania/models/item/jiyuulia.json b/src/main/resources/assets/botania/models/item/jiyuulia.json deleted file mode 100644 index 2f5360006..000000000 --- a/src/main/resources/assets/botania/models/item/jiyuulia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_jiyuulia" - } -} diff --git a/src/main/resources/assets/botania/models/item/kekimurus.json b/src/main/resources/assets/botania/models/item/kekimurus.json deleted file mode 100644 index e884bd038..000000000 --- a/src/main/resources/assets/botania/models/item/kekimurus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_kekimurus" - } -} diff --git a/src/main/resources/assets/botania/models/item/loonium.json b/src/main/resources/assets/botania/models/item/loonium.json deleted file mode 100644 index ca4b7edf7..000000000 --- a/src/main/resources/assets/botania/models/item/loonium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_loonium" - } -} diff --git a/src/main/resources/assets/botania/models/item/manastar.json b/src/main/resources/assets/botania/models/item/manastar.json deleted file mode 100644 index 54a148376..000000000 --- a/src/main/resources/assets/botania/models/item/manastar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_misc_manastar" - } -} diff --git a/src/main/resources/assets/botania/models/item/marimorphosis.json b/src/main/resources/assets/botania/models/item/marimorphosis.json deleted file mode 100644 index 4dc857527..000000000 --- a/src/main/resources/assets/botania/models/item/marimorphosis.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_marimorphosis" - } -} diff --git a/src/main/resources/assets/botania/models/item/marimorphosis_chibi.json b/src/main/resources/assets/botania/models/item/marimorphosis_chibi.json deleted file mode 100644 index 191b315b2..000000000 --- a/src/main/resources/assets/botania/models/item/marimorphosis_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_marimorphosis_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/medumone.json b/src/main/resources/assets/botania/models/item/medumone.json deleted file mode 100644 index 7293548d9..000000000 --- a/src/main/resources/assets/botania/models/item/medumone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_medumone" - } -} diff --git a/src/main/resources/assets/botania/models/item/munchdew.json b/src/main/resources/assets/botania/models/item/munchdew.json deleted file mode 100644 index b4754e722..000000000 --- a/src/main/resources/assets/botania/models/item/munchdew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_munchdew" - } -} diff --git a/src/main/resources/assets/botania/models/item/narslimmus.json b/src/main/resources/assets/botania/models/item/narslimmus.json deleted file mode 100644 index 017fb2b69..000000000 --- a/src/main/resources/assets/botania/models/item/narslimmus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_narslimmus" - } -} diff --git a/src/main/resources/assets/botania/models/item/orechid.json b/src/main/resources/assets/botania/models/item/orechid.json deleted file mode 100644 index 31398c96b..000000000 --- a/src/main/resources/assets/botania/models/item/orechid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_orechid" - } -} diff --git a/src/main/resources/assets/botania/models/item/orechid_ignem.json b/src/main/resources/assets/botania/models/item/orechid_ignem.json deleted file mode 100644 index a7ee9d00e..000000000 --- a/src/main/resources/assets/botania/models/item/orechid_ignem.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_orechid_ignem" - } -} diff --git a/src/main/resources/assets/botania/models/item/pollidisiac.json b/src/main/resources/assets/botania/models/item/pollidisiac.json deleted file mode 100644 index 0ee140245..000000000 --- a/src/main/resources/assets/botania/models/item/pollidisiac.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_pollidisiac" - } -} diff --git a/src/main/resources/assets/botania/models/item/pure_daisy.json b/src/main/resources/assets/botania/models/item/pure_daisy.json deleted file mode 100644 index 4ce06a452..000000000 --- a/src/main/resources/assets/botania/models/item/pure_daisy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_misc_pure_daisy" - } -} diff --git a/src/main/resources/assets/botania/models/item/rafflowsia.json b/src/main/resources/assets/botania/models/item/rafflowsia.json deleted file mode 100644 index a5b46a6cf..000000000 --- a/src/main/resources/assets/botania/models/item/rafflowsia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_rafflowsia" - } -} diff --git a/src/main/resources/assets/botania/models/item/rannuncarpus.json b/src/main/resources/assets/botania/models/item/rannuncarpus.json deleted file mode 100644 index 484159b1e..000000000 --- a/src/main/resources/assets/botania/models/item/rannuncarpus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_rannuncarpus" - } -} diff --git a/src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json b/src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json deleted file mode 100644 index f06e25c08..000000000 --- a/src/main/resources/assets/botania/models/item/rannuncarpus_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_rannuncarpus_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/rosa_arcana.json b/src/main/resources/assets/botania/models/item/rosa_arcana.json deleted file mode 100644 index fb2de594b..000000000 --- a/src/main/resources/assets/botania/models/item/rosa_arcana.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_arcane_rose" - } -} diff --git a/src/main/resources/assets/botania/models/item/shulk_me_not.json b/src/main/resources/assets/botania/models/item/shulk_me_not.json deleted file mode 100644 index 0c85a7be8..000000000 --- a/src/main/resources/assets/botania/models/item/shulk_me_not.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_shulk_me_not" - } -} diff --git a/src/main/resources/assets/botania/models/item/solegnolia.json b/src/main/resources/assets/botania/models/item/solegnolia.json deleted file mode 100644 index 94cef698f..000000000 --- a/src/main/resources/assets/botania/models/item/solegnolia.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_solegnolia" - } -} diff --git a/src/main/resources/assets/botania/models/item/solegnolia_chibi.json b/src/main/resources/assets/botania/models/item/solegnolia_chibi.json deleted file mode 100644 index b7d51a6e2..000000000 --- a/src/main/resources/assets/botania/models/item/solegnolia_chibi.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_solegnolia_chibi" - } -} diff --git a/src/main/resources/assets/botania/models/item/spectranthemum.json b/src/main/resources/assets/botania/models/item/spectranthemum.json deleted file mode 100644 index da9ba3210..000000000 --- a/src/main/resources/assets/botania/models/item/spectranthemum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_spectranthemum" - } -} diff --git a/src/main/resources/assets/botania/models/item/spectrolus.json b/src/main/resources/assets/botania/models/item/spectrolus.json deleted file mode 100644 index 01c438dd4..000000000 --- a/src/main/resources/assets/botania/models/item/spectrolus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_spectrolus" - } -} diff --git a/src/main/resources/assets/botania/models/item/tangleberrie.json b/src/main/resources/assets/botania/models/item/tangleberrie.json deleted file mode 100644 index 886179caf..000000000 --- a/src/main/resources/assets/botania/models/item/tangleberrie.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_tangleberrie" - } -} diff --git a/src/main/resources/assets/botania/models/item/thermalily.json b/src/main/resources/assets/botania/models/item/thermalily.json deleted file mode 100644 index 817eb7dd5..000000000 --- a/src/main/resources/assets/botania/models/item/thermalily.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_gen_thermalily" - } -} diff --git a/src/main/resources/assets/botania/models/item/tigerseye.json b/src/main/resources/assets/botania/models/item/tigerseye.json deleted file mode 100644 index cf9383e44..000000000 --- a/src/main/resources/assets/botania/models/item/tigerseye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_tigerseye" - } -} diff --git a/src/main/resources/assets/botania/models/item/vinculotus.json b/src/main/resources/assets/botania/models/item/vinculotus.json deleted file mode 100644 index 66ca82d1c..000000000 --- a/src/main/resources/assets/botania/models/item/vinculotus.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:block/flower_func_vinculotus" - } -} diff --git a/src/main/resources/assets/botania/textures/block/flower_func_agricarnation.png b/src/main/resources/assets/botania/textures/block/agricarnation.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_agricarnation.png rename to src/main/resources/assets/botania/textures/block/agricarnation.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_agricarnation_chibi.png b/src/main/resources/assets/botania/textures/block/agricarnation_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_agricarnation_chibi.png rename to src/main/resources/assets/botania/textures/block/agricarnation_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_bellethorne.png b/src/main/resources/assets/botania/textures/block/bellethorn.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_bellethorne.png rename to src/main/resources/assets/botania/textures/block/bellethorn.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_bellethorne_chibi.png b/src/main/resources/assets/botania/textures/block/bellethorn_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_bellethorne_chibi.png rename to src/main/resources/assets/botania/textures/block/bellethorn_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_bergamute.png b/src/main/resources/assets/botania/textures/block/bergamute.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_bergamute.png rename to src/main/resources/assets/botania/textures/block/bergamute.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_bubbell.png b/src/main/resources/assets/botania/textures/block/bubbell.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_bubbell.png rename to src/main/resources/assets/botania/textures/block/bubbell.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_bubbell_chibi.png b/src/main/resources/assets/botania/textures/block/bubbell_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_bubbell_chibi.png rename to src/main/resources/assets/botania/textures/block/bubbell_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_clayconia.png b/src/main/resources/assets/botania/textures/block/clayconia.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_clayconia.png rename to src/main/resources/assets/botania/textures/block/clayconia.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_clayconia_chibi.png b/src/main/resources/assets/botania/textures/block/clayconia_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_clayconia_chibi.png rename to src/main/resources/assets/botania/textures/block/clayconia_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_daffomill.png b/src/main/resources/assets/botania/textures/block/daffomill.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_daffomill.png rename to src/main/resources/assets/botania/textures/block/daffomill.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_dandelifeon.png b/src/main/resources/assets/botania/textures/block/dandelifeon.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_dandelifeon.png rename to src/main/resources/assets/botania/textures/block/dandelifeon.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_dandelifeon.png.mcmeta b/src/main/resources/assets/botania/textures/block/dandelifeon.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_dandelifeon.png.mcmeta rename to src/main/resources/assets/botania/textures/block/dandelifeon.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/block/flower_func_dreadthorne.png b/src/main/resources/assets/botania/textures/block/dreadthorn.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_dreadthorne.png rename to src/main/resources/assets/botania/textures/block/dreadthorn.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_endoflame.png b/src/main/resources/assets/botania/textures/block/endoflame.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_endoflame.png rename to src/main/resources/assets/botania/textures/block/endoflame.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_entropinnyum.png b/src/main/resources/assets/botania/textures/block/entropinnyum.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_entropinnyum.png rename to src/main/resources/assets/botania/textures/block/entropinnyum.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_exoflame.png b/src/main/resources/assets/botania/textures/block/exoflame.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_exoflame.png rename to src/main/resources/assets/botania/textures/block/exoflame.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_fallen_kanade.png b/src/main/resources/assets/botania/textures/block/fallen_kanade.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_fallen_kanade.png rename to src/main/resources/assets/botania/textures/block/fallen_kanade.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_gourmaryllis.png b/src/main/resources/assets/botania/textures/block/gourmaryllis.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_gourmaryllis.png rename to src/main/resources/assets/botania/textures/block/gourmaryllis.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_heisei_dream.png b/src/main/resources/assets/botania/textures/block/heisei_dream.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_heisei_dream.png rename to src/main/resources/assets/botania/textures/block/heisei_dream.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_hopperhock.png b/src/main/resources/assets/botania/textures/block/hopperhock.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_hopperhock.png rename to src/main/resources/assets/botania/textures/block/hopperhock.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_hopperhock_chibi.png b/src/main/resources/assets/botania/textures/block/hopperhock_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_hopperhock_chibi.png rename to src/main/resources/assets/botania/textures/block/hopperhock_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_hyacidus.png b/src/main/resources/assets/botania/textures/block/hyacidus.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_hyacidus.png rename to src/main/resources/assets/botania/textures/block/hyacidus.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_hydroangeas.png b/src/main/resources/assets/botania/textures/block/hydroangeas.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_hydroangeas.png rename to src/main/resources/assets/botania/textures/block/hydroangeas.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_hydroangeas_decor.png b/src/main/resources/assets/botania/textures/block/hydroangeas_decor.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_hydroangeas_decor.png rename to src/main/resources/assets/botania/textures/block/hydroangeas_decor.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_jaded_amaranthus.png b/src/main/resources/assets/botania/textures/block/jaded_amaranthus.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_jaded_amaranthus.png rename to src/main/resources/assets/botania/textures/block/jaded_amaranthus.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_jiyuulia.png b/src/main/resources/assets/botania/textures/block/jiyuulia.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_jiyuulia.png rename to src/main/resources/assets/botania/textures/block/jiyuulia.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_kekimurus.png b/src/main/resources/assets/botania/textures/block/kekimurus.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_kekimurus.png rename to src/main/resources/assets/botania/textures/block/kekimurus.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_loonium.png b/src/main/resources/assets/botania/textures/block/loonium.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_loonium.png rename to src/main/resources/assets/botania/textures/block/loonium.png diff --git a/src/main/resources/assets/botania/textures/block/flower_misc_manastar.png b/src/main/resources/assets/botania/textures/block/manastar.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_misc_manastar.png rename to src/main/resources/assets/botania/textures/block/manastar.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_marimorphosis.png b/src/main/resources/assets/botania/textures/block/marimorphosis.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_marimorphosis.png rename to src/main/resources/assets/botania/textures/block/marimorphosis.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_marimorphosis_chibi.png b/src/main/resources/assets/botania/textures/block/marimorphosis_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_marimorphosis_chibi.png rename to src/main/resources/assets/botania/textures/block/marimorphosis_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_medumone.png b/src/main/resources/assets/botania/textures/block/medumone.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_medumone.png rename to src/main/resources/assets/botania/textures/block/medumone.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_munchdew.png b/src/main/resources/assets/botania/textures/block/munchdew.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_munchdew.png rename to src/main/resources/assets/botania/textures/block/munchdew.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_narslimmus.png b/src/main/resources/assets/botania/textures/block/narslimmus.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_narslimmus.png rename to src/main/resources/assets/botania/textures/block/narslimmus.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_orechid.png b/src/main/resources/assets/botania/textures/block/orechid.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_orechid.png rename to src/main/resources/assets/botania/textures/block/orechid.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_orechid_ignem.png b/src/main/resources/assets/botania/textures/block/orechid_ignem.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_orechid_ignem.png rename to src/main/resources/assets/botania/textures/block/orechid_ignem.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_pollidisiac.png b/src/main/resources/assets/botania/textures/block/pollidisiac.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_pollidisiac.png rename to src/main/resources/assets/botania/textures/block/pollidisiac.png diff --git a/src/main/resources/assets/botania/textures/block/flower_misc_pure_daisy.png b/src/main/resources/assets/botania/textures/block/pure_daisy.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_misc_pure_daisy.png rename to src/main/resources/assets/botania/textures/block/pure_daisy.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_rafflowsia.png b/src/main/resources/assets/botania/textures/block/rafflowsia.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_rafflowsia.png rename to src/main/resources/assets/botania/textures/block/rafflowsia.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_rannuncarpus.png b/src/main/resources/assets/botania/textures/block/rannuncarpus.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_rannuncarpus.png rename to src/main/resources/assets/botania/textures/block/rannuncarpus.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_rannuncarpus_chibi.png b/src/main/resources/assets/botania/textures/block/rannuncarpus_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_rannuncarpus_chibi.png rename to src/main/resources/assets/botania/textures/block/rannuncarpus_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_arcane_rose.png b/src/main/resources/assets/botania/textures/block/rosa_arcana.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_arcane_rose.png rename to src/main/resources/assets/botania/textures/block/rosa_arcana.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_shulk_me_not.png b/src/main/resources/assets/botania/textures/block/shulk_me_not.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_shulk_me_not.png rename to src/main/resources/assets/botania/textures/block/shulk_me_not.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_solegnolia.png b/src/main/resources/assets/botania/textures/block/solegnolia.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_solegnolia.png rename to src/main/resources/assets/botania/textures/block/solegnolia.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_solegnolia_chibi.png b/src/main/resources/assets/botania/textures/block/solegnolia_chibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_solegnolia_chibi.png rename to src/main/resources/assets/botania/textures/block/solegnolia_chibi.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_spectranthemum.png b/src/main/resources/assets/botania/textures/block/spectranthemum.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_spectranthemum.png rename to src/main/resources/assets/botania/textures/block/spectranthemum.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_spectrolus.png b/src/main/resources/assets/botania/textures/block/spectrolus.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_spectrolus.png rename to src/main/resources/assets/botania/textures/block/spectrolus.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_tangleberrie.png b/src/main/resources/assets/botania/textures/block/tangleberrie.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_tangleberrie.png rename to src/main/resources/assets/botania/textures/block/tangleberrie.png diff --git a/src/main/resources/assets/botania/textures/block/flower_gen_thermalily.png b/src/main/resources/assets/botania/textures/block/thermalily.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_gen_thermalily.png rename to src/main/resources/assets/botania/textures/block/thermalily.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_tigerseye.png b/src/main/resources/assets/botania/textures/block/tigerseye.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_tigerseye.png rename to src/main/resources/assets/botania/textures/block/tigerseye.png diff --git a/src/main/resources/assets/botania/textures/block/flower_func_vinculotus.png b/src/main/resources/assets/botania/textures/block/vinculotus.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/flower_func_vinculotus.png rename to src/main/resources/assets/botania/textures/block/vinculotus.png