From c39824c00f0ae2aacc88d8b76cd24247ff36727c Mon Sep 17 00:00:00 2001 From: Adubbz Date: Tue, 14 Oct 2014 06:29:12 +1100 Subject: [PATCH] Readied the remaining flowers --- .../biomesoplenty/api/block/BOPBlocks.java | 1 + .../biomesoplenty/api/block/BOPPlant.java | 6 -- .../common/block/BlockBOPFlower.java | 40 ++++++-- .../common/block/BlockBOPFlower2.java | 93 ++++++++++++++++++ .../biomesoplenty/common/init/ModBlocks.java | 2 + .../biomesoplenty/blockstates/flower.json | 5 +- .../biomesoplenty/blockstates/flower2.json | 10 ++ .../assets/biomesoplenty/lang/en_US.lang | 10 ++ .../biomesoplenty/models/block/bluebells.json | 6 ++ .../models/block/burning_blossom.json | 6 ++ .../biomesoplenty/models/block/goldenrod.json | 6 ++ .../biomesoplenty/models/block/icy_iris.json | 6 ++ .../biomesoplenty/models/block/lavender.json | 6 ++ .../models/block/lily_of_the_valley.json | 6 ++ .../models/block/miners_delight.json | 6 ++ .../models/block/pink_hibiscus.json | 6 ++ .../biomesoplenty/models/block/rose.json | 6 ++ .../biomesoplenty/models/item/bluebells.json | 18 ++++ .../models/item/burning_blossom.json | 18 ++++ .../biomesoplenty/models/item/goldenrod.json | 18 ++++ .../biomesoplenty/models/item/icy_iris.json | 18 ++++ .../biomesoplenty/models/item/lavender.json | 18 ++++ .../models/item/lily_of_the_valley.json | 18 ++++ .../models/item/miners_delight.json | 18 ++++ .../models/item/pink_hibiscus.json | 18 ++++ .../biomesoplenty/models/item/rose.json | 18 ++++ .../textures/blocks/bluebells.png | Bin 0 -> 473 bytes .../textures/blocks/burning_blossom.png | Bin 0 -> 655 bytes .../textures/blocks/goldenrod.png | Bin 0 -> 646 bytes .../textures/blocks/icy_iris.png | Bin 0 -> 426 bytes .../textures/blocks/lavender.png | Bin 0 -> 671 bytes .../textures/blocks/lily_of_the_valley.png | Bin 0 -> 496 bytes .../textures/blocks/miners_delight.png | Bin 0 -> 390 bytes .../textures/blocks/pink_hibiscus.png | Bin 0 -> 768 bytes .../biomesoplenty/textures/blocks/rose.png | Bin 0 -> 252 bytes 35 files changed, 366 insertions(+), 17 deletions(-) create mode 100644 src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java create mode 100755 src/main/resources/assets/biomesoplenty/blockstates/flower2.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/bluebells.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/goldenrod.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/icy_iris.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/lavender.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/lily_of_the_valley.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/miners_delight.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/rose.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/bluebells.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/goldenrod.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/icy_iris.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/lavender.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/lily_of_the_valley.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/miners_delight.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/rose.json create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/bluebells.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/burning_blossom.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/goldenrod.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/icy_iris.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/lily_of_the_valley.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/miners_delight.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/pink_hibiscus.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/rose.png diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 8710ca557..f8c9268bb 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -14,6 +14,7 @@ public class BOPBlocks { public static Block ash_block; public static Block flower; + public static Block flower2; public static Block log; public static Block log2; public static Block log3; diff --git a/src/main/java/biomesoplenty/api/block/BOPPlant.java b/src/main/java/biomesoplenty/api/block/BOPPlant.java index 3edb36c65..77be70daa 100644 --- a/src/main/java/biomesoplenty/api/block/BOPPlant.java +++ b/src/main/java/biomesoplenty/api/block/BOPPlant.java @@ -42,12 +42,6 @@ public class BOPPlant extends BOPBlock return super.canPlaceBlockOnSide(world, pos, side) && this.canBlockStay(world, pos, this.getStateFromMeta(stack.getMetadata())); } - @Override - public boolean canPlaceBlockAt(World world, BlockPos pos) - { - return super.canPlaceBlockAt(world, pos) && this.canBlockStay(world, pos, this.getDefaultState()); - } - public boolean canBlockStay(World world, BlockPos pos, IBlockState state) { Block ground = world.getBlockState(pos.offsetDown()).getBlock(); diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java index 2ac408af9..57c308020 100644 --- a/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlower.java @@ -48,10 +48,11 @@ public class BlockBOPFlower extends BOPPlant super(VARIANT_PROP); } - //TODO: Add light for glowflowers and enderlotus (Requires Forge) + //TODO: Add light for glowflowers, enderlotus and the burning blossom (Requires Forge) //TODO: Make enderlotus require spectral moss //TODO: Make bromeliads require hard dirt, hardened clay or sand + //TODO: Make the burning blossom require netherrack or overgrown netherrack @Override public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tileentity) @@ -60,9 +61,18 @@ public class BlockBOPFlower extends BOPPlant FlowerType type = (FlowerType)state.getValue(VARIANT_PROP); - if (type == FlowerType.DEATHBLOOM && (player.getCurrentEquippedItem() == null || !(player.getCurrentEquippedItem().getItem() instanceof ItemShears))) + if (player.getCurrentEquippedItem() == null || !(player.getCurrentEquippedItem().getItem() instanceof ItemShears)) { - player.addPotionEffect(new PotionEffect(Potion.wither.id, 300)); + switch (type) + { + case DEATHBLOOM: + player.addPotionEffect(new PotionEffect(Potion.wither.id, 300)); + break; + + case BURNING_BLOSSOM: + player.setFire(5); + break; + } } } @@ -71,7 +81,11 @@ public class BlockBOPFlower extends BOPPlant { FlowerType type = (FlowerType)state.getValue(VARIANT_PROP); - if (entity instanceof EntityLivingBase && type == FlowerType.DEATHBLOOM) + if (type == FlowerType.BURNING_BLOSSOM) + { + entity.setFire(1); + } + else if (entity instanceof EntityLivingBase && type == FlowerType.DEATHBLOOM) { ((EntityLivingBase)entity).addPotionEffect(new PotionEffect(Potion.wither.id, 200)); } @@ -106,10 +120,6 @@ public class BlockBOPFlower extends BOPPlant this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.5F, 0.7F); break; - case ENDERLOTUS: - this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.4F, 0.7F); - break; - case DANDELION: this.setBlockBounds(0.3F, 0.0F, 0.3F, 0.7F, 0.6F, 0.7F); break; @@ -124,11 +134,18 @@ public class BlockBOPFlower extends BOPPlant @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random rand) { - if ((FlowerType)state.getValue(VARIANT_PROP) == FlowerType.DEATHBLOOM) + FlowerType type = (FlowerType)state.getValue(VARIANT_PROP); + + if (type == FlowerType.DEATHBLOOM) { if (rand.nextInt(4) != 0) world.spawnParticle(EnumParticleTypes.TOWN_AURA, pos.getX() + rand.nextFloat(), pos.getY() + rand.nextFloat(), pos.getZ() + rand.nextFloat(), 0.0D, 0.0D, 0.0D, new int[0]); if (rand.nextInt(4) == 0) world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + rand.nextFloat(), pos.getY() + rand.nextFloat(), pos.getZ() + rand.nextFloat(), 0.0D, 0.0D, 0.0D, new int[0]); } + else if (type == FlowerType.BURNING_BLOSSOM) + { + if (rand.nextInt(2) == 0) world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + rand.nextFloat(), pos.getY() + rand.nextFloat(), pos.getZ() + rand.nextFloat(), 0.0D, 0.0D, 0.0D, new int[0]); + if (rand.nextInt(4) == 0) world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + rand.nextFloat(), pos.getY() + rand.nextFloat(), pos.getZ() + rand.nextFloat(), 0.0D, 0.0D, 0.0D, new int[0]); + } } //TODO: Readd eyebulb in as a seperate block @@ -147,7 +164,10 @@ public class BlockBOPFlower extends BOPPlant WHITE_ANEMONE, ENDERLOTUS, BROMELIAD, - DANDELION; + DANDELION, + PINK_HIBISCUS, + LILY_OF_THE_VALLEY, + BURNING_BLOSSOM; @Override public String getBaseName() diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java b/src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java new file mode 100644 index 000000000..f7eea9f65 --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockBOPFlower2.java @@ -0,0 +1,93 @@ +/******************************************************************************* + * Copyright 2014, the Biomes O' Plenty Team + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/. + ******************************************************************************/ + +package biomesoplenty.common.block; + +import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import biomesoplenty.api.block.BOPPlant; +import biomesoplenty.api.block.IBOPVariant; + +public class BlockBOPFlower2 extends BOPPlant +{ + public static PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", FlowerType.class); + + public BlockBOPFlower2() + { + super(VARIANT_PROP); + } + + @Override + public boolean canBlockStay(World world, BlockPos pos, IBlockState state) + { + Block ground = world.getBlockState(pos.offsetDown()).getBlock(); + FlowerType type = (FlowerType)state.getValue(VARIANT_PROP); + + switch (type) + { + case MINERS_DELIGHT: + return ground == Blocks.stone; + + default: + return ground == Blocks.grass || ground == Blocks.dirt || ground == Blocks.farmland; + } + } + + @Override + protected BlockState createBlockState() + { + return new BlockState(this, new IProperty[] { VARIANT_PROP }); + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos) + { + this.setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); + } + + public static enum FlowerType implements IBOPVariant + { + LAVENDER, + GOLDENROD, + BLUEBELLS, + MINERS_DELIGHT, + ICY_IRIS, + ROSE; + + @Override + public String getBaseName() + { + return null; + } + + @Override + public String getName() + { + return this.name().toLowerCase(); + } + + @Override + public String toString() + { + return getName(); + } + + @Override + public int getDefaultMetadata() + { + return this.ordinal(); + } + } +} diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index c33fecf50..e748f4706 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -18,6 +18,7 @@ import biomesoplenty.client.util.ModelHelper; import biomesoplenty.common.block.BOPBlockPlanks; import biomesoplenty.common.block.BlockAsh; import biomesoplenty.common.block.BlockBOPFlower; +import biomesoplenty.common.block.BlockBOPFlower2; import biomesoplenty.common.block.BlockBOPLog; import biomesoplenty.common.block.BlockBOPLog2; import biomesoplenty.common.block.BlockBOPLog3; @@ -31,6 +32,7 @@ public class ModBlocks { ash_block = registerBlock(new BlockAsh(), "ash_block"); flower = registerBlock(new BlockBOPFlower(), "flower"); + flower2 = registerBlock(new BlockBOPFlower2(), "flower2"); log = registerBlock(new BlockBOPLog(), "log"); log2 = registerBlock(new BlockBOPLog2(), "log2"); log3 = registerBlock(new BlockBOPLog3(), "log3"); diff --git a/src/main/resources/assets/biomesoplenty/blockstates/flower.json b/src/main/resources/assets/biomesoplenty/blockstates/flower.json index 8ecde031d..0fd9b288b 100755 --- a/src/main/resources/assets/biomesoplenty/blockstates/flower.json +++ b/src/main/resources/assets/biomesoplenty/blockstates/flower.json @@ -12,6 +12,9 @@ "variant=white_anemone": { "model": "biomesoplenty:white_anemone" }, "variant=enderlotus": { "model": "biomesoplenty:enderlotus" }, "variant=bromeliad": { "model": "biomesoplenty:bromeliad" }, - "variant=dandelion": { "model": "biomesoplenty:dandelion" } + "variant=dandelion": { "model": "biomesoplenty:dandelion" }, + "variant=pink_hibiscus": { "model": "biomesoplenty:pink_hibiscus" }, + "variant=lily_of_the_valley": { "model": "biomesoplenty:lily_of_the_valley" }, + "variant=burning_blossom": { "model": "biomesoplenty:burning_blossom" } } } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/flower2.json b/src/main/resources/assets/biomesoplenty/blockstates/flower2.json new file mode 100755 index 000000000..3665212e7 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/flower2.json @@ -0,0 +1,10 @@ +{ + "variants": { + "variant=lavender": { "model": "biomesoplenty:lavender" }, + "variant=goldenrod": { "model": "biomesoplenty:goldenrod" }, + "variant=bluebells": { "model": "biomesoplenty:bluebells" }, + "variant=miners_delight": { "model": "biomesoplenty:miners_delight" }, + "variant=icy_iris": { "model": "biomesoplenty:icy_iris" }, + "variant=rose": { "model": "biomesoplenty:rose" } + } +} diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 6dee65d3d..f81613a87 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -13,6 +13,16 @@ tile.flower.white_anemone.name=White Anemone tile.flower.enderlotus.name=Enderlotus tile.flower.bromeliad.name=Bromeliad tile.flower.dandelion.name=Dandelion Puff +tile.flower.pink_hibiscus.name=Pink Hibiscus +tile.flower.lily_of_the_valley.name=Lily of the Valley +tile.flower.burning_blossom.name=Burning Blossom + +tile.flower2.lavender.name=Lavender +tile.flower2.goldenrod.name=Goldenrod +tile.flower2.bluebells.name=Bluebells +tile.flower2.miners_delight.name=Miner's Delight +tile.flower2.icy_iris.name=Icy Iris +tile.flower2.rose.name=Rose tile.log.sacred_oak.name=Sacred Oak Wood tile.log.cherry.name=Cherry Wood diff --git a/src/main/resources/assets/biomesoplenty/models/block/bluebells.json b/src/main/resources/assets/biomesoplenty/models/block/bluebells.json new file mode 100644 index 000000000..f11c3c703 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/bluebells.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/bluebells" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json b/src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json new file mode 100644 index 000000000..09415afaf --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/burning_blossom.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/burning_blossom" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/goldenrod.json b/src/main/resources/assets/biomesoplenty/models/block/goldenrod.json new file mode 100644 index 000000000..e9f5b0009 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/goldenrod.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/goldenrod" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/icy_iris.json b/src/main/resources/assets/biomesoplenty/models/block/icy_iris.json new file mode 100644 index 000000000..fadb2bf70 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/icy_iris.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/icy_iris" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/lavender.json b/src/main/resources/assets/biomesoplenty/models/block/lavender.json new file mode 100644 index 000000000..9c7483929 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/lavender.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/lavender" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/lily_of_the_valley.json b/src/main/resources/assets/biomesoplenty/models/block/lily_of_the_valley.json new file mode 100644 index 000000000..60d67d27a --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/lily_of_the_valley.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/lily_of_the_valley" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/miners_delight.json b/src/main/resources/assets/biomesoplenty/models/block/miners_delight.json new file mode 100644 index 000000000..20bd5baee --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/miners_delight.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/miners_delight" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json b/src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json new file mode 100644 index 000000000..fe14ee61d --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/pink_hibiscus.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/pink_hibiscus" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/rose.json b/src/main/resources/assets/biomesoplenty/models/block/rose.json new file mode 100644 index 000000000..211078bb1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/rose.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "biomesoplenty:blocks/rose" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/bluebells.json b/src/main/resources/assets/biomesoplenty/models/item/bluebells.json new file mode 100644 index 000000000..f9ef35782 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/bluebells.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/bluebells" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json b/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json new file mode 100644 index 000000000..42276a156 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/burning_blossom.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/burning_blossom" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/goldenrod.json b/src/main/resources/assets/biomesoplenty/models/item/goldenrod.json new file mode 100644 index 000000000..3737286bc --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/goldenrod.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/goldenrod" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/icy_iris.json b/src/main/resources/assets/biomesoplenty/models/item/icy_iris.json new file mode 100644 index 000000000..c5c886586 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/icy_iris.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/icy_iris" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/lavender.json b/src/main/resources/assets/biomesoplenty/models/item/lavender.json new file mode 100644 index 000000000..1b4a96777 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/lavender.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/lavender" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/lily_of_the_valley.json b/src/main/resources/assets/biomesoplenty/models/item/lily_of_the_valley.json new file mode 100644 index 000000000..3074e7766 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/lily_of_the_valley.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/lily_of_the_valley" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/miners_delight.json b/src/main/resources/assets/biomesoplenty/models/item/miners_delight.json new file mode 100644 index 000000000..524533cdf --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/miners_delight.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/miners_delight" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json b/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json new file mode 100644 index 000000000..7c45c7534 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/pink_hibiscus.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/pink_hibiscus" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/rose.json b/src/main/resources/assets/biomesoplenty/models/item/rose.json new file mode 100644 index 000000000..e92ef6b67 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/rose.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:blocks/rose" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bluebells.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bluebells.png new file mode 100644 index 0000000000000000000000000000000000000000..66cbf117f850e6e738af9c639d9b7e597f0d353e GIT binary patch literal 473 zcmV;~0Ve*5P)N2bPDNB8 zb~7$DE-^7j^FlWO00C7=L_t(IPwi0KNj?pf4vpQLvBAL4moGAl_f~uyaMn@exm#S8TN2bPDNB8 zb~7$DE-^7j^FlWO00Ik1L_t(IPjypEPg7A49zh7f_&;2*GSS9>T@V}by+9L#Z0B-6sDA>4-?=yYKJimy{ z{eTAf^&+5B{&y#HOW$m_TCGYsdPOI@;UNAl1W}9(;>YlLkSUkWJo9S$I4oqk_5Y`RyuAxnz_17K>%rmeVGEVfa6w|N%v z$qu|(>q2ZyKvpa^Kx}q|0h3;(XhPnucVi+ZNXAd=J8AQupl!rH3n?2g&b{`!L(Aki zU23T+&wOx;3u>{-rdT8vZ*KJJW%16=tIMYl9uYiFbRqRp^hk`8k$E-CU^FaxUUoM= p-e;bkQ6?lZDwfUkRFBpGN2bPDNB8 zb~7$DE-^7j^FlWO00II@L_t(IPi<07Y)oMky-S2dgheexMOlzEEyGxfG{laL1{G-{ zY15&JRf(iYEd^oIus|XR7B;pPLTHebl0J(L&D6}8nM^YO^XB*X&VBiw`RU@!xxeST z_s)}iJ}&?inM_7Gm&++P8VzwAN7>f6uB%+FRwb26i8{q%(Qmebu~Z;qo;U3I%b$j4Rt_i)=RQO;D*+l&NUPZ7xh= z1fgP<^{k z87tG^n#{%HaleiS^^J5o?OpiW5q!M07WH=lG~OQo7LVfh(_X+i2K(>$(;8?a55%P1 zv-GAP#LtIY@%L4)V&jPSSSNggw;(Uv+YI~|!k?GBkbd2dCSp25($Ys--)lYn{aM2h`HPA@axHT@cVEc^qBH?5nsRtf{%KHqn{YvgV6Ou zI1>us^W6<5YxgA#{UEI59R*UW@8TD4FCWD07*qoM6N<$f^Lo_E&u=k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/icy_iris.png b/src/main/resources/assets/biomesoplenty/textures/blocks/icy_iris.png new file mode 100644 index 0000000000000000000000000000000000000000..c3198161f293023b9caef91670b927baad9ad83f GIT binary patch literal 426 zcmV;b0agBqP)N2bPDNB8 zb~7$DE-^7j^FlWO00AaRL_t(IPh+4dIC}fne<+i5uyN%A-5aY9z65(=!?Abd1>&@o=l^d$ z`SJgp^;gL=00ep$93x&c4-XF*H_q+--?ePoe-JyhDi2KK!*GyLn)!dinmPZgr?>y_ zT{-iAQG50ON$chjZvadnsXY6CPdgS-RcqpJa7I6#+(%1{0e3Pf}pQ85n#0J2uJ Us+qJA$N&HU07*qoM6N<$g6^)wB>(^b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png b/src/main/resources/assets/biomesoplenty/textures/blocks/lavender.png new file mode 100644 index 0000000000000000000000000000000000000000..080fce0f2fa7d7c9e6b7a2b3af94d7b644edcb9e GIT binary patch literal 671 zcmV;Q0$}}#P)N2bPDNB8 zb~7$DE-^7j^FlWO00J9HL_t(IPo+@rOOsI)e)k9L`}Q%)iYS)MEPv2u*%s+G_sh-F zj4@xG^R=O^+J`pM%~p~n(a$$BQKyAaPSHhV5JX^65JY~ezoEb2sdMbTuZw-_z;o|? zp7We@&%Kh_Z2m7)6g8;wDk|yQQBfq^?OwvW{0~fopO-aRh_9D%aUe{^RycVhP{79c zFT6;8#;eRG?uSdP&m~GIrN2X!w|oR%OeT|*_swEC^%b+RH=MkEdJ)rI?{VEf$9zU9 zVmbK}uVvs-RDT*TPa~^%dGQMhkqwMF=Q){jO=2ani4Q3t=P0mt?_80!I~_$7F0Zl1 z4G1~UG?tWaSRDF@Vdpq*bw9&G^b>A&%`+#@HSY}6&|8d#RDA-9xNVdZWKJ~aL7LK( z!-(%OXjif=T#&X+A>(<-zW$>l>=QwSSG_8F8!~Y9Sh!I(@C0&w8i4^TPeH|L_XBP) zcx+5>K!yQ(7MGlpd}F&}#c}^WKA%lC!eB5+!9N~qdZBrOi%I`mE=gplJ-HJ-byv`l zILrk$cNJQq7CxUDsuLQG9!c4miy&fe+k?>HAx>y$^6o9;ox}BL?W|$V7pvAMppi*D z5!}yvTkk>M-SXD1aYFcfEgD*@n2XSoWYn4v=s9-JZo%oIV7x|XBD5rZoHnAj&jPDs z2acTDB^vnqtKn!rAh-yl(a1uhOTUdkpSGR002ovPDHLk FV1my0CRG3c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/lily_of_the_valley.png b/src/main/resources/assets/biomesoplenty/textures/blocks/lily_of_the_valley.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a22ae0920a9e8ba9b28e4d8be98e7b59e30a18 GIT binary patch literal 496 zcmVN2bPDNB8 zb~7$DE-^7j^FlWO00C@CL_t(IPn}ZRO2a@D+@x*V`XCB|AK`=Ig(B2Dg;uS-XsT94 zMXVGAuc#EQ_?P{GKpH3w1WKNA>>QJriqPo5VP}_fCbP2NA)!r%uC#Z|YF82&Lk!6`H7#c({2%gT*@OstU7sn6VH2EmYp)ub)w_ud^Zo zS}o19^*(0-!!Y<2utLDHEJB&4`Q-w4hl7KgEG-vi$#ER9R$ic^`z;m-0s^g8iwEJ1 z50Nr5fORy0GYJda<>WC>x#|+n^?E(5)a`b|i6E3zc8Z%JpzAtwP1C{&tQ6-6&k~Qv m-IG580{Br7;K0)ig%F=SbFWJ4>|M410000<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO009C?L_t(IPh%JbGy<)Y68}S)U{Kx?jKaqW4y^0?e|Tfh|D7wE z|Hq~|fi<;HNhVJ7u9Yodg&;!~^rruxSR4Mou`l+2Qnou`1J=*T0V|pS)U;$mHkjR8 z8S+0q!-Y88L153Sw*NER68>+TmG^&oOB`5ZXKBFy=oAMqyKQn3e#2m{nA#MBqA)Sb z?SEZ&6n@Ph0MiKaJBSX8w+7SA6XO5F*mwcRxlkq?fWn}*E0VBgbkN$``oFEM4IGHD zSeQ6*B5?*aH#h%pZ*Tvfl9KYjsi_H^9(sFw{}&b({;#O0AkL7On3(^Ok&*vXQ&ay( kMMZ%P1F@mfNPvL>09`N2bPDNB8 zb~7$DE-^7j^FlWO00MkTL_t(IPgPP$Pg7A8KAl_ITFMNHXk5B8F>wJcDTL5;0o^#I z;ye#AZb&3Fl#XDuYTV(9p-@7?uwsKlWQBwfgE3M03GP6x#eTkXUi&Ox@^bGz?>pc9 z&OL|pdOek3G#W{#(~-eoC`O3PX0yZ@rMT1SB&*dbd-<8q=jqT>GZd&n1=TV7e<-3d zvOiW5CQd9A3L?S|8b=L6tceqjy>fzG9!^`~a=GZpiwbIbVgx&5t{|7oX%3p7SztO# zsJu$ZXS2vnPoqAiLv4aYn3K5_7TX8+HJymqLW-fC6<}cjNF;z%3cseN&~(27jrVM@ zSS-SKhRe!n7}1N(gAeTZoylOcvlID^5ca}hx%QSxhKS*IyJgkT z@?33^@eJX>Wrds|R9qmL4Hl}tVSvNoAm^pB4zLZihgMh3I{IJH2UZqqiOpt#))! y{T&OqRV>60_QB_)cU~{8`TevW2ncsQ5TJkL_f$)JhPQ?Q0000q|KvmhEE{-7<{>c)oCT#a_{`}u;FvVMnA#=`&BftJDNk9J|yXH=Ul$NVR zgUDfnGYTt2J~Av3OfmK_KBF3-`G~=zIl}sIePasSr$Y=Zi(=1eT;?faoZ>CVU^zd@ q*@11sThR$_T}*;3AEXZ)U|=|(ZF0f%%)dIIwG5uFelF{r5}E+gyHJY& literal 0 HcmV?d00001