% Adjusted the '/gtpp' command.

$ Hopefully fixed quirky OreDict behaviour for custom Logs, Saplings and Leaves.

1 files changed, 16 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index cb490203df..720da1692b 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -39,6 +39,7 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentData;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
@@ -100,6 +101,11 @@ public class ItemUtils {
 		return y;
 	}
 
+	public static ItemStack getWildcardStack(final ItemStack x) {
+		final ItemStack y = ItemUtils.simpleMetaStack(x, WILDCARD_VALUE, 1);
+		return y;
+	}
+	
 	public static ItemStack getIC2Cell(final String S) {
 		final ItemStack moreTemp = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell" + S, 1);
 
@@ -154,13 +160,20 @@ public class ItemUtils {
 		}
 	}
 
-	public static void addItemToOreDictionary(final ItemStack stack, final String oreDictName) {
+	public static void addItemToOreDictionary(ItemStack stack, final String oreDictName, boolean useWildcardMeta) {
+		if (useWildcardMeta) {
+			stack = ItemUtils.getWildcardStack(stack);
+		}
 		try {
-			GT_OreDictUnificator.registerOre(oreDictName, stack);
+			OreDictionary.registerOre(oreDictName, stack);
 		} catch (final NullPointerException e) {
-			Logger.ERROR(stack.getDisplayName() + " not registered. [NULL]");
+			Logger.ERROR(ItemUtils.getItemName(stack) + " not registered. [NULL]");
 		}
 	}
+	
+	public static void addItemToOreDictionary(final ItemStack stack, final String oreDictName) {
+		addItemToOreDictionary(stack, oreDictName, false);
+	}
 
 	public static ItemStack getItemStackWithMeta(final boolean MOD, final String FQRN, final String itemName,
 			final int meta, final int itemstackSize) {