diff --git a/gradle.properties b/gradle.properties index 13f4cb5..c5b1446 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,5 +12,5 @@ curse_requirements=bookshelf curse_project=59413 version_bookshelf=2.3.567 -version_minetweaker=4.1.9.491 -version_jei=4.13.1.220 \ No newline at end of file +version_minetweaker=4.1.20.675 +version_jei=4.13.1.220 diff --git a/src/main/java/net/darkhax/eplus/ConfigurationHandler.java b/src/main/java/net/darkhax/eplus/ConfigurationHandler.java index 0beb266..fee2ee8 100644 --- a/src/main/java/net/darkhax/eplus/ConfigurationHandler.java +++ b/src/main/java/net/darkhax/eplus/ConfigurationHandler.java @@ -10,6 +10,7 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.oredict.OreDictionary; public final class ConfigurationHandler { @@ -44,7 +45,14 @@ public static void initConfig (File configFile) { public static void buildBlacklist () { - for (final String itemString : blacklistedItems) { + for (String origString : blacklistedItems) { + + String itemString = origString; + if (!itemString.contains("#")) { + + # Default items to all metas + itemString = itemString + "#" + OreDictionary.WILDCARD_VALUE; + } final ItemStack stack = StackUtils.createStackFromString(itemString); @@ -74,4 +82,4 @@ public static void buildBlacklist () { } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/darkhax/eplus/api/Blacklist.java b/src/main/java/net/darkhax/eplus/api/Blacklist.java index 9e9c21b..2379c5d 100644 --- a/src/main/java/net/darkhax/eplus/api/Blacklist.java +++ b/src/main/java/net/darkhax/eplus/api/Blacklist.java @@ -30,7 +30,7 @@ public static boolean isItemBlacklisted (ItemStack stack) { for (final ItemStack blacklisted : BLACKLIST_ITEMS) { - if (StackUtils.areStacksSimilarWithPartialNBT(blacklisted, stack)) { + if (StackUtils.areStacksSimilar(blacklisted, stack)) { return true; } @@ -43,4 +43,4 @@ public static boolean isEnchantmentBlacklisted (Enchantment enchantment) { return BLACKLIST_ENCHANTMENTS.contains(enchantment); } -} \ No newline at end of file +} diff --git a/src/main/java/net/darkhax/eplus/compat/crt/EnchantingPlusCRT.java b/src/main/java/net/darkhax/eplus/compat/crt/EnchantingPlusCRT.java index 9ecd77b..75d1438 100644 --- a/src/main/java/net/darkhax/eplus/compat/crt/EnchantingPlusCRT.java +++ b/src/main/java/net/darkhax/eplus/compat/crt/EnchantingPlusCRT.java @@ -5,7 +5,10 @@ import crafttweaker.annotations.ZenRegister; import crafttweaker.api.enchantments.IEnchantment; import crafttweaker.api.item.IItemStack; +import crafttweaker.api.minecraft.CraftTweakerMC; import net.darkhax.eplus.api.Blacklist; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -23,7 +26,7 @@ public static void blacklistItem (IItemStack stack) { @ZenMethod public static void blacklistEnchantment (IEnchantment enchantment) { - CraftTweakerAPI.apply(new ActionBlacklist(enchantment)); + CraftTweakerAPI.apply(new ActionBlacklistEnch(enchantment)); } private static class ActionBlacklistItem implements IAction { @@ -38,7 +41,7 @@ public ActionBlacklistItem (IItemStack stack) { @Override public void apply () { - Blacklist.blacklist((ItemStack) this.item.getDefinition().getInternal()); + Blacklist.blacklist(CraftTweakerMC.getItemStack(this.item)); } @Override @@ -48,11 +51,11 @@ public String describe () { } } - private static class ActionBlacklist implements IAction { + private static class ActionBlacklistEnch implements IAction { private final IEnchantment enchantment; - public ActionBlacklist (IEnchantment enchantment) { + public ActionBlacklistEnch (IEnchantment enchantment) { this.enchantment = enchantment; } @@ -60,7 +63,7 @@ public ActionBlacklist (IEnchantment enchantment) { @Override public void apply () { - Blacklist.blacklist((ItemStack) this.enchantment.getDefinition().getInternal()); + Blacklist.blacklist((Enchantment) this.enchantment.getDefinition().getInternal()); } @Override @@ -69,4 +72,4 @@ public String describe () { return "Blacklisting " + this.enchantment.displayName() + " from E+"; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/darkhax/eplus/gui/GuiEnchantmentLabel.java b/src/main/java/net/darkhax/eplus/gui/GuiEnchantmentLabel.java index 890bbdd..0fcc2e9 100644 --- a/src/main/java/net/darkhax/eplus/gui/GuiEnchantmentLabel.java +++ b/src/main/java/net/darkhax/eplus/gui/GuiEnchantmentLabel.java @@ -109,7 +109,6 @@ public String getDisplayName () { * the enchantment being represented. * * @param xPos The xPos of the slider. - * @param baseX The previous slider position. */ public void updateSlider (int xPos) {