Fix duplicate ore generation recipes.

2 files changed, 53 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 4c6f0dc712..47278c559d 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -523,6 +523,9 @@ public final class ModItems {
 			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false);
 			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false);
 			
+			if (!CORE.GTNH) {
+				MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM);				
+			}
 			
 			//Custom Materials that will have standalone refinery processes
 			MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false);
@@ -534,8 +537,8 @@ public final class ModItems {
 			//Custom Materials that are from Runescape
 			MaterialGenerator.generate(ELEMENT.STANDALONE.BLACK_METAL);
 			MaterialGenerator.generate(ELEMENT.STANDALONE.WHITE_METAL);
-			MaterialGenerator.generate(ELEMENT.STANDALONE.GRANITE, false, false);
-			MaterialGenerator.generate(ELEMENT.STANDALONE.RUNITE, false);
+			MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.GRANITE);
+			MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.STANDALONE.RUNITE);
 			MaterialGenerator.generate(ELEMENT.STANDALONE.DRAGON_METAL, false);
 			
 			MISC_MATERIALS.run();
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 96b5d8139f..d1ea784b81 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -411,6 +411,54 @@ public class MaterialGenerator {
 			t.printStackTrace();
 		}
 	}
+	
+	public static boolean generateOreMaterialWithAllExcessComponents(final Material matInfo){
+		try {
+			if (matInfo == null){
+				Logger.DEBUG_MATERIALS("Invalid Material while constructing null material.");
+				return false;
+			}
+			final short[] C = matInfo.getRGBA();
+			final Integer Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
+			
+			tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE, Colour.intValue());	
+			tempBlock = new BlockBaseModular(matInfo,BlockTypes.STANDARD);
+			temp = new BaseItemIngot(matInfo);
+			temp = new BaseItemDust(matInfo);
+			temp = new BaseItemNugget(matInfo);
+			temp = new BaseItemPlate(matInfo);
+			temp = new BaseItemPlateDouble(matInfo);
+
+
+			temp = new BaseItemCrushedOre(matInfo);
+			temp = new BaseItemCentrifugedCrushedOre(matInfo);
+			temp = new BaseItemPurifiedCrushedOre(matInfo);
+			temp = new BaseItemImpureDust(matInfo);
+			temp = new BaseItemPurifiedDust(matInfo);
+
+			Logger.MATERIALS("Generated all ore & base components for "+matInfo.getLocalizedName()+", now generating processing recipes.");			
+
+			new RecipeGen_Ore(matInfo, true);		
+			new RecipeGen_AlloySmelter(matInfo);
+			new RecipeGen_Assembler(matInfo);
+			new RecipeGen_BlastSmelter(matInfo);
+			new RecipeGen_MetalRecipe(matInfo);
+			new RecipeGen_Extruder(matInfo);
+			new RecipeGen_Fluids(matInfo);
+			new RecipeGen_Plates(matInfo);
+			new RecipeGen_ShapedCrafting(matInfo);
+			new RecipeGen_MaterialProcessing(matInfo);
+			new RecipeGen_DustGeneration(matInfo);
+			new RecipeGen_Recycling(matInfo);
+			return true;
+		} 
+		catch (final Throwable t){
+			Logger.MATERIALS(""+matInfo.getLocalizedName()+" failed to generate.");
+			t.printStackTrace();
+			return false;
+		}
+
+	}
 
 
 }