Merge pull request #116 from williambl/tame-with-oredict

Add oredict support to taming item config (Closes #110)
itsmeow · Nov 22, 2019 · 2d08363 · 2d08363
2 parents 16ef1d4 + b487447
commit 2d08363
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityTameableBetterAnimalsPlus.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityTameableBetterAnimalsPlus.java
@@ -7,6 +7,7 @@
 import net.minecraft.entity.passive.EntityTameable;
 import net.minecraft.item.Item;
 import net.minecraft.world.World;
+import net.minecraftforge.oredict.OreDictionary;
 
 public abstract class EntityTameableBetterAnimalsPlus extends EntityTameable {
 
@@ -21,6 +22,11 @@ public boolean isTamingItem(Item item) {
             String[] items = section.tameItems;
             String id = item.getRegistryName().toString();
             for(String itemsId : items) {
+                if (itemsId.startsWith("ore:")) {
+                    if (OreDictionary.getOres(itemsId.substring(4)).stream().anyMatch(itemStack -> itemStack.getItem() == item)) {
+                        return true;
+                    }
+                }
                 if(id.equals(itemsId)) {
                     return true;
                 }