+ Added some AgriChem. (You can now use Raw waste as a fuel source)

+ Added OreDict names to vanilla items, as was done in Forge 1.8.9.
+ Added functions to allow other mods to add Semifluid Fuels.
+ Added functions to handle String data into StringUtils.java.
% Renamed getItemStack -> getItemStackFromFQRN.
$ Fixed handling of custom cells for fluids using '.' within their names.
$ Fixed HF exploit.

4 files changed, 60 insertions, 52 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 37c7fef1db..7164bc20f7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -326,7 +326,7 @@ public class RECIPES_GREGTECH {
 						CI.getAlternativeTieredFluid(7, 144 * 18 * (GTNH ? 16 : 8)),
 						
 				},
-				ItemUtils.getItemStack("miscutils:personalHealingDevice", 1), 
+				ItemUtils.getItemStackFromFQRN("miscutils:personalHealingDevice", 1), 
 				20 * 60 * 30 * (GTNH ? 2 : 1),
 				(int) GT_Values.V[7]);
 		
@@ -335,7 +335,7 @@ public class RECIPES_GREGTECH {
 		//Charge Pack LuV-UV
 
 		ItemStack[] aChargeResearch = new ItemStack[] {
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore7", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
 				ItemUtils.getSimpleStack(ModItems.itemChargePack1, 1),
 				ItemUtils.getSimpleStack(ModItems.itemChargePack2, 1),
 				ItemUtils.getSimpleStack(ModItems.itemChargePack3, 1),
@@ -349,10 +349,10 @@ public class RECIPES_GREGTECH {
 		};
 
 		ItemStack[] aBufferCoreInputs = new ItemStack[] {
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore7", GTNH ? 8 : 4),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore8", GTNH ? 8 : 4),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore9", GTNH ? 8 : 4),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore10", GTNH ? 8 : 4),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", GTNH ? 8 : 4),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", GTNH ? 8 : 4),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", GTNH ? 8 : 4),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", GTNH ? 8 : 4),
 		};
 		
 		int aCurrSlot = 0;
@@ -696,21 +696,29 @@ public class RECIPES_GREGTECH {
 		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion),
 				ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250));
 
-		// Hydrofluoric Acid
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
-				ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
-				FluidUtils.getFluidStack("hydrofluoricacid", 250), null);
-		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
-				ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 250));
 
+		
+		// Hydrofluoric Acid
+		boolean addedGtExtraction = false;
+		// Try use Internal GT Fluid first
 		if (Utils.getGregtechVersionAsInt() >= 50929) {
 			// Hydrofluoric Acid
 			GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
 					ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
 					FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250), null);
-			GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+			addedGtExtraction = GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
 					ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 250));
 		}
+		//Add a Fill recipe for GT++ Acid
+		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle),
+				ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+				FluidUtils.getFluidStack("hydrofluoricacid", 125), null);
+		//Add an empty recipe, but only if we didn't for the standard GT HF. Prevents Fluid transformation exploits.
+		if (!addedGtExtraction)
+		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion),
+				ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 125));
+
+		
 	}
 
 	private static void cokeOvenRecipes() {
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 54380306cc..1c0f3f8a28 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -50,7 +50,7 @@ public class RECIPES_General {
 			RECIPE_Obsidian = ItemUtils.getSimpleStack(Blocks.obsidian);
 			RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table);
 			RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob);	
-			RECIPE_BasicCasingIC2 = ItemUtils.getItemStack("IC2:blockMachine", 1);			
+			RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1);			
 			OUTPUT_Workbench_Bronze = ItemUtils.getSimpleStack(ModBlocks.blockWorkbench);
 			OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase);	
 			run();
@@ -127,9 +127,9 @@ public class RECIPES_General {
 		//Iron bars
 		final ItemStack ironBars;
 		if (CORE.GTNH) {
-			ironBars = ItemUtils.getItemStack("dreamcraft:item.SteelBars", 1);
+			ironBars = ItemUtils.getItemStackFromFQRN("dreamcraft:item.SteelBars", 1);
 		} else {
-			ironBars = ItemUtils.getItemStack("minecraft:iron_bars", 1);
+			ironBars = ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 1);
 		}
 
 		//Fish Trap
@@ -154,7 +154,7 @@ public class RECIPES_General {
 						null, CI.craftingToolWrench, null,
 						ironRecipe, ironRecipe, ironRecipe,
 						ironRecipe, ironRecipe, ironRecipe,
-						ItemUtils.getItemStack("minecraft:iron_bars", 8))) {
+						ItemUtils.getItemStackFromFQRN("minecraft:iron_bars", 8))) {
 					Logger.INFO("Re-added old GT recipe for Iron Bars.");			
 				}
 			}
@@ -287,7 +287,7 @@ public class RECIPES_General {
 						ItemUtils.getSimpleStack(ModBlocks.blockNet, 8), ItemUtils.getSimpleStack(Blocks.vine, 8),
 						ALLOY.TUMBAGA.getRing(1), },
 				FluidUtils.getWater(1000), // Fluid
