+ Added Trinium Ore and Byproducts.

$ Fixed Ore Recipe generator not working for things without byproducts (pure materials)
$ Tried to fix loading of some recipes.
$ Fixed a bug in the Fluids recipe generator.

6 files changed, 95 insertions, 39 deletions

diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 0185c7d8c4..12c323d68d 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -321,6 +321,7 @@ public class MaterialGenerator {
 			temp = new BaseItemImpureDust(matInfo);
 			temp = new BaseItemPurifiedDust(matInfo);
 
+			Logger.MATERIALS("Generated all ore components for "+matInfo.getLocalizedName()+", now generating processing recipes.");
 			RecipeGen_Ore.generateRecipes(matInfo);
 
 		} catch (final Throwable t){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 57db26a521..53150ba4d9 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -2,7 +2,6 @@ package gtPlusPlus.core.recipe;
 
 import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.api.objects.Logger;
@@ -18,26 +17,35 @@ import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
 
 public class RECIPES_General {
 
-	static ItemStack NULL = null;
-	static ItemStack RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
-	static ItemStack RECIPE_Dirt = ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.dirt));
-	static ItemStack RECIPE_Snow = ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.snow));
-	static ItemStack RECIPE_Obsidian = ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.obsidian));
+	static final ItemStack NULL = null;
+	static ItemStack RECIPE_Paper;
+	static ItemStack RECIPE_Dirt;
+	static ItemStack RECIPE_Snow;
+	static ItemStack RECIPE_Obsidian;
 	static String RECIPE_LapisDust = "dustLazurite";
-	static ItemStack OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);
-	static ItemStack RECIPE_CraftingTable = ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.crafting_table));
+	static ItemStack OUTPUT_Blueprint;
+	static ItemStack RECIPE_CraftingTable;
 	static String RECIPE_BronzePlate = "plateBronze";
 	static ItemStack RECIPE_BasicCasingIC2;
-	static ItemStack OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench));
-	static ItemStack RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);
+	static ItemStack OUTPUT_Workbench_Bronze;
+	static ItemStack RECIPE_HydrogenDust;
 
 	public static void loadRecipes(){
+		
+		RECIPE_Paper = ItemUtils.getSimpleStack(Items.paper);
+		RECIPE_Dirt = ItemUtils.getSimpleStack(Blocks.dirt);
+		RECIPE_Snow = ItemUtils.getSimpleStack(Blocks.snow);
+		RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian);
+		RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
+		RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);	
+		
+		OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(ModBlocks.blockWorkbench);
+		OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);	
+		
 		if (LoadedMods.Gregtech){
 			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);
 			run();
@@ -163,7 +171,7 @@ public class RECIPES_General {
 			Logger.INFO("Added a recipe for The Alkalus Disk.");
 		}
 
-		final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
+		/*final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
 		final ItemStack gemShards[] = new ItemStack[]{ItemUtils.simpleMetaStack(ModItems.itemGemShards, 0, 1),
 				ItemUtils.simpleMetaStack(ModItems.itemGemShards, 1, 1),
 				ItemUtils.simpleMetaStack(ModItems.itemGemShards, 2, 1),
@@ -176,55 +184,72 @@ public class RECIPES_General {
 					ItemUtils.getItemStackOfAmountFromOreDict(gem, 1),
 					new ItemStack(ModItems.itemAlkalusDisk, 1, OreDictionary.WILDCARD_VALUE));
 			l++;
-		}
+		}*/
 
-		RecipeUtils.addShapedGregtechRecipe(
+		if (RecipeUtils.recipeBuilder(
 				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
 				"plateTungstenSteel", getSimpleStack(Items.nether_star), "plateTungstenSteel",
 				"stickBlackSteel", "plateTungstenSteel", "stickBlackSteel",
-				ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32));
+				ItemUtils.getSimpleStack(ModBlocks.blockWitherGuard, 32))){
+			Logger.INFO("Added a recipe for Wither Cages.");
+		}
 
