Added Mahogany logs/leaves/planks/saplings/etc. for Tropical Rainforest trees

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

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));
             }

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;
 			}
 		}
 

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));
 		}
 	}
 

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()

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;
 

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<String> 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;
 

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);

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));

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);
 	}

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);
         

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)
 	{

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)
 	{

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);
                                     }
                                 }
                             }

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