From 08960ffb7b856f8dc462b450b61f1a72cac3c455 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Mon, 8 Dec 2014 05:03:43 -0800 Subject: [PATCH] Unbind Shaped/Shapeless Ore Recipies from Array list to normal List. --- .../java/net/minecraftforge/oredict/ShapedOreRecipe.java | 6 +++--- .../java/net/minecraftforge/oredict/ShapelessOreRecipe.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java index 0b5f5eb131..58538c60df 100644 --- a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java @@ -1,6 +1,6 @@ package net.minecraftforge.oredict; -import java.util.ArrayList; +import java.util.List; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -215,11 +215,11 @@ public class ShapedOreRecipe implements IRecipe return false; } } - else if (target instanceof ArrayList) + else if (target instanceof List) { boolean matched = false; - Iterator itr = ((ArrayList)target).iterator(); + Iterator itr = ((List)target).iterator(); while (itr.hasNext() && !matched) { matched = OreDictionary.itemMatches(itr.next(), slot, false); diff --git a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java index 1fdc23dfc9..b69b121bfa 100644 --- a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java @@ -110,9 +110,9 @@ public class ShapelessOreRecipe implements IRecipe { match = OreDictionary.itemMatches((ItemStack)next, slot, false); } - else if (next instanceof ArrayList) + else if (next instanceof List) { - Iterator itr = ((ArrayList)next).iterator(); + Iterator itr = ((List)next).iterator(); while (itr.hasNext() && !match) { match = OreDictionary.itemMatches(itr.next(), slot, false);