From f862485a055e199045a7a97d2f1d3acacd26dc1c Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 1 Jan 2015 19:43:23 -0800 Subject: [PATCH] Fix #298. xupaosso - Add Ipe, Padauk, Cocobolo, and Zebrawood trees --- .../gadgets/StructureLogicAlveary.java | 3 +- .../VillageHandlerArboriculture.java | 5 +- .../java/forestry/arboriculture/WoodType.java | 23 ++-- .../arboriculture/gadgets/BlockArbStairs.java | 2 - .../arboriculture/gadgets/BlockSlab.java | 2 +- .../arboriculture/genetics/TreeTemplates.java | 37 ++++++ .../worldgen/WorldGenArboriculture.java | 10 ++ .../worldgen/WorldGenCocobolo.java | 57 +++++++++ .../worldgen/WorldGenCrescentia.java | 97 +++++++++++++++ .../arboriculture/worldgen/WorldGenIpe.java | 53 ++++++++ .../worldgen/WorldGenPadauk.java | 77 ++++++++++++ .../worldgen/WorldGenZebrawood.java | 54 ++++++++ .../java/forestry/core/genetics/Allele.java | 5 + .../forestry/core/worldgen/BlockType.java | 8 ++ .../forestry/plugins/PluginArboriculture.java | 116 ++++++++++++++---- .../blocks/germlings/sapling.treeCocobolo.png | Bin 0 -> 423 bytes .../blocks/germlings/sapling.treeIpe.png | Bin 0 -> 1427 bytes .../blocks/germlings/sapling.treePadauk.png | Bin 0 -> 367 bytes .../germlings/sapling.treeZebrawood.png | Bin 0 -> 345 bytes .../textures/blocks/wood/bark.cocobolo.png | Bin 0 -> 881 bytes .../textures/blocks/wood/bark.ipe.png | Bin 0 -> 1465 bytes .../textures/blocks/wood/bark.padauk.png | Bin 0 -> 868 bytes .../textures/blocks/wood/bark.zebrawood.png | Bin 0 -> 920 bytes .../textures/blocks/wood/heart.cocobolo.png | Bin 0 -> 607 bytes .../textures/blocks/wood/heart.ipe.png | Bin 0 -> 1336 bytes .../textures/blocks/wood/heart.padauk.png | Bin 0 -> 652 bytes .../textures/blocks/wood/heart.zebrawood.png | Bin 0 -> 643 bytes .../textures/blocks/wood/planks.cocobolo.png | Bin 0 -> 761 bytes .../textures/blocks/wood/planks.giganteum.png | Bin 0 -> 1382 bytes .../textures/blocks/wood/planks.ipe.png | Bin 0 -> 1396 bytes .../textures/blocks/wood/planks.padauk.png | Bin 0 -> 348 bytes .../textures/blocks/wood/planks.zebrawood.png | Bin 0 -> 861 bytes 32 files changed, 502 insertions(+), 47 deletions(-) create mode 100644 src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java create mode 100644 src/main/java/forestry/arboriculture/worldgen/WorldGenCrescentia.java create mode 100644 src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java create mode 100644 src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java create mode 100644 src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java create mode 100644 src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCocobolo.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeIpe.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePadauk.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeZebrawood.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/bark.cocobolo.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/bark.ipe.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/bark.padauk.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/bark.zebrawood.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/heart.cocobolo.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/heart.ipe.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/heart.padauk.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/heart.zebrawood.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/planks.cocobolo.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/planks.giganteum.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/planks.ipe.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/planks.padauk.png create mode 100644 src/main/resources/assets/forestry/textures/blocks/wood/planks.zebrawood.png diff --git a/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java b/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java index b435e0308..fbe2fad36 100755 --- a/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java @@ -37,8 +37,7 @@ public class StructureLogicAlveary extends StructureLogic { slabBlocks.add(ForestryBlock.slabs1.block()); slabBlocks.add(ForestryBlock.slabs2.block()); slabBlocks.add(ForestryBlock.slabs3.block()); - if (ForestryBlock.slabs4.block() != null) - slabBlocks.add(ForestryBlock.slabs4.block()); + slabBlocks.add(ForestryBlock.slabs4.block()); } public StructureLogicAlveary(ITileStructure structure) { diff --git a/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java b/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java index 14a2e7f79..bd8340ca7 100755 --- a/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java +++ b/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java @@ -38,10 +38,7 @@ public class VillageHandlerArboriculture implements IVillageTradeHandler { WoodType sells = WoodType.VALUES[random.nextInt(WoodType.VALUES.length)]; Block plankBlock; int meta; - if(!sells.hasPlank) { - plankBlock = ForestryBlock.planks1.block(); - meta = 0; - } else if(sells.ordinal() > 15) { + if(sells.ordinal() > 15) { plankBlock = ForestryBlock.planks2.block(); meta = sells.ordinal() - 16; } else { diff --git a/src/main/java/forestry/arboriculture/WoodType.java b/src/main/java/forestry/arboriculture/WoodType.java index 623429af3..e9a60777b 100755 --- a/src/main/java/forestry/arboriculture/WoodType.java +++ b/src/main/java/forestry/arboriculture/WoodType.java @@ -19,24 +19,24 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; public enum WoodType { - LARCH, TEAK, ACACIA, LIME, CHESTNUT, WENGE, BAOBAB, SEQUOIA(4.0f), KAPOK, EBONY, MAHOGANY, BALSA(1.0f), WILLOW, WALNUT, GREENHEART(7.5f), CHERRY, MAHOE, POPLAR, PALM, PAPAYA, PINE( - 3.0f), PLUM, MAPLE, CITRUS, GIGANTEUM(2.0f, false); + LARCH, TEAK, ACACIA, LIME, + CHESTNUT, WENGE, BAOBAB, SEQUOIA(4.0f), + KAPOK, EBONY, MAHOGANY, BALSA(1.0f), + WILLOW, WALNUT, GREENHEART(7.5f), CHERRY, + MAHOE, POPLAR, PALM, PAPAYA, + PINE(3.0f), PLUM, MAPLE, CITRUS, + GIGANTEUM(2.0f), IPE, PADAUK, COCOBOLO, + ZEBRAWOOD; public static final WoodType[] VALUES = values(); private final float hardness; - public final boolean hasPlank; private WoodType() { - this(2.0f, true); + this(2.0f); } private WoodType(float hardness) { - this(hardness, true); - } - - private WoodType(float hardness, boolean hasPlank) { this.hardness = hardness; - this.hasPlank = hasPlank; } @SideOnly(Side.CLIENT) @@ -49,10 +49,7 @@ public enum WoodType { WoodType woodType = VALUES[i]; String woodName = woodType.toString().toLowerCase(Locale.ENGLISH); - if (woodType.hasPlank) - icons[0][i] = TextureManager.getInstance().registerTex(register, "wood/planks." + woodName); - else - icons[0][i] = null; + icons[0][i] = TextureManager.getInstance().registerTex(register, "wood/planks." + woodName); icons[1][i] = TextureManager.getInstance().registerTex(register, "wood/bark." + woodName); icons[2][i] = TextureManager.getInstance().registerTex(register, "wood/heart." + woodName); } diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java index 6c2c5b554..5c9f4ef13 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java @@ -53,8 +53,6 @@ public class BlockArbStairs extends BlockStairs { @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (WoodType type : WoodType.VALUES) { - if(!type.hasPlank) - continue; ItemStack stack = new ItemStack(item, 1, 0); NBTTagCompound compound = new NBTTagCompound(); type.saveToCompound(compound); diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java b/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java index f4c865c31..8126b60d4 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java @@ -35,7 +35,7 @@ import forestry.arboriculture.WoodType; public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyped { public static enum SlabCat { - CAT0, CAT1, CAT2 + CAT0, CAT1, CAT2, CAT3 } public static final int slabsPerCat = 8; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java b/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java index 13e0d11ad..bfe6e893e 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java @@ -64,6 +64,11 @@ public class TreeTemplates { public static IMutation papayaA; public static IMutation dateA; + public static IMutation ipeA; + public static TreeMutation padaukA; + public static TreeMutation cocoboloA; + public static TreeMutation zebrawoodA; + /* TEMPLATES */ public static IAllele[] getDefaultTemplate() { IAllele[] alleles = new IAllele[EnumTreeChromosome.values().length]; @@ -376,6 +381,38 @@ public class TreeTemplates { return alleles; } + public static IAllele[] getIpeTemplate() { + IAllele[] alleles = getDefaultTemplate(); + alleles[EnumTreeChromosome.SPECIES.ordinal()] = Allele.treeIpe; + alleles[EnumTreeChromosome.SAPPINESS.ordinal()] = Allele.sappinessLower; + alleles[EnumTreeChromosome.HEIGHT.ordinal()] = Allele.heightLarge; + alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int2; + return alleles; + } + + public static IAllele[] getPadaukTemplate() { + IAllele[] alleles = getDefaultTemplate(); + alleles[EnumTreeChromosome.SPECIES.ordinal()] = Allele.treePadauk; + alleles[EnumTreeChromosome.SAPPINESS.ordinal()] = Allele.sappinessLower; + alleles[EnumTreeChromosome.HEIGHT.ordinal()] = Allele.heightLarge; + return alleles; + } + + public static IAllele[] getCocoboloTemplate() { + IAllele[] alleles = getDefaultTemplate(); + alleles[EnumTreeChromosome.SPECIES.ordinal()] = Allele.treeCocobolo; + alleles[EnumTreeChromosome.HEIGHT.ordinal()] = Allele.heightLargest; + return alleles; + } + + public static IAllele[] getZebrawoodTemplate() { + IAllele[] alleles = getDefaultTemplate(); + alleles[EnumTreeChromosome.SPECIES.ordinal()] = Allele.treeZebrawood; + alleles[EnumTreeChromosome.HEIGHT.ordinal()] = Allele.heightLarge; + alleles[EnumTreeChromosome.GIRTH.ordinal()] = Allele.int2; + return alleles; + } + // / HELPER FUNCTIONS public static Chromosome[] templateAsChromosomes(IAllele[] template) { diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index e290f424d..0781aa7b3 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -160,7 +160,17 @@ public abstract class WorldGenArboriculture extends WorldGenBase { protected final void addWood(int x, int y, int z, EnumReplaceMode replace) { addBlock(x, y, z, wood, replace); } + + protected final void addXWood(int x, int y, int z, EnumReplaceMode replace) { + BlockType woodX = new BlockType(wood.getBlock(), wood.getMeta() + 4); + addBlock(x, y, z, woodX, replace); + } + protected final void addZWood(int x, int y, int z, EnumReplaceMode replace) { + BlockType woodZ = new BlockType(wood.getBlock(), wood.getMeta() + 8); + addBlock(x, y, z, woodZ, replace); + } + protected final void addLeaf(int x, int y, int z, EnumReplaceMode replace) { addBlock(x, y, z, leaf, replace); } diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java new file mode 100644 index 000000000..3c92f5fc5 --- /dev/null +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCocobolo.java @@ -0,0 +1,57 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.worldgen; + +import forestry.api.world.ITreeGenData; + +public class WorldGenCocobolo extends WorldGenTree { + + public WorldGenCocobolo(ITreeGenData tree) { + super(tree); + } + + @Override + public void generate() { + generateTreeTrunk(height, girth); + + int leafSpawn = height; + + addLeaf(0, leafSpawn--, 0, EnumReplaceMode.NONE); + generateAdjustedCylinder(leafSpawn--, 1, 1, leaf); + + if (height > 10) + generateAdjustedCylinder(leafSpawn--, 2, 1, leaf); + generateAdjustedCylinder(leafSpawn, 0, 1, leaf); + + leafSpawn--; + + while (leafSpawn > 4) { + int offset = 1; + if (leafSpawn % 2 == 0) { + if (rand.nextBoolean()) + offset = -1; + generateAdjustedCylinder(leafSpawn, offset, 2, 1, leaf, EnumReplaceMode.NONE); + } else { + if (rand.nextBoolean()) + offset = -1; + generateAdjustedCylinder(leafSpawn, offset, 0, 1, leaf, EnumReplaceMode.NONE ); + } + leafSpawn--; + } + + } + + @Override + public void preGenerate() { + height = determineHeight(8, 8); + girth = determineGirth(tree.getGirth(world, startX, startY, startZ)); + } +} diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenCrescentia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCrescentia.java new file mode 100644 index 000000000..4743541a9 --- /dev/null +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenCrescentia.java @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.worldgen; + +import forestry.api.world.ITreeGenData; + +public class WorldGenCrescentia extends WorldGenTree { + + public WorldGenCrescentia(ITreeGenData tree) { + super(tree); + } + + @Override + public void generate() { + generateTreeTrunk(height, girth); + + int leafSpawn = height + 1; + + generateAdjustedCylinder(leafSpawn--, 0, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 0.5f, 1, leaf); + + generateAdjustedCylinder(leafSpawn--, 1.9f, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 1.9f, 1, leaf); + if (rand.nextBoolean()) + generateAdjustedCylinder(leafSpawn--, 1.9f, 1, leaf); + + generateAdjustedCylinder(leafSpawn--, 0.5f, 1, leaf); + + } + + @Override + public void generateTreeTrunk(int height, int girth) { + + int offset = (girth - 1) / 2; + + + //Trunk generation + for (int x = 0; x < girth; x++) //offsets trunk in x direction + for (int z = 0; z < girth; z++) //offsets trunk in z direction + if (x==0 || x==girth-1) { //checks for edges in x direction + if (z==0 || z==girth-1) {//checks for corners + if (x==0 && z==0) {}//xz corner + if (x==girth-1 && z==0) {}//x-1z corner + if (x==0 && z==girth-1) {}//xz-1 corner + if (x==girth-1 && z==0) {} //x-1z-1 corner + } else { //these are the z only edges + if (x==0) { + + } else if (x==girth-1) { + + } + } + } else if (z==0 || z==girth-1) { //these are the x only edges + if (z==0) { + + } else if (z==girth-1) { + + } + } else { //these are center pieces + for (int i = 0; i < height; i++) { //grows trunk straight up in y direction to the correct height + addWood(x - offset, i, z - offset, EnumReplaceMode.ALL); + } + } + + //End trunk generation + + //Spawn pods + for (int y = minPodHeight; y < height; y++) + for (int x = 0; x < girth; x++) + for (int z = 0; z < girth; z++) { + + if ((x > 0 && x < girth) && (z > 0 && z < girth)) + continue; + + tree.trySpawnFruitBlock(world, startX + x + 1, startY + y, startZ + z); + tree.trySpawnFruitBlock(world, startX + x - 1, startY + y, startZ + z); + tree.trySpawnFruitBlock(world, startX + x, startY + y, startZ + z + 1); + tree.trySpawnFruitBlock(world, startX + x, startY + y, startZ + z - 1); + } + + + } + + @Override + public void preGenerate() { + height = determineHeight(6, 3); + girth = determineGirth(tree.getGirth(world, startX, startY, startZ)); + } +} diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java new file mode 100644 index 000000000..e461240d6 --- /dev/null +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenIpe.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.worldgen; + +import forestry.api.world.ITreeGenData; + +public class WorldGenIpe extends WorldGenTree { + + public WorldGenIpe(ITreeGenData tree) { + super(tree); + } + + @Override + public void generate() { + generateTreeTrunk(height, girth); + + int leafSpawn = height + 1; + float adjustedGirth = girth*.65f; + + generateAdjustedCylinder(leafSpawn--, 0, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 0.2f*adjustedGirth, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 0.2f*adjustedGirth, 1, leaf); + + while (leafSpawn > 7) { + generateAdjustedCylinder(leafSpawn, (float) (1.25f*(adjustedGirth * .65)), 1, leaf); + leafSpawn--; + } + + generateAdjustedCylinder(leafSpawn--, 1.6f*adjustedGirth, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 1.6f*adjustedGirth, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 1.6f*adjustedGirth, 1, leaf); + + if (rand.nextBoolean()) + generateAdjustedCylinder(leafSpawn--, 1.25f*adjustedGirth, 1, leaf); + + generateAdjustedCylinder(leafSpawn--, 1f*adjustedGirth, 1, leaf); + + } + + @Override + public void preGenerate() { + height = determineHeight(8, 8); + girth = determineGirth(tree.getGirth(world, startX, startY, startZ)); + } +} diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java new file mode 100644 index 000000000..c5463d9ee --- /dev/null +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPadauk.java @@ -0,0 +1,77 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.worldgen; + +import java.util.Random; + +import forestry.api.world.ITreeGenData; + +public class WorldGenPadauk extends WorldGenTree { + + public WorldGenPadauk(ITreeGenData tree) { + super(tree); + + minHeight = 7; + } + + @Override + public void generate() { + generateTreeTrunk(height, girth); + + + int leafSpawn = height + 1; + + generateAdjustedCylinder(leafSpawn--, 0, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 1.5f, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 3f, 1, leaf); + + int count = 0; + int max = 3; + int min = 1; + int canopyHeight = rand.nextInt(max - min + 1) + min; + + while (leafSpawn > 3 && count < canopyHeight) { + generateAdjustedCylinder(leafSpawn--, 4.5f, 1, leaf); + count++; + //Random Trunk Branches + for (int i = 0; i < girth*4; i++) { + if (rand.nextBoolean()){ + + int[] offset = {-1, 1}; + int offsetValue = (offset[new Random().nextInt(offset.length)]); + int maxBranchLength = 3; + int branchLength = new Random().nextInt(maxBranchLength+1); + char[] direction = {'z', 'x'}; + char directionValue = (direction[new Random().nextInt(direction.length)]); + int branchSpawn = leafSpawn; + + for (int j = 1; j < branchLength+1; j++) { + if (j == branchLength && rand.nextBoolean()) { //Just adding a bit of variation to the ends for character + branchSpawn += 1; + } + if (directionValue == 'z') { + addZWood(0, branchSpawn, j*offsetValue, EnumReplaceMode.ALL); + } else if (directionValue == 'x'){ + addXWood(j*offsetValue, branchSpawn, 0, EnumReplaceMode.ALL); + } + } + + } + } + } + } + + @Override + public void preGenerate() { + height = determineHeight(6, 6); + girth = determineGirth(tree.getGirth(world, startX, startY, startZ)); + } +} diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java new file mode 100644 index 000000000..259039f1c --- /dev/null +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenZebrawood.java @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.arboriculture.worldgen; + +import forestry.api.world.ITreeGenData; + +public class WorldGenZebrawood extends WorldGenTree { + + public WorldGenZebrawood(ITreeGenData tree) { + super(tree); + } + + @Override + public void generate() { + + generateTreeTrunk(height, girth); + + int leafSpawn = height + 1; + + generateAdjustedCylinder(leafSpawn--, 0, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 0.5f, 1, leaf); + + generateAdjustedCylinder(leafSpawn--, 1.9f, 1, leaf); + + while (leafSpawn > height - 4) + generateAdjustedCylinder(leafSpawn--, 2.5f, 1, leaf); + generateAdjustedCylinder(leafSpawn--, 1.9f, 1, leaf); + + // Add some smaller twigs below for flavour + for (int times = 0; times < height / 4; times++) { + int h = 10 + rand.nextInt(Math.max(1, height - 10)); + if (rand.nextBoolean() && h < height / 2) + h = height / 2 + rand.nextInt(height / 2); + int x_off = -1 + rand.nextInt(3); + int y_off = -1 + rand.nextInt(3); + generateSphere(new Vector(x_off, h, y_off), 1 + rand.nextInt(1), leaf, EnumReplaceMode.NONE); + } + + } + + @Override + public void preGenerate() { + height = determineHeight(8, 8); + girth = determineGirth(tree.getGirth(world, startX, startY, startZ)); + } +} diff --git a/src/main/java/forestry/core/genetics/Allele.java b/src/main/java/forestry/core/genetics/Allele.java index f87886311..660a59dc2 100755 --- a/src/main/java/forestry/core/genetics/Allele.java +++ b/src/main/java/forestry/core/genetics/Allele.java @@ -168,6 +168,11 @@ public class Allele implements IAllele { public static AlleleSpecies treeMaple; + public static AlleleSpecies treeIpe; + public static AlleleSpecies treePadauk; + public static AlleleSpecies treeCocobolo; + public static AlleleSpecies treeZebrawood; + /// BUTTERFLIES // SPECIES // Moths public static AlleleSpecies mothBrimstone; diff --git a/src/main/java/forestry/core/worldgen/BlockType.java b/src/main/java/forestry/core/worldgen/BlockType.java index 222d65467..5eb2a6327 100755 --- a/src/main/java/forestry/core/worldgen/BlockType.java +++ b/src/main/java/forestry/core/worldgen/BlockType.java @@ -36,4 +36,12 @@ public class BlockType { if (world.getTileEntity(x, y, z) != null) world.removeTileEntity(x, y, z); } + + public int getMeta() { + return this.meta; + } + + public Block getBlock() { + return this.block; + } } diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index d8bead8d5..f84ababe2 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -101,11 +101,13 @@ import forestry.arboriculture.worldgen.WorldGenBaobab; import forestry.arboriculture.worldgen.WorldGenBirch; import forestry.arboriculture.worldgen.WorldGenCherry; import forestry.arboriculture.worldgen.WorldGenChestnut; +import forestry.arboriculture.worldgen.WorldGenCocobolo; import forestry.arboriculture.worldgen.WorldGenDarkOak; import forestry.arboriculture.worldgen.WorldGenDate; import forestry.arboriculture.worldgen.WorldGenEbony; import forestry.arboriculture.worldgen.WorldGenGiganteum; import forestry.arboriculture.worldgen.WorldGenGreenheart; +import forestry.arboriculture.worldgen.WorldGenIpe; import forestry.arboriculture.worldgen.WorldGenJungle; import forestry.arboriculture.worldgen.WorldGenKapok; import forestry.arboriculture.worldgen.WorldGenLarch; @@ -115,6 +117,7 @@ import forestry.arboriculture.worldgen.WorldGenMahoe; import forestry.arboriculture.worldgen.WorldGenMahogany; import forestry.arboriculture.worldgen.WorldGenMaple; import forestry.arboriculture.worldgen.WorldGenOak; +import forestry.arboriculture.worldgen.WorldGenPadauk; import forestry.arboriculture.worldgen.WorldGenPapaya; import forestry.arboriculture.worldgen.WorldGenPine; import forestry.arboriculture.worldgen.WorldGenPlum; @@ -125,6 +128,7 @@ import forestry.arboriculture.worldgen.WorldGenTeak; import forestry.arboriculture.worldgen.WorldGenWalnut; import forestry.arboriculture.worldgen.WorldGenWenge; import forestry.arboriculture.worldgen.WorldGenWillow; +import forestry.arboriculture.worldgen.WorldGenZebrawood; import forestry.core.GameMode; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; @@ -161,7 +165,8 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock.log4, ForestryBlock.log5, ForestryBlock.log6, - ForestryBlock.log7); + ForestryBlock.log7, + ForestryBlock.log8); public static final EnumSet fireproofLogs = EnumSet.of( ForestryBlock.fireproofLog1, ForestryBlock.fireproofLog2, @@ -169,7 +174,8 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock.fireproofLog4, ForestryBlock.fireproofLog5, ForestryBlock.fireproofLog6, - ForestryBlock.fireproofLog7); + ForestryBlock.fireproofLog7, + ForestryBlock.fireproofLog8); private static final EnumSet planks = EnumSet.of( ForestryBlock.planks1, ForestryBlock.planks2); @@ -179,7 +185,8 @@ public class PluginArboriculture extends ForestryPlugin { private static final EnumSet slabs = EnumSet.of( ForestryBlock.slabs1, ForestryBlock.slabs2, - ForestryBlock.slabs3); + ForestryBlock.slabs3, + ForestryBlock.slabs4); private static final EnumSet fences = EnumSet.of( ForestryBlock.fences1, ForestryBlock.fences2); @@ -195,6 +202,7 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock.log5.registerBlock(new BlockLog(LogCat.CAT4), ItemWoodBlock.class, "log5"); ForestryBlock.log6.registerBlock(new BlockLog(LogCat.CAT5), ItemWoodBlock.class, "log6"); ForestryBlock.log7.registerBlock(new BlockLog(LogCat.CAT6), ItemWoodBlock.class, "log7"); + ForestryBlock.log8.registerBlock(new BlockLog(LogCat.CAT7), ItemWoodBlock.class, "log8"); for (ForestryBlock log : logs) { log.block().setHarvestLevel("axe", 0); @@ -208,6 +216,7 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock.fireproofLog5.registerBlock(new BlockFireproofLog(LogCat.CAT4), ItemWoodBlock.class, "fireproofLog5"); ForestryBlock.fireproofLog6.registerBlock(new BlockFireproofLog(LogCat.CAT5), ItemWoodBlock.class, "fireproofLog6"); ForestryBlock.fireproofLog7.registerBlock(new BlockFireproofLog(LogCat.CAT6), ItemWoodBlock.class, "fireproofLog7"); + ForestryBlock.fireproofLog8.registerBlock(new BlockFireproofLog(LogCat.CAT7), ItemWoodBlock.class, "fireproofLog8"); for (ForestryBlock fireproofLog : fireproofLogs) { fireproofLog.block().setHarvestLevel("axe", 0); @@ -233,6 +242,7 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock.slabs1.registerBlock(new BlockSlab(SlabCat.CAT0), ItemWoodBlock.class, "slabs1"); ForestryBlock.slabs2.registerBlock(new BlockSlab(SlabCat.CAT1), ItemWoodBlock.class, "slabs2"); ForestryBlock.slabs3.registerBlock(new BlockSlab(SlabCat.CAT2), ItemWoodBlock.class, "slabs3"); + ForestryBlock.slabs4.registerBlock(new BlockSlab(SlabCat.CAT3), ItemWoodBlock.class, "slabs4"); for (ForestryBlock plank : slabs) { plank.block().setHarvestLevel("axe", 0); @@ -394,6 +404,10 @@ public class PluginArboriculture extends ForestryPlugin { Proxies.common.addShapelessRecipe(ForestryBlock.planks2.getItemStack(4, i), ForestryBlock.log5.getItemStack(1, i)); for (int i = 0; i < 4; i++) Proxies.common.addShapelessRecipe(ForestryBlock.planks2.getItemStack(4, 4 + i), ForestryBlock.log6.getItemStack(1, i)); + for (int i = 0; i < 4; i++) + Proxies.common.addShapelessRecipe(ForestryBlock.planks2.getItemStack(4, 8 + i), ForestryBlock.log7.getItemStack(1, i)); + for (int i = 0; i < 1; i++) + Proxies.common.addShapelessRecipe(ForestryBlock.planks2.getItemStack(4, 12 + i), ForestryBlock.log8.getItemStack(1, i)); // Fabricator recipes if (PluginManager.Module.FACTORY.isEnabled() && PluginManager.Module.APICULTURE.isEnabled()) { @@ -403,11 +417,8 @@ public class PluginArboriculture extends ForestryPlugin { BlockLog blockLog = (BlockLog) forestryBlock.block(); ForestryBlock fireproofLog = BlockFireproofLog.getFireproofLog(blockLog); - if (forestryBlock == ForestryBlock.log8) - continue; - for (int i = 0; i < 4; i++) { - if (forestryBlock == ForestryBlock.log7 && i > 0) + if (forestryBlock == ForestryBlock.log8 && i > 0) break; ItemStack logStack = forestryBlock.getItemStack(1, i); @@ -435,7 +446,7 @@ public class PluginArboriculture extends ForestryPlugin { 'X', plankStack}); } plank = ForestryBlock.planks2; - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 12; i++) { ForestryBlock fireproofPlank = BlockFireproofPlanks.getFireproofPlanks((BlockPlanks)plank.block()); ItemStack plankStack = plank.getItemStack(1, i); ItemStack fireproofPlankStack = fireproofPlank.getItemStack(5, i); @@ -461,14 +472,25 @@ public class PluginArboriculture extends ForestryPlugin { Proxies.common.addShapelessRecipe(ForestryBlock.fireproofPlanks2.getItemStack(4, i), ForestryBlock.fireproofLog5.getItemStack(1, i)); for (int i = 0; i < 4; i++) Proxies.common.addShapelessRecipe(ForestryBlock.fireproofPlanks2.getItemStack(4, 4 + i), ForestryBlock.fireproofLog6.getItemStack(1, i)); + for (int i = 0; i < 4; i++) + Proxies.common.addShapelessRecipe(ForestryBlock.fireproofPlanks2.getItemStack(4, 8 + i), ForestryBlock.fireproofLog7.getItemStack(1, i)); + for (int i = 0; i < 1; i++) + Proxies.common.addShapelessRecipe(ForestryBlock.fireproofPlanks2.getItemStack(4, 12 + i), ForestryBlock.fireproofLog8.getItemStack(1, i)); // Slab recipes - for (int i = 0; i < 8; i++) - Proxies.common.addPriorityRecipe(ForestryBlock.slabs1.getItemStack(6, i), "###", '#', ForestryBlock.planks1.getItemStack(1, i)); - for (int i = 0; i < 8; i++) - Proxies.common.addPriorityRecipe(ForestryBlock.slabs2.getItemStack(6, i), "###", '#', ForestryBlock.planks1.getItemStack(1, 8 + i)); - for (int i = 0; i < 8; i++) - Proxies.common.addPriorityRecipe(ForestryBlock.slabs3.getItemStack(6, i), "###", '#', ForestryBlock.planks2.getItemStack(1, i)); + for (WoodType woodType : WoodType.values()) { + int i = woodType.ordinal(); + if (i < 8) + Proxies.common.addPriorityRecipe(ForestryBlock.slabs1.getItemStack(6, i % 8), "###", '#', ForestryBlock.planks1.getItemStack(1, i % 16)); + else if (i < 16) + Proxies.common.addPriorityRecipe(ForestryBlock.slabs2.getItemStack(6, i % 8), "###", '#', ForestryBlock.planks1.getItemStack(1, i % 16)); + else if (i < 24) + Proxies.common.addPriorityRecipe(ForestryBlock.slabs3.getItemStack(6, i % 8), "###", '#', ForestryBlock.planks2.getItemStack(1, i % 16)); + else if (i < 32) + Proxies.common.addPriorityRecipe(ForestryBlock.slabs4.getItemStack(6, i % 8), "###", '#', ForestryBlock.planks2.getItemStack(1, i % 16)); + else + throw new RuntimeException("Wood type has no slabs defined"); + } // Fence recipes for (WoodType woodType : WoodType.values()) { @@ -629,6 +651,9 @@ public class PluginArboriculture extends ForestryPlugin { IClassification lamiaceae = AlleleManager.alleleRegistry.createAndRegisterClassification( EnumClassLevel.FAMILY, "lamiaceae", "Lamiaceae"); lamiales.addMemberGroup(lamiaceae); + IClassification bignoniaceae = AlleleManager.alleleRegistry.createAndRegisterClassification( + EnumClassLevel.FAMILY, "bignoniaceae", "Bignoniaceae"); + lamiales.addMemberGroup(bignoniaceae); IClassification ebenaceae = AlleleManager.alleleRegistry.createAndRegisterClassification( EnumClassLevel.FAMILY, "ebenaceae", "Ebenaceae"); @@ -656,7 +681,11 @@ public class PluginArboriculture extends ForestryPlugin { IClassification sapindaceae = AlleleManager.alleleRegistry.createAndRegisterClassification( EnumClassLevel.FAMILY, "sapindaceae", "Sapindaceae"); sapindales.addMemberGroup(sapindaceae); - + IClassification anacardiaceae = AlleleManager.alleleRegistry.createAndRegisterClassification( + EnumClassLevel.FAMILY, "anacardiaceae", "Anacardiaceae"); + sapindales.addMemberGroup(anacardiaceae); + + IClassification caricaceae = AlleleManager.alleleRegistry.createAndRegisterClassification( EnumClassLevel.FAMILY, "caricaceae", "Caricaceae"); brassicales.addMemberGroup(caricaceae); @@ -705,7 +734,17 @@ public class PluginArboriculture extends ForestryPlugin { fabaceae.addMemberGroup(acacia); IClassification millettia = new BranchTrees("millettia", "Millettia"); fabaceae.addMemberGroup(millettia); - + IClassification dalbergia = new BranchTrees("dalbergia", "Dalbergia"); + fabaceae.addMemberGroup(dalbergia); + IClassification pterocarpus = new BranchTrees("pterocarpus", "Pterocarpus"); + fabaceae.addMemberGroup(pterocarpus); + + IClassification tabebuia = new BranchTrees("tabebuia", "Tabebuia"); + bignoniaceae.addMemberGroup(tabebuia); + + IClassification astronium = new BranchTrees("astronium", "Astronium"); + anacardiaceae.addMemberGroup(astronium); + IClassification ochroma = new BranchTrees("ochroma", "Ochroma"); malvaceae.addMemberGroup(ochroma); @@ -778,6 +817,11 @@ public class PluginArboriculture extends ForestryPlugin { final ItemStack lemonLog = ForestryBlock.log6.getItemStack(1, 3); final ItemStack giganteumLog = ForestryBlock.log7.getItemStack(1, 0); + final ItemStack ipeLog = ForestryBlock.log7.getItemStack(1, 1); + final ItemStack padaukLog = ForestryBlock.log7.getItemStack(1, 2); + final ItemStack cocoboloLog = ForestryBlock.log7.getItemStack(1, 3); + + final ItemStack zebrawoodLog = ForestryBlock.log8.getItemStack(1, 0); // Deciduous Allele.treeOak = new AlleleTreeSpecies("treeOak", false, "appleOak", quercus, "robur", @@ -843,8 +887,11 @@ public class PluginArboriculture extends ForestryPlugin { "tectona", proxy.getFoliageColorBasic(), 0x539d12, WorldGenJungle.class, jungleLog) .addFruitFamily(jungle).setLeafIndices("jungle").setVanillaMap(3); Allele.treeTeak = new AlleleTreeSpecies("treeTeak", true, "teak", tectona, "grandis", - 0xfeff8f, 0xffd98f, WorldGenTeak.class, teakLog).addFruitFamily(jungle).setLeafIndices( - "jungle"); + 0xfeff8f, 0xffd98f, WorldGenTeak.class, teakLog) + .addFruitFamily(jungle).setLeafIndices("jungle"); + Allele.treeIpe = new AlleleTreeSpecies("treeIpe", true, "ipe", tabebuia, "serratifolia", + 0xfdd207, 0xad8f04, WorldGenIpe.class, ipeLog) + .addFruitFamily(jungle).setLeafIndices("jungle").setGirth(2); Allele.treeKapok = new AlleleTreeSpecies("treeKapok", true, "kapok", ceiba, "pentandra", 0x89987b, 0x89aa9e, WorldGenKapok.class, kapokLog).addFruitFamily(jungle) .addFruitFamily(prunes).setLeafIndices("jungle"); @@ -853,6 +900,9 @@ public class PluginArboriculture extends ForestryPlugin { Allele.treeEbony = new AlleleTreeSpecies("treeEbony", true, "myrtleEbony", diospyros, "pentamera", 0xa2d24a, 0xc4d24a, WorldGenEbony.class, ebonyLog).addFruitFamily(jungle) .addFruitFamily(prunes).setGirth(3).setLeafIndices("jungle"); + Allele.treeZebrawood = new AlleleTreeSpecies("treeZebrawood", false, "zebrawood", astronium, + "graveolens", 0xa2d24a, 0xc4d24a, WorldGenZebrawood.class, zebrawoodLog) + .addFruitFamily(nux).setGirth(2).setLeafIndices("jungle"); // Diospyros mespiliformis, the Jackalberry (also known as African Ebony // The Gaub Tree, Malabar ebony, Black-and-white Ebony or Pale Moon @@ -883,8 +933,12 @@ public class PluginArboriculture extends ForestryPlugin { Allele.treeDesertAcacia = new AlleleTreeSpecies("treeAcacia", true, "desertAcacia", acacia, "erioloba", 0x748C1C, 0xb3b302, WorldGenAcacia.class, desertAcaciaLog).addFruitFamily(jungle) .addFruitFamily(nux); + Allele.treePadauk = new AlleleTreeSpecies("treePadauk", true, "padauk", pterocarpus, + "soyauxii", 0xd0df8c, 0x435c32, WorldGenPadauk.class, padaukLog).addFruitFamily(jungle); Allele.treeBalsa = new AlleleTreeSpecies("treeBalsa", true, "balsa", ochroma, "pyramidale", 0x59ac00, 0xfeff8f, WorldGenBalsa.class, balsaLog).addFruitFamily(jungle).addFruitFamily(nux); + Allele.treeCocobolo = new AlleleTreeSpecies("treeCocobolo", false, "cocobolo", dalbergia, "retusa", + 0x6aa17a, 0x487d4c, WorldGenCocobolo.class, cocoboloLog).addFruitFamily(jungle); Allele.treeWenge = new AlleleTreeSpecies("treeWenge", true, "wenge", millettia, "laurentii", 0xada157, 0xad8a57, WorldGenWenge.class, wengeLog).addFruitFamily(jungle) .addFruitFamily(nux).setGirth(2); @@ -965,10 +1019,14 @@ public class PluginArboriculture extends ForestryPlugin { treeInterface.registerTemplate(TreeTemplates.getDesertAcaciaTemplate()); treeInterface.registerTemplate(TreeTemplates.getWengeTemplate()); treeInterface.registerTemplate(TreeTemplates.getBaobabTemplate()); - + treeInterface.registerTemplate(TreeTemplates.getPadaukTemplate()); + treeInterface.registerTemplate(TreeTemplates.getCocoboloTemplate()); + treeInterface.registerTemplate(TreeTemplates.getTeakTemplate()); + treeInterface.registerTemplate(TreeTemplates.getIpeTemplate()); treeInterface.registerTemplate(TreeTemplates.getKapokTemplate()); treeInterface.registerTemplate(TreeTemplates.getEbonyTemplate()); + treeInterface.registerTemplate(TreeTemplates.getZebrawoodTemplate()); treeInterface.registerTemplate(TreeTemplates.getMahoganyTemplate()); treeInterface.registerTemplate(TreeTemplates.getWillowTemplate()); @@ -1019,7 +1077,7 @@ public class PluginArboriculture extends ForestryPlugin { // Decidious TreeTemplates.limeA = new TreeMutation(Allele.treeBirch, Allele.treeOak, TreeTemplates.getLimeTemplate(), 15); - TreeTemplates.mapleA = new TreeMutation(Allele.treeLime, Allele.treeLarch, + TreeTemplates.mapleA = new TreeMutation(Allele.treeSpruce, Allele.treeLarch, TreeTemplates.getMapleTemplate(), 5); // Fructifera @@ -1051,12 +1109,16 @@ public class PluginArboriculture extends ForestryPlugin { TreeTemplates.getSequoiaTemplate(), 5); // Tropical - TreeTemplates.teakA = new TreeMutation(Allele.treeLime, Allele.treeJungle, + TreeTemplates.teakA = new TreeMutation(Allele.treeDarkOak, Allele.treeJungle, TreeTemplates.getTeakTemplate(), 10); + TreeTemplates.ipeA = new TreeMutation(Allele.treeTeak, Allele.treeDarkOak, + TreeTemplates.getIpeTemplate(), 10); TreeTemplates.kapokA = new TreeMutation(Allele.treeJungle, Allele.treeTeak, TreeTemplates.getKapokTemplate(), 10); - TreeTemplates.ebonyA = new TreeMutation(Allele.treeKapok, Allele.treeTeak, + TreeTemplates.ebonyA = new TreeMutation(Allele.treeDarkOak, Allele.treeKapok, TreeTemplates.getEbonyTemplate(), 10); + TreeTemplates.zebrawoodA = new TreeMutation(Allele.treeEbony, Allele.treePoplar, + TreeTemplates.getZebrawoodTemplate(), 5); TreeTemplates.mahoganyA = new TreeMutation(Allele.treeKapok, Allele.treeEbony, TreeTemplates.getMahoganyTemplate(), 10); @@ -1066,15 +1128,19 @@ public class PluginArboriculture extends ForestryPlugin { TreeTemplates.getDateTemplate(), 5); // Malva - TreeTemplates.balsaA = new TreeMutation(Allele.treeTeak, Allele.treeLime, + TreeTemplates.balsaA = new TreeMutation(Allele.treeTeak, Allele.treeAcacia, TreeTemplates.getBalsaTemplate(), 10); TreeTemplates.acaciaA = new TreeMutation(Allele.treeTeak, Allele.treeBalsa, TreeTemplates.getDesertAcaciaTemplate(), 10); - TreeTemplates.wengeA = new TreeMutation(Allele.treeDesertAcacia, Allele.treeBalsa, + TreeTemplates.padaukA = new TreeMutation(Allele.treeAcacia, Allele.treeJungle, + TreeTemplates.getPadaukTemplate(), 10); + TreeTemplates.cocoboloA = new TreeMutation(Allele.treeDesertAcacia, Allele.treeDarkOak, + TreeTemplates.getCocoboloTemplate(), 10); + TreeTemplates.wengeA = new TreeMutation(Allele.treeCocobolo, Allele.treeBalsa, TreeTemplates.getWengeTemplate(), 10); TreeTemplates.baobabA = new TreeMutation(Allele.treeBalsa, Allele.treeWenge, TreeTemplates.getBaobabTemplate(), 10); - TreeTemplates.mahoeA = new TreeMutation(Allele.treeBirch, Allele.treeDesertAcacia, + TreeTemplates.mahoeA = new TreeMutation(Allele.treeBalsa, Allele.treeDesertAcacia, TreeTemplates.getMahoeTemplate(), 5); TreeTemplates.willowA = new TreeMutation(Allele.treeOak, Allele.treeBirch, diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCocobolo.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCocobolo.png new file mode 100644 index 0000000000000000000000000000000000000000..f017d5b9a4ac9f7edd1badb13d8723f5f7fd02fe GIT binary patch literal 423 zcmV;Y0a*TtP)3-r5QVo)X^}du zR*ESiqUJ1YG%1Y233e7XR)P^yshuE*T_8>VfxmI%H{63&ZUc%BhGA#-y?HZt?r!)v zbUaZQ6tc=WmdA}B9h2-70gogSW+MF={M*35gWa^}$H|lHty^9pk*I(!Ak z7H4lYvwBHV`6C=w7BU}Z#vkw9{Hwn-kfvX+Nhh^J=Muc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z)ZE-iN5ROz&_v(BP~Xs4*U-|+#Kg+LKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvryA&s6}2k5wiXH@KLZ znmL-88<`uqIfC79>f+>N>SpNVZ06`_Zswu{)tiFF?@+zQIQ8lS9itD5T%^c`2?0|O zhzU=+Kn^_dr{)1ud=W5d?^NEmgMopG+0(@_q~caf@Okf$K#_m%_P#&sqc5n$)fM$b zX;DV#1+UHWEUc}rEN@$;i3*0eY!fWLtmOE=Ws<@jO;OhiyPT9RhMYQ?b1bt+$Mtw& z+BxgH)#-C)elL2XbN=VP_chPwRI?f%Zm}0S{6FcN_{Y9nuPe_|BuwV2_$}!;{IjI3 z;*Iu)FO?g<^&go2-l1sSEyIaw{|vnL)UFnKS-IeKqDU!gT3YA&`@KnZj1@)^n`Zkk zFZ+D(v0z<*n!jIoEDMX>aYjX!y0kBTrzUXDt-kX5AkVrbEsIt3Vn1rhY`iDLFH?N; zI@i8+rg>cnTRp-Se7?tZ%TFTw$S(e#!wn8Lj%VyHY>DptyS7iX(s)90#LT=By}Z;C1rt33 zJ>#Bd(*uBN9(cMqhFJLTowSjc$xwjhuAq=AgQSq8(80+U7)=;h1tv_oz^HnGkx@2) z!Byf|QrxyD^|qYak?Hflf4ipMzW>ojn`7^{Nl(afDVpspy!`Br_>{fzYD(2dZG_{m zhi+#`;po1*=55OL&t)R{%RQs!>M7jU|Liis#bt_-V@H;^O#unGvP^H(_xntFU&+Z40g==>$sqLzXM19QWK7^H{#iz0sYG0>FVdQ I&MBb@0CS6o7XSbN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeZebrawood.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeZebrawood.png new file mode 100644 index 0000000000000000000000000000000000000000..5c681b97ffb4c7fd5732ceb32ff5fedc7e546af8 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBNPIQo+jI25b!6*=h@=|RvwAtPfZlO_eA^t k-EG;PrT1Ij?OZKGWXzQ-yp59-fWBhzboFyt=akR{0LguXLjV8( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/bark.cocobolo.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.cocobolo.png new file mode 100644 index 0000000000000000000000000000000000000000..23c727615382e885b1f963a46c361cc64db06680 GIT binary patch literal 881 zcmV-%1CIQOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0^&(TK~y+T4a?hil5hY3U|xIebX{w!+)YcJ zP8|Z`4MhYI1jVV~&nw{FP;<7;&CP1lZadx1>GIe^PyLDYy?>CL4vavU2|1P%AoJ+! zQU16iPrI_h!qYlgOzyW1F#Q1ILzZmBOzy4x4|rW>SvvG>0?I<*?S)Y)3ZG9)uZGQj zRaD}3Y-gK5EiZu^Fs`tB2jW?@l8G>J{CX@4(Txvt^>Wso8Q{Dt)dd11?1~th_KCK% zrgM&<^)}Q{#ZHB!DePPm3Q6nYw4CMf4CxwInZvrosYh)APQaVcKoyO$ zhooJvJKW{C`u?ObZc9ZDZ7Qq*c)`EH;68<1t0f%GTr9Y6gRbY#4>gQRcxF1?R;cB% zcGNGvP^AJJ9GCd0=OK-`=MA(%I!VORlUZmvZH?=2Ebcm0V<&xZ*vcnEjslGe5qMhV zE158{XTGS}bOw8Bx>u!a&|x=o*~QXQa5><#0@o>L{=Dt}x@ae({&S5U)>zEG{-$o$ z1^k(5)ezm#*$d^W=ZnUi6?%Kvs^nAD*HQZWICtEXIoxvE!k_gq?MfkB8ogyqnoJHG-<;VaZ}5qK-iVT7HB@meQ8_$*xtu}R!!|wA-E$aG{z%P zzQ6C9bi_OBI7XbQ2mHOVk8!O+1_%teHN>@Xr7>j=AuxNZ5EF@TS{y0g6>ID2KcOhKi00000NkvXX Hu0mjfb(y84 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/bark.ipe.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.ipe.png new file mode 100644 index 0000000000000000000000000000000000000000..dcc0e33aeb8697219dd5b9fcd3e90d66de19a72a GIT binary patch literal 1465 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z)ZE-iN5ROz&_v(BP~Xs4*U-|+#Kg+LKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*Wxi}e^IGUKcn44HQ85+8pI2yRRS~{CK znVA|ITR0jS!1TK0Czs}?=9R$orXcjX;?xUD4!H$Dn_W_iGRsm^+=}vZ6~NxM%Eav! zC!FR%^`_u)ze_-u_}^5$X{7Dzx&gaQ)K%{}=LyYP+g7Y&?7G-s)z z(=FGsW;MmAl+03_=r(7$xaFg|x9z*~G?!+IEK1yc+hlHtmwC|KT@NpLeaj7A=+`TC zj7!kHXP>Q$m88YJI+OL96ELR$N7zS-`B@H zJrJkW_g27w!);1JhS1`Jk4{!LvAvHuHrZKOf4S7;44(Ch&IhjY>g~%in7gy0{&}0+ iktSIKvG4zxco=3%CrnwC#l#0HOg&xwT-G@yGywq1xg~Z0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/bark.padauk.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.padauk.png new file mode 100644 index 0000000000000000000000000000000000000000..e281270dbb989dce89f9bc356aee30de60a1c4d1 GIT binary patch literal 868 zcmV-q1DpJbP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0@X=GK~y+T9g^uz8etfP=YATiwICq-zRECw z+NKxLC8=ArR9e?4prULA24+L8nkt$`MchUf7j}k;F};<(Hu-*jPtG~-IS4uNnw}JH zdqn#){l`nn^A!!dt}lj7w=ru4M;nBzMGtbBA)Xn0q+L&x;~8Kkg*(%t?40z}r@C6x z6+(t`)O;Ve)lyiKa<`e`PG*?T3_dddf%Hf>G2Z)YT6{1g$p^Hhh`AWnm%{pL(q2zH z+w^c}^DRfYT9osNas6db1Rw2%xA|3=ofV%2RHc}u5Z1FnBVGHgvtsj0r-v(lplMb59e4C=1e^;fG(HmE9wb$4-dHH}sYM~!l}nE{S8 zBJ>m}NOrvaM+@?kWhhR49#DV+8&sEKrn`i-k{YOzSe+SaQT7(DMbcwE_~@%Gk0?7Y zKlN+!0riSlUK6FJtz1*4>?a#>$=Vdv+8e-)A@_ayE2km6WYcy131E9m>HabVw44 z8+#t?j#rYMmqBibak-{pHz0%QK546_9Z&^qsRLybb_9MC6N1cC-|lw_94hBmU94)^ ubzL!Hyo+0_DYQYt!rdJ0=4t06iT(pdahsloPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0|`k)K~y+T9gd18I)qZ-RQqxzaEw2eLir~+WYqR*`UG=3%y)e=A&o5{YG+2=KNC94R!O; zqnDh-`~Tl?ALK$ZANe5G6yWRSqlcxqlB0*r&??zbx0HsYw5O9Il?)-Lh%QIAlVm4N zb+Um*hEn*@K|ay}Zh^tuneA4b6le@;G3z3`p>R}-u}j>4k;q^Q@U&Qao5g#%=W>RS zQtM)h5ExX5+8`NhpLD8U{`x5MVS%>Scd!xI&5vvVA^DZPqtQ5Uy?itLJ3o+{~*fc<=2SRic-qfp|hI^a3QQ*M`wPMUN z<9>8!`;T#_{;qd%g82OgX}C?y{Sx|f9I9p#rm0bjW^8HV#`4%@YDE{cE?TCqF8%rw zsv8Sh9v{^!)XGESZ&!_~i>qT7A%}iqK{X1`sHbmU9=~*M^2+(CD?g}yK5v;*nRQc$ z_MQ(z?qB;+ed&Vs)`;f%2$aT6Sqgoxv?I1f&%)$}UcIipYuBor1~r4PdX{E=He=yA z4jc>d)k*5nZHRNiEILmkh9qW8*$qi_KKWG7ZS3(nU#s}h uc8>WZ31Zy!DzZ@vt?j2g$Bo@u!1^8Pjf<{TZdc|20000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0nkZAK~y+TU6TE4QgIl?4@9tm5frVltt4qJ z7wxS~+ti#AW~o<~i?(s?R%xv@ ze-GQ^>V$ogi(OZ>yz=IpCZ#DUBL5+tl?rEk5+EjRhqQY0f|`vQ(zw(*ug~Fsa4_yi z%733eg@$XT#Iz0@wHG1313BwXG*E(QG83%E=k%+002@0Ikf2+7Xc!Ku!jO=+Zdu3O zmfd45TL$tetp1IWpfF90Y!~MAasLV1@cw&k-jvn~Ae)yS4NgqZuEq52eI3@AIUS5- z4gyZF&ImKp=i%a{`X6>#&URq?(E%~^PRzk2Mun7?E~($y;RBH{Paywc*j6_;tKQ)z zg?YCQ>`ekfG$0^_Z}8&nDYd-}3<0)Ki9YNaOl4lN6&LU(6}_yl%_@SCLHA+%StdFl zd=`EaQtQ&4$VIj5_pG&n4*1BQXRkI%fU9Gp+H&r`a}%Xhbno%<^GdSws^B@xuPZUH tlKR=qR?;(0e8Ndyar4*e4;C^Dkw2;ZgVB?DDeV9N002ovPDHLkV1hIg7OwyR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/heart.ipe.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.ipe.png new file mode 100644 index 0000000000000000000000000000000000000000..8672a2d73153d88215d7c1f8102a9d4304814f0c GIT binary patch literal 1336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z)ZE-iN5ROz&_v(BP~Xs4*U-|+#Kg+LKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*W8Ce(^xmmaX!`jWs(9qSy!qU{$&D_b% z(8$He#N5pQrq?AuximL5uLPzy1)5GC5)7sUz#T7cTxGy9}SpTdxYtAy9oOVU}QSSZ*>5L^gH{M!Jw)FYt{@Xw4 z2p?Nc{QPHX=evL3&U?pjFn)uHxMiPO)Jg{3j=neVj`~J>cl4=TS~j=0`GDAx(3HL) z9jPz-({=?n%IGxm|G%|X|Ek4;K#hW18z#K>TXj@x1t;sl1)V%kEL-zUe%#mj>D466 zC3INSau@3x?(E$+dBhgWgie-DSereVOgO_nD#mWzxu0AVt zG34*l>@L4ohDH377j4-QJR|Cs-iEIqDmKbhY4zrdG{_};tX#J8y_MoGsoC?+&bRxv zJJV8flY7yxW1+|IE_$pXqnQ4_a_LL=21bVC2i{Fl-1u!8s4Vkz^>bP0l+XkKOW5Gf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/heart.padauk.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.padauk.png new file mode 100644 index 0000000000000000000000000000000000000000..02f58edb60d4c42474e076ee9a0cf1d8d729950d GIT binary patch literal 652 zcmV;70(1R|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0sTotK~y+TU6SETQ(+Xw-@m7vj++~+)onU9 zsSPc^Xq0AQVuZFbH+4n?f_;gMpxo-ZySur}DVU~K<_P>^I6}-?IjuhRrGKK|IC2@m z;qbigdCz&y^W3X)qwY-1xisb}Jo2qQ)Hj~^KP5t+jpl8$c`F&-pS$#XvFrP*_PzXt za`xQc`F53!*Dpo93w_7Q)iHnFZC}0}YBS@D zWM@t8h8ti<`kMA8a;lsODKnOHj#HsVM)NQ5mu=|hrC0UhylEh`3s{>_FzZ^ ze6vDo=AH*NoHxhMOQ%o~w3*%7T(8US{FQG}v-c~t{7tXDk~m0kgLMMf8J<$MN#*W( z5GNW?pXjIoNUX<$G8mUw6;QGQ${KR=fhdS4fd8V}*4=bKC2lzw%vl)FO#wibpn(#; zfp?4s^(=De61Ff29<PEy z<1V3=fB_%*^W-?&Q`y9hgG^XiBd+9tmWpcABiizVlj{?Wg$dus$ESPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0rW{kK~y+TU6OB4QehazpRIR&1YfrC0m@R- za+a%EVQB-+1ffBp%V0ATm1eGUO8Mho2BfZZ>`o={(LUATF}e zz5~m=WGt*~g(4$IOljURwwoeDI zKm;cRzZAwLMuptyIH!Db73qcWS@=yzeKPJC{)>vAQCbV= zfRFrna@=`!(@g6ysyX_{45O`*E=MUXN`qgg55K-&(UL dADlM{|0%LeUH>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0%}P_K~y+T6;fGG6JZqn&iQ6Kowc2rw(Jjz z62xGLB0GeoC$Z$-KjVkNC9#St}%TQ+s<+hC( z74sTzeAav}MNl^JOvOzCf7+Rg<1z3u!i!dlNr~eaD>{Z1Oh!5%b_hXnaFeY&9htM>!>heS2P}F%ANBpR1RdMK9jX>jVoWP|0*tFT za5!hNnqx zr8uTR)C}GvxTE7KFs)+C43p$N7M+mOMWhARHRKvtY2r`>q8#OAf`@?^kc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z)ZE-iN5ROz&_v(BP~Xs4*U-|+#Kg+LKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIU1N-I2*XQnwy#$85+8pIGVY*IvKfG znmZb}8albT!1TK0Czs}?=9R$orXcjX;nWLC4!H$Dn_W_iGRsm^+=}vZ6~NxM%Eav! zXPo9i^`_upB%Qo8;1 z)z#JEX7T%L{90ArPR+RC_4v)4O;*`QC6q0vtET7cZoIweMY41jlgG^9Pv<-}?e(`W zkKO&+{$;l=U8ebMPWHP=-q zaj9o!y{(nzxf2wY5h~h!`Lcy|_LT+J6ANg*GPL4^7Z;sdlNY+yC>&7H?*_0Ni4kar175BMz=2#HkA@y zJa&<;+@=$ayxp$WW-M73WdFBTw&Bs1J<%KX@g$!;qyIPJVyoTB>;A|0*0R^mPMh-P z%EtcHUthDlVBfvq&%d&3hR3YLZ}Q}>&f{6Aw)d1(?~yfmhDx&*Cz+K#EV%mH_cm|+ z+VqHw+eRB_^ICl^ow4q8k$6*iSntc^KLWFozw(x>ssHoS{OpE+K>6JtF0k%6{Vc(& zckBAcN9J+1+&Xjc^}?H<%l7@XeVH0(Ab9y?we?&ST;Nj!FGJ#*QvSzDrhFW3LiD#6evpRo1xx9z;3lF!rC&t;ucLK6VPVFFnI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/planks.ipe.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.ipe.png new file mode 100644 index 0000000000000000000000000000000000000000..5069aac839321dba529318bcd3db6320aced4b4b GIT binary patch literal 1396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z)ZE-iN5ROz&_v(BP~Xs4*U-|+#Kg+LKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WnVT6~I2)Ono10iT8ydQrSU4HExS5z5 znz%T*xEQz^!t}c2Czs}?=9R$orXciM;M5CB4!H$Dn_W_iGRsm^+=}vZ6~NxM%Eav! zQ=H~O^`_uL^_&?P7@v5$ zIEGZ*@(DVaciVtxsmrOZw`psG6Q(EaerNyf|Mj_Tv1JjBW!bY8HYZ0e`L-nCFvsBy zs-HgYb>DSS8SRVXvt%0x*GGyVS{~cQkuno42GTdUle(m|)Jcm*>bM4CQO zPk!)5kxyzHoAvTN&jk{1U6MdVC9t)>POqF?{-g5B&_x43kvSe(+ql#0x41 NJzf1=);T3K0RS6C3Nioy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/planks.padauk.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.padauk.png new file mode 100644 index 0000000000000000000000000000000000000000..050fa9ad67e8eb14db12cae6474294325f980754 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBN&U(5yhFJLLPTa_Q$U%T*Kf94iH_yceWo0derA$gHM$4}_3AdOW-*YT# z-tkK>O80NC-#+d1@4A{ezDDgm>ylrI9r?vjaOU!Xm0Mj~KRg|c=dOFLYw-9Z3$&OM_s=tF><9Rv8+4Y=JA%fyUa%C pKcn38xsJMvg6Dsij{a;?!>}<(E<7#%X%x_744$rjF6*2UngGI@h=~9I literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/blocks/wood/planks.zebrawood.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.zebrawood.png new file mode 100644 index 0000000000000000000000000000000000000000..dd0b140e5feae2243897f8f0e0f6587688cad7b7 GIT binary patch literal 861 zcmV-j1ETziP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0?tW9K~y+T6_Qy~+F%rh^Mh>b6t_;ja8#5m z5RyQmCwa`$7Eg_GM;odi{jVYdp_Rh@Tf?=VZ7G6r>JoMlFg7^cUN;hF!b z5UfS!u31D0jt|dQZsJr&a5P2aK11JVgf1YE5k*A*drNUQ6<06G{4It`;n{rHE(ONF zWtf|Ur^PSoJlsoqbjfKcPDtl4);DU%L_@}Pnfg=M$nVbdxi zRhRIZh(SgS=hwy?3S}xpT_S%Mwu*-f*-r~nXsVs?R0Z7N;4%yAlG{*-&ItuQo-y&D ztS@A{`k7~Tnv`? zXKEa(25q-#rlnDR8LNXYfskE8fo6Q|8h=GY-nr_EE77yB@ZH?3={5pn0 zmWapvW7e^!p%8`wENzw!?HA!iAu!oVdck9ZgDcTjXdSdrTu?QN3F{NOOailp;&~`+ zl_Col2e26WV8ww-ca3!vSr`o0q8pfner6c}U5g@D9Qyry^|=tp?M`1G!P>?|H|ed5 z&b|Z#=)08nKFb&)3|TyKM2~=$dJG+8eE%w&mGDd{vZ#h8?y^h06x|gZCJ3axEsZb) z7(gRO%$uf4wvGu<^rf<04A15E?P6g3_6yTXFEx1w_^Xour{Ss#D5Uck?|*Nql%*1e zO#RAl6vFfQ2*R$|x+%J;Q98R=K61Qnffd;W)j1HbS;t-gR29jG{6;xqzdUfL+taNC nRTbUfG_E+Lp^#M(Zzrh#mIi8amlx5h00000NkvXXu0mjfj