+ 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.

2 files changed, 7 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 2522ba56da..50778e1285 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -124,7 +124,7 @@ public class ItemUtils {
 			final int meta) {
 		try {
 			Item em = null;
-			final Item em1 = getItem(FQRN);
+			final Item em1 = getItemFromFQRN(FQRN);
 			// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
 			if (em1 != null) {
 				em = em1;
@@ -158,7 +158,7 @@ public class ItemUtils {
 		if (MOD) {
 			try {
 				Item em = null;
-				final Item em1 = getItem(FQRN);
+				final Item em1 = getItemFromFQRN(FQRN);
 				// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
 				if (em1 != null) {
 					if (null == em) {
@@ -181,7 +181,7 @@ public class ItemUtils {
 	public static ItemStack simpleMetaStack(final String FQRN, final int meta, final int itemstackSize) {
 		try {
 			Item em = null;
-			final Item em1 = getItem(FQRN);
+			final Item em1 = getItemFromFQRN(FQRN);
 			// Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta);
 			if (em1 != null) {
 				if (null == em) {
@@ -233,7 +233,7 @@ public class ItemUtils {
 		ItemStack temp;
 		if (fqrn.toLowerCase().contains(oreDict.toLowerCase())) {
 			final String sanitizedName = fqrn.replace(oreDict, "");
-			temp = ItemUtils.getItemStack(sanitizedName, stackSize);
+			temp = ItemUtils.getItemStackFromFQRN(sanitizedName, stackSize);
 			return temp;
 		}
 		final String[] fqrnSplit = fqrn.split(":");
@@ -258,13 +258,13 @@ public class ItemUtils {
 		return null;
 	}
 
-	public static Item getItem(final String fqrn) // fqrn = fully qualified resource name
+	public static Item getItemFromFQRN(final String fqrn) // fqrn = fully qualified resource name
 	{
 		final String[] fqrnSplit = fqrn.split(":");
 		return GameRegistry.findItem(fqrnSplit[0], fqrnSplit[1]);
 	}
 
-	public static ItemStack getItemStack(final String fqrn, final int Size) // fqrn = fully qualified resource name
+	public static ItemStack getItemStackFromFQRN(final String fqrn, final int Size) // fqrn = fully qualified resource name
 	{
 		final String[] fqrnSplit = fqrn.split(":");
 		return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index a5f5c778bf..664ab40e6f 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -212,7 +212,7 @@ public static int mInvalidID = 1;
 	public static boolean removeCraftingRecipe(Object x){
 		if (null == x){return false;}
 		if (x instanceof String){
-			final Item R = ItemUtils.getItem((String) x);
+			final Item R = ItemUtils.getItemFromFQRN((String) x);
 			if (R != null){
 				x = R;
 			}