From 512945af89eaae9cdb8f4e080b9e58d575c492c5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 3 Jul 2020 19:02:58 -0500 Subject: [PATCH] Fix three high template model, fix floating flower blockstates being deleted accidentally --- .../assets/botania/blockstates/black_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/blue_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/brown_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/cyan_floating_flower.json | 7 +++++++ .../botania/blockstates/floating_agricarnation.json | 7 +++++++ .../botania/blockstates/floating_agricarnation_chibi.json | 7 +++++++ .../assets/botania/blockstates/floating_bellethorn.json | 7 +++++++ .../botania/blockstates/floating_bellethorn_chibi.json | 7 +++++++ .../assets/botania/blockstates/floating_bergamute.json | 7 +++++++ .../assets/botania/blockstates/floating_bubbell.json | 7 +++++++ .../botania/blockstates/floating_bubbell_chibi.json | 7 +++++++ .../assets/botania/blockstates/floating_clayconia.json | 7 +++++++ .../botania/blockstates/floating_clayconia_chibi.json | 7 +++++++ .../assets/botania/blockstates/floating_daffomill.json | 7 +++++++ .../assets/botania/blockstates/floating_dandelifeon.json | 7 +++++++ .../assets/botania/blockstates/floating_dreadthorn.json | 7 +++++++ .../assets/botania/blockstates/floating_endoflame.json | 7 +++++++ .../assets/botania/blockstates/floating_entropinnyum.json | 7 +++++++ .../assets/botania/blockstates/floating_exoflame.json | 7 +++++++ .../botania/blockstates/floating_fallen_kanade.json | 7 +++++++ .../assets/botania/blockstates/floating_gourmaryllis.json | 7 +++++++ .../assets/botania/blockstates/floating_heisei_dream.json | 7 +++++++ .../assets/botania/blockstates/floating_hopperhock.json | 7 +++++++ .../botania/blockstates/floating_hopperhock_chibi.json | 7 +++++++ .../assets/botania/blockstates/floating_hyacidus.json | 7 +++++++ .../assets/botania/blockstates/floating_hydroangeas.json | 7 +++++++ .../botania/blockstates/floating_jaded_amaranthus.json | 7 +++++++ .../assets/botania/blockstates/floating_jiyuulia.json | 7 +++++++ .../assets/botania/blockstates/floating_kekimurus.json | 7 +++++++ .../assets/botania/blockstates/floating_loonium.json | 7 +++++++ .../assets/botania/blockstates/floating_manastar.json | 7 +++++++ .../botania/blockstates/floating_marimorphosis.json | 7 +++++++ .../botania/blockstates/floating_marimorphosis_chibi.json | 7 +++++++ .../assets/botania/blockstates/floating_medumone.json | 7 +++++++ .../assets/botania/blockstates/floating_munchdew.json | 7 +++++++ .../assets/botania/blockstates/floating_narslimmus.json | 7 +++++++ .../assets/botania/blockstates/floating_orechid.json | 7 +++++++ .../botania/blockstates/floating_orechid_ignem.json | 7 +++++++ .../assets/botania/blockstates/floating_pollidisiac.json | 7 +++++++ .../assets/botania/blockstates/floating_pure_daisy.json | 7 +++++++ .../assets/botania/blockstates/floating_rafflowsia.json | 7 +++++++ .../assets/botania/blockstates/floating_rannuncarpus.json | 7 +++++++ .../botania/blockstates/floating_rannuncarpus_chibi.json | 7 +++++++ .../assets/botania/blockstates/floating_rosa_arcana.json | 7 +++++++ .../assets/botania/blockstates/floating_shulk_me_not.json | 7 +++++++ .../assets/botania/blockstates/floating_solegnolia.json | 7 +++++++ .../botania/blockstates/floating_solegnolia_chibi.json | 7 +++++++ .../botania/blockstates/floating_spectranthemum.json | 7 +++++++ .../assets/botania/blockstates/floating_spectrolus.json | 7 +++++++ .../assets/botania/blockstates/floating_tangleberrie.json | 7 +++++++ .../assets/botania/blockstates/floating_thermalily.json | 7 +++++++ .../assets/botania/blockstates/floating_tigerseye.json | 7 +++++++ .../assets/botania/blockstates/floating_vinculotus.json | 7 +++++++ .../assets/botania/blockstates/gray_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/green_floating_flower.json | 7 +++++++ .../botania/blockstates/light_blue_floating_flower.json | 7 +++++++ .../botania/blockstates/light_gray_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/lime_floating_flower.json | 7 +++++++ .../botania/blockstates/magenta_floating_flower.json | 7 +++++++ .../botania/blockstates/orange_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/pink_floating_flower.json | 7 +++++++ .../botania/blockstates/purple_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/red_floating_flower.json | 7 +++++++ .../assets/botania/blockstates/white_floating_flower.json | 7 +++++++ .../botania/blockstates/yellow_floating_flower.json | 7 +++++++ src/main/java/vazkii/botania/data/BlockstateProvider.java | 8 +++++--- src/main/java/vazkii/botania/data/DataGenerators.java | 2 +- .../models/block/shapes/three_high_bottom_top.json | 2 +- 68 files changed, 462 insertions(+), 5 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 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/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index fb67bfe72..5157eafc6 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -66,9 +66,6 @@ public class BlockstateProvider extends BlockStateProvider { .filter(b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace())) .collect(Collectors.toSet()); - // Handled by FloatingFlowerModelProvider - remainingBlocks.removeIf(b -> b instanceof BlockFloatingFlower); - // Manually written blockstate + models remainingBlocks.remove(ghostRail); remainingBlocks.remove(solidVines); @@ -408,6 +405,11 @@ public class BlockstateProvider extends BlockStateProvider { simpleBlock(b, model); }); + takeAll(remainingBlocks, b -> b instanceof BlockFloatingFlower).forEach(b -> { + String name = Registry.BLOCK.getKey(b).getPath(); + simpleBlock(b, models().getExistingFile(prefix("block/" + name))); + }); + takeAll(remainingBlocks, b -> b instanceof PaneBlock).forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); ResourceLocation edge = prefix("block/" + name); diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index b17dbd1e7..2a1192ba1 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -30,8 +30,8 @@ public class DataGenerators { evt.getGenerator().addProvider(new RuneProvider(evt.getGenerator())); } if (evt.includeClient()) { - evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); + evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); } } diff --git a/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json b/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json index 39bfce351..f0b7eb890 100644 --- a/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json +++ b/src/main/resources/assets/botania/models/block/shapes/three_high_bottom_top.json @@ -10,7 +10,7 @@ "to": [ 16, 3, 16 ], "faces": { "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#up" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, "north": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" }, "south": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" }, "west": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" },