fix bookmarks (#307)

Co-authored-by: slprime <[email protected]>

dependencies.gradle

@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
-    compile('com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev')
+    compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev')
+    compile('com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev')
     shadowImplementation('org.apache.commons:commons-csv:1.8')
 }

src/main/java/codechicken/nei/BookmarkPanel.java

@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.WeakHashMap;
 import javax.annotation.Nullable;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -70,8 +71,11 @@ public class BookmarkPanel extends PanelWidget {
 
     protected static class BookmarkGrid extends ItemsGrid {
 
+        protected static final float SCALE_SPEED = 0.1f;
+
         protected List<List<Integer>> gridMask;
         protected List<BookmarkStackMeta> metadata = new ArrayList<>();
+        protected WeakHashMap<ItemStack, Float> animation = new WeakHashMap<>();
 
         protected BookmarkViewMode viewMode = BookmarkViewMode.DEFAULT;
         protected boolean[] todoSpaces;
@@ -207,7 +211,7 @@ public class BookmarkPanel extends PanelWidget {
                 final BookmarkStackMeta meta = getMetadata(idx);
                 if ((recipeId == null && meta.recipeId == null
                                 || recipeId != null && meta.recipeId != null && recipeId.equals(meta.recipeId))
-                        && StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
+                        && StackInfo.equalItemAndNBT(stackA, getItem(idx), useNBT)) {
                     return idx;
                 }
             }
@@ -220,8 +224,17 @@ public class BookmarkPanel extends PanelWidget {
         }
 
         public void addItem(ItemStack stackA, BookmarkStackMeta meta) {
+            addItem(stackA, meta, true);
+        }
+
+        public void addItem(ItemStack stackA, BookmarkStackMeta meta, boolean animate) {
             realItems.add(stackA);
             metadata.add(meta);
+
+            if (animate && !NEIClientConfig.shouldCacheItemRendering() && NEIClientConfig.areBookmarksAnimated()) {
+                animation.put(stackA, 0f);
+            }
+
             onGridChanged();
         }
 
@@ -253,6 +266,7 @@ public class BookmarkPanel extends PanelWidget {
         }
 
         protected boolean removeItem(int idx) {
+            animation.remove(getItem(idx));
             realItems.remove(idx);
             metadata.remove(idx);
             onGridChanged();
@@ -317,20 +331,36 @@ public class BookmarkPanel extends PanelWidget {
                     || LayoutManager.bookmarkPanel.sortedStackIndex != idx) {
                 final ItemStack stack = getItem(idx);
                 final BookmarkStackMeta meta = getMetadata(idx);
+                final String stackSize = meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize);
 
-                GuiContainerManager.drawItem(
-                        rect.x + 1,
-                        rect.y + 1,
-                        stack,
-                        true,
-                        meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize));
+                if (animation.containsKey(stack) && animation.get(stack) < 1) {
+                    final float currentScale = animation.get(stack) + SCALE_SPEED;
+                    animation.put(stack, currentScale);
+                    drawPoppingItem(rect, stack, stackSize, currentScale);
+                } else {
 
-                if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
-                    drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
+                    GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, stack, true, stackSize);
+
+                    if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
+                        drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
+                    }
                 }
             }
         }
 
