Merge remote-tracking branch 'origin/better-bookmark' into dev

src/main/java/codechicken/nei/AnimatedItemStack.java

@@ -0,0 +1,67 @@
+package codechicken.nei;
+
+import static codechicken.nei.ItemsGrid.SLOT_SIZE;
+
+import codechicken.nei.guihook.GuiContainerManager;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.opengl.GL11;
+
+public class AnimatedItemStack {
+
+    private static final int steep = 10;
+    private static final float scaleSpeed = 0.1f;
+
+    private int lastPosX = -1;
+    private int lastPosY = -1;
+    private float currentScale = 0;
+    private boolean doPopAnim;
+
+    public ItemStack itemStack;
+
+    public AnimatedItemStack(ItemStack itemStack, boolean doPopAnim) {
+        this.itemStack = itemStack;
+        this.doPopAnim = doPopAnim;
+    }
+
+    public void drawItem(int x, int y) {
+        drawItem(x, y, false, null);
+    }
+
+    public void drawItem(int x, int y, boolean smallAmount, String stackSize) {
+        if (doPopAnim && currentScale < 1) {
+            drawPoppingItem(x, y, smallAmount, stackSize);
+        } else if (lastPosX != x || lastPosY != y) {
+            drawMovingItem(x, y, smallAmount, stackSize);
+        } else {
+            GuiContainerManager.drawItem(x, y, itemStack, smallAmount, stackSize);
+        }
+    }
+
+    private void drawPoppingItem(int x, int y, boolean smallAmount, String stackSize) {
+        currentScale += scaleSpeed;
+        GL11.glScalef(currentScale, currentScale, currentScale); // push & pop matrix crashes the game
+        GuiContainerManager.drawItem(
+                (int) ((x + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                (int) ((y + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                itemStack,
+                smallAmount,
+                stackSize);
+        GL11.glScalef(1 / currentScale, 1 / currentScale, 1 / currentScale);
+    }
+
+    private void drawMovingItem(int x, int y, boolean smallAmount, String stackSize) {
+        if (lastPosX != -1 && lastPosY != -1) {
+            int xDiff = x - lastPosX;
+            int yDiff = y - lastPosY;
+            int moveX = xDiff / steep + ((xDiff % steep == 0) ? 0 : (xDiff > 0 ? 1 : -1));
+            int moveY = yDiff / steep + ((yDiff % steep == 0) ? 0 : (yDiff > 0 ? 1 : -1));
+            GuiContainerManager.drawItem(lastPosX + moveX, lastPosY + moveY, itemStack, smallAmount, stackSize);
+            lastPosX = lastPosX + moveX;
+            lastPosY = lastPosY + moveY;
+        } else {
+            lastPosX = x;
+            lastPosY = y;
+            GuiContainerManager.drawItem(x, y, itemStack, smallAmount, stackSize);
+        }
+    }
+}

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

@@ -1,8 +1,7 @@
 package codechicken.nei;
 
-import static codechicken.lib.gui.GuiDraw.drawRect;
-import static codechicken.lib.gui.GuiDraw.getMousePosition;
-import static codechicken.nei.NEIClientUtils.translate;
+import static codechicken.lib.gui.GuiDraw.*;
+import static codechicken.nei.NEIClientUtils.*;
 
 import codechicken.core.CommonUtils;
 import codechicken.lib.vec.Rectangle4i;
@@ -30,6 +29,7 @@ import java.util.Map;
 import javax.annotation.Nullable;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import org.apache.commons.io.IOUtils;
@@ -49,6 +49,9 @@ public class BookmarkPanel extends PanelWidget {
     protected List<BookmarkGrid> namespaces = new ArrayList<>();
     protected int activeNamespaceIndex = 0;
 
+    private BookmarkStackMeta draggedStackMeta;
+    private int draggedStackOriginIndex = -1;
+
     protected static class BookmarkStackMeta {
         public int factor;
         public BookmarkRecipeId recipeId;
@@ -207,7 +210,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,13 +223,23 @@ public class BookmarkPanel extends PanelWidget {
         }
 
         public void addItem(ItemStack stackA, BookmarkStackMeta meta) {
-            realItems.add(stackA);
+            addRealItem(stackA, true);
             metadata.add(meta);
             onGridChanged();
         }
 
+        public void addItem(ItemStack stackA, BookmarkStackMeta meta, int index) {
+            if (index == -1) {
+                addItem(stackA, meta);
+                return;
+            }
+            addRealItem(index, stackA, true);
+            metadata.add(index, meta);
+            onGridChanged();
+        }
+
         public void replaceItem(int idx, ItemStack stack) {
-            realItems.set(idx, stack);
+            setRealItem(idx, stack, true);
             onGridChanged();
         }
 
@@ -318,12 +331,13 @@ public class BookmarkPanel extends PanelWidget {
                 final ItemStack stack = getItem(idx);
                 final BookmarkStackMeta meta = getMetadata(idx);
 
-                GuiContainerManager.drawItem(
-                        rect.x + 1,
-                        rect.y + 1,
-                        stack,
-                        true,
-                        meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize));
+                realItems
+                        .get(idx)
+                        .drawItem(
+                                rect.x + 1,
+                                rect.y + 1,
+                                true,
+                                meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize));
 
                 if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
                     drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
@@ -407,12 +421,26 @@ public class BookmarkPanel extends PanelWidget {
         addOrRemoveItem(stackA, null, null, false, false);
     }
 
+    public void addOrRemoveItem(ItemStack stackA, int index) {
+        addOrRemoveItem(stackA, null, null, false, false, index);
+    }
+
     public void addOrRemoveItem(
             ItemStack stackover,
             final String handlerName,
             final List<PositionedStack> ingredients,
             boolean saveIngredients,
             boolean saveStackSize) {
+        addOrRemoveItem(stackover, handlerName, ingredients, saveIngredients, saveStackSize, -1);
+    }
+
+    public void addOrRemoveItem(
+            ItemStack stackover,
+            final String handlerName,
+            final List<PositionedStack> ingredients,
+            boolean saveIngredients,
+            boolean saveStackSize,
+            int addIndex) {
         loadBookmarksIfNeeded();
 
         final Point mousePos = getMousePosition();
@@ -462,7 +490,8 @@ public class BookmarkPanel extends PanelWidget {
                                         recipeId != null ? recipeId.copy() : null,
                                         (saveStackSize ? 1 : -1) * count,
                                         true,
-                                        nbTag.hasKey("gtFluidName")));
+                                        nbTag.hasKey("gtFluidName")),
+                                addIndex);
                     }
                 }
 
@@ -472,7 +501,8 @@ public class BookmarkPanel extends PanelWidget {
                                 recipeId,
                                 (saveStackSize ? 1 : -1) * nbTagA.getInteger("Count"),
                                 false,
-                                nbTagA.hasKey("gtFluidName")));
+                                nbTagA.hasKey("gtFluidName")),
+                        addIndex);
             }
         }
 
