% Refined the Radiation handler.

> Now it does variable damage based on what material is being handled.
% Refined the material generation system.
> Radioactive materials no longer generate Gears, Rings, Screws, Bolts or Rotors. (No point or use.)

10 files changed, 102 insertions, 109 deletions

diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
index 920a3d7acf..f3cc14e889 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechConduits.java
@@ -222,11 +222,11 @@ public class GregtechConduits {
 		ItemStack pipePlate = UtilsItems.getItemStackOfAmountFromOreDict("plate"+output, 1).copy();
 		
 		//Check all pipes are not null
-		Utils.LOG_INFO("Generated pipeTiny from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
-		Utils.LOG_INFO("Generated pipeSmall from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
-		Utils.LOG_INFO("Generated pipeNormal from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
-		Utils.LOG_INFO("Generated pipeLarge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
-		Utils.LOG_INFO("Generated pipeHuge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
+		Utils.LOG_WARNING("Generated pipeTiny from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Tiny"+output, 1) != null) ? true : false));
+		Utils.LOG_WARNING("Generated pipeSmall from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Small"+output, 1) != null) ? true : false));
+		Utils.LOG_WARNING("Generated pipeNormal from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Medium"+output, 1) != null) ? true : false));
+		Utils.LOG_WARNING("Generated pipeLarge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Large"+output, 1) != null) ? true : false));
+		Utils.LOG_WARNING("Generated pipeHuge from "+ materialName +"? "+ ((UtilsItems.getItemStackOfAmountFromOreDict("pipe"+"Huge"+output, 1) != null) ? true : false));
 		
 		//Add the Three Shaped Recipes First		
 		UtilsRecipe.recipeBuilder(
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
index 360b620cc5..8dc49c3249 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -6,8 +6,6 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
 
 import java.util.List;
 
@@ -18,7 +16,6 @@ import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.math.MathUtils;
 import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -100,14 +97,7 @@ public class BaseItemDust extends Item{
 	protected final int sRadiation;
 	 @Override
 		public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
-			if (!world.isRemote){
-				if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) {
-			         EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
-			         if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
-			             IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
-			         }
-			     }
-			}
+		 Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding);
 		}
 
 	@Override
@@ -123,8 +113,8 @@ public class BaseItemDust extends Item{
 				list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
 			}
 			if (sRadiation > 0){
-				list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.");
-			}
+				list.add(CORE.GT_Tooltip_Radioactive);
+				}
 		//}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
@@ -141,6 +131,8 @@ public class BaseItemDust extends Item{
 		return colour;
 
 	}
+	
+	
 
 	private void addMixerRecipe(){
 		ItemStack tempStack = UtilsItems.getSimpleStack(this);
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
index 30659c53cc..c726614be6 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java
@@ -2,8 +2,6 @@ package miscutil.core.item.base.ingots;
 
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
 
 import java.util.List;
 
@@ -13,7 +11,6 @@ import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -67,8 +64,8 @@ public class BaseItemIngot extends Item{
 			list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling..");		
 		}
 		if (sRadiation > 0){
-			list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.");
-		}
+			list.add(CORE.GT_Tooltip_Radioactive);
+			}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
@@ -116,13 +113,6 @@ public class BaseItemIngot extends Item{
 	protected final int sRadiation;
 	 @Override
 		public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
-			if (!world.isRemote){
-				if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) {
-			         EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
-			         if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
-			             IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
-			         }
-			     }
-			}
+		 Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding);
 		}
 }
diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java
index 6c244b33db..9c701ab51f 100644
--- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -1,19 +1,17 @@
 package miscutil.core.item.base.itemblock;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
 
 import java.util.List;
 
+import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
 public class ItemBlockGtBlock extends ItemBlock{
@@ -40,21 +38,14 @@ public class ItemBlockGtBlock extends ItemBlock{
     @Override
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
 			if (sRadiation > 0){
-				list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.");
+				list.add(CORE.GT_Tooltip_Radioactive);
 			}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
     
 	 @Override
 		public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
-			if (!world.isRemote){				
-				if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) {
-			         EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
-			         if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
-			             IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
-			         }
-			     }
-			}
+		 Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding);
 		}
 
 }
diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
index 75d3f6a527..b802ed51bf 100644
--- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
+++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
@@ -2,8 +2,6 @@ package miscutil.core.item.base.plates;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
 
 import java.util.List;
 
