% 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.)

1 files changed, 45 insertions, 21 deletions

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);
 	}
 
 }