Merge branch 'master' of https://github.com/BiomesOPlenty/BiomesOPlenty

src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java

@@ -29,7 +29,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     }
     
     //colorizedLeaves1
-    //Acacia		(0)
+    //Sacred Oak	(0)
     //Mangrove 		(1)
     //Palm			(2)
     //Redwood		(3)
@@ -38,7 +38,7 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     //Willow		(0)
     //Pine			(1)
     
-    private static final String[] leaves = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine"};
+    private static final String[] leaves = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine"};
     private IIcon[][] textures;
     private final ColourizedLeafCategory category;
     int[] adjacentTreeBlocks;
@@ -115,12 +115,6 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
     {
         switch (par1)
         {
-            case 0:
-                return ColorizerFoliage.getFoliageColorBirch();
-
-            case 3:
-                return ColorizerFoliage.getFoliageColorPine();
-
             default:
                 return ColorizerFoliage.getFoliageColorBasic();
         }

src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedSapling.java

@@ -18,7 +18,7 @@ import biomesoplenty.BiomesOPlenty;
 
 public class BlockBOPColorizedSapling extends BlockSapling
 {
-	private static final String[] saplings = new String[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine", "sacredoak"};
+	private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine"};
 	private IIcon[] textures;
 	private static final int TYPES = 15;
 
@@ -126,8 +126,8 @@ public class BlockBOPColorizedSapling extends BlockSapling
 		{
 			switch (meta)
 			{
-			    case 0: // Acacia Tree
+			    case 0: // Sacred Oak Tree
-			        obj = new WorldGenAcacia(false);
+			        obj = new WorldGenMassiveTree(false);
 			        break;
 
 			    case 1: // Mangrove Tree
@@ -155,10 +155,6 @@ public class BlockBOPColorizedSapling extends BlockSapling
 			    case 5: // Pine Tree
 			        obj = new WorldGenPineTree();
 			        break;
-
-			    case 6: // Sacred Oak
-			        obj = new WorldGenMassiveTree(false);
-			        break;
 			}
 		}*/
 

src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java

@@ -23,7 +23,7 @@ public class BlockBOPLog extends Block
 	}
 	
 	//logs1
-	//Acacia			(0)
+	//Sacred Oak		(0)
 	//Cherry			(1)
 	//Dark				(2)
 	//Fir				(3)
@@ -45,7 +45,7 @@ public class BlockBOPLog extends Block
 	//Hellbark			(1)
 	//Jacaranda			(2)
 
-	private static final String[] types = new String[] {"acacia", "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"};
 	private IIcon[] textures;
 	private IIcon[] logHearts;
 

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_acacia", "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"};
 	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[] {"acacia", "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"};
 	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
 	{
-		ACACIA ("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"), 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[] {"acacia", "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"};
 	private static final String[] stoneTypes = new String[] {"redcobble", "redbrick", "mudbrick", "holycobble", "holybrick"};
 	private IIcon[] textures;
 

src/main/java/biomesoplenty/common/core/BOPBlocks.java

@@ -206,7 +206,7 @@ public class BOPBlocks
 		registerBlock(stoneSingleSlab, ItemBlockSlab.class, stoneSingleSlab, stoneDoubleSlab);
 		registerBlock(stoneDoubleSlab, ItemBlockSlab.class, stoneSingleSlab, stoneDoubleSlab);
 		
-		registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.ACACIA).func_149663_c("acaciaStairs"));
+		registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.SACREDOAK).func_149663_c("sacredoakStairs"));
 		registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.CHERRY).func_149663_c("cherryStairs"));
 		registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.DARK).func_149663_c("darkStairs"));
 		registerBlock(new BlockBOPStairs(BOPBlockHelper.get("planks"), Category.FIR).func_149663_c("firStairs"));

src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java

@@ -30,7 +30,7 @@ public class FurnaceFuelHandler implements IFuelHandler
 		addFuel(new ItemStack(BOPBlockHelper.get("redwoodStairs")), 300);
 		addFuel(new ItemStack(BOPBlockHelper.get("willowStairs")), 300);
 		addFuel(new ItemStack(BOPBlockHelper.get("firStairs")), 300);
