Merged in MillingRecipes (pull request #7)

Milling Recipes & many other misc fixes

28 files changed, 1987 insertions, 417 deletions

diff --git a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
index 903730f767..c9cdc41424 100644
--- a/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
+++ b/src/Java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java
@@ -7,6 +7,7 @@ import java.util.Map;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -19,6 +20,10 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
 
 
 public class CommandEnableDebugWhileRunning implements ICommand
@@ -33,14 +38,14 @@ public class CommandEnableDebugWhileRunning implements ICommand
 	@Override
 	public int compareTo(final Object o){
 		if (o instanceof Comparable<?>) {
-		 @SuppressWarnings("unchecked")
-		Comparable<ICommand> a = (Comparable<ICommand>) o;	
-		 if (a.equals(this)) {
-			 return 0;
-		 }
-		 else {
-			 return -1;
-		 }
+			@SuppressWarnings("unchecked")
+			Comparable<ICommand> a = (Comparable<ICommand>) o;	
+			if (a.equals(this)) {
+				return 0;
+			}
+			else {
+				return -1;
+			}
 		}
 		return -1;
 	}
@@ -66,7 +71,7 @@ public class CommandEnableDebugWhileRunning implements ICommand
 
 	@Override
 	public void processCommand(final ICommandSender S, final String[] argString){
-		int aMaxArgumentsAllowed = 1;
+		int aMaxArgumentsAllowed = 2;
 
 		if ((argString == null || argString.length == 0 || argString.length > aMaxArgumentsAllowed) || argString[0].toLowerCase().equals("?")) {
 			Logger.INFO("Listing commands and their uses.");			
@@ -75,6 +80,8 @@ public class CommandEnableDebugWhileRunning implements ICommand
 			PlayerUtils.messagePlayer(P, "The following are valid args for the '/gtpp' command:");
 			PlayerUtils.messagePlayer(P, "?       - This help command.");
 			PlayerUtils.messagePlayer(P, "logging - Toggles ALL GT++ logging for current session.");
+			PlayerUtils.messagePlayer(P, "hand - Lists information about held item.");
+			PlayerUtils.messagePlayer(P, "fuid xxx - Tries to find the fluid in the FluidRegistry.");
 			PlayerUtils.messagePlayer(P, "debug   - Toggles GT++ Debug Mode. Only use when advised, may break everything. (OP)");
 		}
 		else if (argString[0].toLowerCase().equals("debug")) {
@@ -106,13 +113,72 @@ public class CommandEnableDebugWhileRunning implements ICommand
 					String aItemDisplayName = ItemUtils.getItemName(aHeldItem);
 					String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem);
 					String aNbtString = tryIterateNBTData(aHeldItem);	
-					PlayerUtils.messagePlayer(P, "["+aItemUnlocalName+"]"+"["+aItemDisplayName+"] "+aNbtString);				
+					AutoMap<String> aOreDictNames = new AutoMap<String>();
+
+					int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem);
+					for (int id : aOreIDs) {
+						String aOreNameFromID = OreDictionary.getOreName(id);
+						if (aOreNameFromID != null && aOreNameFromID.length() > 0 && !aOreNameFromID.equals("Unknown")) {
+							aOreDictNames.add(aOreNameFromID);
+						}
+					}
+
+					String aOreDictData = "";
+					if (!aOreDictNames.isEmpty()) {
+						for (String tag : aOreDictNames) {
+							aOreDictData += (tag+", ");
+						}
+						if (aOreDictData.endsWith(", ")) {
+							aOreDictData = aOreDictData.substring(0, aOreDictData.length()-2);
+						}
+					}
+					
+					String aFluidContainerData = "";
+					FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem);
+					if (aHeldItemFluid != null) {
+						aFluidContainerData = "["+aHeldItemFluid.getUnlocalizedName()+"]["+aHeldItemFluid.getLocalizedName()+"]";
+					}
+
+					PlayerUtils.messagePlayer(P, "["+aItemUnlocalName+"]"+"["+aItemDisplayName+"] ");
+					if (aFluidContainerData.length() > 0) {
+						PlayerUtils.messagePlayer(P, ""+aFluidContainerData);				
+					}
+					if (!aOreDictNames.isEmpty()) {
+						PlayerUtils.messagePlayer(P, ""+aOreDictData);
+					}
+					if (aNbtString.length() > 0) {
+						PlayerUtils.messagePlayer(P, ""+aNbtString);				
+					}
 				}
 				else {
 					PlayerUtils.messagePlayer(P, "No item held.");
 				}
 			}
 		}
