From b487447da5d7bccacf234e4793e9da452b327d45 Mon Sep 17 00:00:00 2001 From: williambl Date: Fri, 22 Nov 2019 22:15:27 +0000 Subject: [PATCH] Add oredict support to taming item config #110, but for 1.12. --- .../common/entity/EntityTameableBetterAnimalsPlus.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/its_meow/betteranimalsplus/common/entity/EntityTameableBetterAnimalsPlus.java b/src/main/java/its_meow/betteranimalsplus/common/entity/EntityTameableBetterAnimalsPlus.java index 1b817e7d..40d1c9d7 100644 --- 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; }