-		RecipeUtils.addShapedGregtechRecipe(
+		if (RecipeUtils.recipeBuilder(
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
 				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1), getSimpleStack(Items.nether_star), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1),
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
-				ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1));
+				ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1))){
+			Logger.INFO("Added a recipe for XP Converter.");
+		}
 
 
 
 
 		// Rope/Fiber/Net
-		RecipeUtils.addShapelessGregtechRecipe(
+		if (RecipeUtils.addShapelessGregtechRecipe(
 				new ItemStack[]{
 						ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), ItemUtils.getSimpleStack(Items.reeds)},
 				ItemUtils.getSimpleStack(ModItems.itemFiber, 16)
-				);
-		RecipeUtils.addShapelessGregtechRecipe(
+				)){
+			Logger.INFO("Added a recipe for Fiber.");
+		}
+
+		if (RecipeUtils.addShapelessGregtechRecipe(
 				new ItemStack[]{
 						ItemUtils.getItemStackOfAmountFromOreDictNoBroken(CI.craftingToolKnife, 1), ItemUtils.getSimpleStack(Blocks.sapling)},
 				ItemUtils.getSimpleStack(ModItems.itemFiber, 32)
-				);
-		RecipeUtils.recipeBuilder(
+				)){
+			Logger.INFO("Added a recipe for Fiber.");
+		}
+
+		if (RecipeUtils.recipeBuilder(
 				null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null,
 				ItemUtils.getSimpleStack(ModItems.itemFiber, 1), CI.craftingToolKnife, ItemUtils.getSimpleStack(ModItems.itemFiber, 1),
 				null, ItemUtils.getSimpleStack(ModItems.itemFiber, 1), null,
-				ItemUtils.getSimpleStack(ModItems.itemRope, 3));
-		RecipeUtils.recipeBuilder(
+				ItemUtils.getSimpleStack(ModItems.itemRope, 3))){
+			Logger.INFO("Added a recipe for Rope.");
+		}
+
+		if (RecipeUtils.recipeBuilder(
 				ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1),
 				ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1), ItemUtils.getSimpleStack(ModItems.itemRope, 1),
 				null, null, null,
-				ItemUtils.getSimpleStack(ModBlocks.blockNet, 2));
+				ItemUtils.getSimpleStack(ModBlocks.blockNet, 2))){
+			Logger.INFO("Added a recipe for Nets.");
+		}
 
 
 	}
 
 	private static boolean addCompressedObsidian(){
 		//Invert Obsidian
-		RecipeUtils.addShapedGregtechRecipe(
+		if (RecipeUtils.recipeBuilder(
 				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
 				getSimpleStack(Items.glowstone_dust), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 1, 1), getSimpleStack(Items.glowstone_dust),
 				getSimpleStack(Items.redstone), getSimpleStack(Items.glowstone_dust), getSimpleStack(Items.redstone),
-				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1));
+				ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 5, 1))){
+			Logger.INFO("Added a recipe for Inverted Obsidian.");
+		}
 
 		final ItemStack[] mItems = new ItemStack[6];
 		mItems[0] = ItemUtils.getSimpleStack(Blocks.obsidian);
@@ -238,13 +263,17 @@ public class RECIPES_General {
 			final ItemStack input = mItems[r];
 			final ItemStack output = mItems[r+1];
 
-			RecipeUtils.addShapedGregtechRecipe(
+			if (RecipeUtils.recipeBuilder(
 					input, input, input,
 					input, input, input,
 					input, input, input,
-					output);
+					output)){
+						Logger.INFO("Added a recipe for Compressed Obsidian ["+r+"]");
+					}
 
-			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{output}, ItemUtils.getSimpleStack(input, 9));
+			if (RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{output}, ItemUtils.getSimpleStack(input, 9))){
+				Logger.INFO("Added a shapeless recipe for Compressed Obsidian ["+r+"]");
+			}
 
 		}
 		return true;