+		else if (argString[0].toLowerCase().equals("fluid")) {
+			if (argString.length > 1 && argString[1] != null && argString[1].length() > 0) {			
+				final EntityPlayer P = CommandUtils.getPlayer(S);
+				FluidStack aFluid = FluidUtils.getWildcardFluidStack(argString[1], 1);
+				if (P != null && aFluid != null) {
+					PlayerUtils.messagePlayer(P, "Found fluid stack: "+FluidRegistry.getFluidName(aFluid));						
+				}		
+				else if (P != null && aFluid == null) {
+					PlayerUtils.messagePlayer(P, "Could not find any fluids.");						
+				}	
+			}
+		}
+		else if (argString[0].toLowerCase().equals("item")) {
+			if (argString.length > 1 && argString[1] != null && argString[1].length() > 0) {			
+				final EntityPlayer P = CommandUtils.getPlayer(S);
+				ItemStack aTest = ItemUtils.getItemStackFromFQRN(argString[1], 1);
+				if (P != null && aTest != null) {
+					PlayerUtils.messagePlayer(P, "Found fluid stack: "+ItemUtils.getItemName(aTest));						
+				}		
+				else if (P != null && aTest == null) {
+					PlayerUtils.messagePlayer(P, "Could not find valid item.");						
+				}	
+			}
+		}
 		else {		
 			final EntityPlayer P = CommandUtils.getPlayer(S);	
 			PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'");
@@ -134,6 +200,8 @@ public class CommandEnableDebugWhileRunning implements ICommand
 		aTabCompletes.add("?");
 		aTabCompletes.add("logging");
 		aTabCompletes.add("debug");
+		aTabCompletes.add("hand");
+		aTabCompletes.add("fluid");
 		return aTabCompletes;
 	}
 
@@ -146,7 +214,7 @@ public class CommandEnableDebugWhileRunning implements ICommand
 	public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost){
 		return true;
 	}
