Merged in MillingRecipes (pull request #7)

Milling Recipes & many other misc fixes

5 files changed, 140 insertions, 9 deletions

diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
index 2ee1587809..3716359d7a 100644
--- a/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java
@@ -16,6 +16,9 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.xmod.bop.blocks.pine.LeavesPineTree;
+import gtPlusPlus.xmod.bop.blocks.pine.LogPineTree;
+import gtPlusPlus.xmod.bop.blocks.pine.SaplingPineTree;
 import gtPlusPlus.xmod.bop.blocks.rainforest.LeavesRainforestTree;
 import gtPlusPlus.xmod.bop.blocks.rainforest.LogRainforestTree;
 import gtPlusPlus.xmod.bop.blocks.rainforest.SaplingRainforestTree;
@@ -30,10 +33,14 @@ public class BOP_Block_Registrator {
 	public static Block log_Rainforest;
 	public static Block leaves_Rainforest;
 	public static Block sapling_Rainforest;
+	public static Block log_Pine;
+	public static Block leaves_Pine;
+	public static Block sapling_Pine;
 
 	//Runs Each tree Type separately
 	public static final void run(){
 		registerTree_Rainforest();
+		registerTree_Pine();
 	}
 
 
@@ -47,10 +54,23 @@ public class BOP_Block_Registrator {
 		return true;
 	}
 
+	private static final boolean registerTree_Pine(){
+		log_Pine = new LogPineTree();
+		leaves_Pine = new LeavesPineTree();
+		sapling_Pine = new SaplingPineTree();
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(log_Pine), "logWood", true);
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(leaves_Pine), "treeLeaves", true);
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(sapling_Pine), "treeSapling", true);		
+		return true;
+	}
+
 	public static final void recipes() {		
-		//Rainforest Oak
+		// Rainforest Oak
 		addLogRecipes(ItemUtils.getSimpleStack(log_Rainforest));
 		addSaplingRecipes(ItemUtils.getSimpleStack(sapling_Rainforest));
+		// Pine
+		addLogRecipes(ItemUtils.getSimpleStack(log_Pine));
+		addSaplingRecipes(ItemUtils.getSimpleStack(sapling_Pine));
 
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
index 264aaa2a20..5c86c45591 100644
--- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
@@ -55,16 +55,12 @@ public class LeavesBase extends BlockLeaves {
 
 	@Override//Drops when Leaf is broken
 	protected void func_150124_c(World world, int x, int y, int z, int meta, int randomChance){
-		if (this.treeType.length == this.bonusDrops.length){
-			for (int i = 0; i < this.treeType.length; ++i){
-				if (this.bonusDrops[i] != null && world.rand.nextInt(randomChance) == 0){
-					this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(this.bonusDrops[i], 1));
-				}
+		Logger.INFO("Dropping Bonus Drops");
+		for (int i = 0; i < this.bonusDrops.length; ++i){
+			if (this.bonusDrops[i] != null && world.rand.nextInt(randomChance) == 0){
+				this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(this.bonusDrops[i], 1));
 			}
 		}
-		else {
-			Logger.WARNING("Unable to drop anything, Leaf Type array and Loot array are different sizes.");
-		}
 	}
 
 	/**
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
new file mode 100644
index 0000000000..c942db14cf
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.bop.blocks.pine;
+
+import java.util.Random;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.base.LeavesBase;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class LeavesPineTree extends LeavesBase {
+
+	public LeavesPineTree(){
+		super("Pine", "pine", new ItemStack[]{});
+		this.treeType = new String[] {"pine"};
+		this.leafType = new String[][] {{"pine"},{"pine_opaque"}};
+	}
+
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_){
+		return Item.getItemFromBlock(BOP_Block_Registrator.sapling_Pine);
+	}
+
+	@Override//Drops when Leaf is broken
+	protected void func_150124_c(World world, int x, int y, int z, int meta, int randomChance){
+		Logger.INFO("Dropping Bonus Drops");
+		if (MathUtils.randInt(0, 10) >= 9) {
+			this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, MathUtils.randInt(1, 4)));
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java
new file mode 100644
index 0000000000..dee5bf02fd
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/pine/LogPineTree.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.xmod.bop.blocks.pine;
+
+import gtPlusPlus.xmod.bop.blocks.base.LogBase;
+
+public class LogPineTree extends LogBase {
+
+	public LogPineTree(){
+	super("Pine Log", "pine", new String[]{"pine"});
+	this.treeType = new String[] {"pine"};
+	}
+
+	/*@Override
+	@SideOnly(Side.CLIENT)
+	protected IIcon getSideIcon(int metaID){
+		return this.textureSide[metaID % this.textureSide.length];
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	protected IIcon getTopIcon(int metaID){
+		return this.textureTop[metaID % this.textureTop.length];
+	}*/
+	
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java
new file mode 100644
index 0000000000..0ee04de899
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java
@@ -0,0 +1,55 @@
+package gtPlusPlus.xmod.bop.blocks.pine;
+
+import java.util.Random;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.xmod.bop.blocks.base.SaplingBase;
+import gtPlusPlus.xmod.bop.world.features.trees.WorldGenPineTree;
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenBigTree;
+import net.minecraft.world.gen.feature.WorldGenTrees;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class SaplingPineTree extends SaplingBase {
+
+	public SaplingPineTree(){
+		super("Pine Sapling", "pine", new String[]{"pine"});
+	}
+
+	@Override
+	public void func_149878_d(World world, int x, int y, int z, Random rand){
+		Logger.WARNING("func_149878_d - 1");
+		if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(world, rand, x, y, z)) return;
+		rand.nextInt(10);
+		new WorldGenBigTree(true);
+		new WorldGenTrees(true);
+		int i1 = 0;
+		int j1 = 0;
+		boolean flag = false;
+
+		Block block = Blocks.air;
+
+		if (flag)
+		{
+			world.setBlock(x + i1, y, z + j1, block, 0, 4);
+			world.setBlock(x + i1 + 1, y, z + j1, block, 0, 4);
+			world.setBlock(x + i1, y, z + j1 + 1, block, 0, 4);
+			world.setBlock(x + i1 + 1, y, z + j1 + 1, block, 0, 4);
+		}
+		else
+		{
+			world.setBlock(x, y, z, block, 0, 4);
+		}
+		Object obj = new WorldGenPineTree();		
+		if (obj != null) {
+			world.setBlockToAir(x, y, z);
+			if (!((WorldGenerator) obj).generate(world, CORE.RANDOM, x, y, z)) {
+				world.setBlock(x, y, z, this, 0, 2);
+			}
+		}
+	}
+
+}
\ No newline at end of file