From c65062dd53ac7fa50dee36787e75d91d5f67424f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 24 Feb 2020 14:53:36 -0600 Subject: [PATCH] Delete unneeded cross_tinted now that special flower coloring is gone --- .../botania/models/block/agricarnation.json | 2 +- .../models/block/agricarnation_chibi.json | 2 +- .../botania/models/block/bellethorn.json | 2 +- .../models/block/bellethorn_chibi.json | 2 +- .../botania/models/block/bergamute.json | 2 +- .../assets/botania/models/block/bubbell.json | 2 +- .../botania/models/block/bubbell_chibi.json | 2 +- .../botania/models/block/clayconia.json | 2 +- .../botania/models/block/clayconia_chibi.json | 2 +- .../botania/models/block/daffomill.json | 2 +- .../botania/models/block/dandelifeon.json | 2 +- .../botania/models/block/dreadthorn.json | 2 +- .../botania/models/block/endoflame.json | 2 +- .../botania/models/block/entropinnyum.json | 2 +- .../assets/botania/models/block/exoflame.json | 2 +- .../botania/models/block/fallen_kanade.json | 2 +- .../botania/models/block/gourmaryllis.json | 2 +- .../botania/models/block/heisei_dream.json | 2 +- .../botania/models/block/hopperhock.json | 2 +- .../models/block/hopperhock_chibi.json | 2 +- .../assets/botania/models/block/hyacidus.json | 2 +- .../botania/models/block/hydroangeas.json | 2 +- .../models/block/jaded_amaranthus.json | 2 +- .../assets/botania/models/block/jiyuulia.json | 2 +- .../botania/models/block/kekimurus.json | 2 +- .../assets/botania/models/block/loonium.json | 2 +- .../assets/botania/models/block/manastar.json | 2 +- .../botania/models/block/marimorphosis.json | 2 +- .../models/block/marimorphosis_chibi.json | 2 +- .../assets/botania/models/block/medumone.json | 2 +- .../assets/botania/models/block/munchdew.json | 2 +- .../botania/models/block/narslimmus.json | 2 +- .../assets/botania/models/block/orechid.json | 2 +- .../botania/models/block/orechid_ignem.json | 2 +- .../botania/models/block/pollidisiac.json | 2 +- .../botania/models/block/pure_daisy.json | 2 +- .../botania/models/block/rafflowsia.json | 2 +- .../botania/models/block/rannuncarpus.json | 2 +- .../models/block/rannuncarpus_chibi.json | 2 +- .../botania/models/block/rosa_arcana.json | 2 +- .../models/block/shapes/cross_tinted.json | 28 ------------------- .../botania/models/block/shulk_me_not.json | 2 +- .../botania/models/block/solegnolia.json | 2 +- .../models/block/solegnolia_chibi.json | 2 +- .../botania/models/block/spectranthemum.json | 2 +- .../botania/models/block/spectrolus.json | 2 +- .../botania/models/block/tangleberrie.json | 2 +- .../botania/models/block/thermalily.json | 2 +- .../botania/models/block/tigerseye.json | 2 +- .../botania/models/block/vinculotus.json | 2 +- 50 files changed, 49 insertions(+), 77 deletions(-) delete mode 100644 src/main/resources/assets/botania/models/block/shapes/cross_tinted.json diff --git a/src/main/resources/assets/botania/models/block/agricarnation.json b/src/main/resources/assets/botania/models/block/agricarnation.json index deb9f375a..be5a9fc51 100644 --- a/src/main/resources/assets/botania/models/block/agricarnation.json +++ b/src/main/resources/assets/botania/models/block/agricarnation.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_agricarnation" } diff --git a/src/main/resources/assets/botania/models/block/agricarnation_chibi.json b/src/main/resources/assets/botania/models/block/agricarnation_chibi.json index bd31b6936..828008826 100644 --- a/src/main/resources/assets/botania/models/block/agricarnation_chibi.json +++ b/src/main/resources/assets/botania/models/block/agricarnation_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_agricarnation_chibi" } diff --git a/src/main/resources/assets/botania/models/block/bellethorn.json b/src/main/resources/assets/botania/models/block/bellethorn.json index 2c555a23b..92741cc8f 100644 --- a/src/main/resources/assets/botania/models/block/bellethorn.json +++ b/src/main/resources/assets/botania/models/block/bellethorn.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_bellethorne" } diff --git a/src/main/resources/assets/botania/models/block/bellethorn_chibi.json b/src/main/resources/assets/botania/models/block/bellethorn_chibi.json index 78084d3b7..238b13c6f 100644 --- a/src/main/resources/assets/botania/models/block/bellethorn_chibi.json +++ b/src/main/resources/assets/botania/models/block/bellethorn_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_bellethorne_chibi" } diff --git a/src/main/resources/assets/botania/models/block/bergamute.json b/src/main/resources/assets/botania/models/block/bergamute.json index 1a56599dd..3f7f6f436 100644 --- a/src/main/resources/assets/botania/models/block/bergamute.json +++ b/src/main/resources/assets/botania/models/block/bergamute.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_bergamute" } diff --git a/src/main/resources/assets/botania/models/block/bubbell.json b/src/main/resources/assets/botania/models/block/bubbell.json index 5a9536b9b..15812f477 100644 --- a/src/main/resources/assets/botania/models/block/bubbell.json +++ b/src/main/resources/assets/botania/models/block/bubbell.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_bubbell" } diff --git a/src/main/resources/assets/botania/models/block/bubbell_chibi.json b/src/main/resources/assets/botania/models/block/bubbell_chibi.json index 8dcc2af9a..0a2a6db24 100644 --- a/src/main/resources/assets/botania/models/block/bubbell_chibi.json +++ b/src/main/resources/assets/botania/models/block/bubbell_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_bubbell_chibi" } diff --git a/src/main/resources/assets/botania/models/block/clayconia.json b/src/main/resources/assets/botania/models/block/clayconia.json index a53f14e2d..17ef72a68 100644 --- a/src/main/resources/assets/botania/models/block/clayconia.json +++ b/src/main/resources/assets/botania/models/block/clayconia.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_clayconia" } diff --git a/src/main/resources/assets/botania/models/block/clayconia_chibi.json b/src/main/resources/assets/botania/models/block/clayconia_chibi.json index c88b7ebd7..ddbd5eb87 100644 --- a/src/main/resources/assets/botania/models/block/clayconia_chibi.json +++ b/src/main/resources/assets/botania/models/block/clayconia_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_clayconia_chibi" } diff --git a/src/main/resources/assets/botania/models/block/daffomill.json b/src/main/resources/assets/botania/models/block/daffomill.json index cd2607175..9660c2d2e 100644 --- a/src/main/resources/assets/botania/models/block/daffomill.json +++ b/src/main/resources/assets/botania/models/block/daffomill.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_daffomill" } diff --git a/src/main/resources/assets/botania/models/block/dandelifeon.json b/src/main/resources/assets/botania/models/block/dandelifeon.json index 1d4c3de99..c0989d96b 100644 --- a/src/main/resources/assets/botania/models/block/dandelifeon.json +++ b/src/main/resources/assets/botania/models/block/dandelifeon.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_dandelifeon" } diff --git a/src/main/resources/assets/botania/models/block/dreadthorn.json b/src/main/resources/assets/botania/models/block/dreadthorn.json index 4aa8d075a..72741a345 100644 --- a/src/main/resources/assets/botania/models/block/dreadthorn.json +++ b/src/main/resources/assets/botania/models/block/dreadthorn.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_dreadthorne" } diff --git a/src/main/resources/assets/botania/models/block/endoflame.json b/src/main/resources/assets/botania/models/block/endoflame.json index e0ba09462..0e9b81ec4 100644 --- a/src/main/resources/assets/botania/models/block/endoflame.json +++ b/src/main/resources/assets/botania/models/block/endoflame.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_endoflame" } diff --git a/src/main/resources/assets/botania/models/block/entropinnyum.json b/src/main/resources/assets/botania/models/block/entropinnyum.json index 944c0be2b..e36810a24 100644 --- a/src/main/resources/assets/botania/models/block/entropinnyum.json +++ b/src/main/resources/assets/botania/models/block/entropinnyum.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_entropinnyum" } diff --git a/src/main/resources/assets/botania/models/block/exoflame.json b/src/main/resources/assets/botania/models/block/exoflame.json index 18377c71b..2eea83b92 100644 --- a/src/main/resources/assets/botania/models/block/exoflame.json +++ b/src/main/resources/assets/botania/models/block/exoflame.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_exoflame" } diff --git a/src/main/resources/assets/botania/models/block/fallen_kanade.json b/src/main/resources/assets/botania/models/block/fallen_kanade.json index 52dde2119..99663622a 100644 --- a/src/main/resources/assets/botania/models/block/fallen_kanade.json +++ b/src/main/resources/assets/botania/models/block/fallen_kanade.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_fallen_kanade" } diff --git a/src/main/resources/assets/botania/models/block/gourmaryllis.json b/src/main/resources/assets/botania/models/block/gourmaryllis.json index 049c76151..cada19179 100644 --- a/src/main/resources/assets/botania/models/block/gourmaryllis.json +++ b/src/main/resources/assets/botania/models/block/gourmaryllis.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_gourmaryllis" } diff --git a/src/main/resources/assets/botania/models/block/heisei_dream.json b/src/main/resources/assets/botania/models/block/heisei_dream.json index 81f925f0d..07c411001 100644 --- a/src/main/resources/assets/botania/models/block/heisei_dream.json +++ b/src/main/resources/assets/botania/models/block/heisei_dream.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_heisei_dream" } diff --git a/src/main/resources/assets/botania/models/block/hopperhock.json b/src/main/resources/assets/botania/models/block/hopperhock.json index 4b26ee161..47209dfc0 100644 --- a/src/main/resources/assets/botania/models/block/hopperhock.json +++ b/src/main/resources/assets/botania/models/block/hopperhock.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_hopperhock" } diff --git a/src/main/resources/assets/botania/models/block/hopperhock_chibi.json b/src/main/resources/assets/botania/models/block/hopperhock_chibi.json index e4431a2e9..54d61e76e 100644 --- a/src/main/resources/assets/botania/models/block/hopperhock_chibi.json +++ b/src/main/resources/assets/botania/models/block/hopperhock_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_hopperhock_chibi" } diff --git a/src/main/resources/assets/botania/models/block/hyacidus.json b/src/main/resources/assets/botania/models/block/hyacidus.json index 3fef5f84c..4073adb71 100644 --- a/src/main/resources/assets/botania/models/block/hyacidus.json +++ b/src/main/resources/assets/botania/models/block/hyacidus.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_hyacidus" } diff --git a/src/main/resources/assets/botania/models/block/hydroangeas.json b/src/main/resources/assets/botania/models/block/hydroangeas.json index 330e41454..3d6d8b38e 100644 --- a/src/main/resources/assets/botania/models/block/hydroangeas.json +++ b/src/main/resources/assets/botania/models/block/hydroangeas.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_hydroangeas" } diff --git a/src/main/resources/assets/botania/models/block/jaded_amaranthus.json b/src/main/resources/assets/botania/models/block/jaded_amaranthus.json index cf78e1e1a..f6b61c5c3 100644 --- a/src/main/resources/assets/botania/models/block/jaded_amaranthus.json +++ b/src/main/resources/assets/botania/models/block/jaded_amaranthus.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_jaded_amaranthus" } diff --git a/src/main/resources/assets/botania/models/block/jiyuulia.json b/src/main/resources/assets/botania/models/block/jiyuulia.json index 304a176d6..c17f54ad4 100644 --- a/src/main/resources/assets/botania/models/block/jiyuulia.json +++ b/src/main/resources/assets/botania/models/block/jiyuulia.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_jiyuulia" } diff --git a/src/main/resources/assets/botania/models/block/kekimurus.json b/src/main/resources/assets/botania/models/block/kekimurus.json index 060d7dce3..a91c4f14c 100644 --- a/src/main/resources/assets/botania/models/block/kekimurus.json +++ b/src/main/resources/assets/botania/models/block/kekimurus.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_kekimurus" } diff --git a/src/main/resources/assets/botania/models/block/loonium.json b/src/main/resources/assets/botania/models/block/loonium.json index d59f3131b..7774baee0 100644 --- a/src/main/resources/assets/botania/models/block/loonium.json +++ b/src/main/resources/assets/botania/models/block/loonium.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_loonium" } diff --git a/src/main/resources/assets/botania/models/block/manastar.json b/src/main/resources/assets/botania/models/block/manastar.json index f73003ff1..a02faeeac 100644 --- a/src/main/resources/assets/botania/models/block/manastar.json +++ b/src/main/resources/assets/botania/models/block/manastar.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_misc_manastar" } diff --git a/src/main/resources/assets/botania/models/block/marimorphosis.json b/src/main/resources/assets/botania/models/block/marimorphosis.json index ae4f0f804..ca81098aa 100644 --- a/src/main/resources/assets/botania/models/block/marimorphosis.json +++ b/src/main/resources/assets/botania/models/block/marimorphosis.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_marimorphosis" } diff --git a/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json b/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json index 59550ca2a..5d9cf655b 100644 --- a/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json +++ b/src/main/resources/assets/botania/models/block/marimorphosis_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_marimorphosis_chibi" } diff --git a/src/main/resources/assets/botania/models/block/medumone.json b/src/main/resources/assets/botania/models/block/medumone.json index 88f936f28..b7afa51a3 100644 --- a/src/main/resources/assets/botania/models/block/medumone.json +++ b/src/main/resources/assets/botania/models/block/medumone.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_medumone" } diff --git a/src/main/resources/assets/botania/models/block/munchdew.json b/src/main/resources/assets/botania/models/block/munchdew.json index 621a3ec30..efd87ddca 100644 --- a/src/main/resources/assets/botania/models/block/munchdew.json +++ b/src/main/resources/assets/botania/models/block/munchdew.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_munchdew" } diff --git a/src/main/resources/assets/botania/models/block/narslimmus.json b/src/main/resources/assets/botania/models/block/narslimmus.json index 465ea7c71..7f67d6eb7 100644 --- a/src/main/resources/assets/botania/models/block/narslimmus.json +++ b/src/main/resources/assets/botania/models/block/narslimmus.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_narslimmus" } diff --git a/src/main/resources/assets/botania/models/block/orechid.json b/src/main/resources/assets/botania/models/block/orechid.json index 13e5a729f..2eb8a6408 100644 --- a/src/main/resources/assets/botania/models/block/orechid.json +++ b/src/main/resources/assets/botania/models/block/orechid.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_orechid" } diff --git a/src/main/resources/assets/botania/models/block/orechid_ignem.json b/src/main/resources/assets/botania/models/block/orechid_ignem.json index 8aaccdde8..ca6550202 100644 --- a/src/main/resources/assets/botania/models/block/orechid_ignem.json +++ b/src/main/resources/assets/botania/models/block/orechid_ignem.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_orechid_ignem" } diff --git a/src/main/resources/assets/botania/models/block/pollidisiac.json b/src/main/resources/assets/botania/models/block/pollidisiac.json index e9beff4c4..6e4032449 100644 --- a/src/main/resources/assets/botania/models/block/pollidisiac.json +++ b/src/main/resources/assets/botania/models/block/pollidisiac.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_pollidisiac" } diff --git a/src/main/resources/assets/botania/models/block/pure_daisy.json b/src/main/resources/assets/botania/models/block/pure_daisy.json index a5bf965f6..80722fe51 100644 --- a/src/main/resources/assets/botania/models/block/pure_daisy.json +++ b/src/main/resources/assets/botania/models/block/pure_daisy.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_misc_pure_daisy" } diff --git a/src/main/resources/assets/botania/models/block/rafflowsia.json b/src/main/resources/assets/botania/models/block/rafflowsia.json index ed76ffa19..59bfa986e 100644 --- a/src/main/resources/assets/botania/models/block/rafflowsia.json +++ b/src/main/resources/assets/botania/models/block/rafflowsia.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_rafflowsia" } diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus.json b/src/main/resources/assets/botania/models/block/rannuncarpus.json index c5e46f34e..00e6a4604 100644 --- a/src/main/resources/assets/botania/models/block/rannuncarpus.json +++ b/src/main/resources/assets/botania/models/block/rannuncarpus.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_rannuncarpus" } diff --git a/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json b/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json index bc641b879..2571135e5 100644 --- a/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json +++ b/src/main/resources/assets/botania/models/block/rannuncarpus_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_rannuncarpus_chibi" } diff --git a/src/main/resources/assets/botania/models/block/rosa_arcana.json b/src/main/resources/assets/botania/models/block/rosa_arcana.json index 0220144ef..711537100 100644 --- a/src/main/resources/assets/botania/models/block/rosa_arcana.json +++ b/src/main/resources/assets/botania/models/block/rosa_arcana.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_arcane_rose" } diff --git a/src/main/resources/assets/botania/models/block/shapes/cross_tinted.json b/src/main/resources/assets/botania/models/block/shapes/cross_tinted.json deleted file mode 100644 index f5aad893c..000000000 --- a/src/main/resources/assets/botania/models/block/shapes/cross_tinted.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#cross" - }, - "elements": [ - { - "from": [ 0.8, 0, 8 ], - "to": [ 15.2, 16, 8 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 } - } - }, - { - "from": [ 8, 0, 0.8 ], - "to": [ 8, 16, 15.2 ], - "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, - "shade": false, - "faces": { - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 } - } - } - ] -} diff --git a/src/main/resources/assets/botania/models/block/shulk_me_not.json b/src/main/resources/assets/botania/models/block/shulk_me_not.json index f2935031b..9dbb12aee 100644 --- a/src/main/resources/assets/botania/models/block/shulk_me_not.json +++ b/src/main/resources/assets/botania/models/block/shulk_me_not.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_shulk_me_not" } diff --git a/src/main/resources/assets/botania/models/block/solegnolia.json b/src/main/resources/assets/botania/models/block/solegnolia.json index b4f107f21..5ec70fc7b 100644 --- a/src/main/resources/assets/botania/models/block/solegnolia.json +++ b/src/main/resources/assets/botania/models/block/solegnolia.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_solegnolia" } diff --git a/src/main/resources/assets/botania/models/block/solegnolia_chibi.json b/src/main/resources/assets/botania/models/block/solegnolia_chibi.json index 0368ca6c8..ab6a270dd 100644 --- a/src/main/resources/assets/botania/models/block/solegnolia_chibi.json +++ b/src/main/resources/assets/botania/models/block/solegnolia_chibi.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_solegnolia_chibi" } diff --git a/src/main/resources/assets/botania/models/block/spectranthemum.json b/src/main/resources/assets/botania/models/block/spectranthemum.json index 16eea08a0..b88eeb0e0 100644 --- a/src/main/resources/assets/botania/models/block/spectranthemum.json +++ b/src/main/resources/assets/botania/models/block/spectranthemum.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_spectranthemum" } diff --git a/src/main/resources/assets/botania/models/block/spectrolus.json b/src/main/resources/assets/botania/models/block/spectrolus.json index cdbbb3694..a712ebd4a 100644 --- a/src/main/resources/assets/botania/models/block/spectrolus.json +++ b/src/main/resources/assets/botania/models/block/spectrolus.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_spectrolus" } diff --git a/src/main/resources/assets/botania/models/block/tangleberrie.json b/src/main/resources/assets/botania/models/block/tangleberrie.json index 72b22868e..a30c22063 100644 --- a/src/main/resources/assets/botania/models/block/tangleberrie.json +++ b/src/main/resources/assets/botania/models/block/tangleberrie.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_tangleberrie" } diff --git a/src/main/resources/assets/botania/models/block/thermalily.json b/src/main/resources/assets/botania/models/block/thermalily.json index 3c94c82ee..5d0547206 100644 --- a/src/main/resources/assets/botania/models/block/thermalily.json +++ b/src/main/resources/assets/botania/models/block/thermalily.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_gen_thermalily" } diff --git a/src/main/resources/assets/botania/models/block/tigerseye.json b/src/main/resources/assets/botania/models/block/tigerseye.json index 7c41a4f34..519319917 100644 --- a/src/main/resources/assets/botania/models/block/tigerseye.json +++ b/src/main/resources/assets/botania/models/block/tigerseye.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_tigerseye" } diff --git a/src/main/resources/assets/botania/models/block/vinculotus.json b/src/main/resources/assets/botania/models/block/vinculotus.json index 3d410ebfb..94f34872c 100644 --- a/src/main/resources/assets/botania/models/block/vinculotus.json +++ b/src/main/resources/assets/botania/models/block/vinculotus.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/cross_tinted", + "parent": "minecraft:block/cross", "textures": { "cross": "botania:blocks/flower_func_vinculotus" }