-	
+
 	public static String tryIterateNBTData(ItemStack aStack) {
 		try {
 			AutoMap<String> aItemDataTags = new AutoMap<String>();
@@ -161,9 +229,9 @@ public class CommandEnableDebugWhileRunning implements ICommand
 						int a = 0;
 						String data = "";
 						for (String tag : aItemDataTags) {
-							data += (tag+",");
+							data += (tag+", ");
 						}
-						if (data.endsWith(",")) {
+						if (data.endsWith(", ")) {
 							data = data.substring(0, data.length()-2);
 						}
 						return data;
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 0aeff5ae16..4dad732e25 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -1,10 +1,6 @@
 package gtPlusPlus.core.common;
 
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
@@ -19,18 +15,8 @@ import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.fluids.FluidFactory;
-import gtPlusPlus.core.handler.BookHandler;
-import gtPlusPlus.core.handler.BurnableFuelHandler;
-import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
-import gtPlusPlus.core.handler.GuiHandler;
-import gtPlusPlus.core.handler.StopAnnoyingFuckingAchievements;
-import gtPlusPlus.core.handler.events.BlockEventHandler;
-import gtPlusPlus.core.handler.events.EnderDragonDeathHandler;
-import gtPlusPlus.core.handler.events.EntityDeathHandler;
-import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
-import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
-import gtPlusPlus.core.handler.events.ZombieBackupSpawnEventHandler;
+import gtPlusPlus.core.handler.*;
+import gtPlusPlus.core.handler.events.*;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.lib.CORE;
@@ -50,7 +36,6 @@ import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
 import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler;
 import net.minecraft.enchantment.Enchantment;
@@ -89,10 +74,7 @@ public class CommonProxy {
 		}
 
 		AddToCreativeTab.initialiseTabs();
-		
-		if (LoadedMods.Gregtech) {
-			HANDLER_GT.addNewOrePrefixes();
-		}
+		EnumHelperHandler.init();
 
 		// Moved from Init after Debug Loading.
 		// 29/01/18 - Alkalus
diff --git a/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java b/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java
new file mode 100644
index 0000000000..d164efa3d7
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/handler/EnumHelperHandler.java
@@ -0,0 +1,21 @@
+package gtPlusPlus.core.handler;
+
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.xmod.gregtech.HANDLER_GT;
+import gtPlusPlus.xmod.ic2.CustomInternalName;
+
+public class EnumHelperHandler {
+
+	public static void init() {		
+
+		if (LoadedMods.IndustrialCraft2) {
+			CustomInternalName.init();
+		}
+		
+		if (LoadedMods.Gregtech) {
+			HANDLER_GT.addNewOrePrefixes();
+		}
+		
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index b3738e6ea2..6da2dac38b 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -19,6 +19,7 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -87,7 +88,6 @@ public class BlockEventHandler {
 
 	}
 
-	public static final Map<String, EntityPlayer> mCachedFakePlayers = new WeakHashMap<String, EntityPlayer>();
 
 	// Used to handle Thaumcraft Shards when TC is not installed.
 	@SubscribeEvent
@@ -97,21 +97,9 @@ public class BlockEventHandler {
 			if (event != null && event.harvester != null && event.harvester.worldObj != null) {
 				if (!event.harvester.worldObj.isRemote) {
 
-					EntityPlayer p = event.harvester;
-					ChunkCoordinates aChunkLocation = p.getPlayerCoordinates();
-
-					// Cache Fake Player
-					if (p instanceof FakePlayer || p instanceof FakeThaumcraftPlayer 
-							|| (event.harvester.getCommandSenderName() == null
-									|| event.harvester.getCommandSenderName().length() <= 0)
-							|| (p.isEntityInvulnerable() && !p.canCommandSenderUseCommand(0, "")
-									&& (aChunkLocation.posX == 0 && aChunkLocation.posY == 0
-											&& aChunkLocation.posZ == 0))) {
-						mCachedFakePlayers.put(p.getUniqueID().toString(), p);
-					}
+					EntityPlayer p = event.harvester;					
 
-					if (!mCachedFakePlayers.containsKey(event.harvester.getUniqueID().toString())) {
-						
+					if (PlayerUtils.isRealPlayer(p)) {						
 						// Spawns Fluorite from Lime Stone
 						if (chanceToDropFluoriteOre != 0) {
 							if (!oreLimestone.isEmpty() || !blockLimestone.isEmpty()) {
diff --git a/src/Java/gtPlusPlus/core/handler/events/EntityDeathHandler.java b/src/Java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
index c4ab6edaa6..3492ee4788 100644
--- a/src/Java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/EntityDeathHandler.java
@@ -7,18 +7,25 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Triplet;
+import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChunkCoordinates;
+import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
+import thaumcraft.common.lib.FakeThaumcraftPlayer;
 
 public class EntityDeathHandler {
-	
-	
+
+
 	private static final HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>> mMobDropMap = new HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>>();
 	private static final HashSet<Class> mInternalClassKeyCache = new HashSet<Class>();
-	
+
 	/**
 	 * Provides the ability to provide custom drops upon the death of EntityLivingBase objects.
 	 * @param aMobClass - The Base Class you want to drop this item.
@@ -34,15 +41,15 @@ public class EntityDeathHandler {
 		}
 		aDataMap.put(aData);
 		mMobDropMap.put(aMobClass, aDataMap);	
-		
+
 		Logger.INFO("[Loot] Registered "+aStack.getDisplayName()+" (1-"+aMaxAmount+") as a valid drop for "+aMobClass.getCanonicalName());
-		
+
 		if (!mInternalClassKeyCache.contains(aMobClass)) {
 			mInternalClassKeyCache.add(aMobClass);
 		}
-		
+
 	}
-	
+
 	private static ItemStack processItemDropTriplet(Triplet<ItemStack, Integer, Integer> aData) {
 		ItemStack aLoot = aData.getValue_1();
 		int aMaxDrop = aData.getValue_2();
@@ -55,7 +62,7 @@ public class EntityDeathHandler {
 		}		
 		return null;
 	}
-	
+
 	private static boolean processDropsForMob(EntityLivingBase entityLiving) {
 		AutoMap<Triplet<ItemStack, Integer, Integer>> aMobData = mMobDropMap.get(entityLiving.getClass());
 		boolean aDidDrop = false;
@@ -74,10 +81,30 @@ public class EntityDeathHandler {
 		}		
 		return aDidDrop;
 	}
-	
-	
-	
-	
+
+
+
+	private static void dropMeatFromPlayer(EntityPlayer aPlayer) {
+		
+		// always drop some meat.
+		int aBigMeatStackSize1 = MathUtils.randInt(4, 8);
+		aPlayer.entityDropItem(ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize1), MathUtils.randInt(0, 1));
+		
+		// additional chances for more meat.
+		if (MathUtils.randInt(0, 10) < 7) {
+			int aBigMeatStackSize2 = MathUtils.randInt(4, 8);
+			aPlayer.entityDropItem(ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize2), MathUtils.randInt(0, 1));
+		}
+		if (MathUtils.randInt(0, 10) < 4) {
+			int aBigMeatStackSize3 = MathUtils.randInt(4, 8);
+			aPlayer.entityDropItem(ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize3), MathUtils.randInt(0, 1));
+		}
+		if (MathUtils.randInt(0, 10) < 2) {
+			int aBigMeatStackSize4 = MathUtils.randInt(4, 8);
+			aPlayer.entityDropItem(ItemUtils.simpleMetaStack(ModItems.itemMetaFood, 0, aBigMeatStackSize4), MathUtils.randInt(0, 1));	
+		}
+
+	}	
 
 	@SubscribeEvent
 	public void onEntityDrop(LivingDropsEvent event) {
@@ -85,10 +112,16 @@ public class EntityDeathHandler {
 		if (event == null || event.entityLiving == null) {
 			return;
 		}
-		for (Class c : mInternalClassKeyCache) {
-			if (c.isInstance(event.entityLiving)) {
-				aDidDrop = processDropsForMob(event.entityLiving);
-			}
+		if (PlayerUtils.isRealPlayer(event.entityLiving)) {
+			EntityPlayer aPlayer = (EntityPlayer) event.entityLiving;
+			dropMeatFromPlayer(aPlayer);
+		}
+		else {
+			for (Class c : mInternalClassKeyCache) {
+				if (c.isInstance(event.entityLiving)) {
+					aDidDrop = processDropsForMob(event.entityLiving);
+				}
+			}			
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 3f02ca898d..e11b163753 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -110,6 +110,7 @@ public class AgriculturalChem extends ItemPackage {
 	 * 21 - Lithium Chloride
 	 * 22 - Pellet Mold
 	 * 23 - Clean Aluminium Mix
+	 * 24 - Pinecone
 	 */
 
 	public static ItemStack mAlgaeBiosmass;
@@ -136,6 +137,8 @@ public class AgriculturalChem extends ItemPackage {
 	public static ItemStack mLithiumChloride;
 	public static ItemStack mPelletMold;
 	public static ItemStack mCleanAluminiumMix;
+	public static ItemStack mPinecone;
+	public static ItemStack mCrushedPine;
 	
 
 	@Override
@@ -205,6 +208,8 @@ public class AgriculturalChem extends ItemPackage {
 		mLithiumChloride = ItemUtils.simpleMetaStack(mAgrichemItem1, 21, 1);
 		mPelletMold = ItemUtils.simpleMetaStack(mAgrichemItem1, 22, 1);
 		mCleanAluminiumMix = ItemUtils.simpleMetaStack(mAgrichemItem1, 23, 1);
+		mPinecone = ItemUtils.simpleMetaStack(mAgrichemItem1, 24, 1);
+		mCrushedPine = ItemUtils.simpleMetaStack(mAgrichemItem1, 25, 1);
 
 		ItemUtils.addItemToOreDictionary(mGreenAlgaeBiosmass, "biomassGreenAlgae");
 		ItemUtils.addItemToOreDictionary(mBrownAlgaeBiosmass, "biomassBrownAlgae");
@@ -231,6 +236,8 @@ public class AgriculturalChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mSodiumHydroxide, "dustSodiumHydroxide");	
 		ItemUtils.addItemToOreDictionary(mSodiumCarbonate, "dustSodiumCarbonate");
 		ItemUtils.addItemToOreDictionary(mLithiumChloride, "dustLithiumChloride");	
+		ItemUtils.addItemToOreDictionary(mPinecone, "pinecone");	
+		ItemUtils.addItemToOreDictionary(mCrushedPine, "crushedPineMaterial");	
 		
 		//Handle GT NaOH dusts
 		List<ItemStack> NaOHSmall = OreDictionary.getOres("dustSmallSodiumHydroxide_GT5U", false);
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index ff55326031..80a51d80cc 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -1,33 +1,26 @@
 package gtPlusPlus.core.item.chemistry;
 
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.TextureSet;
+import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
+import gtPlusPlus.core.item.circuit.ItemAdvancedChip;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.material.MaterialStack;
-import gtPlusPlus.core.material.NONMATERIAL;
+import gtPlusPlus.core.material.*;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.plugin.agrichem.BioRecipes;
 import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.*;
 
 public class GenericChem extends ItemPackage {
 
@@ -37,6 +30,7 @@ public class GenericChem extends ItemPackage {
 
 	private static boolean usingGregtechNitricOxide = false;
 	private static boolean usingGregtechNitrogenDioxide = false;
+	private static boolean usingGregtechHydricSulfur = false;
 
 	/**
 	 * Materials
@@ -94,6 +88,8 @@ public class GenericChem extends ItemPackage {
 	public static Fluid Lithium_Peroxide;
 	public static Fluid Nitric_Oxide;
 	public static Fluid Nitrogen_Dioxide;
+	public static Fluid Carbon_Disulfide;
+	public static Fluid Hydrogen_Sulfide;
 
 	/**
 	 * Items
@@ -102,6 +98,7 @@ public class GenericChem extends ItemPackage {
 	// Phenol Byproducts
 	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
 	public static ItemGenericChemBase mGenericChemItem1;
+	public static Item mAdvancedCircuit;
 
 	private ItemStack mCatalystCarrier;
 
@@ -115,6 +112,11 @@ public class GenericChem extends ItemPackage {
 
 	public static ItemStack mMillingBallAlumina;
 	public static ItemStack mMillingBallSoapstone;
+	
+	public static ItemStack mSodiumEthoxide;
+	public static ItemStack mSodiumEthylXanthate;
+	public static ItemStack mPotassiumEthylXanthate;
+	public static ItemStack mPotassiumHydroxide;
 
 
 
@@ -125,7 +127,9 @@ public class GenericChem extends ItemPackage {
 		MaterialGenerator.generate(NYLON, false);
 		MaterialGenerator.generate(TEFLON, false);		
 
-		mGenericChemItem1 = new ItemGenericChemBase();		
+		mGenericChemItem1 = new ItemGenericChemBase();	
+		mAdvancedCircuit = new ItemAdvancedChip();		
+		GregtechItemList.Circuit_T3RecipeSelector.set(mAdvancedCircuit);
 
 		registerItemStacks();
 		registerOreDict();
@@ -149,6 +153,10 @@ public class GenericChem extends ItemPackage {
 		mPinkCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 6, 1);
 		mMillingBallAlumina = ItemUtils.simpleMetaStack(mGenericChemItem1, 7, 1);
 		mMillingBallSoapstone = ItemUtils.simpleMetaStack(mGenericChemItem1, 8, 1);
+		mSodiumEthoxide = ItemUtils.simpleMetaStack(mGenericChemItem1, 9, 1);
+		mSodiumEthylXanthate = ItemUtils.simpleMetaStack(mGenericChemItem1, 10, 1);
+		mPotassiumEthylXanthate = ItemUtils.simpleMetaStack(mGenericChemItem1, 11, 1);
+		mPotassiumHydroxide = ItemUtils.simpleMetaStack(mGenericChemItem1, 12, 1);
 
 	}
 
@@ -163,6 +171,10 @@ public class GenericChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mPinkCatalyst, "catalystPlatinumRhodium");
 		ItemUtils.addItemToOreDictionary(mMillingBallAlumina, "millingballAlumina");
 		ItemUtils.addItemToOreDictionary(mMillingBallSoapstone, "millingballSoapstone");
+		ItemUtils.addItemToOreDictionary(mSodiumEthoxide, "dustSodiumEthoxide");
+		ItemUtils.addItemToOreDictionary(mSodiumEthylXanthate, "dustSodiumEthylXanthate");
+		ItemUtils.addItemToOreDictionary(mPotassiumEthylXanthate, "dustPotassiumEthylXanthate");
+		ItemUtils.addItemToOreDictionary(mPotassiumHydroxide, "dustPotassiumHydroxide");
 
 	}
 
@@ -241,8 +253,30 @@ public class GenericChem extends ItemPackage {
 		//Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O
 		Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new short[]{135, 135, 135, 100}, null, null);
 
-
-
+		Carbon_Disulfide = FluidUtils.generateFluidNoPrefix("CarbonDisulfide", "Carbon Disulfide", 350, new short[]{175, 175, 175, 100});
+
+		if (FluidRegistry.isFluidRegistered("fluid.liquid_hydricsulfur") || MaterialUtils.doesMaterialExist("HydricSulfide")) {
+			usingGregtechHydricSulfur = true;
+			Fluid aFluid = null;
+			if (ItemUtils.doesItemListEntryExist("sHydricSulfur")) {
+				ItemStack aListItem = ItemUtils.getValueOfItemList("sHydricSulfur", 1, (ItemList) null);
+				if (aListItem != null) {
+					FluidStack aFluidStack = FluidContainerRegistry.getFluidForFilledItem(aListItem);
+					if (aFluidStack != null) {
+						aFluid = aFluidStack.getFluid();
+					}
+					
+				}
+			}
+			if (aFluid == null) {
+				aFluid = FluidUtils.getWildcardFluidStack("liquid_hydricsulfur", 1000).getFluid();				
+			}
+			Hydrogen_Sulfide = aFluid;
+		}
+		else {
+			Hydrogen_Sulfide = FluidUtils.generateFluidNoPrefix("HydrogenSulfide", "Hydrogen Sulfide", 446, new short[]{240, 130, 30, 100});
+		}
+		
 	}	
 
 	@Override
@@ -253,6 +287,7 @@ public class GenericChem extends ItemPackage {
 	@Override
 	public boolean generateRecipes() {
 
+		recipeAdvancedChip();
 		recipeCatalystRed();
 		recipeCatalystYellow();
 		recipeCatalystBlue();
@@ -281,17 +316,173 @@ public class GenericChem extends ItemPackage {
 		if (!usingGregtechNitrogenDioxide) {
 			recipeNitrogenDioxide();	
 		}
+		if (!usingGregtechHydricSulfur) {
+			recipeHydricSulfur();			
+		}
 
 		// Add recipes if we are not using GT's fluid.
 		if (!FluidRegistry.isFluidRegistered("hydrochloricacid_gt5u")) {
 			recipeHydrochloricAcid();			
 		}
+		
+		recipeSodiumEthoxide();
+		recipeCarbonDisulfide();
+		recipeEthylXanthates();
+		recipePotassiumHydroxide();
+		
 		registerFuels();
 
 		return true;
 	}	
 
 
+	private void recipeSodiumEthoxide() {
+		//2 C2H5OH + 2 Na → 2 C2H5ONa + H2
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(16),
+						ELEMENT.getInstance().SODIUM.getDust(2)
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000),
+				}, 
+				new ItemStack[] {
+						ItemUtils.getSimpleStack(mSodiumEthoxide, 2)
+
+				}, 
+				new FluidStack[] {
+						ELEMENT.getInstance().HYDROGEN.getFluid(2000)						
+				}, 
+				20 *20,
+				120, 
+				2);
+	}
+
+
+	private void recipePotassiumHydroxide() {
+		//Ca(OH)2 + K2CO3 → CaCO3 + 2 KOH		
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(18),
+						ELEMENT.getInstance().POTASSIUM.getDust(4),	
+						ELEMENT.getInstance().CARBON.getDust(2),	
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 2),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack("oxygen", 6000),
+				}, 
+				new ItemStack[] {
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 2),
+						ItemUtils.getSimpleStack(mPotassiumHydroxide, 4)
+
+				}, 
+				new FluidStack[] {
+						
+				}, 
+				20 *30,
+				120, 
+				2);
+		
+	}
+
+
+	private void recipeEthylXanthates() {
+
+		//Potassium ethyl xanthate - CH3CH2OH + CS2 + KOH → CH3CH2OCS2K + H2O
+		CORE.RA.addChemicalPlantRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(17),	
+						ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 2),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000),
+						FluidUtils.getFluidStack(C