-				ItemUtils.getItemStack("miscutils:SlowBuildingRing", 1), // Output
+				ItemUtils.getItemStackFromFQRN("miscutils:SlowBuildingRing", 1), // Output
 				20 * 30, // Dur
 				16); // Eu
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index a7c0655f89..91ceb30911 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -97,16 +97,16 @@ public class RECIPES_Machines {
 
 
 	//Buffer Cores
-	public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStack("miscutils:item.itemBufferCore1", 1);
-	public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1);
-	public static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStack("miscutils:item.itemBufferCore3", 1);
-	public static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStack("miscutils:item.itemBufferCore4", 1);
-	public static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStack("miscutils:item.itemBufferCore5", 1);
-	public static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStack("miscutils:item.itemBufferCore6", 1);
-	public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStack("miscutils:item.itemBufferCore7", 1);
-	public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStack("miscutils:item.itemBufferCore8", 1);
-	public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStack("miscutils:item.itemBufferCore9", 1);
-	public static ItemStack RECIPE_BufferCore_MAX = ItemUtils.getItemStack("miscutils:item.itemBufferCore10", 1);
+	public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore1", 1);
+	public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1);
+	public static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore3", 1);
+	public static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore4", 1);
+	public static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore5", 1);
+	public static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore6", 1);
+	public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1);
+	public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1);
+	public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1);
+	public static ItemStack RECIPE_BufferCore_MAX = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1);
 
 
 	//Wire
@@ -181,7 +181,7 @@ public class RECIPES_Machines {
 
 	//Lava Boiler
 	public static ItemStack boiler_Coal;
-	public static ItemStack blockBricks = ItemUtils.getItemStack("minecraft:brick_block", 1);
+	public static ItemStack blockBricks = ItemUtils.getItemStackFromFQRN("minecraft:brick_block", 1);
 
 	//Batteries
 	public static String batteryBasic = "batteryBasic";
@@ -990,7 +990,7 @@ public class RECIPES_Machines {
 						"plateDoubleZeron100", CI.craftingToolHammer_Hard, "plateDoubleZeron100",
 						RECIPE_LFTRInnerCasing);
 
-				ItemStack IC2HeatPlate = ItemUtils.getItemStack("IC2:reactorPlatingHeat", 1);
+				ItemStack IC2HeatPlate = ItemUtils.getItemStackFromFQRN("IC2:reactorPlatingHeat", 1);
 				RecipeUtils.addShapedGregtechRecipe(
 						"plateDoubleHastelloyN", IC2HeatPlate, "plateDoubleHastelloyN",
 						IC2HeatPlate, "frameGtHastelloyC276", IC2HeatPlate,
@@ -1605,7 +1605,7 @@ public class RECIPES_Machines {
 
 		Item aBaseCore = ModItems.itemControlCore;		
 		ItemStack[] aInputPrevTier = new ItemStack[] {
-				GTNH ? ItemUtils.getItemStack("miscutils:item.itemBufferCore3", 1) : ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1),
+				GTNH ? ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore3", 1) : ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1),
 						ItemUtils.simpleMetaStack(aBaseCore, 0, 1),
 						ItemUtils.simpleMetaStack(aBaseCore, 1, 1),
 						ItemUtils.simpleMetaStack(aBaseCore, 2, 1),
@@ -1636,7 +1636,7 @@ public class RECIPES_Machines {
 						aOutput[1],
 						aMat_A[1].getGear(GTNH ? 4 : 2),
 						aMat_B[2].getPlateDouble(GTNH ? 16 : 8),
-						ItemUtils.getItemStack("miscutils:item.itemBufferCore"+(GTNH ? "2" : "1"), GTNH ? 4 : 2),
+						ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+(GTNH ? "2" : "1"), GTNH ? 4 : 2),
 						ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(GTNH ? 3 : 2), GTNH ? 10 : 5)
 				},					
 				aMat_B[3].getFluid(144 * 8), //Input Fluid					
@@ -1806,16 +1806,16 @@ public class RECIPES_Machines {
 
 
 		ItemStack[] aOutput = new ItemStack[] {
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"1", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"2", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"3", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"4", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"5", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"6", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"7", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"8", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"9", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"10", 1)
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"1", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"2", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"3", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"4", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"5", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"6", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"7", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"8", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"9", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"10", 1)
 		};		
 
 		int aCostMultiplier = GTNH ? 4 : 1;	
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 28fa12ac1a..42cb075400 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -631,16 +631,16 @@ public class CI {
 	
 	public static ItemStack getEnergyCore(int aTier, int aAmount) {
 		ItemStack[] aOutput = new ItemStack[] {
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"1", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"2", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"3", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"4", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"5", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"6", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"7", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"8", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"9", 1),
-				ItemUtils.getItemStack("miscutils:item.itemBufferCore"+"10", 1)
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"1", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"2", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"3", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"4", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"5", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"6", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"7", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"8", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"9", 1),
+				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore"+"10", 1)
 		};
 		return ItemUtils.getSimpleStack(aOutput[MathUtils.balance(aTier, 0, 9)], aAmount);
 	}