Automatic synchronization

16 files changed, 1260 insertions, 191 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 6b4bab9e26..7505c2a808 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -5,7 +5,6 @@ import static gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow.mOverfl
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -16,7 +15,6 @@ import java.util.TimerTask;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -24,11 +22,8 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
 import gregtech.common.GT_Proxy;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
@@ -39,11 +34,8 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.reflect.ProxyFinder;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE;
-import gtPlusPlus.xmod.gregtech.loaders.misc.AssLineAchievements;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -98,6 +90,9 @@ public class Meta_GT_Proxy {
             GT_Log.out.println("GT++ Mod: Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
             throw new RuntimeException("");
         }
+		
+        //Gotta set it here so that we don't try call gregtech too early.
+		StaticFields59.mGT6StylePipes = (boolean) StaticFields59.getFieldFromGregtechProxy(true, "gt6Pipe");		
         
         GT_Log.out.println("GT++ Mod: Registering the BaseMetaTileEntity.");
         GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity_GTPP");
@@ -375,37 +370,13 @@ public class Meta_GT_Proxy {
 	}
 	
 	
-	private static GT_Proxy[] mProxies = new GT_Proxy[2];
+	static GT_Proxy[] mProxies = new GT_Proxy[2];
 
+	/**
+	 * @deprecated Use {@link StaticFields59#getFieldFromGregtechProxy(boolean,String)} instead
+	 */
 	public static Object getFieldFromGregtechProxy(boolean client, String fieldName) {
-		Object proxyGT;
-
-		if (mProxies[0] != null && client) {
-			proxyGT = mProxies[0];
-		} else if (mProxies[1] != null && !client) {
-			proxyGT = mProxies[1];
-		} else {
-			try {
-				proxyGT = (client ? ProxyFinder.getClientProxy(GT_Mod.instance)
-						: ProxyFinder.getServerProxy(GT_Mod.instance));
-			} catch (final ReflectiveOperationException e1) {
-				proxyGT = null;
-				Logger.INFO("Failed to obtain instance of GT " + (client ? "Client" : "Server") + " proxy.");
-			}
-			if (mProxies[0] == null && client) {
-				mProxies[0] = (GT_Proxy) proxyGT;
-			} else if (mProxies[1] == null && !client) {
-				mProxies[1] = (GT_Proxy) proxyGT;
-			}
-		}
-
-		if (proxyGT != null && proxyGT instanceof GT_Proxy) {
-			try {
-				return ReflectionUtils.getField(proxyGT.getClass(), fieldName).get(proxyGT);
-			} catch (IllegalArgumentException | IllegalAccessException e) {
-			}
-		}
-		return null;
+		return StaticFields59.getFieldFromGregtechProxy(client, fieldName);
 	}
 	
 	public void setCustomGregtechTooltip(String aNbtTagName, FormattedTooltipString aData) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
index 1604cc5acd..2a3fd5e77c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
@@ -9,6 +9,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -18,14 +19,19 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffl
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.common.GT_Proxy;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.reflect.ProxyFinder;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
 public class StaticFields59 {
 
+	
+	public static boolean mGT6StylePipes;
+	
 	public static final Field mGtBlockCasings5;
 	public static final Field mPreventableComponents;
 	public static final Field mDisabledItems;
@@ -45,6 +51,7 @@ public class StaticFields59 {
 
 	static {
 		Logger.INFO("[SH] Creating Static Helper for various fields which require reflective access.");
+		
 		mGtBlockCasings5 = getField(GregTech_API.class, "sBlockCasings5");
 		Logger.INFO("[SH] Got Field: sBlockCasings5");
 		mPreventableComponents = getField(OrePrefixes.class, "mPreventableComponents");
@@ -176,5 +183,36 @@ public class StaticFields59 {
 		return null;
 	}
 
+	public static Object getFieldFromGregtechProxy(boolean client, String fieldName) {
+		Object proxyGT;
+	
+		if (Meta_GT_Proxy.mProxies[0] != null && client) {
+			proxyGT = Meta_GT_Proxy.mProxies[0];
+		} else if (Meta_GT_Proxy.mProxies[1] != null && !client) {
+			proxyGT = Meta_GT_Proxy.mProxies[1];
+		} else {
+			try {
+				proxyGT = (client ? ProxyFinder.getClientProxy(GT_Mod.instance)
+						: ProxyFinder.getServerProxy(GT_Mod.instance));
+			} catch (final ReflectiveOperationException e1) {
+				proxyGT = null;
+				Logger.INFO("Failed to obtain instance of GT " + (client ? "Client" : "Server") + " proxy.");
+			}
+			if (Meta_GT_Proxy.mProxies[0] == null && client) {
+				Meta_GT_Proxy.mProxies[0] = (GT_Proxy) proxyGT;
+			} else if (Meta_GT_Proxy.mProxies[1] == null && !client) {
+				Meta_GT_Proxy.mProxies[1] = (GT_Proxy) proxyGT;
+			}
+		}
+	
+		if (proxyGT != null && proxyGT instanceof GT_Proxy) {
+			try {
+				return ReflectionUtils.getField(proxyGT.getClass(), fieldName).get(proxyGT);
+			} catch (IllegalArgumentException | IllegalAccessException e) {
+			}
+		}
+		return null;
+	}
+
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
index cf6e484ff5..4fde2d6916 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
@@ -1,16 +1,14 @@
 package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 
 public class TexturesCentrifugeMultiblock {
 
@@ -92,103 +90,55 @@ public class TexturesCentrifugeMultiblock {
 				TileEntity tTileEntity;
 				IMetaTileEntity tMetaTileEntity;
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[0].getIcon();
-					}
-					return this.CENTRIFUGE[0].getIcon();
+					return getIconByIndex(tMetaTileEntity, 0);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[3].getIcon();
-					}
-					return this.CENTRIFUGE[3].getIcon();
+					return getIconByIndex(tMetaTileEntity, 3);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[6].getIcon();
-					}
-					return this.CENTRIFUGE[6].getIcon();
+					return getIconByIndex(tMetaTileEntity, 6);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[1].getIcon();
-					}
-					return this.CENTRIFUGE[1].getIcon();
+					return getIconByIndex(tMetaTileEntity, 1);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[7].getIcon();
-					}
-					return this.CENTRIFUGE[7].getIcon();
+					return getIconByIndex(tMetaTileEntity, 7);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[8].getIcon();
-					}
-					return this.CENTRIFUGE[8].getIcon();
+					return getIconByIndex(tMetaTileEntity, 8);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[5].getIcon();
-					}
-					return this.CENTRIFUGE[5].getIcon();
+					return getIconByIndex(tMetaTileEntity, 5);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[2].getIcon();
-					}
-					return this.CENTRIFUGE[2].getIcon();
+					return getIconByIndex(tMetaTileEntity, 2);
 				}
 			} else if ((aSide == 4) || (aSide == 5)) {
 				TileEntity tTileEntity;
 				Object tMetaTileEntity;
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[0].getIcon();
-					}
-					return this.CENTRIFUGE[0].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 0);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[3].getIcon();
-					}
-					return this.CENTRIFUGE[3].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 3);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[6].getIcon();
-					}
-					return this.CENTRIFUGE[6].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 6);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[1].getIcon();
-					}
-					return this.CENTRIFUGE[1].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 1);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[7].getIcon();
-					}
-					return this.CENTRIFUGE[7].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 7);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[8].getIcon();
-					}
-					return this.CENTRIFUGE[8].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 8);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[5].getIcon();
-					}
-					return this.CENTRIFUGE[5].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 5);
 				}
 				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge))) {
-					if (isUsingAnimatedTexture(tTileEntity)) {
-						return this.CENTRIFUGE_ACTIVE[2].getIcon();
-					}
-					return this.CENTRIFUGE[2].getIcon();
+					return getIconByIndex((IMetaTileEntity) tMetaTileEntity, 2);
 				}
 			}
 			return TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
