From 1dd13c5a5f3d87145963fde06b57533aed55f394 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 23 Aug 2014 11:27:59 +0200 Subject: [PATCH] Oredict support for custom materials --- .../library/crafting/PatternBuilder.java | 2 +- .../library/tools/CustomMaterial.java | 35 ++++++++++++++++--- .../library/tools/FletchlingLeafMaterial.java | 4 +++ 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 60f2dca4..9ed20adc 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -140,7 +140,7 @@ public class PatternBuilder for (CustomMaterial mat : TConstructRegistry.customMaterials) { - if (material.isItemEqual(mat.input)) + if (mat.matches(material)) return mat.value; } } diff --git a/src/main/java/tconstruct/library/tools/CustomMaterial.java b/src/main/java/tconstruct/library/tools/CustomMaterial.java index dfd243b0..a36af1f8 100644 --- a/src/main/java/tconstruct/library/tools/CustomMaterial.java +++ b/src/main/java/tconstruct/library/tools/CustomMaterial.java @@ -1,6 +1,10 @@ package tconstruct.library.tools; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.List; public abstract class CustomMaterial { @@ -8,6 +12,7 @@ public abstract class CustomMaterial public final int value; public final ItemStack input; public final ItemStack craftingItem; + public final String oredict; public CustomMaterial(int materialID, int value, ItemStack input, ItemStack craftingItem) { @@ -15,12 +20,32 @@ public abstract class CustomMaterial this.value = value; this.input = input; this.craftingItem = craftingItem; + this.oredict = null; } - /* - * public boolean matches(ItemStack input, ItemStack pattern) { if - * (ItemStack.areItemStacksEqual(this.input, input) && - * ItemStack.areItemStacksEqual(this.craftingPattern, pattern)) return true; - * return false; } + public CustomMaterial(int materialID, int value, String oredict, ItemStack craftingItem) + { + this.materialID = materialID; + this.value = value; + this.input = null; + this.craftingItem = craftingItem; + this.oredict = oredict; + } + + /** + * Wether an itemstack is a stack of this custom material or not. */ + public boolean matches(ItemStack stack) + { + if(this.oredict != null) + { + List items = OreDictionary.getOres(oredict); + for(ItemStack item : items) + if(OreDictionary.itemMatches(item, stack, false)) + return true; + return false; + } + return stack.isItemEqual(input); + } + } diff --git a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java new file mode 100644 index 00000000..52b9708a --- /dev/null +++ b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java @@ -0,0 +1,4 @@ +package tconstruct.library.tools; + +public class FletchlingLeafMaterial { +}