lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Mod ID filter should only be based on the modid (#1179)

Browse source 
Dangit way
This commit is contained in:
Nicholas Ignoffo 2018-02-17 16:10:27 -08:00
parent 0cb9d66c81
commit 539879dbd7
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/WayofTime/bloodmagic/routing/ModIdItemFilter.java
View file

@ -1,24 +1,16 @@
package WayofTime.bloodmagic.routing; package WayofTime.bloodmagic.routing;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
public class ModIdItemFilter extends TestItemFilter { public class ModIdItemFilter extends TestItemFilter {
@Override @Override
public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) { public boolean doStacksMatch(ItemStack filterStack, ItemStack testStack) {
if (ItemStack.areItemsEqualIgnoreDurability(filterStack, testStack)) { return getModID(filterStack).equalsIgnoreCase(getModID(testStack));
String keyId = getModID(filterStack.getItem());
String checkedId = getModID(testStack.getItem());
return keyId.equals(checkedId);
}
return false;
} }
public String getModID(Item item) { public String getModID(ItemStack stack) {
ResourceLocation resource = ForgeRegistries.ITEMS.getKey(item); String modid = stack.getItem().getCreatorModId(stack);
return resource.getResourceDomain(); return modid == null ? "" : modid;
} }
} }