@@ -440,15 +390,33 @@ public class TexturesCentrifugeMultiblock {
 		return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
 	}
 	
-	public boolean isUsingAnimatedTexture(TileEntity tTileEntity) {
-		IGregTechTileEntity aTile;
-		if (tTileEntity instanceof IGregTechTileEntity) {
-			aTile = (IGregTechTileEntity) tTileEntity;
-			if (aTile instanceof GregtechMetaTileEntity_IndustrialCentrifuge) {
-				return ((GregtechMetaTileEntity_IndustrialCentrifuge) aTile).usingAnimations();
-			}
-		}		
+	public boolean isCentrifugeRunning(IMetaTileEntity aTile) {
+		if (aTile == null) {
+			return false;
+		}
+		else {
+			return aTile.getBaseMetaTileEntity().isActive();
+		}
+		
+		
+	}
+	
+	public boolean isUsingAnimatedTexture(IMetaTileEntity aMetaTileEntity) {
+			if (aMetaTileEntity != null) {
+				if (aMetaTileEntity instanceof GregtechMetaTileEntity_IndustrialCentrifuge) {
+					return ((GregtechMetaTileEntity_IndustrialCentrifuge) aMetaTileEntity).usingAnimations();
+				}
+			}		
 		return false;
 	}
 
+	public IIcon getIconByIndex(IMetaTileEntity aMetaTileEntity, int aIndex) {
+		if (isUsingAnimatedTexture(aMetaTileEntity)) {
+			if (isCentrifugeRunning(aMetaTileEntity)) {
+				return this.CENTRIFUGE_ACTIVE[aIndex].getIcon();				
+			}
+		}
+		return this.CENTRIFUGE[aIndex].getIcon();
+	}
+	
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
index ca795e40d1..ee104eaca3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
@@ -13,6 +13,10 @@ import gtPlusPlus.core.lib.CORE;
 public final class TexturesGtTools {
 
 	public final static CustomIcon SKOOKUM_CHOOCHER = new CustomIcon("iconsets/SKOOKUMCHOOCHER");
+	public final static CustomIcon ANGLE_GRINDER = new CustomIcon("iconsets/ANGLE_GRINDER");
+	public final static CustomIcon ELECTRIC_SNIPS = new CustomIcon("iconsets/ELECTRIC_SNIPS");
+	public final static CustomIcon ELECTRIC_LIGHTER = new CustomIcon("iconsets/ELECTRIC_LIGHTER");
+	public final static CustomIcon ELECTRIC_BUTCHER_KNIFE = new CustomIcon("iconsets/ELECTRIC_BUTCHER_KNIFE");
 
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index d228fdc04a..dbae4fe194 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -1,47 +1,68 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.concurrent.ConcurrentHashMap;
-
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.ToolDictNames;
-import gregtech.api.interfaces.IItemBehaviour;
-import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.util.GT_Log;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngelGrinder;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter;
+import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips;
 
 public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 
+	public static final short ELECTRIC_LIGHTER = 7534;
+	public static final short ELECTRIC_BUTCHER_KNIFE = 7634;
 	public static final short SKOOKUM_CHOOCHER = 7734;
+	public static final short ANGLE_GRINDER = 7834;
+	public static final short ELECTRIC_SNIPS = 7934;
 	public static GT_MetaGenerated_Tool INSTANCE;
 
 	public MetaGeneratedGregtechTools() {
 		super("plusplus.metatool.01");
 		INSTANCE = this;
-		//Skookum Choocher
-		GregTech_API.registerTool(
-				this.addTool(
-						SKOOKUM_CHOOCHER, "Skookum Choocher",
-						"Can Really Chooch. Does a Skookum job at Hammering and Wrenching stuff.",
-						new TOOL_Gregtech_Choocher(),
-						new Object[]{GregtechToolDictNames.craftingToolSkookumChoocher,
-								ToolDictNames.craftingToolHardHammer,
-								ToolDictNames.craftingToolWrench,
-								new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-								new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-								new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)}),
+		// Skookum Choocher
+		GregTech_API.registerTool(this.addTool(SKOOKUM_CHOOCHER, "Skookum Choocher",
+				"Can Really Chooch. Does a Skookum job at Hammering and Wrenching stuff.", new TOOL_Gregtech_Choocher(),
+				new Object[] { GregtechToolDictNames.craftingToolSkookumChoocher, ToolDictNames.craftingToolHardHammer,
+						ToolDictNames.craftingToolWrench, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }),
 				GregTech_API.sWrenchList);
-	}	
+
+		// Electric File
+		this.addTool(ANGLE_GRINDER, "Angle Grinder", "Hand-held electric filing device",
+				new TOOL_Gregtech_AngelGrinder(),
+				new Object[] { GregtechToolDictNames.craftingToolAngleGrinder, ToolDictNames.craftingToolFile,
+						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
+
+		// Electric Wire Cutter
+		this.addTool(ELECTRIC_SNIPS, "Automatic Snips", "Hand-held electric wire cutter",
+				new TOOL_Gregtech_ElectricSnips(),
+				new Object[] { GregtechToolDictNames.craftingToolElectricSnips, ToolDictNames.craftingToolWireCutter,
+						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
+
+		// Electric Lighter
+		this.addTool(ELECTRIC_LIGHTER, "Pyromatic 9k", "Electric Fire!",
+				new TOOL_Gregtech_ElectricLighter(),
+				new Object[] { GregtechToolDictNames.craftingToolElectricLighter,
+						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
+
+		// Electric Butcher Knife
+		this.addTool(ELECTRIC_BUTCHER_KNIFE, "Meat-o-matic", "Electric butcher knife",
+				new TOOL_Gregtech_ElectricButcherKnife(),
+				new Object[] { GregtechToolDictNames.craftingToolElectricButcherKnife, ToolDictNames.craftingToolKnife,
+						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
+						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) });
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
new file mode 100644
index 0000000000..278b556733
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -0,0 +1,143 @@
+package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+
+import java.util.List;
+
+import codechicken.lib.math.MathHelper;
+import gregtech.api.GregTech_API;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GT_Utility.ItemNBT;
+import gregtech.common.items.behaviors.Behaviour_None;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper;
+import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
+import ic2.api.item.IElectricItemManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class Behaviour_Electric_Lighter extends Behaviour_None {
+
+	private final ItemStack mLighter;
+
+	private final long mFuelAmount;
+
+	private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.tooltip",
+			"Can light things on Fire");
+	private final String mTooltipUses = GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.uses",
+			"Remaining Uses:");
+	private final String mTooltipUnstackable = GT_LanguageManager.addStringLocalization("gt.behaviour.unstackable",
+			"Not usable when stacked!");
+
+	public Behaviour_Electric_Lighter(ItemStack aFullLighter, long aFuelAmount) {
+		this.mLighter = aFullLighter;
+		this.mFuelAmount = aFuelAmount;
+	}
+
+	public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
+		if (!aPlayer.worldObj.isRemote && aStack.stackSize == 1) {
+			boolean rOutput = false;
+			if (aEntity instanceof EntityCreeper) {
+				if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
+					GT_Utility.sendSoundToPlayers(aPlayer.worldObj, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F,
+							MathHelper.floor_double(aEntity.posX), MathHelper.floor_double(aEntity.posY),
+							MathHelper.floor_double(aEntity.posZ));
+					((EntityCreeper) aEntity).func_146079_cb();
+					rOutput = true;
+				}
+			}
+			return rOutput;
+		} else {
+			return false;
+		}
+	}
+
+	public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+			int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+		return false;
+	}
+
+	public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
+			int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+		if (!aWorld.isRemote && aStack.stackSize == 1) {
+			Logger.WARNING("Preparing Lighter a");
+			boolean rOutput = false;
+			ForgeDirection tDirection = ForgeDirection.getOrientation(aSide);
+			aX += tDirection.offsetX;
+			aY += tDirection.offsetY;
+			aZ += tDirection.offsetZ;
+			if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && aPlayer.canPlayerEdit(aX, aY, aZ, aSide, aStack)) {
+				Logger.WARNING("Preparing Lighter b");
+				if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
+					Logger.WARNING("Preparing Lighter c");
+					GT_Utility.sendSoundToPlayers(aWorld, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F, aX, aY,
+							aZ);
+					aWorld.setBlock(aX, aY, aZ, Blocks.fire);
+					rOutput = true;
+					// ItemNBT.setLighterFuel(aStack, tFuelAmount);
+					return rOutput;
+				}
+			}
+		}
+		Logger.WARNING("Preparing Lighter z");
+		return false;
+	}
+
+	private boolean prepare(ItemStack aStack) {
+		if (aStack != null) {
+			Logger.WARNING("Preparing Lighter 1");
+			if (aStack.getItem() instanceof MetaGeneratedGregtechTools) {
+				Logger.WARNING("Preparing Lighter 2");
+				if (ChargingHelper.isItemValid(aStack)) {
+					Logger.WARNING("Preparing Lighter 3");
+					if (aStack.getItem() instanceof IElectricItemManager) {
+						Logger.WARNING("Preparing Lighter 4");
+						IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem();
+						double aCharge = aItemElec.getCharge(aStack);
+						long aEuCost = 4096 * 2;
+						if (aCharge >= aEuCost) {
+							Logger.WARNING("Preparing Lighter 5");
+							aItemElec.discharge(aStack, aEuCost, 3, true, true, false);
+							return true;
+						}
+					}
+				}
+			}
+		}
+		Logger.WARNING("Preparing Lighter 0");
+		return false;
+	}
+
+	private void useUp(ItemStack aStack) {
+
+	}
+
+	public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
+		aList.add(this.mTooltip);
+		int aUses = 0;
+
+		if (aStack != null) {
+			if (aStack.getItem() instanceof MetaGeneratedGregtechTools) {
+				if (ChargingHelper.isItemValid(aStack)) {
+					if (aStack.getItem() instanceof IElectricItemManager) {
+						IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem();
+						double aCharge = aItemElec.getCharge(aStack);
+						long aEuCost = 4096 * 2;
+						aUses = (int) (aCharge / aEuCost);
+					}
+				}
+			}
+		}
+
+		NBTTagCompound tNBT = aStack.getTagCompound();
+		aList.add(this.mTooltipUses + " " + aUses);
+		aList.add(this.mTooltipUnstackable);
+		return aList;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
new file mode 100644
index 0000000000..9012bb8cd8
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
@@ -0,0 +1,94 @@
+package gtPlusPlus.xmod.gregtech.common.items.behaviours;
+
+import java.util.List;
+
+import gregtech.api.enums.SubTag;
+import gregtech.api.interfaces.IItemBehaviour;
+import gregtech.api.items.GT_MetaBase_Item;
+import net.minecraft.dispenser.IBlockSource;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class Behaviou