diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java index c10e4d83..908bc29f 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java @@ -71,10 +71,10 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { this.registerApp(30, "MAGNET_CARD", "ME", "magnet_card.me"); this.registerApp(30, "MAGNET_CARD", "FILTER", "magnet_card.filter"); this.registerApp(31, "MAGNET_CARD", "OFF", "magnet_card.off"); - this.registerApp(33, "ENABLE_12x", "ENABLE", "enable"); - this.registerApp(34, "DISABLE_12x", "DISABLE", "disable"); - this.registerApp(36, "RESTOCK", "ENABLE", "restock.on"); - this.registerApp(37, "RESTOCK", "DISABLE", "restock.off"); + this.registerApp(32, "ENABLE_12x", "ENABLE", "enable"); + this.registerApp(33, "DISABLE_12x", "DISABLE", "disable"); + this.registerApp(34, "RESTOCK", "ENABLE", "restock.on"); + this.registerApp(35, "RESTOCK", "DISABLE", "restock.off"); } } diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java index 49755be0..d8ab3f5c 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java @@ -3,8 +3,9 @@ package com.glodblock.github.inventory.item; import static com.glodblock.github.inventory.item.WirelessMagnet.filterConfigKey; import static com.glodblock.github.inventory.item.WirelessMagnet.filterKey; -import java.util.HashMap; +import java.util.Map; import java.util.UUID; +import java.util.WeakHashMap; import java.util.function.Predicate; import net.minecraft.entity.item.EntityItem; @@ -39,7 +40,7 @@ public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory imp private boolean useOreDict; private String oreDictFilter = ""; protected Predicate filterPredicate = null; - private WirelessMagnet.ListMode listMode = WirelessMagnet.ListMode.WhiteList; + private WirelessMagnet.ListMode listMode = WirelessMagnet.ListMode.BlackList; private final AppEngInternalInventory filterInventory; private final NBTTagCompound settingCache; private final NBTTagCompound filterCache; @@ -269,7 +270,7 @@ public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory imp public static class FilterCache { - private static final HashMap cache = new HashMap<>(); + private static final Map cache = new WeakHashMap<>(); public static WirelessMagnetCardFilterInventory getFilter(ItemStack is, int slot, IGridNode gridNode, EntityPlayer player) { diff --git a/src/main/resources/assets/ae2fc/textures/gui/states3.png b/src/main/resources/assets/ae2fc/textures/gui/states3.png index 800f800d..b138d468 100644 Binary files a/src/main/resources/assets/ae2fc/textures/gui/states3.png and b/src/main/resources/assets/ae2fc/textures/gui/states3.png differ