From 539879dbd7fd0482fa549a49ee121b72a680a510 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Sat, 17 Feb 2018 16:10:27 -0800 Subject: [PATCH] Mod ID filter should only be based on the modid (#1179) Dangit way --- .../bloodmagic/routing/ModIdItemFilter.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java index c414770a..36531585 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java @@ -1,24 +1,16 @@ package WayofTime.bloodmagic.routing; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.ForgeRegistries; public class ModIdItemFilter extends TestItemFilter { + @Override public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { - if (ItemStack.areItemsEqualIgnoreDurability(filterStack, testStack)) { - String keyId = getModID(filterStack.getItem()); - String checkedId = getModID(testStack.getItem()); - return keyId.equals(checkedId); - } - - return false; + return getModID(filterStack).equalsIgnoreCase(getModID(testStack)); } - public String getModID(Item item) { - ResourceLocation resource = ForgeRegistries.ITEMS.getKey(item); - return resource.getResourceDomain(); + public String getModID(ItemStack stack) { + String modid = stack.getItem().getCreatorModId(stack); + return modid == null ? "" : modid; } }