From 255244bc4b9d185c9ceccc0113243a03d6141706 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 2 Feb 2014 15:58:33 -0500 Subject: [PATCH] Added Mahogany logs/leaves/planks/saplings/etc. for Tropical Rainforest trees --- .../biomes/BiomeGenTropicalRainforest.java | 2 +- .../common/blocks/BlockBOPColorizedLeaves.java | 5 +++-- .../common/blocks/BlockBOPColorizedSapling.java | 7 ++++++- .../common/blocks/BlockBOPLog.java | 16 ++++------------ .../common/blocks/BlockBOPPlank.java | 2 +- .../common/blocks/BlockBOPSlab.java | 2 +- .../common/blocks/BlockBOPStairs.java | 4 ++-- .../biomesoplenty/common/core/BOPBlocks.java | 2 ++ .../biomesoplenty/common/core/BOPCrafting.java | 7 +++++++ .../common/handlers/FurnaceFuelHandler.java | 1 + .../integration/TreecapitatorIntegration.java | 7 +++++++ .../itemblocks/ItemBlockColorizedSapling.java | 2 +- .../common/itemblocks/ItemBlockPlank.java | 2 +- .../features/trees/WorldGenRainforestTree1.java | 2 +- .../assets/biomesoplenty/lang/en_US.lang | 7 +++++++ .../textures/blocks/leaves_mahogany_fancy.png | Bin 0 -> 710 bytes .../textures/blocks/leaves_mahogany_fast.png | Bin 0 -> 617 bytes .../textures/blocks/log_mahogany_heart.png | Bin 0 -> 597 bytes .../textures/blocks/log_mahogany_side.png | Bin 0 -> 649 bytes .../textures/blocks/plank_mahogany.png | Bin 0 -> 356 bytes .../textures/blocks/sapling_mahogany.png | Bin 0 -> 893 bytes 21 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany_fancy.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany_fast.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/log_mahogany_heart.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/log_mahogany_side.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/plank_mahogany.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/sapling_mahogany.png diff --git a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java index a2911c834..fdbf92b68 100644 --- a/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biomes/BiomeGenTropicalRainforest.java @@ -56,7 +56,7 @@ public class BiomeGenTropicalRainforest extends BOPBiome public WorldGenAbstractTree func_150567_a(Random random) { return random.nextInt(5) == 0 ? new WorldGenTrees(false, 4 + random.nextInt(7), 3, 3, true) : - new WorldGenRainforestTree1(Blocks.log, Blocks.leaves, 3, 3, false, 8, 8); + new WorldGenRainforestTree1(BOPBlockHelper.get("logs4"), BOPBlockHelper.get("colorizedLeaves2"), 3, 2, false, 8, 8); } @Override diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java index 85f254d21..6023280e0 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java @@ -37,8 +37,9 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab //colorizedLeaves2 //Willow (0) //Pine (1) + //Mahogany (2) - private static final String[] leaves = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine"}; + private static final String[] leaves = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine", "mahogany"}; private IIcon[][] textures; private final ColourizedLeafCategory category; int[] adjacentTreeBlocks; @@ -166,7 +167,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab { for (int i = 0; i < 4; ++i) { - if (category != ColourizedLeafCategory.CAT2 || i < 2) + if (category != ColourizedLeafCategory.CAT2 || i < 3) { list.add(new ItemStack(block, 1, i)); } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java index 12cd7980d..1c31815ef 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java @@ -20,12 +20,13 @@ import biomesoplenty.api.BOPBlockHelper; import biomesoplenty.common.world.features.trees.WorldGenBOPSwampTree; import biomesoplenty.common.world.features.trees.WorldGenPalmTree1; import biomesoplenty.common.world.features.trees.WorldGenPineTree; +import biomesoplenty.common.world.features.trees.WorldGenRainforestTree1; import biomesoplenty.common.world.features.trees.WorldGenRedwoodTree2; import biomesoplenty.common.world.features.trees.WorldGenSacredOak; public class BlockBOPColorizedSapling extends BlockSapling { - private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine"}; + private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine", "mahogany"}; private IIcon[] textures; private static final int TYPES = 15; @@ -160,6 +161,10 @@ public class BlockBOPColorizedSapling extends BlockSapling case 5: // Pine Tree obj = new WorldGenPineTree(); break; + + case 6: //Mahogany Tree + obj = new WorldGenRainforestTree1(BOPBlockHelper.get("logs4"), BOPBlockHelper.get("colorizedLeaves2"), 3, 2, false, 8, 8); + break; } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java index e46abf3b4..9db58fc5a 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java @@ -44,8 +44,9 @@ public class BlockBOPLog extends Block //Pine (0) //Hellbark (1) //Jacaranda (2) + //Mahogany (3) - private static final String[] types = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "dead", "bigflowerstem", "pine", "hellbark", "jacaranda"}; + private static final String[] types = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "dead", "bigflowerstem", "pine", "hellbark", "jacaranda", "mahogany"}; private IIcon[] textures; private IIcon[] logHearts; @@ -107,17 +108,8 @@ public class BlockBOPLog extends Block //TODO: getSubBlocks() public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) { - if (category != LogCategory.CAT4) - { - for (int i = 0; i < 4; ++i) { - list.add(new ItemStack(this, 1, i)); - } - } - else - { - for (int i = 0; i < 3; ++i) { - list.add(new ItemStack(this, 1, i)); - } + for (int i = 0; i < 4; ++i) { + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java index 58935c1bb..e5519031d 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java @@ -14,7 +14,7 @@ import biomesoplenty.BiomesOPlenty; public class BlockBOPPlank extends Block { - private static final String[] woodTypes = new String[] {"plank_sacredoak", "plank_cherry", "plank_dark", "plank_fir", "plank_holy", "plank_magic", "plank_mangrove", "plank_palm", "plank_redwood", "plank_willow", "bamboothatching", "plank_pine", "plank_hell_bark", "plank_jacaranda"}; + private static final String[] woodTypes = new String[] {"plank_sacredoak", "plank_cherry", "plank_dark", "plank_fir", "plank_holy", "plank_magic", "plank_mangrove", "plank_palm", "plank_redwood", "plank_willow", "bamboothatching", "plank_pine", "plank_hell_bark", "plank_jacaranda", "plank_mahogany"}; private IIcon[] textures; public BlockBOPPlank() diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java index 92b1c268b..1724ef1a5 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java @@ -25,7 +25,7 @@ public class BlockBOPSlab extends BlockSlab WOOD1, WOOD2, STONE; } - private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda"}; + private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda", "mahogany"}; private static final String[] rockTypes = new String[] {"redcobble", "redbrick", "mudbrick", "holycobble", "holybrick"}; private IIcon[] textures; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java index 0308f74ae..7b9dadc24 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java @@ -14,7 +14,7 @@ public class BlockBOPStairs extends BlockStairs { public static enum Category { - SACREDOAK ("wood"), CHERRY ("wood"), DARK ("wood"), FIR ("wood"), HOLY ("wood"), MAGIC ("wood"), MANGROVE ("wood"), PALM ("wood"), REDWOOD ("wood"), WILLOW ("wood"), PINE ("wood"), HELL_BARK ("wood"), JACARANDA ("wood"), RED_COBBLE ("stone"), RED_BRICKS ("stone"), MUD_BRICKS ("stone"), HOLY_COBBLE ("stone"), HOLY_BRICKS ("stone"); + SACREDOAK ("wood"), CHERRY ("wood"), DARK ("wood"), FIR ("wood"), HOLY ("wood"), MAGIC ("wood"), MANGROVE ("wood"), PALM ("wood"), REDWOOD ("wood"), WILLOW ("wood"), PINE ("wood"), HELL_BARK ("wood"), JACARANDA ("wood"), MAHOGANY ("wood"), RED_COBBLE ("stone"), RED_BRICKS ("stone"), MUD_BRICKS ("stone"), HOLY_COBBLE ("stone"), HOLY_BRICKS ("stone"); private final List values; private String type; @@ -26,7 +26,7 @@ public class BlockBOPStairs extends BlockStairs } } - private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda"}; + private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda", "mahogany"}; private static final String[] stoneTypes = new String[] {"redcobble", "redbrick", "mudbrick", "holycobble", "holybrick"}; private IIcon[] textures; diff --git a/src/main/java/biomesoplenty/common/core/BOPBlocks.java b/src/main/java/biomesoplenty/common/core/BOPBlocks.java index 0034c83be..14c2b6977 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBlocks.java +++ b/src/main/java/biomesoplenty/common/core/BOPBlocks.java @@ -220,6 +220,7 @@ public class BOPBlocks registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.PINE).func_149663_c("pineStairs")); registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.HELL_BARK).func_149663_c("hellBarkStairs")); registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.JACARANDA).func_149663_c("jacarandaStairs")); + registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.MAHOGANY).func_149663_c("mahoganyStairs")); registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.RED_COBBLE).func_149663_c("redCobbleStairs")); registerBlock(new BlockBOPStairs(BOPBlockHelper.get("redRock"), Category.RED_BRICKS).func_149663_c("redBricksStairs")); @@ -262,6 +263,7 @@ public class BOPBlocks Blocks.fire.setFireInfo(BOPBlockHelper.get("pineStairs"), 5, 20); Blocks.fire.setFireInfo(BOPBlockHelper.get("hellBarkStairs"), 5, 20); Blocks.fire.setFireInfo(BOPBlockHelper.get("jacarandaStairs"), 5, 20); + Blocks.fire.setFireInfo(BOPBlockHelper.get("mahoganyStairs"), 5, 20); Blocks.fire.setFireInfo(BOPBlockHelper.get("moss"), 15, 100); Blocks.fire.setFireInfo(BOPBlockHelper.get("treeMoss"), 15, 100); diff --git a/src/main/java/biomesoplenty/common/core/BOPCrafting.java b/src/main/java/biomesoplenty/common/core/BOPCrafting.java index 78f1534d4..4afce2535 100644 --- a/src/main/java/biomesoplenty/common/core/BOPCrafting.java +++ b/src/main/java/biomesoplenty/common/core/BOPCrafting.java @@ -160,6 +160,12 @@ public class BOPCrafting addRecipeToFront(new ItemStack(BOPBlockHelper.get("woodenSingleSlab2"), 6, 4), new Object[] {"RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 13)}); addRecipeToFront(new ItemStack(BOPBlockHelper.get("jacarandaStairs"), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 13)}); addRecipeToFront(new ItemStack(BOPBlockHelper.get("jacarandaStairs"), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 13)}); + + //Mahogany + GameRegistry.addShapelessRecipe(new ItemStack(BOPBlockHelper.get("planks"), 4, 14), new Object[] {new ItemStack(BOPBlockHelper.get("logs4"), 1, 3)}); + addRecipeToFront(new ItemStack(BOPBlockHelper.get("woodenSingleSlab2"), 6, 5), new Object[] {"RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 14)}); + addRecipeToFront(new ItemStack(BOPBlockHelper.get("mahoganyStairs"), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 14)}); + addRecipeToFront(new ItemStack(BOPBlockHelper.get("mahoganyStairs"), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPBlockHelper.get("planks"), 1, 14)}); GameRegistry.addRecipe(new ItemStack(BOPBlockHelper.get("overgrownNetherrack"), 1, 0), new Object[] {"SSS", "SNS", "SSS", 'S', Items.wheat_seeds, 'N', Blocks.netherrack}); GameRegistry.addRecipe(new ItemStack(Blocks.wool, 1, 0), new Object[] {"CCC", "CCC", "CCC", 'C', new ItemStack(BOPBlockHelper.get("plants"), 1, 7)}); @@ -381,6 +387,7 @@ public class BOPCrafting OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("pineStairs"))); OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("hellBarkStairs"))); OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("jacarandaStairs"))); + OreDictionary.registerOre("stairWood", new ItemStack(BOPBlockHelper.get("mahoganyStairs"))); OreDictionary.registerOre("treeLeaves", new ItemStack(BOPBlockHelper.get("colorizedLeaves1"), 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre("treeLeaves", new ItemStack(BOPBlockHelper.get("colorizedLeaves2"), 1, OreDictionary.WILDCARD_VALUE)); diff --git a/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java b/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java index e173712e5..16e779b87 100644 --- a/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java +++ b/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java @@ -39,6 +39,7 @@ public class FurnaceFuelHandler implements IFuelHandler addFuel(new ItemStack(BOPBlockHelper.get("pineStairs")), 300); addFuel(new ItemStack(BOPBlockHelper.get("jacarandaStairs")), 300); addFuel(new ItemStack(BOPBlockHelper.get("hellBarkStairs")), 300); + addFuel(new ItemStack(BOPBlockHelper.get("mahoganyStairs")), 300); addFuel(new ItemStack(BOPItemHelper.get("misc"), 1, 1), 400); } diff --git a/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java b/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java index 63748e550..32dc87e57 100644 --- a/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java +++ b/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java @@ -179,6 +179,13 @@ public class TreecapitatorIntegration tree.setString("leaves", String.format("%s,1; %s,9", leaves4, leaves4)); tree.setBoolean("requireLeafDecayCheck", false); treeList.appendTag(tree); + // BoP mahogany + tree = new NBTTagCompound(); + tree.setString("treeName", "mahogany"); + tree.setString("logs", String.format("%s,3; %s,7; %s,11", logs4, logs4, logs4)); + tree.setString("leaves", String.format("%s,2; %s,10", leavesColorized2, leavesColorized2)); + tree.setBoolean("requireLeafDecayCheck", false); + treeList.appendTag(tree); tpModCfg.setTag("trees", treeList); diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java index addb93e84..7b296267c 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockColorizedSapling.java @@ -7,7 +7,7 @@ import net.minecraft.util.IIcon; public class ItemBlockColorizedSapling extends ItemBlock { - private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine"}; + private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine", "mahogany"}; public ItemBlockColorizedSapling(Block block) { diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java index 1b8ecedb3..db96b9700 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; public class ItemBlockPlank extends ItemBlock { - private static final String[] woodTypes = new String[] {"sacredoakPlank", "cherryPlank", "darkPlank", "firPlank", "holyPlank", "magicPlank", "mangrovePlank", "palmPlank", "redwoodPlank", "willowPlank", "bambooThatching", "pinePlank", "hellBarkPlank", "jacarandaPlank"}; + private static final String[] woodTypes = new String[] {"sacredoakPlank", "cherryPlank", "darkPlank", "firPlank", "holyPlank", "magicPlank", "mangrovePlank", "palmPlank", "redwoodPlank", "willowPlank", "bambooThatching", "pinePlank", "hellBarkPlank", "jacarandaPlank", "mahoganyPlank"}; public ItemBlockPlank(Block block) { diff --git a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java index 69889aeb6..371b063f7 100644 --- a/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java +++ b/src/main/java/biomesoplenty/common/world/features/trees/WorldGenRainforestTree1.java @@ -118,7 +118,7 @@ public class WorldGenRainforestTree1 extends WorldGenAbstractTree if (block1.isAir(world, i2, k1, k2) || block1.isLeaves(world, i2, k1, k2)) { - this.func_150516_a(world, i2, k1, k2, Blocks.leaves, this.leavesMeta); + this.func_150516_a(world, i2, k1, k2, this.leaves, this.leavesMeta); } } } diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index adeef0c0b..da419f6b8 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -110,6 +110,7 @@ tile.colorizedSaplings.palmSapling.name=Palm Sapling tile.colorizedSaplings.redwoodSapling.name=Redwood Sapling tile.colorizedSaplings.willowSapling.name=Willow Sapling tile.colorizedSaplings.pineSapling.name=Pine Sapling +tile.colorizedSaplings.mahoganySapling.name=Mahogany Sapling tile.willow.name=Willow tile.ivy.name=Ivy @@ -200,6 +201,7 @@ tile.planks.bambooThatching.name=Bamboo Thatching tile.planks.pinePlank.name=Pine Wood Planks tile.planks.hellBarkPlank.name=Hellbark Wood Planks tile.planks.jacarandaPlank.name=Jacaranda Wood Planks +tile.planks.mahoganyPlank.name=Mahogany Wood Planks tile.logs1.sacredoakWood.name=Sacred Oak Wood tile.logs1.cherryWood.name=Cherry Wood @@ -219,6 +221,7 @@ tile.logs3.bigflowerstemWood.name=Giant Flower Stem tile.logs4.pineWood.name=Pine Wood tile.logs4.hellbarkWood.name=Hellbark Wood tile.logs4.jacarandaWood.name=Jacaranda Wood +tile.logs4.mahoganyWood.name=Mahogany Wood tile.leaves1.yellowautumn.name=Yellow Autumn Leaves tile.leaves1.bamboo.name=Bamboo Leaves @@ -245,6 +248,7 @@ tile.colorizedLeaves1.redwood.name=Redwood Leaves tile.colorizedLeaves2.willow.name=Willow Leaves tile.colorizedLeaves2.pine.name=Pine Leaves +tile.colorizedLeaves2.mahogany.name=Mahogany Leaves tile.appleLeaves.name=Apple Leaves tile.persimmonLeaves.name=Persimmon Leaves @@ -262,6 +266,7 @@ tile.woodenDoubleSlab2.willowSlab.name=Willow Wood Slab tile.woodenDoubleSlab2.pineSlab.name=Pine Wood Slab tile.woodenDoubleSlab2.hell_barkSlab.name=Hellbark Wood Slab tile.woodenDoubleSlab2.jacarandaSlab.name=Jacaranda Wood Slab +tile.woodenDoubleSlab2.mahoganySlab.name=Mahogany Wood Slab tile.woodenSingleSlab1.sacredoakSlab.name=Sacred Oak Wood Slab tile.woodenSingleSlab1.cherrySlab.name=Cherry Wood Slab @@ -276,6 +281,7 @@ tile.woodenSingleSlab2.willowSlab.name=Willow Wood Slab tile.woodenSingleSlab2.pineSlab.name=Pine Wood Slab tile.woodenSingleSlab2.hell_barkSlab.name=Hellbark Wood Slab tile.woodenSingleSlab2.jacarandaSlab.name=Jacaranda Wood Slab +tile.woodenSingleSlab2.mahoganySlab.name=Mahogany Wood Slab tile.sacredoakStairs.name=Sacred Oak Wood Stairs tile.cherryStairs.name=Cherry Wood Stairs @@ -290,6 +296,7 @@ tile.willowStairs.name=Willow Wood Stairs tile.pineStairs.name=Pine Wood Stairs tile.hellBarkStairs.name=Hellbark Wood Stairs tile.jacarandaStairs.name=Jacaranda Wood Stairs +tile.mahoganyStairs.name=Mahogany Wood Stairs item.food.berries.name=Berry item.food.shroompowder.name=Shroom Powder diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany_fancy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany_fancy.png new file mode 100644 index 0000000000000000000000000000000000000000..ac242ffa1e87ad603c8790a9bd7f82647d7b5bfb GIT binary patch literal 710 zcmV;%0y+JOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0006tNkls(Z@zt7YwbPG=kqyMGMUuQ&W`r>_LRwF zTbb{TjSc63I-k$g?RIs3elDsvn@!DT zGjrbG-`B~>iH?tt&Bp%t_%Iu^EW!Hvx`TV8(GYZMwVF9DmrJEmDSdu^>iPLu?RHz& z*Vh`4$9jK%|3%}-cz=JdN~Iz+fkHl?H?AZhxKt{cz-MP?CM2|N0Uv(#dR@h0(JBlE z1Ir!?g^WTvoi-Z$108lyf!r1%#p7|^-Q8(2nP@tl+C7)cX?J&5;c(c3Zfimz@+DaK)@vu3HwK4+UEEB-DcMv@^a{)ouXeSd!&GDmy1wzl;6 z_-L>Z3U!$QbfFVWAw_@>N;ZC=a=;`rA~Ah@6U=;IV-7YqHyue|UtdLspvwcZx57k$ sfG14w&q*LBLNXWlk@)A${H5gFA9h{?bW>t^vH$=807*qoM6N<$g3jAG1^@s6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany_fast.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_mahogany_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2a5b7dde96b0480450b8d785c9f890a868197b GIT binary patch literal 617 zcmV-v0+#)WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0005lNkle&yav2VXv)ODamEw|fxm>tJ;dchqk47W3wcBl;U$0jpk+|J% z+wFEboi>|I$8pZ*GnJx&?!jPSnkF%l48uS%Jyh50b+C%XB6AC18qkB#e!pL>RzX@W zm+}Eg>2w-Z#L#jNA+ca!xKJq6>-7$Y!|`||&gF8Nrm3n*U8mEj)oR^tcQ_nA9uEaB zB*BjHG)E#4QXsIB^z-?^U#V1JBSoIV^J1~c=kp*TX|-DMz$p|8c#RFjz*8gL`?`bx zgt7;O5>w6S;9(JdFd>%Eb2^JDI=kN-l0y`KC$ASr{W;0x} z2U7a?`#sj7S<;FbV37Z6`IV*2%}xk_kpDCx&*l09b#ra$4FJj@00000NkvXXu0mjf DfP4;& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/log_mahogany_heart.png b/src/main/resources/assets/biomesoplenty/textures/blocks/log_mahogany_heart.png new file mode 100644 index 0000000000000000000000000000000000000000..ba56120f011a0f4a7e2397f5c98f0af33ed871e2 GIT binary patch literal 597 zcmV-b0;>IqP)H;LN@>a0lrB@K~y+TU6NT(0znXj=ht|k zM#Lx&Afn5$il8j)rNC;U@ji$?dEyllk9Z5BZ~jrgwUZ4osZ467ySk@qMx`S?U^N%} z+^&4@d(BN(kM`>$eIPp=f~O;)>1cmB5e5w}uSj}vW*@CQYbPE`)4}0KrPQpJA*Zz& zwPhq<=Zj~i*056zD|I-RU_B{K+*EUr0GDp|)t%FZdzGO@kY3H}Zwp4tvpVtqcS8A3 z&q705>)2D9<>a$npaU`K&MKe;tH?yKZ6sCQNyARdlOiBMx9iH3+(h!I!X+X5PDZ_~ znUcp?G7O|uGryLcpfF8@w0A0MJs)El_CM>3qLfwu*@ct2H>LumZ|lTh7wm3nHn@^F z=nKfR{X7VFrjH&Csa;cJIGKUzkBuZm&|b8qFfMUb$Z{dB)=F_6h=6zk`G-zhx7N2bPDNB8 zb~7$DE-^7j^FlWO00IR`L_t(IPd$>2QrbWih4*EuHpGfJ5L>`P5<)0Kksl!lq$nM* zAxH+X<7lycgHCH}q4Zt*g`IKc%+1Np-gD2MU6G6JfMGGY^gHXB`{X&crrPlc$R8;1 zTugbVsr92M`0ADfoA^BX4m}`fTI2E&l|_la*Y0}WU-XV8#JHNdETtz+W75#4P4lW| zOzUQFYSQ+0_XWePL}V@{q^Syj`8RU*ii2;)W)n`a2RIHOG`#uqID<|*D*0>f$Tr~{Rr4@Ow^v}4H{Gm#e z!%B+dJq+H1)vdd{aR=p;7}Zi!Cx;kzZ`wAaXC3?JZFjZkKi&0+l0bpi*7Heq?C1g| z2622WvRj&-cMDU;3fh);k|D~%YZc(x*xwQO;T3%>rb#n=LYi7h@5zV6-5~@v!K9fV z9$F@F?d0X70{>SI&AZ$P$SF~XRvF8Sc j;|I=$P&6Jfquc)hR=WHQw!cKA00000NkvXXu0mjf$+;s6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/plank_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/blocks/plank_mahogany.png new file mode 100644 index 0000000000000000000000000000000000000000..2d24962594a71dfea219c3d45206ce8be0cf4805 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvkDLT^vI!{BtK7avgFIa4i;mdsImwX|Y1sHm3u}LgEfGS1@byzlo0f zu`c_;#xwtB+8fUcBg4H-lqFMGaai(BjG;}=30{(UiONRqgw zz3|celwgDZY*wzzPt5Fll@`jgv&qzGFQbkq&$3LBKr8drz}-suuEf$gNa^S$dX_$MNLgM@zVWicLQF(m40#RWw_E@OU)NMW^}ViSj0N}&$-;< wvDI;J9{=U~hTnOw7qMOJ}!=x6r72MPQfx?i%)78&qol`;+0Jb%UZ~y=R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_mahogany.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_mahogany.png new file mode 100644 index 0000000000000000000000000000000000000000..874bac9c0e679e5b36a08ba090e5497b87f3d6ef GIT binary patch literal 893 zcmV-@1A_dCP)H;LN@>a0_I6XK~y+TJyS_fQ&AK?op_yW zYefk{5fO)4nG|U(5R8HrEQKOvv_cWFC!hw;HkU&bMl1g7{AxVSl^)9ENFDT%aNEv46}Q88qKd(a58*-V9DE!e5@?O~L^ zIfTCNT6~zbQqA}=5m2Mih+w2pD9Afv#R(t5U*y2EqZaZETk!5zD%w6uD0_Ycwkm?F zOM)Xn$gCr}a92&7M4-4wkL*@LdF}~xPLrtO%fA$|w<>V?fl^dd5R#}j;KBIg7Nk@X z3d4F)1*N5>iJrOF$k#kv@0XC@p}^TjLT(#TcB>BUw_F(P@T0rl4QHnwTz)u=7bhR@|ddW{B66H4R+RY>&`Mt>eBvfJ%s zC?P78