From bb886f49e40ff477f53e2b4427e8008b93043d9f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Oct 2019 01:37:58 -0500 Subject: [PATCH] Floaters all rendering properly statically --- .../botania/api/subtile/ISpecialFlower.java | 1 + .../subtile/TileEntityFunctionalFlower.java | 2 ++ .../subtile/TileEntityGeneratingFlower.java | 2 ++ .../api/subtile/TileEntitySpecialFlower.java | 21 ++++++++++--------- .../block/BlockFloatingSpecialFlower.java | 3 ++- .../common/block/tile/TileFloatingFlower.java | 15 ++++--------- .../blockstates/black_floating_flower.json | 12 +++++++++++ .../blockstates/blue_floating_flower.json | 12 +++++++++++ .../blockstates/brown_floating_flower.json | 12 +++++++++++ .../blockstates/cyan_floating_flower.json | 12 +++++++++++ .../blockstates/floating_agricarnation.json | 12 +++++++++++ .../floating_agricarnation_chibi.json | 12 +++++++++++ .../blockstates/floating_bellethorn.json | 12 +++++++++++ .../floating_bellethorn_chibi.json | 12 +++++++++++ .../blockstates/floating_bergamute.json | 12 +++++++++++ .../botania/blockstates/floating_bubbell.json | 12 +++++++++++ .../blockstates/floating_bubbell_chibi.json | 12 +++++++++++ .../blockstates/floating_clayconia.json | 12 +++++++++++ .../blockstates/floating_clayconia_chibi.json | 12 +++++++++++ .../blockstates/floating_daffomill.json | 12 +++++++++++ .../blockstates/floating_dandelifeon.json | 12 +++++++++++ .../blockstates/floating_dreadthorn.json | 12 +++++++++++ .../blockstates/floating_endoflame.json | 12 +++++++++++ .../blockstates/floating_entropinnyum.json | 12 +++++++++++ .../blockstates/floating_exoflame.json | 12 +++++++++++ .../blockstates/floating_fallen_kanade.json | 12 +++++++++++ .../blockstates/floating_gourmaryllis.json | 12 +++++++++++ .../blockstates/floating_heisei_dream.json | 12 +++++++++++ .../blockstates/floating_hopperhock.json | 12 +++++++++++ .../floating_hopperhock_chibi.json | 12 +++++++++++ .../blockstates/floating_hyacidus.json | 12 +++++++++++ .../blockstates/floating_hydroangeas.json | 12 +++++++++++ .../floating_jaded_amaranthus.json | 12 +++++++++++ .../blockstates/floating_jiyuulia.json | 12 +++++++++++ .../blockstates/floating_kekimurus.json | 12 +++++++++++ .../botania/blockstates/floating_loonium.json | 12 +++++++++++ .../blockstates/floating_manastar.json | 12 +++++++++++ .../blockstates/floating_marimorphosis.json | 12 +++++++++++ .../floating_marimorphosis_chibi.json | 12 +++++++++++ .../blockstates/floating_medumone.json | 12 +++++++++++ .../blockstates/floating_munchdew.json | 12 +++++++++++ .../blockstates/floating_narslimmus.json | 12 +++++++++++ .../botania/blockstates/floating_orechid.json | 12 +++++++++++ .../blockstates/floating_orechid_ignem.json | 12 +++++++++++ .../blockstates/floating_pollidisiac.json | 12 +++++++++++ .../blockstates/floating_pure_daisy.json | 12 +++++++++++ .../blockstates/floating_rafflowsia.json | 12 +++++++++++ .../blockstates/floating_rannuncarpus.json | 12 +++++++++++ .../floating_rannuncarpus_chibi.json | 12 +++++++++++ .../blockstates/floating_rosa_arcana.json | 12 +++++++++++ .../blockstates/floating_shulk_me_not.json | 12 +++++++++++ .../blockstates/floating_solegnolia.json | 12 +++++++++++ .../floating_solegnolia_chibi.json | 12 +++++++++++ .../blockstates/floating_spectranthemum.json | 12 +++++++++++ .../blockstates/floating_spectrolus.json | 12 +++++++++++ .../blockstates/floating_tangleberrie.json | 12 +++++++++++ .../blockstates/floating_thermalily.json | 12 +++++++++++ .../blockstates/floating_tigerseye.json | 12 +++++++++++ .../blockstates/floating_vinculotus.json | 12 +++++++++++ .../blockstates/gray_floating_flower.json | 12 +++++++++++ .../blockstates/green_floating_flower.json | 12 +++++++++++ .../light_blue_floating_flower.json | 12 +++++++++++ .../light_gray_floating_flower.json | 12 +++++++++++ .../blockstates/lime_floating_flower.json | 12 +++++++++++ .../blockstates/magenta_floating_flower.json | 12 +++++++++++ .../blockstates/orange_floating_flower.json | 12 +++++++++++ .../blockstates/pink_floating_flower.json | 12 +++++++++++ .../blockstates/purple_floating_flower.json | 12 +++++++++++ .../blockstates/red_floating_flower.json | 12 +++++++++++ .../blockstates/white_floating_flower.json | 2 +- .../blockstates/yellow_floating_flower.json | 12 +++++++++++ .../models/item/black_floating_flower.json | 4 ++++ .../models/item/blue_floating_flower.json | 4 ++++ .../models/item/brown_floating_flower.json | 4 ++++ .../models/item/cyan_floating_flower.json | 4 ++++ .../models/item/floating_agricarnation.json | 4 ++++ .../item/floating_agricarnation_chibi.json | 4 ++++ .../models/item/floating_bellethorn.json | 4 ++++ .../item/floating_bellethorn_chibi.json | 4 ++++ .../models/item/floating_bergamute.json | 4 ++++ .../botania/models/item/floating_bubbell.json | 4 ++++ .../models/item/floating_bubbell_chibi.json | 4 ++++ .../models/item/floating_clayconia.json | 4 ++++ .../models/item/floating_clayconia_chibi.json | 4 ++++ .../models/item/floating_daffomill.json | 4 ++++ .../models/item/floating_dandelifeon.json | 4 ++++ .../models/item/floating_dreadthorn.json | 4 ++++ .../models/item/floating_endoflame.json | 4 ++++ .../models/item/floating_entropinnyum.json | 4 ++++ .../models/item/floating_exoflame.json | 4 ++++ .../models/item/floating_fallen_kanade.json | 4 ++++ .../models/item/floating_gourmaryllis.json | 4 ++++ .../models/item/floating_heisei_dream.json | 4 ++++ .../models/item/floating_hopperhock.json | 4 ++++ .../item/floating_hopperhock_chibi.json | 4 ++++ .../models/item/floating_hyacidus.json | 4 ++++ .../models/item/floating_hydroangeas.json | 4 ++++ .../item/floating_jaded_amaranthus.json | 4 ++++ .../models/item/floating_jiyuulia.json | 4 ++++ .../models/item/floating_kekimurus.json | 4 ++++ .../botania/models/item/floating_loonium.json | 4 ++++ .../models/item/floating_manastar.json | 4 ++++ .../models/item/floating_marimorphosis.json | 4 ++++ .../item/floating_marimorphosis_chibi.json | 4 ++++ .../models/item/floating_medumone.json | 4 ++++ .../models/item/floating_munchdew.json | 4 ++++ .../models/item/floating_narslimmus.json | 4 ++++ .../botania/models/item/floating_orechid.json | 4 ++++ .../models/item/floating_orechid_ignem.json | 4 ++++ .../models/item/floating_pollidisiac.json | 4 ++++ .../models/item/floating_pure_daisy.json | 4 ++++ .../models/item/floating_rafflowsia.json | 4 ++++ .../models/item/floating_rannuncarpus.json | 4 ++++ .../item/floating_rannuncarpus_chibi.json | 4 ++++ .../models/item/floating_rosa_arcana.json | 4 ++++ .../models/item/floating_shulk_me_not.json | 4 ++++ .../models/item/floating_solegnolia.json | 4 ++++ .../item/floating_solegnolia_chibi.json | 4 ++++ .../models/item/floating_spectranthemum.json | 4 ++++ .../models/item/floating_spectrolus.json | 4 ++++ .../models/item/floating_tangleberrie.json | 4 ++++ .../models/item/floating_thermalily.json | 4 ++++ .../models/item/floating_tigerseye.json | 4 ++++ .../models/item/floating_vinculotus.json | 4 ++++ .../models/item/gray_floating_flower.json | 4 ++++ .../models/item/green_floating_flower.json | 4 ++++ .../item/light_blue_floating_flower.json | 4 ++++ .../item/light_gray_floating_flower.json | 4 ++++ .../models/item/lime_floating_flower.json | 4 ++++ .../models/item/magenta_floating_flower.json | 4 ++++ .../models/item/orange_floating_flower.json | 4 ++++ .../models/item/pink_floating_flower.json | 4 ++++ .../models/item/purple_floating_flower.json | 4 ++++ .../models/item/red_floating_flower.json | 4 ++++ .../models/item/white_floating_flower.json | 4 ++++ .../models/item/yellow_floating_flower.json | 4 ++++ 136 files changed, 1051 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/black_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/blue_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/brown_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/cyan_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_agricarnation.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_bellethorn.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_bergamute.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_bubbell.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_clayconia.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_daffomill.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_dandelifeon.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_dreadthorn.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_endoflame.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_entropinnyum.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_exoflame.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_heisei_dream.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_hopperhock.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_hyacidus.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_hydroangeas.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_jiyuulia.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_kekimurus.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_loonium.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_manastar.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_marimorphosis.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_medumone.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_munchdew.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_narslimmus.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_orechid.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_pollidisiac.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_pure_daisy.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_rafflowsia.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_solegnolia.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_spectranthemum.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_spectrolus.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_tangleberrie.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_thermalily.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_tigerseye.json create mode 100644 src/main/resources/assets/botania/blockstates/floating_vinculotus.json create mode 100644 src/main/resources/assets/botania/blockstates/gray_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/green_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/lime_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/magenta_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/orange_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/pink_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/purple_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/red_floating_flower.json create mode 100644 src/main/resources/assets/botania/blockstates/yellow_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/black_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/blue_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/brown_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/cyan_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/floating_agricarnation.json create mode 100644 src/main/resources/assets/botania/models/item/floating_agricarnation_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_bellethorn.json create mode 100644 src/main/resources/assets/botania/models/item/floating_bellethorn_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_bergamute.json create mode 100644 src/main/resources/assets/botania/models/item/floating_bubbell.json create mode 100644 src/main/resources/assets/botania/models/item/floating_bubbell_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_clayconia.json create mode 100644 src/main/resources/assets/botania/models/item/floating_clayconia_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_daffomill.json create mode 100644 src/main/resources/assets/botania/models/item/floating_dandelifeon.json create mode 100644 src/main/resources/assets/botania/models/item/floating_dreadthorn.json create mode 100644 src/main/resources/assets/botania/models/item/floating_endoflame.json create mode 100644 src/main/resources/assets/botania/models/item/floating_entropinnyum.json create mode 100644 src/main/resources/assets/botania/models/item/floating_exoflame.json create mode 100644 src/main/resources/assets/botania/models/item/floating_fallen_kanade.json create mode 100644 src/main/resources/assets/botania/models/item/floating_gourmaryllis.json create mode 100644 src/main/resources/assets/botania/models/item/floating_heisei_dream.json create mode 100644 src/main/resources/assets/botania/models/item/floating_hopperhock.json create mode 100644 src/main/resources/assets/botania/models/item/floating_hopperhock_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_hyacidus.json create mode 100644 src/main/resources/assets/botania/models/item/floating_hydroangeas.json create mode 100644 src/main/resources/assets/botania/models/item/floating_jaded_amaranthus.json create mode 100644 src/main/resources/assets/botania/models/item/floating_jiyuulia.json create mode 100644 src/main/resources/assets/botania/models/item/floating_kekimurus.json create mode 100644 src/main/resources/assets/botania/models/item/floating_loonium.json create mode 100644 src/main/resources/assets/botania/models/item/floating_manastar.json create mode 100644 src/main/resources/assets/botania/models/item/floating_marimorphosis.json create mode 100644 src/main/resources/assets/botania/models/item/floating_marimorphosis_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_medumone.json create mode 100644 src/main/resources/assets/botania/models/item/floating_munchdew.json create mode 100644 src/main/resources/assets/botania/models/item/floating_narslimmus.json create mode 100644 src/main/resources/assets/botania/models/item/floating_orechid.json create mode 100644 src/main/resources/assets/botania/models/item/floating_orechid_ignem.json create mode 100644 src/main/resources/assets/botania/models/item/floating_pollidisiac.json create mode 100644 src/main/resources/assets/botania/models/item/floating_pure_daisy.json create mode 100644 src/main/resources/assets/botania/models/item/floating_rafflowsia.json create mode 100644 src/main/resources/assets/botania/models/item/floating_rannuncarpus.json create mode 100644 src/main/resources/assets/botania/models/item/floating_rannuncarpus_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_rosa_arcana.json create mode 100644 src/main/resources/assets/botania/models/item/floating_shulk_me_not.json create mode 100644 src/main/resources/assets/botania/models/item/floating_solegnolia.json create mode 100644 src/main/resources/assets/botania/models/item/floating_solegnolia_chibi.json create mode 100644 src/main/resources/assets/botania/models/item/floating_spectranthemum.json create mode 100644 src/main/resources/assets/botania/models/item/floating_spectrolus.json create mode 100644 src/main/resources/assets/botania/models/item/floating_tangleberrie.json create mode 100644 src/main/resources/assets/botania/models/item/floating_thermalily.json create mode 100644 src/main/resources/assets/botania/models/item/floating_tigerseye.json create mode 100644 src/main/resources/assets/botania/models/item/floating_vinculotus.json create mode 100644 src/main/resources/assets/botania/models/item/gray_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/green_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/light_blue_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/light_gray_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/lime_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/magenta_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/orange_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/pink_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/purple_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/red_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/white_floating_flower.json create mode 100644 src/main/resources/assets/botania/models/item/yellow_floating_flower.json diff --git a/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java index cc3db2a8d..a709cd339 100644 --- a/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/ISpecialFlower.java @@ -15,6 +15,7 @@ package vazkii.botania.api.subtile; * BlockFlower would be checked against, but isn't convenient for * the special flowers with effects. For Azanor and Lycaon. */ +// todo 1.14 remove public interface ISpecialFlower { } diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java index bfed6eae5..a0cd047c7 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java @@ -160,6 +160,7 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { @Override public void readFromPacketNBT(CompoundNBT cmp) { + super.readFromPacketNBT(cmp); mana = cmp.getInt(TAG_MANA); int x = cmp.getInt(TAG_POOL_X); @@ -171,6 +172,7 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { @Override public void writeToPacketNBT(CompoundNBT cmp) { + super.writeToPacketNBT(cmp); cmp.putInt(TAG_MANA, mana); if(cachedPoolCoordinates != null) { diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index 1c7a51629..6ddd3bf52 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -252,6 +252,7 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { @Override public void readFromPacketNBT(CompoundNBT cmp) { + super.readFromPacketNBT(cmp); mana = cmp.getInt(TAG_MANA); passiveDecayTicks = cmp.getInt(TAG_PASSIVE_DECAY_TICKS); @@ -264,6 +265,7 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { @Override public void writeToPacketNBT(CompoundNBT cmp) { + super.writeToPacketNBT(cmp); cmp.putInt(TAG_MANA, mana); cmp.putInt(TAG_TICKS_EXISTED, ticksExisted); cmp.putInt(TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks); diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 1123d38d7..aee42bbe8 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -43,6 +43,7 @@ import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootContext; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.model.ModelDataManager; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; @@ -160,8 +161,6 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile super.read(cmp); if(cmp.contains(TAG_TICKS_EXISTED)) ticksExisted = cmp.getInt(TAG_TICKS_EXISTED); - if(cmp.contains(TAG_FLOATING_DATA)) - BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); readFromPacketNBT(cmp); } @@ -169,7 +168,6 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile @Override public final CompoundNBT write(CompoundNBT cmp) { cmp.putInt(TAG_TICKS_EXISTED, ticksExisted); - cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); writeToPacketNBT(cmp); return cmp; } @@ -184,8 +182,9 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile @Override public void onDataPacket(NetworkManager net, SUpdateTileEntityPacket packet) { IFloatingFlower.IslandType oldType = floatingData.getIslandType(); - super.onDataPacket(net, packet); + readFromPacketNBT(packet.getNbtCompound()); if(oldType != floatingData.getIslandType() && isFloating()) { + ModelDataManager.requestModelDataRefresh(this); world.notifyBlockUpdate(getPos(), getBlockState(), getBlockState(), 0); } } @@ -201,23 +200,25 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile * by readFromPacketNBT on the client that receives the packet. * Note: This method is also used to write to the world NBT. */ - public void writeToPacketNBT(CompoundNBT cmp) { } + public void writeToPacketNBT(CompoundNBT cmp) { + if (isFloating()) + cmp.put(TAG_FLOATING_DATA, BotaniaAPI.FLOATING_FLOWER_CAP.writeNBT(floatingData, null)); + } /** * Reads data from a network packet. This data is written by * writeToPacketNBT in the server. Note: This method is also used * to read from the world NBT. */ - public void readFromPacketNBT(CompoundNBT cmp) { } + public void readFromPacketNBT(CompoundNBT cmp) { + if(cmp.contains(TAG_FLOATING_DATA)) + BotaniaAPI.FLOATING_FLOWER_CAP.readNBT(floatingData, null, cmp.getCompound(TAG_FLOATING_DATA)); + } public void sync() { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } - public String getUnlocalizedName() { - return getType().getRegistryName().toString(); - } - /** * Called when a Wand of the Forest is used on this sub tile. Note that the * player parameter can be null if this is called from a dispenser. diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 6d06ce325..1da99a13e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -124,7 +124,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public boolean onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, hit) || super.onBlockActivated(state, world, pos, player, hand, hit); + return super.onBlockActivated(state, world, pos, player, hand, hit) + || ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, hit) || super.onBlockActivated(state, world, pos, player, hand, hit); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index f9484404b..4f54b65ec 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -42,21 +42,14 @@ public class TileFloatingFlower extends TileMod { public static TileEntityType TYPE; private static final String TAG_FLOATING_DATA = "floating"; - public static ItemStack forcedStack = ItemStack.EMPTY; private final IFloatingFlower floatingData = new FloatingFlowerImpl() { @Override public ItemStack getDisplayStack() { - if(!forcedStack.isEmpty()) { - ItemStack retStack = forcedStack; - forcedStack = ItemStack.EMPTY; - return retStack; + Block b = getBlockState().getBlock(); + if(b instanceof BlockFloatingFlower) { + return new ItemStack(ModBlocks.getShinyFlower(((BlockFloatingFlower) b).color)); } else { - Block b = getBlockState().getBlock(); - if(b instanceof BlockFloatingFlower) { - return new ItemStack(ModBlocks.getShinyFlower(((BlockFloatingFlower) b).color)); - } else { - return ItemStack.EMPTY; - } + return ItemStack.EMPTY; } } }; diff --git a/src/main/resources/assets/botania/blockstates/black_floating_flower.json b/src/main/resources/assets/botania/blockstates/black_floating_flower.json new file mode 100644 index 000000000..dc6623e89 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/black_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_black" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/blue_floating_flower.json b/src/main/resources/assets/botania/blockstates/blue_floating_flower.json new file mode 100644 index 000000000..d49fbd5de --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/blue_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_blue" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/brown_floating_flower.json b/src/main/resources/assets/botania/blockstates/brown_floating_flower.json new file mode 100644 index 000000000..30cc7d8a8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/brown_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_brown" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/cyan_floating_flower.json b/src/main/resources/assets/botania/blockstates/cyan_floating_flower.json new file mode 100644 index 000000000..74c434329 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/cyan_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_cyan" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_agricarnation.json b/src/main/resources/assets/botania/blockstates/floating_agricarnation.json new file mode 100644 index 000000000..0f00f732e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_agricarnation.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/agricarnation" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json b/src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json new file mode 100644 index 000000000..d0dace695 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_agricarnation_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/agricarnation_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_bellethorn.json b/src/main/resources/assets/botania/blockstates/floating_bellethorn.json new file mode 100644 index 000000000..cb73df0e8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_bellethorn.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/bellethorn" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json b/src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json new file mode 100644 index 000000000..2440aba37 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_bellethorn_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/bellethorn_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_bergamute.json b/src/main/resources/assets/botania/blockstates/floating_bergamute.json new file mode 100644 index 000000000..798ae3fcc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_bergamute.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/bergamute" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_bubbell.json b/src/main/resources/assets/botania/blockstates/floating_bubbell.json new file mode 100644 index 000000000..d0ccd3bba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_bubbell.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/bubbell" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json b/src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json new file mode 100644 index 000000000..7865f2708 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_bubbell_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/bubbell_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_clayconia.json b/src/main/resources/assets/botania/blockstates/floating_clayconia.json new file mode 100644 index 000000000..dd1f5cc30 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_clayconia.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/clayconia" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json b/src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json new file mode 100644 index 000000000..02ba5a1ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_clayconia_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/clayconia_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_daffomill.json b/src/main/resources/assets/botania/blockstates/floating_daffomill.json new file mode 100644 index 000000000..a98efe287 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_daffomill.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/daffomill" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_dandelifeon.json b/src/main/resources/assets/botania/blockstates/floating_dandelifeon.json new file mode 100644 index 000000000..837365308 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_dandelifeon.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/dandelifeon" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_dreadthorn.json b/src/main/resources/assets/botania/blockstates/floating_dreadthorn.json new file mode 100644 index 000000000..c9a66601e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_dreadthorn.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/dreadthorn" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_endoflame.json b/src/main/resources/assets/botania/blockstates/floating_endoflame.json new file mode 100644 index 000000000..abad3ada3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_endoflame.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/endoflame" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_entropinnyum.json b/src/main/resources/assets/botania/blockstates/floating_entropinnyum.json new file mode 100644 index 000000000..492ee05a0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_entropinnyum.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/entropinnyum" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_exoflame.json b/src/main/resources/assets/botania/blockstates/floating_exoflame.json new file mode 100644 index 000000000..04026cf3f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_exoflame.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/exoflame" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json b/src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json new file mode 100644 index 000000000..9d29681b1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_fallen_kanade.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/fallen_kanade" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json b/src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json new file mode 100644 index 000000000..8f339f538 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_gourmaryllis.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/gourmaryllis" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_heisei_dream.json b/src/main/resources/assets/botania/blockstates/floating_heisei_dream.json new file mode 100644 index 000000000..a5f421065 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_heisei_dream.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/heisei_dream" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_hopperhock.json b/src/main/resources/assets/botania/blockstates/floating_hopperhock.json new file mode 100644 index 000000000..fdc8ba200 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_hopperhock.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/hopperhock" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json b/src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json new file mode 100644 index 000000000..d26227bff --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_hopperhock_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/hopperhock_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_hyacidus.json b/src/main/resources/assets/botania/blockstates/floating_hyacidus.json new file mode 100644 index 000000000..95f229144 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_hyacidus.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/hyacidus" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_hydroangeas.json b/src/main/resources/assets/botania/blockstates/floating_hydroangeas.json new file mode 100644 index 000000000..4550c9fa1 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_hydroangeas.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/hydroangeas" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json b/src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json new file mode 100644 index 000000000..e168c6e7d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_jaded_amaranthus.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/jaded_amaranthus" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_jiyuulia.json b/src/main/resources/assets/botania/blockstates/floating_jiyuulia.json new file mode 100644 index 000000000..e8676768a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_jiyuulia.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/jiyuulia" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_kekimurus.json b/src/main/resources/assets/botania/blockstates/floating_kekimurus.json new file mode 100644 index 000000000..16bf02d1f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_kekimurus.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/kekimurus" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_loonium.json b/src/main/resources/assets/botania/blockstates/floating_loonium.json new file mode 100644 index 000000000..88cd4b122 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_loonium.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/loonium" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_manastar.json b/src/main/resources/assets/botania/blockstates/floating_manastar.json new file mode 100644 index 000000000..cdb98c9b9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_manastar.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/manastar" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_marimorphosis.json b/src/main/resources/assets/botania/blockstates/floating_marimorphosis.json new file mode 100644 index 000000000..b803c88b5 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_marimorphosis.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/marimorphosis" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json b/src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json new file mode 100644 index 000000000..c288f9dc8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_marimorphosis_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/marimorphosis_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_medumone.json b/src/main/resources/assets/botania/blockstates/floating_medumone.json new file mode 100644 index 000000000..6301f3214 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_medumone.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/medumone" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_munchdew.json b/src/main/resources/assets/botania/blockstates/floating_munchdew.json new file mode 100644 index 000000000..a5453b751 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_munchdew.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/munchdew" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_narslimmus.json b/src/main/resources/assets/botania/blockstates/floating_narslimmus.json new file mode 100644 index 000000000..f4fc57236 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_narslimmus.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/narslimmus" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_orechid.json b/src/main/resources/assets/botania/blockstates/floating_orechid.json new file mode 100644 index 000000000..a04d97e88 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_orechid.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/orechid" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json b/src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json new file mode 100644 index 000000000..13969e7dc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_orechid_ignem.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/orechid_ignem" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_pollidisiac.json b/src/main/resources/assets/botania/blockstates/floating_pollidisiac.json new file mode 100644 index 000000000..6a30d132c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_pollidisiac.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/pollidisiac" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_pure_daisy.json b/src/main/resources/assets/botania/blockstates/floating_pure_daisy.json new file mode 100644 index 000000000..5ed059926 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_pure_daisy.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/pure_daisy" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_rafflowsia.json b/src/main/resources/assets/botania/blockstates/floating_rafflowsia.json new file mode 100644 index 000000000..bc45870e6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_rafflowsia.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/rafflowsia" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json b/src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json new file mode 100644 index 000000000..ec40a5795 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_rannuncarpus.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/rannuncarpus" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json b/src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json new file mode 100644 index 000000000..12e7c74e3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_rannuncarpus_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/rannuncarpus_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json b/src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json new file mode 100644 index 000000000..27671b559 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_rosa_arcana.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/rosa_arcana" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json b/src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json new file mode 100644 index 000000000..f4dff5c72 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_shulk_me_not.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/shulk_me_not" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_solegnolia.json b/src/main/resources/assets/botania/blockstates/floating_solegnolia.json new file mode 100644 index 000000000..cde412280 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_solegnolia.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/solegnolia" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json b/src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json new file mode 100644 index 000000000..57569aeeb --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_solegnolia_chibi.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/solegnolia_chibi" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_spectranthemum.json b/src/main/resources/assets/botania/blockstates/floating_spectranthemum.json new file mode 100644 index 000000000..fd00732db --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_spectranthemum.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/spectranthemum" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_spectrolus.json b/src/main/resources/assets/botania/blockstates/floating_spectrolus.json new file mode 100644 index 000000000..ececff7ba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_spectrolus.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/spectrolus" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_tangleberrie.json b/src/main/resources/assets/botania/blockstates/floating_tangleberrie.json new file mode 100644 index 000000000..3c651a534 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_tangleberrie.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/tangleberrie" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_thermalily.json b/src/main/resources/assets/botania/blockstates/floating_thermalily.json new file mode 100644 index 000000000..7f1db1995 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_thermalily.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/thermalily" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_tigerseye.json b/src/main/resources/assets/botania/blockstates/floating_tigerseye.json new file mode 100644 index 000000000..aef8ad743 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_tigerseye.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/tigerseye" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/floating_vinculotus.json b/src/main/resources/assets/botania/blockstates/floating_vinculotus.json new file mode 100644 index 000000000..8c978a1ba --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/floating_vinculotus.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/vinculotus" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/gray_floating_flower.json b/src/main/resources/assets/botania/blockstates/gray_floating_flower.json new file mode 100644 index 000000000..fdab5bd77 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/gray_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_gray" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/green_floating_flower.json b/src/main/resources/assets/botania/blockstates/green_floating_flower.json new file mode 100644 index 000000000..ad78c31c4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/green_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_green" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json b/src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json new file mode 100644 index 000000000..a33856929 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/light_blue_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_light_blue" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json b/src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json new file mode 100644 index 000000000..5ddb5f980 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/light_gray_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_light_gray" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/lime_floating_flower.json b/src/main/resources/assets/botania/blockstates/lime_floating_flower.json new file mode 100644 index 000000000..283137b45 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/lime_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_lime" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/magenta_floating_flower.json b/src/main/resources/assets/botania/blockstates/magenta_floating_flower.json new file mode 100644 index 000000000..aca83a685 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/magenta_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_magenta" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/orange_floating_flower.json b/src/main/resources/assets/botania/blockstates/orange_floating_flower.json new file mode 100644 index 000000000..cdaf5ef36 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/orange_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_orange" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/pink_floating_flower.json b/src/main/resources/assets/botania/blockstates/pink_floating_flower.json new file mode 100644 index 000000000..8851dc991 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pink_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_pink" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/purple_floating_flower.json b/src/main/resources/assets/botania/blockstates/purple_floating_flower.json new file mode 100644 index 000000000..e24e245ca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/purple_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_purple" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/red_floating_flower.json b/src/main/resources/assets/botania/blockstates/red_floating_flower.json new file mode 100644 index 000000000..2d0026b9c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/red_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_red" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/blockstates/white_floating_flower.json b/src/main/resources/assets/botania/blockstates/white_floating_flower.json index 91da4f33f..f8e12ed22 100644 --- a/src/main/resources/assets/botania/blockstates/white_floating_flower.json +++ b/src/main/resources/assets/botania/blockstates/white_floating_flower.json @@ -9,4 +9,4 @@ "variants": { "": [{}] } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/blockstates/yellow_floating_flower.json b/src/main/resources/assets/botania/blockstates/yellow_floating_flower.json new file mode 100644 index 000000000..d13f2e616 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/yellow_floating_flower.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania_special:floating_flower", + "custom": { + "flower": "botania:block/plants/flower_yellow" + } + }, + "variants": { + "": [{}] + } +} diff --git a/src/main/resources/assets/botania/models/item/black_floating_flower.json b/src/main/resources/assets/botania/models/item/black_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/black_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/blue_floating_flower.json b/src/main/resources/assets/botania/models/item/blue_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blue_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/brown_floating_flower.json b/src/main/resources/assets/botania/models/item/brown_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/brown_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/cyan_floating_flower.json b/src/main/resources/assets/botania/models/item/cyan_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/cyan_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_agricarnation.json b/src/main/resources/assets/botania/models/item/floating_agricarnation.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_agricarnation.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_agricarnation_chibi.json b/src/main/resources/assets/botania/models/item/floating_agricarnation_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_agricarnation_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_bellethorn.json b/src/main/resources/assets/botania/models/item/floating_bellethorn.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_bellethorn.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_bellethorn_chibi.json b/src/main/resources/assets/botania/models/item/floating_bellethorn_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_bellethorn_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_bergamute.json b/src/main/resources/assets/botania/models/item/floating_bergamute.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_bergamute.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_bubbell.json b/src/main/resources/assets/botania/models/item/floating_bubbell.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_bubbell.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_bubbell_chibi.json b/src/main/resources/assets/botania/models/item/floating_bubbell_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_bubbell_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_clayconia.json b/src/main/resources/assets/botania/models/item/floating_clayconia.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_clayconia.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_clayconia_chibi.json b/src/main/resources/assets/botania/models/item/floating_clayconia_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_clayconia_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_daffomill.json b/src/main/resources/assets/botania/models/item/floating_daffomill.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_daffomill.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_dandelifeon.json b/src/main/resources/assets/botania/models/item/floating_dandelifeon.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_dandelifeon.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_dreadthorn.json b/src/main/resources/assets/botania/models/item/floating_dreadthorn.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_dreadthorn.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_endoflame.json b/src/main/resources/assets/botania/models/item/floating_endoflame.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_endoflame.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_entropinnyum.json b/src/main/resources/assets/botania/models/item/floating_entropinnyum.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_entropinnyum.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_exoflame.json b/src/main/resources/assets/botania/models/item/floating_exoflame.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_exoflame.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_fallen_kanade.json b/src/main/resources/assets/botania/models/item/floating_fallen_kanade.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_fallen_kanade.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_gourmaryllis.json b/src/main/resources/assets/botania/models/item/floating_gourmaryllis.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_gourmaryllis.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_heisei_dream.json b/src/main/resources/assets/botania/models/item/floating_heisei_dream.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_heisei_dream.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_hopperhock.json b/src/main/resources/assets/botania/models/item/floating_hopperhock.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_hopperhock.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_hopperhock_chibi.json b/src/main/resources/assets/botania/models/item/floating_hopperhock_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_hopperhock_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_hyacidus.json b/src/main/resources/assets/botania/models/item/floating_hyacidus.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_hyacidus.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_hydroangeas.json b/src/main/resources/assets/botania/models/item/floating_hydroangeas.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_hydroangeas.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_jaded_amaranthus.json b/src/main/resources/assets/botania/models/item/floating_jaded_amaranthus.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_jaded_amaranthus.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_jiyuulia.json b/src/main/resources/assets/botania/models/item/floating_jiyuulia.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_jiyuulia.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_kekimurus.json b/src/main/resources/assets/botania/models/item/floating_kekimurus.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_kekimurus.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_loonium.json b/src/main/resources/assets/botania/models/item/floating_loonium.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_loonium.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_manastar.json b/src/main/resources/assets/botania/models/item/floating_manastar.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_manastar.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_marimorphosis.json b/src/main/resources/assets/botania/models/item/floating_marimorphosis.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_marimorphosis.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_marimorphosis_chibi.json b/src/main/resources/assets/botania/models/item/floating_marimorphosis_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_marimorphosis_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_medumone.json b/src/main/resources/assets/botania/models/item/floating_medumone.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_medumone.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_munchdew.json b/src/main/resources/assets/botania/models/item/floating_munchdew.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_munchdew.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_narslimmus.json b/src/main/resources/assets/botania/models/item/floating_narslimmus.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_narslimmus.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_orechid.json b/src/main/resources/assets/botania/models/item/floating_orechid.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_orechid.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_orechid_ignem.json b/src/main/resources/assets/botania/models/item/floating_orechid_ignem.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_orechid_ignem.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_pollidisiac.json b/src/main/resources/assets/botania/models/item/floating_pollidisiac.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_pollidisiac.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_pure_daisy.json b/src/main/resources/assets/botania/models/item/floating_pure_daisy.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_pure_daisy.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_rafflowsia.json b/src/main/resources/assets/botania/models/item/floating_rafflowsia.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_rafflowsia.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_rannuncarpus.json b/src/main/resources/assets/botania/models/item/floating_rannuncarpus.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_rannuncarpus.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_rannuncarpus_chibi.json b/src/main/resources/assets/botania/models/item/floating_rannuncarpus_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_rannuncarpus_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_rosa_arcana.json b/src/main/resources/assets/botania/models/item/floating_rosa_arcana.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_rosa_arcana.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_shulk_me_not.json b/src/main/resources/assets/botania/models/item/floating_shulk_me_not.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_shulk_me_not.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_solegnolia.json b/src/main/resources/assets/botania/models/item/floating_solegnolia.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_solegnolia.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_solegnolia_chibi.json b/src/main/resources/assets/botania/models/item/floating_solegnolia_chibi.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_solegnolia_chibi.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_spectranthemum.json b/src/main/resources/assets/botania/models/item/floating_spectranthemum.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_spectranthemum.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_spectrolus.json b/src/main/resources/assets/botania/models/item/floating_spectrolus.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_spectrolus.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_tangleberrie.json b/src/main/resources/assets/botania/models/item/floating_tangleberrie.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_tangleberrie.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_thermalily.json b/src/main/resources/assets/botania/models/item/floating_thermalily.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_thermalily.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_tigerseye.json b/src/main/resources/assets/botania/models/item/floating_tigerseye.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_tigerseye.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/floating_vinculotus.json b/src/main/resources/assets/botania/models/item/floating_vinculotus.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/floating_vinculotus.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/gray_floating_flower.json b/src/main/resources/assets/botania/models/item/gray_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/gray_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/green_floating_flower.json b/src/main/resources/assets/botania/models/item/green_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/green_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/light_blue_floating_flower.json b/src/main/resources/assets/botania/models/item/light_blue_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_blue_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/light_gray_floating_flower.json b/src/main/resources/assets/botania/models/item/light_gray_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/light_gray_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/lime_floating_flower.json b/src/main/resources/assets/botania/models/item/lime_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lime_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/magenta_floating_flower.json b/src/main/resources/assets/botania/models/item/magenta_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magenta_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/orange_floating_flower.json b/src/main/resources/assets/botania/models/item/orange_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/orange_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/pink_floating_flower.json b/src/main/resources/assets/botania/models/item/pink_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pink_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/purple_floating_flower.json b/src/main/resources/assets/botania/models/item/purple_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/purple_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/red_floating_flower.json b/src/main/resources/assets/botania/models/item/red_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/red_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/white_floating_flower.json b/src/main/resources/assets/botania/models/item/white_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/white_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +} diff --git a/src/main/resources/assets/botania/models/item/yellow_floating_flower.json b/src/main/resources/assets/botania/models/item/yellow_floating_flower.json new file mode 100644 index 000000000..990c71669 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/yellow_floating_flower.json @@ -0,0 +1,4 @@ +{ + "parent": "builtin/entity", + "__comment": "Replaced on startup during ModelBakeEvent" +}