Merge branch 'master' of https://github.com/draknyte1/GTplusplus

7 files changed, 20 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/core/util/ClassUtils.java b/src/Java/gtPlusPlus/core/util/ClassUtils.java
index 20ca894211..498362e817 100644
--- a/src/Java/gtPlusPlus/core/util/ClassUtils.java
+++ b/src/Java/gtPlusPlus/core/util/ClassUtils.java
@@ -20,6 +20,7 @@ public class ClassUtils {
 		}
 	}
 
+	@SuppressWarnings("rawtypes")
 	public static Method getMethodViaReflection(final Class<?> lookupClass, final String methodName, final boolean invoke) throws Exception{
 		final Class<? extends Class> lookup = lookupClass.getClass();
 		final Method m = lookup.getDeclaredMethod(methodName);
@@ -30,7 +31,7 @@ public class ClassUtils {
 		return m;
 	}
 
-	public static Class getNonPublicClass(final String className){
+	public static Class<?> getNonPublicClass(final String className){
 		Class<?> c = null;
 		try {
 			c = Class.forName(className);
@@ -60,7 +61,7 @@ public class ClassUtils {
 
 				try {
 					final Object o = constructor.newInstance();
-					return (Class) o;
+					return (Class<?>) o;
 				} catch (InstantiationException | IllegalAccessException
 						| IllegalArgumentException | InvocationTargetException e) {
 					// TODO Auto-generated catch block
diff --git a/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java b/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
index e5c52939ac..a10c0ce4d1 100644
--- a/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
+++ b/src/Java/gtPlusPlus/core/util/entity/EntityUtils.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.util.entity;
 
 import cpw.mods.fml.common.registry.EntityRegistry;
+import gregtech.api.util.GT_Utility;
 import ic2.core.IC2Potion;
 import ic2.core.item.armor.ItemArmorHazmat;
 import net.minecraft.block.Block;
@@ -40,21 +41,22 @@ public class EntityUtils {
 		EntityRegistry.addSpawn(classy, 6, 1, 5, EntityType, baseBiomeGen); //change the values to vary the spawn rarity, biome, etc.
 	}
 
-	public static boolean applyRadiationDamageToEntity(final int damage, final World world, final Entity entityHolding){
+	public static boolean applyRadiationDamageToEntity(final int stackSize, final int radiationLevel, final World world, final Entity entityHolding){
 		if (!world.isRemote){
-			if ((damage > 0) && (entityHolding instanceof EntityLivingBase)) {
+			if ((radiationLevel > 0) && (entityHolding instanceof EntityLivingBase)) {
 				final EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
-				if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
+				if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving) || !GT_Utility.isWearingFullRadioHazmat(entityLiving)) {
 					int duration;
 					if (entityLiving.getActivePotionEffect(IC2Potion.radiation) != null){
 						//Utils.LOG_INFO("t");
-						duration = (damage*5)+entityLiving.getActivePotionEffect(IC2Potion.radiation).getDuration();
+						duration = (radiationLevel*5)+entityLiving.getActivePotionEffect(IC2Potion.radiation).getDuration();
 					}
 					else {
 						//Utils.LOG_INFO("f");
-						duration = damage*30;
+						duration = radiationLevel*30;
 					}
-					IC2Potion.radiation.applyTo(entityLiving, duration, damage * 15);
+					//IC2Potion.radiation.applyTo(entityLiving, duration, damage * 15);
+					GT_Utility.applyRadioactivity(entityLiving, radiationLevel, stackSize);
 				}
 			}
 			return true;
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index b820e674aa..02835a92ef 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -311,6 +311,9 @@ public class FluidUtils {
 		if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) {
 			GT_Values.RA.addFluidCannerRecipe(aFullContainer, container(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
 		}
+		else {
+			//Utils.LOG_INFO("Failed creating recipes to fill/empty cells of "+aName+".");
+		}
 		return rFluid;
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
index 863ba2b3b8..010f7b0bf0 100644
--- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java
@@ -14,6 +14,7 @@ public class MaterialUtils {
 
 	public static short firstID = 791;
 
+	@SuppressWarnings({ "rawtypes", "unused" })
 	private static Class[][] commonTypes =
 		{{Materials.class, int.class, TextureSet.class, float.class, int.class,
 			int.class, int.class, int.class, int.class, int.class, int.class,
@@ -32,6 +33,7 @@ public class MaterialUtils {
 	}
 
 	public static Material generateMaterialFromGtENUM(final Materials material){
+		@SuppressWarnings("deprecation")
 		String name = material.name();
 		final short[] rgba = material.mRGBa;
 		final int melting = material.mMeltingPoint;
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
index c1d0279f72..99a9bf2fa9 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java
@@ -12,7 +12,7 @@ public class ClientProxyFinder {
 				final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class);
 				final Object fieldValue = field.get(modInstance);
 				try {
-					final Class clientSideClass = Class.forName(sidedProxy.clientSide());
+					final Class<?> clientSideClass = Class.forName(sidedProxy.clientSide());
 					if(clientSideClass.isAssignableFrom(fieldValue.getClass())) {
 						final Object clientProxy = clientSideClass.cast(fieldValue);
 						//do what you want with client proxy instance
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index c789871b6f..f88f8e32e0 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -102,7 +102,7 @@ public class ReflectionUtils {
 	/**
 	 * Allows to change the state of an immutable instance. Huh?!?
 	 */
-	public static void setFieldValue(Class clazz,  String fieldName, Object newValue) throws Exception {
+	public static void setFieldValue(Class<?> clazz,  String fieldName, Object newValue) throws Exception {
 		Field nameField = getField(clazz, fieldName);
 		setValue(clazz, nameField, newValue);
 	}
@@ -110,7 +110,7 @@ public class ReflectionUtils {
 	/**
 	 * Allows to change the state of final statics. Huh?!?
 	 */
-	public static void setDefault(Class clazz, String fieldName, Object newValue) throws Exception {
+	public static void setDefault(Class<?> clazz, String fieldName, Object newValue) throws Exception {
 		Field staticField = clazz.getDeclaredField(fieldName);
 		setValue(null, staticField, newValue);
 	}
diff --git a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java
index 2fae02a9fd..38382b4a46 100644
--- a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java
+++ b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java
@@ -12,7 +12,7 @@ public class ServerProxyFinder {
 				final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class);
 				final Object fieldValue = field.get(modInstance);
 				try {
-					final Class serverSideClass = Class.forName(sidedProxy.serverSide());
+					final Class<?> serverSideClass = Class.forName(sidedProxy.serverSide());
 					if(serverSideClass.isAssignableFrom(fieldValue.getClass())) {
 						final Object serverProxy = serverSideClass.cast(fieldValue);
 						//do what you want with server proxy instance