@@ -863,8 +893,8 @@ public class BookmarkPanel extends PanelWidget {
 
     @Override
     public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
-
-        if (button == 0 && NEIClientUtils.shiftKey() && mouseDownSlot >= 0) {
+        // legacy sort
+        if (button == 0 && NEIClientUtils.shiftKey() && mouseDownSlot >= 0 && draggedStack == null) {
             ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
 
             if (sortedStackIndex == -1) {
@@ -935,7 +965,80 @@ public class BookmarkPanel extends PanelWidget {
             return;
         }
 
-        super.mouseDragged(mousex, mousey, button, heldTime);
+        if (mouseDownSlot >= 0
+                && draggedStack == null
+                && NEIClientUtils.getHeldItem() == null
+                && NEIClientConfig.hasSMPCounterPart()) {
+            ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
+
+            if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
+                draggedStack = getDraggedStackWithQuantity(mouseDownSlot);
+                draggedStackMeta = ((BookmarkGrid) grid).getMetadata(mouseDownSlot);
+                draggedStackOriginIndex = mouseDownSlot;
+                ((BookmarkGrid) grid).removeItem(mouseDownSlot);
+                saveBookmarks();
+                fixCountOfNamespaces();
+                mouseDownSlot = -1;
+            }
+        }
+    }
+
+    @Override
+    public void update() {
+        int mouseX = getMousePosition().x;
+        int mouseY = getMousePosition().y;
+        if (draggedStack != null) {
+
+            if (!contains(mouseX, mouseY)) {
+                if (sortedStackIndex != -1 && sortedStackIndex < grid.realItems.size()) {
+                    ((BookmarkGrid) grid).removeItem(sortedStackIndex);
+                    sortedStackIndex = -1;
+                }
+            } else {
+                ItemPanelSlot mouseOverSlot = getSlotMouseOver(mouseX, mouseY);
+                if (sortedStackIndex == -1) {
+                    sortedNamespaceIndex = activeNamespaceIndex;
+                    if (mouseOverSlot != null) {
+                        sortedStackIndex = mouseOverSlot.slotIndex;
+                    } else {
+                        sortedStackIndex = grid.size();
+                    }
+                    // dummy item
+                    addOrRemoveItem(
+                            new ItemStack(Items.paper).setStackDisplayName("this is a dummy item"), sortedStackIndex);
+                } else if (mouseOverSlot != null && mouseOverSlot.slotIndex != sortedStackIndex) {
+                    final BookmarkGrid sortedGrid = namespaces.get(sortedNamespaceIndex);
+                    if (sortedStackIndex >= grid.size()) sortedStackIndex = grid.size() - 1;
+                    if (sortedGrid.getViewMode() == BookmarkViewMode.DEFAULT) {
+                        sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
+                        sortedStackIndex = mouseOverSlot.slotIndex;
+                    } else if (sortedGrid.getViewMode() == BookmarkViewMode.TODO_LIST) {
+                        final ItemStack stack = sortedGrid.getItem(sortedStackIndex);
+                        final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
+                        final boolean isIngredient = sortedStackIndex > 0
+                                && meta.recipeId != null
+                                && meta.ingredient
+                                && meta.recipeId.equals(sortedGrid.getRecipeId(sortedStackIndex - 1));
+
+                        if (!isIngredient) {
+                            mouseOverSlot = getSlotMouseOver(grid.marginLeft + grid.paddingLeft, mouseY);
+
+                            if (mouseOverSlot != null && sortedStackIndex != mouseOverSlot.slotIndex) {
+                                sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
+                                sortedStackIndex = sortedGrid.indexOf(stack, meta.recipeId);
+                            }
+
+                        } else if (meta.recipeId != null
+                                && sortedGrid.getMetadata(mouseOverSlot.slotIndex).ingredient
+                                && meta.recipeId.equals(sortedGrid.getRecipeId(mouseOverSlot.slotIndex))) {
+                            sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
+                            sortedStackIndex = sortedGrid.indexOf(stack, meta.recipeId);
+                        }
+                    }
+                }
+            }
+        }
+        super.update();
     }
 
     private ItemPanelSlot getNextSlot(int mousex, int mousey, boolean line) {
@@ -960,7 +1063,8 @@ public class BookmarkPanel extends PanelWidget {
     @Override
     public void postDraw(int mousex, int mousey) {
 
-        if (sortedStackIndex != -1) {
+        // legacy sort
+        if (sortedStackIndex != -1 && shiftKey() && draggedStack == null) {
             GuiContainerManager.drawItems.zLevel += 100;
             GuiContainerManager.drawItem(
                     mousex - 8,
@@ -996,6 +1100,39 @@ public class BookmarkPanel extends PanelWidget {
         }
     }
 
+    @Override
+    protected boolean handleDraggedClick(int mouseX, int mouseY, int button) {
+        if (contains(mouseX, mouseY)) {
+            ((BookmarkGrid) grid).removeItem(sortedStackIndex);
+            if (draggedStackMeta != null) {
+                ((BookmarkGrid) grid).addItem(draggedStack, draggedStackMeta, sortedStackIndex);
+                fixCountOfNamespaces();
+                saveBookmarks();
+            } else addOrRemoveItem(draggedStack, sortedStackIndex);
+            sortedStackIndex = -1;
+            draggedStack = null;
+            draggedStackMeta = null;
+            draggedStackOriginIndex = -1;
+            return true;
+        }
+        return false;
+    }
+
+    public void restoreBookmark() {
+        if (draggedStack != null && draggedStackOriginIndex != -1) {
+            if (sortedStackIndex != -1) ((BookmarkGrid) grid).removeItem(sortedStackIndex);
+            if (draggedStackMeta != null) {
+                ((BookmarkGrid) grid).addItem(draggedStack, draggedStackMeta, draggedStackOriginIndex);
+                fixCountOfNamespaces();
+                saveBookmarks();
+            } else addOrRemoveItem(draggedStack, draggedStackOriginIndex);
+            sortedStackIndex = -1;
+            draggedStack = null;
+            draggedStackMeta = null;
+            draggedStackOriginIndex = -1;
+        }
+    }
+
     @Override
     public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
 
@@ -1009,8 +1146,7 @@ public class BookmarkPanel extends PanelWidget {
 
     @Override
     public void mouseUp(int mousex, int mousey, int button) {
-        if (sortedStackIndex != -1) {
-            draggedStack = null;
+        if (sortedStackIndex != -1 && draggedStack == null) {
             sortedNamespaceIndex = -1;
             sortedStackIndex = -1;
             mouseDownSlot = -1;
@@ -1089,4 +1225,9 @@ public class BookmarkPanel extends PanelWidget {
             BGrid.replaceItem(slotIndex, StackInfo.loadFromNBT(nbTag));
         }
     }
+
+    public void deleteDraggedMeta() {
+        draggedStackMeta = null;
+        draggedStackOriginIndex = -1;
+    }
 }

src/main/java/codechicken/nei/ItemPanel.java

@@ -57,7 +57,8 @@ public class ItemPanel extends PanelWidget {
         public void refresh(GuiContainer gui) {
 
             if (newItems != null) {
-                realItems = newItems;
+                realItems.clear();
+                addRealItems(newItems, false);
                 newItems = null;
                 onGridChanged();
             }

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

@@ -9,7 +9,9 @@ import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.recipe.StackInfo;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
@@ -31,7 +33,7 @@ public class ItemsGrid {
 
     protected int paddingLeft;
 
-    protected ArrayList<ItemStack> realItems = new ArrayList<>();
+    protected ArrayList<AnimatedItemStack> realItems = new ArrayList<>();
 
     protected int page;
     protected int perPage;
@@ -49,11 +51,27 @@ public class ItemsGrid {
     protected boolean refreshBuffer = true;
 
     public ArrayList<ItemStack> getItems() {
-        return realItems;
+        return realItems.stream().map(e -> e.itemStack).collect(Collectors.toCollection(ArrayList::new));
     }
 
     public ItemStack getItem(int idx) {
-        return realItems.get(idx);
+        return realItems.get(idx).itemStack;
+    }
+
+    protected void addRealItems(Collection<ItemStack> itemStack, boolean doPopAnim) {
+        itemStack.forEach(e -> addRealItem(e, doPopAnim));
+    }
+
+    protected void addRealItem(ItemStack itemStack, boolean doPopAnim) {
+        realItems.add(new AnimatedItemStack(itemStack, doPopAnim));
+    }
+
+    protected void addRealItem(int index, ItemStack itemStack, boolean doPopAnim) {
+        realItems.add(index, new AnimatedItemStack(itemStack, doPopAnim));
+    }
+
+    protected void setRealItem(int index, ItemStack itemStack, boolean doPopAnim) {
+        realItems.set(index, new AnimatedItemStack(itemStack, doPopAnim));
     }
 
     public int size() {
@@ -63,7 +81,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;
             }
         }
@@ -317,7 +335,7 @@ public class ItemsGrid {
     }
 
     protected void drawItem(Rectangle4i rect, int idx) {
-        GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, getItem(idx));
+        realItems.get(idx).drawItem(rect.x + 1, rect.y + 1);
     }
 
     public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {

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

@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 public abstract class PanelWidget extends Widget {
     protected static final int PADDING = 2;
 
-    public ItemStack draggedStack;
+    public static ItemStack draggedStack;
     public int mouseDownSlot = -1;
 
     public Button pagePrev;
@@ -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,14 +240,30 @@ public abstract class PanelWidget extends Widget {
 
     @Override
     public boolean handleClickExt(int mouseX, int mouseY, int button) {
-        if (ItemPanels.itemPanel.draggedStack != null) {
-            return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
-        }
+        if (draggedStack != null) {
+            boolean succeed = ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button)
+                    || ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
+            if (succeed) return true;
 
-        if (ItemPanels.bookmarkPanel.draggedStack != null) {
-            return ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button);
-        }
+            if (handleGUIContainerClick(draggedStack, mouseX, mouseY, button)) {
+                if (draggedStack.stackSize == 0) {
+                    ItemPanels.bookmarkPanel.restoreBookmark();
+                    draggedStack = null;
+                }
 
+                return true;
+            }
+
+            final GuiContainer gui = NEIClientUtils.getGuiContainer();
+            if (mouseX < gui.guiLeft
+                    || mouseY < gui.guiTop
+                    || mouseX >= gui.guiLeft + gui.xSize
+                    || mouseY >= gui.guiTop + gui.ySize) {
+                ItemPanels.bookmarkPanel.deleteDraggedMeta();
+                draggedStack = null;
+                return true;
+            }
+        }
         if (NEIClientUtils.getHeldItem() != null) {
             final ItemStack draggedStack = NEIClientUtils.getHeldItem().copy();
             return handleGUIContainerClick(draggedStack, mouseX, mouseY, button);
@@ -258,28 +273,7 @@ public abstract class PanelWidget extends Widget {
     }
 
     protected boolean handleDraggedClick(int mouseX, int mouseY, int button) {
-        if (draggedStack == null) {
-            return false;
-        }
-
-        if (handleGUIContainerClick(draggedStack, mouseX, mouseY, button)) {
-
-            if (draggedStack.stackSize == 0) {
-                draggedStack = null;
-            }
-
-            return true;
-        }
-
-        final GuiContainer gui = NEIClientUtils.getGuiContainer();
-        if (mouseX < gui.guiLeft
-                || mouseY < gui.guiTop
-                || mouseX >= gui.guiLeft + gui.xSize
-                || mouseY >= gui.guiTop + gui.ySize) {
-            draggedStack = null;
-        }
-
-        return true;
+        return false;
     }
 
     protected boolean handleGUIContainerClick(final ItemStack draggedStack, int mouseX, int mouseY, int button) {