@@ -13,7 +11,6 @@ import miscutil.core.util.Utils;
 import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.math.MathUtils;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -56,8 +53,8 @@ public class BaseItemPlate extends Item{
 			list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + ".");		
 		}
 		if (sRadiation > 0){
-			list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.");
-		}
+			list.add(CORE.GT_Tooltip_Radioactive);
+			}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
@@ -77,14 +74,7 @@ public class BaseItemPlate extends Item{
 	protected final int sRadiation;
 	 @Override
 		public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
-			if (!world.isRemote){
-				if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) {
-			         EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
-			         if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
-			             IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
-			         }
-			     }
-			}
+		 Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding);
 		}
 
 	private void addBendingRecipe(){
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
index 64abd9f591..c007887b59 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
@@ -3,8 +3,6 @@ package miscutil.core.item.base.rods;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_OreDictUnificator;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
 
 import java.util.List;
 
@@ -15,7 +13,6 @@ import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.math.MathUtils;
 import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -58,8 +55,8 @@ public class BaseItemRod extends Item{
 			list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + ".");		
 		}
 		if (sRadiation > 0){
-			list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.");
-		}
+			list.add(CORE.GT_Tooltip_Radioactive);
+			}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
@@ -79,14 +76,7 @@ public class BaseItemRod extends Item{
 	protected final int sRadiation;
 	 @Override
 		public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
-			if (!world.isRemote){
-				if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) {
-			         EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
-			         if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
-			             IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
-			         }
-			     }
-			}
+		 Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding);
 		}
 	
 	private void addExtruderRecipe(){
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
index dc2b50e594..c02254488a 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
+++ b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
@@ -2,8 +2,6 @@ package miscutil.core.item.base.rods;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
-import ic2.core.IC2Potion;
-import ic2.core.item.armor.ItemArmorHazmat;
 
 import java.util.List;
 
@@ -14,7 +12,6 @@ import miscutil.core.util.item.UtilsItems;
 import miscutil.core.util.math.MathUtils;
 import miscutil.core.util.recipe.UtilsRecipe;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -57,7 +54,7 @@ public class BaseItemRodLong extends Item{
 			list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + ".");		
 		}
 		if (sRadiation > 0){
-			list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.");
+			list.add(CORE.GT_Tooltip_Radioactive);
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
@@ -76,18 +73,11 @@ public class BaseItemRodLong extends Item{
 	}
 
 	protected final int sRadiation;
-	 @Override
-		public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
-			if (!world.isRemote){
-				if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) {
-			         EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
-			         if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
-			             IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10);
-			         }
-			     }
-			}
-		}
-	
+	@Override
+	public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) {
+		Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding);
+	}
+
 	private void addExtruderRecipe(){
 		Utils.LOG_WARNING("Adding recipe for Long "+materialName+" Rods");
 		String tempIngot = unlocalName.replace("itemRodLong", "stick");
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index ab7b8d5dab..49b8d2a7b1 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -35,6 +35,7 @@ public class CORE {
 	public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class;
 	public static Configuration Config;	
 	public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
+	public static final String GT_Tooltip_Radioactive = EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection.";
 	public static final String noItem = "";
 	
 	/**
diff --git a/src/Java/miscutil/core/util/Utils.java b/src/Java/miscutil/core/util/Utils.java
index 4a5f43b7c4..2419234e26 100644
--- a/src/Java/miscutil/core/util/Utils.java
+++ b/src/Java/miscutil/core/util/Utils.java
@@ -3,6 +3,8 @@ package miscutil.core.util;
 import static gregtech.api.enums.GT_Values.F;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import ic2.core.IC2Potion;
+import ic2.core.item.armor.ItemArmorHazmat;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -21,6 +23,7 @@ import miscutil.core.util.math.MathUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -49,7 +52,7 @@ public class Utils {
 	public static TC_AspectStack getTcAspectStack (TC_Aspects aspect, int size){
 
 		TC_AspectStack returnValue = null;
-		
+
 		if (aspect.name().toUpperCase() == "COGNITIO"){
 			//Adds in Compat for older GT Versions which Misspell aspects.
 			try {
@@ -57,7 +60,7 @@ public class Utils {
 			} catch (NoSuchFieldError r){
 				Utils.LOG_INFO("Fallback TC Aspect found - "+aspect.name()+" - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR");
 				returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITO"), size);
-				
+
 			}
 		}
 		else if (aspect.name().toUpperCase() == "EXANIMUS"){
@@ -437,6 +440,28 @@ public class Utils {
 		return true;
 	}
 
+	public static boolean applyRadiationDamageToEntity(int damage, World world, Entity entityHolding){
+		if (!world.isRemote){				
+			if (damage > 0 && (entityHolding instanceof EntityLivingBase)) {
+				EntityLivingBase entityLiving = (EntityLivingBase) entityHolding;
+				if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) {
+					int duration;
+					if (entityLiving.getActivePotionEffect(IC2Potion.radiation) != null){
+						//Utils.LOG_INFO("t");
+						duration = (damage*5)+entityLiving.getActivePotionEffect(IC2Potion.radiation).getDuration();
+					}
+					else {
+						//Utils.LOG_INFO("f");
+						duration = damage*30;
+					}					
+					IC2Potion.radiation.applyTo(entityLiving, duration, damage * 15);
+				}
+			}
+			return true;
+		}
+		return false;		
+	}
+
 
 }
 
diff --git a/src/Java/miscutil/core/util/item/UtilsItems.java b/src/Java/miscutil/core/util/item/UtilsItems.java
index eca3d750af..8b1772305b 100644
--- a/src/Java/miscutil/core/util/item/UtilsItems.java
+++ b/src/Java/miscutil/core/util/item/UtilsItems.java
@@ -255,30 +255,54 @@ public class UtilsItems {
 		}
 		int sRadiation = 0;
 		
-		if (materialName.toLowerCase().contains("uranium") || materialName.toLowerCase().contains("plutonium") || materialName.toLowerCase().contains("thorium")){
+		if (materialName.toLowerCase().contains("uranium")){
 			sRadiation = 2;
 		}
-		Item temp;
-		Block tempBlock;
-		tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
-		tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.FRAME, Colour);
-		temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation);
-		if (hotIngot){
-			Item tempIngot = temp;
-			temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1), materialTier);
-			}
-		temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", hotIngot, materialTier, sRadiation);
-		temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", hotIngot, materialTier, sRadiation);
-		temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", hotIngot, materialTier, sRadiation);
+		else if (materialName.toLowerCase().contains("plutonium")){
+			sRadiation = 4;
+		}
+		else if (materialName.toLowerCase().contains("thorium")){
+			sRadiation = 1;
+		}
+		if (sRadiation >= 1){
+			Item temp;
+			Block tempBlock;
+			tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+			temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation);
+			
+			temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", hotIngot, materialTier, sRadiation);
+			temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", hotIngot, materialTier, sRadiation);
+			temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", hotIngot, materialTier, sRadiation);
+			
+			temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
+			temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
+			temp = new BaseItemRodLong("itemRodLong"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
+		}
+		
+		else {
+			Item temp;
+			Block tempBlock;
+			tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+			tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.FRAME, Colour);
+			temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation);
+			if (hotIngot){
+				Item tempIngot = temp;
+				temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, UtilsItems.getSimpleStack(tempIngot, 1), materialTier);
+				}
+			temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", hotIngot, materialTier, sRadiation);
+			temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", hotIngot, materialTier, sRadiation);
+			temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", hotIngot, materialTier, sRadiation);
+			
+			temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
+			temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
+			temp = new BaseItemRodLong("itemRodLong"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
+			temp = new BaseItemRing("itemRing"+unlocalizedName, materialName, Colour, materialTier);
+			temp = new BaseItemBolt("itemBolt"+unlocalizedName, materialName, Colour, materialTier);
+			temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour, materialTier);
+			temp = new BaseItemRotor("itemRotor"+unlocalizedName, materialName, Colour);
+			temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour, materialTier);
+		}
 		
-		temp = new BaseItemPlate("itemPlate"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
-		temp = new BaseItemRod("itemRod"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
-		temp = new BaseItemRodLong("itemRodLong"+unlocalizedName, materialName, Colour, materialTier, sRadiation);
-		temp = new BaseItemRing("itemRing"+unlocalizedName, materialName, Colour, materialTier);
-		temp = new BaseItemBolt("itemBolt"+unlocalizedName, materialName, Colour, materialTier);
-		temp = new BaseItemScrew("itemScrew"+unlocalizedName, materialName, Colour, materialTier);
-		temp = new BaseItemRotor("itemRotor"+unlocalizedName, materialName, Colour);
-		temp = new BaseItemGear("itemGear"+unlocalizedName, materialName, Colour, materialTier);
 	}
 
 }