Fix spell book for crystals trade not working

2018-04-09 17:28:59 +01:00
parent 4e91b0d19d
commit 766570aeb2
3 changed files with 140 additions and 3 deletions
@@ -0,0 +1,57 @@
+package electroblob.wizardry.util;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.village.MerchantRecipe;
+import net.minecraft.village.MerchantRecipeList;
+import net.minecraftforge.oredict.OreDictionary;
+
+/** Custom version of {@link MerchantRecipeList} which allows wildcard recipes (i.e. trades which accept items with any
+ * damage value). Function is otherwise identical. For some reason this feature was removed in 1.11.
+ * @author Electroblob
+ * @since Wizardry 4.1 */
+@SuppressWarnings("serial")
+public class WildcardTradeList extends MerchantRecipeList {
+
+	public WildcardTradeList(){
+		super();
+	}
+	
+	public WildcardTradeList(NBTTagCompound tag){
+		super(tag);
+	}
+
+	@Override
+    public MerchantRecipe canRecipeBeUsed(ItemStack offer1, ItemStack offer2, int index){
+		
+        if(index > 0 && index < this.size()){
+        	
+            MerchantRecipe merchantrecipe1 = (MerchantRecipe)this.get(index);
+            return !this.areItemStacksExactlyEqual(offer1, merchantrecipe1.getItemToBuy()) || (!offer2.isEmpty() || merchantrecipe1.hasSecondItemToBuy()) && (!merchantrecipe1.hasSecondItemToBuy() || !this.areItemStacksExactlyEqual(offer2, merchantrecipe1.getSecondItemToBuy())) || offer1.getCount() < merchantrecipe1.getItemToBuy().getCount() || merchantrecipe1.hasSecondItemToBuy() && offer2.getCount() < merchantrecipe1.getSecondItemToBuy().getCount() ? null : merchantrecipe1;
+        
+        }else{
+        	
+            for(int i = 0; i < this.size(); ++i){
+            	
+                MerchantRecipe merchantrecipe = (MerchantRecipe)this.get(i);
+
+                if (this.areItemStacksExactlyEqual(offer1, merchantrecipe.getItemToBuy()) && offer1.getCount() >= merchantrecipe.getItemToBuy().getCount() && (!merchantrecipe.hasSecondItemToBuy() && offer2.isEmpty() || merchantrecipe.hasSecondItemToBuy() && this.areItemStacksExactlyEqual(offer2, merchantrecipe.getSecondItemToBuy()) && offer2.getCount() >= merchantrecipe.getSecondItemToBuy().getCount())){
+                    return merchantrecipe;
+                }
+            }
+            
+            return null;
+        }
+    }
+
+    private boolean areItemStacksExactlyEqual(ItemStack stack1, ItemStack stack2){
+    	// Added to allow wildcards; this line is the only actual change.
+    	if((stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE)
+    			// Can't use ItemStack.areItemsEqualIgnoreDurability because that only works for items with durability, not subtypes.
+    			&& stack1.getItem() == stack2.getItem()) return true;
+    	
+        return ItemStack.areItemsEqual(stack1, stack2) && (!stack2.hasTagCompound() || stack1.hasTagCompound() && NBTUtil.areNBTEquals(stack2.getTagCompound(), stack1.getTagCompound(), false));
+    }
+	
+}