diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index 21263b14..cebf28d0 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -1187,7 +1187,15 @@ public class BookmarkPanel extends PanelWidget { } if (!items.isEmpty()) { - containerHandler.pullBookmarkItemsFromContainer(guiContainer, items); + final int helmStackIndex = FastTransferManager.dropHeldItem(guiContainer); + + if (guiContainer.mc.thePlayer.inventory.getItemStack() == null) { + containerHandler.pullBookmarkItemsFromContainer(guiContainer, items); + + if (helmStackIndex != -1) { + FastTransferManager.clickSlot(guiContainer, helmStackIndex, 0, 0); + } + } } return true; diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index fa50989f..45f5c56e 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -43,7 +43,6 @@ import com.google.common.collect.Lists; import codechicken.core.ClassDiscoverer; import codechicken.core.ClientUtils; -import codechicken.core.GuiModListScroll; import codechicken.lib.packet.PacketCustom; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; @@ -276,7 +275,6 @@ public class ClientHandler { public static void load() { instance = new ClientHandler(); - GuiModListScroll.register("NotEnoughItems"); PacketCustom.assignHandler(NEICPH.channel, new NEICPH()); FMLCommonHandler.instance().bus().register(instance); MinecraftForge.EVENT_BUS.register(instance); diff --git a/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java index 9f97f1e5..9c9cd21a 100644 --- a/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java +++ b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java @@ -1,7 +1,7 @@ package codechicken.nei; import java.util.ArrayList; -import java.util.LinkedList; +import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -12,36 +12,19 @@ public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandle @Override public void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList bookmarkItems) { - FastTransferManager manager = new FastTransferManager(); - LinkedList containerStacks = manager.saveContainer(guiContainer.inventorySlots); + final FastTransferManager manager = new FastTransferManager(); + final List containerStacks = getStorageStacks(guiContainer); for (ItemStack bookmarkItem : bookmarkItems) { - - int bookmarkSizeBackup = bookmarkItem.stackSize; - - for (int i = 0; i < containerStacks.size() - 4 * 9; i++) { // Last 36 slots are player inventory - ItemStack containerItem = containerStacks.get(i); - - if (containerItem == null) { - continue; - } + for (int i = 0; i < containerStacks.size() && bookmarkItem.stackSize > 0; i++) { + final ItemStack containerItem = containerStacks.get(i); if (bookmarkItem.isItemEqual(containerItem)) { - if (bookmarkItem.stackSize <= 0) { - break; - } - - int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize); - + final int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize); manager.transferItems(guiContainer, i, transferAmount); bookmarkItem.stackSize -= transferAmount; - - if (bookmarkItem.stackSize == 0) { - break; - } } } - bookmarkItem.stackSize = bookmarkSizeBackup; } } } diff --git a/src/main/java/codechicken/nei/FastTransferManager.java b/src/main/java/codechicken/nei/FastTransferManager.java index 79d8cfa5..5efa6b11 100644 --- a/src/main/java/codechicken/nei/FastTransferManager.java +++ b/src/main/java/codechicken/nei/FastTransferManager.java @@ -9,7 +9,9 @@ import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -281,6 +283,27 @@ public class FastTransferManager { GuiContainerManager.getManager(window).handleSlotClick(slotIndex, button, modifier); } + public static int dropHeldItem(GuiContainer window) { + final EntityPlayerSP player = window.mc.thePlayer; + final ItemStack held = player.inventory.getItemStack(); + + if (held == null) return -1; + + for (int i = 0; held != null && i < window.inventorySlots.inventorySlots.size(); i++) { + final Slot slot = window.inventorySlots.inventorySlots.get(i); + + if (slot.inventory instanceof InventoryPlayer && !slot.getHasStack() && slot.isItemValid(held)) { + clickSlot(window, i, 0, 0); + + if (player.inventory.getItemStack() == null) { + return i; + } + } + } + + return -1; + } + private boolean fillZoneWithHeldItem(GuiContainer window, int zoneIndex) { for (int transferTo : slotZones.get(zoneIndex)) { ItemStack held = NEIClientUtils.getHeldItem(); diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 5363c00e..da2b449a 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -986,7 +986,6 @@ public class NEIClientConfig { try { IConfigureNEI config = (IConfigureNEI) clazz.getConstructor().newInstance(); config.loadConfig(); - NEIModContainer.plugins.add(config); logger.debug("Loaded {}", clazz.getName()); } catch (Throwable e) { logger.error("Failed to Load {}", clazz.getName(), e); diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index ba0dada7..30849770 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -4,18 +4,14 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; -import net.minecraft.util.EnumChatFormatting; - import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; import codechicken.core.CommonUtils; import codechicken.core.launch.CodeChickenCorePlugin; -import codechicken.nei.api.IConfigureNEI; import codechicken.nei.asm.NEICorePlugin; import codechicken.nei.config.IMCHandler; import codechicken.nei.recipe.GuiRecipeTab; @@ -37,8 +33,6 @@ import cpw.mods.fml.common.versioning.VersionRange; public class NEIModContainer extends DummyModContainer { - public static LinkedList plugins = new LinkedList<>(); - private static boolean gregTech5Loaded; private static boolean gtnhLibLoaded; @@ -46,7 +40,6 @@ public class NEIModContainer extends DummyModContainer { public NEIModContainer() { super(getModMetadata()); - loadMetadata(); } private static ModMetadata getModMetadata() { @@ -85,30 +78,6 @@ public class NEIModContainer extends DummyModContainer { private String description; - private void loadMetadata() { - description = super.getMetadata().description.replace("Supporters:", EnumChatFormatting.AQUA + "Supporters:"); - } - - @Override - public ModMetadata getMetadata() { - StringBuilder s_plugins = new StringBuilder(); - if (plugins.size() == 0) { - s_plugins.append(EnumChatFormatting.RED).append("No installed plugins."); - } else { - s_plugins.append(EnumChatFormatting.GREEN).append("Installed plugins: "); - for (int i = 0; i < plugins.size(); i++) { - if (i > 0) s_plugins.append(", "); - IConfigureNEI plugin = plugins.get(i); - s_plugins.append(plugin.getName()).append(" ").append(plugin.getVersion()); - } - s_plugins.append("."); - } - - ModMetadata meta = super.getMetadata(); - meta.description = description.replace("", s_plugins.toString()); - return meta; - } - @Override public boolean registerBus(EventBus bus, LoadController controller) { bus.register(this); diff --git a/src/main/java/codechicken/nei/TextField.java b/src/main/java/codechicken/nei/TextField.java index 2fb71d9a..5c605302 100644 --- a/src/main/java/codechicken/nei/TextField.java +++ b/src/main/java/codechicken/nei/TextField.java @@ -89,7 +89,7 @@ public abstract class TextField extends Widget { onTextChange(oldText); } - return handled; + return handled || keyID == Keyboard.KEY_SPACE; } public abstract void onTextChange(String oldText); diff --git a/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java index 60aa6dce..bdd4b3e6 100644 --- a/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java +++ b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java @@ -15,7 +15,7 @@ public interface IBookmarkContainerHandler { for (int i = 0; i < slots.size() - 4 * 9; i++) { if (slots.get(i).getHasStack()) { - stacks.add(slots.get(i).getStack()); + stacks.add(slots.get(i).getStack().copy()); } } diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java b/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java index 89823697..b674cdb1 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkStorage.java @@ -7,7 +7,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -16,6 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import org.apache.commons.io.IOUtils; +import com.google.common.io.Files; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -137,6 +137,7 @@ public class BookmarkStorage { NBTTagCompound navigation = new NBTTagCompound(); namespaces.add(new BookmarkGrid()); BookmarkGrid grid = namespaces.get(0); + boolean wasError = false; if (NEIClientConfig.world.nbt.hasKey("bookmark")) { navigation = NEIClientConfig.world.nbt.getCompoundTag("bookmark"); @@ -151,17 +152,19 @@ public class BookmarkStorage { } if (itemStr.startsWith("; ")) { - JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject(); if (grid.size() > 0) { // do not create empty namespaces grid = new BookmarkGrid(); + + if (navigation.hasKey("namespacePage." + namespaces.size())) { + grid.setPage(navigation.getInteger("namespacePage." + namespaces.size())); + } + namespaces.add(grid); } - if (navigation.hasKey("namespacePage." + (namespaces.size() - 1))) { - grid.setPage(navigation.getInteger("namespacePage." + (namespaces.size() - 1)));; - } + final JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject(); if (settings.get("viewmode") != null) { grid.groups.get(BookmarkGrid.DEFAULT_GROUP_ID).viewMode = BookmarkViewMode @@ -196,17 +199,28 @@ public class BookmarkStorage { } if (!addItemToGrid(grid, parser.parse(itemStr).getAsJsonObject())) { + wasError = true; NEIClientConfig.logger.warn( "Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}", itemStr); } - } catch (IllegalArgumentException | JsonSyntaxException | IllegalStateException e) { + } catch (Exception e) { + wasError = true; NEIClientConfig.logger.error("Failed to load bookmarked ItemStack from json string:\n{}", itemStr); } } - prepareOldRecipeFormat(namespaces); + if (wasError) { + try { + Files.copy( + bookmarkFile, + new File(bookmarkFile.getAbsolutePath() + ".backup-" + System.currentTimeMillis())); + NEIClientConfig.logger.info("Backed up invalid bookmark file to {}", bookmarkFile); + } catch (IOException e) { + NEIClientConfig.logger.error("Failed to backup invalid bookmark file to {}", bookmarkFile, e); + } + } for (BookmarkGrid gr : namespaces) { gr.onItemsChanged(); @@ -264,48 +278,6 @@ public class BookmarkStorage { return itemStack != null; } - private void prepareOldRecipeFormat(List namespaces) { - - for (BookmarkGrid grid : namespaces) { - if (grid.bookmarkItems.stream() - .noneMatch(item -> item.recipeId != null && item.recipeId.getResult() == null)) { - continue; - } - - final Map recipes = new HashMap<>(); - - for (BookmarkItem item : grid.bookmarkItems) { - if (item.recipeId != null && item.type != BookmarkItemType.INGREDIENT - && item.recipeId.getResult() == null) { - final JsonObject recipeJson = item.recipeId.toJsonObject(); - final String recipeGUID = item.groupId + ":" + NBTJson.toJson(recipeJson); - - if (!recipes.containsKey(recipeGUID)) { - recipeJson.add("result", NBTJson.toJsonObject(StackInfo.itemStackToNBT(item.itemStack))); - recipes.put(recipeGUID, item.recipeId = RecipeId.of(recipeJson)); - } - } - } - - for (BookmarkItem item : grid.bookmarkItems) { - if (item.recipeId != null && item.recipeId.getResult() == null) { - final JsonObject recipeJson = item.recipeId.toJsonObject(); - final String recipeGUID = item.groupId + ":" + NBTJson.toJson(recipeJson); - - if (recipes.containsKey(recipeGUID)) { - item.recipeId = recipes.get(recipeGUID).copy(); - item.permutations = BookmarkItem.generatePermutations( - item.itemStack, - item.recipeId, - item.type == BookmarkItemType.INGREDIENT); - } else { - item.recipeId = null; - } - } - } - } - } - public void save() { if (this.bookmarkFile == null) { diff --git a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java index 5d1041db..9b18d619 100644 --- a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java +++ b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java @@ -6,10 +6,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.Set; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotCrafting; @@ -50,17 +50,17 @@ public class DefaultOverlayHandler implements IOverlayHandler { public Slot[] slots; } - public DefaultOverlayHandler(int x, int y) { - offsetx = x; - offsety = y; - } + public int offsetx; + public int offsety; public DefaultOverlayHandler() { this(5, 11); } - public int offsetx; - public int offsety; + public DefaultOverlayHandler(int x, int y) { + this.offsetx = x; + this.offsety = y; + } @Override public void overlayRecipe(GuiContainer gui, IRecipeHandler handler, int recipeIndex, boolean maxTransfer) { @@ -72,7 +72,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { final List ingredients = handler.getIngredientStacks(recipeIndex); final List ingredStacks = getPermutationIngredients(ingredients); - if (!clearIngredients(gui)) return 0; + if (!clearIngredients(gui, handler)) return 0; findInventoryQuantities(gui, ingredStacks); @@ -99,12 +99,17 @@ public class DefaultOverlayHandler implements IOverlayHandler { } @Override - public boolean craft(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, int multiplier) { - final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer; - boolean craft = false; + public boolean craft(GuiContainer firstGui, IRecipeHandler handler, int recipeIndex, int multiplier) { + final Slot craftingSlot = firstGui.inventorySlots.inventorySlots.stream() + .filter(slot -> slot instanceof SlotCrafting).findFirst().orElse(null); + if (craftingSlot == null) { + return false; + } + + boolean craft = false; while (multiplier > 0) { - final int transfer = transferRecipe(firstGui, recipe, recipeIndex, multiplier); + final int transfer = transferRecipe(firstGui, handler, recipeIndex, multiplier); if (transfer <= 0) { break; @@ -112,43 +117,88 @@ public class DefaultOverlayHandler implements IOverlayHandler { multiplier -= transfer; - for (Slot slot : firstGui.inventorySlots.inventorySlots) { - if (slot.getHasStack() && slot instanceof SlotCrafting && slot.canTakeStack(thePlayer)) { - FastTransferManager.clickSlot(firstGui, slot.slotNumber, 0, 1); - craft = true; - break; - } + if (craftingSlot.getHasStack() && craftingSlot.canTakeStack(firstGui.mc.thePlayer)) { + FastTransferManager.clickSlot(firstGui, craftingSlot.slotNumber, 0, 1); + craft = true; } } - clearIngredients(firstGui); + clearIngredients(firstGui, handler); return craft; } - private boolean clearIngredients(GuiContainer gui) { - final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer; + protected boolean clearIngredients(GuiContainer gui, IRecipeHandler handler) { - for (Slot slot : gui.inventorySlots.inventorySlots) { - if (slot.getHasStack() && !canMoveFrom(slot, gui) - && !(slot instanceof SlotCrafting) - && slot.canTakeStack(thePlayer)) { + for (Slot slot : getCraftMatrixSlots(gui, handler)) { + if (slot.canTakeStack(gui.mc.thePlayer)) { FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1); if (slot.getHasStack()) return false; } } - return dropOffMouseStack(thePlayer, gui); + FastTransferManager.dropHeldItem(gui); + + return gui.mc.thePlayer.inventory.getItemStack() == null; + } + + /** + * Gets the slots in the crafting matrix for the given GUI and recipe handler. + * + * @param gui + * @param handler + * @return + */ + protected Set getCraftMatrixSlots(GuiContainer gui, IRecipeHandler handler) { + final PositionedStack firstIngr = handler.getIngredientStacks(0).get(0); + final Map grid = new HashMap<>(); + final Set ingredSlots = new HashSet<>(); + + for (Slot slot : gui.inventorySlots.inventorySlots) { + final int key = (slot.xDisplayPosition - this.offsetx) * 10_000 + (slot.yDisplayPosition - this.offsety); + grid.put(key, slot); + } + + int left = firstIngr.relx; + int top = firstIngr.rely; + int right = left; + int bottom = top; + + while (grid.containsKey((left - 18) * 10_000 + firstIngr.rely)) { + left -= 18; + } + + while (grid.containsKey((right + 18) * 10_000 + firstIngr.rely)) { + right += 18; + } + + while (grid.containsKey(firstIngr.relx * 10_000 + (top - 18))) { + top -= 18; + } + + while (grid.containsKey(firstIngr.relx * 10_000 + (bottom + 18))) { + bottom += 18; + } + + for (int x = left; x <= right; x += 18) { + for (int y = top; y <= bottom; y += 18) { + final Slot slot = grid.get(x * 10_000 + y); + if (slot != null && !(slot.inventory instanceof InventoryPlayer)) { + ingredSlots.add(slot); + } + } + } + + return ingredSlots; } private void moveIngredients(GuiContainer gui, List assignedIngredients, int multiplier) { - final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer; for (Slot slot : gui.inventorySlots.inventorySlots) { if (slot instanceof SlotCrafting || !slot.getHasStack() || !canMoveFrom(slot, gui) - || !slot.canTakeStack(thePlayer)) + || !slot.canTakeStack(gui.mc.thePlayer)) continue; ItemStack stack = slot.getStack(); int slotTransferCap = stack.getMaxStackSize(); @@ -186,7 +236,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { } - if (thePlayer.inventory.getItemStack() != null) { + if (gui.mc.thePlayer.inventory.getItemStack() != null) { FastTransferManager.clickSlot(gui, slot.slotNumber); } } @@ -194,33 +244,6 @@ public class DefaultOverlayHandler implements IOverlayHandler { } } - protected boolean dropOffMouseStack(EntityPlayer entityPlayer, GuiContainer gui) { - - if (entityPlayer.inventory.getItemStack() == null) { - return true; - } - - for (int i = 0; i < gui.inventorySlots.inventorySlots.size(); i++) { - Slot slot = gui.inventorySlots.inventorySlots.get(i); - - if (slot.inventory == entityPlayer.inventory) { - ItemStack mouseItem = entityPlayer.inventory.getItemStack(); - ItemStack slotStack = slot.getStack(); - - if (slotStack == null || NEIClientUtils.areStacksSameType(mouseItem, slotStack)) { - FastTransferManager.clickSlot(gui, i, 0, 0); - } - - if (entityPlayer.inventory.getItemStack() == null) { - return true; - } - - } - } - - return entityPlayer.inventory.getItemStack() == null; - } - private int calculateRecipeQuantity(List assignedIngredients) { int quantity = Integer.MAX_VALUE; diff --git a/src/main/java/codechicken/nei/recipe/Recipe.java b/src/main/java/codechicken/nei/recipe/Recipe.java index 7a68bfcc..6062b2e7 100644 --- a/src/main/java/codechicken/nei/recipe/Recipe.java +++ b/src/main/java/codechicken/nei/recipe/Recipe.java @@ -236,6 +236,12 @@ public class Recipe { return false; } + if (isShapedRecipe() && this.result != null + && anRecipeId.result != null + && !StackInfo.equalItemAndNBT(this.result, anRecipeId.result, true)) { + return false; + } + for (int idx = 0; idx < this.ingredients.size(); idx++) { if (!StackInfo.equalItemAndNBT(this.ingredients.get(idx), anRecipeId.ingredients.get(idx), true)) { return false; diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java index 16bff592..46b9e220 100644 --- a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java +++ b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java @@ -112,7 +112,8 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler { public ItemStack normalizeRecipeQueryStack(ItemStack stack) { - if (stack.getItem() == GameRegistry.findItem("ae2fc", "fluid_drop")) { + if (stack.getItem() == GameRegistry.findItem("ae2fc", "fluid_drop") + || stack.getItem() == GameRegistry.findItem("ae2fc", "fluid_packet")) { final FluidStack fluidStack = getFluid(stack); if (fluidStack != null) {