Merge branch 'GTNewHorizons:master' into master

3 files changed, 116 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java
new file mode 100644
index 0000000000..39e434243a
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java
@@ -0,0 +1,26 @@
+package gtPlusPlus.xmod.bop.blocks.rainforest;
+
+import java.util.Random;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.base.LeavesBase;
+
+public class LeavesRainforestTree extends LeavesBase {
+
+	public LeavesRainforestTree(){
+		super("Rainforest Oak", "rainforestoak", new ItemStack[]{ItemUtils.getSimpleStack(Items.apple)});
+		this.treeType = new String[] {"rainforest"};
+		this.leafType = new String[][] {{"rainforest"},{"rainforest_opaque"}};
+	}
+
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_){
+		return Item.getItemFromBlock(BOP_Block_Registrator.sapling_Rainforest);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java
new file mode 100644
index 0000000000..6d30caafb7
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LogRainforestTree.java
@@ -0,0 +1,24 @@
+package gtPlusPlus.xmod.bop.blocks.rainforest;
+
+import gtPlusPlus.xmod.bop.blocks.base.LogBase;
+
+public class LogRainforestTree extends LogBase {
+
+	public LogRainforestTree(){
+	super("Rainforest Oak", "rainforestoak", new String[]{"rainforest"});
+	this.treeType = new String[] {"rainforest"};
+	}
+
+	/*@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/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
new file mode 100644
index 0000000000..73b916d383
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
@@ -0,0 +1,66 @@
+package gtPlusPlus.xmod.bop.blocks.rainforest;
+
+import java.util.Random;
+
+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;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
+import gtPlusPlus.xmod.bop.blocks.base.SaplingBase;
+import gtPlusPlus.xmod.bop.world.features.trees.WorldGenRainForestTree_Ex;
+
+public class SaplingRainforestTree extends SaplingBase {
+
+	public SaplingRainforestTree(){
+		super("Rainforest Oak Sapling", "rainforestoak", new String[]{"rainforest"});
+	}
+
+	@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;
+		int l = world.getBlockMetadata(x, y, z) & 7;
+		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 o = new WorldGenRainForestTree_Ex(BOP_Block_Registrator.log_Rainforest, BOP_Block_Registrator.leaves_Rainforest, 0, 0, true, 50, 75);
+
+		if (!((WorldGenerator)o).generate(world, rand, x + i1, y, z + j1))
+		{
+			if (flag)
+			{
+				world.setBlock(x + i1, y, z + j1, this, l, 4);
+				world.setBlock(x + i1 + 1, y, z + j1, this, l, 4);
+				world.setBlock(x + i1, y, z + j1 + 1, this, l, 4);
+				world.setBlock(x + i1 + 1, y, z + j1 + 1, this, l, 4);
+			}
+			else
+			{
+				world.setBlock(x, y, z, this, l, 4);
+			}
+		}
+	}
+
+}
\ No newline at end of file