From f236e93bfa58ada010c81ae395e261017da36538 Mon Sep 17 00:00:00 2001 From: Adubbz Date: Thu, 2 Oct 2014 15:57:50 +1000 Subject: [PATCH] Added the remaining logs --- .../biomesoplenty/api/block/BOPBlocks.java | 2 + .../common/block/BlockBOPLog3.java | 82 ++++++++++++++++++ .../common/block/BlockBOPLog4.java | 78 +++++++++++++++++ .../biomesoplenty/common/init/ModBlocks.java | 5 +- .../biomesoplenty/blockstates/log3.json | 19 ++++ .../biomesoplenty/blockstates/log4.json | 7 ++ .../biomesoplenty/models/block/dead_log.json | 7 ++ .../models/block/giant_flower_stem.json | 7 ++ .../models/block/hell_bark_log.json | 7 ++ .../models/block/jacaranda_log.json | 7 ++ .../models/block/mahogany_log.json | 7 ++ .../biomesoplenty/models/block/pine_log.json | 7 ++ .../biomesoplenty/models/item/dead_log.json | 10 +++ .../models/item/giant_flower_stem.json | 10 +++ .../models/item/hell_bark_log.json | 10 +++ .../models/item/jacaranda_log.json | 10 +++ .../models/item/mahogany_log.json | 10 +++ .../biomesoplenty/models/item/pine_log.json | 10 +++ .../textures/blocks/dead_log.png | Bin 0 -> 747 bytes .../textures/blocks/dead_log_top.png | Bin 0 -> 873 bytes .../textures/blocks/giant_flower_stem.png | Bin 0 -> 533 bytes .../textures/blocks/giant_flower_stem_top.png | Bin 0 -> 559 bytes .../textures/blocks/hell_bark_log.png | Bin 0 -> 704 bytes .../textures/blocks/hell_bark_log_top.png | Bin 0 -> 627 bytes .../textures/blocks/jacaranda_log.png | Bin 0 -> 588 bytes .../textures/blocks/jacaranda_log_top.png | Bin 0 -> 533 bytes .../textures/blocks/mahogany_log.png | Bin 0 -> 649 bytes .../textures/blocks/mahogany_log_top.png | Bin 0 -> 614 bytes .../textures/blocks/pine_log.png | Bin 0 -> 590 bytes .../textures/blocks/pine_log_top.png | Bin 0 -> 543 bytes 30 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 src/main/java/biomesoplenty/common/block/BlockBOPLog3.java create mode 100644 src/main/java/biomesoplenty/common/block/BlockBOPLog4.java create mode 100755 src/main/resources/assets/biomesoplenty/blockstates/log3.json create mode 100755 src/main/resources/assets/biomesoplenty/blockstates/log4.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/dead_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/giant_flower_stem.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/hell_bark_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/block/pine_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/dead_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/giant_flower_stem.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/hell_bark_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/jacaranda_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/mahogany_log.json create mode 100644 src/main/resources/assets/biomesoplenty/models/item/pine_log.json create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/giant_flower_stem.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/giant_flower_stem_top.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/hell_bark_log.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/hell_bark_log_top.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/jacaranda_log_top.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/pine_log.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/pine_log_top.png diff --git a/src/main/java/biomesoplenty/api/block/BOPBlocks.java b/src/main/java/biomesoplenty/api/block/BOPBlocks.java index 837971eff..4a4332488 100644 --- a/src/main/java/biomesoplenty/api/block/BOPBlocks.java +++ b/src/main/java/biomesoplenty/api/block/BOPBlocks.java @@ -15,5 +15,7 @@ public class BOPBlocks public static Block ash_block; public static Block log; public static Block log2; + public static Block log3; + public static Block log4; public static Block planks; } diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog3.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog3.java new file mode 100644 index 000000000..d4ca1e885 --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog3.java @@ -0,0 +1,82 @@ +/******************************************************************************* + * 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.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import biomesoplenty.api.block.IBOPVariant; + +public class BlockBOPLog3 extends BlockBOPLogBase +{ + public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", LogType.class); + + public BlockBOPLog3() + { + super(VARIANT_PROP); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + int axis = meta % 3; + int type = (meta - axis) / 3; + + return this.getDefaultState().withProperty(VARIANT_PROP, LogType.values()[type]).withProperty(AXIS_PROP, EnumFacing.Axis.values()[axis]); + } + + @Override + public int getMetaFromState(IBlockState state) + { + int baseMeta = ((LogType)state.getValue(VARIANT_PROP)).ordinal(); + + return baseMeta * 3 + ((EnumFacing.Axis)state.getValue(AXIS_PROP)).ordinal(); + } + + @Override + protected BlockState createBlockState() + { + return new BlockState(this, new IProperty[] { AXIS_PROP, VARIANT_PROP }); + } + + public static enum LogType implements IBOPVariant + { + DEAD, + GIANT_FLOWER_STEM, + PINE, + HELL_BARK, + JACARANDA; + + @Override + public String getBaseName() + { + return this.equals(GIANT_FLOWER_STEM) ? null : "log"; + } + + @Override + public String getName() + { + return this.name().toLowerCase(); + } + + @Override + public String toString() + { + return getName(); + } + + @Override + public int getDefaultMetadata() + { + return this.ordinal() * 3; + } + } +} diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLog4.java b/src/main/java/biomesoplenty/common/block/BlockBOPLog4.java new file mode 100644 index 000000000..6b574f164 --- /dev/null +++ b/src/main/java/biomesoplenty/common/block/BlockBOPLog4.java @@ -0,0 +1,78 @@ +/******************************************************************************* + * 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.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import biomesoplenty.api.block.IBOPVariant; + +public class BlockBOPLog4 extends BlockBOPLogBase +{ + public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", LogType.class); + + public BlockBOPLog4() + { + super(VARIANT_PROP); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + int axis = meta % 3; + int type = (meta - axis) / 3; + + return this.getDefaultState().withProperty(VARIANT_PROP, LogType.values()[type]).withProperty(AXIS_PROP, EnumFacing.Axis.values()[axis]); + } + + @Override + public int getMetaFromState(IBlockState state) + { + int baseMeta = ((LogType)state.getValue(VARIANT_PROP)).ordinal(); + + return baseMeta * 3 + ((EnumFacing.Axis)state.getValue(AXIS_PROP)).ordinal(); + } + + @Override + protected BlockState createBlockState() + { + return new BlockState(this, new IProperty[] { AXIS_PROP, VARIANT_PROP }); + } + + public static enum LogType implements IBOPVariant + { + MAHOGANY; + + @Override + public String getBaseName() + { + return "log"; + } + + @Override + public String getName() + { + return this.name().toLowerCase(); + } + + @Override + public String toString() + { + return getName(); + } + + @Override + public int getDefaultMetadata() + { + return this.ordinal() * 3; + } + } +} diff --git a/src/main/java/biomesoplenty/common/init/ModBlocks.java b/src/main/java/biomesoplenty/common/init/ModBlocks.java index 1447913c5..934773850 100644 --- a/src/main/java/biomesoplenty/common/init/ModBlocks.java +++ b/src/main/java/biomesoplenty/common/init/ModBlocks.java @@ -11,7 +11,6 @@ package biomesoplenty.common.init; import static biomesoplenty.api.block.BOPBlocks.*; import net.minecraft.block.Block; import net.minecraft.item.Item; -import net.minecraft.util.IStringSerializable; import biomesoplenty.api.block.BOPBlock; import biomesoplenty.api.block.IBOPVariant; import biomesoplenty.client.util.ModelHelper; @@ -19,6 +18,8 @@ import biomesoplenty.common.block.BOPBlockPlanks; import biomesoplenty.common.block.BlockAsh; import biomesoplenty.common.block.BlockBOPLog; import biomesoplenty.common.block.BlockBOPLog2; +import biomesoplenty.common.block.BlockBOPLog3; +import biomesoplenty.common.block.BlockBOPLog4; import biomesoplenty.common.item.ItemBlockWithVariants; import biomesoplenty.common.util.RegistryUtil; import biomesoplenty.core.BiomesOPlenty; @@ -30,6 +31,8 @@ public class ModBlocks ash_block = registerBlock(new BlockAsh(), "ash_block"); log = registerBlock(new BlockBOPLog(), "log"); log2 = registerBlock(new BlockBOPLog2(), "log2"); + log3 = registerBlock(new BlockBOPLog3(), "log3"); + log4 = registerBlock(new BlockBOPLog4(), "log4"); planks = registerBlock(new BOPBlockPlanks(), "planks"); } diff --git a/src/main/resources/assets/biomesoplenty/blockstates/log3.json b/src/main/resources/assets/biomesoplenty/blockstates/log3.json new file mode 100755 index 000000000..54beabc39 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/log3.json @@ -0,0 +1,19 @@ +{ + "variants": { + "axis=x,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90, "y": 90 }, + "axis=y,variant=dead": { "model": "biomesoplenty:dead_log" }, + "axis=z,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90 }, + "axis=x,variant=giant_flower_stem": { "model": "biomesoplenty:giant_flower_stem", "x": 90, "y": 90 }, + "axis=y,variant=giant_flower_stem": { "model": "biomesoplenty:giant_flower_stem" }, + "axis=z,variant=giant_flower_stem": { "model": "biomesoplenty:giant_flower_stem", "x": 90 }, + "axis=x,variant=pine": { "model": "biomesoplenty:pine_log", "x": 90, "y": 90 }, + "axis=y,variant=pine": { "model": "biomesoplenty:pine_log" }, + "axis=z,variant=pine": { "model": "biomesoplenty:pine_log", "x": 90 }, + "axis=x,variant=hell_bark": { "model": "biomesoplenty:hell_bark_log", "x": 90, "y": 90 }, + "axis=y,variant=hell_bark": { "model": "biomesoplenty:hell_bark_log" }, + "axis=z,variant=hell_bark": { "model": "biomesoplenty:hell_bark_log", "x": 90 }, + "axis=x,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log", "x": 90, "y": 90 }, + "axis=y,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log" }, + "axis=z,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log", "x": 90 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/blockstates/log4.json b/src/main/resources/assets/biomesoplenty/blockstates/log4.json new file mode 100755 index 000000000..fdf86b247 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/blockstates/log4.json @@ -0,0 +1,7 @@ +{ + "variants": { + "axis=x,variant=mahogany": { "model": "biomesoplenty:mahogany_log", "x": 90, "y": 90 }, + "axis=y,variant=mahogany": { "model": "biomesoplenty:mahogany_log" }, + "axis=z,variant=mahogany": { "model": "biomesoplenty:mahogany_log", "x": 90 } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/dead_log.json b/src/main/resources/assets/biomesoplenty/models/block/dead_log.json new file mode 100644 index 000000000..5afab3abe --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/dead_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:blocks/dead_log_top", + "side": "biomesoplenty:blocks/dead_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/giant_flower_stem.json b/src/main/resources/assets/biomesoplenty/models/block/giant_flower_stem.json new file mode 100644 index 000000000..1ebb77501 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/giant_flower_stem.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:blocks/giant_flower_stem_top", + "side": "biomesoplenty:blocks/giant_flower_stem" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/hell_bark_log.json b/src/main/resources/assets/biomesoplenty/models/block/hell_bark_log.json new file mode 100644 index 000000000..f77862f29 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/hell_bark_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:blocks/hell_bark_log_top", + "side": "biomesoplenty:blocks/hell_bark_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json new file mode 100644 index 000000000..896f1d2de --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/jacaranda_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:blocks/jacaranda_log_top", + "side": "biomesoplenty:blocks/jacaranda_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json b/src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json new file mode 100644 index 000000000..be5a0f9a0 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/mahogany_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:blocks/mahogany_log_top", + "side": "biomesoplenty:blocks/mahogany_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/block/pine_log.json b/src/main/resources/assets/biomesoplenty/models/block/pine_log.json new file mode 100644 index 000000000..e7dfe7b62 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/block/pine_log.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "biomesoplenty:blocks/pine_log_top", + "side": "biomesoplenty:blocks/pine_log" + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/dead_log.json b/src/main/resources/assets/biomesoplenty/models/item/dead_log.json new file mode 100644 index 000000000..56b7cba68 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/dead_log.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/dead_log", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/giant_flower_stem.json b/src/main/resources/assets/biomesoplenty/models/item/giant_flower_stem.json new file mode 100644 index 000000000..4b2988881 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/giant_flower_stem.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/giant_flower_stem", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/hell_bark_log.json b/src/main/resources/assets/biomesoplenty/models/item/hell_bark_log.json new file mode 100644 index 000000000..2bb9e4b69 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/hell_bark_log.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/hell_bark_log", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/jacaranda_log.json b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_log.json new file mode 100644 index 000000000..b14226360 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/jacaranda_log.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/jacaranda_log", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/mahogany_log.json b/src/main/resources/assets/biomesoplenty/models/item/mahogany_log.json new file mode 100644 index 000000000..000964982 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/mahogany_log.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/mahogany_log", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/pine_log.json b/src/main/resources/assets/biomesoplenty/models/item/pine_log.json new file mode 100644 index 000000000..ea79c2af5 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/pine_log.json @@ -0,0 +1,10 @@ +{ + "parent": "biomesoplenty:block/pine_log", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log.png new file mode 100644 index 0000000000000000000000000000000000000000..40d9b34cc2f5a01b21bf23c4a01f2f47c6af578c GIT binary patch literal 747 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv00077Nkl@W(ls8LZ|M&nF;|6~rD5OUM|eP_LtB6CT%P9*OA;Zh^~DDn>1Gt(eZ ztA_6!bGDp>{kA>r`}n_I##Bj{J6@Tk)3!;@wfy^jNkk^@IQz{QU+{Zak2J#VE(V@s zKJBKIN;t1p9E5JIth;vQ_A&-%)Upjl_*s}l9&>i`d)U?s{M+3H1?oJX6*)R^t3+gR zA#xeanYzr;DaiPET;TvQC4)d1)pAQvC5yRcy`&LgHSGbS*Q`lAZIyK}gHtaEf9@|u z_H3Rssf$TCiUPB!^qSUo9>ORVeA|$C1|q|t`g}9vbLmm&0(TUBGekj^XS3tJU$=@4 zOT#9>o^R%|Ko2@j^_)QSdfxZl>eV8qu!K89m4-d9QY>KTW4}^m4&m^*Q;3Fppx~h7 zS&&n}yT2MrTxQs7bbPyRop=3;kV`|GO8C1~!ZW9s8}|dy##pFVl+VK&3Csp?fO>PAeaMT5(b&nudmk~g;EqL2X<&siTL-hsg~5`EP@S4 zubCRWPLrlAvH<;hyQVBt|92_A^ZW?&ivRNQd^hJp|x5<{A}#xi7p2gbnAZ#$DX dfc3?o^&gGDsY3Gxferuw002ovPDHLkV1k66N-6*V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/dead_log_top.png new file mode 100644 index 0000000000000000000000000000000000000000..6eaa85386ea1c3db44f2035dcc57fcd3e72d9710 GIT binary patch literal 873 zcmV-v1D5=WP)<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00QMnL_t(IPYsgmPTBwfM*AY}mdqL04cTN_yv{*Iq6G^rr8i5V zw9tY;EfiWV6$U631revBlWoejZ2sAgJ>GbLFW*Vd0Vo<0Xvl7POd}u@0Hc)G{?fXz z;+UJAVS=6*>vyiq1-I6M>x({cnMF2%ZN!t4U{yjS7OLmB`_1J2uzXq(x(3@Sh7L;! zO~Puqu#uv45p~Vm0Nb<2nW&FNz;iR1VBt9JIw-SEBW&cEH0jO=epT3tplfQH$nm}i z;RPg)$a1h*C5|hRtK+<>MXuVZFJ}Hg#t--6H=W%0tbAe09V4=@vun-;V0CFuiwBEo z)uhZS1Cwg6``k#1HV+N*jH_*E(Rp8KCno7}L4BG&nKA4hIev$O-Wr^;7tffcm zN{B*N+D5ciri~mi*-w5%dR)SPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004mNklO;|3e59>lGvLdn=bAzFCS<98o&q2N4eC@IfRwwh-Ig$nXiBxSSUyrUIV-^J28cNx zoeWPk9sv-+5&-Iu=7tg&$9Sd!7gD7{@2P?f#>e7pi36T$Od5s)yi8Ug2vGQ^91Z%V zhlL*LkbVeIkR?EHn;zc;wnWUWVa&?K!ArMN@Juz_=d#Gh-XMb880~>gyJ;$}5BEJ; zIr&>NFT7KYGTmy^s6YTcujB{}a96yb05?Qn1VDi$z{euFX_p?Dy*sumW-7zuD2B-| XDq)GT7}n~S00000NkvXXu0mjfpyAmt literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/giant_flower_stem_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/giant_flower_stem_top.png new file mode 100644 index 0000000000000000000000000000000000000000..4f54d9abd8f13174feb55196ee2b8c7b54d2c4de GIT binary patch literal 559 zcmV+~0?_@5P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0004=Nkl`mp>T`g%MekU)= z)M>r@v5K5s{O@N_rmx~a;DF9t$8Yz%q%--c7BqzJW|JNnpght*Xq~e%br}+VIci2r z&ADg^NC^7%ef{v)R{#43yZ3eN%|k=vz{3&b5fo1yub5&>upXqN?|qT75Xx#?Kk^YdhNY2NJcemJ11 x8uRJL0-l}*4?1c2syUWQizCbN%WtjM{s96;l>Xv62TcF~002ovPDHLkV1fei^ezAZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hell_bark_log.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hell_bark_log.png new file mode 100644 index 0000000000000000000000000000000000000000..d73ca1951acedf1e16b0ff9ae17d46e4c6405a1a GIT binary patch literal 704 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/mahogany_log_top.png new file mode 100644 index 0000000000000000000000000000000000000000..24f2016277881ae02e0147f5d0f2e5a0bfe5986b GIT binary patch literal 614 zcmV-s0-61ZP)H;LN@>a0nbT9K~y+TU6T7N!%-N<&tKy* zWG42*(D>Rcm;EpnD@?A#W@fggecNnJG%5MTHRKj4Nr;5p@(1{beCDlhOFf;QbKdj3 zm**Viu#|y`4%>F9e=q9aoc6h_m9Dx9&{k`LJ1nMlYh_Q987%s{6qg>;@jE@rT8x`S z*f@M$(%+U-kknwO3VQ5M*@dIT_(?KwyfCpF@v|PpMy_&m5Ci9_;8P}{)s`!dW@Yqm0s>UK z%!Z{Cxknb7ghczCY9rv4dyFN+K;Bo<-)lJ|F-3&z%=D|tE*sOZ|Jhy_rIZ55&h)A4 zc*sx|Y;CSCf!*d4MoZ!#-~{W0&@**hR+9>QHHMQJn0|kL7$W#u%}QciqE*PKyFmrI z8+afB;tAv*ifs-0T9mWCg2e2l0&^39unG_m!Z)~9Q>J)r7y@h|6Lpx?=t{g|DlXtn zVd$CeW(0e4LmU;`&oHOSNeIuvHz9PdM|UCvYOJGCN(-ofkNiB@Ud4h&2u!(~3W9lG z8-KgiT*`lT+p1>08i@2dDbCZvxj>W;-)b)X1uRT`lEDDjPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005KNkl`o*wyr5x^HWyy!obdQLS*Y((W(brT!O<@27funriaRPu%}}S&r<#UsvE^ZqMFU z$~gcQS1PtXT^%oOOcvz{%PV&@AcpK~f5sW9VMUX2Bl))KL}8%wIj;i%8309GSYn2{ zo5@Z)a|3Ah7KTEu6L(G-q9g&Z@JN#|Ni5yGxK#)ic^dtGFwLVq*@%*i&^|7~3e zIA)qHP5_f~E+3ai^drU+2Jr84O;_fDmo`nN-nKen7-NkANL2)dFJo@<&j0`b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pine_log_top.png b/src/main/resources/assets/biomesoplenty/textures/blocks/pine_log_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7ccf27ba5dfd56fe881e486d239c4ccc98079a12 GIT binary patch literal 543 zcmV+)0^t3LP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0004wNkl#6ovPn_^yvO2T)>tnB-U07kF+|X?ivmDu&m!^1FTluWCqpY>w4^MBM$L5lxrk-$_*dScAd<5 zPm|qy6K>YS>5i+cAEI!+(D%3!Cc9bTBJF!#jeKm4TJf?LWhMRR_81zjkzI4zOYfIL zR3IkRSp}qE6`2T(3W#7wGo2zJK()(EzjPw^$U>9<1OymMhJn0qj(qPXRAPz}IKet0^h_PoC5Dq3nEqg@9U}PJ8JEPk zM5_=(5O7xVg9wNxkRn)Z4K-IAGmx0QRA6ob5LN*KLih$BYOMHk30ufS9cEQsiC0X; z1-vm`La;yS;mB$~!{q0CAp91d38A~ipdsK-OKAZW@R64%+v}81g@EZ&+*5~?*9&JX hxV(7