From c509874908cf86b8fd1ffc06be459cbc481a14ea Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jan 2020 22:30:24 -0600 Subject: [PATCH] Datagenerate floating flower blockstates and models --- build.gradle | 6 +-- .../blockstates/black_floating_flower.json | 7 +++ .../blockstates/blue_floating_flower.json | 7 +++ .../blockstates/brown_floating_flower.json | 7 +++ .../blockstates/cyan_floating_flower.json | 7 +++ .../blockstates/floating_agricarnation.json | 7 +++ .../floating_agricarnation_chibi.json | 7 +++ .../blockstates/floating_bellethorn.json | 7 +++ .../floating_bellethorn_chibi.json | 7 +++ .../blockstates/floating_bergamute.json | 7 +++ .../botania/blockstates/floating_bubbell.json | 7 +++ .../blockstates/floating_bubbell_chibi.json | 7 +++ .../blockstates/floating_clayconia.json | 7 +++ .../blockstates/floating_clayconia_chibi.json | 7 +++ .../blockstates/floating_daffomill.json | 7 +++ .../blockstates/floating_dandelifeon.json | 7 +++ .../blockstates/floating_dreadthorn.json | 7 +++ .../blockstates/floating_endoflame.json | 7 +++ .../blockstates/floating_entropinnyum.json | 7 +++ .../blockstates/floating_exoflame.json | 7 +++ .../blockstates/floating_fallen_kanade.json | 7 +++ .../blockstates/floating_gourmaryllis.json | 7 +++ .../blockstates/floating_heisei_dream.json | 7 +++ .../blockstates/floating_hopperhock.json | 7 +++ .../floating_hopperhock_chibi.json | 7 +++ .../blockstates/floating_hyacidus.json | 7 +++ .../blockstates/floating_hydroangeas.json | 7 +++ .../floating_jaded_amaranthus.json | 7 +++ .../blockstates/floating_jiyuulia.json | 7 +++ .../blockstates/floating_kekimurus.json | 7 +++ .../botania/blockstates/floating_loonium.json | 7 +++ .../blockstates/floating_manastar.json | 7 +++ .../blockstates/floating_marimorphosis.json | 7 +++ .../floating_marimorphosis_chibi.json | 7 +++ .../blockstates/floating_medumone.json | 7 +++ .../blockstates/floating_munchdew.json | 7 +++ .../blockstates/floating_narslimmus.json | 7 +++ .../botania/blockstates/floating_orechid.json | 7 +++ .../blockstates/floating_orechid_ignem.json | 7 +++ .../blockstates/floating_pollidisiac.json | 7 +++ .../blockstates/floating_pure_daisy.json | 7 +++ .../blockstates/floating_rafflowsia.json | 7 +++ .../blockstates/floating_rannuncarpus.json | 7 +++ .../floating_rannuncarpus_chibi.json | 7 +++ .../blockstates/floating_rosa_arcana.json | 7 +++ .../blockstates/floating_shulk_me_not.json | 7 +++ .../blockstates/floating_solegnolia.json | 7 +++ .../floating_solegnolia_chibi.json | 7 +++ .../blockstates/floating_spectranthemum.json | 7 +++ .../blockstates/floating_spectrolus.json | 7 +++ .../blockstates/floating_tangleberrie.json | 7 +++ .../blockstates/floating_thermalily.json | 7 +++ .../blockstates/floating_tigerseye.json | 7 +++ .../blockstates/floating_vinculotus.json | 7 +++ .../blockstates/gray_floating_flower.json | 7 +++ .../blockstates/green_floating_flower.json | 7 +++ .../light_blue_floating_flower.json | 7 +++ .../light_gray_floating_flower.json | 7 +++ .../blockstates/lime_floating_flower.json | 7 +++ .../blockstates/magenta_floating_flower.json | 7 +++ .../blockstates/orange_floating_flower.json | 7 +++ .../blockstates/pink_floating_flower.json | 7 +++ .../blockstates/purple_floating_flower.json | 7 +++ .../blockstates/red_floating_flower.json | 7 +++ .../blockstates/white_floating_flower.json | 7 +++ .../blockstates/yellow_floating_flower.json | 7 +++ .../models/block/black_floating_flower.json | 7 +++ .../models/block/blue_floating_flower.json | 7 +++ .../models/block/brown_floating_flower.json | 7 +++ .../models/block/cyan_floating_flower.json | 7 +++ .../models/block/floating_agricarnation.json | 7 +++ .../block/floating_agricarnation_chibi.json | 7 +++ .../models/block/floating_bellethorn.json | 7 +++ .../block/floating_bellethorn_chibi.json | 7 +++ .../models/block/floating_bergamute.json | 7 +++ .../models/block/floating_bubbell.json | 7 +++ .../models/block/floating_bubbell_chibi.json | 7 +++ .../models/block/floating_clayconia.json | 7 +++ .../block/floating_clayconia_chibi.json | 7 +++ .../models/block/floating_daffomill.json | 7 +++ .../models/block/floating_dandelifeon.json | 7 +++ .../models/block/floating_dreadthorn.json | 7 +++ .../models/block/floating_endoflame.json | 7 +++ .../models/block/floating_entropinnyum.json | 7 +++ .../models/block/floating_exoflame.json | 7 +++ .../models/block/floating_fallen_kanade.json | 7 +++ .../models/block/floating_gourmaryllis.json | 7 +++ .../models/block/floating_heisei_dream.json | 7 +++ .../models/block/floating_hopperhock.json | 7 +++ .../block/floating_hopperhock_chibi.json | 7 +++ .../models/block/floating_hyacidus.json | 7 +++ .../models/block/floating_hydroangeas.json | 7 +++ .../block/floating_jaded_amaranthus.json | 7 +++ .../models/block/floating_jiyuulia.json | 7 +++ .../models/block/floating_kekimurus.json | 7 +++ .../models/block/floating_loonium.json | 7 +++ .../models/block/floating_manastar.json | 7 +++ .../models/block/floating_marimorphosis.json | 7 +++ .../block/floating_marimorphosis_chibi.json | 7 +++ .../models/block/floating_medumone.json | 7 +++ .../models/block/floating_munchdew.json | 7 +++ .../models/block/floating_narslimmus.json | 7 +++ .../models/block/floating_orechid.json | 7 +++ .../models/block/floating_orechid_ignem.json | 7 +++ .../models/block/floating_pollidisiac.json | 7 +++ .../models/block/floating_pure_daisy.json | 7 +++ .../models/block/floating_rafflowsia.json | 7 +++ .../models/block/floating_rannuncarpus.json | 7 +++ .../block/floating_rannuncarpus_chibi.json | 7 +++ .../models/block/floating_rosa_arcana.json | 7 +++ .../models/block/floating_shulk_me_not.json | 7 +++ .../models/block/floating_solegnolia.json | 7 +++ .../block/floating_solegnolia_chibi.json | 7 +++ .../models/block/floating_spectranthemum.json | 7 +++ .../models/block/floating_spectrolus.json | 7 +++ .../models/block/floating_tangleberrie.json | 7 +++ .../models/block/floating_thermalily.json | 7 +++ .../models/block/floating_tigerseye.json | 7 +++ .../models/block/floating_vinculotus.json | 7 +++ .../models/block/gray_floating_flower.json | 7 +++ .../models/block/green_floating_flower.json | 7 +++ .../block/light_blue_floating_flower.json | 7 +++ .../block/light_gray_floating_flower.json | 7 +++ .../models/block/lime_floating_flower.json | 7 +++ .../models/block/magenta_floating_flower.json | 7 +++ .../models/block/orange_floating_flower.json | 7 +++ .../models/block/pink_floating_flower.json | 7 +++ .../models/block/purple_floating_flower.json | 7 +++ .../models/block/red_floating_flower.json | 7 +++ .../models/block/white_floating_flower.json | 7 +++ .../models/block/yellow_floating_flower.json | 7 +++ .../client/core/handler/ModelHandler.java | 2 +- .../client/model/FloatingFlowerModel.java | 4 ++ .../botania/data/BlockstateProvider.java | 3 +- .../vazkii/botania/data/DataGenerators.java | 1 + .../data/FloatingFlowerModelBuilder.java | 31 +++++++++++++ .../data/FloatingFlowerModelProvider.java | 45 +++++++++++++++++++ .../blockstates/black_floating_flower.json | 12 ----- .../blockstates/blue_floating_flower.json | 12 ----- .../blockstates/brown_floating_flower.json | 12 ----- .../blockstates/cyan_floating_flower.json | 12 ----- .../blockstates/floating_agricarnation.json | 12 ----- .../floating_agricarnation_chibi.json | 12 ----- .../blockstates/floating_bellethorn.json | 12 ----- .../floating_bellethorn_chibi.json | 12 ----- .../blockstates/floating_bergamute.json | 12 ----- .../botania/blockstates/floating_bubbell.json | 12 ----- .../blockstates/floating_bubbell_chibi.json | 12 ----- .../blockstates/floating_clayconia.json | 12 ----- .../blockstates/floating_clayconia_chibi.json | 12 ----- .../blockstates/floating_daffomill.json | 12 ----- .../blockstates/floating_dandelifeon.json | 12 ----- .../blockstates/floating_dreadthorn.json | 12 ----- .../blockstates/floating_endoflame.json | 12 ----- .../blockstates/floating_entropinnyum.json | 12 ----- .../blockstates/floating_exoflame.json | 12 ----- .../blockstates/floating_fallen_kanade.json | 12 ----- .../blockstates/floating_gourmaryllis.json | 12 ----- .../blockstates/floating_heisei_dream.json | 12 ----- .../blockstates/floating_hopperhock.json | 12 ----- .../floating_hopperhock_chibi.json | 12 ----- .../blockstates/floating_hyacidus.json | 12 ----- .../blockstates/floating_hydroangeas.json | 12 ----- .../floating_jaded_amaranthus.json | 12 ----- .../blockstates/floating_jiyuulia.json | 12 ----- .../blockstates/floating_kekimurus.json | 12 ----- .../botania/blockstates/floating_loonium.json | 12 ----- .../blockstates/floating_manastar.json | 12 ----- .../blockstates/floating_marimorphosis.json | 12 ----- .../floating_marimorphosis_chibi.json | 12 ----- .../blockstates/floating_medumone.json | 12 ----- .../blockstates/floating_munchdew.json | 12 ----- .../blockstates/floating_narslimmus.json | 12 ----- .../botania/blockstates/floating_orechid.json | 12 ----- .../blockstates/floating_orechid_ignem.json | 12 ----- .../blockstates/floating_pollidisiac.json | 12 ----- .../blockstates/floating_pure_daisy.json | 12 ----- .../blockstates/floating_rafflowsia.json | 12 ----- .../blockstates/floating_rannuncarpus.json | 12 ----- .../floating_rannuncarpus_chibi.json | 12 ----- .../blockstates/floating_rosa_arcana.json | 12 ----- .../blockstates/floating_shulk_me_not.json | 12 ----- .../blockstates/floating_solegnolia.json | 12 ----- .../floating_solegnolia_chibi.json | 12 ----- .../blockstates/floating_spectranthemum.json | 12 ----- .../blockstates/floating_spectrolus.json | 12 ----- .../blockstates/floating_tangleberrie.json | 12 ----- .../blockstates/floating_thermalily.json | 12 ----- .../blockstates/floating_tigerseye.json | 12 ----- .../blockstates/floating_vinculotus.json | 12 ----- .../blockstates/gray_floating_flower.json | 12 ----- .../blockstates/green_floating_flower.json | 12 ----- .../light_blue_floating_flower.json | 12 ----- .../light_gray_floating_flower.json | 12 ----- .../blockstates/lime_floating_flower.json | 12 ----- .../blockstates/magenta_floating_flower.json | 12 ----- .../blockstates/orange_floating_flower.json | 12 ----- .../blockstates/pink_floating_flower.json | 12 ----- .../blockstates/purple_floating_flower.json | 12 ----- .../blockstates/red_floating_flower.json | 12 ----- .../blockstates/white_floating_flower.json | 12 ----- .../blockstates/yellow_floating_flower.json | 12 ----- 202 files changed, 996 insertions(+), 786 deletions(-) create mode 100644 src/generated/resources/assets/botania/blockstates/black_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/blue_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/brown_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/cyan_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_agricarnation.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_agricarnation_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_bellethorn.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_bellethorn_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_bergamute.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_bubbell.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_bubbell_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_clayconia.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_clayconia_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_daffomill.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_dandelifeon.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_dreadthorn.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_endoflame.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_entropinnyum.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_exoflame.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_fallen_kanade.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_gourmaryllis.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_heisei_dream.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_hopperhock.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_hopperhock_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_hyacidus.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_hydroangeas.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_jaded_amaranthus.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_jiyuulia.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_kekimurus.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_loonium.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_manastar.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_marimorphosis.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_medumone.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_munchdew.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_narslimmus.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_orechid.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_orechid_ignem.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_pollidisiac.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_pure_daisy.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_rafflowsia.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_rannuncarpus.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_rosa_arcana.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_shulk_me_not.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_solegnolia.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_solegnolia_chibi.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_spectranthemum.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_spectrolus.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_tangleberrie.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_thermalily.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_tigerseye.json create mode 100644 src/generated/resources/assets/botania/blockstates/floating_vinculotus.json create mode 100644 src/generated/resources/assets/botania/blockstates/gray_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/green_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/light_blue_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/light_gray_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/lime_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/magenta_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/orange_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/pink_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/purple_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/red_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/white_floating_flower.json create mode 100644 src/generated/resources/assets/botania/blockstates/yellow_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/black_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/blue_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/brown_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/cyan_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_agricarnation.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_agricarnation_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_bellethorn.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_bellethorn_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_bergamute.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_bubbell.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_bubbell_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_clayconia.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_clayconia_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_daffomill.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_dandelifeon.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_dreadthorn.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_endoflame.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_entropinnyum.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_exoflame.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_fallen_kanade.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_gourmaryllis.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_heisei_dream.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_hopperhock.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_hopperhock_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_hyacidus.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_hydroangeas.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_jaded_amaranthus.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_jiyuulia.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_kekimurus.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_loonium.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_manastar.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_marimorphosis.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_marimorphosis_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_medumone.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_munchdew.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_narslimmus.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_orechid.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_orechid_ignem.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_pollidisiac.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_pure_daisy.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_rafflowsia.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_rannuncarpus.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_rannuncarpus_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_rosa_arcana.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_shulk_me_not.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_solegnolia.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_solegnolia_chibi.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_spectranthemum.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_spectrolus.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_tangleberrie.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_thermalily.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_tigerseye.json create mode 100644 src/generated/resources/assets/botania/models/block/floating_vinculotus.json create mode 100644 src/generated/resources/assets/botania/models/block/gray_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/green_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/light_blue_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/light_gray_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/lime_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/magenta_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/orange_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/pink_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/purple_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/red_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/white_floating_flower.json create mode 100644 src/generated/resources/assets/botania/models/block/yellow_floating_flower.json create mode 100644 src/main/java/vazkii/botania/data/FloatingFlowerModelBuilder.java create mode 100644 src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java delete mode 100644 src/main/resources/assets/botania/blockstates/black_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/blue_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/brown_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/cyan_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_agricarnation.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_bellethorn.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_bergamute.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_bubbell.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_clayconia.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_daffomill.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_dandelifeon.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_dreadthorn.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_endoflame.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_entropinnyum.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_exoflame.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_heisei_dream.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_hopperhock.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_hyacidus.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_hydroangeas.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_jiyuulia.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_kekimurus.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_loonium.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_manastar.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_marimorphosis.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_medumone.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_munchdew.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_narslimmus.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_orechid.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_pollidisiac.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_pure_daisy.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_rafflowsia.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_solegnolia.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_spectranthemum.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_spectrolus.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_tangleberrie.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_thermalily.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_tigerseye.json delete mode 100644 src/main/resources/assets/botania/blockstates/floating_vinculotus.json delete mode 100644 src/main/resources/assets/botania/blockstates/gray_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/green_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/lime_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/magenta_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/orange_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/pink_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/purple_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/red_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/white_floating_flower.json delete mode 100644 src/main/resources/assets/botania/blockstates/yellow_floating_flower.json diff --git a/build.gradle b/build.gradle index 8bc773d0f..c858f8c63 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,6 @@ minecraft { accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { - properties 'forge.logging.markers': 'REGISTRIES,REGISTRYDUMP' properties 'forge.logging.console.level': 'debug' properties 'fml.earlyprogresswindow': 'false' workingDirectory project.file('run') @@ -47,7 +46,6 @@ minecraft { } } server { - properties 'forge.logging.markers': 'REGISTRIES,REGISTRYDUMP' properties 'forge.logging.console.level': 'debug' workingDirectory project.file('run') mods { @@ -64,7 +62,9 @@ minecraft { source sourceSets.main } } - args '--mod', 'botania', '--all', '--existing', '"' + file('src/main/resources/') + '"', + args '--mod', 'botania', '--all', + '--existing', '"' + file('src/main/resources/') + '"', + '--existing', '"' + file('src/generated/resources/') + '"', '--output', '"' + file('src/generated/resources/') + '"' } } diff --git a/src/generated/resources/assets/botania/blockstates/black_floating_flower.json b/src/generated/resources/assets/botania/blockstates/black_floating_flower.json new file mode 100644 index 000000000..30d992bc9 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/black_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/black_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/blue_floating_flower.json b/src/generated/resources/assets/botania/blockstates/blue_floating_flower.json new file mode 100644 index 000000000..aabf8ffdb --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/blue_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/blue_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/brown_floating_flower.json b/src/generated/resources/assets/botania/blockstates/brown_floating_flower.json new file mode 100644 index 000000000..16aa91e63 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/brown_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/brown_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/cyan_floating_flower.json b/src/generated/resources/assets/botania/blockstates/cyan_floating_flower.json new file mode 100644 index 000000000..68e7bbb3d --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/cyan_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/cyan_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_agricarnation.json b/src/generated/resources/assets/botania/blockstates/floating_agricarnation.json new file mode 100644 index 000000000..7f66de50b --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_agricarnation.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_agricarnation" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_agricarnation_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_agricarnation_chibi.json new file mode 100644 index 000000000..88531376e --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_agricarnation_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_agricarnation_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_bellethorn.json b/src/generated/resources/assets/botania/blockstates/floating_bellethorn.json new file mode 100644 index 000000000..e5909305f --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_bellethorn.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_bellethorn" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_bellethorn_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_bellethorn_chibi.json new file mode 100644 index 000000000..d23ea32cc --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_bellethorn_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_bellethorn_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_bergamute.json b/src/generated/resources/assets/botania/blockstates/floating_bergamute.json new file mode 100644 index 000000000..2ae88f9c1 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_bergamute.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_bergamute" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_bubbell.json b/src/generated/resources/assets/botania/blockstates/floating_bubbell.json new file mode 100644 index 000000000..cedf012c7 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_bubbell.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_bubbell" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_bubbell_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_bubbell_chibi.json new file mode 100644 index 000000000..e14b17398 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_bubbell_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_bubbell_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_clayconia.json b/src/generated/resources/assets/botania/blockstates/floating_clayconia.json new file mode 100644 index 000000000..6c70f0f93 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_clayconia.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_clayconia" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_clayconia_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_clayconia_chibi.json new file mode 100644 index 000000000..ca9945479 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_clayconia_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_clayconia_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_daffomill.json b/src/generated/resources/assets/botania/blockstates/floating_daffomill.json new file mode 100644 index 000000000..09e7838d9 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_daffomill.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_daffomill" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_dandelifeon.json b/src/generated/resources/assets/botania/blockstates/floating_dandelifeon.json new file mode 100644 index 000000000..7ec36d4d2 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_dandelifeon.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_dandelifeon" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_dreadthorn.json b/src/generated/resources/assets/botania/blockstates/floating_dreadthorn.json new file mode 100644 index 000000000..edcaab0f6 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_dreadthorn.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_dreadthorn" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_endoflame.json b/src/generated/resources/assets/botania/blockstates/floating_endoflame.json new file mode 100644 index 000000000..0eddc0abd --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_endoflame.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_endoflame" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_entropinnyum.json b/src/generated/resources/assets/botania/blockstates/floating_entropinnyum.json new file mode 100644 index 000000000..ac25014b6 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_entropinnyum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_entropinnyum" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_exoflame.json b/src/generated/resources/assets/botania/blockstates/floating_exoflame.json new file mode 100644 index 000000000..8dd766899 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_exoflame.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_exoflame" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_fallen_kanade.json b/src/generated/resources/assets/botania/blockstates/floating_fallen_kanade.json new file mode 100644 index 000000000..5721e29ee --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_fallen_kanade.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_fallen_kanade" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_gourmaryllis.json b/src/generated/resources/assets/botania/blockstates/floating_gourmaryllis.json new file mode 100644 index 000000000..1f3d60942 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_gourmaryllis.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_gourmaryllis" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_heisei_dream.json b/src/generated/resources/assets/botania/blockstates/floating_heisei_dream.json new file mode 100644 index 000000000..e99356a8d --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_heisei_dream.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_heisei_dream" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_hopperhock.json b/src/generated/resources/assets/botania/blockstates/floating_hopperhock.json new file mode 100644 index 000000000..27ac961ca --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_hopperhock.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_hopperhock" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_hopperhock_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_hopperhock_chibi.json new file mode 100644 index 000000000..efeb9a0fa --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_hopperhock_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_hopperhock_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_hyacidus.json b/src/generated/resources/assets/botania/blockstates/floating_hyacidus.json new file mode 100644 index 000000000..d744b5479 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_hyacidus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_hyacidus" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_hydroangeas.json b/src/generated/resources/assets/botania/blockstates/floating_hydroangeas.json new file mode 100644 index 000000000..2da97cc56 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_hydroangeas.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_hydroangeas" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_jaded_amaranthus.json b/src/generated/resources/assets/botania/blockstates/floating_jaded_amaranthus.json new file mode 100644 index 000000000..0489600b2 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_jaded_amaranthus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_jaded_amaranthus" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_jiyuulia.json b/src/generated/resources/assets/botania/blockstates/floating_jiyuulia.json new file mode 100644 index 000000000..c24401dd0 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_jiyuulia.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_jiyuulia" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_kekimurus.json b/src/generated/resources/assets/botania/blockstates/floating_kekimurus.json new file mode 100644 index 000000000..358d6006a --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_kekimurus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_kekimurus" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_loonium.json b/src/generated/resources/assets/botania/blockstates/floating_loonium.json new file mode 100644 index 000000000..6dc4b61eb --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_loonium.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_loonium" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_manastar.json b/src/generated/resources/assets/botania/blockstates/floating_manastar.json new file mode 100644 index 000000000..31937479c --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_manastar.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_manastar" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_marimorphosis.json b/src/generated/resources/assets/botania/blockstates/floating_marimorphosis.json new file mode 100644 index 000000000..14fbea295 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_marimorphosis.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_marimorphosis" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json new file mode 100644 index 000000000..05cb236b3 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_marimorphosis_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_medumone.json b/src/generated/resources/assets/botania/blockstates/floating_medumone.json new file mode 100644 index 000000000..1d1002d7d --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_medumone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_medumone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_munchdew.json b/src/generated/resources/assets/botania/blockstates/floating_munchdew.json new file mode 100644 index 000000000..5a861ae7e --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_munchdew.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_munchdew" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_narslimmus.json b/src/generated/resources/assets/botania/blockstates/floating_narslimmus.json new file mode 100644 index 000000000..1b4e79c53 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_narslimmus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_narslimmus" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_orechid.json b/src/generated/resources/assets/botania/blockstates/floating_orechid.json new file mode 100644 index 000000000..4a033e6a7 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_orechid.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_orechid" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_orechid_ignem.json b/src/generated/resources/assets/botania/blockstates/floating_orechid_ignem.json new file mode 100644 index 000000000..cc6bd0246 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_orechid_ignem.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_orechid_ignem" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_pollidisiac.json b/src/generated/resources/assets/botania/blockstates/floating_pollidisiac.json new file mode 100644 index 000000000..076e85869 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_pollidisiac.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_pollidisiac" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_pure_daisy.json b/src/generated/resources/assets/botania/blockstates/floating_pure_daisy.json new file mode 100644 index 000000000..5bc3dfe23 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_pure_daisy.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_pure_daisy" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_rafflowsia.json b/src/generated/resources/assets/botania/blockstates/floating_rafflowsia.json new file mode 100644 index 000000000..c7f48c24c --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_rafflowsia.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_rafflowsia" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus.json b/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus.json new file mode 100644 index 000000000..93cc4f406 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_rannuncarpus" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json new file mode 100644 index 000000000..f2378ccd9 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_rannuncarpus_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_rosa_arcana.json b/src/generated/resources/assets/botania/blockstates/floating_rosa_arcana.json new file mode 100644 index 000000000..2e466577f --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_rosa_arcana.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_rosa_arcana" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_shulk_me_not.json b/src/generated/resources/assets/botania/blockstates/floating_shulk_me_not.json new file mode 100644 index 000000000..0a7ababe1 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_shulk_me_not.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_shulk_me_not" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_solegnolia.json b/src/generated/resources/assets/botania/blockstates/floating_solegnolia.json new file mode 100644 index 000000000..bd2272042 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_solegnolia.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_solegnolia" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_solegnolia_chibi.json b/src/generated/resources/assets/botania/blockstates/floating_solegnolia_chibi.json new file mode 100644 index 000000000..3aa18a21f --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_solegnolia_chibi.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_solegnolia_chibi" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_spectranthemum.json b/src/generated/resources/assets/botania/blockstates/floating_spectranthemum.json new file mode 100644 index 000000000..1c31d565a --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_spectranthemum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_spectranthemum" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_spectrolus.json b/src/generated/resources/assets/botania/blockstates/floating_spectrolus.json new file mode 100644 index 000000000..64326b154 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_spectrolus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_spectrolus" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_tangleberrie.json b/src/generated/resources/assets/botania/blockstates/floating_tangleberrie.json new file mode 100644 index 000000000..503c8ae34 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_tangleberrie.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_tangleberrie" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_thermalily.json b/src/generated/resources/assets/botania/blockstates/floating_thermalily.json new file mode 100644 index 000000000..1c62cb386 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_thermalily.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_thermalily" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_tigerseye.json b/src/generated/resources/assets/botania/blockstates/floating_tigerseye.json new file mode 100644 index 000000000..12b5d2b80 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_tigerseye.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_tigerseye" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/floating_vinculotus.json b/src/generated/resources/assets/botania/blockstates/floating_vinculotus.json new file mode 100644 index 000000000..841aea717 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/floating_vinculotus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/floating_vinculotus" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/gray_floating_flower.json b/src/generated/resources/assets/botania/blockstates/gray_floating_flower.json new file mode 100644 index 000000000..d5d2fa1a3 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/gray_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/gray_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/green_floating_flower.json b/src/generated/resources/assets/botania/blockstates/green_floating_flower.json new file mode 100644 index 000000000..763ff32b2 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/green_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/green_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/light_blue_floating_flower.json b/src/generated/resources/assets/botania/blockstates/light_blue_floating_flower.json new file mode 100644 index 000000000..ab3e90914 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/light_blue_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/light_blue_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/light_gray_floating_flower.json b/src/generated/resources/assets/botania/blockstates/light_gray_floating_flower.json new file mode 100644 index 000000000..2e0e33440 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/light_gray_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/light_gray_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/lime_floating_flower.json b/src/generated/resources/assets/botania/blockstates/lime_floating_flower.json new file mode 100644 index 000000000..0533f3fe0 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/lime_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/lime_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/magenta_floating_flower.json b/src/generated/resources/assets/botania/blockstates/magenta_floating_flower.json new file mode 100644 index 000000000..e335b5113 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/magenta_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/magenta_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/orange_floating_flower.json b/src/generated/resources/assets/botania/blockstates/orange_floating_flower.json new file mode 100644 index 000000000..3d3ca9c72 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/orange_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/orange_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/pink_floating_flower.json b/src/generated/resources/assets/botania/blockstates/pink_floating_flower.json new file mode 100644 index 000000000..fcea9caf0 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/pink_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/pink_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/purple_floating_flower.json b/src/generated/resources/assets/botania/blockstates/purple_floating_flower.json new file mode 100644 index 000000000..e185d3af2 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/purple_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/purple_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/red_floating_flower.json b/src/generated/resources/assets/botania/blockstates/red_floating_flower.json new file mode 100644 index 000000000..9d0af11dd --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/red_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/red_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/white_floating_flower.json b/src/generated/resources/assets/botania/blockstates/white_floating_flower.json new file mode 100644 index 000000000..72a3f972d --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/white_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/white_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/yellow_floating_flower.json b/src/generated/resources/assets/botania/blockstates/yellow_floating_flower.json new file mode 100644 index 000000000..bdc8a8f6a --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/yellow_floating_flower.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/yellow_floating_flower" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/black_floating_flower.json b/src/generated/resources/assets/botania/models/block/black_floating_flower.json new file mode 100644 index 000000000..2a660e6f5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/black_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/black_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/blue_floating_flower.json b/src/generated/resources/assets/botania/models/block/blue_floating_flower.json new file mode 100644 index 000000000..e4bd2768e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/blue_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/blue_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/brown_floating_flower.json b/src/generated/resources/assets/botania/models/block/brown_floating_flower.json new file mode 100644 index 000000000..7162be332 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/brown_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/brown_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/cyan_floating_flower.json b/src/generated/resources/assets/botania/models/block/cyan_floating_flower.json new file mode 100644 index 000000000..c5a5c63fa --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/cyan_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/cyan_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_agricarnation.json b/src/generated/resources/assets/botania/models/block/floating_agricarnation.json new file mode 100644 index 000000000..b216e7374 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_agricarnation.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/agricarnation" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_agricarnation_chibi.json b/src/generated/resources/assets/botania/models/block/floating_agricarnation_chibi.json new file mode 100644 index 000000000..48dbc8a6b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_agricarnation_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/agricarnation_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_bellethorn.json b/src/generated/resources/assets/botania/models/block/floating_bellethorn.json new file mode 100644 index 000000000..8464ea572 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_bellethorn.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/bellethorn" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_bellethorn_chibi.json b/src/generated/resources/assets/botania/models/block/floating_bellethorn_chibi.json new file mode 100644 index 000000000..9eab657d2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_bellethorn_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/bellethorn_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_bergamute.json b/src/generated/resources/assets/botania/models/block/floating_bergamute.json new file mode 100644 index 000000000..7d41e632b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_bergamute.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/bergamute" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_bubbell.json b/src/generated/resources/assets/botania/models/block/floating_bubbell.json new file mode 100644 index 000000000..efc6e2dc6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_bubbell.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/bubbell" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_bubbell_chibi.json b/src/generated/resources/assets/botania/models/block/floating_bubbell_chibi.json new file mode 100644 index 000000000..d0dd140dd --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_bubbell_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/bubbell_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_clayconia.json b/src/generated/resources/assets/botania/models/block/floating_clayconia.json new file mode 100644 index 000000000..53da364cd --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_clayconia.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/clayconia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_clayconia_chibi.json b/src/generated/resources/assets/botania/models/block/floating_clayconia_chibi.json new file mode 100644 index 000000000..7ecad04e1 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_clayconia_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/clayconia_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_daffomill.json b/src/generated/resources/assets/botania/models/block/floating_daffomill.json new file mode 100644 index 000000000..bb1744abd --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_daffomill.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/daffomill" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_dandelifeon.json b/src/generated/resources/assets/botania/models/block/floating_dandelifeon.json new file mode 100644 index 000000000..3df1137bd --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_dandelifeon.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/dandelifeon" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_dreadthorn.json b/src/generated/resources/assets/botania/models/block/floating_dreadthorn.json new file mode 100644 index 000000000..3dc3f3dbc --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_dreadthorn.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/dreadthorn" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_endoflame.json b/src/generated/resources/assets/botania/models/block/floating_endoflame.json new file mode 100644 index 000000000..679dafc02 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_endoflame.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/endoflame" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_entropinnyum.json b/src/generated/resources/assets/botania/models/block/floating_entropinnyum.json new file mode 100644 index 000000000..cf67a0d2b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_entropinnyum.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/entropinnyum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_exoflame.json b/src/generated/resources/assets/botania/models/block/floating_exoflame.json new file mode 100644 index 000000000..e26bcb3fa --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_exoflame.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/exoflame" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_fallen_kanade.json b/src/generated/resources/assets/botania/models/block/floating_fallen_kanade.json new file mode 100644 index 000000000..177943492 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_fallen_kanade.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/fallen_kanade" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_gourmaryllis.json b/src/generated/resources/assets/botania/models/block/floating_gourmaryllis.json new file mode 100644 index 000000000..c96d632f2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_gourmaryllis.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/gourmaryllis" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_heisei_dream.json b/src/generated/resources/assets/botania/models/block/floating_heisei_dream.json new file mode 100644 index 000000000..c8cd73d7b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_heisei_dream.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/heisei_dream" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_hopperhock.json b/src/generated/resources/assets/botania/models/block/floating_hopperhock.json new file mode 100644 index 000000000..00f139e7d --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_hopperhock.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/hopperhock" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_hopperhock_chibi.json b/src/generated/resources/assets/botania/models/block/floating_hopperhock_chibi.json new file mode 100644 index 000000000..df168bfdd --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_hopperhock_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/hopperhock_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_hyacidus.json b/src/generated/resources/assets/botania/models/block/floating_hyacidus.json new file mode 100644 index 000000000..99169c821 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_hyacidus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/hyacidus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_hydroangeas.json b/src/generated/resources/assets/botania/models/block/floating_hydroangeas.json new file mode 100644 index 000000000..495b1f720 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_hydroangeas.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/hydroangeas" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_jaded_amaranthus.json b/src/generated/resources/assets/botania/models/block/floating_jaded_amaranthus.json new file mode 100644 index 000000000..f913959ed --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_jaded_amaranthus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/jaded_amaranthus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_jiyuulia.json b/src/generated/resources/assets/botania/models/block/floating_jiyuulia.json new file mode 100644 index 000000000..0d1b96602 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_jiyuulia.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/jiyuulia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_kekimurus.json b/src/generated/resources/assets/botania/models/block/floating_kekimurus.json new file mode 100644 index 000000000..a0456d353 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_kekimurus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/kekimurus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_loonium.json b/src/generated/resources/assets/botania/models/block/floating_loonium.json new file mode 100644 index 000000000..83d54e8eb --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_loonium.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/loonium" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_manastar.json b/src/generated/resources/assets/botania/models/block/floating_manastar.json new file mode 100644 index 000000000..e5323854b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_manastar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/manastar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_marimorphosis.json b/src/generated/resources/assets/botania/models/block/floating_marimorphosis.json new file mode 100644 index 000000000..8a3d876eb --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_marimorphosis.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/marimorphosis" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_marimorphosis_chibi.json b/src/generated/resources/assets/botania/models/block/floating_marimorphosis_chibi.json new file mode 100644 index 000000000..8c6491f74 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_marimorphosis_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/marimorphosis_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_medumone.json b/src/generated/resources/assets/botania/models/block/floating_medumone.json new file mode 100644 index 000000000..41fa5ceb3 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_medumone.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/medumone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_munchdew.json b/src/generated/resources/assets/botania/models/block/floating_munchdew.json new file mode 100644 index 000000000..19a7df2e1 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_munchdew.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/munchdew" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_narslimmus.json b/src/generated/resources/assets/botania/models/block/floating_narslimmus.json new file mode 100644 index 000000000..f634edaae --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_narslimmus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/narslimmus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_orechid.json b/src/generated/resources/assets/botania/models/block/floating_orechid.json new file mode 100644 index 000000000..c431d9044 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_orechid.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/orechid" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_orechid_ignem.json b/src/generated/resources/assets/botania/models/block/floating_orechid_ignem.json new file mode 100644 index 000000000..28ba4ee25 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_orechid_ignem.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/orechid_ignem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_pollidisiac.json b/src/generated/resources/assets/botania/models/block/floating_pollidisiac.json new file mode 100644 index 000000000..cb00dd91b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_pollidisiac.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/pollidisiac" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_pure_daisy.json b/src/generated/resources/assets/botania/models/block/floating_pure_daisy.json new file mode 100644 index 000000000..57b8459cc --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_pure_daisy.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/pure_daisy" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_rafflowsia.json b/src/generated/resources/assets/botania/models/block/floating_rafflowsia.json new file mode 100644 index 000000000..13d747031 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_rafflowsia.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/rafflowsia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_rannuncarpus.json b/src/generated/resources/assets/botania/models/block/floating_rannuncarpus.json new file mode 100644 index 000000000..061fa7152 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_rannuncarpus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/rannuncarpus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_rannuncarpus_chibi.json b/src/generated/resources/assets/botania/models/block/floating_rannuncarpus_chibi.json new file mode 100644 index 000000000..9268b498c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_rannuncarpus_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/rannuncarpus_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_rosa_arcana.json b/src/generated/resources/assets/botania/models/block/floating_rosa_arcana.json new file mode 100644 index 000000000..35e863f82 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_rosa_arcana.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/rosa_arcana" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_shulk_me_not.json b/src/generated/resources/assets/botania/models/block/floating_shulk_me_not.json new file mode 100644 index 000000000..6bfe0f33e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_shulk_me_not.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/shulk_me_not" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_solegnolia.json b/src/generated/resources/assets/botania/models/block/floating_solegnolia.json new file mode 100644 index 000000000..1264eb9c7 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_solegnolia.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/solegnolia" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_solegnolia_chibi.json b/src/generated/resources/assets/botania/models/block/floating_solegnolia_chibi.json new file mode 100644 index 000000000..0e1f2ec34 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_solegnolia_chibi.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/solegnolia_chibi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_spectranthemum.json b/src/generated/resources/assets/botania/models/block/floating_spectranthemum.json new file mode 100644 index 000000000..71164d7bb --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_spectranthemum.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/spectranthemum" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_spectrolus.json b/src/generated/resources/assets/botania/models/block/floating_spectrolus.json new file mode 100644 index 000000000..8caf815e5 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_spectrolus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/spectrolus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_tangleberrie.json b/src/generated/resources/assets/botania/models/block/floating_tangleberrie.json new file mode 100644 index 000000000..71af7dee4 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_tangleberrie.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/tangleberrie" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_thermalily.json b/src/generated/resources/assets/botania/models/block/floating_thermalily.json new file mode 100644 index 000000000..f2ae4ff31 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_thermalily.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/thermalily" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_tigerseye.json b/src/generated/resources/assets/botania/models/block/floating_tigerseye.json new file mode 100644 index 000000000..cc79ff18d --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_tigerseye.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/tigerseye" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/floating_vinculotus.json b/src/generated/resources/assets/botania/models/block/floating_vinculotus.json new file mode 100644 index 000000000..225331563 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/floating_vinculotus.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/vinculotus" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gray_floating_flower.json b/src/generated/resources/assets/botania/models/block/gray_floating_flower.json new file mode 100644 index 000000000..6291ef838 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gray_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/gray_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/green_floating_flower.json b/src/generated/resources/assets/botania/models/block/green_floating_flower.json new file mode 100644 index 000000000..0f4fe9dd0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/green_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/green_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_blue_floating_flower.json b/src/generated/resources/assets/botania/models/block/light_blue_floating_flower.json new file mode 100644 index 000000000..a45e4df1e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_blue_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/light_blue_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_gray_floating_flower.json b/src/generated/resources/assets/botania/models/block/light_gray_floating_flower.json new file mode 100644 index 000000000..f78264bc6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_gray_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/light_gray_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/lime_floating_flower.json b/src/generated/resources/assets/botania/models/block/lime_floating_flower.json new file mode 100644 index 000000000..b306d3620 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/lime_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/lime_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/magenta_floating_flower.json b/src/generated/resources/assets/botania/models/block/magenta_floating_flower.json new file mode 100644 index 000000000..f502b6841 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/magenta_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/magenta_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/orange_floating_flower.json b/src/generated/resources/assets/botania/models/block/orange_floating_flower.json new file mode 100644 index 000000000..8a3b0d452 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/orange_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/orange_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/pink_floating_flower.json b/src/generated/resources/assets/botania/models/block/pink_floating_flower.json new file mode 100644 index 000000000..5af95492a --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/pink_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/pink_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/purple_floating_flower.json b/src/generated/resources/assets/botania/models/block/purple_floating_flower.json new file mode 100644 index 000000000..54e2471b6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/purple_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/purple_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_floating_flower.json b/src/generated/resources/assets/botania/models/block/red_floating_flower.json new file mode 100644 index 000000000..60f080c95 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/red_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/white_floating_flower.json b/src/generated/resources/assets/botania/models/block/white_floating_flower.json new file mode 100644 index 000000000..c96b7fe98 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/white_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/white_mystical_flower" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/yellow_floating_flower.json b/src/generated/resources/assets/botania/models/block/yellow_floating_flower.json new file mode 100644 index 000000000..2c9810989 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/yellow_floating_flower.json @@ -0,0 +1,7 @@ +{ + "parent": "block/block", + "loader": "botania:floating_flower", + "flower": { + "parent": "botania:block/yellow_mystical_flower" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 15743bd4b..fce22f1e8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -98,7 +98,7 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public final class ModelHandler { @SubscribeEvent public static void registerModels(ModelRegistryEvent evt) { - ModelLoaderRegistry.registerLoader(prefix("floating_flower"), FloatingFlowerModel.Loader.INSTANCE); + ModelLoaderRegistry.registerLoader(FloatingFlowerModel.Loader.ID, FloatingFlowerModel.Loader.INSTANCE); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":mana_gun_clip", "inventory")); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory")); ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory")); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 815240064..528a07d3f 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -46,6 +46,8 @@ import java.util.Random; import java.util.Set; import java.util.function.Function; +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + public class FloatingFlowerModel implements IModelGeometry { private IUnbakedModel unbakedFlower; private final Map unbakedIslands = new HashMap<>(); @@ -144,6 +146,8 @@ public class FloatingFlowerModel implements IModelGeometry public enum Loader implements IModelLoader { INSTANCE; + public static final ResourceLocation ID = prefix("floating_flower"); + @Override public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) {} diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 0d94b384b..d8d2bd9a0 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -54,8 +54,7 @@ public class BlockstateProvider extends BlockStateProvider { protected void registerStatesAndModels() { Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) .forEach(b -> { - if (b instanceof BlockFloatingFlower - || b == ModBlocks.craftCrate || b == ModBlocks.ghostRail + if (b == ModBlocks.craftCrate || b == ModBlocks.ghostRail || b == ModBlocks.solidVines) return; diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index 829846748..53f21a460 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -13,6 +13,7 @@ public class DataGenerators { evt.getGenerator().addProvider(new BlockTagProvider(evt.getGenerator())); evt.getGenerator().addProvider(new ItemTagProvider(evt.getGenerator())); evt.getGenerator().addProvider(new StonecuttingProvider(evt.getGenerator())); + evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); } } diff --git a/src/main/java/vazkii/botania/data/FloatingFlowerModelBuilder.java b/src/main/java/vazkii/botania/data/FloatingFlowerModelBuilder.java new file mode 100644 index 000000000..eaf55785a --- /dev/null +++ b/src/main/java/vazkii/botania/data/FloatingFlowerModelBuilder.java @@ -0,0 +1,31 @@ +package vazkii.botania.data; + +import com.google.gson.JsonObject; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.client.model.generators.ModelBuilder; +import net.minecraftforge.client.model.generators.ModelFile; +import vazkii.botania.client.model.FloatingFlowerModel; + +public class FloatingFlowerModelBuilder extends ModelBuilder { + private ModelFile flowerModel; + + public FloatingFlowerModelBuilder(ResourceLocation outputLocation, ExistingFileHelper existingFileHelper) { + super(outputLocation, existingFileHelper); + } + + public FloatingFlowerModelBuilder withFlowerModel(ModelFile model) { + this.flowerModel = model; + return this; + } + + @Override + public JsonObject toJson() { + JsonObject ret = super.toJson(); + ret.addProperty("loader", FloatingFlowerModel.Loader.ID.toString()); + JsonObject submodel = new JsonObject(); + submodel.addProperty("parent", flowerModel.getLocation().toString()); + ret.add("flower", submodel); + return ret; + } +} diff --git a/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java b/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java new file mode 100644 index 000000000..cb3438c89 --- /dev/null +++ b/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java @@ -0,0 +1,45 @@ +package vazkii.botania.data; + +import net.minecraft.block.Block; +import net.minecraft.data.DataGenerator; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.registry.Registry; +import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.client.model.generators.ModelProvider; +import vazkii.botania.common.block.decor.BlockFloatingFlower; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; + +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + +public class FloatingFlowerModelProvider extends ModelProvider { + public FloatingFlowerModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, LibMisc.MOD_ID, BLOCK_FOLDER, FloatingFlowerModelBuilder::new, existingFileHelper); + } + + @Override + protected void registerModels() { + for (Block b : Registry.BLOCK) { + if (LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()) && b instanceof BlockFloatingFlower) { + String name = b.getRegistryName().getPath(); + String nonFloat; + if (name.endsWith("_floating_flower")) { + nonFloat = name.replace("_floating_flower", "_mystical_flower"); + } else { + nonFloat = name.replace("floating_", ""); + } + + getBuilder(name) + .parent(getExistingFile(new ResourceLocation("block/block"))) + .withFlowerModel(getExistingFile(prefix(nonFloat))); + } + } + } + + @Nonnull + @Override + public String getName() { + return "Botania floating flower models"; + } +} diff --git a/src/main/resources/assets/botania/blockstates/black_floating_flower.json b/src/main/resources/assets/botania/blockstates/black_floating_flower.json deleted file mode 100644 index dc6623e89..000000000 --- a/src/main/resources/assets/botania/blockstates/black_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_black" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/blue_floating_flower.json b/src/main/resources/assets/botania/blockstates/blue_floating_flower.json deleted file mode 100644 index d49fbd5de..000000000 --- a/src/main/resources/assets/botania/blockstates/blue_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_blue" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/brown_floating_flower.json b/src/main/resources/assets/botania/blockstates/brown_floating_flower.json deleted file mode 100644 index 30cc7d8a8..000000000 --- a/src/main/resources/assets/botania/blockstates/brown_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_brown" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/cyan_floating_flower.json b/src/main/resources/assets/botania/blockstates/cyan_floating_flower.json deleted file mode 100644 index 74c434329..000000000 --- a/src/main/resources/assets/botania/blockstates/cyan_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_cyan" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_agricarnation.json b/src/main/resources/assets/botania/blockstates/floating_agricarnation.json deleted file mode 100644 index 0f00f732e..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_agricarnation.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/agricarnation" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json b/src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json deleted file mode 100644 index d0dace695..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/agricarnation_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_bellethorn.json b/src/main/resources/assets/botania/blockstates/floating_bellethorn.json deleted file mode 100644 index cb73df0e8..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_bellethorn.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/bellethorn" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json b/src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json deleted file mode 100644 index 2440aba37..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/bellethorn_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_bergamute.json b/src/main/resources/assets/botania/blockstates/floating_bergamute.json deleted file mode 100644 index 798ae3fcc..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_bergamute.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/bergamute" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_bubbell.json b/src/main/resources/assets/botania/blockstates/floating_bubbell.json deleted file mode 100644 index d0ccd3bba..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_bubbell.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/bubbell" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json b/src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json deleted file mode 100644 index 7865f2708..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/bubbell_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_clayconia.json b/src/main/resources/assets/botania/blockstates/floating_clayconia.json deleted file mode 100644 index dd1f5cc30..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_clayconia.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/clayconia" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json b/src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json deleted file mode 100644 index 02ba5a1ee..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/clayconia_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_daffomill.json b/src/main/resources/assets/botania/blockstates/floating_daffomill.json deleted file mode 100644 index a98efe287..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_daffomill.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/daffomill" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_dandelifeon.json b/src/main/resources/assets/botania/blockstates/floating_dandelifeon.json deleted file mode 100644 index 837365308..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_dandelifeon.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/dandelifeon" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_dreadthorn.json b/src/main/resources/assets/botania/blockstates/floating_dreadthorn.json deleted file mode 100644 index c9a66601e..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_dreadthorn.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/dreadthorn" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_endoflame.json b/src/main/resources/assets/botania/blockstates/floating_endoflame.json deleted file mode 100644 index abad3ada3..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_endoflame.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/endoflame" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_entropinnyum.json b/src/main/resources/assets/botania/blockstates/floating_entropinnyum.json deleted file mode 100644 index 492ee05a0..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_entropinnyum.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/entropinnyum" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_exoflame.json b/src/main/resources/assets/botania/blockstates/floating_exoflame.json deleted file mode 100644 index 04026cf3f..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_exoflame.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/exoflame" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json b/src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json deleted file mode 100644 index 9d29681b1..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/fallen_kanade" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json b/src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json deleted file mode 100644 index 8f339f538..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/gourmaryllis" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_heisei_dream.json b/src/main/resources/assets/botania/blockstates/floating_heisei_dream.json deleted file mode 100644 index a5f421065..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_heisei_dream.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/heisei_dream" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_hopperhock.json b/src/main/resources/assets/botania/blockstates/floating_hopperhock.json deleted file mode 100644 index fdc8ba200..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_hopperhock.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/hopperhock" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json b/src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json deleted file mode 100644 index d26227bff..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/hopperhock_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_hyacidus.json b/src/main/resources/assets/botania/blockstates/floating_hyacidus.json deleted file mode 100644 index 95f229144..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_hyacidus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/hyacidus" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_hydroangeas.json b/src/main/resources/assets/botania/blockstates/floating_hydroangeas.json deleted file mode 100644 index 4550c9fa1..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_hydroangeas.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/hydroangeas" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json b/src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json deleted file mode 100644 index e168c6e7d..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/jaded_amaranthus" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_jiyuulia.json b/src/main/resources/assets/botania/blockstates/floating_jiyuulia.json deleted file mode 100644 index e8676768a..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_jiyuulia.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/jiyuulia" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_kekimurus.json b/src/main/resources/assets/botania/blockstates/floating_kekimurus.json deleted file mode 100644 index 16bf02d1f..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_kekimurus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/kekimurus" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_loonium.json b/src/main/resources/assets/botania/blockstates/floating_loonium.json deleted file mode 100644 index 88cd4b122..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_loonium.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/loonium" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_manastar.json b/src/main/resources/assets/botania/blockstates/floating_manastar.json deleted file mode 100644 index cdb98c9b9..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_manastar.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/manastar" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_marimorphosis.json b/src/main/resources/assets/botania/blockstates/floating_marimorphosis.json deleted file mode 100644 index b803c88b5..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_marimorphosis.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/marimorphosis" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json b/src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json deleted file mode 100644 index c288f9dc8..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/marimorphosis_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_medumone.json b/src/main/resources/assets/botania/blockstates/floating_medumone.json deleted file mode 100644 index 6301f3214..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_medumone.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/medumone" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_munchdew.json b/src/main/resources/assets/botania/blockstates/floating_munchdew.json deleted file mode 100644 index a5453b751..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_munchdew.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/munchdew" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_narslimmus.json b/src/main/resources/assets/botania/blockstates/floating_narslimmus.json deleted file mode 100644 index f4fc57236..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_narslimmus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/narslimmus" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_orechid.json b/src/main/resources/assets/botania/blockstates/floating_orechid.json deleted file mode 100644 index a04d97e88..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_orechid.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/orechid" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json b/src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json deleted file mode 100644 index 13969e7dc..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/orechid_ignem" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_pollidisiac.json b/src/main/resources/assets/botania/blockstates/floating_pollidisiac.json deleted file mode 100644 index 6a30d132c..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_pollidisiac.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/pollidisiac" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_pure_daisy.json b/src/main/resources/assets/botania/blockstates/floating_pure_daisy.json deleted file mode 100644 index 5ed059926..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_pure_daisy.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/pure_daisy" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_rafflowsia.json b/src/main/resources/assets/botania/blockstates/floating_rafflowsia.json deleted file mode 100644 index bc45870e6..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_rafflowsia.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/rafflowsia" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json b/src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json deleted file mode 100644 index ec40a5795..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/rannuncarpus" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json b/src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json deleted file mode 100644 index 12e7c74e3..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/rannuncarpus_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json b/src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json deleted file mode 100644 index 27671b559..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/rosa_arcana" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json b/src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json deleted file mode 100644 index f4dff5c72..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/shulk_me_not" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_solegnolia.json b/src/main/resources/assets/botania/blockstates/floating_solegnolia.json deleted file mode 100644 index cde412280..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_solegnolia.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/solegnolia" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json b/src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json deleted file mode 100644 index 57569aeeb..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/solegnolia_chibi" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_spectranthemum.json b/src/main/resources/assets/botania/blockstates/floating_spectranthemum.json deleted file mode 100644 index fd00732db..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_spectranthemum.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/spectranthemum" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_spectrolus.json b/src/main/resources/assets/botania/blockstates/floating_spectrolus.json deleted file mode 100644 index ececff7ba..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_spectrolus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/spectrolus" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_tangleberrie.json b/src/main/resources/assets/botania/blockstates/floating_tangleberrie.json deleted file mode 100644 index 3c651a534..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_tangleberrie.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/tangleberrie" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_thermalily.json b/src/main/resources/assets/botania/blockstates/floating_thermalily.json deleted file mode 100644 index 7f1db1995..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_thermalily.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/thermalily" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_tigerseye.json b/src/main/resources/assets/botania/blockstates/floating_tigerseye.json deleted file mode 100644 index aef8ad743..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_tigerseye.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/tigerseye" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/floating_vinculotus.json b/src/main/resources/assets/botania/blockstates/floating_vinculotus.json deleted file mode 100644 index 8c978a1ba..000000000 --- a/src/main/resources/assets/botania/blockstates/floating_vinculotus.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/vinculotus" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/gray_floating_flower.json b/src/main/resources/assets/botania/blockstates/gray_floating_flower.json deleted file mode 100644 index fdab5bd77..000000000 --- a/src/main/resources/assets/botania/blockstates/gray_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_gray" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/green_floating_flower.json b/src/main/resources/assets/botania/blockstates/green_floating_flower.json deleted file mode 100644 index ad78c31c4..000000000 --- a/src/main/resources/assets/botania/blockstates/green_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_green" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json b/src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json deleted file mode 100644 index a33856929..000000000 --- a/src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_light_blue" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json b/src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json deleted file mode 100644 index 5ddb5f980..000000000 --- a/src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_light_gray" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/lime_floating_flower.json b/src/main/resources/assets/botania/blockstates/lime_floating_flower.json deleted file mode 100644 index 283137b45..000000000 --- a/src/main/resources/assets/botania/blockstates/lime_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_lime" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/magenta_floating_flower.json b/src/main/resources/assets/botania/blockstates/magenta_floating_flower.json deleted file mode 100644 index aca83a685..000000000 --- a/src/main/resources/assets/botania/blockstates/magenta_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_magenta" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/orange_floating_flower.json b/src/main/resources/assets/botania/blockstates/orange_floating_flower.json deleted file mode 100644 index cdaf5ef36..000000000 --- a/src/main/resources/assets/botania/blockstates/orange_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_orange" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/pink_floating_flower.json b/src/main/resources/assets/botania/blockstates/pink_floating_flower.json deleted file mode 100644 index 8851dc991..000000000 --- a/src/main/resources/assets/botania/blockstates/pink_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_pink" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/purple_floating_flower.json b/src/main/resources/assets/botania/blockstates/purple_floating_flower.json deleted file mode 100644 index e24e245ca..000000000 --- a/src/main/resources/assets/botania/blockstates/purple_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_purple" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/red_floating_flower.json b/src/main/resources/assets/botania/blockstates/red_floating_flower.json deleted file mode 100644 index 2d0026b9c..000000000 --- a/src/main/resources/assets/botania/blockstates/red_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_red" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/white_floating_flower.json b/src/main/resources/assets/botania/blockstates/white_floating_flower.json deleted file mode 100644 index f8e12ed22..000000000 --- a/src/main/resources/assets/botania/blockstates/white_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_white" - } - }, - "variants": { - "": [{}] - } -} diff --git a/src/main/resources/assets/botania/blockstates/yellow_floating_flower.json b/src/main/resources/assets/botania/blockstates/yellow_floating_flower.json deleted file mode 100644 index d13f2e616..000000000 --- a/src/main/resources/assets/botania/blockstates/yellow_floating_flower.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "botania_special:floating_flower", - "custom": { - "flower": "botania:block/plants/flower_yellow" - } - }, - "variants": { - "": [{}] - } -}