From 9285a2ffdc9729f7b3c6917e44fdc68fc2d253c9 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 27 May 2018 12:48:44 +1000
Subject: + Added a custom ItemEntity for the Large Chicken Eggs, they now
 hatch in world. + Added a custom Mutagen Fluid used in making Large Eggs. $
 Fixed some issue with BlockPos object having invalid worlds.

---
 .../gregtech/common/helpers/TreeFarmHelper.java    | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/helpers')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 9d7750d834..2bfb07ff4a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -415,7 +415,7 @@ public class TreeFarmHelper {
 						if (h == 1) {
 							if (TreeFarmHelper.isWoodLog(aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j))) {
 								Logger.INFO("Found a Log");
-								return new BlockPos(aBaseMetaTileEntity.getXCoord()+xDir + i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir + j);
+								return new BlockPos(aBaseMetaTileEntity.getXCoord()+xDir + i, aBaseMetaTileEntity.getYCoord()+h, aBaseMetaTileEntity.getZCoord()+zDir + j, aBaseMetaTileEntity.getWorld());
 							}
 						}
 					}
@@ -558,42 +558,42 @@ public class TreeFarmHelper {
 		int z = P.zPos;
 		if (checkLeaves) {
 			if (isWoodLog(W.getBlock(x-1, y, z)) || isLeaves(W.getBlock(x-1, y, z))) {
-				BlockPos L = new BlockPos(x-1, y, z);
+				BlockPos L = new BlockPos(x-1, y, z, W);
 				if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				}
 			}
 			if (isWoodLog(W.getBlock(x+1, y, z)) || isLeaves(W.getBlock(x+1, y, z))) {
-				BlockPos L = new BlockPos(x+1, y, z);
+				BlockPos L = new BlockPos(x+1, y, z, W);
 				if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				}
 			}
 			if (isWoodLog(W.getBlock(x, y-1, z)) || isLeaves(W.getBlock(x, y-1, z))) {
-				BlockPos L = new BlockPos(x, y-1, z);
+				BlockPos L = new BlockPos(x, y-1, z, W);
 				if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				}
 			}
 			if (isWoodLog(W.getBlock(x, y+1, z)) || isLeaves(W.getBlock(x, y+1, z))) {
-				BlockPos L = new BlockPos(x, y+1, z);
+				BlockPos L = new BlockPos(x, y+1, z, W);
 				if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				}
 			}
 			if (isWoodLog(W.getBlock(x, y, z-1)) || isLeaves(W.getBlock(x, y, z-1))) {
-				BlockPos L = new BlockPos(x, y, z-1);
+				BlockPos L = new BlockPos(x, y, z-1, W);
 				if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				}
 			}
 			if (isWoodLog(W.getBlock(x, y, z+1)) || isLeaves(W.getBlock(x, y, z+1))) {
-				BlockPos L = new BlockPos(x, y, z+1);
+				BlockPos L = new BlockPos(x, y, z+1, W);
 				if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
@@ -602,42 +602,42 @@ public class TreeFarmHelper {
 		}
 		else {
 			if (isWoodLog(W.getBlock(x-1, y, z))) {
-				BlockPos L = new BlockPos(x-1, y, z);
+				BlockPos L = new BlockPos(x-1, y, z, W);
 				//if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				//}
 			}
 			if (isWoodLog(W.getBlock(x+1, y, z))) {
-				BlockPos L = new BlockPos(x+1, y, z);
+				BlockPos L = new BlockPos(x+1, y, z, W);
 				//if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				//}
 			}
 			if (isWoodLog(W.getBlock(x, y-1, z))) {
-				BlockPos L = new BlockPos(x, y-1, z);
+				BlockPos L = new BlockPos(x, y-1, z, W);
 				//if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				//}
 			}
 			if (isWoodLog(W.getBlock(x, y+1, z))) {
-				BlockPos L = new BlockPos(x, y+1, z);
+				BlockPos L = new BlockPos(x, y+1, z, W);
 				//if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				//}
 			}
 			if (isWoodLog(W.getBlock(x, y, z-1))) {
-				BlockPos L = new BlockPos(x, y, z-1);
+				BlockPos L = new BlockPos(x, y, z-1, W);
 				//if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
 				//}
 			}
 			if (isWoodLog(W.getBlock(x, y, z+1))) {
-				BlockPos L = new BlockPos(x, y, z+1);
+				BlockPos L = new BlockPos(x, y, z+1, W);
 				//if (!checkedSpaces.contains(L)) {
 					mConnected.add(L);
 					Logger.INFO("Found Connected. [III]");
-- 
cgit