+ Added Clay Plates.

+ Added HOTINGOT to ComponentTypes.
+ Added subscript formulae to dusts. (Which still use the old material system) when the name contains subscript (Basically assumes that any item with a number is a chemical formula).

- Removed Subscript from dust names.

% Added a check to the tooltip for any component item to not show the chemical composition if it's empty or ??.
% Made the mChemicalFormula String in generateMaterialFromGtENUM subscripted.
% Rewrote BaseItemIngot.java to use the component system, renamed copy of the old class to BaseItemIngotOLD.java.
% Rewrote BaseItemIngotHot.java to use the new component system.
% Changed the Error ingot to use BaseItemIngotOLD.java

1 files changed, 5 insertions, 6 deletions

diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index eb70191d78..97ad8e7ad3 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -49,7 +49,7 @@ public class MaterialGenerator {
 				Item temp;
 				Block tempBlock;
 				tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
-				temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation);
+				temp = new BaseItemIngot(matInfo);
 
 				temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
 				temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
@@ -65,10 +65,9 @@ public class MaterialGenerator {
 				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);
+				temp = new BaseItemIngot(matInfo);
 				if (hotIngot){
-					Item tempIngot = temp;
-					temp = new BaseItemIngotHot("itemHotIngot"+unlocalizedName, materialName, ItemUtils.getSimpleStack(tempIngot, 1), materialTier);
+					temp = new BaseItemIngotHot(matInfo);
 				}
 				temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
 				temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
@@ -88,7 +87,7 @@ public class MaterialGenerator {
 			Item temp;
 			Block tempBlock;
 			tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
-			temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation);
+			temp = new BaseItemIngot(matInfo);
 			temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
 			temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
 			temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", materialTier, sRadiation);
@@ -122,7 +121,7 @@ public class MaterialGenerator {
 		Block tempBlock;
 		
 		tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
-		temp = new BaseItemIngot("itemIngot"+unlocalizedName, materialName, Colour, sRadiation);
+		temp = new BaseItemIngot(matInfo);
 		temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", 3, sRadiation);
 		temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", 2, sRadiation);
 		temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", 1, sRadiation);