From fb732b9398feb70d80072e879f2143d65a49cd1f Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 26 Oct 2016 16:24:17 +0200 Subject: [PATCH] Adding more flower models --- .../botany/api/IAlleleFlowerSpecies.java | 2 +- .../java/binnie/botany/api/IFlowerType.java | 2 +- .../java/binnie/botany/core/BotanyCore.java | 2 +- .../binnie/botany/flower/BlockFlower.java | 38 ++++--- .../java/binnie/botany/flower/ItemBotany.java | 4 +- .../botany/flower/ItemInsulatedTube.java | 86 +++++++--------- .../botany/flower/StateMapperFlower.java | 7 ++ .../botany/flower/TileEntityFlower.java | 67 ++++++++----- .../botany/genetics/AlleleFlowerSpecies.java | 4 +- .../botany/genetics/EnumFlowerType.java | 27 ++--- .../botany/genetics/FlowerDefinition.java | 5 + .../botany/genetics/FlowerTemplates.java | 3 +- .../assets/botany/blockstates/flower.json | 99 ++++++++++--------- .../assets/botany/blockstates/flowerbed.json | 18 ++-- .../botany/blockstates/flowerbedNoWeed.json | 18 ++-- .../assets/botany/blockstates/loam.json | 18 ++-- .../assets/botany/blockstates/loamNoWeed.json | 18 ++-- .../assets/botany/blockstates/plant.json | 8 +- .../assets/botany/blockstates/soil.json | 18 ++-- .../assets/botany/blockstates/soilNoWeed.json | 18 ++-- .../models/block/flowers/agapanthus.json | 7 ++ .../block/flowers/agapanthus_flowered.json | 7 ++ .../botany/models/block/flowers/allium.json | 7 ++ .../models/block/flowers/allium_flowered.json | 7 ++ .../botany/models/block/flowers/anemone.json | 7 ++ .../block/flowers/anemone_flowered.json | 7 ++ .../models/block/flowers/aquilegia.json | 7 ++ .../block/flowers/aquilegia_flowered.json | 7 ++ .../botany/models/block/flowers/aster.json | 7 ++ .../models/block/flowers/aster_flowered.json | 7 ++ .../botany/models/block/flowers/auricula.json | 7 ++ .../block/flowers/auricula_flowered.json | 7 ++ .../botany/models/block/flowers/azalea.json | 7 ++ .../models/block/flowers/azalea_flowered.json | 7 ++ .../botany/models/block/flowers/bluet.json | 7 ++ .../models/block/flowers/bluet_flowered.json | 7 ++ .../models/block/flowers/carnation.json | 7 ++ .../block/flowers/carnation_flowered.json | 7 ++ .../models/block/flowers/coneflower.json | 7 ++ .../block/flowers/coneflower_flowered.json | 7 ++ .../models/block/flowers/cornflower.json | 7 ++ .../block/flowers/cornflower_flowered.json | 7 ++ .../botany/models/block/flowers/daffodil.json | 7 ++ .../block/flowers/daffodil_flowered.json | 7 ++ .../botany/models/block/flowers/dahlia.json | 7 ++ .../models/block/flowers/dahlia_flowered.json | 7 ++ .../botany/models/block/flowers/daisy.json | 7 ++ .../models/block/flowers/daisy_flowered.json | 7 ++ .../botany/models/block/flowers/dianthus.json | 7 ++ .../block/flowers/dianthus_flowered.json | 7 ++ .../models/block/flowers/edelweiss.json | 7 ++ .../block/flowers/edelweiss_flowered.json | 7 ++ .../botany/models/block/flowers/forget.json | 7 ++ .../models/block/flowers/forget_flowered.json | 7 ++ .../botany/models/block/flowers/fuchsia.json | 7 ++ .../block/flowers/fuchsia_flowered.json | 7 ++ .../models/block/flowers/gaillardia.json | 7 ++ .../block/flowers/gaillardia_flowered.json | 7 ++ .../botany/models/block/flowers/geranium.json | 7 ++ .../block/flowers/geranium_flowered.json | 7 ++ .../botany/models/block/flowers/iris.json | 7 ++ .../models/block/flowers/iris_flowered.json | 7 ++ .../botany/models/block/flowers/lily.json | 7 ++ .../models/block/flowers/lily_flowered.json | 7 ++ .../botany/models/block/flowers/marigold.json | 7 ++ .../block/flowers/marigold_flowered.json | 7 ++ .../botany/models/block/flowers/mums.json | 7 ++ .../models/block/flowers/mums_flowered.json | 7 ++ .../botany/models/block/flowers/orchid.json | 7 ++ .../models/block/flowers/orchid_flowered.json | 7 ++ .../botany/models/block/flowers/pansy.json | 7 ++ .../models/block/flowers/pansy_flowered.json | 7 ++ .../botany/models/block/flowers/petunia.json | 7 ++ .../block/flowers/petunia_flowered.json | 7 ++ .../botany/models/block/flowers/poppy.json | 7 ++ .../models/block/flowers/poppy_flowered.json | 7 ++ .../botany/models/block/flowers/primrose.json | 7 ++ .../block/flowers/primrose_flowered.json | 7 ++ .../botany/models/block/flowers/scabious.json | 7 ++ .../block/flowers/scabious_flowered.json | 7 ++ .../botany/models/block/flowers/seed.json | 7 ++ .../botany/models/block/flowers/tulip.json | 7 ++ .../models/block/flowers/tulip_flowered.json | 7 ++ .../botany/models/block/flowers/viola.json | 7 ++ .../models/block/flowers/viola_flowered.json | 7 ++ .../botany/models/block/flowers/yarrow.json | 7 ++ .../models/block/flowers/yarrow_flowered.json | 7 ++ .../botany/models/block/flowers/zinnia.json | 7 ++ .../models/block/flowers/zinnia_flowered.json | 7 ++ .../botany/models/item/flowers/pollen.json | 8 ++ .../botany/models/item/flowers/seed.json | 8 ++ .../botany/models/item/insulatedTube.json | 8 ++ 92 files changed, 750 insertions(+), 219 deletions(-) create mode 100644 src/main/resources/assets/botany/models/block/flowers/agapanthus.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/allium.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/allium_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/anemone.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/aquilegia.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/aster.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/aster_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/auricula.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/azalea.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/bluet.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/carnation.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/coneflower.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/cornflower.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/daffodil.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/dahlia.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/daisy.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/dianthus.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/edelweiss.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/forget.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/forget_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/fuchsia.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/gaillardia.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/geranium.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/iris.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/iris_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/lily.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/lily_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/marigold.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/mums.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/mums_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/orchid.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/pansy.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/petunia.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/poppy.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/primrose.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/scabious.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/seed.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/tulip.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/viola.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/viola_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/yarrow.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/zinnia.json create mode 100644 src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json create mode 100644 src/main/resources/assets/botany/models/item/flowers/pollen.json create mode 100644 src/main/resources/assets/botany/models/item/flowers/seed.json create mode 100644 src/main/resources/assets/botany/models/item/insulatedTube.json diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index 8dcc07b2..7398abed 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -23,7 +23,7 @@ public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty extends Comparable { @Nonnull @SideOnly(Side.CLIENT) - ModelResourceLocation getModel(EnumFlowerStage type, boolean flowered, int section); + ModelResourceLocation getModel(EnumFlowerStage type, boolean flowered); String getName(); diff --git a/src/main/java/binnie/botany/core/BotanyCore.java b/src/main/java/binnie/botany/core/BotanyCore.java index 8868f5e2..a89b2029 100644 --- a/src/main/java/binnie/botany/core/BotanyCore.java +++ b/src/main/java/binnie/botany/core/BotanyCore.java @@ -3,10 +3,10 @@ package binnie.botany.core; import binnie.botany.api.FlowerManager; import binnie.botany.api.IFlowerRoot; import binnie.botany.genetics.FlowerRoot; +import forestry.api.genetics.AlleleManager; public class BotanyCore { public static final int CHANCE_INTERPOLLINATION = 20; - public static IFlowerRoot speciesRoot; public static IFlowerRoot getFlowerRoot() { if(FlowerManager.flowerRoot == null){ diff --git a/src/main/java/binnie/botany/flower/BlockFlower.java b/src/main/java/binnie/botany/flower/BlockFlower.java index b832f462..3c6e5be3 100644 --- a/src/main/java/binnie/botany/flower/BlockFlower.java +++ b/src/main/java/binnie/botany/flower/BlockFlower.java @@ -51,6 +51,7 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IItemM public static final PropertyFlower FLOWER = new PropertyFlower("flower", IFlowerType.class); public static final PropertyInteger SECTION = PropertyInteger.create("section", 0, EnumFlowerType.highestSection - 1); public static final PropertyBool FLOWERED = PropertyBool.create("flowered"); + public static final PropertyBool SEED = PropertyBool.create("seed"); public BlockFlower() { super(Material.PLANTS); @@ -96,10 +97,15 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IItemM return FLOWER_BLOCK_AABB; } - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } + @Override + public boolean isOpaqueCube(IBlockState state){ + return false; + } + + @Override + public boolean isFullCube(IBlockState state){ + return false; + } @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { @@ -127,15 +133,17 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IItemM @Override @SideOnly(Side.CLIENT) public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { - final TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileEntityFlower) { - TileEntityFlower flower = (TileEntityFlower) tile; - if(tintIndex == 0){ - return flower.getStemColour(); - }else if(tintIndex == 1){ - return flower.getPrimaryColour(); - }else{ - return flower.getSecondaryColour(); + if(pos != null){ + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileEntityFlower) { + TileEntityFlower flower = (TileEntityFlower) tile; + if(tintIndex == 0){ + return flower.getStemColour(); + }else if(tintIndex == 1){ + return flower.getPrimaryColour(); + }else{ + return flower.getSecondaryColour(); + } } } return 16777215; @@ -179,16 +187,18 @@ public class BlockFlower extends BlockContainer implements IColoredBlock, IItemM state = state.withProperty(FLOWER, flower.getType()); state = state.withProperty(FLOWERED, flower.isFlowered()); state = state.withProperty(SECTION, flower.getRenderSection()); + state = state.withProperty(SEED, flower.getAge() == 0); }else{ state = state.withProperty(FLOWER, FlowerDefinition.Dandelion.getSpecies().getType()); state = state.withProperty(FLOWERED, false); + state = state.withProperty(SEED, false); } return state; } @Override protected BlockStateContainer createBlockState() { - return new BlockStateContainer(this, FLOWER, FLOWERED, SECTION); + return new BlockStateContainer(this, FLOWER, FLOWERED, SECTION, SEED); } @Override diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 44939ed3..1d6a9350 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -151,7 +151,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister @Override public int getColorFromItemstack(ItemStack stack, int tintIndex) { - final IFlower flower = BotanyCore.speciesRoot.getMember(stack); + IFlower flower = BotanyCore.getFlowerRoot().getMember(stack); if (flower == null || flower.getGenome() == null) { return 16777215; } @@ -174,7 +174,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary(); IFlowerType flowerType = flowerSpecies.getType(); - return flowerSpecies.getFlowerModel(type, flower.hasFlowered(), flowerType.getSections() - 1); + return flowerSpecies.getFlowerModel(type, flower.hasFlowered()); } } diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index a20d1a04..19930bc7 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -10,75 +10,65 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemInsulatedTube extends Item { -// IIcon[] icons; +import binnie.botany.CreativeTabBotany; +import binnie.core.item.ItemCore; +import forestry.api.core.IModelManager; +import forestry.core.items.IColoredItem; + +public class ItemInsulatedTube extends ItemCore implements IColoredItem { public ItemInsulatedTube() { - setRegistryName("insulatedTube"); + super("insulatedTube"); + setUnlocalizedName("insulatedTube"); + setCreativeTab(CreativeTabBotany.instance); } @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item p_150895_1_, final CreativeTabs p_150895_2_, final List p_150895_3_) { - for (final Material mat : Material.values()) { - for (final Insulate ins : Insulate.values()) { - p_150895_3_.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); + public void getSubItems(Item item, CreativeTabs tab, List subItems) { + for (Material mat : Material.values()) { + for (Insulate ins : Insulate.values()) { + subItems.add(new ItemStack(this, 1, mat.ordinal() + ins.ordinal() * 128)); } } } - -// @Override -// @SideOnly(Side.CLIENT) -// public void registerIcons(final IIconRegister p_94581_1_) { -// for (int i = 0; i < 3; ++i) { -// this.icons[i] = Botany.proxy.getIcon(p_94581_1_, "insulatedTube." + i); -// } -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public int getColorFromItemStack(final ItemStack stack, final int pass) { -// return (pass == 0) ? 16777215 : ((pass == 1) ? Material.get(stack.getItemDamage()).getColor() : Insulate.get(stack.getItemDamage()).getColor()); -// } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + for (Material mat : Material.values()) { + for (Insulate ins : Insulate.values()) { + manager.registerItemModel(item, mat.ordinal() + ins.ordinal() * 128); + } + } + } + + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) { + if(tintIndex == 0){ + return 16777215; + }else if(tintIndex == 1){ + Material.get(stack.getItemDamage()).getColor(); + } + return Insulate.get(stack.getItemDamage()).getColor(); + } @Override @SideOnly(Side.CLIENT) - public void addInformation(final ItemStack p_77624_1_, final EntityPlayer p_77624_2_, final List p_77624_3_, final boolean p_77624_4_) { - super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_); - p_77624_3_.add(Insulate.get(p_77624_1_.getItemDamage()).getName()); + public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) { + tooltip.add(Insulate.get(itemStack.getItemDamage()).getName()); } @Override - public String getItemStackDisplayName(final ItemStack p_77653_1_) { + public String getItemStackDisplayName(ItemStack p_77653_1_) { return Material.get(p_77653_1_.getItemDamage()).getName() + " Insulated Tube"; } -// @Override -// public int getRenderPasses(final int metadata) { -// return 3; -// } -// -// @Override -// public IIcon getIcon(final ItemStack stack, final int pass) { -// return this.icons[pass % 3]; -// } -// -// @Override -// public boolean requiresMultipleRenderPasses() { -// return true; -// } -// -// public ItemInsulatedTube() { -// this.icons = new IIcon[3]; -// this.setUnlocalizedName("insulatedTube"); -// this.setCreativeTab(CreativeTabBotany.instance); -// } - - public static String getInsulate(final ItemStack stack) { + public static String getInsulate(ItemStack stack) { return Insulate.get(stack.getItemDamage()).getName(); } - public static ItemStack getInsulateStack(final ItemStack stack) { + public static ItemStack getInsulateStack(ItemStack stack) { return Insulate.get(stack.getItemDamage()).getStack(); } diff --git a/src/main/java/binnie/botany/flower/StateMapperFlower.java b/src/main/java/binnie/botany/flower/StateMapperFlower.java index 8ba6b825..5bf805a5 100644 --- a/src/main/java/binnie/botany/flower/StateMapperFlower.java +++ b/src/main/java/binnie/botany/flower/StateMapperFlower.java @@ -24,6 +24,13 @@ public class StateMapperFlower extends StateMapperBase { }else if(flowerType.getSections() <= state.getValue(BlockFlower.SECTION)){ properties.put(BlockFlower.SECTION, flowerType.getSections()-1); } + if(state.getValue(BlockFlower.SEED)){ + properties.remove(BlockFlower.SECTION); + properties.remove(BlockFlower.FLOWER); + properties.remove(BlockFlower.FLOWERED); + }else{ + properties.remove(BlockFlower.SEED); + } return new ModelResourceLocation(Constants.BOTANY_MOD_ID + ":flower", getPropertyString(properties)); } diff --git a/src/main/java/binnie/botany/flower/TileEntityFlower.java b/src/main/java/binnie/botany/flower/TileEntityFlower.java index fbc2deb2..fd09803d 100644 --- a/src/main/java/binnie/botany/flower/TileEntityFlower.java +++ b/src/main/java/binnie/botany/flower/TileEntityFlower.java @@ -26,6 +26,7 @@ import forestry.api.genetics.IPollinatable; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -56,48 +57,62 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt this.renderInfo = null; this.matureTime = 0; } - + + + @Override - public void readFromNBT(final NBTTagCompound nbttagcompound) { - this.flower = new Flower(nbttagcompound); - this.section = nbttagcompound.getByte("section"); - if (this.flower.getAge() == 0) { - this.flower.setFlowered(false); - } - this.owner = NBTUtil.readGameProfileFromNBT(nbttagcompound.getCompoundTag("owner")); - if (nbttagcompound.hasKey("CATER") && BinnieCore.isLepidopteryActive()) { - this.matureTime = nbttagcompound.getInteger("caterTime"); - this.caterpillar = Binnie.Genetics.getButterflyRoot().getMember(nbttagcompound.getCompoundTag("cater")); - } - super.readFromNBT(nbttagcompound); + public NBTTagCompound getUpdateTag() { + updateRender(true); + return super.getUpdateTag(); } @Override - public NBTTagCompound writeToNBT(final NBTTagCompound nbttagcompound) { + public void readFromNBT(final NBTTagCompound nbtCompound) { + if(nbtCompound.hasKey("Flower")){ + this.flower = new Flower(nbtCompound.getCompoundTag("Flower")); + if (flower.getAge() == 0) { + flower.setFlowered(false); + } + } + if(nbtCompound.hasKey("section")){ + this.section = nbtCompound.getByte("section"); + } + if(nbtCompound.hasKey("owner")){ + this.owner = NBTUtil.readGameProfileFromNBT(nbtCompound.getCompoundTag("owner")); + } + if (nbtCompound.hasKey("CATER") && BinnieCore.isLepidopteryActive()) { + this.matureTime = nbtCompound.getInteger("caterTime"); + this.caterpillar = Binnie.Genetics.getButterflyRoot().getMember(nbtCompound.getCompoundTag("cater")); + } + super.readFromNBT(nbtCompound); + } + + @Override + public NBTTagCompound writeToNBT(final NBTTagCompound nbtCompound) { if (this.flower != null) { - this.flower.writeToNBT(nbttagcompound); + nbtCompound.setTag("Flower", flower.writeToNBT(new NBTTagCompound())); } if (this.owner != null) { final NBTTagCompound nbt = new NBTTagCompound(); NBTUtil.writeGameProfile(nbt, this.owner); - nbttagcompound.setTag("owner", nbt); + nbtCompound.setTag("owner", nbt); } if (this.caterpillar != null) { - nbttagcompound.setInteger("caterTime", this.matureTime); + nbtCompound.setInteger("caterTime", this.matureTime); final NBTTagCompound subcompound = new NBTTagCompound(); this.caterpillar.writeToNBT(subcompound); - nbttagcompound.setTag("cater", subcompound); + nbtCompound.setTag("cater", subcompound); } - nbttagcompound.setByte("section", (byte) this.getSection()); - return super.writeToNBT(nbttagcompound); + nbtCompound.setByte("section", (byte) getSection()); + return super.writeToNBT(nbtCompound); } public void create(final ItemStack stack, final GameProfile owner) { this.create(BotanyCore.getFlowerRoot().getMember(stack), owner); } - public void create(final IFlower stack, final GameProfile owner) { - this.flower = stack; + public void create(final IFlower flower, final GameProfile owner) { + this.flower = flower; if (this.flower.getAge() == 0) { this.flower.setFlowered(false); } @@ -536,8 +551,12 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt public void setRender(final RenderInfo render) { this.renderInfo = render; this.section = this.renderInfo.section; - worldObj.markBlockRangeForRenderUpdate(pos, pos); - worldObj.markChunkDirty(pos, this); + if(!worldObj.isRemote){ + IBlockState blockState = worldObj.getBlockState(pos); + worldObj.notifyBlockUpdate(pos, blockState, blockState, 0); + }else{ + worldObj.markBlockRangeForRenderUpdate(pos, pos); + } } public int getAge() { diff --git a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java index dd8253bc..161d1b84 100644 --- a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java @@ -84,8 +84,8 @@ public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerS } @Override - public ModelResourceLocation getFlowerModel(EnumFlowerStage type, boolean flowered, int section) { - return flowerType.getModel(type, flowered, section); + public ModelResourceLocation getFlowerModel(EnumFlowerStage type, boolean flowered) { + return flowerType.getModel(type, flowered); } @Override diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/src/main/java/binnie/botany/genetics/EnumFlowerType.java index 44e72920..4102b754 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -6,6 +6,7 @@ import binnie.Constants; import binnie.botany.api.EnumFlowerStage; import binnie.botany.api.IFlowerType; import forestry.api.core.IModelManager; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraftforge.fml.relauncher.Side; @@ -63,8 +64,7 @@ public enum EnumFlowerType implements IFlowerType { public static int highestSection = 2; int sections; - ModelResourceLocation[] flowered; - ModelResourceLocation[] unflowered; + ModelResourceLocation flower; ModelResourceLocation seed; ModelResourceLocation pollen; @@ -74,36 +74,27 @@ public enum EnumFlowerType implements IFlowerType { EnumFlowerType(final int sections) { this.sections = sections; - this.flowered = new ModelResourceLocation[sections]; - this.unflowered = new ModelResourceLocation[sections]; } @Override @SideOnly(Side.CLIENT) public void registerModels(Item item, IModelManager manager, EnumFlowerStage type){ - for (int i = 0; i < this.sections; ++i) { - final String suf = (i == 0) ? "" : ("" + (i + 1)); - final String pre = (this.sections == 1) ? "" : "double/"; - this.flowered[i] = new ModelResourceLocation(Constants.BOTANY_MOD_ID, "flowers/" + pre + this.toString().toLowerCase() + suf + "_flowered"); - this.unflowered[i] = new ModelResourceLocation(Constants.BOTANY_MOD_ID, "flowers/" + pre + this.toString().toLowerCase() + suf + "_unflowered"); - } - this.seed = new ModelResourceLocation(Constants.BOTANY_MOD_ID, "flowers/seed"); - this.pollen = new ModelResourceLocation(Constants.BOTANY_MOD_ID, "flowers/pollen"); + String pre = (this.sections == 1) ? "" : "double/"; + flower = new ModelResourceLocation(Constants.BOTANY_MOD_ID + "flowers/" + pre + this.toString().toLowerCase(), "inventory"); + seed = new ModelResourceLocation(Constants.BOTANY_MOD_ID + ":flowers/seed", "inventory"); + pollen = new ModelResourceLocation(Constants.BOTANY_MOD_ID + ":flowers/pollen", "inventory"); + ModelBakery.registerItemVariants(item, pollen, seed, flower); } @SideOnly(Side.CLIENT) @Override - public ModelResourceLocation getModel(EnumFlowerStage type, boolean flowered, int section) { + public ModelResourceLocation getModel(EnumFlowerStage type, boolean flowered) { if(type == EnumFlowerStage.SEED){ return seed; }else if(type == EnumFlowerStage.POLLEN){ return pollen; }else{ - if(flowered){ - return this.flowered[section % this.sections]; - }else{ - return unflowered[section % this.sections]; - } + return flower; } } diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index cad32619..47cd4cf0 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -927,6 +927,7 @@ public enum FlowerDefinition implements IFlowerDefinition { String branchName; List variantTemplates; IClassification branch; + EnumFlowerColor primaryColor, secondaryColor; private static void setupVariants() { IFlowerRoot flowerRood = BotanyCore.getFlowerRoot(); @@ -973,6 +974,8 @@ public enum FlowerDefinition implements IFlowerDefinition { this.binomial = binomial; this.branchName = branch; this.type = flowerType; + this.primaryColor = primaryColor; + this.secondaryColor = secondaryColor; IAlleleFlowerSpeciesBuilder speciesBuilder = FlowerManager.flowerFactory.createSpecies(uid, unlocalizedName, "Binnie's Mod Team", unlocalizedDescription, isDominant, getBranch(), binomial, flowerType); setSpeciesProperties(speciesBuilder); @@ -1070,6 +1073,8 @@ public enum FlowerDefinition implements IFlowerDefinition { template = Arrays.copyOf(FlowerTemplates.getDefaultTemplate(), EnumFlowerChromosome.values().length); AlleleHelper.instance.set(template, EnumFlowerChromosome.SPECIES, species); AlleleHelper.instance.set(template, EnumFlowerChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(template, EnumFlowerChromosome.PRIMARY, primaryColor); + AlleleHelper.instance.set(template, EnumFlowerChromosome.SECONDARY, secondaryColor); setAlleles(template); genome = BotanyCore.getFlowerRoot().templateAsGenome(template); diff --git a/src/main/java/binnie/botany/genetics/FlowerTemplates.java b/src/main/java/binnie/botany/genetics/FlowerTemplates.java index 14971dcf..7316f2c8 100644 --- a/src/main/java/binnie/botany/genetics/FlowerTemplates.java +++ b/src/main/java/binnie/botany/genetics/FlowerTemplates.java @@ -8,7 +8,8 @@ import forestry.core.genetics.alleles.EnumAllele; public class FlowerTemplates { public static IAllele[] getDefaultTemplate() { final IAllele[] alleles = new IAllele[EnumFlowerChromosome.values().length]; - AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SPECIES, FlowerDefinition.Dandelion.getSpecies()); + //TODO: Test flower reset + AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SPECIES, FlowerDefinition.Poppy.getSpecies()); AlleleHelper.instance.set(alleles, EnumFlowerChromosome.PRIMARY, EnumFlowerColor.Red); AlleleHelper.instance.set(alleles, EnumFlowerChromosome.SECONDARY, EnumFlowerColor.Red); AlleleHelper.instance.set(alleles, EnumFlowerChromosome.FERTILITY, EnumAllele.Fertility.NORMAL); diff --git a/src/main/resources/assets/botany/blockstates/flower.json b/src/main/resources/assets/botany/blockstates/flower.json index 5d0d2718..535660bc 100644 --- a/src/main/resources/assets/botany/blockstates/flower.json +++ b/src/main/resources/assets/botany/blockstates/flower.json @@ -4,10 +4,10 @@ "flower=agapanthus,flowered=true": { "model": "botany:flowers/agapanthus_flowered" }, "flower=allium,flowered=false": { "model": "botany:flowers/allium" }, "flower=allium,flowered=true": { "model": "botany:flowers/allium_flowered" }, - "flower=althea,flowered=false,section=0": { "model": "botany:flowers/double/althea" }, - "flower=althea,flowered=false,section=1": { "model": "botany:flowers/double/althea" }, - "flower=althea,flowered=true,section=0": { "model": "botany:flowers/double/althea_flowered" }, - "flower=althea,flowered=true,section=1": { "model": "botany:flowers/double/althea_flowered" }, + "flower=althea,flowered=false,section=0": { "model": "botany:flowers/double/althea_0" }, + "flower=althea,flowered=false,section=1": { "model": "botany:flowers/double/althea_1" }, + "flower=althea,flowered=true,section=0": { "model": "botany:flowers/double/althea_0_flowered" }, + "flower=althea,flowered=true,section=1": { "model": "botany:flowers/double/althea_1_flowered" }, "flower=anemone,flowered=false": { "model": "botany:flowers/anemone" }, "flower=anemone,flowered=true": { "model": "botany:flowers/anemone_flowered" }, "flower=aquilegia,flowered=false": { "model": "botany:flowers/aquilegia" }, @@ -20,10 +20,10 @@ "flower=azalea,flowered=true": { "model": "botany:flowers/azalea_flowered" }, "flower=bluet,flowered=false": { "model": "botany:flowers/bluet" }, "flower=bluet,flowered=true": { "model": "botany:flowers/bluet_flowered" }, - "flower=camellia,flowered=false,section=0": { "model": "botany:flowers/double/camellia" }, - "flower=camellia,flowered=false,section=1": { "model": "botany:flowers/double/camellia" }, - "flower=camellia,flowered=true,section=0": { "model": "botany:flowers/double/camellia_flowered" }, - "flower=camellia,flowered=true,section=1": { "model": "botany:flowers/double/camellia_flowered" }, + "flower=camellia,flowered=false,section=0": { "model": "botany:flowers/double/camellia_0" }, + "flower=camellia,flowered=false,section=1": { "model": "botany:flowers/double/camellia_1" }, + "flower=camellia,flowered=true,section=0": { "model": "botany:flowers/double/camellia_0_flowered" }, + "flower=camellia,flowered=true,section=1": { "model": "botany:flowers/double/camellia_1_flowered" }, "flower=carnation,flowered=false": { "model": "botany:flowers/carnation" }, "flower=carnation,flowered=true": { "model": "botany:flowers/carnation_flowered" }, "flower=coneflower,flowered=false": { "model": "botany:flowers/coneflower" }, @@ -38,48 +38,48 @@ "flower=daisy,flowered=true": { "model": "botany:flowers/daisy_flowered" }, "flower=dandelion,flowered=false": { "model": "botany:flowers/dandelion" }, "flower=dandelion,flowered=true": { "model": "botany:flowers/dandelion_flowered" }, - "flower=delphinium,flowered=false,section=0": { "model": "botany:flowers/double/delphinium" }, - "flower=delphinium,flowered=false,section=1": { "model": "botany:flowers/double/delphinium" }, - "flower=delphinium,flowered=true,section=0": { "model": "botany:flowers/double/delphinium_flowered" }, - "flower=delphinium,flowered=true,section=1": { "model": "botany:flowers/double/delphinium_flowered" }, + "flower=delphinium,flowered=false,section=0": { "model": "botany:flowers/double/delphinium_0" }, + "flower=delphinium,flowered=false,section=1": { "model": "botany:flowers/double/delphinium_1" }, + "flower=delphinium,flowered=true,section=0": { "model": "botany:flowers/double/delphinium_0_flowered" }, + "flower=delphinium,flowered=true,section=1": { "model": "botany:flowers/double/delphinium_1_flowered" }, "flower=dianthus,flowered=false": { "model": "botany:flowers/dianthus" }, "flower=dianthus,flowered=true": { "model": "botany:flowers/dianthus_flowered" }, "flower=edelweiss,flowered=false": { "model": "botany:flowers/edelweiss" }, "flower=edelweiss,flowered=true": { "model": "botany:flowers/edelweiss_flowered" }, "flower=forget,flowered=false": { "model": "botany:flowers/forget" }, "flower=forget,flowered=true": { "model": "botany:flowers/forget_flowered" }, - "flower=foxglove,flowered=false,section=0": { "model": "botany:flowers/double/foxglove" }, - "flower=foxglove,flowered=false,section=1": { "model": "botany:flowers/double/foxglove" }, - "flower=foxglove,flowered=true,section=0": { "model": "botany:flowers/double/foxglove_flowered" }, - "flower=foxglove,flowered=true,section=1": { "model": "botany:flowers/double/foxglove_flowered" }, + "flower=foxglove,flowered=false,section=0": { "model": "botany:flowers/double/foxglove_0" }, + "flower=foxglove,flowered=false,section=1": { "model": "botany:flowers/double/foxglove_1" }, + "flower=foxglove,flowered=true,section=0": { "model": "botany:flowers/double/foxglove_0_flowered" }, + "flower=foxglove,flowered=true,section=1": { "model": "botany:flowers/double/foxglove_1_flowered" }, "flower=fuchsia,flowered=false": { "model": "botany:flowers/fuchsia" }, "flower=fuchsia,flowered=true": { "model": "botany:flowers/fuchsia_flowered" }, "flower=gaillardia,flowered=false": { "model": "botany:flowers/gaillardia" }, "flower=gaillardia,flowered=true": { "model": "botany:flowers/gaillardia_flowered" }, "flower=geranium,flowered=false": { "model": "botany:flowers/geranium" }, "flower=geranium,flowered=true": { "model": "botany:flowers/geranium_flowered" }, - "flower=goldenrod,flowered=false,section=0": { "model": "botany:flowers/double/goldenrod" }, - "flower=goldenrod,flowered=false,section=1": { "model": "botany:flowers/double/goldenrod" }, - "flower=goldenrod,flowered=true,section=0": { "model": "botany:flowers/double/goldenrod_flowered" }, - "flower=goldenrod,flowered=true,section=1": { "model": "botany:flowers/double/goldenrod_flowered" }, - "flower=hollyhock,flowered=false,section=0": { "model": "botany:flowers/double/hollyhock" }, - "flower=hollyhock,flowered=false,section=1": { "model": "botany:flowers/double/hollyhock" }, - "flower=hollyhock,flowered=true,section=0": { "model": "botany:flowers/double/hollyhock_flowered" }, - "flower=hollyhock,flowered=true,section=1": { "model": "botany:flowers/double/hollyhock_flowered" }, - "flower=hydrangea,flowered=false,section=0": { "model": "botany:flowers/double/hydrangea" }, - "flower=hydrangea,flowered=false,section=1": { "model": "botany:flowers/double/hydrangea" }, - "flower=hydrangea,flowered=true,section=0": { "model": "botany:flowers/double/hydrangea_flowered" }, - "flower=hydrangea,flowered=true,section=1": { "model": "botany:flowers/double/hydrangea_flowered" }, + "flower=goldenrod,flowered=false,section=0": { "model": "botany:flowers/double/goldenrod_0" }, + "flower=goldenrod,flowered=false,section=1": { "model": "botany:flowers/double/goldenrod_1" }, + "flower=goldenrod,flowered=true,section=0": { "model": "botany:flowers/double/goldenrod_0_flowered" }, + "flower=goldenrod,flowered=true,section=1": { "model": "botany:flowers/double/goldenrod_1_flowered" }, + "flower=hollyhock,flowered=false,section=0": { "model": "botany:flowers/double/hollyhock_0" }, + "flower=hollyhock,flowered=false,section=1": { "model": "botany:flowers/double/hollyhock_1" }, + "flower=hollyhock,flowered=true,section=0": { "model": "botany:flowers/double/hollyhock_0_flowered" }, + "flower=hollyhock,flowered=true,section=1": { "model": "botany:flowers/double/hollyhock_1_flowered" }, + "flower=hydrangea,flowered=false,section=0": { "model": "botany:flowers/double/hydrangea_0" }, + "flower=hydrangea,flowered=false,section=1": { "model": "botany:flowers/double/hydrangea_1" }, + "flower=hydrangea,flowered=true,section=0": { "model": "botany:flowers/double/hydrangea_0_flowered" }, + "flower=hydrangea,flowered=true,section=1": { "model": "botany:flowers/double/hydrangea_1_flowered" }, "flower=iris,flowered=false": { "model": "botany:flowers/iris" }, "flower=iris,flowered=true": { "model": "botany:flowers/iris_flowered" }, - "flower=lavender,flowered=false,section=0": { "model": "botany:flowers/double/lavender" }, - "flower=lavender,flowered=false,section=1": { "model": "botany:flowers/double/lavender" }, - "flower=lavender,flowered=true,section=0": { "model": "botany:flowers/double/lavender_flowered" }, - "flower=lavender,flowered=true,section=1": { "model": "botany:flowers/double/lavender_flowered" }, - "flower=lilac,flowered=false,section=0": { "model": "botany:flowers/double/lilac" }, - "flower=lilac,flowered=false,section=1": { "model": "botany:flowers/double/lilac" }, - "flower=lilac,flowered=true,section=0": { "model": "botany:flowers/double/lilac_flowered" }, - "flower=lilac,flowered=true,section=1": { "model": "botany:flowers/double/lilac_flowered" }, + "flower=lavender,flowered=false,section=0": { "model": "botany:flowers/double/lavender_0" }, + "flower=lavender,flowered=false,section=1": { "model": "botany:flowers/double/lavender_1" }, + "flower=lavender,flowered=true,section=0": { "model": "botany:flowers/double/lavender_0_flowered" }, + "flower=lavender,flowered=true,section=1": { "model": "botany:flowers/double/lavender_1_flowered" }, + "flower=lilac,flowered=false,section=0": { "model": "botany:flowers/double/lilac_0" }, + "flower=lilac,flowered=false,section=1": { "model": "botany:flowers/double/lilac_1" }, + "flower=lilac,flowered=true,section=0": { "model": "botany:flowers/double/lilac_0_flowered" }, + "flower=lilac,flowered=true,section=1": { "model": "botany:flowers/double/lilac_1_flowered" }, "flower=lily,flowered=false": { "model": "botany:flowers/lily" }, "flower=lily,flowered=true": { "model": "botany:flowers/lily_flowered" }, "flower=marigold,flowered=false": { "model": "botany:flowers/marigold" }, @@ -90,24 +90,24 @@ "flower=orchid,flowered=true": { "model": "botany:flowers/orchid_flowered" }, "flower=pansy,flowered=false": { "model": "botany:flowers/pansy" }, "flower=pansy,flowered=true": { "model": "botany:flowers/pansy_flowered" }, - "flower=penstemon,flowered=false,section=0": { "model": "botany:flowers/double/penstemon" }, - "flower=penstemon,flowered=false,section=1": { "model": "botany:flowers/double/penstemon" }, - "flower=penstemon,flowered=true,section=0": { "model": "botany:flowers/double/penstemon_flowered" }, - "flower=penstemon,flowered=true,section=1": { "model": "botany:flowers/double/penstemon_flowered" }, - "flower=peony,flowered=false,section=0": { "model": "botany:flowers/double/peony" }, - "flower=peony,flowered=false,section=1": { "model": "botany:flowers/double/peony" }, - "flower=peony,flowered=true,section=0": { "model": "botany:flowers/double/peony_flowered" }, - "flower=peony,flowered=true,section=1": { "model": "botany:flowers/double/peony_flowered" }, + "flower=penstemon,flowered=false,section=0": { "model": "botany:flowers/double/penstemon_0" }, + "flower=penstemon,flowered=false,section=1": { "model": "botany:flowers/double/penstemon_1" }, + "flower=penstemon,flowered=true,section=0": { "model": "botany:flowers/double/penstemon_0_flowered" }, + "flower=penstemon,flowered=true,section=1": { "model": "botany:flowers/double/penstemon_1_flowered" }, + "flower=peony,flowered=false,section=0": { "model": "botany:flowers/double/peony_0" }, + "flower=peony,flowered=false,section=1": { "model": "botany:flowers/double/peony_1" }, + "flower=peony,flowered=true,section=0": { "model": "botany:flowers/double/peony_0_flowered" }, + "flower=peony,flowered=true,section=1": { "model": "botany:flowers/double/peony_1_flowered" }, "flower=petunia,flowered=false": { "model": "botany:flowers/petunia" }, "flower=petunia,flowered=true": { "model": "botany:flowers/petunia_flowered" }, "flower=poppy,flowered=false": { "model": "botany:flowers/poppy" }, "flower=poppy,flowered=true": { "model": "botany:flowers/poppy_flowered" }, "flower=primrose,flowered=false": { "model": "botany:flowers/primrose" }, "flower=primrose,flowered=true": { "model": "botany:flowers/primrose_flowered" }, - "flower=rose,flowered=false,section=0": { "model": "botany:flowers/double/rose" }, - "flower=rose,flowered=false,section=1": { "model": "botany:flowers/double/rose" }, - "flower=rose,flowered=true,section=0": { "model": "botany:flowers/double/rose_flowered" }, - "flower=rose,flowered=true,section=1": { "model": "botany:flowers/double/rose_flowered" }, + "flower=rose,flowered=false,section=0": { "model": "botany:flowers/double/rose_0" }, + "flower=rose,flowered=false,section=1": { "model": "botany:flowers/double/rose_1" }, + "flower=rose,flowered=true,section=0": { "model": "botany:flowers/double/rose_0_flowered" }, + "flower=rose,flowered=true,section=1": { "model": "botany:flowers/double/rose_1_flowered" }, "flower=scabious,flowered=false": { "model": "botany:flowers/scabious" }, "flower=scabious,flowered=true": { "model": "botany:flowers/scabious_flowered" }, "flower=tulip,flowered=false": { "model": "botany:flowers/tulip" }, @@ -117,6 +117,7 @@ "flower=yarrow,flowered=false": { "model": "botany:flowers/yarrow" }, "flower=yarrow,flowered=true": { "model": "botany:flowers/yarrow_flowered" }, "flower=zinnia,flowered=false": { "model": "botany:flowers/zinnia" }, - "flower=zinnia,flowered=true": { "model": "botany:flowers/zinnia_flowered" } + "flower=zinnia,flowered=true": { "model": "botany:flowers/zinnia_flowered" }, + "seed=true": { "model": "botany:flowers/seed" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/flowerbed.json b/src/main/resources/assets/botany/blockstates/flowerbed.json index bf656267..bbb668c0 100644 --- a/src/main/resources/assets/botany/blockstates/flowerbed.json +++ b/src/main/resources/assets/botany/blockstates/flowerbed.json @@ -1,13 +1,13 @@ { "variants": { - "acidity=neutral,moisture=normal": { "model": "botany:flowerbed/normal" }, - "acidity=neutral,moisture=dry": { "model": "botany:flowerbed/dry" }, - "acidity=neutral,moisture=damp": { "model": "botany:flowerbed/damp" }, - "acidity=acid,moisture=normal": { "model": "botany:flowerbed/acid" }, - "acidity=acid,moisture=dry": { "model": "botany:flowerbed/acid_dry" }, - "acidity=acid,moisture=damp": { "model": "botany:flowerbed/acid_damp" }, - "acidity=alkaline,moisture=normal": { "model": "botany:flowerbed/alkaline" }, - "acidity=alkaline,moisture=dry": { "model": "botany:flowerbed/alkaline_dry" }, - "acidity=alkaline,moisture=damp": { "model": "botany:flowerbed/alkaline_damp" } + "acidity=acid,moisture=damp": { "model": "botany:flowerbed/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:flowerbed/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:flowerbed/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:flowerbed/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:flowerbed/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:flowerbed/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:flowerbed/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:flowerbed/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:flowerbed/normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json b/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json index 5b94c2e7..b89a1e1c 100644 --- a/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json +++ b/src/main/resources/assets/botany/blockstates/flowerbedNoWeed.json @@ -1,13 +1,13 @@ { "variants": { - "acidity=neutral,moisture=normal": { "model": "botany:flowerbedNoWeed/normal" }, - "acidity=neutral,moisture=dry": { "model": "botany:flowerbedNoWeed/dry" }, - "acidity=neutral,moisture=damp": { "model": "botany:flowerbedNoWeed/damp" }, - "acidity=acid,moisture=normal": { "model": "botany:flowerbedNoWeed/acid" }, - "acidity=acid,moisture=dry": { "model": "botany:flowerbedNoWeed/acid_dry" }, - "acidity=acid,moisture=damp": { "model": "botany:flowerbedNoWeed/acid_damp" }, - "acidity=alkaline,moisture=normal": { "model": "botany:flowerbedNoWeed/alkaline" }, - "acidity=alkaline,moisture=dry": { "model": "botany:flowerbedNoWeed/alkaline_dry" }, - "acidity=alkaline,moisture=damp": { "model": "botany:flowerbedNoWeed/alkaline_damp" } + "acidity=acid,moisture=damp": { "model": "botany:flowerbedNoWeed/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:flowerbedNoWeed/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:flowerbedNoWeed/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:flowerbedNoWeed/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:flowerbedNoWeed/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:flowerbedNoWeed/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:flowerbedNoWeed/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:flowerbedNoWeed/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:flowerbedNoWeed/normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/loam.json b/src/main/resources/assets/botany/blockstates/loam.json index 746afbf1..1cd733aa 100644 --- a/src/main/resources/assets/botany/blockstates/loam.json +++ b/src/main/resources/assets/botany/blockstates/loam.json @@ -1,13 +1,13 @@ { "variants": { - "acidity=neutral,moisture=normal": { "model": "botany:loam/normal" }, - "acidity=neutral,moisture=dry": { "model": "botany:loam/dry" }, - "acidity=neutral,moisture=damp": { "model": "botany:loam/damp" }, - "acidity=acid,moisture=normal": { "model": "botany:loam/acid" }, - "acidity=acid,moisture=dry": { "model": "botany:loam/acid_dry" }, - "acidity=acid,moisture=damp": { "model": "botany:loam/acid_damp" }, - "acidity=alkaline,moisture=normal": { "model": "botany:loam/alkaline" }, - "acidity=alkaline,moisture=dry": { "model": "botany:loam/alkaline_dry" }, - "acidity=alkaline,moisture=damp": { "model": "botany:loam/alkaline_damp" } + "acidity=acid,moisture=damp": { "model": "botany:loam/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:loam/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:loam/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:loam/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:loam/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:loam/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:loam/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:loam/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:loam/normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/loamNoWeed.json b/src/main/resources/assets/botany/blockstates/loamNoWeed.json index 2d6a4222..582759ca 100644 --- a/src/main/resources/assets/botany/blockstates/loamNoWeed.json +++ b/src/main/resources/assets/botany/blockstates/loamNoWeed.json @@ -1,13 +1,13 @@ { "variants": { - "acidity=neutral,moisture=normal": { "model": "botany:loamNoWeed/normal" }, - "acidity=neutral,moisture=dry": { "model": "botany:loamNoWeed/dry" }, - "acidity=neutral,moisture=damp": { "model": "botany:loamNoWeed/damp" }, - "acidity=acid,moisture=normal": { "model": "botany:loamNoWeed/acid" }, - "acidity=acid,moisture=dry": { "model": "botany:loamNoWeed/acid_dry" }, - "acidity=acid,moisture=damp": { "model": "botany:loamNoWeed/acid_damp" }, - "acidity=alkaline,moisture=normal": { "model": "botany:loamNoWeed/alkaline" }, - "acidity=alkaline,moisture=dry": { "model": "botany:loamNoWeed/alkaline_dry" }, - "acidity=alkaline,moisture=damp": { "model": "botany:loamNoWeed/alkaline_damp" } + "acidity=acid,moisture=damp": { "model": "botany:loamNoWeed/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:loamNoWeed/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:loamNoWeed/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:loamNoWeed/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:loamNoWeed/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:loamNoWeed/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:loamNoWeed/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:loamNoWeed/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:loamNoWeed/normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/plant.json b/src/main/resources/assets/botany/blockstates/plant.json index 0b990e01..342bf308 100644 --- a/src/main/resources/assets/botany/blockstates/plant.json +++ b/src/main/resources/assets/botany/blockstates/plant.json @@ -1,9 +1,9 @@ { "variants": { + "plant_type=dead_flower": { "model": "botany:dead_flower" }, + "plant_type=decaying_flower": { "model": "botany:decaying_flower" }, "plant_type=weeds": { "model": "botany:weeds" }, - "plant_type=weeds_long": { "model": "botany:weeds_long" }, - "plant_type=weeds_very_long": { "model": "botany:weeds_very_long" }, - "plant_type=dead_flower": { "model": "botany:dead_flower" }, - "plant_type=decaying_flower": { "model": "botany:decaying_flower" } + "plant_type=weeds_long": { "model": "botany:weeds_long" }, + "plant_type=weeds_very_long": { "model": "botany:weeds_very_long" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/soil.json b/src/main/resources/assets/botany/blockstates/soil.json index 248d4e5a..b4d58b65 100644 --- a/src/main/resources/assets/botany/blockstates/soil.json +++ b/src/main/resources/assets/botany/blockstates/soil.json @@ -1,13 +1,13 @@ { "variants": { - "acidity=neutral,moisture=normal": { "model": "botany:soil/normal" }, - "acidity=neutral,moisture=dry": { "model": "botany:soil/dry" }, - "acidity=neutral,moisture=damp": { "model": "botany:soil/damp" }, - "acidity=acid,moisture=normal": { "model": "botany:soil/acid" }, - "acidity=acid,moisture=dry": { "model": "botany:soil/acid_dry" }, - "acidity=acid,moisture=damp": { "model": "botany:soil/acid_damp" }, - "acidity=alkaline,moisture=normal": { "model": "botany:soil/alkaline" }, - "acidity=alkaline,moisture=dry": { "model": "botany:soil/alkaline_dry" }, - "acidity=alkaline,moisture=damp": { "model": "botany:soil/alkaline_damp" } + "acidity=acid,moisture=damp": { "model": "botany:soil/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:soil/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:soil/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:soil/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:soil/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:soil/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:soil/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:soil/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:soil/normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/blockstates/soilNoWeed.json b/src/main/resources/assets/botany/blockstates/soilNoWeed.json index 6ba0abce..a72068ba 100644 --- a/src/main/resources/assets/botany/blockstates/soilNoWeed.json +++ b/src/main/resources/assets/botany/blockstates/soilNoWeed.json @@ -1,13 +1,13 @@ { "variants": { - "acidity=neutral,moisture=normal": { "model": "botany:soilNoWeed/normal" }, - "acidity=neutral,moisture=dry": { "model": "botany:soilNoWeed/dry" }, - "acidity=neutral,moisture=damp": { "model": "botany:soilNoWeed/damp" }, - "acidity=acid,moisture=normal": { "model": "botany:soilNoWeed/acid" }, - "acidity=acid,moisture=dry": { "model": "botany:soilNoWeed/acid_dry" }, - "acidity=acid,moisture=damp": { "model": "botany:soilNoWeed/acid_damp" }, - "acidity=alkaline,moisture=normal": { "model": "botany:soilNoWeed/alkaline" }, - "acidity=alkaline,moisture=dry": { "model": "botany:soilNoWeed/alkaline_dry" }, - "acidity=alkaline,moisture=damp": { "model": "botany:soilNoWeed/alkaline_damp" } + "acidity=acid,moisture=damp": { "model": "botany:soilNoWeed/acid_damp" }, + "acidity=acid,moisture=dry": { "model": "botany:soilNoWeed/acid_dry" }, + "acidity=acid,moisture=normal": { "model": "botany:soilNoWeed/acid" }, + "acidity=alkaline,moisture=damp": { "model": "botany:soilNoWeed/alkaline_damp" }, + "acidity=alkaline,moisture=dry": { "model": "botany:soilNoWeed/alkaline_dry" }, + "acidity=alkaline,moisture=normal": { "model": "botany:soilNoWeed/alkaline" }, + "acidity=neutral,moisture=damp": { "model": "botany:soilNoWeed/damp" }, + "acidity=neutral,moisture=dry": { "model": "botany:soilNoWeed/dry" }, + "acidity=neutral,moisture=normal": { "model": "botany:soilNoWeed/normal" } } } \ No newline at end of file diff --git a/src/main/resources/assets/botany/models/block/flowers/agapanthus.json b/src/main/resources/assets/botany/models/block/flowers/agapanthus.json new file mode 100644 index 00000000..d1da6814 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/agapanthus.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/agapanthus.0", + "petal": "botany:blocks/flowers/agapanthus.1", + "variant": "botany:blocks/flowers/agapanthus.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json b/src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json new file mode 100644 index 00000000..3dc87434 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/agapanthus_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/agapanthus.0", + "petal": "botany:blocks/flowers/agapanthus.1", + "variant": "botany:blocks/flowers/agapanthus.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/allium.json b/src/main/resources/assets/botany/models/block/flowers/allium.json new file mode 100644 index 00000000..ea097c71 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/allium.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/allium.0", + "petal": "botany:blocks/flowers/allium.1", + "variant": "botany:blocks/flowers/allium.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/allium_flowered.json b/src/main/resources/assets/botany/models/block/flowers/allium_flowered.json new file mode 100644 index 00000000..a76f2441 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/allium_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/allium.0", + "petal": "botany:blocks/flowers/allium.1", + "variant": "botany:blocks/flowers/allium.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/anemone.json b/src/main/resources/assets/botany/models/block/flowers/anemone.json new file mode 100644 index 00000000..64ca369a --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/anemone.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/anemone.0", + "petal": "botany:blocks/flowers/anemone.1", + "variant": "botany:blocks/flowers/anemone.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json b/src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json new file mode 100644 index 00000000..5eba1c2f --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/anemone_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/anemone.0", + "petal": "botany:blocks/flowers/anemone.1", + "variant": "botany:blocks/flowers/anemone.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/aquilegia.json b/src/main/resources/assets/botany/models/block/flowers/aquilegia.json new file mode 100644 index 00000000..f0b41bec --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/aquilegia.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/aquilegia.0", + "petal": "botany:blocks/flowers/aquilegia.1", + "variant": "botany:blocks/flowers/aquilegia.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json b/src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json new file mode 100644 index 00000000..476b0917 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/aquilegia_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/aquilegia.0", + "petal": "botany:blocks/flowers/aquilegia.1", + "variant": "botany:blocks/flowers/aquilegia.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/aster.json b/src/main/resources/assets/botany/models/block/flowers/aster.json new file mode 100644 index 00000000..447f4570 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/aster.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/aster.0", + "petal": "botany:blocks/flowers/aster.1", + "variant": "botany:blocks/flowers/aster.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/aster_flowered.json b/src/main/resources/assets/botany/models/block/flowers/aster_flowered.json new file mode 100644 index 00000000..28525f1b --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/aster_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/aster.0", + "petal": "botany:blocks/flowers/aster.1", + "variant": "botany:blocks/flowers/aster.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/auricula.json b/src/main/resources/assets/botany/models/block/flowers/auricula.json new file mode 100644 index 00000000..a6e3aeaf --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/auricula.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/auricula.0", + "petal": "botany:blocks/flowers/auricula.1", + "variant": "botany:blocks/flowers/auricula.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json b/src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json new file mode 100644 index 00000000..6da716e4 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/auricula_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/auricula.0", + "petal": "botany:blocks/flowers/auricula.1", + "variant": "botany:blocks/flowers/auricula.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/azalea.json b/src/main/resources/assets/botany/models/block/flowers/azalea.json new file mode 100644 index 00000000..4e6e83e3 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/azalea.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/azalea.0", + "petal": "botany:blocks/flowers/azalea.1", + "variant": "botany:blocks/flowers/azalea.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json b/src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json new file mode 100644 index 00000000..f4b328f3 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/azalea_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/azalea.0", + "petal": "botany:blocks/flowers/azalea.1", + "variant": "botany:blocks/flowers/azalea.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/bluet.json b/src/main/resources/assets/botany/models/block/flowers/bluet.json new file mode 100644 index 00000000..abf1f43c --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/bluet.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/bluet.0", + "petal": "botany:blocks/flowers/bluet.1", + "variant": "botany:blocks/flowers/bluet.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json b/src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json new file mode 100644 index 00000000..2918d265 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/bluet_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/bluet.0", + "petal": "botany:blocks/flowers/bluet.1", + "variant": "botany:blocks/flowers/bluet.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/carnation.json b/src/main/resources/assets/botany/models/block/flowers/carnation.json new file mode 100644 index 00000000..c3cfbc36 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/carnation.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/carnation.0", + "petal": "botany:blocks/flowers/carnation.1", + "variant": "botany:blocks/flowers/carnation.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json b/src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json new file mode 100644 index 00000000..81c648d0 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/carnation_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/carnation.0", + "petal": "botany:blocks/flowers/carnation.1", + "variant": "botany:blocks/flowers/carnation.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/coneflower.json b/src/main/resources/assets/botany/models/block/flowers/coneflower.json new file mode 100644 index 00000000..c54cd9a9 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/coneflower.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/coneflower.0", + "petal": "botany:blocks/flowers/coneflower.1", + "variant": "botany:blocks/flowers/coneflower.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json b/src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json new file mode 100644 index 00000000..d868c9c0 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/coneflower_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/coneflower.0", + "petal": "botany:blocks/flowers/coneflower.1", + "variant": "botany:blocks/flowers/coneflower.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/cornflower.json b/src/main/resources/assets/botany/models/block/flowers/cornflower.json new file mode 100644 index 00000000..3688c512 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/cornflower.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/cornflower.0", + "petal": "botany:blocks/flowers/cornflower.1", + "variant": "botany:blocks/flowers/cornflower.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json b/src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json new file mode 100644 index 00000000..07823bcb --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/cornflower_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/cornflower.0", + "petal": "botany:blocks/flowers/cornflower.1", + "variant": "botany:blocks/flowers/cornflower.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/daffodil.json b/src/main/resources/assets/botany/models/block/flowers/daffodil.json new file mode 100644 index 00000000..b7d01930 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/daffodil.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/daffodil.0", + "petal": "botany:blocks/flowers/daffodil.1", + "variant": "botany:blocks/flowers/daffodil.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json b/src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json new file mode 100644 index 00000000..7905ffc0 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/daffodil_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/daffodil.0", + "petal": "botany:blocks/flowers/daffodil.1", + "variant": "botany:blocks/flowers/daffodil.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/dahlia.json b/src/main/resources/assets/botany/models/block/flowers/dahlia.json new file mode 100644 index 00000000..88cd6eb2 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/dahlia.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/dahlia.0", + "petal": "botany:blocks/flowers/dahlia.1", + "variant": "botany:blocks/flowers/dahlia.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json b/src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json new file mode 100644 index 00000000..43dd24d4 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/dahlia_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/dahlia.0", + "petal": "botany:blocks/flowers/dahlia.1", + "variant": "botany:blocks/flowers/dahlia.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/daisy.json b/src/main/resources/assets/botany/models/block/flowers/daisy.json new file mode 100644 index 00000000..e3b5c566 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/daisy.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/daisy.0", + "petal": "botany:blocks/flowers/daisy.1", + "variant": "botany:blocks/flowers/daisy.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json b/src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json new file mode 100644 index 00000000..7b262759 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/daisy_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/daisy.0", + "petal": "botany:blocks/flowers/daisy.1", + "variant": "botany:blocks/flowers/daisy.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/dianthus.json b/src/main/resources/assets/botany/models/block/flowers/dianthus.json new file mode 100644 index 00000000..ef3665d4 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/dianthus.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/dianthus.0", + "petal": "botany:blocks/flowers/dianthus.1", + "variant": "botany:blocks/flowers/dianthus.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json b/src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json new file mode 100644 index 00000000..319310c7 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/dianthus_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/dianthus.0", + "petal": "botany:blocks/flowers/dianthus.1", + "variant": "botany:blocks/flowers/dianthus.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/edelweiss.json b/src/main/resources/assets/botany/models/block/flowers/edelweiss.json new file mode 100644 index 00000000..74e9d418 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/edelweiss.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/edelweiss.0", + "petal": "botany:blocks/flowers/edelweiss.1", + "variant": "botany:blocks/flowers/edelweiss.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json b/src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json new file mode 100644 index 00000000..32b3ccec --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/edelweiss_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/edelweiss.0", + "petal": "botany:blocks/flowers/edelweiss.1", + "variant": "botany:blocks/flowers/edelweiss.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/forget.json b/src/main/resources/assets/botany/models/block/flowers/forget.json new file mode 100644 index 00000000..0ab0c94d --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/forget.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/forget.0", + "petal": "botany:blocks/flowers/forget.1", + "variant": "botany:blocks/flowers/forget.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/forget_flowered.json b/src/main/resources/assets/botany/models/block/flowers/forget_flowered.json new file mode 100644 index 00000000..2d524003 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/forget_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/forget.0", + "petal": "botany:blocks/flowers/forget.1", + "variant": "botany:blocks/flowers/forget.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/fuchsia.json b/src/main/resources/assets/botany/models/block/flowers/fuchsia.json new file mode 100644 index 00000000..af83202a --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/fuchsia.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/fuchsia.0", + "petal": "botany:blocks/flowers/fuchsia.1", + "variant": "botany:blocks/flowers/fuchsia.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json b/src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json new file mode 100644 index 00000000..96fddd07 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/fuchsia_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/fuchsia.0", + "petal": "botany:blocks/flowers/fuchsia.1", + "variant": "botany:blocks/flowers/fuchsia.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/gaillardia.json b/src/main/resources/assets/botany/models/block/flowers/gaillardia.json new file mode 100644 index 00000000..e4bcadb7 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/gaillardia.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/gaillardia.0", + "petal": "botany:blocks/flowers/gaillardia.1", + "variant": "botany:blocks/flowers/gaillardia.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json b/src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json new file mode 100644 index 00000000..c37ab26e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/gaillardia_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/gaillardia.0", + "petal": "botany:blocks/flowers/gaillardia.1", + "variant": "botany:blocks/flowers/gaillardia.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/geranium.json b/src/main/resources/assets/botany/models/block/flowers/geranium.json new file mode 100644 index 00000000..144f990e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/geranium.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/geranium.0", + "petal": "botany:blocks/flowers/geranium.1", + "variant": "botany:blocks/flowers/geranium.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json b/src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json new file mode 100644 index 00000000..3b644165 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/geranium_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/geranium.0", + "petal": "botany:blocks/flowers/geranium.1", + "variant": "botany:blocks/flowers/geranium.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/iris.json b/src/main/resources/assets/botany/models/block/flowers/iris.json new file mode 100644 index 00000000..c558e3f5 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/iris.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/iris.0", + "petal": "botany:blocks/flowers/iris.1", + "variant": "botany:blocks/flowers/iris.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/iris_flowered.json b/src/main/resources/assets/botany/models/block/flowers/iris_flowered.json new file mode 100644 index 00000000..884fe9c5 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/iris_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/iris.0", + "petal": "botany:blocks/flowers/iris.1", + "variant": "botany:blocks/flowers/iris.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/lily.json b/src/main/resources/assets/botany/models/block/flowers/lily.json new file mode 100644 index 00000000..1fae0221 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/lily.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/lily.0", + "petal": "botany:blocks/flowers/lily.1", + "variant": "botany:blocks/flowers/lily.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/lily_flowered.json b/src/main/resources/assets/botany/models/block/flowers/lily_flowered.json new file mode 100644 index 00000000..449c6675 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/lily_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/lily.0", + "petal": "botany:blocks/flowers/lily.1", + "variant": "botany:blocks/flowers/lily.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/marigold.json b/src/main/resources/assets/botany/models/block/flowers/marigold.json new file mode 100644 index 00000000..72bce49e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/marigold.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/marigold.0", + "petal": "botany:blocks/flowers/marigold.1", + "variant": "botany:blocks/flowers/marigold.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json b/src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json new file mode 100644 index 00000000..e27b7c5a --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/marigold_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/marigold.0", + "petal": "botany:blocks/flowers/marigold.1", + "variant": "botany:blocks/flowers/marigold.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/mums.json b/src/main/resources/assets/botany/models/block/flowers/mums.json new file mode 100644 index 00000000..2a296076 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/mums.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/mums.0", + "petal": "botany:blocks/flowers/mums.1", + "variant": "botany:blocks/flowers/mums.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/mums_flowered.json b/src/main/resources/assets/botany/models/block/flowers/mums_flowered.json new file mode 100644 index 00000000..4c2ee4fb --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/mums_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/mums.0", + "petal": "botany:blocks/flowers/mums.1", + "variant": "botany:blocks/flowers/mums.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/orchid.json b/src/main/resources/assets/botany/models/block/flowers/orchid.json new file mode 100644 index 00000000..2182d890 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/orchid.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/orchid.0", + "petal": "botany:blocks/flowers/orchid.1", + "variant": "botany:blocks/flowers/orchid.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json b/src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json new file mode 100644 index 00000000..85fd79d5 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/orchid_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/orchid.0", + "petal": "botany:blocks/flowers/orchid.1", + "variant": "botany:blocks/flowers/orchid.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/pansy.json b/src/main/resources/assets/botany/models/block/flowers/pansy.json new file mode 100644 index 00000000..0cd733ae --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/pansy.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/pansy.0", + "petal": "botany:blocks/flowers/pansy.1", + "variant": "botany:blocks/flowers/pansy.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json b/src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json new file mode 100644 index 00000000..035abfc9 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/pansy_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/pansy.0", + "petal": "botany:blocks/flowers/pansy.1", + "variant": "botany:blocks/flowers/pansy.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/petunia.json b/src/main/resources/assets/botany/models/block/flowers/petunia.json new file mode 100644 index 00000000..d1186449 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/petunia.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/petunia.0", + "petal": "botany:blocks/flowers/petunia.1", + "variant": "botany:blocks/flowers/petunia.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json b/src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json new file mode 100644 index 00000000..28a0e059 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/petunia_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/petunia.0", + "petal": "botany:blocks/flowers/petunia.1", + "variant": "botany:blocks/flowers/petunia.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/poppy.json b/src/main/resources/assets/botany/models/block/flowers/poppy.json new file mode 100644 index 00000000..b8ea0633 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/poppy.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/poppy.0", + "petal": "botany:blocks/flowers/poppy.1", + "variant": "botany:blocks/flowers/poppy.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json b/src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json new file mode 100644 index 00000000..70a43c93 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/poppy_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/poppy.0", + "petal": "botany:blocks/flowers/poppy.1", + "variant": "botany:blocks/flowers/poppy.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/primrose.json b/src/main/resources/assets/botany/models/block/flowers/primrose.json new file mode 100644 index 00000000..c7d42090 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/primrose.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/primrose.0", + "petal": "botany:blocks/flowers/primrose.1", + "variant": "botany:blocks/flowers/primrose.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json b/src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json new file mode 100644 index 00000000..f30dffe0 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/primrose_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/primrose.0", + "petal": "botany:blocks/flowers/primrose.1", + "variant": "botany:blocks/flowers/primrose.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/scabious.json b/src/main/resources/assets/botany/models/block/flowers/scabious.json new file mode 100644 index 00000000..fb252829 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/scabious.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/scabious.0", + "petal": "botany:blocks/flowers/scabious.1", + "variant": "botany:blocks/flowers/scabious.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json b/src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json new file mode 100644 index 00000000..79c5adcc --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/scabious_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/scabious.0", + "petal": "botany:blocks/flowers/scabious.1", + "variant": "botany:blocks/flowers/scabious.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/seed.json b/src/main/resources/assets/botany/models/block/flowers/seed.json new file mode 100644 index 00000000..05a15006 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/seed.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/seed.0", + "petal": "botany:blocks/flowers/seed.1", + "variant": "botany:blocks/flowers/seed.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/tulip.json b/src/main/resources/assets/botany/models/block/flowers/tulip.json new file mode 100644 index 00000000..37c1c46c --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/tulip.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/tulip.0", + "petal": "botany:blocks/flowers/tulip.1", + "variant": "botany:blocks/flowers/tulip.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json b/src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json new file mode 100644 index 00000000..339d345e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/tulip_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/tulip.0", + "petal": "botany:blocks/flowers/tulip.1", + "variant": "botany:blocks/flowers/tulip.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/viola.json b/src/main/resources/assets/botany/models/block/flowers/viola.json new file mode 100644 index 00000000..22861539 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/viola.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/viola.0", + "petal": "botany:blocks/flowers/viola.1", + "variant": "botany:blocks/flowers/viola.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/viola_flowered.json b/src/main/resources/assets/botany/models/block/flowers/viola_flowered.json new file mode 100644 index 00000000..80dc3718 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/viola_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/viola.0", + "petal": "botany:blocks/flowers/viola.1", + "variant": "botany:blocks/flowers/viola.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/yarrow.json b/src/main/resources/assets/botany/models/block/flowers/yarrow.json new file mode 100644 index 00000000..e9009413 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/yarrow.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/yarrow.0", + "petal": "botany:blocks/flowers/yarrow.1", + "variant": "botany:blocks/flowers/yarrow.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json b/src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json new file mode 100644 index 00000000..bfb8ba95 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/yarrow_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/yarrow.0", + "petal": "botany:blocks/flowers/yarrow.1", + "variant": "botany:blocks/flowers/yarrow.2" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/zinnia.json b/src/main/resources/assets/botany/models/block/flowers/zinnia.json new file mode 100644 index 00000000..16cbc91e --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/zinnia.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/zinnia.0", + "petal": "botany:blocks/flowers/zinnia.1", + "variant": "botany:blocks/flowers/zinnia.3" + } +} diff --git a/src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json b/src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json new file mode 100644 index 00000000..c0bc3739 --- /dev/null +++ b/src/main/resources/assets/botany/models/block/flowers/zinnia_flowered.json @@ -0,0 +1,7 @@ +{ "parent": "botany:block/flowers/flower", + "textures": { + "stem": "botany:blocks/flowers/zinnia.0", + "petal": "botany:blocks/flowers/zinnia.1", + "variant": "botany:blocks/flowers/zinnia.2" + } +} diff --git a/src/main/resources/assets/botany/models/item/flowers/pollen.json b/src/main/resources/assets/botany/models/item/flowers/pollen.json new file mode 100644 index 00000000..56b83eb8 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowers/pollen.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:blocks/flowers/pollen.0", + "layer1": "botany:blocks/flowers/pollen.1", + "layer2": "botany:blocks/flowers/pollen.2" + } +} diff --git a/src/main/resources/assets/botany/models/item/flowers/seed.json b/src/main/resources/assets/botany/models/item/flowers/seed.json new file mode 100644 index 00000000..818cb9db --- /dev/null +++ b/src/main/resources/assets/botany/models/item/flowers/seed.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:blocks/flowers/seed.0", + "layer1": "botany:blocks/flowers/seed.1", + "layer2": "botany:blocks/flowers/seed.2" + } +} diff --git a/src/main/resources/assets/botany/models/item/insulatedTube.json b/src/main/resources/assets/botany/models/item/insulatedTube.json new file mode 100644 index 00000000..4ac593b4 --- /dev/null +++ b/src/main/resources/assets/botany/models/item/insulatedTube.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botany:items/insulatedTube.0", + "layer1": "botany:items/insulatedTube.1", + "layer2": "botany:items/insulatedTube.2" + } +}