diff --git a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
index c43a725065..43000e17eb 100644
--- a/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
+++ b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java
@@ -109,6 +109,13 @@ public class GTplusplus_Everglades implements ActionListener {
 		if (LoadedMods.Big_Reactors) {
 			MaterialGenerator.generateOreMaterial(ELEMENT.getInstance().YELLORIUM, false, false, true, new short[] {255, 242, 10});
 		}
+		
+		MaterialGenerator.generateOreMaterial(
+				ELEMENT.getInstance().TRINIUM,
+				true,
+				false,
+				false,
+				ELEMENT.getInstance().TRINIUM_REFINED.getRGBA());
 	}
 
 	protected synchronized void setVars(FMLPreInitializationEvent event){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 931f3022a4..1f3c91c9cb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -35,8 +35,12 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 
 	private void generateRecipes(final Material material, final boolean dO){
 
+		if (material == null) {
+			return;
+		}
+		
 		//Melting Shapes to fluid
-		if (!material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")){
+		if (material.getFluid(1) != null && !material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")){
 			
 			if (!material.requiresBlastFurnace()) {
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
index 294e41c6cb..71e3a5093c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java
@@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 
@@ -11,12 +12,12 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -32,21 +33,27 @@ public class RecipeGen_Ore implements Runnable{
 	public void run() {
 		generateRecipes(this.toGenerate);
 	}
+	
+	private static Material mStone;
 
 	public static void generateRecipes(final Material material){
 
-		if (material.getMaterialComposites().length > 1){
+		if (mStone == null) {
+			mStone = MaterialUtils.generateMaterialFromGtENUM(Materials.Stone);
+		}
+		
+		//if (material.getMaterialComposites().length > 1){
 			Logger.MATERIALS("[Recipe Generator Debug] ["+material.getLocalizedName()+"]");
 			final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 120 : 30;
 			final ItemStack dustStone = ItemUtils.getItemStackOfAmountFromOreDict("dustStone", 1);
 			Material bonusA = null; //Ni
 			Material bonusB = null; //Tin
 
-			if (material.getComposites().get(0) != null){
+			if (material.getComposites().size() >= 1 && material.getComposites().get(0) != null){
 				bonusA = material.getComposites().get(0).getStackMaterial();
 			}
 			else {
-				return;
+				bonusA = material;
 			}
 
 			boolean allFailed = false;
@@ -64,7 +71,7 @@ public class RecipeGen_Ore implements Runnable{
 							//If Fifth Output has no solid output, default out to Chrome.
 							if (!bonusB.hasSolidForm()) {
 								allFailed = true;
-								bonusB = ELEMENT.getInstance().PLATINUM;
+								bonusB = mStone;
 							}
 						}
 					}
@@ -76,7 +83,7 @@ public class RecipeGen_Ore implements Runnable{
 
 			//Default out if it's made of fluids or some shit.
 			if (allFailed || bonusB == null) {
-				bonusB = ELEMENT.getInstance().PLATINUM;
+				bonusB = tVoltageMultiplier <= 100 ? material : mStone;
 			}
 
 			AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>();
@@ -447,7 +454,7 @@ public class RecipeGen_Ore implements Runnable{
 				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 
-		}
+		//}
 	}
 
 
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 5254ad7de5..fed5cd2667 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -1984,3 +1984,11 @@ entity.throwablePotionHydrofluoric.name=Flask of Hydrofluoric Acid
 entity.toxinBall.name=Toxin globule
 entity.plasmaBolt.name=Plasma
 entity.bigChickenFriendly.name=Giant Chicken
+
+//Added 26/6/18
+tile.OreTrinium.name=Trinium Ore
+item.crushedTrinium.name=Crushed Trinium Ore
+item.crushedCentrifugedTrinium.name=Centrifuged Crushed Trinium Ore
+item.crushedPurifiedTrinium.name=Purified Crushed Trinium Ore
+item.dustImpureTrinium.name=Impure Trinium Dust
+item.dustPureTrinium.name=Purified Trinium Dust
\ No newline at end of file