From 1fe377e10ef32f3e54e0d152f64c67eaebef1993 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 24 Oct 2019 02:09:32 +0100
Subject: + Added burn times for Wooden Pellets & Bricks. % Many minor Bio
 recipe adjustments. $ Fixed Oredict name of some Fluid Cells, advise if this
 breaks existing recipes. (Probably look at Alkalus ingots)

---
 .../core/item/base/BaseItemComponent.java          | 10 ++++++++-
 .../gtPlusPlus/core/util/minecraft/ItemUtils.java  |  2 +-
 .../core/util/minecraft/OreDictUtils.java          | 25 ++++++++++++++++++++++
 .../gtPlusPlus/core/util/reflect/OreDictUtils.java |  7 ------
 4 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
 delete mode 100644 src/Java/gtPlusPlus/core/util/reflect/OreDictUtils.java

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index dc2c0232a6..c8b6253753 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -96,7 +96,7 @@ public class BaseItemComponent extends Item{
 		this.extraData = RGBA;
 		this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME);
 		GameRegistry.registerItem(this, aFormattedNameForFluids);
-		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+aFormattedNameForFluids, ItemUtils.getSimpleStack(this));
+		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this));
 		registerComponent();
 	}
 
@@ -165,6 +165,14 @@ public class BaseItemComponent extends Item{
 	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
 		try {
+			
+
+			if (this.componentMaterial == null){
+				if (this.materialName != null){
+					list.add(Utils.sanitizeStringKeepBrackets(materialName));					
+				}				
+			}			
+			
 			if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){
 
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index a8cef939be..88fdda555c 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1220,7 +1220,7 @@ public class ItemUtils {
 	}
 
 	public static boolean doesOreDictHaveEntryFor(String string) {		
-		return OreDictionary.doesOreNameExist(string);
+		return OreDictUtils.containsValidEntries(string);
 	}
 
 	public static void hideItemFromNEI(ItemStack aItemToHide) {
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
new file mode 100644
index 0000000000..324d39b863
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/util/minecraft/OreDictUtils.java
@@ -0,0 +1,25 @@
+package gtPlusPlus.core.util.minecraft;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class OreDictUtils {
+
+	public static boolean containsValidEntries(String aOreName) {
+		boolean a = OreDictionary.doesOreNameExist(aOreName);
+		List<ItemStack> b = OreDictionary.getOres(aOreName, false);
+		
+		if (!a) {
+			return false;
+		}
+		else {
+			if (b == null || b.isEmpty()) {
+				return false;
+			}
+		}
+		return true;		
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/util/reflect/OreDictUtils.java b/src/Java/gtPlusPlus/core/util/reflect/OreDictUtils.java
deleted file mode 100644
index 6d34733545..0000000000
--- a/src/Java/gtPlusPlus/core/util/reflect/OreDictUtils.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package gtPlusPlus.core.util.reflect;
-
-public class OreDictUtils {
-
-	
-
-}
-- 
cgit