-		addFuel(new ItemStack(BOPBlockHelper.get("acaciaStairs")), 300);
+		addFuel(new ItemStack(BOPBlockHelper.get("sacredoakStairs")), 300);
 		addFuel(new ItemStack(BOPBlockHelper.get("cherryStairs")), 300);
 		addFuel(new ItemStack(BOPBlockHelper.get("darkStairs")), 300);
 		addFuel(new ItemStack(BOPBlockHelper.get("magicStairs")), 300);

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[] {"acacia", "mangrove", "palm", "redwood", "willow", "pine", "sacredoak"};
+	private static final String[] saplings = new String[] {"sacredoak", "mangrove", "palm", "redwood", "willow", "pine"};
 
 	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[] {"acaciaPlank", "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"};
 
 	public ItemBlockPlank(Block block)
 	{

src/main/resources/assets/biomesoplenty/lang/en_US.lang

@@ -104,13 +104,12 @@ tile.saplings.hellbarkSapling.name=Hellbark Sapling
 tile.saplings.jacarandaSapling.name=Jacaranda Sapling
 tile.saplings.persimmonSapling.name=Persimmon Sapling
 
-tile.colorizedSaplings.acaciaSapling.name=Acacia Sapling
+tile.colorizedSaplings.sacredoakSapling.name=Sacred Oak Sapling
 tile.colorizedSaplings.mangroveSapling.name=Mangrove Sapling
 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.sacredoakSapling.name=Sacred Oak Sapling
 
 tile.willow.name=Willow
 tile.ivy.name=Ivy
@@ -187,7 +186,7 @@ tile.stoneSingleSlab.mudbrickSlab.name=Mud Bricks Slab
 tile.stoneSingleSlab.holycobbleSlab.name=Skystone Cobblestone Slab
 tile.stoneSingleSlab.holybrickSlab.name=Skystone Bricks Slab
 
-tile.planks.acaciaPlank.name=Acacia Wood Planks
+tile.planks.sacredoakPlank.name=Sacred Oak Wood Planks
 tile.planks.cherryPlank.name=Cherry Wood Planks
 tile.planks.darkPlank.name=Dark Wood Planks
 tile.planks.firPlank.name=Fir Wood Planks
@@ -202,7 +201,7 @@ tile.planks.pinePlank.name=Pine Wood Planks
 tile.planks.hellBarkPlank.name=Hellbark Wood Planks
 tile.planks.jacarandaPlank.name=Jacaranda Wood Planks
 
-tile.logs1.acaciaWood.name=Acacia Wood
+tile.logs1.sacredoakWood.name=Sacred Oak Wood
 tile.logs1.cherryWood.name=Cherry Wood
 tile.logs1.darkWood.name=Dark Wood
 tile.logs1.firWood.name=Fir Wood
@@ -239,7 +238,7 @@ tile.leaves3.whitecherry.name=White Cherry Leaves
 tile.leaves4.hellbark.name=Hellbark Leaves
 tile.leaves4.jacaranda.name=Jacaranda Leaves
 
-tile.colorizedLeaves1.acacia.name=Acacia Leaves
+tile.colorizedLeaves1.sacredoak.name=Sacred Oak Leaves
 tile.colorizedLeaves1.mangrove.name=Mangrove Leaves
 tile.colorizedLeaves1.palm.name=Palm Leaves
 tile.colorizedLeaves1.redwood.name=Redwood Leaves
@@ -250,7 +249,7 @@ tile.colorizedLeaves2.pine.name=Pine Leaves
 tile.appleLeaves.name=Apple Leaves
 tile.persimmonLeaves.name=Persimmon Leaves
 
-tile.woodenDoubleSlab1.acaciaSlab.name=Acacia Wood Slab
+tile.woodenDoubleSlab1.sacredoakSlab.name=Sacred Oak Wood Slab
 tile.woodenDoubleSlab1.cherrySlab.name=Cherry Wood Slab
 tile.woodenDoubleSlab1.darkSlab.name=Dark Wood Slab
 tile.woodenDoubleSlab1.firSlab.name=Fir Wood Slab
@@ -264,7 +263,7 @@ tile.woodenDoubleSlab2.pineSlab.name=Pine Wood Slab
 tile.woodenDoubleSlab2.hell_barkSlab.name=Hellbark Wood Slab
 tile.woodenDoubleSlab2.jacarandaSlab.name=Jacaranda Wood Slab
 
-tile.woodenSingleSlab1.acaciaSlab.name=Acacia Wood Slab
+tile.woodenSingleSlab1.sacredoakSlab.name=Sacred Oak Wood Slab
 tile.woodenSingleSlab1.cherrySlab.name=Cherry Wood Slab
 tile.woodenSingleSlab1.darkSlab.name=Dark Wood Slab
 tile.woodenSingleSlab1.firSlab.name=Fir Wood Slab
@@ -278,7 +277,7 @@ tile.woodenSingleSlab2.pineSlab.name=Pine Wood Slab
 tile.woodenSingleSlab2.hell_barkSlab.name=Hellbark Wood Slab
 tile.woodenSingleSlab2.jacarandaSlab.name=Jacaranda Wood Slab
 
-tile.acaciaStairs.name=Acacia Wood Stairs
+tile.sacredoakStairs.name=Sacred Oak Wood Stairs
 tile.cherryStairs.name=Cherry Wood Stairs
 tile.darkStairs.name=Dark Wood Stairs
 tile.firStairs.name=Fir Wood Stairs