Merge pull request #525 from alkcorp/DevTop

+ 6 Months of work, let's get the ball rolling.

3 files changed, 85 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index bda75be793..70c7b2da23 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -420,8 +420,10 @@ public class ChargingHelper {
 		if (stack == null) {
 			return false;
 		}
-		return (Info.itemEnergy.getEnergyValue(stack) > 0.0D)
-				|| (ElectricItem.manager.discharge(stack, (1.0D / 0.0D), 4, true, true, true) > 0.0D);
+		else {
+			return false;
+		}
+		//return (Info.itemEnergy.getEnergyValue(stack) > 0.0D) || (ElectricItem.manager.discharge(stack, (1.0D / 0.0D), 4, true, true, true) > 0.0D);
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
new file mode 100644
index 0000000000..d51107bbf0
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
@@ -0,0 +1,80 @@
+package gtPlusPlus.xmod.gregtech.common.helpers;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import gregtech.api.enums.Textures.BlockIcons;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+
+public class GT_MethodHelper {
+
+	private static final Method mGetTexture;
+	private static final Class mITexturedTileEntity;
+
+	static {
+		Class clazz = null;
+		Method aMeth = null;
+		if (ReflectionUtils.doesClassExist("gregtech.api.interfaces.tileentity.ITexturedTileEntity")) {
+			clazz = ReflectionUtils.getClass("gregtech.api.interfaces.tileentity.ITexturedTileEntity");
+			aMeth = ReflectionUtils.getMethod(clazz, "getTexture", Block.class, byte.class);
+		}
+		mITexturedTileEntity = clazz;
+		mGetTexture = aMeth;
+	}
+
+
+	public static ITexture[] getTexture(TileEntity tTileEntity, Block aBlock, byte aSide) {
+
+		if (mITexturedTileEntity.isInstance(tTileEntity)) {
+
+			if (mGetTexture != null) {
+				try {
+					mGetTexture.invoke(tTileEntity, aBlock, aSide);
+				}
+				catch (IllegalAccessException | IllegalArgumentException
+						| InvocationTargetException e) {
+					e.printStackTrace();
+				}
+			}
+			else {
+				if (tTileEntity instanceof BaseMetaTileEntity) {
+					try {
+						BaseMetaTileEntity aTile = (BaseMetaTileEntity) tTileEntity;					
+						ITexture rIcon = aTile.getCoverTexture(aSide);
+						Field aFacing = ReflectionUtils.getField(BaseMetaTileEntity.class, "mFacing");
+						Field aColor = ReflectionUtils.getField(BaseMetaTileEntity.class, "mColor");
+						Field aActive = ReflectionUtils.getField(BaseMetaTileEntity.class, "mActive");
+						Field aMetaTile = ReflectionUtils.getField(BaseMetaTileEntity.class, "mMetaTileEntity");
+						Method aHasValidTile = ReflectionUtils.getMethod(BaseMetaTileEntity.class, "hasValidMetaTileEntity", new Class[] {});
+
+						boolean hasValidTileObj = (boolean) aHasValidTile.invoke(aTile, new Object[] {});
+						boolean aActiveObj = aActive.getBoolean(aTile);
+						byte aFacingObj = aFacing.getByte(aTile);
+						byte aColorObj = aColor.getByte(aTile);;
+						MetaTileEntity aMetaTileObj = (MetaTileEntity) aMetaTile.get(aTile);
+
+						if (rIcon != null) {
+							return new ITexture[]{rIcon};
+						} else {
+							return hasValidTileObj
+									? aMetaTileObj.getTexture(aTile, aSide, aFacingObj, (byte) (aColorObj - 1), aActiveObj,
+											aTile.getOutputRedstoneSignal(aSide) > 0)
+											: BlockIcons.ERROR_RENDERING;
+						}
+					}
+					catch (Throwable t) {
+						t.printStackTrace();
+					}
+				}
+			}
+		}
+		return BlockIcons.ERROR_RENDERING;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 4038d5bdf4..8b3fb9a42f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -297,7 +297,7 @@ public class TreeFarmHelper {
 					return true;
 				}
 				else if (aStack.getUnlocalizedName().toLowerCase().contains("mu-metaitem")) {
-					String[] aData = aStack.getUnlocalizedName().toLowerCase().split(".");
+					String[] aData = aStack.getUnlocalizedName().toLowerCase().split("//.");
 					if (aData != null && aData.length > 0) {
 						for (String s : aData) {
 							if (s.contains("32120")) {