+        protected void drawPoppingItem(Rectangle4i rect, ItemStack stack, String stackSize, float currentScale) {
+            GL11.glScalef(currentScale, currentScale, currentScale); // push & pop matrix crashes the game
+
+            GuiContainerManager.drawItem(
+                    Math.round((rect.x + 1 + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                    Math.round((rect.y + 1 + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                    stack,
+                    true,
+                    stackSize);
+
+            GL11.glScalef(1 / currentScale, 1 / currentScale, 1 / currentScale);
+        }
+
         protected void drawRecipeMarker(int offsetX, int offsetY, FontRenderer fontRenderer) {
             final float scaleFactor = fontRenderer.getUnicodeFlag() ? 0.85f : 0.5f;
             final float inverseScaleFactor = 1.0f / scaleFactor;
@@ -739,7 +769,8 @@ public class BookmarkPanel extends PanelWidget {
                                                             .get("ingredient")
                                                             .getAsBoolean()
                                                     : false,
-                                            itemStackNBT.hasKey("gtFluidName")));
+                                            itemStackNBT.hasKey("gtFluidName")),
+                                    false);
                 } else {
                     NEIClientConfig.logger.warn(
                             "Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}",
@@ -883,17 +914,12 @@ public class BookmarkPanel extends PanelWidget {
                     final BookmarkGrid hoverGrid = namespaces.get(activeNamespaceIndex);
                     final BookmarkGrid sortedGrid = namespaces.get(sortedNamespaceIndex);
 
-                    if (mouseOverSlot == null) {
-                        mouseOverSlot =
-                                getNextSlot(mousex, mousey, hoverGrid.getViewMode() == BookmarkViewMode.TODO_LIST);
-                    }
-
-                    if (mouseOverSlot != null) {
+                    if (mouseOverSlot != null || getNextSlot(new Point(mousex, mousey)) >= 0) {
                         final ItemStack stack = sortedGrid.getItem(sortedStackIndex);
                         final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
 
                         sortedGrid.removeItem(sortedStackIndex);
-                        hoverGrid.addItem(stack, meta);
+                        hoverGrid.addItem(stack, meta, false);
 
                         sortedNamespaceIndex = activeNamespaceIndex;
                         sortedStackIndex = hoverGrid.indexOf(stack, meta.recipeId);
@@ -938,23 +964,24 @@ public class BookmarkPanel extends PanelWidget {
         super.mouseDragged(mousex, mousey, button, heldTime);
     }
 
-    private ItemPanelSlot getNextSlot(int mousex, int mousey, boolean line) {
+    private int getNextSlot(final Point point) {
         final List<Integer> mask = grid.getMask();
         final int columns = grid.getColumns();
         final int perPage = grid.getRows() * columns;
+        final boolean line = ((BookmarkGrid) grid).getViewMode() == BookmarkViewMode.TODO_LIST;
 
         for (int i = mask.size(); i < perPage; i++) {
             if (!grid.isInvalidSlot(i) && (!line || (i % columns) == 0)) {
 
-                if (grid.getSlotRect(i).contains(mousex, mousey)) {
-                    return new ItemPanelSlot(grid.size() - 1, null);
+                if (point == null || grid.getSlotRect(i).contains(point.x, point.y)) {
+                    return i;
                 }
 
-                return null;
+                return -1;
             }
         }
 
-        return null;
+        return -1;
     }
 
     @Override
@@ -973,6 +1000,15 @@ public class BookmarkPanel extends PanelWidget {
             GuiContainerManager.drawItems.zLevel -= 100;
         }
 
+        if (ItemPanels.itemPanel.draggedStack != null && this.contains(mousex, mousey)) {
+            final int idx = getNextSlot(null);
+
+            if (idx >= 0) {
+                Rectangle4i rect = grid.getSlotRect(idx);
+                drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555); // highlight
+            }
+        }
+
         super.postDraw(mousex, mousey);
     }
 

src/main/java/codechicken/nei/ItemsGrid.java

@@ -63,7 +63,7 @@ public class ItemsGrid {
     public int indexOf(ItemStack stackA, boolean useNBT) {
 
         for (int idx = 0; idx < realItems.size(); idx++) {
-            if (StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
+            if (StackInfo.equalItemAndNBT(stackA, getItem(idx), useNBT)) {
                 return idx;
             }
         }

src/main/java/codechicken/nei/NEIClientConfig.java

@@ -237,6 +237,10 @@ public class NEIClientConfig {
                 .setComment("Use NBT in Bookmarks")
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.useNBTInBookmarks", true));
+        tag.getTag("inventory.bookmarksAnimationEnabled")
+                .setComment("REI Style Animation in Bookmarks")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.bookmarksAnimationEnabled", true));
         tag.getTag("inventory.showRecipeMarker")
                 .setComment("Show Recipe Marker")
                 .getBooleanValue(false);
@@ -344,6 +348,8 @@ public class NEIClientConfig {
         API.addHashBind("gui.overlay_use", Keyboard.KEY_S + NEIClientUtils.SHIFT_HASH);
         API.addHashBind("gui.overlay_hide", Keyboard.KEY_S + NEIClientUtils.CTRL_HASH);
         API.addHashBind("gui.hide_bookmarks", Keyboard.KEY_B);
+        API.addKeyBind("gui.getprevioussearch", Keyboard.KEY_UP);
+        API.addKeyBind("gui.getnextsearch", Keyboard.KEY_DOWN);
 
         API.addKeyBind("world.chunkoverlay", Keyboard.KEY_F9);
         API.addKeyBind("world.moboverlay", Keyboard.KEY_F7);
@@ -502,6 +508,10 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.useNBTInBookmarks");
     }
 
+    public static boolean areBookmarksAnimated() {
+        return getBooleanSetting("inventory.bookmarksAnimationEnabled");
+    }
+
     public static boolean showRecipeMarker() {
         return getBooleanSetting("inventory.showRecipeMarker");
     }

src/main/java/codechicken/nei/PanelWidget.java

@@ -183,8 +183,7 @@ public abstract class PanelWidget extends Widget {
         if (mouseDownSlot >= 0
                 && draggedStack == null
                 && NEIClientUtils.getHeldItem() == null
-                && NEIClientConfig.hasSMPCounterPart()
-                && !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
+                && NEIClientConfig.hasSMPCounterPart()) {
             ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
 
             if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
@@ -241,6 +240,13 @@ public abstract class PanelWidget extends Widget {
 
     @Override
     public boolean handleClickExt(int mouseX, int mouseY, int button) {
+
+        if (ItemPanels.itemPanel.draggedStack != null && ItemPanels.bookmarkPanel.contains(mouseX, mouseY)) {
+            ItemPanels.bookmarkPanel.addOrRemoveItem(ItemPanels.itemPanel.draggedStack, null, null, false, true);
+            ItemPanels.itemPanel.draggedStack = null;
+            return true;
+        }
+
         if (ItemPanels.itemPanel.draggedStack != null) {
             return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
         }

src/main/java/codechicken/nei/SearchField.java

@@ -9,6 +9,7 @@ import codechicken.nei.ItemList.PatternItemFilter;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
+import codechicken.nei.util.TextHistory;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -45,6 +46,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
     }
 
     public static List<ISearchProvider> searchProviders = new LinkedList<>();
+    private static final TextHistory history = new TextHistory();
     private boolean isVisible = true;
 
     long lastclicktime;
@@ -116,6 +118,13 @@ public class SearchField extends TextField implements ItemFilterProvider {
         if (isVisible() && NEIClientConfig.isKeyHashDown("gui.search")) {
             setFocus(true);
         }
+        if (NEIClientConfig.isKeyHashDown("gui.getprevioussearch") && focused()) {
+            handleNavigateHistory(TextHistory.Direction.PREVIOUS);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.getnextsearch") && focused()) {
+            handleNavigateHistory(TextHistory.Direction.NEXT);
+        }
     }
 
     @Override
@@ -156,4 +165,26 @@ public class SearchField extends TextField implements ItemFilterProvider {
         if (!secondary.isEmpty()) return new AnyMultiItemFilter(secondary);
         return new EverythingItemFilter();
     }
+
+    @Override
+    public void setFocus(boolean focus) {
+        final boolean previousFocus = field.isFocused();
+
+        if (previousFocus != focus) {
+            history.add(text());
+        }
+        super.setFocus(focus);
+    }
+
+    private boolean handleNavigateHistory(TextHistory.Direction direction) {
+        if (focused()) {
+            return history.get(direction, text())
+                    .map(newText -> {
+                        setText(newText);
+                        return true;
+                    })
+                    .orElse(false);
+        }
+        return false;
+    }
 }

src/main/java/codechicken/nei/api/INEIGuiAdapter.java

@@ -3,13 +3,18 @@ package codechicken.nei.api;
 import codechicken.nei.VisiblityData;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 
 /**
  * Lets you just override those things you want to
  */
 public class INEIGuiAdapter implements INEIGuiHandler {
+
+    static final Pattern SPECIAL_REGEX_CHARS = Pattern.compile("[{}()\\[\\].+*?^$\\\\|]");
+
     @Override
     public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
         return currentVisibility;
@@ -34,4 +39,10 @@ public class INEIGuiAdapter implements INEIGuiHandler {
     public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
         return false;
     }
+
+    protected String formattingText(String displayName) {
+        return SPECIAL_REGEX_CHARS
+                .matcher(EnumChatFormatting.getTextWithoutFormattingCodes(displayName))
+                .replaceAll("\\\\$0");
+    }
 }

src/main/java/codechicken/nei/drawable/GuiElementDuex.java

@@ -3,6 +3,7 @@ package codechicken.nei.drawable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.gui.GuiScreen;
+import org.lwjgl.opengl.GL11;
 
 /*
 * Taken from Mantle 1.12-1.3.3.49 under the MIT License
@@ -70,6 +71,7 @@ public class GuiElementDuex {
      */
     public int draw(int xPos, int yPos) {
         // drawModalRectWithCustomSizedTexture
+        GL11.glColor4f(1, 1, 1, 1);
         GuiScreen.func_146110_a(xPos, yPos, x, y, w, h, texW, texH);
         return w;
     }

src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java

@@ -3,16 +3,12 @@ package codechicken.nei.recipe;
 import static codechicken.nei.LayoutManager.searchField;
 
 import codechicken.nei.api.INEIGuiAdapter;
-import java.util.regex.Pattern;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
 
 public class SearchInputDropHandler extends INEIGuiAdapter {
 
-    protected static final Pattern SPECIAL_REGEX_CHARS = Pattern.compile("[{}()\\[\\].+*?^$\\\\|]");
-
     @Override
     public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
 
@@ -30,10 +26,4 @@ public class SearchInputDropHandler extends INEIGuiAdapter {
 
         return false;
     }
-
-    protected String formattingText(String displayName) {
-        return SPECIAL_REGEX_CHARS
-                .matcher(EnumChatFormatting.getTextWithoutFormattingCodes(displayName))
-                .replaceAll("\\\\$0");
-    }
 }

src/main/java/codechicken/nei/util/TextHistory.java

@@ -0,0 +1,69 @@
+package codechicken.nei.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Backported from JustEnoughItems/Core/src/main/java/mezz/jei/core/util/TextHistory.java
+ */
+public class TextHistory {
+    private static final int MAX_HISTORY = 100;
+
+    public enum Direction {
+        NEXT,
+        PREVIOUS
+    }
+
+    private final List<String> history = new ArrayList<>();
+
+    public boolean add(String currentText) {
+        if (currentText.length() > 0) {
+            history.remove(currentText);
+            history.add(currentText);
+            if (history.size() > MAX_HISTORY) {
+                history.remove(0);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public Optional<String> get(Direction direction, String currentText) {
+        if (direction == direction.NEXT) {
+            return getNext(currentText);
+        } else {
+            return getPrevious(currentText);
+        }
+    }
+
+    public Optional<String> getPrevious(String currentText) {
+        int historyIndex = history.indexOf(currentText);
+        if (historyIndex < 0) {
+            if (add(currentText)) {
+                historyIndex = history.size() - 1;
+            } else {
+                historyIndex = history.size();
+            }
+        }
+        if (historyIndex <= 0) {
+            return Optional.empty();
+        }
+        String value = history.get(historyIndex - 1);
+        return Optional.of(value);
+    }
+
+    public Optional<String> getNext(String currentText) {
+        int historyIndex = history.indexOf(currentText);
+        if (historyIndex < 0) {
+            return Optional.empty();
+        }
+        final String historyString;
+        if (historyIndex + 1 < history.size()) {
+            historyString = history.get(historyIndex + 1);
+        } else {
+            historyString = "";
+        }
+        return Optional.of(historyString);
+    }
+}

src/main/resources/assets/nei/csv/catalysts.csv

@@ -8,6 +8,7 @@ advsolar.client.nei.MTRecipeHandler,AdvancedSolarPanel:BlockMolecularTransformer
 crafting,appliedenergistics2:item.ItemMultiPart:360,,appliedenergistics2,TRUE,,,,,,
 appeng.integration.modules.NEIHelpers.NEIGrinderRecipeHandler,appliedenergistics2:tile.BlockGrinder,,appliedenergistics2,TRUE,dreamcraft,,,,,
 appeng.integration.modules.NEIHelpers.NEIInscriberRecipeHandler,appliedenergistics2:tile.BlockInscriber,,appliedenergistics2,TRUE,,,,,,
+appeng.integration.modules.NEIHelpers.NEIInscriberRecipeHandler,ae2stuff:Inscriber,,ae2stuff,TRUE,,,,,,
 fox.spiteful.avaritia.compat.nei.CompressionHandler,Avaritia:Neutronium_Compressor,,Avaritia,TRUE,,,,,,
 extreme,Avaritia:Dire_Crafting,,Avaritia,TRUE,,,,,,
 extreme,avaritiaddons:ExtremeAutoCrafter,,avaritiaddons,TRUE,,,,,,

src/main/resources/assets/nei/lang/en_US.lang

@@ -106,6 +106,8 @@ nei.options.keys.gui.hide_bookmarks=Toggle Bookmark Panel Visibility
 nei.options.keys.gui.overlay=Overlay Recipe
 nei.options.keys.gui.overlay_hide=Hide Overlay Recipe
 nei.options.keys.gui.overlay_use=Use Overlay Recipe
+nei.options.keys.gui.getprevioussearch=Previous Search
+nei.options.keys.gui.getnextsearch=Next Search
 nei.options.keys.world=World
 nei.options.keys.world.chunkoverlay=Chunk Boundary Overlay
 nei.options.keys.world.moboverlay=Mob Spawn Overlay
@@ -144,6 +146,9 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=Disabled
 nei.options.inventory.useNBTInBookmarks=Use NBT in Bookmarks
 nei.options.inventory.useNBTInBookmarks.true=Yes
 nei.options.inventory.useNBTInBookmarks.false=No
+nei.options.inventory.bookmarksAnimationEnabled=REI Style Animation in Bookmarks
+nei.options.inventory.bookmarksAnimationEnabled.true=Yes
+nei.options.inventory.bookmarksAnimationEnabled.false=No
 nei.options.inventory.showRecipeMarker=Show Recipe Marker
 nei.options.inventory.showRecipeMarker.true=Yes
 nei.options.inventory.showRecipeMarker.false=No

src/main/resources/assets/nei/lang/zh_CN.lang

@@ -8,6 +8,10 @@ nei.key.ctrl.mac=CMD
 
 nei.bookmark.toggle=书签
 nei.bookmark.toggle.tip=显示/隐藏书签页
+nei.bookmark.viewmode.toggle.tip=切换书签栏浏览模式
+
+nei.itempanel.quantity.default=一组
+nei.itempanel.loading=物品列表加载中...
 
 nei.enchant=附魔
 nei.enchant.level=等级
@@ -66,7 +70,8 @@ nei.chat.rain.on=开启雨雪
 nei.chat.rain.off=关闭雨雪
 nei.chat.time=白天 %d. %d:00
 nei.chat.give.noitem=没有此物品
-nei.chat.recipe.error=加载合成表过程中出现错误.请查看log文件获取详细信息.
+nei.chat.recipe.error=加载合成表过程中出现错误.请查看日志了解详情.
+nei.chat.render.error=渲染物品过程中出现错误.请查看日志了解详情.
 
 nei.options=NEI选项
 nei.options.back=后退
@@ -94,8 +99,15 @@ nei.options.keys.gui.next_machine=下一机器
 nei.options.keys.gui.prev_machine=上一机器
 nei.options.keys.gui.search=跳转到搜索框
 nei.options.keys.gui.bookmark=添加书签
+nei.options.keys.gui.bookmark_recipe=添加带有合成表的书签
+nei.options.keys.gui.bookmark_count=添加带有数量的书签
+nei.options.keys.gui.bookmark_recipe_count=添加带有合成表和数量的书签
 nei.options.keys.gui.hide_bookmarks=显示/隐藏书签页
 nei.options.keys.gui.overlay=提取合成表至合成栏/工作台
+nei.options.keys.gui.overlay_hide=隐藏覆盖合成表
+nei.options.keys.gui.overlay_use=使用覆盖合成表
+nei.options.keys.gui.getprevioussearch=上一个搜索
+nei.options.keys.gui.getnextsearch=下一个搜索
 nei.options.keys.world=世界
 nei.options.keys.world.chunkoverlay=区块(chunks)边界显示
 nei.options.keys.world.moboverlay=刷怪区域显示
@@ -134,12 +146,21 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=禁用
 nei.options.inventory.useNBTInBookmarks=在书签中启用NBT
 nei.options.inventory.useNBTInBookmarks.true=是
 nei.options.inventory.useNBTInBookmarks.false=否
+nei.options.inventory.bookmarksAnimationEnabled=REI风格书签动画
+nei.options.inventory.bookmarksAnimationEnabled.true=是
+nei.options.inventory.bookmarksAnimationEnabled.false=否
 nei.options.inventory.showRecipeMarker=在书签栏显示合成产物标记
 nei.options.inventory.showRecipeMarker.true=是
 nei.options.inventory.showRecipeMarker.false=否
+nei.options.inventory.showItemQuantityWidget=显示物品数量栏(右下角)
+nei.options.inventory.showItemQuantityWidget.true=是
+nei.options.inventory.showItemQuantityWidget.false=否
 nei.options.inventory.creative_tab_style=创造模式/JEI标签页
 nei.options.inventory.creative_tab_style.true=创造模式
 nei.options.inventory.creative_tab_style.false=JEI
+nei.options.inventory.ignore_potion_overlap=忽略书签与药水效果重叠
+nei.options.inventory.ignore_potion_overlap.true=忽略
+nei.options.inventory.ignore_potion_overlap.false=规避
 nei.options.inventory.widgetsenabled.true=激活NEI
 nei.options.inventory.widgetsenabled.false=禁用NEI
 nei.options.inventory.cheatmode.0=合成模式

src/main/resources/dependencies.info

@@ -1,7 +1,7 @@
 {
-        "repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.3/",
-        "file": "CodeChickenLib-1.7.10-1.1.5.3.jar",
-        "dev": "CodeChickenLib-1.7.10-1.1.5.3-dev.jar",
+        "repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.5/",
+        "file": "CodeChickenLib-1.7.10-1.1.5.5.jar",
+        "dev": "CodeChickenLib-1.7.10-1.1.5.5-dev.jar",
         "class": "codechicken.lib.asm.ASMHelper",
         "coreLib": true
 }