diff --git a/src/generated/resources/assets/botania/blockstates/black_floating_flower.json b/src/generated/resources/assets/botania/blockstates/black_floating_flower.json deleted file mode 100644 index 30d992bc9..000000000 --- a/src/generated/resources/assets/botania/blockstates/black_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index aabf8ffdb..000000000 --- a/src/generated/resources/assets/botania/blockstates/blue_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 16aa91e63..000000000 --- a/src/generated/resources/assets/botania/blockstates/brown_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 68e7bbb3d..000000000 --- a/src/generated/resources/assets/botania/blockstates/cyan_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 7f66de50b..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_agricarnation.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 88531376e..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_agricarnation_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index e5909305f..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_bellethorn.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index d23ea32cc..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_bellethorn_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 2ae88f9c1..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_bergamute.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index cedf012c7..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_bubbell.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index e14b17398..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_bubbell_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 6c70f0f93..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_clayconia.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index ca9945479..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_clayconia_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 09e7838d9..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_daffomill.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 7ec36d4d2..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_dandelifeon.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index edcaab0f6..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_dreadthorn.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 0eddc0abd..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_endoflame.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index ac25014b6..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_entropinnyum.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 8dd766899..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_exoflame.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 5721e29ee..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_fallen_kanade.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 1f3d60942..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_gourmaryllis.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index e99356a8d..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_heisei_dream.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 27ac961ca..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_hopperhock.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index efeb9a0fa..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_hopperhock_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index d744b5479..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_hyacidus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 2da97cc56..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_hydroangeas.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 0489600b2..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_jaded_amaranthus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index c24401dd0..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_jiyuulia.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 358d6006a..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_kekimurus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 6dc4b61eb..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_loonium.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 31937479c..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_manastar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 14fbea295..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_marimorphosis.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 05cb236b3..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 1d1002d7d..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_medumone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 5a861ae7e..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_munchdew.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 1b4e79c53..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_narslimmus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 4a033e6a7..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_orechid.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index cc6bd0246..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_orechid_ignem.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 076e85869..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_pollidisiac.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 5bc3dfe23..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_pure_daisy.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index c7f48c24c..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_rafflowsia.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 93cc4f406..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index f2378ccd9..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 2e466577f..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_rosa_arcana.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 0a7ababe1..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_shulk_me_not.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index bd2272042..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_solegnolia.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 3aa18a21f..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_solegnolia_chibi.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 1c31d565a..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_spectranthemum.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 64326b154..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_spectrolus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 503c8ae34..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_tangleberrie.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 1c62cb386..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_thermalily.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 12b5d2b80..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_tigerseye.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 841aea717..000000000 --- a/src/generated/resources/assets/botania/blockstates/floating_vinculotus.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index d5d2fa1a3..000000000 --- a/src/generated/resources/assets/botania/blockstates/gray_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 763ff32b2..000000000 --- a/src/generated/resources/assets/botania/blockstates/green_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index ab3e90914..000000000 --- a/src/generated/resources/assets/botania/blockstates/light_blue_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 2e0e33440..000000000 --- a/src/generated/resources/assets/botania/blockstates/light_gray_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 0533f3fe0..000000000 --- a/src/generated/resources/assets/botania/blockstates/lime_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index e335b5113..000000000 --- a/src/generated/resources/assets/botania/blockstates/magenta_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 3d3ca9c72..000000000 --- a/src/generated/resources/assets/botania/blockstates/orange_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index fcea9caf0..000000000 --- a/src/generated/resources/assets/botania/blockstates/pink_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index e185d3af2..000000000 --- a/src/generated/resources/assets/botania/blockstates/purple_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 9d0af11dd..000000000 --- a/src/generated/resources/assets/botania/blockstates/red_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 72a3f972d..000000000 --- a/src/generated/resources/assets/botania/blockstates/white_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index bdc8a8f6a..000000000 --- a/src/generated/resources/assets/botania/blockstates/yellow_floating_flower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "botania:block/yellow_floating_flower" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/abstruse_platform.json b/src/generated/resources/assets/botania/models/block/abstruse_platform.json similarity index 61% rename from src/main/resources/assets/botania/models/block/abstruse_platform.json rename to src/generated/resources/assets/botania/models/block/abstruse_platform.json index 9c7edbd4e..876e65e46 100644 --- a/src/main/resources/assets/botania/models/block/abstruse_platform.json +++ b/src/generated/resources/assets/botania/models/block/abstruse_platform.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/abstruse_platform" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/alchemy_catalyst.json b/src/generated/resources/assets/botania/models/block/alchemy_catalyst.json new file mode 100644 index 000000000..c81cdc36a --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/alchemy_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "botania:block/alchemy_catalyst" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_0.json b/src/generated/resources/assets/botania/models/block/azulejo_0.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_0.json rename to src/generated/resources/assets/botania/models/block/azulejo_0.json index 53006367a..f781b6593 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_0.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_0.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_0" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_1.json b/src/generated/resources/assets/botania/models/block/azulejo_1.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_1.json rename to src/generated/resources/assets/botania/models/block/azulejo_1.json index 242ae2375..0bad30f13 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_1.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_1.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_1" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_10.json b/src/generated/resources/assets/botania/models/block/azulejo_10.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_10.json rename to src/generated/resources/assets/botania/models/block/azulejo_10.json index bc5f947c1..6a0381ec5 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_10.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_10.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_10" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_11.json b/src/generated/resources/assets/botania/models/block/azulejo_11.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_11.json rename to src/generated/resources/assets/botania/models/block/azulejo_11.json index 3937fefaa..c7e7af741 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_11.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_11.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_11" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_12.json b/src/generated/resources/assets/botania/models/block/azulejo_12.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_12.json rename to src/generated/resources/assets/botania/models/block/azulejo_12.json index 56a572b0f..20474e4f0 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_12.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_12.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_12" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_13.json b/src/generated/resources/assets/botania/models/block/azulejo_13.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_13.json rename to src/generated/resources/assets/botania/models/block/azulejo_13.json index 9f4383812..cd5ee8d78 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_13.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_13.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_13" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_14.json b/src/generated/resources/assets/botania/models/block/azulejo_14.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_14.json rename to src/generated/resources/assets/botania/models/block/azulejo_14.json index bf0fd5b99..a36685a11 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_14.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_14.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_14" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_15.json b/src/generated/resources/assets/botania/models/block/azulejo_15.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_15.json rename to src/generated/resources/assets/botania/models/block/azulejo_15.json index 40453cf69..16e8a2bc6 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_15.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_15.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_15" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_2.json b/src/generated/resources/assets/botania/models/block/azulejo_2.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_2.json rename to src/generated/resources/assets/botania/models/block/azulejo_2.json index 67f829cfc..7fb9da64c 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_2.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_2.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_2" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_3.json b/src/generated/resources/assets/botania/models/block/azulejo_3.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_3.json rename to src/generated/resources/assets/botania/models/block/azulejo_3.json index cc1795efc..eba6625a8 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_3.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_3.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_3" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_4.json b/src/generated/resources/assets/botania/models/block/azulejo_4.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_4.json rename to src/generated/resources/assets/botania/models/block/azulejo_4.json index bdcb6a2e0..55479bf4b 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_4.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_4.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_4" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_5.json b/src/generated/resources/assets/botania/models/block/azulejo_5.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_5.json rename to src/generated/resources/assets/botania/models/block/azulejo_5.json index 5275b8547..dcefe9a9a 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_5.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_5.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_5" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_6.json b/src/generated/resources/assets/botania/models/block/azulejo_6.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_6.json rename to src/generated/resources/assets/botania/models/block/azulejo_6.json index 3960f3b0d..bad6b2e3e 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_6.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_6.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_6" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_7.json b/src/generated/resources/assets/botania/models/block/azulejo_7.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_7.json rename to src/generated/resources/assets/botania/models/block/azulejo_7.json index 3b84fdd83..974b6833d 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_7.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_7.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_7" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_8.json b/src/generated/resources/assets/botania/models/block/azulejo_8.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_8.json rename to src/generated/resources/assets/botania/models/block/azulejo_8.json index 0be9a53fc..aa6e74c07 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_8.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_8.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_8" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/azulejo_9.json b/src/generated/resources/assets/botania/models/block/azulejo_9.json similarity index 58% rename from src/main/resources/assets/botania/models/block/azulejo_9.json rename to src/generated/resources/assets/botania/models/block/azulejo_9.json index 2fc36500d..064d7eb53 100644 --- a/src/main/resources/assets/botania/models/block/azulejo_9.json +++ b/src/generated/resources/assets/botania/models/block/azulejo_9.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/azulejo_9" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bifrost.json b/src/generated/resources/assets/botania/models/block/bifrost.json similarity index 57% rename from src/main/resources/assets/botania/models/block/bifrost.json rename to src/generated/resources/assets/botania/models/block/bifrost.json index cad83cee5..326e3e8e9 100644 --- a/src/main/resources/assets/botania/models/block/bifrost.json +++ b/src/generated/resources/assets/botania/models/block/bifrost.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/bifrost" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/black_pavement.json b/src/generated/resources/assets/botania/models/block/black_pavement.json similarity index 60% rename from src/main/resources/assets/botania/models/block/black_pavement.json rename to src/generated/resources/assets/botania/models/block/black_pavement.json index b9a598bd9..bc404f318 100644 --- a/src/main/resources/assets/botania/models/block/black_pavement.json +++ b/src/generated/resources/assets/botania/models/block/black_pavement.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/black_pavement" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blaze_block.json b/src/generated/resources/assets/botania/models/block/blaze_block.json similarity index 59% rename from src/main/resources/assets/botania/models/block/blaze_block.json rename to src/generated/resources/assets/botania/models/block/blaze_block.json index 7abc6ae40..0a932030b 100644 --- a/src/main/resources/assets/botania/models/block/blaze_block.json +++ b/src/generated/resources/assets/botania/models/block/blaze_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/blaze_block" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blue_pavement.json b/src/generated/resources/assets/botania/models/block/blue_pavement.json similarity index 60% rename from src/main/resources/assets/botania/models/block/blue_pavement.json rename to src/generated/resources/assets/botania/models/block/blue_pavement.json index a69c84de5..c273d9c43 100644 --- a/src/main/resources/assets/botania/models/block/blue_pavement.json +++ b/src/generated/resources/assets/botania/models/block/blue_pavement.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/blue_pavement" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cell_block.json b/src/generated/resources/assets/botania/models/block/cell_block.json similarity index 58% rename from src/main/resources/assets/botania/models/block/cell_block.json rename to src/generated/resources/assets/botania/models/block/cell_block.json index bf0439fcf..69c742cd8 100644 --- a/src/main/resources/assets/botania/models/block/cell_block.json +++ b/src/generated/resources/assets/botania/models/block/cell_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/cell_block" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/chiseled_livingrock_bricks.json b/src/generated/resources/assets/botania/models/block/chiseled_livingrock_bricks.json similarity index 64% rename from src/main/resources/assets/botania/models/block/chiseled_livingrock_bricks.json rename to src/generated/resources/assets/botania/models/block/chiseled_livingrock_bricks.json index 378a3fc0f..a61d725c3 100644 --- a/src/main/resources/assets/botania/models/block/chiseled_livingrock_bricks.json +++ b/src/generated/resources/assets/botania/models/block/chiseled_livingrock_bricks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/chiseled_livingrock_bricks" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/conjuration_catalyst.json b/src/generated/resources/assets/botania/models/block/conjuration_catalyst.json new file mode 100644 index 000000000..acea34293 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/conjuration_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "botania:block/conjuration_catalyst" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cracked_livingrock_bricks.json b/src/generated/resources/assets/botania/models/block/cracked_livingrock_bricks.json similarity index 64% rename from src/main/resources/assets/botania/models/block/cracked_livingrock_bricks.json rename to src/generated/resources/assets/botania/models/block/cracked_livingrock_bricks.json index a0dd48467..659e2fbe7 100644 --- a/src/main/resources/assets/botania/models/block/cracked_livingrock_bricks.json +++ b/src/generated/resources/assets/botania/models/block/cracked_livingrock_bricks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/cracked_livingrock_bricks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dragonstone_block.json b/src/generated/resources/assets/botania/models/block/dragonstone_block.json similarity index 61% rename from src/main/resources/assets/botania/models/block/dragonstone_block.json rename to src/generated/resources/assets/botania/models/block/dragonstone_block.json index edd58ddbc..926da98f4 100644 --- a/src/main/resources/assets/botania/models/block/dragonstone_block.json +++ b/src/generated/resources/assets/botania/models/block/dragonstone_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/dragonstone_block" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood.json b/src/generated/resources/assets/botania/models/block/dreamwood.json similarity index 58% rename from src/main/resources/assets/botania/models/block/dreamwood.json rename to src/generated/resources/assets/botania/models/block/dreamwood.json index 78b620e20..dd23d70e3 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood.json +++ b/src/generated/resources/assets/botania/models/block/dreamwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/dreamwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks.json b/src/generated/resources/assets/botania/models/block/dreamwood_planks.json similarity index 61% rename from src/main/resources/assets/botania/models/block/dreamwood_planks.json rename to src/generated/resources/assets/botania/models/block/dreamwood_planks.json index 78e03cb66..ab260a239 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_planks.json +++ b/src/generated/resources/assets/botania/models/block/dreamwood_planks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/elementium_block.json b/src/generated/resources/assets/botania/models/block/elementium_block.json similarity index 61% rename from src/main/resources/assets/botania/models/block/elementium_block.json rename to src/generated/resources/assets/botania/models/block/elementium_block.json index d9c1ac31a..069ecd231 100644 --- a/src/main/resources/assets/botania/models/block/elementium_block.json +++ b/src/generated/resources/assets/botania/models/block/elementium_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/elementium_block" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/enchanter.json b/src/generated/resources/assets/botania/models/block/enchanter.json similarity index 58% rename from src/main/resources/assets/botania/models/block/enchanter.json rename to src/generated/resources/assets/botania/models/block/enchanter.json index e78271392..993e4bf87 100644 --- a/src/main/resources/assets/botania/models/block/enchanter.json +++ b/src/generated/resources/assets/botania/models/block/enchanter.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/enchanter" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/framed_dreamwood.json b/src/generated/resources/assets/botania/models/block/framed_dreamwood.json similarity index 61% rename from src/main/resources/assets/botania/models/block/framed_dreamwood.json rename to src/generated/resources/assets/botania/models/block/framed_dreamwood.json index 73b94a395..3b3842233 100644 --- a/src/main/resources/assets/botania/models/block/framed_dreamwood.json +++ b/src/generated/resources/assets/botania/models/block/framed_dreamwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/framed_dreamwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/framed_livingwood.json b/src/generated/resources/assets/botania/models/block/framed_livingwood.json similarity index 61% rename from src/main/resources/assets/botania/models/block/framed_livingwood.json rename to src/generated/resources/assets/botania/models/block/framed_livingwood.json index 0d1e4bca4..8a132b39c 100644 --- a/src/main/resources/assets/botania/models/block/framed_livingwood.json +++ b/src/generated/resources/assets/botania/models/block/framed_livingwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/framed_livingwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_dreamwood.json b/src/generated/resources/assets/botania/models/block/glimmering_dreamwood.json similarity index 62% rename from src/main/resources/assets/botania/models/block/glimmering_dreamwood.json rename to src/generated/resources/assets/botania/models/block/glimmering_dreamwood.json index 163967ce2..a2f6b46fc 100644 --- a/src/main/resources/assets/botania/models/block/glimmering_dreamwood.json +++ b/src/generated/resources/assets/botania/models/block/glimmering_dreamwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/glimmering_dreamwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/glimmering_livingwood.json b/src/generated/resources/assets/botania/models/block/glimmering_livingwood.json similarity index 62% rename from src/main/resources/assets/botania/models/block/glimmering_livingwood.json rename to src/generated/resources/assets/botania/models/block/glimmering_livingwood.json index a93b5c11f..b5ce8a82f 100644 --- a/src/main/resources/assets/botania/models/block/glimmering_livingwood.json +++ b/src/generated/resources/assets/botania/models/block/glimmering_livingwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/glimmering_livingwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/green_pavement.json b/src/generated/resources/assets/botania/models/block/green_pavement.json similarity index 60% rename from src/main/resources/assets/botania/models/block/green_pavement.json rename to src/generated/resources/assets/botania/models/block/green_pavement.json index 990542a40..e1eb98e09 100644 --- a/src/main/resources/assets/botania/models/block/green_pavement.json +++ b/src/generated/resources/assets/botania/models/block/green_pavement.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/green_pavement" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/infrangible_platform.json b/src/generated/resources/assets/botania/models/block/infrangible_platform.json similarity index 62% rename from src/main/resources/assets/botania/models/block/infrangible_platform.json rename to src/generated/resources/assets/botania/models/block/infrangible_platform.json index 3ea966e46..ee5a7f80e 100644 --- a/src/main/resources/assets/botania/models/block/infrangible_platform.json +++ b/src/generated/resources/assets/botania/models/block/infrangible_platform.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/infrangible_platform" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock.json b/src/generated/resources/assets/botania/models/block/livingrock.json similarity index 58% rename from src/main/resources/assets/botania/models/block/livingrock.json rename to src/generated/resources/assets/botania/models/block/livingrock.json index 7fe1dfe89..ec467d371 100644 --- a/src/main/resources/assets/botania/models/block/livingrock.json +++ b/src/generated/resources/assets/botania/models/block/livingrock.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/livingrock" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingrock_bricks.json b/src/generated/resources/assets/botania/models/block/livingrock_bricks.json similarity index 61% rename from src/main/resources/assets/botania/models/block/livingrock_bricks.json rename to src/generated/resources/assets/botania/models/block/livingrock_bricks.json index d456f6f42..8c981cc5f 100644 --- a/src/main/resources/assets/botania/models/block/livingrock_bricks.json +++ b/src/generated/resources/assets/botania/models/block/livingrock_bricks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/livingrock_bricks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood.json b/src/generated/resources/assets/botania/models/block/livingwood.json similarity index 58% rename from src/main/resources/assets/botania/models/block/livingwood.json rename to src/generated/resources/assets/botania/models/block/livingwood.json index 26ff054ce..6c1230aaa 100644 --- a/src/main/resources/assets/botania/models/block/livingwood.json +++ b/src/generated/resources/assets/botania/models/block/livingwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/livingwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/generated/resources/assets/botania/models/block/livingwood_planks.json similarity index 61% rename from src/main/resources/assets/botania/models/block/livingwood_planks.json rename to src/generated/resources/assets/botania/models/block/livingwood_planks.json index f9bbc8623..90be189d5 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_planks.json +++ b/src/generated/resources/assets/botania/models/block/livingwood_planks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/livingwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_bomb.json b/src/generated/resources/assets/botania/models/block/mana_bomb.json similarity index 58% rename from src/main/resources/assets/botania/models/block/mana_bomb.json rename to src/generated/resources/assets/botania/models/block/mana_bomb.json index 25e91e335..ed3456a34 100644 --- a/src/main/resources/assets/botania/models/block/mana_bomb.json +++ b/src/generated/resources/assets/botania/models/block/mana_bomb.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mana_bomb" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_diamond_block.json b/src/generated/resources/assets/botania/models/block/mana_diamond_block.json similarity index 61% rename from src/main/resources/assets/botania/models/block/mana_diamond_block.json rename to src/generated/resources/assets/botania/models/block/mana_diamond_block.json index d2bd12630..f1b149b54 100644 --- a/src/main/resources/assets/botania/models/block/mana_diamond_block.json +++ b/src/generated/resources/assets/botania/models/block/mana_diamond_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mana_diamond_block" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_fluxfield.json b/src/generated/resources/assets/botania/models/block/mana_fluxfield.json similarity index 60% rename from src/main/resources/assets/botania/models/block/mana_fluxfield.json rename to src/generated/resources/assets/botania/models/block/mana_fluxfield.json index 2c9e9df48..df9c1090f 100644 --- a/src/main/resources/assets/botania/models/block/mana_fluxfield.json +++ b/src/generated/resources/assets/botania/models/block/mana_fluxfield.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mana_fluxfield" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_glass.json b/src/generated/resources/assets/botania/models/block/mana_glass.json similarity index 58% rename from src/main/resources/assets/botania/models/block/mana_glass.json rename to src/generated/resources/assets/botania/models/block/mana_glass.json index c7c9dfc20..af6cb57b6 100644 --- a/src/main/resources/assets/botania/models/block/mana_glass.json +++ b/src/generated/resources/assets/botania/models/block/mana_glass.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mana_glass" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_void.json b/src/generated/resources/assets/botania/models/block/mana_void.json similarity index 58% rename from src/main/resources/assets/botania/models/block/mana_void.json rename to src/generated/resources/assets/botania/models/block/mana_void.json index b3d7de95c..eda6a3d1f 100644 --- a/src/main/resources/assets/botania/models/block/mana_void.json +++ b/src/generated/resources/assets/botania/models/block/mana_void.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mana_void" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manasteel_block.json b/src/generated/resources/assets/botania/models/block/manasteel_block.json similarity index 60% rename from src/main/resources/assets/botania/models/block/manasteel_block.json rename to src/generated/resources/assets/botania/models/block/manasteel_block.json index e4e8ea695..17a888564 100644 --- a/src/main/resources/assets/botania/models/block/manasteel_block.json +++ b/src/generated/resources/assets/botania/models/block/manasteel_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/manasteel_block" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mossy_dreamwood_planks.json b/src/generated/resources/assets/botania/models/block/mossy_dreamwood_planks.json similarity index 63% rename from src/main/resources/assets/botania/models/block/mossy_dreamwood_planks.json rename to src/generated/resources/assets/botania/models/block/mossy_dreamwood_planks.json index 621b01d87..18c725773 100644 --- a/src/main/resources/assets/botania/models/block/mossy_dreamwood_planks.json +++ b/src/generated/resources/assets/botania/models/block/mossy_dreamwood_planks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mossy_dreamwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mossy_livingrock_bricks.json b/src/generated/resources/assets/botania/models/block/mossy_livingrock_bricks.json similarity index 63% rename from src/main/resources/assets/botania/models/block/mossy_livingrock_bricks.json rename to src/generated/resources/assets/botania/models/block/mossy_livingrock_bricks.json index 71a8a838a..43cd60123 100644 --- a/src/main/resources/assets/botania/models/block/mossy_livingrock_bricks.json +++ b/src/generated/resources/assets/botania/models/block/mossy_livingrock_bricks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mossy_livingrock_bricks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mossy_livingwood_planks.json b/src/generated/resources/assets/botania/models/block/mossy_livingwood_planks.json similarity index 63% rename from src/main/resources/assets/botania/models/block/mossy_livingwood_planks.json rename to src/generated/resources/assets/botania/models/block/mossy_livingwood_planks.json index 0e11a52f3..9fd43d140 100644 --- a/src/main/resources/assets/botania/models/block/mossy_livingwood_planks.json +++ b/src/generated/resources/assets/botania/models/block/mossy_livingwood_planks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/mossy_livingwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pattern_framed_dreamwood.json b/src/generated/resources/assets/botania/models/block/pattern_framed_dreamwood.json similarity index 63% rename from src/main/resources/assets/botania/models/block/pattern_framed_dreamwood.json rename to src/generated/resources/assets/botania/models/block/pattern_framed_dreamwood.json index 1682858b4..537df5d5b 100644 --- a/src/main/resources/assets/botania/models/block/pattern_framed_dreamwood.json +++ b/src/generated/resources/assets/botania/models/block/pattern_framed_dreamwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/pattern_framed_dreamwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pattern_framed_livingwood.json b/src/generated/resources/assets/botania/models/block/pattern_framed_livingwood.json similarity index 64% rename from src/main/resources/assets/botania/models/block/pattern_framed_livingwood.json rename to src/generated/resources/assets/botania/models/block/pattern_framed_livingwood.json index 7fbae4a3f..30e552738 100644 --- a/src/main/resources/assets/botania/models/block/pattern_framed_livingwood.json +++ b/src/generated/resources/assets/botania/models/block/pattern_framed_livingwood.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/pattern_framed_livingwood" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/piston_relay.json b/src/generated/resources/assets/botania/models/block/piston_relay.json similarity index 59% rename from src/main/resources/assets/botania/models/block/piston_relay.json rename to src/generated/resources/assets/botania/models/block/piston_relay.json index 23750a882..768990589 100644 --- a/src/main/resources/assets/botania/models/block/piston_relay.json +++ b/src/generated/resources/assets/botania/models/block/piston_relay.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/piston_relay" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_pavement.json b/src/generated/resources/assets/botania/models/block/red_pavement.json similarity index 59% rename from src/main/resources/assets/botania/models/block/red_pavement.json rename to src/generated/resources/assets/botania/models/block/red_pavement.json index ab04713ff..cdf8fe12e 100644 --- a/src/main/resources/assets/botania/models/block/red_pavement.json +++ b/src/generated/resources/assets/botania/models/block/red_pavement.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/red_pavement" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/root.json b/src/generated/resources/assets/botania/models/block/root.json similarity index 56% rename from src/main/resources/assets/botania/models/block/root.json rename to src/generated/resources/assets/botania/models/block/root.json index 5fe55d278..cbb8dee5f 100644 --- a/src/main/resources/assets/botania/models/block/root.json +++ b/src/generated/resources/assets/botania/models/block/root.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/root" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shimmerrock.json b/src/generated/resources/assets/botania/models/block/shimmerrock.json similarity index 59% rename from src/main/resources/assets/botania/models/block/shimmerrock.json rename to src/generated/resources/assets/botania/models/block/shimmerrock.json index b03fdaeec..82b305215 100644 --- a/src/main/resources/assets/botania/models/block/shimmerrock.json +++ b/src/generated/resources/assets/botania/models/block/shimmerrock.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/shimmerrock" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shimmerwood_planks.json b/src/generated/resources/assets/botania/models/block/shimmerwood_planks.json similarity index 61% rename from src/main/resources/assets/botania/models/block/shimmerwood_planks.json rename to src/generated/resources/assets/botania/models/block/shimmerwood_planks.json index 6ac850efd..a4ebe3b05 100644 --- a/src/main/resources/assets/botania/models/block/shimmerwood_planks.json +++ b/src/generated/resources/assets/botania/models/block/shimmerwood_planks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/shimmerwood_planks" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/spectral_platform.json b/src/generated/resources/assets/botania/models/block/spectral_platform.json similarity index 61% rename from src/main/resources/assets/botania/models/block/spectral_platform.json rename to src/generated/resources/assets/botania/models/block/spectral_platform.json index e543d22e9..cd7115d3d 100644 --- a/src/main/resources/assets/botania/models/block/spectral_platform.json +++ b/src/generated/resources/assets/botania/models/block/spectral_platform.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/spectral_platform" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terrasteel_block.json b/src/generated/resources/assets/botania/models/block/terrasteel_block.json similarity index 61% rename from src/main/resources/assets/botania/models/block/terrasteel_block.json rename to src/generated/resources/assets/botania/models/block/terrasteel_block.json index 0a4d90b06..ce42c0971 100644 --- a/src/main/resources/assets/botania/models/block/terrasteel_block.json +++ b/src/generated/resources/assets/botania/models/block/terrasteel_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/terrasteel_block" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/white_pavement.json b/src/generated/resources/assets/botania/models/block/white_pavement.json similarity index 60% rename from src/main/resources/assets/botania/models/block/white_pavement.json rename to src/generated/resources/assets/botania/models/block/white_pavement.json index 630545260..ccb4adc83 100644 --- a/src/main/resources/assets/botania/models/block/white_pavement.json +++ b/src/generated/resources/assets/botania/models/block/white_pavement.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/white_pavement" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/yellow_pavement.json b/src/generated/resources/assets/botania/models/block/yellow_pavement.json similarity index 60% rename from src/main/resources/assets/botania/models/block/yellow_pavement.json rename to src/generated/resources/assets/botania/models/block/yellow_pavement.json index d96934541..76da45f5e 100644 --- a/src/main/resources/assets/botania/models/block/yellow_pavement.json +++ b/src/generated/resources/assets/botania/models/block/yellow_pavement.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "botania:block/yellow_pavement" } -} +} \ 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 31ff85f01..fb67bfe72 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -31,6 +31,7 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.Botania; import vazkii.botania.common.block.*; import vazkii.botania.common.block.decor.BlockBuriedPetals; +import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.string.BlockRedString; @@ -64,6 +65,10 @@ public class BlockstateProvider extends BlockStateProvider { Set remainingBlocks = Registry.BLOCK.stream() .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); @@ -81,11 +86,11 @@ public class BlockstateProvider extends BlockStateProvider { ModelFile alfPortalModel = models().cubeAll(alfPortalName, prefix("block/" + alfPortalName)); ModelFile alfPortalActivatedModel = models().cubeAll(alfPortalName + "_activated", prefix("block/" + alfPortalName + "_activated")); getVariantBuilder(alfPortal).partialState().with(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF) - .setModels(new ConfiguredModel(alfPortalModel)); + .setModels(new ConfiguredModel(alfPortalModel)); getVariantBuilder(alfPortal).partialState().with(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.ON_X) - .setModels(new ConfiguredModel(alfPortalActivatedModel)); + .setModels(new ConfiguredModel(alfPortalActivatedModel)); getVariantBuilder(alfPortal).partialState().with(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.ON_Z) - .setModels(new ConfiguredModel(alfPortalActivatedModel)); + .setModels(new ConfiguredModel(alfPortalActivatedModel)); remainingBlocks.remove(alfPortal); String bifrostPermName = Registry.BLOCK.getKey(bifrostPerm).getPath(); @@ -94,8 +99,8 @@ public class BlockstateProvider extends BlockStateProvider { String cacophoniumName = Registry.BLOCK.getKey(cacophonium).getPath(); simpleBlock(cacophonium, models().cubeTop(cacophoniumName, - prefix("block/" + cacophoniumName), - prefix("block/" + cacophoniumName + "_top"))); + prefix("block/" + cacophoniumName), + prefix("block/" + cacophoniumName + "_top"))); remainingBlocks.remove(cacophonium); String craftCrateName = Registry.BLOCK.getKey(craftCrate).getPath(); @@ -104,8 +109,8 @@ public class BlockstateProvider extends BlockStateProvider { String suffix = pat == CratePattern.NONE ? "" : "_" + pat.func_176610_l().substring("crafty_".length()); String name = craftCrateName + suffix; ModelFile model = models().withExistingParent(name, prefix("block/shapes/crate")) - .texture("bottom", prefix("block/" + craftCrateName + "_bottom")) - .texture("side", prefix("block/" + name)); + .texture("bottom", prefix("block/" + craftCrateName + "_bottom")) + .texture("side", prefix("block/" + name)); return new ConfiguredModel[] { new ConfiguredModel(model) }; }); remainingBlocks.remove(craftCrate); @@ -122,25 +127,25 @@ public class BlockstateProvider extends BlockStateProvider { String enchSoilName = Registry.BLOCK.getKey(enchantedSoil).getPath(); simpleBlock(enchantedSoil, models().cubeBottomTop(enchSoilName, - prefix("block/" + enchSoilName + "_side"), - new ResourceLocation("block/dirt"), - prefix("block/" + enchSoilName + "_top") + prefix("block/" + enchSoilName + "_side"), + new ResourceLocation("block/dirt"), + prefix("block/" + enchSoilName + "_top") )); remainingBlocks.remove(enchantedSoil); String felName = Registry.BLOCK.getKey(felPumpkin).getPath(); simpleBlock(felPumpkin, models().orientable(felName, new ResourceLocation("block/pumpkin_side"), prefix("block/" + felName), - new ResourceLocation("block/pumpkin_top"))); + new ResourceLocation("block/pumpkin_top"))); remainingBlocks.remove(felPumpkin); String forestEyeName = Registry.BLOCK.getKey(forestEye).getPath(); ModelFile forestEyeFile = models().withExistingParent(forestEyeName, prefix("block/shapes/eightbyeight")) - .texture("bottom", prefix("block/" + forestEyeName + "_bottom")) - .texture("top", prefix("block/" + forestEyeName + "_top")) - .texture("north", prefix("block/" + forestEyeName + "_north")) - .texture("south", prefix("block/" + forestEyeName + "_south")) - .texture("west", prefix("block/" + forestEyeName + "_west")) - .texture("east", prefix("block/" + forestEyeName + "_east")); + .texture("bottom", prefix("block/" + forestEyeName + "_bottom")) + .texture("top", prefix("block/" + forestEyeName + "_top")) + .texture("north", prefix("block/" + forestEyeName + "_north")) + .texture("south", prefix("block/" + forestEyeName + "_south")) + .texture("west", prefix("block/" + forestEyeName + "_west")) + .texture("east", prefix("block/" + forestEyeName + "_east")); simpleBlock(forestEye, forestEyeFile); remainingBlocks.remove(forestEye); @@ -151,54 +156,54 @@ public class BlockstateProvider extends BlockStateProvider { String lightLauncherName = Registry.BLOCK.getKey(lightLauncher).getPath(); ModelFile lightLauncherFile = models().withExistingParent(lightLauncherName, prefix("block/shapes/four_high_bottom_top")) - .texture("bottom", prefix("block/" + lightLauncherName + "_end")) - .texture("top", prefix("block/" + lightLauncherName + "_end")) - .texture("side", prefix("block/" + lightLauncherName + "_side")); + .texture("bottom", prefix("block/" + lightLauncherName + "_end")) + .texture("top", prefix("block/" + lightLauncherName + "_end")) + .texture("side", prefix("block/" + lightLauncherName + "_side")); simpleBlock(lightLauncher, lightLauncherFile); remainingBlocks.remove(lightLauncher); String openCrateName = Registry.BLOCK.getKey(openCrate).getPath(); ModelFile openCrateFile = models().withExistingParent(openCrateName, prefix("block/shapes/crate")) - .texture("side", prefix("block/" + openCrateName)) - .texture("bottom", prefix("block/" + openCrateName + "_bottom")); + .texture("side", prefix("block/" + openCrateName)) + .texture("bottom", prefix("block/" + openCrateName + "_bottom")); simpleBlock(openCrate, openCrateFile); remainingBlocks.remove(openCrate); String sparkChangerName = Registry.BLOCK.getKey(sparkChanger).getPath(); ModelFile sparkChangerFile = models().withExistingParent(sparkChangerName, prefix("block/shapes/three_high_bottom_top")) - .texture("bottom", prefix("block/" + sparkChangerName + "_bottom")) - .texture("top", prefix("block/" + sparkChangerName + "_top")) - .texture("side", prefix("block/" + sparkChangerName + "_side")); + .texture("bottom", prefix("block/" + sparkChangerName + "_bottom")) + .texture("top", prefix("block/" + sparkChangerName + "_top")) + .texture("side", prefix("block/" + sparkChangerName + "_side")); simpleBlock(sparkChanger, sparkChangerFile); remainingBlocks.remove(sparkChanger); String starfieldName = Registry.BLOCK.getKey(starfield).getPath(); ModelFile starfieldFile = models().withExistingParent(starfieldName, prefix("block/shapes/four_high_bottom_top")) - .texture("bottom", prefix("block/" + starfieldName + "_bottom")) - .texture("top", prefix("block/" + starfieldName + "_top")) - .texture("side", prefix("block/" + starfieldName + "_side")); + .texture("bottom", prefix("block/" + starfieldName + "_bottom")) + .texture("top", prefix("block/" + starfieldName + "_top")) + .texture("side", prefix("block/" + starfieldName + "_side")); simpleBlock(starfield, starfieldFile); remainingBlocks.remove(starfield); String terraPlateName = Registry.BLOCK.getKey(terraPlate).getPath(); ModelFile terraPlateFile = models().withExistingParent(terraPlateName, prefix("block/shapes/three_high_bottom_top")) - .texture("bottom", prefix("block/" + terraPlateName + "_bottom")) - .texture("top", prefix("block/" + terraPlateName + "_top")) - .texture("side", prefix("block/" + terraPlateName + "_side")); + .texture("bottom", prefix("block/" + terraPlateName + "_bottom")) + .texture("top", prefix("block/" + terraPlateName + "_top")) + .texture("side", prefix("block/" + terraPlateName + "_side")); simpleBlock(terraPlate, terraPlateFile); remainingBlocks.remove(terraPlate); String tinyPlanetName = Registry.BLOCK.getKey(tinyPlanet).getPath(); ModelFile tinyPlanetFile = models().withExistingParent(tinyPlanetName, prefix("block/shapes/tenbyten_all")) - .texture("all", prefix("block/" + tinyPlanetName)); + .texture("all", prefix("block/" + tinyPlanetName)); simpleBlock(tinyPlanet, tinyPlanetFile); remainingBlocks.remove(tinyPlanet); String turnTableName = Registry.BLOCK.getKey(turntable).getPath(); simpleBlock(turntable, models().cubeBottomTop(turnTableName, - prefix("block/" + turnTableName + "_side"), - prefix("block/" + turnTableName + "_bottom"), - prefix("block/" + turnTableName + "_top") + prefix("block/" + turnTableName + "_side"), + prefix("block/" + turnTableName + "_bottom"), + prefix("block/" + turnTableName + "_top") )); remainingBlocks.remove(turntable); @@ -258,8 +263,8 @@ public class BlockstateProvider extends BlockStateProvider { takeAll(remainingBlocks, gatheringDrum, canopyDrum, wildDrum).forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); ModelFile model = models().withExistingParent(name, prefix("block/shapes/drum")) - .texture("top", prefix("block/drum_top")) - .texture("side", prefix("block/" + name)); + .texture("top", prefix("block/drum_top")) + .texture("side", prefix("block/" + name)); simpleBlock(b, model); }); @@ -274,22 +279,22 @@ public class BlockstateProvider extends BlockStateProvider { material = "livingwood"; } ModelFile model = models().withExistingParent(name, prefix("block/shapes/spreader")) - .texture("side", prefix("block/" + name + "_side")) - .texture("material", prefix("block/" + material)); + .texture("side", prefix("block/" + name + "_side")) + .texture("material", prefix("block/" + material)); models().withExistingParent(name + "_inside", prefix("block/shapes/spreader_inside")) - .texture("inside", prefix("block/" + name + "_inside")); + .texture("inside", prefix("block/" + name + "_inside")); simpleBlock(b, model); }); takeAll(remainingBlocks, manaPool, dilutedPool, fabulousPool, creativePool).forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); ResourceLocation tex = b == manaPool || b == fabulousPool - ? prefix("block/livingrock") - : prefix("block/" + name); + ? prefix("block/livingrock") + : prefix("block/" + name); ModelFile pool = models().withExistingParent(name, prefix("block/shapes/pool")) - .texture("all", tex); + .texture("all", tex); models().withExistingParent(name + "_full", prefix("block/shapes/pool_full")) - .texture("all", tex).texture("liquid", prefix("block/mana_water")); + .texture("all", tex).texture("liquid", prefix("block/mana_water")); simpleBlock(b, pool); }); @@ -363,25 +368,25 @@ public class BlockstateProvider extends BlockStateProvider { ResourceLocation quartzId = prefix(variant + "_quartz"); Block quartz = Registry.BLOCK.getValue(quartzId).get(); simpleBlock(quartz, models().cubeBottomTop(quartzId.getPath(), - prefix("block/" + quartzId.getPath() + "_side"), - prefix("block/" + quartzId.getPath() + "_bottom"), - prefix("block/" + quartzId.getPath() + "_top"))); + prefix("block/" + quartzId.getPath() + "_side"), + prefix("block/" + quartzId.getPath() + "_bottom"), + prefix("block/" + quartzId.getPath() + "_top"))); ResourceLocation pillarId = prefix(variant + "_quartz_pillar"); Block pillar = Registry.BLOCK.getValue(pillarId).get(); ModelFile pillarModel = models().cubeColumn(pillarId.getPath(), - prefix("block/" + pillarId.getPath() + "_side"), - prefix("block/" + pillarId.getPath() + "_end")); + prefix("block/" + pillarId.getPath() + "_side"), + prefix("block/" + pillarId.getPath() + "_end")); getVariantBuilder(pillar) - .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).setModels(new ConfiguredModel(pillarModel, 90, 90, false)) - .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Y).setModels(new ConfiguredModel(pillarModel)) - .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Z).setModels(new ConfiguredModel(pillarModel, 90, 0, false)); + .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).setModels(new ConfiguredModel(pillarModel, 90, 90, false)) + .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Y).setModels(new ConfiguredModel(pillarModel)) + .partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Z).setModels(new ConfiguredModel(pillarModel, 90, 0, false)); ResourceLocation chiseledId = prefix("chiseled_" + variant + "_quartz"); Block chiseled = Registry.BLOCK.getValue(chiseledId).get(); simpleBlock(chiseled, models().cubeColumn(chiseledId.getPath(), - prefix("block/" + chiseledId.getPath() + "_side"), - prefix("block/" + chiseledId.getPath() + "_end"))); + prefix("block/" + chiseledId.getPath() + "_side"), + prefix("block/" + chiseledId.getPath() + "_end"))); remainingBlocks.remove(quartz); remainingBlocks.remove(pillar); @@ -424,7 +429,12 @@ public class BlockstateProvider extends BlockStateProvider { } }); - takeAll(remainingBlocks, b -> b instanceof SlabBlock).forEach(b -> { + // Double slab generation refers to the cube all model, so let them be generated first + Iterable slabs = takeAll(remainingBlocks, b -> b instanceof SlabBlock); + + remainingBlocks.forEach(this::simpleBlock); + + slabs.forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); String baseName = name.substring(0, name.length() - LibBlockNames.SLAB_SUFFIX.length()); boolean quartz = name.contains("quartz"); @@ -437,11 +447,6 @@ public class BlockstateProvider extends BlockStateProvider { slabBlock((SlabBlock) b, prefix(baseName), prefix("block/" + baseName)); } }); - - remainingBlocks.forEach(b -> { - String name = Registry.BLOCK.getKey(b).getPath(); - simpleBlock(b, models().getExistingFile(prefix("block/" + name))); - }); } private void particleOnly(Set blocks, Block b, ResourceLocation particle) { diff --git a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json deleted file mode 100644 index f0cbfe350..000000000 --- a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:block/catalyst_alchemy" - } -} diff --git a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json deleted file mode 100644 index 3c12305df..000000000 --- a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "botania:block/catalyst_conjuration" - } -}