Merged in AlkWork (pull request #4)

AlkWork

11 files changed, 177 insertions, 73 deletions

diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 234b54d2d2..72b13b3067 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -935,22 +935,6 @@ public class Utils {
 		return false;
 	}
 
-	public static ItemList getValueOfItemList(String string, ItemList aOther) {		
-		ItemList[] aListValues = ItemList.class.getEnumConstants();		
-		for (ItemList aItem : aListValues) {
-			if (aItem != null) {
-				if (aItem.name().equals(string) || aItem.name().toLowerCase().equals(string.toLowerCase())) {
-					return aItem;
-				}
-			}
-		}
-		Logger.INFO("Tried to obtain '"+string+"' from the GT ItemList, however it does not exist.");
-		if (aOther != null) {
-			Logger.INFO("Using fallback option instead - "+aOther.name());
-		}
-		return aOther;
-	}
-
 	public static long getMillisSince(long aStartTime, long aCurrentTime) {		
 		return (aCurrentTime - aStartTime);
 	}
diff --git a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
index b1cd1697f5..f8fc15c778 100644
--- a/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
+++ b/src/Java/gtPlusPlus/core/util/debug/DEBUG_INIT.java
@@ -1,12 +1,12 @@
 package gtPlusPlus.core.util.debug;
 
-import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.preloader.CORE_Preloader;
 
 public class DEBUG_INIT {
 
 	public static void registerBlocks(){
 		//Debug Loading
-		if (CORE.DEBUG){
+		if (CORE_Preloader.DEBUG_MODE){
 
 		}
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
index 49aa3a1306..66f9e2453d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/EntityUtils.java
@@ -29,8 +29,23 @@ import net.minecraft.world.biome.BiomeGenBase;
 
 public class EntityUtils {
 
-	public static void setEntityOnFire(final Entity entity, final int length){
-		entity.setFire(length);
+	public static void setEntityOnFire(final Entity aEntity, final int length){
+		if (!isEntityImmuneToFire(aEntity)) {
+			aEntity.setFire(length);
+		}
+	}
+	
+	public static boolean isEntityOnFire(final Entity aEntity) {
+		Field aIsOnFire = ReflectionUtils.getField(Entity.class, "fire");
+		if (aIsOnFire != null) {
+			int aFireTime = (int) ReflectionUtils.getFieldValue(aIsOnFire, aEntity);
+			return aFireTime > 0;
+		}
+		return false;
+	}
+	
+	public static boolean isEntityImmuneToFire(Entity aEntity) {
+		return aEntity.isImmuneToFire();
 	}
 
 	public static int getFacingDirection(final Entity entity){
@@ -59,6 +74,13 @@ public class EntityUtils {
 		final int blockZ = MathHelper.floor_double(parEntity.posZ);
 		return new BlockPos(blockX, blockY, blockZ, parEntity.worldObj);
 	}
+	
+	public static BlockPos findBlockPosOfEntity(final Entity parEntity){
+		final int blockX = MathHelper.floor_double(parEntity.posX);
+		final int blockY = MathHelper.floor_double(parEntity.boundingBox.minY);
+		final int blockZ = MathHelper.floor_double(parEntity.posZ);
+		return new BlockPos(blockX, blockY, blockZ, parEntity.worldObj);
+	}
 
 	//TODO
 	public static void registerEntityToBiomeSpawns(final Class<EntityLiving> classy, final EnumCreatureType EntityType, final BiomeGenBase baseBiomeGen){
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index d7b6bc0a30..758ec8bab0 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -1,14 +1,9 @@
 package gtPlusPlus.core.util.minecraft;
 
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.FluidGT6;
 import gtPlusPlus.core.item.base.BaseItemComponent;
@@ -19,7 +14,14 @@ import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import net.minecraftforge.fluids.*;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidContainerItem;
 
 public class FluidUtils {
 
@@ -611,5 +613,9 @@ public class FluidUtils {
 		}
 	}
 
+	public static FluidStack getAir(int aAmount) {
+		return FluidUtils.getFluidStack("air", aAmount);
+	}
+
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index d7d611a1e4..725799a43d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -27,6 +27,7 @@ import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate_OLD;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
+import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
 import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
 import gtPlusPlus.core.lib.CORE;
@@ -36,13 +37,13 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentData;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
@@ -354,7 +355,7 @@ public class ItemUtils {
 	}
 
 	public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) {
-		if (CORE.DEBUG) {
+		if (CORE_Preloader.DEBUG_MODE) {
 			Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(1));
 			Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(2));
 			Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(3));
@@ -1220,7 +1221,6 @@ public class ItemUtils {
 		return GT_Values.NI;
 	}
 
-
 	public static ItemStack depleteStack(ItemStack aStack) {
 		return depleteStack(aStack, 1);
 	}
@@ -1235,41 +1235,6 @@ public class ItemUtils {
 		}
 		return getNullStack();
 	}
-	
-	public static ItemStack getItemListObject(String aObjectFromExperimentalName, String aReplacementName, int aAmount) {
-		ItemList aItemListObject = getItemListObject(aObjectFromExperimentalName, aReplacementName);
-		if (aItemListObject == ItemList.NULL || aItemListObject == null) {
-			return null;
-		}
-		else {
-			return aItemListObject.get(aAmount);
-		}
-	}
-	
-	public static ItemStack getItemListObject(ItemList aItemListObject, int aAmount) {
-		if (aItemListObject == ItemList.NULL || aItemListObject == null) {
-			return null;
-		}
-		else {
-			return aItemListObject.get(aAmount);
-		}
-	}
-
-	public static ItemList getItemListObject(String aObjectFromExperimentalName, String aReplacementName) {
-		ItemList aVal = ItemList.valueOf(aObjectFromExperimentalName);
-		if (aVal != null) {
-			return aVal;
-		}
-		else {
-			aVal = ItemList.valueOf(aReplacementName);
-			if (aVal != null) {
-				return aVal;
-			}
-			else {
-				return ItemList.NULL;
-			}
-		}		
-	}
 
 	public static boolean isControlCircuit(ItemStack aStack) {
 		if (aStack != null) {
@@ -1282,7 +1247,9 @@ public class ItemUtils {
 	}
 	
 	public static boolean isCatalyst(ItemStack aStack) {
-
+		if (GT_Utility.areStacksEqual(aStack, RocketFuels.Formaldehyde_Catalyst_Stack, true)) {
+			return true;
+		}
 		if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
 			return true;
 		}
@@ -1309,9 +1276,69 @@ public class ItemUtils {
 		}
 		return false;
 	}
+	
+	public static boolean isMillingBall(ItemStack aStack) {
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) {
+			return true;
+		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) {
+			return true;
+		}
+		return false;
+	}
 
 	public static String getLocalizedNameOfBlock(Block aBlock, int aMeta) {
 		return LangUtils.getLocalizedNameOfBlock(aBlock, aMeta);
 	}
+	
+
+	
+	public static boolean doesItemListEntryExist(String string) {		
+		ItemList[] aListValues = ItemList.class.getEnumConstants();		
+		for (ItemList aItem : aListValues) {
+			if (aItem != null) {
+				if (aItem.name().equals(string) || aItem.name().toLowerCase().equals(string.toLowerCase())) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public static ItemList getValueOfItemList(String string, ItemList aOther) {		
+		ItemList[] aListValues = ItemList.class.getEnumConstants();		
+		for (ItemList aItem : aListValues) {
+			if (aItem != null) {
+				if (aItem.name().equals(string) || aItem.name().toLowerCase().equals(string.toLowerCase())) {
+					return aItem;
+				}
+			}
+		}
+		Logger.INFO("Tried to obtain '"+string+"' from the GT ItemList, however it does not exist.");
+		if (aOther != null) {
+			Logger.INFO("Using fallback option instead - "+aOther.name());
+		}
+		return aOther;
+	}
+	
+	public static ItemStack getValueOfItemList(String string, int aAmount, ItemList aOther) {	
+		return getValueOfItemList(string, aOther).get(aAmount);
+	}
+	
+	public static ItemStack getValueOfItemList(String string, int aAmount, ItemStack aOther) {		
+		ItemList[] aListValues = ItemList.class.getEnumConstants();		
+		for (ItemList aItem : aListValues) {
+			if (aItem != null) {
+				if (aItem.name().equals(string) || aItem.name().toLowerCase().equals(string.toLowerCase())) {
+					return aItem.get(aAmount);
+				}
+			}
+		}
+		Logger.INFO("Tried to obtain '"+string+"' from the GT ItemList, however it does not exist.");
+		if (aOther != null) {
+			Logger.INFO("Using fallback option instead - "+ItemUtils.getItemName(aOther));
+		}
+		return aOther;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 2108087542..64a6c9e820 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -501,5 +501,14 @@ public class MaterialUtils {
 		
 	}
 
+	public static boolean doesMaterialExist(String aMatName) {
+		for (Materials m : Materials.values()) {
+			if (m.name().toLowerCase().equals(aMatName.toLowerCase())) {
+				return true;
+			}
+		}
+		return false;		
+	}
+
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
index 9a8a8e691c..e64414b493 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
@@ -188,4 +188,12 @@ public class PlayerUtils {
 		Utils.sendServerMessage(string);		
 	}
 
+	public static boolean isCreative(EntityPlayer aPlayer) {
+		return aPlayer.capabilities.isCreativeMode;
+	}
+	
+	public static boolean canTakeDamage(EntityPlayer aPlayer) {
+		return !aPlayer.capabilities.disableDamage;
+	} 
+
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 13bc0c9382..56772f0dc7 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -20,6 +20,7 @@ import gtPlusPlus.api.objects.minecraft.ShapedRecipe;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
+import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import net.minecraft.item.Item;
@@ -632,5 +633,16 @@ public static int mInvalidID = 1;
     }
 
 
+	public static void addSmeltingRecipe(ItemStack aStackInput, ItemStack aStackOutput) {
+		addSmeltingRecipe(aStackInput, aStackOutput, 0f);
+	}
+    
+	public static void addSmeltingRecipe(ItemStack aStackInput, ItemStack aStackOutput, float aXpGained) {
+
+		GameRegistry.addSmelting(aStackInput, aStackOutput, aXpGained);
+		
+	}
+
+
 
 }
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index 4d8a02d800..e45d27b926 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -365,7 +365,13 @@ public class ReflectionUtils {
 
 
 	public static boolean setField(final Object object, final String fieldName, final Object fieldValue) {
-		Class<?> clazz = object.getClass();
+		Class<?> clazz;
+		if (object instanceof Class) {
+			clazz = (Class<?>) object;
+		}
+		else {
+			clazz = object.getClass();
+		}
 		while (clazz != null) {
 			try {
 				final Field field = getField(clazz, fieldName);
@@ -387,7 +393,13 @@ public class ReflectionUtils {
 	}
 
 	public static boolean setField(final Object object, final Field field, final Object fieldValue) {
-		Class<?> clazz = object.getClass();
+		Class<?> clazz;
+		if (object instanceof Class) {
+			clazz = (Class<?>) object;
+		}
+		else {
+			clazz = object.getClass();
+		}
 		while (clazz != null) {
 			try {
 				final Field field2 = getField(clazz, field.getName());
@@ -522,6 +534,25 @@ public class ReflectionUtils {
 		return false;
 	}
 
+
+	public static Object invokeNonBool(Object objectInstance, Method method, Object[] values){
+		if (objectInstance == null || method == null || values == null){
+			return false;
+		}		
+		String methodName = method.getName();
+		Class<?> mLocalClass = (objectInstance instanceof Class ? (Class<?>) objectInstance : objectInstance.getClass());
+		Logger.REFLECTION("Trying to invoke "+methodName+" on an instance of "+mLocalClass.getCanonicalName()+".");
+		try {
+				return method.invoke(objectInstance, values);
+		}
+		catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+			Logger.REFLECTION("Failed to Dynamically invoke "+methodName+" on an object of type: "+mLocalClass.getName());
+		}		
+
+		Logger.REFLECTION("Invoke failed or did something wrong.");		
+		return null;
+	}
+
 	public static Object invokeNonBool(Object objectInstance, String methodName, Class[] parameters, Object[] values){
 		if (objectInstance == null || methodName == null || parameters == null || values == null){
 			return false;
@@ -973,9 +1004,9 @@ public class ReflectionUtils {
 	 */
 	private static void makeModifiable(Field nameField) throws Exception {
 		nameField.setAccessible(true);
-        Field modifiers = getField(Field.class, "modifiers");
-        modifiers.setAccessible(true);
-        modifiers.setInt(nameField, nameField.getModifiers() & ~Modifier.FINAL);
+		Field modifiers = getField(Field.class, "modifiers");
+		modifiers.setAccessible(true);
+		modifiers.setInt(nameField, nameField.getModifiers() & ~Modifier.FINAL);
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java b/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
index 6ec6662a44..0e5a33b948 100644
--- a/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
+++ b/src/Java/gtPlusPlus/core/util/sys/GeoUtils.java
@@ -3,17 +3,22 @@ package gtPlusPlus.core.util.sys;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
 
 import org.apache.http.client.utils.URIBuilder;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.preloader.CORE_Preloader;
 
 public class GeoUtils {
 
 	public static String determineUsersCountry(){
-		if (!CORE.DEBUG && !CORE.DEVENV) {
+		if (!CORE_Preloader.DEBUG_MODE && !CORE.DEVENV) {
 		try {
 		if (NetworkUtils.checkNetworkIsAvailableWithValidInterface()){
 			return getUsersCountry();			
diff --git a/src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java b/src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java
index f1417e8a2d..b883391a86 100644
--- a/src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java
+++ b/src/Java/gtPlusPlus/core/util/sys/NetworkUtils.java
@@ -121,7 +121,7 @@ public class NetworkUtils {
 	private static boolean checkAddressWithTimeout(String URL, int timeout) {
 		
 		 try {
-		        InetAddress.getByName(URL).isReachable(3000); //Replace with your name
+		        InetAddress.getByName(URL).isReachable(timeout); //Replace with your name
 		        return true;
 		    } catch (Exception e) {
 		        return false;